Replace app logos and app name

commit f9058b7b08
Author: Ryan Harg <ryan.harg@mailbox.org>
Date:   Tue Jun 29 18:41:32 2021 +0200

    Exchange app logo in login activity

commit a67d2a854c
Author: Ryan Harg <ryan.harg@mailbox.org>
Date:   Tue Jun 29 15:00:31 2021 +0200

    Re-add source-set specific application name

commit 8bfcb36d60
Author: Ryan Harg <ryan.harg@mailbox.org>
Date:   Tue Jun 29 14:19:22 2021 +0200

    Replace in-app icons

commit f8eb547732
Author: Ryan Harg <ryan.harg@mailbox.org>
Date:   Tue Jun 29 13:57:44 2021 +0200

    Replace application icons and adjust app name

app/build.gradle.kts

@@ -45,9 +45,7 @@ android {
 
     ndkVersion = "21.3.6528147"
 
-    androidGitVersion.code().let {
-      versionCode = if (it == 0) 1 else it
-    }
+    versionCode = androidGitVersion.code()
     versionName = androidGitVersion.name()
   }
 

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name" translatable="false">Otter (debug)</string>
-</resources>
+    <string name="app_name" translatable="false">Funkwhale</string>
+</resources>

app/src/main/java/com/github/apognu/otter/playback/MediaControlsManager.kt

@@ -54,7 +54,7 @@ class MediaControlsManager(val context: Service, private val scope: CoroutineSco
               .setMediaSession(mediaSession.sessionToken)
               .setShowActionsInCompactView(0, 1, 2)
           )
