Merge pull request #13 from RLD-JL/version-1.0.6-b

Version 1.0.6 b
RLD-JL · May 31, 2023 · 920b4f2 · 920b4f2
2 parents 36bcd46 + ce35d58
commit 920b4f2
Show file tree

Hide file tree

Showing 22 changed files with 159 additions and 74 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -11,27 +11,21 @@ dependencies {
     implementation("com.google.android.material:material:1.6.1")
     implementation("androidx.appcompat:appcompat:1.4.2")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.0-rc02")
-    implementation("androidx.activity:activity-compose:1.4.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.0")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0-alpha01")
+    implementation("androidx.activity:activity-compose:1.5.0")
     implementation("androidx.palette:palette-ktx:1.0.0")
 
-    implementation("androidx.compose.ui:ui-util:1.2.0-rc02")
-    implementation("androidx.compose.material:material:1.2.0-rc02")
-    implementation("androidx.compose.ui:ui:1.2.0-rc02")
-    implementation("androidx.compose.animation:animation:1.2.0-rc02")
-    debugImplementation("androidx.compose.ui:ui-tooling:1.2.0-rc02")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.2.0-rc02")
+    implementation(libs.bundles.compose)
+    debugImplementation(libs.compose.ui.preview)
 
-    implementation ("com.google.android.exoplayer:exoplayer-core:2.18.0")
-    implementation ("com.google.android.exoplayer:extension-mediasession:2.18.0")
-    implementation ("com.google.android.exoplayer:exoplayer-ui:2.18.0")
+    implementation (libs.bundles.exoplayer)
 
     implementation ("dev.chrisbanes.snapper:snapper:0.2.2")
     implementation ("androidx.work:work-runtime-ktx:2.7.1")
 
 
-    implementation("androidx.lifecycle:lifecycle-process:2.5.0-rc02")
+    implementation("androidx.lifecycle:lifecycle-process:2.6.0-alpha01")
     implementation("io.coil-kt:coil-compose:2.1.0")
     implementation("com.google.dagger:hilt-android:2.42")
     kapt("com.google.dagger:hilt-android-compiler:2.42")
@@ -46,13 +40,13 @@ kapt {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
     defaultConfig {
         applicationId = "com.rld.justlisten.android"
         minSdk = 21
-        targetSdk = 32
-        versionCode = 18
-        versionName = "1.0.6"
+        targetSdk = 33
+        versionCode = 20
+        versionName = "1.0.6-b"
         vectorDrawables {
             useSupportLibrary = true
         }
@@ -73,13 +67,13 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     buildFeatures {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.2.0-beta03"
+        kotlinCompilerExtensionVersion = "1.2.0"
     }
 
     packagingOptions {

diff --git a/androidApp/proguard-rules.pro b/androidApp/proguard-rules.pro
@@ -66,4 +66,12 @@
     boolean getASSERTIONS_ENABLED() return false;
     boolean getDEBUG() return false;
     boolean getRECOVER_STACK_TRACES() return false;
-}
+}
+
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.*
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.rld.justlisten.android">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>

diff --git a/androidApp/src/main/java/com/rld/justlisten/android/MainActivity.kt b/androidApp/src/main/java/com/rld/justlisten/android/MainActivity.kt
@@ -15,7 +15,6 @@ import com.rld.justlisten.android.ui.theme.JustListenTheme
 import com.rld.justlisten.android.ui.utils.getColorPallet
 import com.rld.justlisten.datalayer.datacalls.settings.getSettingsInfo
 
-
 class MainActivity : ComponentActivity() {
 
     @OptIn(ExperimentalMaterialApi::class)

diff --git a/androidApp/src/main/java/com/rld/justlisten/android/di/ServiceModule.kt b/androidApp/src/main/java/com/rld/justlisten/android/di/ServiceModule.kt
@@ -45,7 +45,7 @@ object ServiceModule {
     @Provides
     @ServiceScoped
     fun provideAudioAttributes() = AudioAttributes.Builder()
-        .setContentType(C.CONTENT_TYPE_MUSIC)
+        .setContentType(C.AUDIO_CONTENT_TYPE_MUSIC)
         .setUsage(C.USAGE_MEDIA)
         .build()
 

diff --git a/.../src/main/java/com/rld/justlisten/android/exoplayer/callbacks/MusicPlayerEventListener.kt b/.../src/main/java/com/rld/justlisten/android/exoplayer/callbacks/MusicPlayerEventListener.kt
@@ -1,5 +1,7 @@
 package com.rld.justlisten.android.exoplayer.callbacks
 
+import android.app.Service.STOP_FOREGROUND_DETACH
+import android.os.Build
 import android.widget.Toast
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.PlaybackException
@@ -17,7 +19,11 @@ class MusicPlayerEventListener(
     override fun onPlayWhenReadyChanged(playWhenReady: Boolean, reason: Int) {
         super.onPlayWhenReadyChanged(playWhenReady, reason)
         if (reason == Player.STATE_READY && !playWhenReady) {
-            musicService.stopForeground(false)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                musicService.stopForeground(STOP_FOREGROUND_DETACH)
+            } else {
+                musicService.stopForeground(true)
+            }
             musicService.isForegroundService = false
         }
     }

diff --git a/...in/java/com/rld/justlisten/android/exoplayer/callbacks/MusicPlayerNotificationListener.kt b/...in/java/com/rld/justlisten/android/exoplayer/callbacks/MusicPlayerNotificationListener.kt
@@ -1,7 +1,9 @@
 package com.rld.justlisten.android.exoplayer.callbacks
 
 import android.app.Notification
+import android.app.Service
 import android.content.Intent
+import android.os.Build
 import androidx.core.content.ContextCompat
 import com.rld.justlisten.android.exoplayer.MusicService
 import com.rld.justlisten.android.exoplayer.utils.Constants.NOTIFICATION_ID
@@ -13,7 +15,11 @@ class MusicPlayerNotificationListener(
     override fun onNotificationCancelled(notificationId: Int, dismissedByUser: Boolean) {
         super.onNotificationCancelled(notificationId, dismissedByUser)
         musicService.apply {
-            stopForeground(true)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                musicService.stopForeground(Service.STOP_FOREGROUND_DETACH)
+            } else {
+                musicService.stopForeground(true)
+            }
             isForegroundService = false
             stopSelf()
         }

diff --git a/...va/com/rld/justlisten/android/ui/bottombars/playbar/components/PlayBarActionsMaximized.kt b/...va/com/rld/justlisten/android/ui/bottombars/playbar/components/PlayBarActionsMaximized.kt
@@ -102,7 +102,7 @@ fun PlayBarActionsMaximized(
                                     SHUFFLE_MODE_ALL
                                 )
                             },
-                        painter = painterResource(id = R.drawable.exo_styled_controls_shuffle_off),
+                        painter = painterResource(id = com.google.android.exoplayer2.ui.R.drawable.exo_styled_controls_shuffle_off),
                         contentDescription = null,
                     )
                 } else {
@@ -115,7 +115,7 @@ fun PlayBarActionsMaximized(
                                     SHUFFLE_MODE_NONE
                                 )
                             },
-                        painter = painterResource(id = R.drawable.exo_styled_controls_shuffle_on),
+                        painter = painterResource(id = com.google.android.exoplayer2.ui.R.drawable.exo_styled_controls_shuffle_on),
                         contentDescription = null,
                     )
                 }
