Add preview for new logo

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,

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;

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;
         }

app/src/main/res/drawables/mastodon/drawable/fedilab_logo_bubbles_pea_green.xml

@@ -0,0 +1,49 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+    <path
+        android:fillType="nonZero"
+        android:pathData="M40.44,21.94C39.147,21.933 37.703,22.724 37.086,23.828C37.086,23.828 35.914,25.926 33.493,26.911C31.513,27.715 30.042,27.463 30.042,27.463C28.667,27.225 26.966,28.018 26.262,29.224L23.9,33.269C23.187,34.502 22.704,36.119 24.637,36.119L26.282,36.119C27.872,36.119 29.857,35.011 30.691,33.656C30.691,33.656 32.194,31.217 35.159,31.155C38.609,31.084 41.464,33.823 41.535,37.272C41.605,40.722 38.866,43.577 35.416,43.647C32.362,43.71 30.723,41.125 30.723,41.125C29.872,39.783 27.873,38.683 26.283,38.683L22.246,38.709C21.481,38.743 20.682,38.919 20.136,39.716L18.644,42.271C18.461,42.585 18.276,42.9 18.092,43.214C17.389,44.418 15.692,45.188 14.322,44.923C14.322,44.923 12.063,44.485 9.687,45.451C4.761,47.453 2.392,53.071 4.394,57.991C6.397,62.918 12.014,65.287 16.944,63.284C21.874,61.281 24.239,55.664 22.236,50.734C21.647,49.285 21.355,48.968 21.355,48.968C20.411,47.941 20.214,46.114 20.919,44.91L21.134,44.358C27.794,49.266 36.764,50.703 44.994,47.358C54.847,43.353 60.694,33.678 60.304,23.638L57.864,23.414C57.864,23.414 56.97,23.599 56.435,24.15C56.342,24.3 56.245,24.446 56.14,24.588L56.138,24.588C56.107,24.667 56.056,24.723 55.999,24.769C55.354,25.574 54.502,26.232 53.477,26.649C51.981,27.257 50.387,27.244 48.981,26.73C48.979,26.729 48.977,26.728 48.975,26.728C48.975,26.728 48.975,26.728 48.974,26.727C48.958,26.721 48.941,26.714 48.924,26.708C48.847,26.679 48.771,26.649 48.695,26.618C48.604,26.579 48.513,26.538 48.423,26.495C48.423,26.495 48.423,26.495 48.422,26.495C48.332,26.451 48.243,26.406 48.155,26.359C48.155,26.359 48.155,26.359 48.154,26.359C48.066,26.311 47.98,26.262 47.894,26.21C47.894,26.21 47.894,26.21 47.893,26.21C47.807,26.158 47.723,26.105 47.64,26.049C47.64,26.049 47.64,26.049 47.64,26.049C47.557,25.993 47.475,25.935 47.394,25.875C47.394,25.875 47.394,25.875 47.393,25.875C47.313,25.815 47.233,25.753 47.156,25.69C47.156,25.689 47.156,25.689 47.155,25.689C47.102,25.646 47.051,25.6 46.999,25.555C46.975,25.534 46.95,25.513 46.925,25.492C46.851,25.424 46.777,25.354 46.706,25.283C46.634,25.211 46.564,25.138 46.495,25.062L46.495,25.062C46.358,24.911 46.228,24.753 46.106,24.587C46.044,24.504 45.985,24.42 45.927,24.333L45.927,24.333C45.697,23.988 45.497,23.614 45.335,23.214L45.248,23C45.244,22.985 45.235,22.97 45.221,22.954C45.2,22.929 45.166,22.903 45.125,22.876C45.115,22.869 45.107,22.863 45.095,22.856C45.066,22.839 45.034,22.822 44.998,22.804C44.998,22.804 44.998,22.804 44.997,22.804C44.961,22.787 44.922,22.769 44.88,22.752C44.709,22.68 44.487,22.608 44.227,22.537C44.227,22.537 44.227,22.537 44.227,22.537C44.163,22.519 44.096,22.502 44.027,22.484L44.027,22.484C44.024,22.484 44.02,22.483 44.017,22.482C43.885,22.449 43.744,22.417 43.598,22.386C43.594,22.386 43.591,22.385 43.588,22.384C43.281,22.319 42.948,22.261 42.603,22.212L40.839,21.962C40.709,21.943 40.577,21.934 40.443,21.934L40.44,21.94Z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:centerX="42"
+                android:centerY="14"
+                android:gradientRadius="49.406"
+                android:type="radial">
+                <item
+                    android:color="#FF41D16C"
+                    android:offset="0" />
+                <item
+                    android:color="#FF118734"
+                    android:offset="0.51" />
+                <item
+                    android:color="#FF006D21"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillType="nonZero"
+        android:pathData="M23.12,23.51L22.64,22.332C20.908,18.072 22.957,13.214 27.217,11.482C31.477,9.749 36.335,11.798 38.067,16.059L38.37,16.802C38.515,17.64 39.764,18.484 41.147,18.68L42.574,18.881C43.956,19.077 45.621,18.228 46.274,16.995C46.274,16.995 46.884,15.842 48.765,15.077C51.962,13.778 55.606,15.316 56.906,18.511C56.987,18.713 57.057,18.916 57.117,19.119C57.329,19.591 57.715,19.833 58.099,19.956L59.907,20.121C59.607,18.511 59.141,16.908 58.501,15.333C53.387,2.753 39.041,-3.297 26.471,1.823C13.891,6.936 7.841,21.283 12.961,33.853C13.833,35.999 14.98,37.949 16.335,39.692L23.447,27.512C24.15,26.307 24.008,24.505 23.129,23.507L23.12,23.51Z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:centerX="42"
+                android:centerY="14"
+                android:gradientRadius="49.406"
+                android:type="radial">
+                <item
+                    android:color="#FF3FFF00"
+                    android:offset="0" />
+                <item
+                    android:color="#FF3BBC00"
+                    android:offset="0.51" />
+                <item
+                    android:color="#FF39A500"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>

