archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Dialog cleanup

Browse Source
pull/321/head
Alex Baker 9 years ago
parent 584acf872c
commit 5ec0ed0d99
12 changed files with 115 additions and 156 deletions
Show Stats Download Patch File Download Diff File

36
src/main/java/com/todoroo/andlib/utility/DialogUtilities.java
Unescape Escape View File

@ -8,58 +8,28 @@ package com.todoroo.andlib.utility;
import android.app.Activity;
import android.app.Dialog;
import android.app.ProgressDialog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.tasks.R;
@Deprecated
public class DialogUtilities {
private static final Logger log = LoggerFactory.getLogger(DialogUtilities.class);
/**
* Displays a progress dialog. Must be run on the UI thread
*/
public static ProgressDialog progressDialog(Activity context, String text) {
ProgressDialog dialog = new ProgressDialog(context, R.style.TasksDialog);
dialog.setIndeterminate(true);
dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
dialog.setMessage(text);
dialog.show();
dialog.setOwnerActivity(context);
return dialog;
}
/**
* Dismiss a dialog off the UI thread
*/
@Deprecated
public static void dismissDialog(Activity activity, final Dialog dialog) {
if(dialog == null) {
return;
}
tryOnUiThread(activity, new Runnable() {
@Override
public void run() {
try {
dialog.dismiss();
} catch (Exception e) {
// could have killed activity
log.error(e.getMessage(), e);
}
}
});
}
private static void tryOnUiThread(Activity activity, final Runnable runnable) {
activity.runOnUiThread(new Runnable() {
@Override
public void run() {
try {
runnable.run();
} catch (Exception e) {
// probably window was closed
dialog.dismiss();
} catch(Exception e) {
log.error(e.getMessage(), e);
}
}

2
src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java
Unescape Escape View File

@ -107,10 +107,8 @@ public class GtasksListFragment extends SubtasksListFragment {
}
private void clearCompletedTasks() {
final ProgressDialog pd = dialogBuilder.newProgressDialog(R.string.gtasks_GTA_clearing);
final TodorooCursor<Task> tasks = taskService.fetchFiltered(filter.getSqlQuery(),
null, Task.ID, Task.COMPLETION_DATE);
pd.show();
new AsyncTask<Void, Void, Void>() {

5
src/main/java/org/tasks/activities/ClearAllDataActivity.java
Unescape Escape View File

@ -31,9 +31,10 @@ public class ClearAllDataActivity extends InjectingAppCompatActivity {
System.exit(0);
}
})
.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
.setNegativeButton(android.R.string.cancel, null)
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
public void onDismiss(DialogInterface dialog) {
finish();
}
})

6
src/main/java/org/tasks/activities/ClearGtaskDataActivity.java
Unescape Escape View File

@ -26,12 +26,12 @@ public class ClearGtaskDataActivity extends InjectingAppCompatActivity {
public void onClick(DialogInterface dialog, int which) {
gtasksSyncV2Provider.signOut();
setResult(RESULT_OK);
finish();
}
})
.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
.setNegativeButton(android.R.string.cancel, null)
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
public void onDismiss(DialogInterface dialog) {
finish();
}
})

5
src/main/java/org/tasks/activities/DeleteAllCalendarEventsActivity.java
Unescape Escape View File

@ -63,9 +63,10 @@ public class DeleteAllCalendarEventsActivity extends InjectingAppCompatActivity
}.execute();
}
})
.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
.setNegativeButton(android.R.string.cancel, null)
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
public void onDismiss(DialogInterface dialog) {
finish();
}
})

5
src/main/java/org/tasks/activities/DeleteCompletedActivity.java
Unescape Escape View File

@ -59,9 +59,10 @@ public class DeleteCompletedActivity extends InjectingAppCompatActivity {
}.execute();
}
})
.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
.setNegativeButton(android.R.string.cancel, null)
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
public void onDismiss(DialogInterface dialog) {
finish();
}
})

5
src/main/java/org/tasks/activities/DeleteCompletedEventsActivity.java
Unescape Escape View File

@ -67,9 +67,10 @@ public class DeleteCompletedEventsActivity extends InjectingAppCompatActivity {
}.execute();
}
})
.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
.setNegativeButton(android.R.string.cancel, null)
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
public void onDismiss(DialogInterface dialog) {
finish();
}
})

5
src/main/java/org/tasks/activities/PurgeDeletedActivity.java
Unescape Escape View File

@ -62,9 +62,10 @@ public class PurgeDeletedActivity extends InjectingAppCompatActivity {
}.execute();
}
})
.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
.setNegativeButton(android.R.string.cancel, null)
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
public void onDismiss(DialogInterface dialog) {
finish();
}
})

16
src/main/java/org/tasks/dialogs/DialogBuilder.java
Unescape Escape View File

