Merge pull request #592 from naveensingh/sdk_and_viewbinding_migration

Migrate to View binding, SDK 34 and Version catalogs

Author: tibbi

app/build.gradle

@@ -0,0 +1,109 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.konan.properties.Properties
+import java.io.FileInputStream
+
+plugins {
+    alias(libs.plugins.android)
+    alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.ksp)
+}
+
+val keystorePropertiesFile: File = rootProject.file("keystore.properties")
+val keystoreProperties = Properties()
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+}
+
+android {
+    compileSdk = project.libs.versions.app.build.compileSDKVersion.get().toInt()
+
+    defaultConfig {
+        applicationId = libs.versions.app.version.appId.get()
+        minSdk = project.libs.versions.app.build.minimumSDK.get().toInt()
+        targetSdk = project.libs.versions.app.build.targetSDK.get().toInt()
+        versionName = project.libs.versions.app.version.versionName.get()
+        versionCode = project.libs.versions.app.version.versionCode.get().toInt()
+        setProperty("archivesBaseName", "music-player")
+        vectorDrawables.useSupportLibrary = true
+    }
+
+    signingConfigs {
+        if (keystorePropertiesFile.exists()) {
+            register("release") {
+                keyAlias = keystoreProperties["keyAlias"] as String
+                keyPassword = keystoreProperties["keyPassword"] as String
+                storeFile = file(keystoreProperties["storeFile"] as String)
+                storePassword = keystoreProperties["storePassword"] as String
+            }
+        }
+    }
+
+    buildFeatures {
+        viewBinding = true
+        buildConfig = true
+    }
+
+    buildTypes {
+        debug {
+            applicationIdSuffix = ".debug"
+        }
+        release {
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+            if (keystorePropertiesFile.exists()) {
+                signingConfig = signingConfigs.getByName("release")
+            }
+        }
+    }
+
+    flavorDimensions.add("variants")
+    productFlavors {
+        register("core")
+        register("fdroid")
+        register("prepaid")
+    }
+
+    sourceSets {
+        getByName("main").java.srcDirs("src/main/kotlin")
+    }
+
+    compileOptions {
+        val currentJavaVersionFromLibs = JavaVersion.valueOf(libs.versions.app.build.javaVersion.get().toString())
+        sourceCompatibility = currentJavaVersionFromLibs
+        targetCompatibility = currentJavaVersionFromLibs
+        isCoreLibraryDesugaringEnabled = true
+    }
+
+    tasks.withType<KotlinCompile> {
+        kotlinOptions.jvmTarget = project.libs.versions.app.build.kotlinJVMTarget.get()
+    }
+
+    namespace = libs.versions.app.version.appId.get()
+
+    lint {
+        checkReleaseBuilds = false
+        abortOnError = false
+    }
+}
+
+dependencies {
+    implementation(libs.simple.mobile.tools.commons)
+    implementation(libs.eventbus)
+    implementation(libs.androidx.media)
+    implementation(libs.androidx.swiperefreshlayout)
+    implementation(libs.androidx.constraintlayout)
+    implementation(libs.androidx.lifecycle.process)
+    implementation(libs.androidx.media3.session)
+    implementation(libs.androidx.media3.exoplayer)
+    implementation(libs.lottie)
+    implementation(libs.m3u.parser)
+    implementation(libs.autofittextview)
+    implementation(libs.jaudiotagger)
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
+
+    implementation(libs.bundles.room)
+    ksp(libs.androidx.room.compiler)
+}

app/build.gradle.kts

@@ -8,15 +8,17 @@
   public <fields>;
 }
 
+# Gson uses generic type information stored in a class file when working with
+# fields. Proguard removes such information by default, keep it.
+-keepattributes Signature
+# This is also needed for R8 in compat mode since multiple optimizations will
+# remove the generic signature such as class merging and argument removal.
+-keep class com.google.gson.reflect.TypeToken { *; }
+-keep class * extends com.google.gson.reflect.TypeToken
+
 # EventBus
 -keepattributes *Annotation*
 -keepclassmembers class ** {
     @org.greenrobot.eventbus.Subscribe <methods>;
 }
 -keep enum org.greenrobot.eventbus.ThreadMode { *; }
