From 48eac2f4bc2676a0de1d361049f59e5b46a88da3 Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Sun, 8 Nov 2015 17:52:12 +0100 Subject: Sleep timer dialog --- .../antennapod/activity/MediaplayerActivity.java | 55 +++++------ .../danoeh/antennapod/dialog/SleepTimerDialog.java | 107 ++++++++++----------- 2 files changed, 75 insertions(+), 87 deletions(-) (limited to 'app/src/main/java/de/danoeh') diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java index e34b4dc67..90bd3afee 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -19,6 +19,8 @@ import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; +import com.afollestad.materialdialogs.MaterialDialog; + import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.feed.FeedItem; import de.danoeh.antennapod.core.feed.FeedMedia; @@ -291,49 +293,40 @@ public abstract class MediaplayerActivity extends ActionBarActivity switch (item.getItemId()) { case R.id.disable_sleeptimer_item: if (controller.serviceAvailable()) { - AlertDialog.Builder stDialog = new AlertDialog.Builder(this); - stDialog.setTitle(R.string.sleep_timer_label); - stDialog.setMessage(getString(R.string.time_left_label) + + MaterialDialog.Builder stDialog = new MaterialDialog.Builder(this); + stDialog.title(R.string.sleep_timer_label); + stDialog.content(getString(R.string.time_left_label) + Converter.getDurationStringLong((int) controller .getSleepTimerTimeLeft())); - stDialog.setPositiveButton( - R.string.disable_sleeptimer_label, - new DialogInterface.OnClickListener() { - - @Override - public void onClick(DialogInterface dialog, - int which) { - dialog.dismiss(); - controller.disableSleepTimer(); - } - } - ); - stDialog.setNegativeButton(R.string.cancel_label, - new DialogInterface.OnClickListener() { - - @Override - public void onClick(DialogInterface dialog, - int which) { - dialog.dismiss(); - } - } - ); - stDialog.create().show(); + stDialog.positiveText(R.string.disable_sleeptimer_label); + stDialog.negativeText(R.string.cancel_label); + stDialog.callback(new MaterialDialog.ButtonCallback() { + @Override + public void onPositive(MaterialDialog dialog) { + dialog.dismiss(); + controller.disableSleepTimer(); + } + + @Override + public void onNegative(MaterialDialog dialog) { + dialog.dismiss(); + } + }); + stDialog.build().show(); } break; case R.id.set_sleeptimer_item: if (controller.serviceAvailable()) { - SleepTimerDialog td = new SleepTimerDialog(this, 0, 0) { + SleepTimerDialog td = new SleepTimerDialog(this) { @Override public void onTimerSet(long millis, boolean shakeToReset, boolean vibrate) { controller.setSleepTimer(millis, shakeToReset, vibrate); } }; - td.show(); - - break; - + td.createNewDialog().show(); } + break; case R.id.visit_website_item: Uri uri = Uri.parse(media.getWebsiteLink()); startActivity(new Intent(Intent.ACTION_VIEW, uri)); diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java index a699706a8..930079e40 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java @@ -17,11 +17,14 @@ import android.widget.EditText; import android.widget.Spinner; import android.widget.Toast; +import com.afollestad.materialdialogs.DialogAction; +import com.afollestad.materialdialogs.MaterialDialog; + import java.util.concurrent.TimeUnit; import de.danoeh.antennapod.R; -public abstract class SleepTimerDialog extends Dialog { +public abstract class SleepTimerDialog { private static final String TAG = SleepTimerDialog.class.getSimpleName(); @@ -35,39 +38,54 @@ public abstract class SleepTimerDialog extends Dialog { private String PREF_SHAKE_TO_RESET = "ShakeToReset"; private SharedPreferences prefs; + private MaterialDialog dialog; private EditText etxtTime; private Spinner spTimeUnit; private CheckBox cbShakeToReset; private CheckBox cbVibrate; - private Button butConfirm; - private Button butCancel; + private TimeUnit[] units = { TimeUnit.SECONDS, TimeUnit.MINUTES, TimeUnit.HOURS }; - public SleepTimerDialog(Context context, int titleTextId, int leftButtonTextId) { - super(context); + public SleepTimerDialog(Context context) { this.context = context; prefs = context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE); } - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - requestWindowFeature(Window.FEATURE_NO_TITLE); - String[] spinnerContent = new String[] { - context.getString(R.string.time_seconds), - context.getString(R.string.time_minutes), - context.getString(R.string.time_hours) }; - - setContentView(R.layout.time_dialog); - etxtTime = (EditText) findViewById(R.id.etxtTime); - spTimeUnit = (Spinner) findViewById(R.id.spTimeUnit); - cbShakeToReset = (CheckBox) findViewById(R.id.cbShakeToReset); - cbVibrate = (CheckBox) findViewById(R.id.cbVibrate); - butConfirm = (Button) findViewById(R.id.butConfirm); - butCancel = (Button) findViewById(R.id.butCancel); + public MaterialDialog createNewDialog() { + MaterialDialog.Builder builder = new MaterialDialog.Builder(context); + builder.title(R.string.set_sleeptimer_label); + builder.customView(R.layout.time_dialog, false); + builder.positiveText(R.string.set_sleeptimer_label); + builder.negativeText(R.string.cancel_label); + builder.callback(new MaterialDialog.ButtonCallback() { + @Override + public void onNegative(MaterialDialog dialog) { + dialog.dismiss(); + } - setTitle(R.string.set_sleeptimer_label); + @Override + public void onPositive(MaterialDialog dialog) { + try { + savePreferences(); + long input = readTimeMillis(); + onTimerSet(input, cbShakeToReset.isChecked(), cbVibrate.isChecked()); + dialog.dismiss(); + } catch (NumberFormatException e) { + e.printStackTrace(); + Toast toast = Toast.makeText(context, R.string.time_dialog_invalid_input, + Toast.LENGTH_LONG); + toast.show(); + } + } + }); + dialog = builder.build(); + + View view = dialog.getView(); + etxtTime = (EditText) view.findViewById(R.id.etxtTime); + spTimeUnit = (Spinner) view.findViewById(R.id.spTimeUnit); + cbShakeToReset = (CheckBox) view.findViewById(R.id.cbShakeToReset); + cbVibrate = (CheckBox) view.findViewById(R.id.cbVibrate); etxtTime.setText(prefs.getString(PREF_VALUE, "15")); etxtTime.addTextChangedListener(new TextWatcher() { @@ -84,15 +102,16 @@ public abstract class SleepTimerDialog extends Dialog { public void onTextChanged(CharSequence s, int start, int before, int count) { } }); - etxtTime.postDelayed(new Runnable() { - @Override - public void run() { - InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE); - imm.showSoftInput(etxtTime, InputMethodManager.SHOW_IMPLICIT); - } + etxtTime.postDelayed(() -> { + InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE); + imm.showSoftInput(etxtTime, InputMethodManager.SHOW_IMPLICIT); }, 100); - ArrayAdapter spinnerAdapter = new ArrayAdapter<>(this.getContext(), + String[] spinnerContent = new String[] { + context.getString(R.string.time_seconds), + context.getString(R.string.time_minutes), + context.getString(R.string.time_hours) }; + ArrayAdapter spinnerAdapter = new ArrayAdapter<>(context, android.R.layout.simple_spinner_item, spinnerContent); spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); spTimeUnit.setAdapter(spinnerAdapter); @@ -102,40 +121,16 @@ public abstract class SleepTimerDialog extends Dialog { cbShakeToReset.setChecked(prefs.getBoolean(PREF_SHAKE_TO_RESET, true)); cbVibrate.setChecked(prefs.getBoolean(PREF_VIBRATE, true)); - butConfirm.setText(R.string.set_sleeptimer_label); - butConfirm.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - try { - savePreferences(); - long input = readTimeMillis(); - onTimerSet(input, cbShakeToReset.isChecked(), cbVibrate.isChecked()); - dismiss(); - } catch (NumberFormatException e) { - e.printStackTrace(); - Toast toast = Toast.makeText(context, R.string.time_dialog_invalid_input, - Toast.LENGTH_LONG); - toast.show(); - } - } - }); - - butCancel.setText(R.string.cancel_label); - butCancel.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - dismiss(); - } - }); + return dialog; } private void checkInputLength(int length) { if (length > 0) { Log.d(TAG, "Length is larger than 0, enabling confirm button"); - butConfirm.setEnabled(true); + dialog.getActionButton(DialogAction.POSITIVE).setEnabled(true); } else { Log.d(TAG, "Length is smaller than 0, disabling confirm button"); - butConfirm.setEnabled(false); + dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false); } } -- cgit v1.2.3 From 8de90b7948569ef946979efa26c3c5f928a50b9c Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Sun, 8 Nov 2015 18:05:19 +0100 Subject: AlertDialog -> v7 AlertDialog --- .../activity/DirectoryChooserActivity.java | 86 ++++++++-------------- .../danoeh/antennapod/activity/MainActivity.java | 2 +- .../antennapod/activity/MediaplayerActivity.java | 18 ++--- .../activity/OnlineFeedViewActivity.java | 2 +- .../activity/OpmlImportFromIntentActivity.java | 2 +- .../adapter/DefaultActionButtonCallback.java | 2 +- .../antennapod/asynctask/OpmlExportWorker.java | 2 +- .../antennapod/asynctask/OpmlImportWorker.java | 20 ++--- .../dialog/AutoFlattrPreferenceDialog.java | 2 +- .../dialog/GpodnetSetHostnameDialog.java | 31 +++----- .../antennapod/dialog/VariableSpeedDialog.java | 2 +- .../antennapod/menuhandler/FeedMenuHandler.java | 2 +- .../preferences/PreferenceController.java | 2 +- 13 files changed, 63 insertions(+), 110 deletions(-) (limited to 'app/src/main/java/de/danoeh') diff --git a/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java index 559fa0574..86ca90eb5 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java @@ -1,7 +1,6 @@ package de.danoeh.antennapod.activity; import android.app.Activity; -import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; @@ -9,6 +8,7 @@ import android.os.Environment; import android.os.FileObserver; import android.support.v4.app.NavUtils; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AlertDialog; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; @@ -84,65 +84,41 @@ public class DirectoryChooserActivity extends ActionBarActivity { adb.setTitle(R.string.folder_not_empty_dialog_title); adb.setMessage(R.string.folder_not_empty_dialog_msg); adb.setNegativeButton(R.string.cancel_label, - new DialogInterface.OnClickListener() { - - @Override - public void onClick(DialogInterface dialog, - int which) { - dialog.dismiss(); - } - }); + (dialog, which) -> { + dialog.dismiss(); + }); adb.setPositiveButton(R.string.confirm_label, - new DialogInterface.OnClickListener() { - - @Override - public void onClick(DialogInterface dialog, - int which) { - dialog.dismiss(); - returnSelectedFolder(); - } - }); + (dialog, which) -> { + dialog.dismiss(); + returnSelectedFolder(); + }); adb.create().show(); } }); - butCancel.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(View v) { - setResult(Activity.RESULT_CANCELED); - finish(); - } - }); - - listDirectories.setOnItemClickListener(new OnItemClickListener() { - - @Override - public void onItemClick(AdapterView adapter, View view, - int position, long id) { - if (BuildConfig.DEBUG) - Log.d(TAG, "Selected index: " + position); - if (filesInDir != null && position >= 0 - && position < filesInDir.length) { - changeDirectory(filesInDir[position]); - } - } - }); - - butNavUp.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(View v) { - File parent = null; - if (selectedDir != null - && (parent = selectedDir.getParentFile()) != null) { - changeDirectory(parent); - } - } - }); - - filenames = new ArrayList(); - listDirectoriesAdapter = new ArrayAdapter(this, + butCancel.setOnClickListener(v -> { + setResult(Activity.RESULT_CANCELED); + finish(); + }); + + listDirectories.setOnItemClickListener((adapter, view, position, id) -> { + Log.d(TAG, "Selected index: " + position); + if (filesInDir != null && position >= 0 + && position < filesInDir.length) { + changeDirectory(filesInDir[position]); + } + }); + + butNavUp.setOnClickListener(v -> { + File parent = null; + if (selectedDir != null + && (parent = selectedDir.getParentFile()) != null) { + changeDirectory(parent); + } + }); + + filenames = new ArrayList<>(); + listDirectoriesAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, filenames); listDirectories.setAdapter(listDirectoriesAdapter); changeDirectory(Environment.getExternalStorageDirectory()); diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java index df680a297..6915c817b 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java @@ -1,7 +1,6 @@ package de.danoeh.antennapod.activity; import android.annotation.TargetApi; -import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.DialogInterface; import android.content.Intent; @@ -20,6 +19,7 @@ import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarActivity; import android.support.v7.app.ActionBarDrawerToggle; +import android.support.v7.app.AlertDialog; import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.ContextMenu; diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java index 90bd3afee..c53a5257b 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -1,6 +1,5 @@ package de.danoeh.antennapod.activity; -import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; import android.graphics.PixelFormat; @@ -8,6 +7,7 @@ import android.media.AudioManager; import android.net.Uri; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AlertDialog; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; @@ -493,19 +493,13 @@ public abstract class MediaplayerActivity extends ActionBarActivity AlertDialog.Builder builder = new AlertDialog.Builder(MediaplayerActivity.this); builder.setTitle(R.string.pref_fast_forward); builder.setSingleChoiceItems(choices, checked, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - choice = values[which]; - } + (dialog, which) -> { + choice = values[which]; }); builder.setNegativeButton(R.string.cancel_label, null); - builder.setPositiveButton(R.string.confirm_label, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - UserPreferences.setPrefFastForwardSecs(choice); - txtvFF.setText(String.valueOf(choice)); - } + builder.setPositiveButton(R.string.confirm_label, (dialog, which) -> { + UserPreferences.setPrefFastForwardSecs(choice); + txtvFF.setText(String.valueOf(choice)); }); builder.create().show(); return true; diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java index a629b8758..c67d65a9d 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java @@ -1,6 +1,5 @@ package de.danoeh.antennapod.activity; -import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; @@ -9,6 +8,7 @@ import android.os.Bundle; import android.os.Looper; import android.support.v4.app.NavUtils; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AlertDialog; import android.util.Log; import android.view.LayoutInflater; import android.view.MenuItem; diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java index f7e9256c0..46e5f0e8e 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java @@ -1,8 +1,8 @@ package de.danoeh.antennapod.activity; -import android.app.AlertDialog; import android.net.Uri; import android.os.Bundle; +import android.support.v7.app.AlertDialog; import android.util.Log; import de.danoeh.antennapod.core.preferences.UserPreferences; diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java index 445e4832c..efdf1a3c9 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java @@ -1,9 +1,9 @@ package de.danoeh.antennapod.adapter; -import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.support.v7.app.AlertDialog; import android.widget.Toast; import org.apache.commons.lang3.Validate; diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java index 3656c3638..3940eb8b6 100644 --- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java +++ b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java @@ -1,13 +1,13 @@ package de.danoeh.antennapod.asynctask; import android.annotation.SuppressLint; -import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.AsyncTask; +import android.support.v7.app.AlertDialog; import android.util.Log; import java.io.File; diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java index 5486bc4fb..86636485d 100644 --- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java +++ b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java @@ -1,12 +1,12 @@ package de.danoeh.antennapod.asynctask; import android.annotation.SuppressLint; -import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.os.AsyncTask; +import android.support.v7.app.AlertDialog; import android.util.Log; import de.danoeh.antennapod.core.BuildConfig; import de.danoeh.antennapod.core.R; @@ -37,8 +37,7 @@ public class OpmlImportWorker extends @Override protected ArrayList doInBackground(Void... params) { - if (BuildConfig.DEBUG) - Log.d(TAG, "Starting background work"); + Log.d(TAG, "Starting background work"); if (mReader==null) { return null; @@ -72,21 +71,14 @@ public class OpmlImportWorker extends } progDialog.dismiss(); if (exception != null) { - if (BuildConfig.DEBUG) - Log.d(TAG, - "An error occurred while trying to parse the opml document"); + Log.d(TAG, "An error occurred while trying to parse the opml document"); AlertDialog.Builder alert = new AlertDialog.Builder(context); alert.setTitle(R.string.error_label); alert.setMessage(context.getString(R.string.opml_reader_error) + exception.getMessage()); - alert.setNeutralButton(android.R.string.ok, new OnClickListener() { - - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - } - - }); + alert.setNeutralButton(android.R.string.ok, (dialog, which) -> { + dialog.dismiss(); + }); alert.create().show(); } } diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java index 1585f9b86..75b1bc8d2 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java @@ -2,9 +2,9 @@ package de.danoeh.antennapod.dialog; import android.annotation.SuppressLint; import android.app.Activity; -import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; +import android.support.v7.app.AlertDialog; import android.view.View; import android.widget.CheckBox; import android.widget.SeekBar; diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java index 16fb77f2a..5f531e88f 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java @@ -1,8 +1,8 @@ package de.danoeh.antennapod.dialog; -import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; +import android.support.v7.app.AlertDialog; import android.text.Editable; import android.text.InputType; import android.view.View; @@ -26,28 +26,19 @@ public class GpodnetSetHostnameDialog { et.setInputType(InputType.TYPE_TEXT_VARIATION_URI); dialog.setTitle(R.string.pref_gpodnet_sethostname_title) .setView(setupContentView(context, et)) - .setPositiveButton(R.string.confirm_label, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - final Editable e = et.getText(); - if (e != null) { - GpodnetPreferences.setHostname(e.toString()); - } - dialog.dismiss(); + .setPositiveButton(R.string.confirm_label, (dialog1, which) -> { + final Editable e = et.getText(); + if (e != null) { + GpodnetPreferences.setHostname(e.toString()); } + dialog1.dismiss(); }) - .setNegativeButton(R.string.cancel_label, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.cancel(); - } + .setNegativeButton(R.string.cancel_label, (dialog1, which) -> { + dialog1.cancel(); }) - .setNeutralButton(R.string.pref_gpodnet_sethostname_use_default_host, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - GpodnetPreferences.setHostname(GpodnetService.DEFAULT_BASE_HOST); - dialog.dismiss(); - } + .setNeutralButton(R.string.pref_gpodnet_sethostname_use_default_host, (dialog1, which) -> { + GpodnetPreferences.setHostname(GpodnetService.DEFAULT_BASE_HOST); + dialog1.dismiss(); }) .setCancelable(true); return dialog.show(); diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java index 5f6e3d0e2..4b512a48d 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java @@ -1,11 +1,11 @@ package de.danoeh.antennapod.dialog; -import android.app.AlertDialog; import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Build; +import android.support.v7.app.AlertDialog; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java index f32a1c2ee..84da32a40 100644 --- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java +++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java @@ -1,10 +1,10 @@ package de.danoeh.antennapod.menuhandler; -import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; +import android.support.v7.app.AlertDialog; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java index 138246038..f729ef807 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java @@ -1,7 +1,6 @@ package de.danoeh.antennapod.preferences; import android.app.Activity; -import android.app.AlertDialog; import android.app.TimePickerDialog; import android.content.Context; import android.content.DialogInterface; @@ -17,6 +16,7 @@ import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceManager; import android.preference.PreferenceScreen; +import android.support.v7.app.AlertDialog; import android.text.Editable; import android.text.TextWatcher; import android.text.format.DateFormat; -- cgit v1.2.3 From 6184b7f30625aaff5448caed3683d99f2d8d1ba4 Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Sun, 8 Nov 2015 18:11:28 +0100 Subject: Material dialogs in preferences --- .../preferences/CustomEditTextPreference.java | 33 ---------------------- 1 file changed, 33 deletions(-) delete mode 100644 app/src/main/java/de/danoeh/antennapod/preferences/CustomEditTextPreference.java (limited to 'app/src/main/java/de/danoeh') diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/CustomEditTextPreference.java b/app/src/main/java/de/danoeh/antennapod/preferences/CustomEditTextPreference.java deleted file mode 100644 index 898a56004..000000000 --- a/app/src/main/java/de/danoeh/antennapod/preferences/CustomEditTextPreference.java +++ /dev/null @@ -1,33 +0,0 @@ -package de.danoeh.antennapod.preferences; - -import android.app.AlertDialog; -import android.content.Context; -import android.os.Build; -import android.preference.EditTextPreference; -import android.util.AttributeSet; - -import de.danoeh.antennapod.R; - -public class CustomEditTextPreference extends EditTextPreference { - - public CustomEditTextPreference(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - } - - public CustomEditTextPreference(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public CustomEditTextPreference(Context context) { - super(context); - } - - @Override - protected void onPrepareDialogBuilder(AlertDialog.Builder builder) { - if(Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) { - builder.setInverseBackgroundForced(true); - getEditText().setTextColor(getContext().getResources().getColor(R.color.black)); - } - } - -} -- cgit v1.2.3 From 059ef16dc237d26861813cac3a43ba6723fd9556 Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Sun, 8 Nov 2015 20:49:59 +0100 Subject: Fix dialog colors --- .../main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/src/main/java/de/danoeh') diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java index 22c15949a..cf0532cf1 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java @@ -138,9 +138,9 @@ public class ChapterListAdapter extends ArrayAdapter { if (current != null) { if (current == sc) { holder.title.setTextColor(convertView.getResources().getColor( - R.color.bright_blue)); + R.color.holo_blue_light)); holder.start.setTextColor(convertView.getResources().getColor( - R.color.bright_blue)); + R.color.holo_blue_light)); } else { holder.title.setTextColor(defaultTextColor); holder.start.setTextColor(defaultTextColor); -- cgit v1.2.3