.gitlab/merge_request_templates/Release.md

@@ -1,10 +0,0 @@
-#### Before merge:
-- [ ] MR is targetting the master branch
-- [ ] **Squash commits must be disabled!**
-- [ ] RoboTests (5 physical, 10 virtual) on a Release apk return no errors
-- [ ] Release notes present
-
-#### After merge
-- [ ] ``git fetch``
-- [ ] Create an annotated and signed tag: ``git tag -sa``
-- [ ] Push the tag to git:``git push --tags``

gradle.properties

@@ -21,5 +21,5 @@ android.nonFinalResIds=true
 org.gradle.unsafe.configuration-cache=true
 
 # TODO Renable on day (check that Retrofit, Jackson, and Imageloader are working)
-android.enableR8.fullMode=true
+android.enableR8.fullMode=false
 

ultrasonic/minify/proguard-jackson.pro

@@ -1,4 +1,5 @@
 #### From Jackson
+
 -keepattributes *Annotation*,EnclosingMethod,Signature
 -keepnames class com.fasterxml.jackson.** {
 *;

ultrasonic/minify/proguard-main.pro

@@ -1,14 +1,8 @@
 -dontobfuscate
 
 ### Don't remove subsonic api serializers/entities
--keep class org.moire.ultrasonic.api.subsonic.** { *; }
+-keep class org.moire.ultrasonic.api.subsonic.response.** { *; }
-
+-keep class org.moire.ultrasonic.api.subsonic.models.** { *; }
-## Don't remove the domain models
--keep class org.moire.ultrasonic.domain.** { *; }
-
-## Don't remove the imageloader
--keep class org.moire.ultrasonic.imageloader.** { *; }
--keep class org.moire.ultrasonic.provider.AlbumArtContentProvider { *; }
 
 ## Don't remove NowPlayingFragment
 -keep class org.moire.ultrasonic.fragment.NowPlayingFragment { *; }

ultrasonic/src/main/res/layout/track_buttons.xml

@@ -7,7 +7,7 @@
     android:orientation="horizontal"
     android:padding="6dp" >
 
-    <com.google.android.material.button.MaterialButton
+    <Button
         android:id="@+id/select_album_select"
         style="@style/Widget.Material3.Button.IconButton"
         android:layout_width="0dp"
@@ -20,7 +20,7 @@
         app:iconGravity="textEnd"
         app:iconSize="26dp" />
 
-    <com.google.android.material.button.MaterialButton
+    <Button
         android:id="@+id/select_album_play_now"
         style="@style/Widget.Material3.Button.IconButton"
         android:layout_width="0dp"
@@ -31,10 +31,9 @@
         android:contentDescription="@string/common.play_now"
         app:icon="@drawable/media_start"
         app:iconGravity="textEnd"
-        app:iconSize="26dp"
+        app:iconSize="26dp" />
-        android:scrollbars="none" />
     
-    <com.google.android.material.button.MaterialButton
+    <Button
         android:id="@+id/select_album_play_next"
         style="@style/Widget.Material3.Button.IconButton"
         android:layout_width="0dp"
@@ -45,10 +44,9 @@
         android:contentDescription="@string/common.play_next"
         app:icon="@drawable/ic_play_next"
         app:iconGravity="textEnd"
-        app:iconSize="26dp"
+        app:iconSize="26dp" />
-        android:scrollbars="none" />
 
-    <com.google.android.material.button.MaterialButton
+    <Button
         android:id="@+id/select_album_play_last"
         style="@style/Widget.Material3.Button.IconButton"
         android:layout_width="0dp"
@@ -59,11 +57,9 @@
         android:contentDescription="@string/common.play_last"
         app:icon="@drawable/ic_play_last"
         app:iconGravity="textEnd"
-        app:iconSize="26dp"
+        app:iconSize="26dp" />
-        android:scrollbars="none"
-        />
 
-    <com.google.android.material.button.MaterialButton
+    <Button
         android:id="@+id/select_album_pin"
         style="@style/Widget.Material3.Button.IconButton"
         android:layout_width="0dp"
@@ -74,11 +70,9 @@
         android:contentDescription="@string/common.pin"
         app:icon="@drawable/ic_menu_pin"
         app:iconGravity="textEnd"
-        app:iconSize="26dp"
+        app:iconSize="26dp" />
-        android:scrollbars="none"
-        />
 
-    <com.google.android.material.button.MaterialButton
+    <Button
         android:id="@+id/select_album_unpin"
         style="@style/Widget.Material3.Button.IconButton"
         android:layout_width="0dp"
@@ -89,11 +83,9 @@
         android:contentDescription="@string/common.unpin"
         app:icon="@drawable/ic_menu_unpin"
         app:iconGravity="textEnd"
-        app:iconSize="26dp"
+        app:iconSize="26dp" />
-        android:scrollbars="none"
-        />
     
-    <com.google.android.material.button.MaterialButton
+    <Button
         android:id="@+id/select_album_download"
         style="@style/Widget.Material3.Button.IconButton"
         android:layout_width="0dp"
@@ -104,11 +96,9 @@
         android:contentDescription="@string/common.download"
         app:icon="@drawable/ic_menu_download"
         app:iconGravity="textEnd"
-        app:iconSize="26dp"
+        app:iconSize="26dp" />
-        android:scrollbars="none"
-        />
 
-    <com.google.android.material.button.MaterialButton
+    <Button
         android:id="@+id/select_album_delete"
         style="@style/Widget.Material3.Button.IconButton"
         android:layout_width="0dp"
@@ -119,11 +109,9 @@
         android:contentDescription="@string/common.delete"
         app:icon="@drawable/ic_menu_close"
         app:iconGravity="textEnd"
-        app:iconSize="26dp"
+        app:iconSize="26dp" />
-        android:scrollbars="none"
-        />
 
-    <com.google.android.material.button.MaterialButton
+    <Button
         android:id="@+id/select_album_more"
         style="@style/Widget.Material3.Button.IconButton"
         android:layout_width="0dp"
@@ -134,8 +122,6 @@
         android:contentDescription="@string/search.more"
         app:icon="@drawable/media_forward"
         app:iconGravity="textEnd"
-        app:iconSize="26dp"
+        app:iconSize="26dp" />
-        android:scrollbars="none"
-        />
 
 </LinearLayout>