diff --git a/.idea/misc.xml b/.idea/misc.xml index 74dd639..b2c751a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 606720a..58f13e4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -14,8 +14,8 @@ android { applicationId = "com.googol.android.apps.photos" minSdk = 24 targetSdk = 35 - versionCode = 26 - versionName = "1.0.0-alpha03" + versionCode = 27 + versionName = "1.0.0-alpha04" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { diff --git a/app/src/main/java/com/zs/gallery/Gallery.kt b/app/src/main/java/com/zs/gallery/Gallery.kt index 4922fa3..307e31b 100644 --- a/app/src/main/java/com/zs/gallery/Gallery.kt +++ b/app/src/main/java/com/zs/gallery/Gallery.kt @@ -19,6 +19,7 @@ package com.zs.gallery import android.os.Build +import androidx.compose.foundation.background import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Spacer @@ -65,8 +66,12 @@ import androidx.navigation.compose.NavHost import androidx.navigation.compose.currentBackStackEntryAsState import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.rememberMultiplePermissionsState +import com.primex.core.ImageBrush +import com.primex.core.blur.legacyBackgroundBlur +import com.primex.core.blur.newBackgroundBlur import com.primex.core.plus import com.primex.core.textResource +import com.primex.core.visualEffect import com.primex.material2.Label import com.primex.material2.OutlinedButton import com.zs.foundation.AppTheme @@ -403,8 +408,8 @@ private fun NavigationBar( else -> BottomAppBar( windowInsets = WindowInsets.navigationBars, - backgroundColor = colors.background(1.dp), - contentColor = colors.onBackground, + backgroundColor = Color.Transparent, + contentColor = AppTheme.colors.onBackground, elevation = 0.dp, contentPadding = PaddingValues( horizontal = AppTheme.padding.normal, @@ -412,7 +417,16 @@ private fun NavigationBar( ) + PaddingValues(top = 16.dp), modifier = modifier .heightIn(BOTTOM_NAV_MIN_HEIGHT) - .clip(BottomNavShape), + .clip(BottomNavShape) + .background(AppTheme.colors.background.copy(if (AppTheme.colors.isLight) 0.73f else 0.8f)) + .let { + when(Build.VERSION.SDK_INT){ + Build.VERSION_CODES.S -> it.newBackgroundBlur(8.dp, downsample = 0.3f) + else -> it.legacyBackgroundBlur(25f, 0.3f) + } + } + .visualEffect(ImageBrush.NoiseBrush, if (AppTheme.colors.isLight) 0.5f else 0.3f) +, content = { Spacer(modifier = Modifier.weight(1f)) // Display routes at the contre of available space diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0cf79fd..8a0519c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] -agp = "8.7.1" +agp = "8.7.2" kotlin = "2.0.21" -compose = "1.8.0-alpha03" +compose = "1.8.0-alpha05" media3 = "1.4.1" -toolkit = "2.0.2-rc04" -material_icons = "1.7.3" +toolkit = "2.0.2" +material_icons = "1.7.5" [plugins] android-application = { id = "com.android.application", version.ref = "agp" }