From 5c9c1de7fd001c5a1b1769f72868eef3066ce9d7 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 8 Apr 2016 01:01:55 +0200 Subject: [PATCH] Indicate in options, whether images are currently loaded or not --- .../activity/MainActivity.java | 25 +++++++++++-------- app/src/main/res/values-de/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java index 6868b312..9ab2c1b9 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java @@ -968,21 +968,26 @@ public class MainActivity extends AppCompatActivity } break; - case R.id.nav_settings_view: { - final CharSequence[] options = {getString(R.string.settings_font), getString(R.string.settings_view), getString(R.string.settings_image)}; + case R.id.nav_settings_view: + { + final CharSequence[] options = {getString(R.string.settings_font), getString(R.string.settings_view), appSettings.isLoadImages() ? + getString(R.string.settings_images_switch_off) : getString(R.string.settings_images_switch_on)}; + if (Helpers.isOnline(MainActivity.this)) { new AlertDialog.Builder(MainActivity.this) .setItems(options, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int item) { - if (options[item].equals(getString(R.string.settings_font))) - alertFormElements(); - if (options[item].equals(getString(R.string.settings_view))) - webView.loadUrl("https://" + podDomain + "/mobile/toggle"); - if (options[item].equals(getString(R.string.settings_image))) - webSettings.setLoadsImagesAutomatically(!appSettings.isLoadImages()); - appSettings.setLoadImages(!appSettings.isLoadImages()); - webView.loadUrl(webView.getUrl()); + switch(item) { + case 0: alertFormElements(); + break; + case 1: webView.loadUrl("https://" + podDomain + "/mobile/toggle"); + break; + case 2: webSettings.setLoadsImagesAutomatically(!appSettings.isLoadImages()); + appSettings.setLoadImages(!appSettings.isLoadImages()); + webView.loadUrl(webView.getUrl()); + break; + } } }).show(); } else { diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 23b26b17..33527423 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -153,5 +153,7 @@ along with this program. If not, see http://www.gnu.org/licenses.<br> <br Profil D* nur Text *[geteilt durch #diaspora-android]* + Bilder nicht laden + Bilder laden diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 40a6b0f5..0e15bc1c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -62,6 +62,8 @@ Change font size Toggle image loading + Do load images + Do not load images Change view Share link as text Share screenshot of webpage