@@ -126,7 +126,7 @@ fun PlayBarActionsMaximized(
                         .clickable {
                             musicServiceConnection.transportControls.skipToPrevious()
                         },
-                    painter = painterResource(id = R.drawable.exo_ic_skip_previous),
+                    painter = painterResource(id = com.google.android.exoplayer2.ui.R.drawable.exo_ic_skip_previous),
                     contentDescription = null,
                 )
                 if (musicServiceConnection.playbackState.value?.state != PlaybackState.STATE_PLAYING &&
@@ -142,7 +142,7 @@ fun PlayBarActionsMaximized(
                             .weight(0.2f),
                         onClick = { musicServiceConnection.transportControls.play() }) {
                         Icon(
-                            painter = painterResource(id = R.drawable.exo_icon_play),
+                            painter = painterResource(id = com.google.android.exoplayer2.ui.R.drawable.exo_icon_play),
                             contentDescription = null
                         )
                     }
@@ -157,14 +157,14 @@ fun PlayBarActionsMaximized(
                             .weight(0.2f),
                         onClick = { musicServiceConnection.transportControls.pause() }) {
                         Icon(
-                            painter = painterResource(id = R.drawable.exo_icon_pause),
+                            painter = painterResource(id = com.google.android.exoplayer2.ui.R.drawable.exo_icon_pause),
                             contentDescription = null
                         )
                     }
                 }
 
                 Icon(
-                    painter = painterResource(id = R.drawable.exo_ic_skip_next),
+                    painter = painterResource(id = com.google.android.exoplayer2.ui.R.drawable.exo_ic_skip_next),
                     modifier = Modifier
                         .size(40.dp)
                         .clickable(onClick = onSkipNextPressed)
@@ -181,7 +181,7 @@ fun PlayBarActionsMaximized(
                                     REPEAT_MODE_ONE
                                 )
                             },
