diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java index 2c2c531d..6b8e0f6e 100644 --- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java @@ -1963,6 +1963,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt public enum iconLauncher { BUBBLES, + BUBBLESUA, + BUBBLESPEAGREEN, FEDIVERSE, HERO, ATOM, diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/ImageListPreference.java b/app/src/main/java/app/fedilab/android/mastodon/helper/ImageListPreference.java index 42408ce3..03d2b458 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/ImageListPreference.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/ImageListPreference.java @@ -102,7 +102,7 @@ public class ImageListPreference extends ListPreference { if (mImages.size() > i) { resource = mImages.get(i); } - items.add(new ImageListItem(getEntries()[i], resource, getEntryValues()[i].equals(launcher))); + items.add(new ImageListItem(getEntries()[i], resource, String.valueOf(getEntryValues()[i]).equalsIgnoreCase(launcher))); } int layout = R.layout.imagelistpreference_item; diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/LogoHelper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/LogoHelper.java index 75310814..355937c3 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/LogoHelper.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/LogoHelper.java @@ -78,6 +78,10 @@ public class LogoHelper { return R.drawable.fedilab_logo_crash; case "Mastalab": return R.drawable.fedilab_logo_mastalab; + case "BubblesUA": + return R.drawable.fedilab_logo_bubbles_ua; + case "BubblesPeaGreen": + return R.drawable.fedilab_logo_bubbles_pea_green; default: return R.drawable.fedilab_logo_bubbles; } @@ -100,6 +104,12 @@ public class LogoHelper { case "Mastalab": mLauncher = BaseMainActivity.iconLauncher.MASTALAB; break; + case "BubblesUA": + mLauncher = BaseMainActivity.iconLauncher.BUBBLESUA; + break; + case "BubblesPeaGreen": + mLauncher = BaseMainActivity.iconLauncher.BUBBLESPEAGREEN; + break; default: mLauncher = BaseMainActivity.iconLauncher.BUBBLES; } diff --git a/app/src/main/res/drawables/mastodon/drawable/fedilab_logo_bubbles_pea_green.xml b/app/src/main/res/drawables/mastodon/drawable/fedilab_logo_bubbles_pea_green.xml new file mode 100644 index 00000000..ea546f5f --- /dev/null +++ b/app/src/main/res/drawables/mastodon/drawable/fedilab_logo_bubbles_pea_green.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawables/mastodon/drawable/fedilab_logo_bubbles_ua.xml b/app/src/main/res/drawables/mastodon/drawable/fedilab_logo_bubbles_ua.xml new file mode 100644 index 00000000..a9f31c26 --- /dev/null +++ b/app/src/main/res/drawables/mastodon/drawable/fedilab_logo_bubbles_ua.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/xml/pref_interface.xml b/app/src/main/res/xml/pref_interface.xml index b5b7afbf..fd36d463 100644 --- a/app/src/main/res/xml/pref_interface.xml +++ b/app/src/main/res/xml/pref_interface.xml @@ -156,7 +156,7 @@ app:title="@string/set_med_desc_timeout" />