diff --git a/briar-android/src/org/briarproject/android/BriarFragmentActivity.java b/briar-android/src/org/briarproject/android/BriarFragmentActivity.java index 6bef438cf98803912918baaee7c8ab2ea79e916a..766a11e33044711faa87e978d22682d9ea4b2fe8 100644 --- a/briar-android/src/org/briarproject/android/BriarFragmentActivity.java +++ b/briar-android/src/org/briarproject/android/BriarFragmentActivity.java @@ -1,10 +1,10 @@ package org.briarproject.android; -import android.app.AlertDialog; import android.support.annotation.AnimRes; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.support.v7.app.ActionBar; +import android.support.v7.app.AlertDialog; import org.briarproject.R; import org.briarproject.android.contact.ContactListFragment; @@ -68,7 +68,8 @@ public abstract class BriarFragmentActivity extends BriarActivity { protected void showMessageDialog(int titleStringId, int msgStringId) { // TODO replace with custom dialog fragment ? - AlertDialog.Builder builder = new AlertDialog.Builder(this); + AlertDialog.Builder builder = new AlertDialog.Builder(this, + R.style.BriarDialogTheme); builder.setTitle(titleStringId); builder.setMessage(msgStringId); builder.setPositiveButton(R.string.dialog_button_ok, null); diff --git a/briar-android/src/org/briarproject/android/CrashReportActivity.java b/briar-android/src/org/briarproject/android/CrashReportActivity.java index 8e5fe4c8c5e5806f49d9add570c967614cd18530..923c2be08ccfbb30ff0b0822f1d2e5ad5b17d46b 100644 --- a/briar-android/src/org/briarproject/android/CrashReportActivity.java +++ b/briar-android/src/org/briarproject/android/CrashReportActivity.java @@ -2,7 +2,6 @@ package org.briarproject.android; import android.annotation.SuppressLint; import android.app.ActivityManager; -import android.app.AlertDialog; import android.bluetooth.BluetoothAdapter; import android.content.DialogInterface; import android.content.Intent; @@ -15,6 +14,7 @@ import android.os.Build; import android.os.Bundle; import android.os.Environment; import android.provider.Settings; +import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatActivity; import android.view.View; import android.view.View.OnClickListener; @@ -104,7 +104,8 @@ public class CrashReportActivity extends AppCompatActivity public void onClick(View view) { // TODO Encapsulate the dialog in a re-usable fragment - AlertDialog.Builder builder = new AlertDialog.Builder(this); + AlertDialog.Builder builder = new AlertDialog.Builder(this, + R.style.BriarDialogTheme); builder.setTitle(R.string.dialog_title_share_crash_report); builder.setMessage(R.string.dialog_message_share_crash_report); builder.setNegativeButton(R.string.cancel_button, null); diff --git a/briar-android/src/org/briarproject/android/PasswordActivity.java b/briar-android/src/org/briarproject/android/PasswordActivity.java index d1653207fe14ad05eecf3b7e121ba993960fca66..33f14f206b1b2c7ef29c640d061b3d1595dcd916 100644 --- a/briar-android/src/org/briarproject/android/PasswordActivity.java +++ b/briar-android/src/org/briarproject/android/PasswordActivity.java @@ -1,10 +1,10 @@ package org.briarproject.android; -import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.support.design.widget.TextInputLayout; +import android.support.v7.app.AlertDialog; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; @@ -116,7 +116,8 @@ public class PasswordActivity extends BaseActivity { public void onForgottenPasswordClick(View v) { // TODO Encapsulate the dialog in a re-usable fragment - AlertDialog.Builder builder = new AlertDialog.Builder(this); + AlertDialog.Builder builder = new AlertDialog.Builder(this, + R.style.BriarDialogTheme); builder.setTitle(R.string.dialog_title_lost_password); builder.setMessage(R.string.dialog_message_lost_password); builder.setNegativeButton(R.string.cancel_button, null); diff --git a/briar-android/src/org/briarproject/android/contact/SelectContactsDialog.java b/briar-android/src/org/briarproject/android/contact/SelectContactsDialog.java index d31070f29d4819d4352950bc23598204fb4cf8a6..53b6588d7e69583e9752e2b354a05d5835d9bece 100644 --- a/briar-android/src/org/briarproject/android/contact/SelectContactsDialog.java +++ b/briar-android/src/org/briarproject/android/contact/SelectContactsDialog.java @@ -1,10 +1,10 @@ package org.briarproject.android.contact; -import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnMultiChoiceClickListener; +import android.support.v7.app.AlertDialog; import org.briarproject.R; import org.briarproject.api.contact.Contact; @@ -37,7 +37,8 @@ public class SelectContactsDialog implements OnMultiChoiceClickListener { public Dialog build(Context ctx) { if (listener == null || contacts == null || selected == null) throw new IllegalStateException(); - AlertDialog.Builder builder = new AlertDialog.Builder(ctx); + AlertDialog.Builder builder = new AlertDialog.Builder(ctx, + R.style.BriarDialogTheme); int size = contacts.size(); String[] names = new String[size]; boolean[] checked = new boolean[size]; diff --git a/briar-android/src/org/briarproject/android/forum/NoContactsDialog.java b/briar-android/src/org/briarproject/android/forum/NoContactsDialog.java index 8e6340aa34e6cd9ede5753cec0b20050a475a5a7..583e25d82c03e030edf91321046a6342ab8ddd6c 100644 --- a/briar-android/src/org/briarproject/android/forum/NoContactsDialog.java +++ b/briar-android/src/org/briarproject/android/forum/NoContactsDialog.java @@ -1,9 +1,9 @@ package org.briarproject.android.forum; -import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; +import android.support.v7.app.AlertDialog; import org.briarproject.R; @@ -17,7 +17,8 @@ public class NoContactsDialog { public Dialog build(Context ctx) { if (listener == null) throw new IllegalStateException(); - AlertDialog.Builder builder = new AlertDialog.Builder(ctx); + AlertDialog.Builder builder = new AlertDialog.Builder(ctx, + R.style.BriarDialogTheme); builder.setMessage(R.string.no_contacts_prompt); builder.setPositiveButton(R.string.add_button, new DialogInterface.OnClickListener() { diff --git a/briar-android/src/org/briarproject/android/panic/PanicPreferencesFragment.java b/briar-android/src/org/briarproject/android/panic/PanicPreferencesFragment.java index 9324466b0b5c377add15c22ef4cd1723a342b513..094eeaac2b07300a3404637d0c218ec88feede21 100644 --- a/briar-android/src/org/briarproject/android/panic/PanicPreferencesFragment.java +++ b/briar-android/src/org/briarproject/android/panic/PanicPreferencesFragment.java @@ -227,10 +227,9 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat } }; - AlertDialog.Builder builder = - new AlertDialog.Builder(getContext()); - builder.setTitle( - getString(R.string.dialog_title_connect_panic_app)); + AlertDialog.Builder builder = new AlertDialog.Builder(getContext(), + R.style.BriarDialogTheme); + builder.setTitle(getString(R.string.dialog_title_connect_panic_app)); CharSequence app = getString(R.string.unknown_app); String packageName = getCallingPackageName();