-                        painter = painterResource(id = R.drawable.exo_controls_repeat_off),
+                        painter = painterResource(id = com.google.android.exoplayer2.ui.R.drawable.exo_controls_repeat_off),
                         contentDescription = null,
                     )
                     REPEAT_MODE_ONE -> Icon(
@@ -193,7 +193,7 @@ fun PlayBarActionsMaximized(
                                     REPEAT_MODE_ALL
                                 )
                             },
-                        painter = painterResource(id = R.drawable.exo_controls_repeat_one),
+                        painter = painterResource(id = com.google.android.exoplayer2.ui.R.drawable.exo_controls_repeat_one),
                         contentDescription = null,
                     )
                     REPEAT_MODE_ALL -> Icon(
@@ -205,7 +205,7 @@ fun PlayBarActionsMaximized(
                                     REPEAT_MODE_NONE
                                 )
                             },
-                        painter = painterResource(id = R.drawable.exo_controls_repeat_all),
+                        painter = painterResource(id = com.google.android.exoplayer2.ui.R.drawable.exo_controls_repeat_all),
                         contentDescription = null,
                     )
                 }

diff --git a/...va/com/rld/justlisten/android/ui/bottombars/playbar/components/PlayBarActionsMinimized.kt b/...va/com/rld/justlisten/android/ui/bottombars/playbar/components/PlayBarActionsMinimized.kt
@@ -15,7 +15,6 @@ import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.rld.justlisten.android.R
 import com.rld.justlisten.android.exoplayer.MusicServiceConnection
 import com.rld.justlisten.android.exoplayer.library.extension.artist
 import com.rld.justlisten.android.ui.theme.typography
