A new custom launcher icon, "Fedilab PS"

app/src/main/AndroidManifest.xml

@@ -447,6 +447,26 @@
         </activity-alias>
 
 
+        <activity-alias
+            android:name=".activities.MainActivity.BubblesPS"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_bubbles_ps"
+            android:label="@string/app_name"
+            android:roundIcon="@mipmap/ic_launcher_bubbles_ps_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+
         <activity-alias
             android:name=".activities.MainActivity.BubblesPeaGreen"
             android:enabled="false"

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

@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:pathData="m58.47,25.62c-2.64,-0.04 -5.33,0.44 -7.93,1.5 -1.4,0.57 -2.7,1.27 -3.89,2.1 -7.68,5.29 -10.94,15.38 -7.28,24.38 0.72,1.77 1.67,3.39 2.79,4.83l5.88,-10.07c0.58,-1 0.46,-2.48 -0.26,-3.31h-0l-0.4,-0.97c-1.31,-3.22 -0,-6.85 2.92,-8.55 0.27,-0.16 0.56,-0.3 0.86,-0.42 3.52,-1.43 7.53,0.26 8.97,3.79l0.25,0.61c0.12,0.69 1.15,1.39 2.3,1.55l1.18,0.17c1.14,0.16 2.52,-0.54 3.06,-1.56 0,0 0.5,-0.95 2.06,-1.59 2.64,-1.07 5.66,0.2 6.73,2.84 0.07,0.17 0.12,0.34 0.17,0.5 0.18,0.39 0.5,0.59 0.81,0.69l1.49,0.13c-0.25,-1.33 -0.63,-2.65 -1.16,-3.96 -3.17,-7.8 -10.63,-12.56 -18.55,-12.67zM62.09,43.75c-1.07,-0.01 -2.26,0.65 -2.77,1.56 0,0 -0.97,1.73 -2.97,2.55 -1.64,0.66 -2.85,0.46 -2.85,0.46 -1.14,-0.2 -2.54,0.46 -3.13,1.46l-1.95,3.34c-0.59,1.02 -0.99,2.36 0.61,2.36h1.36c1.31,0 2.96,-0.92 3.64,-2.04 0,0 1.24,-2.02 3.69,-2.07 2.85,-0.06 5.21,2.21 5.27,5.06 0,0.04 0,0.07 0,0.11h-0c-0,2.8 -2.24,5.1 -5.06,5.16 -2.52,0.05 -3.88,-2.09 -3.88,-2.09 -0.7,-1.11 -2.36,-2.02 -3.67,-2.02l-3.34,0.02c-0.63,0.03 -1.29,0.17 -1.74,0.83l-1.23,2.11c-0.15,0.26 -0.3,0.52 -0.46,0.78 -0.58,1 -1.98,1.63 -3.12,1.41 0,0 -1.87,-0.36 -3.83,0.44 -4.07,1.66 -6.03,6.3 -4.38,10.37 1.66,4.07 6.3,6.03 10.37,4.38s6.03,-6.3 4.38,-10.37c-0.49,-1.2 -0.73,-1.46 -0.73,-1.46 -0.78,-0.85 -0.94,-2.36 -0.36,-3.35l0.18,-0.46c5.5,4.06 12.93,5.25 19.72,2.48 4.19,-1.7 7.5,-4.65 9.69,-8.24 2.06,-3.38 3.12,-7.34 2.97,-11.38l-2.02,-0.18s-0.74,0.15 -1.18,0.61c-0.08,0.12 -0.16,0.25 -0.24,0.36 -0.03,0.07 -0.07,0.11 -0.12,0.15 -0.53,0.67 -1.24,1.21 -2.09,1.55 -1.24,0.5 -2.55,0.49 -3.71,0.07 -0,-0 -0,-0 -0,-0h-0c-0.01,-0.01 -0.03,-0.01 -0.04,-0.02 -0.06,-0.02 -0.13,-0.05 -0.19,-0.07 -0.08,-0.03 -0.15,-0.07 -0.22,-0.1h-0c-0.07,-0.04 -0.15,-0.07 -0.22,-0.11 -0.07,-0.04 -0.14,-0.08 -0.21,-0.12h-0c-0.07,-0.04 -0.14,-0.09 -0.21,-0.13 -0.07,-0.05 -0.14,-0.1 -0.2,-0.14 -0.07,-0.05 -0.13,-0.1 -0.2,-0.15v-0c-0.04,-0.04 -0.09,-0.07 -0.13,-0.11 -0.02,-0.02 -0.04,-0.03 -0.06,-0.05 -0.06,-0.06 -0.12,-0.11 -0.18,-0.17 -0.06,-0.06 -0.12,-0.12 -0.17,-0.18 -0.11,-0.12 -0.22,-0.26 -0.32,-0.39 -0.05,-0.07 -0.1,-0.14 -0.15,-0.21 -0.19,-0.29 -0.35,-0.6 -0.49,-0.93l-0.07,-0.18c-0,-0.01 -0.01,-0.03 -0.02,-0.04 -0.02,-0.02 -0.05,-0.04 -0.08,-0.06 -0.01,-0.01 -0.02,-0.01 -0.03,-0.02 -0.02,-0.01 -0.05,-0.03 -0.08,-0.04 -0.03,-0.01 -0.06,-0.03 -0.1,-0.04 -0.14,-0.06 -0.32,-0.12 -0.54,-0.18v-0c-0.05,-0.01 -0.11,-0.03 -0.17,-0.04 -0,-0 -0.01,-0 -0.01,-0 -0.11,-0.03 -0.22,-0.05 -0.35,-0.08 -0,-0 -0.01,-0 -0.01,-0 -0.25,-0.05 -0.53,-0.1 -0.81,-0.14l-1.46,-0.21c-0.11,-0.02 -0.22,-0.02 -0.33,-0.02z"
+        android:strokeWidth="2"
+        android:strokeColor="#12d663"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="m75.54,56.53c2.06,-3.38 3.12,-7.34 2.97,-11.38l-2.02,-0.18s-0.74,0.15 -1.18,0.61c-0.08,0.12 -0.16,0.25 -0.24,0.36h-0c-0.03,0.07 -0.07,0.11 -0.12,0.15 -0.53,0.67 -1.24,1.21 -2.08,1.55 -1.24,0.5 -2.55,0.49 -3.72,0.07 -0,-0 -0,-0 -0,-0 0,-0 0,-0 -0,-0 -0.01,-0.01 -0.03,-0.01 -0.04,-0.02 -0.06,-0.02 -0.13,-0.05 -0.19,-0.07 -0.08,-0.03 -0.15,-0.07 -0.23,-0.1 0,-0 0,-0 -0,-0 -0.07,-0.04 -0.15,-0.07 -0.22,-0.11 0,-0 0,-0 -0,-0 -0.07,-0.04 -0.14,-0.08 -0.21,-0.12 0,-0 0,-0 -0,-0 -0.07,-0.04 -0.14,-0.09 -0.21,-0.13 -0,-0 0,-0 0,-0 -0.07,-0.05 -0.14,-0.09 -0.2,-0.14 0,-0 0,-0 -0,-0 -0.07,-0.05 -0.13,-0.1 -0.2,-0.15 0,-0 0,-0 -0,-0 -0.04,-0.04 -0.09,-0.07 -0.13,-0.11 -0.02,-0.02 -0.04,-0.03 -0.06,-0.05 -0.06,-0.06 -0.12,-0.11 -0.18,-0.17 -0.06,-0.06 -0.12,-0.12 -0.17,-0.18v-0c-0.11,-0.12 -0.22,-0.26 -0.32,-0.39 -0.05,-0.07 -0.1,-0.14 -0.15,-0.21v-0c-0.19,-0.29 -0.36,-0.59 -0.49,-0.92l-0.07,-0.18c-0,-0.01 -0.01,-0.03 -0.02,-0.04 -0.02,-0.02 -0.05,-0.04 -0.08,-0.06 -0.01,-0.01 -0.02,-0.01 -0.02,-0.02 -0.02,-0.01 -0.05,-0.03 -0.08,-0.04 0,-0 0,-0 -0,-0 -0.03,-0.01 -0.06,-0.03 -0.1,-0.04 -0.14,-0.06 -0.32,-0.12 -0.54,-0.18 -0,-0 0,-0 0,-0 -0.05,-0.01 -0.11,-0.03 -0.17,-0.04v-0c-0,-0 -0.01,-0 -0.01,-0 -0.11,-0.03 -0.23,-0.05 -0.35,-0.08 -0,-0 -0.01,-0 -0.01,-0 -0.25,-0.05 -0.53,-0.1 -0.81,-0.14l-1.46,-0.21c-0.11,-0.02 -0.22,-0.02 -0.33,-0.02l0,-0c-1.07,-0.01 -2.26,0.65 -2.77,1.56 0,0 -0.97,1.73 -2.97,2.55 -1.64,0.66 -2.85,0.46 -2.85,0.46 -1.14,-0.2 -2.54,0.46 -3.12,1.46l-1.95,3.34c-0.59,1.02 -0.99,2.36 0.61,2.36h1.36c1.31,0 2.95,-0.92 3.64,-2.04 0,0 1.24,-2.02 3.69,-2.07 2.85,-0.06 5.21,2.21 5.27,5.06 0,0.04 0,0.07 0,0.11" />
+    <path
+        android:fillColor="#009639"
+        android:pathData="m62.99,56.53c-0,2.8 -2.24,5.1 -5.06,5.16 -2.52,0.05 -3.88,-2.08 -3.88,-2.08 -0.7,-1.11 -2.36,-2.02 -3.67,-2.02l-3.34,0.02c-0.63,0.03 -1.29,0.17 -1.74,0.83l-1.23,2.11c-0.15,0.26 -0.3,0.52 -0.46,0.78 -0.58,1 -1.98,1.63 -3.12,1.41 0,0 -1.87,-0.36 -3.83,0.44 -4.07,1.66 -6.03,6.3 -4.37,10.37 1.66,4.07 6.3,6.03 10.37,4.38s6.03,-6.3 4.37,-10.37c-0.49,-1.2 -0.73,-1.46 -0.73,-1.46 -0.78,-0.85 -0.94,-2.36 -0.36,-3.35l0.18,-0.46c5.5,4.06 12.92,5.24 19.72,2.48 4.19,-1.7 7.5,-4.65 9.69,-8.23" />
+    <path
+        android:fillColor="#ed2e38"
+        android:pathData="m46.65,29.21c-7.68,5.29 -10.94,15.38 -7.28,24.38 0.72,1.77 1.67,3.39 2.79,4.83l5.88,-10.06c0.58,-1 0.46,-2.49 -0.26,-3.31l-0,0 -0.4,-0.97c-1.31,-3.22 -0,-6.85 2.92,-8.55z" />
+    <path
+        android:fillColor="#000"
+        android:pathData="m50.29,35.53c0.27,-0.16 0.56,-0.3 0.86,-0.42 3.52,-1.43 7.54,0.26 8.97,3.78l0.25,0.61c0.12,0.69 1.15,1.39 2.3,1.55l1.18,0.17c1.14,0.16 2.52,-0.54 3.06,-1.56 0,0 0.5,-0.95 2.06,-1.59 2.64,-1.07 5.65,0.2 6.73,2.84 0.07,0.17 0.12,0.33 0.17,0.5 0.18,0.39 0.49,0.59 0.81,0.69l1.49,0.14c-0.25,-1.33 -0.63,-2.66 -1.16,-3.96 -4.23,-10.4 -16.08,-15.4 -26.48,-11.17 -1.4,0.57 -2.7,1.27 -3.89,2.1z" />
+</vector>

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

