Merge pull request #474 from lucasnlm/new-build

New build
lucasnlm · Nov 8, 2023 · 638ddf9 · 638ddf9
2 parents 32f1825 + e315e82
commit 638ddf9
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode 1705071
-        versionName '17.5.7'
+        versionCode 1705081
+        versionName '17.5.8'
         minSdk 21
         targetSdk 34
         compileSdk 34

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -78,3 +78,6 @@
    boolean reportFixture(long);
    float   reportRayFixture(long, float, float, float, float, float);
 }
+
+-dontwarn javax.annotation.processing.AbstractProcessor
+-dontwarn javax.annotation.processing.SupportedOptions
diff --git a/app/src/main/res/layout-land/activity_game.xml b/app/src/main/res/layout-land/activity_game.xml
@@ -135,7 +135,7 @@
                     android:layout_width="?attr/actionBarSize"
                     android:layout_height="?attr/actionBarSize"
                     android:layout_gravity="center"
-                    app:indicatorColor="?colorPrimary"
+                    app:indicatorColor="?colorError"
                     app:indicatorSize="24dp"
                     app:trackThickness="3dp" />
 
@@ -172,13 +172,14 @@
         android:id="@+id/loadingGame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:trackThickness="2dp"
         android:indeterminate="true"
+        android:visibility="gone"
         app:hideAnimationBehavior="outward"
+        app:indicatorColor="?colorError"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:showAnimationBehavior="inward"
-        android:visibility="gone"/>
+        app:trackThickness="2dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_game.xml b/app/src/main/res/layout/activity_game.xml
@@ -84,8 +84,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_weight="1"
-                android:layoutDirection="ltr"
-                android:gravity="center">
+                android:gravity="center"
+                android:layoutDirection="ltr">
 
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/timer"
@@ -138,7 +138,7 @@
                     android:layout_width="?attr/actionBarSize"
                     android:layout_height="?attr/actionBarSize"
                     android:layout_gravity="center"
-                    app:indicatorColor="?colorPrimary"
+                    app:indicatorColor="?colorError"
                     app:indicatorSize="24dp"
                     app:trackThickness="3dp" />
 
@@ -173,14 +173,15 @@
         android:id="@+id/loadingGame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@+id/app_bar"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:trackThickness="2dp"
         android:indeterminate="true"
+        android:visibility="gone"
         app:hideAnimationBehavior="outward"
+        app:indicatorColor="?colorError"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/app_bar"
         app:showAnimationBehavior="inward"
-        android:visibility="gone" />
+        app:trackThickness="2dp" />
 
     <nl.dionsegijn.konfetti.xml.KonfettiView
         android:id="@+id/konfettiView"

diff --git a/wear/proguard-rules.pro b/wear/proguard-rules.pro
@@ -13,6 +13,12 @@
 -keepnames class * extends android.os.Parcelable
 -keepnames class * extends java.io.Serializable
 
+-keepattributes *Annotation*
+-keepattributes Signature
+-dontwarn com.squareup.**
+-keep class com.squareup.** { *; }
+-keep class com.squareup.moshi.** { *; }
+
 -keep class * implements android.os.Parcelable {
    public static final android.os.Parcelable$Creator *;
 }
@@ -27,6 +33,8 @@
 -dontwarn org.openjsse.**
 
 # For Google Play Services
+-keepattributes Signature
+-keep class com.google.android.gms.** { *; }
 -keep class io.grpc.** {*;}
 -keep public class com.google.android.gms.ads.** {
     public *;
@@ -40,4 +48,36 @@
 # Material
 -keep class com.google.android.material.** { *; }
 -dontwarn com.google.android.material.**
--dontnote com.google.android.material.**
+-dontnote com.google.android.material.**
+
+# Kryo
+-dontwarn sun.reflect.**
+-dontwarn java.beans.**
+-dontwarn sun.nio.ch.**
+-dontwarn sun.misc.**
+
+# Firebase
+-keep class com.google.android.gms.** { *; }
+-keep class com.google.firebase.** { *; }
+
+# LibGDX
+-keep class com.badlogic.gdx.scenes.** { *; }
+
+-dontwarn com.badlogic.gdx.backends.android.AndroidFragmentApplication
+
+# Required if using Gdx-Controllers extension
+-keep class com.badlogic.gdx.controllers.android.AndroidControllers
+
+# Required if using Box2D extension
+-keepclassmembers class com.badlogic.gdx.physics.box2d.World {
+   boolean contactFilter(long, long);
+   void    beginContact(long);
+   void    endContact(long);
+   void    preSolve(long, long);
+   void    postSolve(long, long);
+   boolean reportFixture(long);
+   float   reportRayFixture(long, float, float, float, float, float);
+}
+
+-dontwarn javax.annotation.processing.AbstractProcessor
+-dontwarn javax.annotation.processing.SupportedOptions