Update Code

rolled back to old Icon
Updated pro gaurd rules

app/build.gradle

@@ -16,8 +16,8 @@ android {
         vectorDrawables.useSupportLibrary = true
 
         applicationId "code.name.monkey.retromusic"
-        versionCode 10438
+        versionCode 10442
-        versionName '3.5.650' + "_" + getDate()
+        versionName '3.6.000_hot_fix' + "_" + getDate()
 
         multiDexEnabled true
 

app/proguard-rules.pro

@@ -51,4 +51,11 @@
 #  native *** n*(...);
 #}
 
-#-keep class org.jaudiotagger.** { *; }
+#-keep class org.jaudiotagger.** { *; }
+-keepclassmembers enum * { *; }
+-keepattributes *Annotation*, Signature, Exception
+-keepnames class androidx.navigation.fragment.NavHostFragment
+-keepnames class code.name.monkey.retromusic.model.Home
+-keep class * extends androidx.fragment.app.Fragment{}
+-keepnames class * extends android.os.Parcelable
+-keepnames class * extends java.io.Serializable

app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java

@@ -35,13 +35,12 @@ import android.view.View;
 import android.view.animation.LinearInterpolator;
 import android.widget.Scroller;
 
-import androidx.core.content.res.ResourcesCompat;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import code.name.monkey.retromusic.BuildConfig;
 import code.name.monkey.retromusic.R;
 
 /**
@@ -512,7 +511,9 @@ public class LrcView extends View {
             if (i > 0) {
                 y += ((mLrcEntryList.get(i - 1).getHeight() + mLrcEntryList.get(i).getHeight()) >> 1) + mDividerHeight;
             }
-            mLrcPaint.setTypeface(ResourcesCompat.getFont(getContext(), R.font.sans));
+            if (BuildConfig.DEBUG) {
+                //mLrcPaint.setTypeface(ResourcesCompat.getFont(getContext(), R.font.sans));
+            }
             if (i == mCurrentLine) {
                 mLrcPaint.setTextSize(mCurrentTextSize);
                 mLrcPaint.setColor(mCurrentTextColor);

app/src/main/java/code/name/monkey/retromusic/repository/SongRepository.kt

@@ -149,8 +149,13 @@ class RealSongRepository(private val context: Context) : SongRepository {
         selectionFinal =
             selectionFinal + " AND " + Media.DURATION + ">= " + (PreferenceUtil.filterLength * 1000)
 
+        val uri = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
+            Media.getContentUri(MediaStore.VOLUME_EXTERNAL)
+        } else {
+            Media.EXTERNAL_CONTENT_URI
+        }
         return context.contentResolver.query(
-            Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY),
+            uri,
             baseProjection,
             selectionFinal,
             selectionValuesFinal,

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.parallel=true
 jvmArgs='-Xmx2048m'
 android.useAndroidX=true
 android.enabelR8=true
-android.enableR8.fullMode=false
+android.enableR8.fullMode=true
 android.enableJetifier=true
 android.debug.obsoleteApi=true
 android.enableBuildCache=true