From 08793014498afb59def0808a152f1183bcdfd0e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2024 14:26:41 +0100 Subject: [PATCH] Bump androidx.core:core-ktx from 1.13.1 to 1.15.0 (#729) * Bump androidx.core:core-ktx from 1.13.1 to 1.15.0 Bumps androidx.core:core-ktx from 1.13.1 to 1.15.0. --- updated-dependencies: - dependency-name: androidx.core:core-ktx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update to SDK API 35 --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Charlotte Van Petegem --- app/build.gradle | 6 +++--- app/src/main/AndroidManifest.xml | 1 + app/src/main/java/me/vanpetegem/accentor/Accentor.kt | 4 ++-- .../java/me/vanpetegem/accentor/ui/main/MainActivity.kt | 2 ++ .../java/me/vanpetegem/accentor/ui/player/PlayerOverlay.kt | 5 +++-- .../accentor/ui/preferences/PreferencesActivity.kt | 2 ++ flake.nix | 6 +++--- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 55a15298..042a33f1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,12 +9,12 @@ plugins { android { namespace 'me.vanpetegem.accentor' - compileSdkVersion 34 + compileSdkVersion 35 buildToolsVersion "34.0.0" defaultConfig { applicationId "me.vanpetegem.accentor" minSdkVersion 26 - targetSdkVersion 33 + targetSdkVersion 35 versionCode 41 versionName "0.15.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -81,7 +81,7 @@ dependencies { // AndroidX core implementation 'androidx.appcompat:appcompat:1.7.0' - implementation 'androidx.core:core-ktx:1.13.1' + implementation 'androidx.core:core-ktx:1.15.0' // AndroidX navigation implementation "androidx.navigation:navigation-compose:2.8.3" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 51a383ac..7489fbdb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ + diff --git a/app/src/main/java/me/vanpetegem/accentor/Accentor.kt b/app/src/main/java/me/vanpetegem/accentor/Accentor.kt index 50fe550f..7909e488 100644 --- a/app/src/main/java/me/vanpetegem/accentor/Accentor.kt +++ b/app/src/main/java/me/vanpetegem/accentor/Accentor.kt @@ -26,9 +26,9 @@ class Accentor : Application(), ImageLoaderFactory { applicationContext.packageManager.getPackageInfo( packageName, PackageManager.PackageInfoFlags.of(0), - ).versionName + ).versionName!! } else { - applicationContext.packageManager.getPackageInfo(packageName, 0).versionName + applicationContext.packageManager.getPackageInfo(packageName, 0).versionName!! } userAgent = "Accentor/$version" FuelManager.instance.baseHeaders = mapOf("User-Agent" to userAgent) diff --git a/app/src/main/java/me/vanpetegem/accentor/ui/main/MainActivity.kt b/app/src/main/java/me/vanpetegem/accentor/ui/main/MainActivity.kt index cc7c1327..e19522f7 100644 --- a/app/src/main/java/me/vanpetegem/accentor/ui/main/MainActivity.kt +++ b/app/src/main/java/me/vanpetegem/accentor/ui/main/MainActivity.kt @@ -7,6 +7,7 @@ import android.widget.Toast import androidx.activity.ComponentActivity import androidx.activity.compose.BackHandler import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxSize @@ -91,6 +92,7 @@ import me.vanpetegem.accentor.ui.preferences.PreferencesActivity class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + enableEdgeToEdge() setContent { AccentorTheme { Content() diff --git a/app/src/main/java/me/vanpetegem/accentor/ui/player/PlayerOverlay.kt b/app/src/main/java/me/vanpetegem/accentor/ui/player/PlayerOverlay.kt index 7f4d57ef..699b1894 100644 --- a/app/src/main/java/me/vanpetegem/accentor/ui/player/PlayerOverlay.kt +++ b/app/src/main/java/me/vanpetegem/accentor/ui/player/PlayerOverlay.kt @@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -79,7 +80,7 @@ fun PlayerOverlay( Box( modifier = - Modifier.onSizeChanged { size -> + Modifier.safeDrawingPadding().onSizeChanged { size -> totalHeight = size.height anchoredDraggableState.updateAnchors( DraggableAnchors { @@ -89,7 +90,7 @@ fun PlayerOverlay( ) }, ) { - Box(modifier = Modifier.fillMaxSize().padding(bottom = if (showPlayer) 56.dp else 0.dp)) { + Box(modifier = Modifier.fillMaxSize().padding(bottom = if (showPlayer) 64.dp else 0.dp)) { content() } if (showPlayer) { diff --git a/app/src/main/java/me/vanpetegem/accentor/ui/preferences/PreferencesActivity.kt b/app/src/main/java/me/vanpetegem/accentor/ui/preferences/PreferencesActivity.kt index 444208cb..2d687671 100644 --- a/app/src/main/java/me/vanpetegem/accentor/ui/preferences/PreferencesActivity.kt +++ b/app/src/main/java/me/vanpetegem/accentor/ui/preferences/PreferencesActivity.kt @@ -5,6 +5,7 @@ import android.os.Bundle import android.text.format.DateUtils import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -48,6 +49,7 @@ import me.vanpetegem.accentor.version class PreferencesActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + enableEdgeToEdge() setContent { AccentorTheme { Content() diff --git a/flake.nix b/flake.nix index 7f72b71c..ad51979e 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ buildToolsVersion = "34.0.0"; composed = pkgs.androidenv.composeAndroidPackages { buildToolsVersions = [ buildToolsVersion ]; - platformVersions = [ "33" "34" ]; + platformVersions = [ "35" ]; }; fhsEnv = pkgs.buildFHSUserEnv { name = "android-sdk-env"; @@ -49,7 +49,7 @@ category = "tools"; help = "Build a signed APK"; command = '' - rm -f "$APK_DIR/"* + rm -rf "$APK_DIR/"* gradle assembleRelease "$BUILD_TOOLS_PATH/zipalign" -v -p 4 "$APK_DIR/app-release-unsigned.apk" "$APK_DIR/app-release-unsigned-aligned.apk" @@ -62,7 +62,7 @@ category = "tools"; help = "Install a debug signed release APK"; command = '' - rm -f "$APK_DIR/"* + rm -rf "$APK_DIR/"* gradle assembleRelease "$BUILD_TOOLS_PATH/zipalign" -v -p 4 "$APK_DIR/app-release-unsigned.apk" "$APK_DIR/app-release-unsigned-aligned.apk" echo android | "$BUILD_TOOLS_PATH/apksigner" sign --ks "$HOME/.android/debug.keystore" --out "$APK_DIR/app-release.apk" "$APK_DIR/app-release-unsigned-aligned.apk"