@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#000"
+        android:pathData="m75.54,56.53c2.06,-3.38 3.12,-7.34 2.97,-11.38l-2.02,-0.18s-0.74,0.15 -1.18,0.61c-0.08,0.12 -0.16,0.25 -0.24,0.36h-0c-0.03,0.07 -0.07,0.11 -0.12,0.15 -0.53,0.67 -1.24,1.21 -2.08,1.55 -1.24,0.5 -2.55,0.49 -3.72,0.07 -0,-0 -0,-0 -0,-0 0,-0 0,-0 -0,-0 -0.01,-0.01 -0.03,-0.01 -0.04,-0.02 -0.06,-0.02 -0.13,-0.05 -0.19,-0.07 -0.08,-0.03 -0.15,-0.07 -0.23,-0.1 0,-0 0,-0 -0,-0 -0.07,-0.04 -0.15,-0.07 -0.22,-0.11 0,-0 0,-0 -0,-0 -0.07,-0.04 -0.14,-0.08 -0.21,-0.12 0,-0 0,-0 -0,-0 -0.07,-0.04 -0.14,-0.09 -0.21,-0.13 -0,-0 0,-0 0,-0 -0.07,-0.05 -0.14,-0.09 -0.2,-0.14 0,-0 0,-0 -0,-0 -0.07,-0.05 -0.13,-0.1 -0.2,-0.15 0,-0 0,-0 -0,-0 -0.04,-0.04 -0.09,-0.07 -0.13,-0.11 -0.02,-0.02 -0.04,-0.03 -0.06,-0.05 -0.06,-0.06 -0.12,-0.11 -0.18,-0.17 -0.06,-0.06 -0.12,-0.12 -0.17,-0.18v-0c-0.11,-0.12 -0.22,-0.26 -0.32,-0.39 -0.05,-0.07 -0.1,-0.14 -0.15,-0.21v-0c-0.19,-0.29 -0.36,-0.59 -0.49,-0.92l-0.07,-0.18c-0,-0.01 -0.01,-0.03 -0.02,-0.04 -0.02,-0.02 -0.05,-0.04 -0.08,-0.06 -0.01,-0.01 -0.02,-0.01 -0.02,-0.02 -0.02,-0.01 -0.05,-0.03 -0.08,-0.04 0,-0 0,-0 -0,-0 -0.03,-0.01 -0.06,-0.03 -0.1,-0.04 -0.14,-0.06 -0.32,-0.12 -0.54,-0.18 -0,-0 0,-0 0,-0 -0.05,-0.01 -0.11,-0.03 -0.17,-0.04v-0c-0,-0 -0.01,-0 -0.01,-0 -0.11,-0.03 -0.23,-0.05 -0.35,-0.08 -0,-0 -0.01,-0 -0.01,-0 -0.25,-0.05 -0.53,-0.1 -0.81,-0.14l-1.46,-0.21c-0.11,-0.02 -0.22,-0.02 -0.33,-0.02l0,-0c-1.07,-0.01 -2.26,0.65 -2.77,1.56 0,0 -0.97,1.73 -2.97,2.55 -1.64,0.66 -2.85,0.46 -2.85,0.46 -1.14,-0.2 -2.54,0.46 -3.12,1.46l-1.95,3.34c-0.59,1.02 -0.99,2.36 0.61,2.36h1.36c1.31,0 2.95,-0.92 3.64,-2.04 0,0 1.24,-2.02 3.69,-2.07 2.85,-0.06 5.21,2.21 5.27,5.06 0,0.04 0,0.07 0,0.11" />
+    <path
+        android:fillAlpha="0.8"
+        android:fillColor="#000"
+        android:pathData="m62.99,56.53c-0,2.8 -2.24,5.1 -5.06,5.16 -2.52,0.05 -3.88,-2.08 -3.88,-2.08 -0.7,-1.11 -2.36,-2.02 -3.67,-2.02l-3.34,0.02c-0.63,0.03 -1.29,0.17 -1.74,0.83l-1.23,2.11c-0.15,0.26 -0.3,0.52 -0.46,0.78 -0.58,1 -1.98,1.63 -3.12,1.41 0,0 -1.87,-0.36 -3.83,0.44 -4.07,1.66 -6.03,6.3 -4.37,10.37 1.66,4.07 6.3,6.03 10.37,4.38s6.03,-6.3 4.37,-10.37c-0.49,-1.2 -0.73,-1.46 -0.73,-1.46 -0.78,-0.85 -0.94,-2.36 -0.36,-3.35l0.18,-0.46c5.5,4.06 12.92,5.24 19.72,2.48 4.19,-1.7 7.5,-4.65 9.69,-8.23" />
+    <path
+        android:fillAlpha="0.6"
+        android:fillColor="#000"
+        android:pathData="m46.65,29.21c-7.68,5.29 -10.94,15.38 -7.28,24.38 0.72,1.77 1.67,3.39 2.79,4.83l5.88,-10.06c0.58,-1 0.46,-2.49 -0.26,-3.31l-0,0 -0.4,-0.97c-1.31,-3.22 -0,-6.85 2.92,-8.55z" />
+    <path
+        android:fillAlpha="0.4"
+        android:fillColor="#000"
+        android:pathData="m50.29,35.53c0.27,-0.16 0.56,-0.3 0.86,-0.42 3.52,-1.43 7.54,0.26 8.97,3.78l0.25,0.61c0.12,0.69 1.15,1.39 2.3,1.55l1.18,0.17c1.14,0.16 2.52,-0.54 3.06,-1.56 0,0 0.5,-0.95 2.06,-1.59 2.64,-1.07 5.65,0.2 6.73,2.84 0.07,0.17 0.12,0.33 0.17,0.5 0.18,0.39 0.49,0.59 0.81,0.69l1.49,0.14c-0.25,-1.33 -0.63,-2.66 -1.16,-3.96 -4.23,-10.4 -16.08,-15.4 -26.48,-11.17 -1.4,0.57 -2.7,1.27 -3.89,2.1z" />
+</vector>

