Merge pull request #100 from swingmx/fix/auth-channel-navigation

`refactor:` Upgrade Dependencies and Remove Custom WavySlider

Author: Ericgacoki

.gitignore

@@ -11,3 +11,4 @@
 local.properties
 *.keystore
 keystore-base64.txt
+/.kotlin/sessions

app/build.gradle.kts

@@ -1,18 +1,19 @@
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose")
     id("com.google.dagger.hilt.android")
     id("com.google.devtools.ksp")
 }
 
 android {
     namespace = "com.android.swingmusic"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.android.swingmusic"
         minSdk = 26
-        targetSdk = 35
+        targetSdk = 36
         versionCode = project.findProperty("versionCode")?.toString()?.toInt() ?: 1
         versionName = project.findProperty("versionName")?.toString() ?: "1.0.0"
 
@@ -32,6 +33,11 @@ android {
     }
 
     buildTypes {
+        debug {
+            isDebuggable = true
+            applicationIdSuffix = ".debug"
+            resValue("string", "app_name", "[Debug]")
+        }
         release {
             isMinifyEnabled = true
             signingConfig = signingConfigs.getByName("release")
@@ -49,14 +55,15 @@ android {
     }
     buildFeatures {
         compose = true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.0"
+        buildConfig = true
     }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
+        jniLibs {
+            useLegacyPackaging = false
+        }
     }
 }
 
@@ -82,7 +89,7 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
 
     // Compose
-    implementation(platform("androidx.compose:compose-bom:2024.10.01"))
+    implementation(platform("androidx.compose:compose-bom:2025.05.00"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
@@ -93,8 +100,8 @@ dependencies {
     testImplementation("junit:junit:4.13.2")
 
     // Hilt DI
-    implementation("com.google.dagger:hilt-android:2.50")
-    ksp("com.google.dagger:hilt-android-compiler:2.50")
+    implementation("com.google.dagger:hilt-android:2.53.1")
+    ksp("com.google.dagger:hilt-android-compiler:2.53.1")
 
     // Hilt Navigation-Compose
     implementation("androidx.hilt:hilt-navigation-compose:1.2.0")

app/proguard-rules.pro

@@ -16,3 +16,14 @@
 -keep class com.android.swingmusic.core.** { *; }
 -keep class com.android.swingmusic.network.** { *; }
 -keep class com.android.swingmusic.database.** { *; }
+
+# Timber - strip logging calls from release builds
+-assumenosideeffects class timber.log.Timber* {
+    public static *** d(...);
+    public static *** v(...);
+    public static *** i(...);
+    public static *** w(...);
+    public static *** e(...);
+    public static *** wtf(...);
+    public static *** tag(...);
+}

app/src/debug/res/values-night/styles.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Chucker.Theme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="android:fitsSystemWindows">true</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Chucker.Theme" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <item name="android:fitsSystemWindows">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>

app/src/main/AndroidManifest.xml

@@ -3,13 +3,15 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
     <uses-permission android:name="android.permission.WAKE_LOCK" tools:node="replace"/>
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
         android:name=".app.SwingMusicApp"
+        tools:replace="android:name"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -35,7 +37,7 @@
             android:name=".presentation.activity.MainActivity"
             android:exported="true"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|screenSize|uiMode"
+            android:configChanges="orientation"
             android:theme="@style/Theme.SwingMusic">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/android/swingmusic/app/SwingMusicApp.kt

@@ -3,6 +3,7 @@ package com.android.swingmusic.app
 import android.app.Application
 import androidx.work.Configuration
 import com.android.swingmusic.auth.data.workmanager.TokenRefreshWorkerFactory
+import com.android.swingmusic.BuildConfig
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.asExecutor
@@ -17,7 +18,9 @@ class SwingMusicApp : Application(), Configuration.Provider {
 
     override fun onCreate() {
         super.onCreate()
-        Timber.plant(Timber.DebugTree())
+        if (BuildConfig.DEBUG) {
+            Timber.plant(Timber.DebugTree())
+        }
     }
 
     override val workManagerConfiguration: Configuration by lazy {

app/src/main/java/com/android/swingmusic/presentation/activity/MainActivity.kt

@@ -81,6 +81,9 @@ import com.ramcosta.composedestinations.animations.defaults.RootNavGraphDefaultA
 import com.ramcosta.composedestinations.animations.rememberAnimatedNavHostEngine
 import com.ramcosta.composedestinations.navigation.dependency
 import com.ramcosta.composedestinations.utils.destination
+import android.Manifest
+import android.os.Build
+import com.android.swingmusic.BuildConfig
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
@@ -113,6 +116,10 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
+        if (BuildConfig.DEBUG && Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            requestPermissions(arrayOf(Manifest.permission.POST_NOTIFICATIONS), 0)
+        }
+
         scheduleTokenRefreshWork(applicationContext)
 
         setContent {

app/src/main/java/com/android/swingmusic/service/PlaybackService.kt

@@ -12,8 +12,10 @@ import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.DefaultLoadControl
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.source.ProgressiveMediaSource
+import androidx.media3.session.DefaultMediaNotificationProvider
 import androidx.media3.session.MediaSession
 import androidx.media3.session.MediaSessionService
+import com.android.swingmusic.R
 import com.android.swingmusic.auth.data.tokenholder.AuthTokenHolder
 import com.android.swingmusic.auth.domain.repository.AuthRepository
 import dagger.hilt.android.AndroidEntryPoint
@@ -37,6 +39,11 @@ class PlaybackService : MediaSessionService() {
     override fun onCreate() {
         super.onCreate()
 
+        val notificationProvider = DefaultMediaNotificationProvider.Builder(this)
+            .setChannelName(R.string.media3_notification_channel_name)
+            .build()
+        setMediaNotificationProvider(notificationProvider)
+
         serviceScope.launch {
             val accessToken = authRepository.getAccessToken()
                 ?: "TAG: $this SERVICE -> TOKEN NOT FOUND"

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:pathData="M15.003,15.908C16.534,15.908 18.033,15.817 19.262,15.635C20.236,15.488 20.541,14.769 20.21,13.742L18.38,7.976C18.049,6.92 17.199,6.428 16.028,6.428H13.972C12.8,6.428 11.951,6.92 11.62,7.976L9.79,13.742C9.459,14.769 9.764,15.488 10.738,15.635C11.967,15.817 13.467,15.908 15.003,15.908ZM14.365,15.422V23.087H15.637V15.422H14.365ZM11.874,23.572H18.126C18.425,23.572 18.628,23.358 18.628,23.046C18.628,22.47 18.158,22.07 17.451,22.07H12.549C11.842,22.07 11.379,22.47 11.379,23.046C11.379,23.358 11.575,23.572 11.874,23.572Z"
+        android:fillColor="#FFFFFF"/>
+</vector>