From 208a5b8dde22b14b460448f462c53d3a7a3577bf Mon Sep 17 00:00:00 2001 From: tom79 Date: Wed, 25 Sep 2019 15:57:13 +0200 Subject: [PATCH] Some fixes --- .../android/activities/BaseMainActivity.java | 2 +- .../fragments/ContentSettingsFragment.java | 30 +++++++++++++++++++ .../res/layout/fragment_settings_reveal.xml | 4 +-- app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java index 0601f8d14..1cadb7579 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java @@ -197,7 +197,7 @@ public abstract class BaseMainActivity extends BaseActivity public static String regex_home, regex_local, regex_public; public static boolean show_boosts, show_replies, show_art_nsfw; - enum iconLauncher{ + public enum iconLauncher{ BUBBLES, FEDIVERSE, HERO, diff --git a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java index 1b0eac0fa..f9dcb9e12 100644 --- a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java @@ -76,6 +76,7 @@ import java.util.Locale; import java.util.Set; import app.fedilab.android.R; +import app.fedilab.android.activities.BaseMainActivity; import app.fedilab.android.activities.MainActivity; import app.fedilab.android.activities.SettingsActivity; import app.fedilab.android.asynctasks.DownloadTrackingDomainsAsyncTask; @@ -106,6 +107,11 @@ import mabbas007.tagsedittext.TagsEditText; import static android.app.Activity.RESULT_OK; import static android.content.Context.MODE_PRIVATE; +import static app.fedilab.android.activities.BaseMainActivity.iconLauncher.ATOM; +import static app.fedilab.android.activities.BaseMainActivity.iconLauncher.BRAINCRASH; +import static app.fedilab.android.activities.BaseMainActivity.iconLauncher.BUBBLES; +import static app.fedilab.android.activities.BaseMainActivity.iconLauncher.FEDIVERSE; +import static app.fedilab.android.activities.BaseMainActivity.iconLauncher.HERO; import static app.fedilab.android.fragments.ContentSettingsFragment.type.ADMIN; import static app.fedilab.android.fragments.ContentSettingsFragment.type.COMPOSE; import static app.fedilab.android.fragments.ContentSettingsFragment.type.INTERFACE; @@ -2436,6 +2442,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot ImageButton btn_select_icon = rootView.findViewById(R.id.btn_select_icon); btn_select_icon.setOnClickListener(v -> { + AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context, style); View icon_selector = inflater.inflate(R.layout.dialog_icon_selector, null); dialogBuilder.setView(icon_selector); @@ -2452,30 +2459,53 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot icon_selector.findViewById(R.id.icon_bubbles).setOnClickListener(v1 -> { hideAllIcons(context); setIcon(context,"Bubbles"); + SharedPreferences.Editor editor2 = sharedpreferences.edit(); + editor2 = sharedpreferences.edit(); + editor2.putString(Helper.LOGO_LAUNCHER, "bubbles"); + editor2.apply(); + BaseMainActivity.mLauncher = BUBBLES; icon_selector_dialog.dismiss(); }); icon_selector.findViewById(R.id.icon_fediverse).setOnClickListener(v1 -> { hideAllIcons(context); setIcon(context,"Fediverse"); + SharedPreferences.Editor editor2 = sharedpreferences.edit(); + editor2 = sharedpreferences.edit(); + editor2.putString(Helper.LOGO_LAUNCHER, "fediverse"); + editor2.apply(); + BaseMainActivity.mLauncher = FEDIVERSE; icon_selector_dialog.dismiss(); }); icon_selector.findViewById(R.id.icon_hero).setOnClickListener(v1 -> { hideAllIcons(context); setIcon(context,"Hero"); + SharedPreferences.Editor editor2 = sharedpreferences.edit(); + editor2 = sharedpreferences.edit(); + editor2.putString(Helper.LOGO_LAUNCHER, "hero"); + editor2.apply(); + BaseMainActivity.mLauncher = HERO; icon_selector_dialog.dismiss(); }); icon_selector.findViewById(R.id.icon_atom).setOnClickListener(v1 -> { hideAllIcons(context); setIcon(context,"Atom"); + SharedPreferences.Editor editor2 = sharedpreferences.edit(); + editor2.putString(Helper.LOGO_LAUNCHER, "atom"); + editor2.apply(); + BaseMainActivity.mLauncher = ATOM; icon_selector_dialog.dismiss(); }); icon_selector.findViewById(R.id.icon_braincrash).setOnClickListener(v1 -> { hideAllIcons(context); setIcon(context,"BrainCrash"); + SharedPreferences.Editor editor2 = sharedpreferences.edit(); + editor2.putString(Helper.LOGO_LAUNCHER, "braincrash"); + editor2.apply(); + BaseMainActivity.mLauncher = BRAINCRASH; icon_selector_dialog.dismiss(); }); diff --git a/app/src/main/res/layout/fragment_settings_reveal.xml b/app/src/main/res/layout/fragment_settings_reveal.xml index 4c4d1d150..6cffb6758 100644 --- a/app/src/main/res/layout/fragment_settings_reveal.xml +++ b/app/src/main/res/layout/fragment_settings_reveal.xml @@ -2156,7 +2156,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:text="Change app icon (Experimental)" + android:text="@string/change_app_icon_experimental" android:textSize="16sp" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e8898e51c..1aad08395 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1224,4 +1224,6 @@ Allow to compress large photos into smaller sized photos with very less or negligible loss in quality of the image. Allow compressing videos while maintaining their quality. The app is compressing the media, it can be quite long… + Change app icon + Click to change the app icon \ No newline at end of file