app/src/main/res/drawables/mastodon/values/ic_launcher_ps_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_bubbles_ps_background">#FFFFFF</color>
+</resources>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_bubbles_ps.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_bubbles_ps_background" />
+    <foreground android:drawable="@drawable/ic_launcher_bubbles_ps_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_bubbles_ps_monochrome" />
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_bubbles_ps_round.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_bubbles_ps_background" />
+    <foreground android:drawable="@drawable/ic_launcher_bubbles_ps_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_bubbles_ps_monochrome" />
+</adaptive-icon>

app/src/main/res/values/strings.xml

@@ -824,6 +824,7 @@
     <string-array name="set_logo_type_value" translatable="false">
         <item>Fedilab</item>
         <item>Fedilab UA</item>
+        <item>Fedilab PS</item>
         <item>Fedilab Pea Green</item>
         <item>FediPride</item>
         <item>FediPink</item>
@@ -847,6 +848,7 @@
     <string-array name="SET_LOGO_TYPE_VALUE" translatable="false">
         <item>Bubbles</item>
         <item>BubblesUA</item>
+        <item>BubblesPS</item>
         <item>BubblesPeaGreen</item>
         <item>BubblesPride</item>
         <item>BubblesPink</item>
@@ -871,6 +873,7 @@
     <string-array name="SET_LOGO_DRAWABLE" translatable="false">
         <item>@drawable/ic_launcher_bubbles_foreground</item>
         <item>@drawable/ic_launcher_bubbles_ua_foreground</item>
+        <item>@drawable/ic_launcher_bubbles_ps_foreground</item>
         <item>@drawable/ic_launcher_bubbles_pea_green_foreground</item>
         <item>@drawable/ic_launcher_bubbles_pride_foreground</item>
         <item>@drawable/ic_launcher_bubbles_pink_foreground</item>