From de4524371009c5a1b4c5c4185eb7113aee8f30e1 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 22 Apr 2015 11:30:58 -0500 Subject: [PATCH] AppCompat AlertDialog --- .../java/org/tasks/activities/DonationActivity.java | 2 +- .../java/com/todoroo/andlib/utility/DialogUtilities.java | 2 +- .../java/com/todoroo/astrid/actfm/ActFmCameraModule.java | 4 ++-- .../com/todoroo/astrid/activity/SortSelectionActivity.java | 4 ++-- .../java/com/todoroo/astrid/activity/TaskEditFragment.java | 2 +- .../java/com/todoroo/astrid/activity/TaskListActivity.java | 2 +- .../java/com/todoroo/astrid/activity/TaskListFragment.java | 2 +- .../java/com/todoroo/astrid/backup/FilePickerBuilder.java | 2 +- .../java/com/todoroo/astrid/backup/TasksXmlImporter.java | 2 +- .../java/com/todoroo/astrid/calls/MissedCallActivity.java | 4 ++-- .../java/com/todoroo/astrid/core/CustomFilterAdapter.java | 2 +- src/main/java/com/todoroo/astrid/files/FileExplore.java | 5 ++--- .../java/com/todoroo/astrid/ui/NNumberPickerDialog.java | 6 +++--- src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java | 6 +++--- src/main/java/org/tasks/activities/ImportTaskActivity.java | 2 +- src/main/java/org/tasks/reminders/SnoozeActivity.java | 2 +- src/main/java/org/tasks/ui/NavigationDrawerFragment.java | 2 +- 17 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/googleplay/java/org/tasks/activities/DonationActivity.java b/src/googleplay/java/org/tasks/activities/DonationActivity.java index ff1e250bd..409806951 100644 --- a/src/googleplay/java/org/tasks/activities/DonationActivity.java +++ b/src/googleplay/java/org/tasks/activities/DonationActivity.java @@ -1,10 +1,10 @@ package org.tasks.activities; import android.app.Activity; -import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; +import android.support.v7.app.AlertDialog; import android.widget.Toast; import org.slf4j.Logger; diff --git a/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java b/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java index 5a65af811..4ff6e826e 100644 --- a/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java +++ b/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java @@ -7,10 +7,10 @@ package com.todoroo.andlib.utility; import android.app.Activity; -import android.app.AlertDialog; import android.app.Dialog; import android.app.ProgressDialog; import android.content.DialogInterface; +import android.support.v7.app.AlertDialog; import android.view.View; import org.slf4j.Logger; diff --git a/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java b/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java index cf3366be5..431b9fdf3 100644 --- a/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java +++ b/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java @@ -6,7 +6,6 @@ package com.todoroo.astrid.actfm; import android.app.Activity; -import android.app.AlertDialog; import android.content.ContentResolver; import android.content.DialogInterface; import android.content.Intent; @@ -14,6 +13,7 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.provider.MediaStore; import android.support.v4.app.Fragment; +import android.support.v7.app.AlertDialog; import android.webkit.MimeTypeMap; import android.widget.ArrayAdapter; import android.widget.Toast; @@ -45,7 +45,7 @@ public class ActFmCameraModule { private final Preferences preferences; public interface ClearImageCallback { - public void clearImage(); + void clearImage(); } @Inject diff --git a/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java b/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java index 8afd09ddf..9662e59a6 100644 --- a/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java +++ b/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java @@ -6,9 +6,9 @@ package com.todoroo.astrid.activity; import android.app.Activity; -import android.app.AlertDialog; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; +import android.support.v7.app.AlertDialog; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; @@ -31,7 +31,7 @@ import static com.todoroo.andlib.utility.AndroidUtilities.atLeastHoneycomb; public class SortSelectionActivity { public interface OnSortSelectedListener { - public void onSortSelected(boolean always, int flags, int sort); + void onSortSelected(boolean always, int flags, int sort); } /** diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index 064fbaca0..2935e4adc 100755 --- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -6,7 +6,6 @@ package com.todoroo.astrid.activity; import android.app.Activity; -import android.app.AlertDialog; import android.app.Dialog; import android.content.ContentValues; import android.content.DialogInterface; @@ -15,6 +14,7 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.support.v4.view.ViewPager; +import android.support.v7.app.AlertDialog; import android.text.TextUtils; import android.view.KeyEvent; import android.view.LayoutInflater; diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index 56807e989..55dcc9d9e 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -6,12 +6,12 @@ package com.todoroo.astrid.activity; import android.app.Activity; -import android.app.AlertDialog; import android.content.Intent; import android.os.Bundle; import android.support.v4.view.MenuItemCompat; import android.support.v4.view.ViewPager.OnPageChangeListener; import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.AlertDialog; import android.support.v7.widget.SearchView; import android.support.v7.widget.Toolbar; import android.view.KeyEvent; diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 205164644..289ff534b 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -6,7 +6,6 @@ package com.todoroo.astrid.activity; import android.app.Activity; -import android.app.AlertDialog; import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; @@ -18,6 +17,7 @@ import android.database.sqlite.SQLiteException; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.app.AlertDialog; import android.text.TextUtils; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; diff --git a/src/main/java/com/todoroo/astrid/backup/FilePickerBuilder.java b/src/main/java/com/todoroo/astrid/backup/FilePickerBuilder.java index 27c4c718a..d2d92b786 100644 --- a/src/main/java/com/todoroo/astrid/backup/FilePickerBuilder.java +++ b/src/main/java/com/todoroo/astrid/backup/FilePickerBuilder.java @@ -5,9 +5,9 @@ */ package com.todoroo.astrid.backup; -import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; +import android.support.v7.app.AlertDialog; import com.todoroo.andlib.utility.AndroidUtilities; diff --git a/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java b/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java index 02e2f2259..2cd618f1a 100644 --- a/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java +++ b/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java @@ -6,13 +6,13 @@ package com.todoroo.astrid.backup; import android.app.Activity; -import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.res.Resources; import android.os.Handler; +import android.support.v7.app.AlertDialog; import android.text.TextUtils; import android.view.WindowManager.BadTokenException; diff --git a/src/main/java/com/todoroo/astrid/calls/MissedCallActivity.java b/src/main/java/com/todoroo/astrid/calls/MissedCallActivity.java index 2ec036daa..1952aa8f2 100644 --- a/src/main/java/com/todoroo/astrid/calls/MissedCallActivity.java +++ b/src/main/java/com/todoroo/astrid/calls/MissedCallActivity.java @@ -5,7 +5,6 @@ */ package com.todoroo.astrid.calls; -import android.app.AlertDialog; import android.content.ContentUris; import android.content.DialogInterface; import android.content.Intent; @@ -14,6 +13,7 @@ import android.graphics.BitmapFactory; import android.net.Uri; import android.os.Bundle; import android.provider.ContactsContract; +import android.support.v7.app.AlertDialog; import android.text.TextUtils; import android.view.View; import android.view.View.OnClickListener; @@ -22,7 +22,6 @@ import android.widget.TextView; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DialogUtilities; -import org.tasks.preferences.BasicPreferences; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.reminders.SnoozeCallback; import com.todoroo.astrid.reminders.SnoozeDialog; @@ -34,6 +33,7 @@ import org.slf4j.LoggerFactory; import org.tasks.R; import org.tasks.injection.InjectingActivity; import org.tasks.preferences.ActivityPreferences; +import org.tasks.preferences.BasicPreferences; import org.tasks.preferences.ResourceResolver; import java.io.InputStream; diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java b/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java index 693251063..2f1aa3360 100644 --- a/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java +++ b/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java @@ -5,10 +5,10 @@ */ package com.todoroo.astrid.core; -import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; +import android.support.v7.app.AlertDialog; import android.view.ContextMenu; import android.view.LayoutInflater; import android.view.MenuItem; diff --git a/src/main/java/com/todoroo/astrid/files/FileExplore.java b/src/main/java/com/todoroo/astrid/files/FileExplore.java index b74ea74b7..fede38d1e 100644 --- a/src/main/java/com/todoroo/astrid/files/FileExplore.java +++ b/src/main/java/com/todoroo/astrid/files/FileExplore.java @@ -6,14 +6,13 @@ package com.todoroo.astrid.files; import android.app.Activity; -import android.app.AlertDialog; -import android.app.AlertDialog.Builder; import android.app.Dialog; import android.content.DialogInterface; import android.content.DialogInterface.OnCancelListener; import android.content.Intent; import android.os.Bundle; import android.os.Environment; +import android.support.v7.app.AlertDialog; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; @@ -175,7 +174,7 @@ public class FileExplore extends Activity { @Override protected Dialog onCreateDialog(int id) { Dialog dialog; - AlertDialog.Builder builder = new Builder(this); + AlertDialog.Builder builder = new AlertDialog.Builder(this); if (fileList == null) { dialog = builder.create(); diff --git a/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java b/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java index aedecd300..b49af985a 100644 --- a/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java +++ b/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java @@ -5,10 +5,10 @@ */ package com.todoroo.astrid.ui; -import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; +import android.support.v7.app.AlertDialog; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; @@ -48,8 +48,8 @@ public class NNumberPickerDialog extends AlertDialog implements OnClickListener super(context); mCallback = callBack; - setButton(context.getText(android.R.string.ok), this); - setButton2(context.getText(android.R.string.cancel), (OnClickListener) null); + setButton(DialogInterface.BUTTON_POSITIVE, context.getText(android.R.string.ok), this); + setButton(DialogInterface.BUTTON_NEGATIVE, context.getText(android.R.string.cancel), (OnClickListener) null); LayoutInflater inflater = (LayoutInflater) context .getSystemService(Context.LAYOUT_INFLATER_SERVICE); diff --git a/src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java b/src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java index eff795819..d46e85ae0 100644 --- a/src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java +++ b/src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java @@ -5,10 +5,10 @@ */ package com.todoroo.astrid.ui; -import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; +import android.support.v7.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; @@ -28,8 +28,8 @@ public class NumberPickerDialog extends AlertDialog implements OnClickListener { super(context); mCallback = callBack; - setButton(context.getText(android.R.string.ok), this); - setButton2(context.getText(android.R.string.cancel), (OnClickListener) null); + setButton(DialogInterface.BUTTON_POSITIVE, context.getText(android.R.string.ok), this); + setButton(DialogInterface.BUTTON_NEGATIVE, context.getText(android.R.string.cancel), (OnClickListener) null); LayoutInflater inflater = (LayoutInflater) context .getSystemService(Context.LAYOUT_INFLATER_SERVICE); diff --git a/src/main/java/org/tasks/activities/ImportTaskActivity.java b/src/main/java/org/tasks/activities/ImportTaskActivity.java index 5f4ade48e..6f3e48419 100644 --- a/src/main/java/org/tasks/activities/ImportTaskActivity.java +++ b/src/main/java/org/tasks/activities/ImportTaskActivity.java @@ -1,8 +1,8 @@ package org.tasks.activities; -import android.app.AlertDialog; import android.content.DialogInterface; import android.os.Bundle; +import android.support.v7.app.AlertDialog; import com.todoroo.astrid.backup.FilePickerBuilder; import com.todoroo.astrid.backup.TasksXmlImporter; diff --git a/src/main/java/org/tasks/reminders/SnoozeActivity.java b/src/main/java/org/tasks/reminders/SnoozeActivity.java index 271f4e54e..25710f95a 100644 --- a/src/main/java/org/tasks/reminders/SnoozeActivity.java +++ b/src/main/java/org/tasks/reminders/SnoozeActivity.java @@ -1,8 +1,8 @@ package org.tasks.reminders; -import android.app.AlertDialog; import android.content.DialogInterface; import android.os.Bundle; +import android.support.v7.app.AlertDialog; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.reminders.SnoozeCallback; diff --git a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java index 982bb849c..d62b3b84d 100644 --- a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java +++ b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java @@ -1,7 +1,6 @@ package org.tasks.ui; import android.app.Activity; -import android.app.AlertDialog; import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; @@ -14,6 +13,7 @@ import android.os.Bundle; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarDrawerToggle; +import android.support.v7.app.AlertDialog; import android.view.ContextMenu; import android.view.KeyEvent; import android.view.LayoutInflater;