-          .setSmallIcon(R.drawable.ottershape)
+          .setSmallIcon(R.drawable.funkwhaleshape)
           .run {
             coverUrl?.let {
               try {

app/src/main/res/drawable-anydpi/funkwhaleshape.xml

@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF"
+    android:alpha="0.8">
+  <group android:scaleX="0.09499148"
+      android:scaleY="0.09499148"
+      android:translateY="1.1502675">
+    <path
+        android:pathData="m126.327,145.717c24.121,0 43.744,-19.624 43.744,-43.744 0,-1.226 -1.09,-2.317 -2.317,-2.317l-16.489,0c-1.226,0 -2.317,1.09 -2.317,2.317 0,12.401 -10.084,22.622 -22.622,22.622 -12.401,0 -22.622,-10.084 -22.622,-22.622 0,-1.226 -1.09,-2.317 -2.317,-2.317L84.899,99.656c-1.226,0 -2.317,1.09 -2.317,2.317 0,24.257 19.624,43.744 43.744,43.744z"
+        android:fillColor="#009FE3"/>
+    <path
+        android:pathData="m126.327,187.008c46.742,0 84.899,-38.157 84.899,-84.899 0,-1.226 -1.09,-2.317 -2.317,-2.317l-16.489,0c-1.226,0 -2.317,1.09 -2.317,2.317 0,35.295 -28.618,63.913 -63.913,63.913C90.896,166.022 62.278,137.404 62.278,102.109c0,-1.226 -1.09,-2.317 -2.317,-2.317L43.744,99.792c-1.226,0 -2.317,1.09 -2.317,2.317 -0.273,46.742 37.885,84.899 84.899,84.899z"
+        android:fillColor="#009FE3"/>
+    <path
+        android:pathData="m250.338,99.792l-16.489,0c-1.226,0 -2.317,1.09 -2.317,2.317 0,58.053 -47.424,105.341 -105.341,105.341 -58.053,0 -105.341,-47.151 -105.341,-105.341 0,-1.226 -1.09,-2.317 -2.317,-2.317L2.317,99.792c-1.226,0 -2.317,1.09 -2.317,2.317 0,69.637 56.69,126.327 126.327,126.327 69.637,0 126.327,-56.69 126.327,-126.327 0,-1.226 -1.09,-2.317 -2.317,-2.317z"
+        android:fillColor="#009FE3"/>
+    <path
+        android:pathData="m69.5,45.146c8.449,4.361 17.58,5.178 25.756,9.948 5.315,3.134 8.722,6.541 11.992,11.72 5.178,7.768 4.906,17.58 4.906,17.58l0.681,10.766c0,0 4.088,10.766 13.219,10.766 9.676,0 13.219,-10.766 13.219,-10.766l0.681,-10.766c0,0 -0.273,-9.676 4.906,-17.58 3.271,-5.178 6.541,-8.858 11.992,-11.72 8.177,-4.77 17.307,-5.587 25.756,-9.948 8.449,-4.361 16.626,-9.948 22.213,-17.716 5.587,-7.768 8.177,-18.125 5.178,-27.255 -16.08,-0.818 -34.614,1.09 -48.787,8.722 -19.76,10.493 -31.752,6.814 -35.295,22.485l-0.273,0c-3.543,-15.808 -15.399,-11.992 -35.295,-22.485 -14.173,-7.631 -32.706,-9.539 -48.787,-8.722 -3.134,9.13 -0.409,19.351 5.178,27.255 5.996,7.904 14.309,13.491 22.758,17.716z"
+        android:fillColor="#3C3C3B"/>
+  </group>
+</vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0.21800545"
+      android:scaleY="0.21800545"
+      android:translateX="26.46"
+      android:translateY="29.099863">
+    <path
+        android:pathData="m126.327,145.717c24.121,0 43.744,-19.624 43.744,-43.744 0,-1.226 -1.09,-2.317 -2.317,-2.317l-16.489,0c-1.226,0 -2.317,1.09 -2.317,2.317 0,12.401 -10.084,22.622 -22.622,22.622 -12.401,0 -22.622,-10.084 -22.622,-22.622 0,-1.226 -1.09,-2.317 -2.317,-2.317L84.899,99.656c-1.226,0 -2.317,1.09 -2.317,2.317 0,24.257 19.624,43.744 43.744,43.744z"
+        android:fillColor="#009FE3"/>
+    <path
+        android:pathData="m126.327,187.008c46.742,0 84.899,-38.157 84.899,-84.899 0,-1.226 -1.09,-2.317 -2.317,-2.317l-16.489,0c-1.226,0 -2.317,1.09 -2.317,2.317 0,35.295 -28.618,63.913 -63.913,63.913C90.896,166.022 62.278,137.404 62.278,102.109c0,-1.226 -1.09,-2.317 -2.317,-2.317L43.744,99.792c-1.226,0 -2.317,1.09 -2.317,2.317 -0.273,46.742 37.885,84.899 84.899,84.899z"
+        android:fillColor="#009FE3"/>
+    <path
+        android:pathData="m250.338,99.792l-16.489,0c-1.226,0 -2.317,1.09 -2.317,2.317 0,58.053 -47.424,105.341 -105.341,105.341 -58.053,0 -105.341,-47.151 -105.341,-105.341 0,-1.226 -1.09,-2.317 -2.317,-2.317L2.317,99.792c-1.226,0 -2.317,1.09 -2.317,2.317 0,69.637 56.69,126.327 126.327,126.327 69.637,0 126.327,-56.69 126.327,-126.327 0,-1.226 -1.09,-2.317 -2.317,-2.317z"
+        android:fillColor="#009FE3"/>
+    <path
+        android:pathData="m69.5,45.146c8.449,4.361 17.58,5.178 25.756,9.948 5.315,3.134 8.722,6.541 11.992,11.72 5.178,7.768 4.906,17.58 4.906,17.58l0.681,10.766c0,0 4.088,10.766 13.219,10.766 9.676,0 13.219,-10.766 13.219,-10.766l0.681,-10.766c0,0 -0.273,-9.676 4.906,-17.58 3.271,-5.178 6.541,-8.858 11.992,-11.72 8.177,-4.77 17.307,-5.587 25.756,-9.948 8.449,-4.361 16.626,-9.948 22.213,-17.716 5.587,-7.768 8.177,-18.125 5.178,-27.255 -16.08,-0.818 -34.614,1.09 -48.787,8.722 -19.76,10.493 -31.752,6.814 -35.295,22.485l-0.273,0c-3.543,-15.808 -15.399,-11.992 -35.295,-22.485 -14.173,-7.631 -32.706,-9.539 -48.787,-8.722 -3.134,9.13 -0.409,19.351 5.178,27.255 5.996,7.904 14.309,13.491 22.758,17.716z"
+        android:fillColor="#3C3C3B"/>
+  </group>
+</vector>

app/src/main/res/layout-land/activity_main.xml

@@ -55,7 +55,7 @@
     android:theme="@style/AppTheme.AppBar"
     app:backgroundTint="@color/colorPrimary"
     app:layout_insetEdge="bottom"
-    app:navigationIcon="@drawable/ottershape"
+    app:navigationIcon="@drawable/funkwhaleshape"
     tools:menu="@menu/toolbar" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/activity_login.xml

@@ -18,7 +18,7 @@
       android:layout_height="128dp"
       android:layout_marginBottom="32dp"
       android:contentDescription="@string/alt_app_logo"
-      android:src="@drawable/otter"
+      android:src="@drawable/funkwhale"
       app:tint="@android:color/white" />
 
     <TextView

app/src/main/res/layout/activity_main.xml

@@ -38,7 +38,7 @@
     android:theme="@style/AppTheme.AppBar"
     app:backgroundTint="@color/colorPrimary"
     app:layout_insetEdge="bottom"
-    app:navigationIcon="@drawable/ottershape"
+    app:navigationIcon="@drawable/funkwhaleshape"
     tools:menu="@menu/toolbar" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/activity_search.xml

@@ -58,7 +58,7 @@
       android:layout_marginStart="16dp"
       android:layout_marginTop="16dp"
       android:layout_marginEnd="16dp"
-      android:drawableTop="@drawable/ottershape"
+      android:drawableTop="@drawable/funkwhaleshape"
       android:drawablePadding="16dp"
       android:drawableTint="#525252"
       android:text="@string/search_welcome"
@@ -72,7 +72,7 @@
       android:layout_marginStart="16dp"
       android:layout_marginTop="16dp"
       android:layout_marginEnd="16dp"
-      android:drawableTop="@drawable/ottershape"
+      android:drawableTop="@drawable/funkwhaleshape"
       android:drawablePadding="16dp"
       android:drawableTint="#525252"
       android:text="@string/search_no_results"

app/src/main/res/layout/partial_now_playing.xml

@@ -117,7 +117,7 @@
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:adjustViewBounds="true"
-        android:src="@drawable/ottershape"
+        android:src="@drawable/funkwhaleshape"
         tools:src="@tools:sample/avatars" />
 
       <ImageButton

app/src/main/res/layout/partial_queue.xml

@@ -70,7 +70,7 @@
     android:layout_gravity="center"
     android:layout_marginTop="64dp"
     android:layout_marginBottom="64dp"
-    android:drawableTop="@drawable/ottershape"
+    android:drawableTop="@drawable/funkwhaleshape"
     android:drawablePadding="16dp"
     android:drawableTint="#525252"
     android:text="@string/playback_queue_empty"

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Otter</string>
+    <string name="app_name">Funkwhale</string>
     <string name="login_welcome">Bitte gib die Anmeldedaten deiner Funkwhale-Instanz ein, um auf den Inhalt zuzugreifen</string>
     <string name="login_hostname">Servername</string>
     <string name="login_anonymous">Anonyme Anmeldung</string>

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

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

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name" translatable="false">Otter</string>
+  <string name="app_name" translatable="false">Funkwhale</string>
   <string name="login_welcome">Please enter the details of your Funkwhale instance to access its content</string>
   <string name="login_hostname">Host name</string>
   <string name="login_cleartext">Allow cleartext traffic (HTTP)</string>