Skip to content
This repository was archived by the owner on Sep 17, 2025. It is now read-only.

Commit 1dcf181

Browse files
committed
Update 1.6.5
1 parent 7f447d5 commit 1dcf181

3 files changed

Lines changed: 22 additions & 17 deletions

File tree

app/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ android {
1717
applicationId = "com.yangdai.opennote"
1818
minSdk = 29
1919
targetSdk = 35
20-
versionCode = 1640
21-
versionName = "1.6.4"
20+
versionCode = 1650
21+
versionName = "1.6.5"
2222

2323
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2424
vectorDrawables {
@@ -119,7 +119,6 @@ dependencies {
119119
implementation(libs.androidx.room.runtime)
120120
ksp(libs.androidx.room.compiler)
121121
implementation(libs.androidx.room.ktx)
122-
testImplementation(libs.androidx.room.testing)
123122

124123
// Hilt, for dependency injection
125124
implementation(libs.androidx.hilt.navigation)

app/src/main/java/com/yangdai/opennote/presentation/theme/Theme.kt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ import android.os.Build
55
import androidx.compose.animation.core.animateFloatAsState
66
import androidx.compose.animation.core.tween
77
import androidx.compose.foundation.isSystemInDarkTheme
8-
import androidx.compose.material3.MaterialTheme
8+
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
9+
import androidx.compose.material3.MaterialExpressiveTheme
10+
import androidx.compose.material3.darkColorScheme
911
import androidx.compose.material3.dynamicDarkColorScheme
1012
import androidx.compose.material3.dynamicLightColorScheme
13+
import androidx.compose.material3.expressiveLightColorScheme
1114
import androidx.compose.runtime.Composable
1215
import androidx.compose.runtime.LaunchedEffect
1316
import androidx.compose.runtime.SideEffect
@@ -26,6 +29,7 @@ fun darkenColor(color: Color, factor: Float): Color {
2629
return lerp(color, Color.Black, factor)
2730
}
2831

32+
@OptIn(ExperimentalMaterial3ExpressiveApi::class)
2933
@Composable
3034
fun OpenNoteTheme(
3135
darkMode: Boolean = isSystemInDarkTheme(),
@@ -45,7 +49,7 @@ fun OpenNoteTheme(
4549
val context = LocalContext.current
4650
if (darkMode) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
4751
} else {
48-
if (darkMode) DarkPurpleColors else LightPurpleColors
52+
if (darkMode) darkColorScheme() else expressiveLightColorScheme()
4953
}
5054
}
5155

@@ -116,7 +120,10 @@ fun OpenNoteTheme(
116120
)
117121
}
118122

119-
MaterialTheme(
120-
colorScheme = colorScheme, typography = openNoteTypography, content = content
121-
)
123+
MaterialExpressiveTheme(
124+
colorScheme = colorScheme,
125+
typography = openNoteTypography
126+
) {
127+
content()
128+
}
122129
}

gradle/libs.versions.toml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[versions]
22
agp = "8.10.0"
33
colorpickerCompose = "1.1.2"
4-
documentfile = "1.0.1"
4+
documentfile = "1.1.0"
55
glance = "1.1.1"
6-
kotlin = "2.1.20"
7-
ksp = "2.1.20-1.0.32"
6+
kotlin = "2.1.21"
7+
ksp = "2.1.21-2.0.1"
88
kotlinxSerialization = "1.8.1"
99

10-
composeBom = "2025.04.01"
10+
composeBom = "2025.05.00"
1111
activityCompose = "1.10.1"
1212
ktor = "3.1.2"
13-
lifecycleRuntimeCompose = "2.8.7"
14-
navigationCompose = "2.8.9"
13+
lifecycleRuntimeCompose = "2.9.0"
14+
navigationCompose = "2.9.0"
1515

1616
junit = "4.13.2"
1717
junitVersion = "1.2.1"
@@ -20,7 +20,7 @@ espressoCore = "3.6.1"
2020
appcompat = "1.7.0"
2121
hilt = "2.56.1"
2222
hiltNav = "1.2.0"
23-
room = "2.6.1"
23+
room = "2.7.1"
2424
browser = "1.8.0"
2525
commonmark = "0.24.0"
2626
datastorePreferences = "1.1.4"
@@ -65,7 +65,7 @@ androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-toolin
6565
androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
6666
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
6767
androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
68-
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version = "1.4.0-alpha13" }
68+
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version = "1.4.0-alpha14" }
6969
androidx-compose-material3-adaptive = { group = "androidx.compose.material3.adaptive", name = "adaptive" }
7070
androidx-compose-material3-adaptive-layout = { group = "androidx.compose.material3.adaptive", name = "adaptive-layout" }
7171
androidx-compose-material3-adaptive-navigation = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation" }
@@ -79,7 +79,6 @@ androidx-hilt-navigation = { group = "androidx.hilt", name = "hilt-navigation-co
7979
androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
8080
androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
8181
androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
82-
androidx-room-testing = { group = "androidx.room", name = "room-testing", version.ref = "room" }
8382

8483
kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
8584
ktor-client-android = { group = "io.ktor", name = "ktor-client-android", version.ref = "ktor" }

0 commit comments

Comments
 (0)