@@ -33,7 +32,6 @@ fun PlayBarActionsMinimized(
     Row(
         Modifier
             .graphicsLayer(alpha = 1f - currentFraction * 2)
-            .height(IntrinsicSize.Max)
             .clickable(onClick = playBarMinimizedClicked)
     ) {
         if (currentFraction != 1f) {
@@ -106,7 +104,7 @@ fun PlayBarActionsMinimized(
                 musicServiceConnection.playbackState.value?.state != PlaybackState.STATE_BUFFERING
             ) {
                 Icon(
-                    painter = painterResource(id = R.drawable.exo_icon_play),
+                    painter = painterResource(id = com.google.android.exoplayer2.ui.R.drawable.exo_icon_play),
                     modifier = Modifier
                         .padding(8.dp)
                         .clickable(
@@ -122,7 +120,7 @@ fun PlayBarActionsMinimized(
             )
             if (musicServiceConnection.playbackState.value?.state == PlaybackState.STATE_PLAYING) {
                 Icon(
-                    painter = painterResource(id = R.drawable.exo_icon_pause),
+                    painter = painterResource(id = com.google.android.exoplayer2.ui.R.drawable.exo_icon_pause),
                     modifier = Modifier
                         .padding(8.dp)
                         .clickable(
@@ -133,7 +131,7 @@ fun PlayBarActionsMinimized(
                 )
             }
             Icon(
-                painter = painterResource(id = R.drawable.exo_ic_skip_next),
+                painter = painterResource(id = com.google.android.exoplayer2.ui.R.drawable.exo_ic_skip_next),
                 modifier = Modifier
                     .padding(8.dp)
                     .clickable(onClick = onSkipNextPressed)

diff --git a/.../main/java/com/rld/justlisten/android/ui/bottombars/playbar/components/PlayerBottomBar.kt b/.../main/java/com/rld/justlisten/android/ui/bottombars/playbar/components/PlayerBottomBar.kt
@@ -14,7 +14,6 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.rld.justlisten.android.R
 import com.rld.justlisten.android.exoplayer.MusicService.Companion.curSongDuration
 import com.rld.justlisten.android.exoplayer.MusicServiceConnection
 import com.rld.justlisten.android.ui.extensions.noRippleClickable
@@ -96,7 +95,7 @@ fun IsLoading(isLoading: Boolean, modifier: Modifier) {
         ) {
             CircularProgressIndicator()
             Icon(
-                painter = painterResource(id = R.drawable.exo_icon_pause),
+                painter = painterResource(id = com.google.android.exoplayer2.ui.R.drawable.exo_icon_pause),
                 modifier = modifier.size(35.dp),
                 contentDescription = null
             )

diff --git a/androidApp/src/main/java/com/rld/justlisten/android/ui/settingsscreen/SettingsScreen.kt b/androidApp/src/main/java/com/rld/justlisten/android/ui/settingsscreen/SettingsScreen.kt
@@ -97,7 +97,7 @@ fun SettingsScreen(
             Row(modifier = Modifier.fillMaxWidth().weight(1f, false),
             horizontalArrangement = Arrangement.Center)
             {
-                Text(text ="App version:1.0.6")
+                Text(text ="App version:1.0.6-fix")
             }
         }
     }

diff --git a/.../src/main/java/com/rld/justlisten/android/ui/settingsscreen/components/SettingsContent.kt b/.../src/main/java/com/rld/justlisten/android/ui/settingsscreen/components/SettingsContent.kt
@@ -57,10 +57,11 @@ fun SettingsContent(
             verticalAlignment = Alignment.CenterVertically
         ) {
             Text(
-                text = "Has Bottom Donation Navigation",
+                text = "Has Bottom Donation Navigation \nDisabled thanks to google",
                 style = MaterialTheme.typography.h6.copy(fontSize = 14.sp)
             )
             Switch(
+                enabled = false,
                 checked = settings.hasDonationNavigationOn,
                 modifier = Modifier.padding(8.dp),
                 onCheckedChange = {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,14 +5,11 @@ buildscript {
         mavenCentral()
     }
 
-    val kotlin_version = "1.6.21"
-
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
-        classpath("com.android.tools.build:gradle:7.2.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlinVersion.get()}")
+        classpath("com.android.tools.build:gradle:8.0.1")
         classpath("com.squareup.sqldelight:gradle-plugin:1.5.3")
-        classpath ("com.google.dagger:hilt-android-gradle-plugin:2.40.1")
-
+        classpath ("com.google.dagger:hilt-android-gradle-plugin:2.42")
     }
 }
 
@@ -27,9 +24,9 @@ tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
 }
 
-/*
+
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>{
     kotlinOptions {
         freeCompilerArgs = listOf("-Xuse-k2")
     }
-}*/
+}
diff --git a/gradle.properties b/gradle.properties
@@ -5,4 +5,7 @@ org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 kotlin.code.style=official
 
 #Android
-android.useAndroidX=true
+android.useAndroidX=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=true
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 11 15:11:38 EEST 2021
+#Fri Jul 22 21:14:22 EEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME