diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 32dff6b..0bf7b1b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -9,12 +9,12 @@ plugins { android { namespace = "be.chvp.nanoledger" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "be.chvp.nanoledger" minSdk = 21 - targetSdk = 34 + targetSdk = 35 versionCode = 60400 versionName = "0.6.3" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6ec5d3d..30d2e3f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,7 @@ diff --git a/app/src/main/java/be/chvp/nanoledger/ui/add/AddActivity.kt b/app/src/main/java/be/chvp/nanoledger/ui/add/AddActivity.kt index 98d5f5f..3ba1841 100644 --- a/app/src/main/java/be/chvp/nanoledger/ui/add/AddActivity.kt +++ b/app/src/main/java/be/chvp/nanoledger/ui/add/AddActivity.kt @@ -7,6 +7,7 @@ import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.BackHandler import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge import androidx.activity.viewModels import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack @@ -46,6 +47,7 @@ class AddActivity() : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + enableEdgeToEdge() if (getIntent().hasExtra(TRANSACTION_INDEX_KEY)) { val transactionIndex = getIntent().getIntExtra(TRANSACTION_INDEX_KEY, 0) diff --git a/app/src/main/java/be/chvp/nanoledger/ui/edit/EditActivity.kt b/app/src/main/java/be/chvp/nanoledger/ui/edit/EditActivity.kt index ae20b15..d13bf8a 100644 --- a/app/src/main/java/be/chvp/nanoledger/ui/edit/EditActivity.kt +++ b/app/src/main/java/be/chvp/nanoledger/ui/edit/EditActivity.kt @@ -7,6 +7,7 @@ import android.util.Log import androidx.activity.ComponentActivity import androidx.activity.compose.BackHandler import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge import androidx.activity.viewModels import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack @@ -46,6 +47,7 @@ class EditActivity() : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + enableEdgeToEdge() if (!getIntent().hasExtra(TRANSACTION_INDEX_KEY)) { Log.e("be.chvp.nanoledger", "Edit started without transaction index") diff --git a/app/src/main/java/be/chvp/nanoledger/ui/main/MainActivity.kt b/app/src/main/java/be/chvp/nanoledger/ui/main/MainActivity.kt index 9d75bb9..d01f7b3 100644 --- a/app/src/main/java/be/chvp/nanoledger/ui/main/MainActivity.kt +++ b/app/src/main/java/be/chvp/nanoledger/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.activity.viewModels import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -70,6 +71,7 @@ class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + enableEdgeToEdge() setContent { val context = LocalContext.current val searching by mainViewModel.searching.observeAsState() diff --git a/app/src/main/java/be/chvp/nanoledger/ui/preferences/PreferencesActivity.kt b/app/src/main/java/be/chvp/nanoledger/ui/preferences/PreferencesActivity.kt index 1f451cc..3c13b01 100644 --- a/app/src/main/java/be/chvp/nanoledger/ui/preferences/PreferencesActivity.kt +++ b/app/src/main/java/be/chvp/nanoledger/ui/preferences/PreferencesActivity.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge import androidx.activity.result.contract.ActivityResultContracts.OpenDocument import androidx.activity.viewModels import androidx.compose.foundation.clickable @@ -53,6 +54,7 @@ class PreferencesActivity() : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + enableEdgeToEdge() val openFile = registerForActivityResult(OpenDocument()) { uri: Uri? -> if (uri != null) { diff --git a/app/src/main/java/be/chvp/nanoledger/ui/theme/Theme.kt b/app/src/main/java/be/chvp/nanoledger/ui/theme/Theme.kt index 3d4d14e..c08b101 100644 --- a/app/src/main/java/be/chvp/nanoledger/ui/theme/Theme.kt +++ b/app/src/main/java/be/chvp/nanoledger/ui/theme/Theme.kt @@ -10,7 +10,6 @@ import androidx.compose.material3.dynamicLightColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.runtime.SideEffect -import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalView import androidx.core.view.WindowCompat @@ -48,7 +47,6 @@ fun NanoLedgerTheme( val view = LocalView.current SideEffect { val window = (view.context as Activity).window - window.statusBarColor = colorScheme.primary.toArgb() WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme } diff --git a/flake.nix b/flake.nix index 65df458..0d1a234 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"; diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 41c6f99..bfe1648 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ agp = "8.7.2" androidx-test-ext-junit = "1.2.1" appcompat = "1.7.0" compose-bom = "2024.10.01" -core-ktx = "1.13.1" +core-ktx = "1.15.0" espresso-core = "3.6.1" hilt = "2.52" junit = "4.13.2"