From a6fba676355534127006246a1ed59b06f85a6d38 Mon Sep 17 00:00:00 2001 From: Justin Biggs Date: Wed, 7 Aug 2019 21:47:33 -0500 Subject: [PATCH 1/2] #960 updated external link warning popup icon to match others --- .../java/org/kiwix/kiwixmobile/main/MainActivity.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java index 628b37445..c5f37e489 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java @@ -1112,6 +1112,12 @@ public class MainActivity extends BaseActivity implements WebViewCallback, } private void externalLinkPopup(Intent intent) { + int warningResId; + if (sharedPreferenceUtil.nightMode()) { + warningResId = R.drawable.ic_warning_white; + } else { + warningResId = R.drawable.ic_warning_black; + } new AlertDialog.Builder(this, dialogStyle()) .setTitle(R.string.external_link_popup_dialog_title) .setMessage(R.string.external_link_popup_dialog_message) @@ -1125,7 +1131,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback, startActivity(intent); }) .setPositiveButton(android.R.string.yes, (dialogInterface, i) -> startActivity(intent)) - .setIcon(android.R.drawable.ic_dialog_alert) + .setIcon(warningResId) .show(); } From d2bbb3fe67c0eff08b00a8b2cea6320c5d5e613b Mon Sep 17 00:00:00 2001 From: Justin Biggs Date: Sat, 10 Aug 2019 06:27:13 -0500 Subject: [PATCH 2/2] update warning icon using ternary operator --- .../java/org/kiwix/kiwixmobile/main/MainActivity.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java index c5f37e489..2bf206b75 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java @@ -1112,12 +1112,9 @@ public class MainActivity extends BaseActivity implements WebViewCallback, } private void externalLinkPopup(Intent intent) { - int warningResId; - if (sharedPreferenceUtil.nightMode()) { - warningResId = R.drawable.ic_warning_white; - } else { - warningResId = R.drawable.ic_warning_black; - } + int warningResId = (sharedPreferenceUtil.nightMode()) + ? R.drawable.ic_warning_white : R.drawable.ic_warning_black; + new AlertDialog.Builder(this, dialogStyle()) .setTitle(R.string.external_link_popup_dialog_title) .setMessage(R.string.external_link_popup_dialog_message)