app/src/main/res/drawables/mastodon/drawable/fedilab_logo_bubbles_ua.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+    <path
+        android:fillColor="#ffd700"
+        android:pathData="m40.44,21.94c-1.293,-0.007 -2.737,0.784 -3.354,1.888 0,0 -1.172,2.098 -3.593,3.083 -1.98,0.804 -3.451,0.552 -3.451,0.552 -1.375,-0.237 -3.076,0.555 -3.78,1.761l-2.362,4.045c-0.713,1.233 -1.196,2.85 0.737,2.85h1.645c1.59,0 3.575,-1.108 4.409,-2.463 0,0 1.503,-2.439 4.468,-2.501 3.45,-0.071 6.305,2.668 6.376,6.117 0.07,3.45 -2.669,6.305 -6.119,6.375 -3.054,0.063 -4.693,-2.522 -4.693,-2.522 -0.851,-1.342 -2.85,-2.442 -4.44,-2.442l-4.037,0.026c-0.765,0.035 -1.564,0.21 -2.11,1.007l-1.492,2.555c-0.182,0.314 -0.368,0.629 -0.552,0.943 -0.704,1.204 -2.4,1.974 -3.77,1.709 0,0 -2.259,-0.438 -4.635,0.528 -4.926,2.002 -7.295,7.62 -5.293,12.54 2.003,4.927 7.62,7.296 12.55,5.293s7.295,-7.62 5.292,-12.55c-0.589,-1.449 -0.881,-1.766 -0.881,-1.766 -0.944,-1.027 -1.141,-2.854 -0.436,-4.058l0.215,-0.552c6.66,4.908 15.63,6.345 23.86,3 9.853,-4.005 15.7,-13.68 15.31,-23.72l-2.44,-0.224s-0.894,0.185 -1.429,0.736c-0.093,0.15 -0.19,0.296 -0.295,0.438h-0.001c-0.031,0.079 -0.083,0.135 -0.14,0.18 -0.644,0.806 -1.497,1.463 -2.522,1.88 -1.496,0.609 -3.09,0.595 -4.496,0.081 -0.002,-0.001 -0.004,-0.001 -0.005,-0.002 0,-0 0,-0 -0.001,-0 -0.017,-0.006 -0.033,-0.014 -0.05,-0.02 -0.077,-0.029 -0.153,-0.058 -0.229,-0.09 -0.092,-0.039 -0.183,-0.08 -0.273,-0.123 0,-0 0,-0 -0.001,-0 -0.09,-0.043 -0.179,-0.088 -0.267,-0.136 0,-0 0,-0 -0.001,-0 -0.088,-0.047 -0.175,-0.097 -0.26,-0.148 0,-0 0,-0 -0.001,-0 -0.086,-0.052 -0.17,-0.105 -0.253,-0.161 -0,-0 0,-0 0,-0 -0.083,-0.056 -0.165,-0.114 -0.246,-0.174 0,-0 0,-0 -0.001,-0 -0.081,-0.06 -0.16,-0.122 -0.237,-0.185 0,-0 0,-0 -0.001,-0 -0.053,-0.043 -0.104,-0.089 -0.156,-0.134 -0.024,-0.021 -0.05,-0.042 -0.074,-0.063 -0.075,-0.068 -0.148,-0.137 -0.22,-0.209 -0.072,-0.072 -0.142,-0.145 -0.211,-0.221v-0c-0.137,-0.151 -0.267,-0.309 -0.389,-0.475 -0.061,-0.083 -0.121,-0.167 -0.179,-0.254v-0c-0.23,-0.345 -0.43,-0.719 -0.592,-1.119l-0.087,-0.214c-0.005,-0.015 -0.014,-0.03 -0.027,-0.046 -0.021,-0.025 -0.055,-0.051 -0.097,-0.078 -0.01,-0.007 -0.018,-0.013 -0.03,-0.02 -0.029,-0.017 -0.061,-0.034 -0.097,-0.052 0,-0 0,-0 -0.001,-0 -0.036,-0.017 -0.075,-0.035 -0.117,-0.053 -0.17,-0.071 -0.393,-0.144 -0.652,-0.215 -0,-0 0,-0 0,-0 -0.065,-0.018 -0.132,-0.035 -0.201,-0.052v-0c-0.003,-0.001 -0.006,-0.001 -0.009,-0.002 -0.133,-0.033 -0.273,-0.065 -0.419,-0.096 -0.003,-0.001 -0.007,-0.002 -0.01,-0.002 -0.307,-0.064 -0.64,-0.123 -0.985,-0.172l-1.764,-0.25c-0.13,-0.018 -0.262,-0.028 -0.396,-0.028z" />
+    <path
+        android:fillColor="#0057b8"
+        android:pathData="m23.12,23.51 l-0.48,-1.178c-1.732,-4.26 0.317,-9.118 4.577,-10.85 4.26,-1.733 9.118,0.316 10.85,4.577l0.302,0.743c0.145,0.838 1.394,1.682 2.777,1.878l1.427,0.202c1.382,0.196 3.047,-0.653 3.7,-1.886 0,0 0.61,-1.153 2.491,-1.918 3.197,-1.299 6.841,0.238 8.141,3.434 0.081,0.202 0.151,0.404 0.211,0.608 0.213,0.472 0.599,0.714 0.982,0.836l1.808,0.165c-0.299,-1.61 -0.766,-3.213 -1.406,-4.788 -5.114,-12.58 -19.46,-18.63 -32.03,-13.51 -12.58,5.113 -18.63,19.46 -13.51,32.03 0.872,2.146 2.019,4.096 3.374,5.839l7.112,-12.18c0.703,-1.205 0.561,-3.007 -0.318,-4.005z" />
+</vector>

app/src/main/res/xml/pref_interface.xml

@@ -156,7 +156,7 @@
         app:title="@string/set_med_desc_timeout" />
 
     <app.fedilab.android.mastodon.helper.ImageListPreference
-        app:defaultValue="bubbles"
+        app:defaultValue="Bubbles"
         app:dialogTitle="@string/pickup_logo"
         app:entries="@array/set_logo_type_value"
         app:entryValues="@array/SET_LOGO_TYPE_VALUE"