@ -2,9 +2,11 @@ package org.tasks.dialogs;
import android.app.Activity;
import android.app.ProgressDialog;
import android.graphics.drawable.ColorDrawable;
import android.support.v7.app.AlertDialog;
import org.tasks.R;
import com.todoroo.andlib.utility.AndroidUtilities;
import org.tasks.preferences.ActivityPreferences;
import javax.inject.Inject;
@ -23,16 +25,16 @@ public class DialogBuilder {
return new AlertDialog.Builder(activity, activityPreferences.getDialogTheme());
}
public AlertDialog.Builder newMessageDialog(String message) {
return newDialog().setMessage(message);
}
public AlertDialog.Builder newMessageDialog(int message, Object... formatArgs) {
return newMessageDialog(activity.getString(message, formatArgs));
return newDialog().setMessage(activity.getString(message, formatArgs));
}
public ProgressDialog newProgressDialog() {
return new ProgressDialog(activity, activityPreferences.getDialogTheme());
ProgressDialog progressDialog = new ProgressDialog(activity, activityPreferences.getDialogTheme());
if (AndroidUtilities.preLollipop()) {
progressDialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.R.color.transparent));
}
return progressDialog;
}
public ProgressDialog newProgressDialog(int messageId) {

2
src/main/java/org/tasks/ui/ProgressDialogAsyncTask.java
Unescape Escape View File

@ -32,8 +32,6 @@ public abstract class ProgressDialogAsyncTask extends AsyncTask<Void, Void, Inte
}
Toast.makeText(activity, activity.getString(getResultResource(), integer), Toast.LENGTH_LONG).show();
activity.finish();
}
protected abstract int getResultResource();

94
src/main/res/layout/astrid_missed_call_view.xml
Unescape Escape View File

@ -1,94 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
** Copyright (c) 2012 Todoroo Inc
**
** See the file "LICENSE" for the full license governing this code.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/reminder_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="5dip"
android:layout_marginRight="5dip"
android:layout_marginBottom="15dip"
android:layout_marginLeft="10dip">
<ImageView
android:id="@+id/contact_picture"
android:layout_marginTop="5dip"
android:layout_marginRight="10dip"
android:visibility="gone"
android:layout_width="51dip"
android:layout_height="51dip"
android:scaleType="fitCenter" />
<TextView
android:id="@+id/reminder_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="1dip"
android:textSize="24sp"
android:layout_weight="1"
android:text="@string/MCA_title"/>
</LinearLayout>
<TextView
android:id="@+id/call_now"
android:layout_width="fill_parent"
android:layout_height="35dip"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:layout_marginBottom="10dip"
android:textColor="@android:color/white"
android:textSize="24sp"
android:gravity="center"
android:text="@string/MCA_return_call"/>
<TextView
android:id="@+id/call_later"
android:layout_width="fill_parent"
android:layout_height="35dip"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:layout_marginBottom="10dip"
android:textColor="@android:color/white"
android:textSize="24sp"
android:gravity="center"
android:text="@string/MCA_add_task"/>
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:layout_marginBottom="10dip">
<TextView
android:id="@+id/call_ignore"
android:layout_width="fill_parent"
android:layout_height="35dip"
android:textColor="@android:color/white"
android:textSize="24sp"
android:gravity="center"
android:text="@string/MCA_ignore"
android:background="#707070"/>
<ImageView
android:id="@+id/ignore_settings"
android:layout_alignParentRight="true"
android:layout_width="35dip"
android:layout_height="35dip"
android:padding="4dip"
android:background="@android:color/transparent"
android:scaleType="fitCenter"
android:src="@drawable/ic_settings_white_24dp"/>
</RelativeLayout>
</LinearLayout>

90
src/main/res/layout/missed_call_activity.xml
Unescape Escape View File

@ -5,10 +5,90 @@
** See the file "LICENSE" for the full license governing this code.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/reminder_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center">
<include layout="@layout/astrid_missed_call_view"/>
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="5dip"
android:layout_marginRight="5dip"
android:layout_marginBottom="15dip"
android:layout_marginLeft="10dip">
<ImageView
android:id="@+id/contact_picture"
android:layout_marginTop="5dip"
android:layout_marginRight="10dip"
android:visibility="gone"
android:layout_width="51dip"
android:layout_height="51dip"
android:scaleType="fitCenter" />
<TextView
android:id="@+id/reminder_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="1dip"
android:textSize="24sp"
android:layout_weight="1"
android:text="@string/MCA_title"/>
</LinearLayout>
<TextView
android:id="@+id/call_now"
android:layout_width="fill_parent"
android:layout_height="35dip"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:layout_marginBottom="10dip"
android:textColor="@android:color/white"
android:textSize="24sp"
android:gravity="center"
android:text="@string/MCA_return_call"/>
<TextView
android:id="@+id/call_later"
android:layout_width="fill_parent"
android:layout_height="35dip"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:layout_marginBottom="10dip"
android:textColor="@android:color/white"
android:textSize="24sp"
android:gravity="center"
android:text="@string/MCA_add_task"/>
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:layout_marginBottom="10dip">
<TextView
android:id="@+id/call_ignore"
android:layout_width="fill_parent"
android:layout_height="35dip"
android:textColor="@android:color/white"
android:textSize="24sp"
android:gravity="center"
android:text="@string/MCA_ignore"
android:background="#707070"/>
<ImageView
android:id="@+id/ignore_settings"
android:layout_alignParentRight="true"
android:layout_width="35dip"
android:layout_height="35dip"
android:padding="4dip"
android:background="@android:color/transparent"
android:scaleType="fitCenter"
android:src="@drawable/ic_settings_white_24dp"/>
</RelativeLayout>
</LinearLayout>

Write Preview
Loading…
Cancel
Save