-
-# Picasso
--dontwarn javax.annotation.**
--keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
--dontwarn org.codehaus.mojo.animal_sniffer.*
--dontwarn okhttp3.internal.platform.ConscryptPlatform

app/proguard-rules.pro

@@ -6,6 +6,7 @@
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

app/src/main/AndroidManifest.xml

@@ -10,29 +10,30 @@ import com.simplemobiletools.commons.helpers.NavigationIcon
 import com.simplemobiletools.commons.helpers.ensureBackgroundThread
 import com.simplemobiletools.musicplayer.R
 import com.simplemobiletools.musicplayer.adapters.AlbumsTracksAdapter
+import com.simplemobiletools.musicplayer.databinding.ActivityAlbumsBinding
 import com.simplemobiletools.musicplayer.extensions.audioHelper
 import com.simplemobiletools.musicplayer.helpers.ALBUM
 import com.simplemobiletools.musicplayer.helpers.ARTIST
 import com.simplemobiletools.musicplayer.models.*
-import kotlinx.android.synthetic.main.activity_albums.*
-import kotlinx.android.synthetic.main.view_current_track_bar.current_track_bar
 
 // Artists -> Albums -> Tracks
 class AlbumsActivity : SimpleMusicActivity() {
 
+    private val binding by viewBinding(ActivityAlbumsBinding::inflate)
+
     override fun onCreate(savedInstanceState: Bundle?) {
         isMaterialActivity = true
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_albums)
+        setContentView(binding.root)
 
-        updateMaterialActivityViews(albums_coordinator, albums_holder, useTransparentNavigation = true, useTopSearchMenu = false)
-        setupMaterialScrollListener(albums_list, albums_toolbar)
+        updateMaterialActivityViews(binding.albumsCoordinator, binding.albumsHolder, useTransparentNavigation = true, useTopSearchMenu = false)
+        setupMaterialScrollListener(binding.albumsList, binding.albumsToolbar)
 
-        albums_fastscroller.updateColors(getProperPrimaryColor())
+        binding.albumsFastscroller.updateColors(getProperPrimaryColor())
 
         val artistType = object : TypeToken<Artist>() {}.type
         val artist = Gson().fromJson<Artist>(intent.getStringExtra(ARTIST), artistType)
-        albums_toolbar.title = artist.title
+        binding.albumsToolbar.title = artist.title
 
         ensureBackgroundThread {
             val albums = audioHelper.getArtistAlbums(artist.id)
@@ -50,7 +51,7 @@ class AlbumsActivity : SimpleMusicActivity() {
             listItems.addAll(albumTracks)
 
             runOnUiThread {
-                AlbumsTracksAdapter(this, listItems, albums_list) {
+                AlbumsTracksAdapter(this, listItems, binding.albumsList) {
                     hideKeyboard()
                     if (it is Album) {
                         Intent(this, TracksActivity::class.java).apply {
@@ -63,25 +64,29 @@ class AlbumsActivity : SimpleMusicActivity() {
                                 val startIndex = albumTracks.indexOf(it as Track)
                                 prepareAndPlay(albumTracks, startIndex)
                             } else {
-                                PermissionRequiredDialog(this, R.string.allow_notifications_music_player, { openNotificationSettings() })
+                                PermissionRequiredDialog(
+                                    this,
+                                    com.simplemobiletools.commons.R.string.allow_notifications_music_player,
+                                    { openNotificationSettings() }
+                                )
                             }
                         }
                     }
                 }.apply {
-                    albums_list.adapter = this
+                    binding.albumsList.adapter = this
                 }
 
                 if (areSystemAnimationsEnabled) {
-                    albums_list.scheduleLayoutAnimation()
+                    binding.albumsList.scheduleLayoutAnimation()
                 }
             }
         }
 
-        setupCurrentTrackBar(current_track_bar)
+        setupCurrentTrackBar(binding.currentTrackBar.root)
     }
 
     override fun onResume() {
         super.onResume()
-        setupToolbar(albums_toolbar, NavigationIcon.Arrow)
+        setupToolbar(binding.albumsToolbar, NavigationIcon.Arrow)
     }
 }