From 9cde5570fbd9341660cc22a7d7f9b71d61fd1110 Mon Sep 17 00:00:00 2001 From: Nick Nguyen Date: Mon, 11 May 2026 09:05:45 -0700 Subject: [PATCH] Fixed themes for legibility and to actually use the correct colors for light and dark themes for dates --- app/build.gradle.kts | 4 ++-- .../voicerecorder/ui/compose/VoiceLogsScreen.kt | 13 ++++++------- .../com/osunick/voicerecorder/ui/theme/Color.kt | 4 ++-- gradle.properties | 12 +++++++++++- gradle/libs.versions.toml | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 25 insertions(+), 16 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 01bcdc9..ff5abf1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,8 +16,8 @@ android { applicationId = "com.osunick.voicerecorder" minSdk = 26 targetSdk = 35 - versionCode = 7 - versionName = "1.4" + versionCode = 8 + versionName = "1.41" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { diff --git a/app/src/main/java/com/osunick/voicerecorder/ui/compose/VoiceLogsScreen.kt b/app/src/main/java/com/osunick/voicerecorder/ui/compose/VoiceLogsScreen.kt index 32ab703..cabada3 100644 --- a/app/src/main/java/com/osunick/voicerecorder/ui/compose/VoiceLogsScreen.kt +++ b/app/src/main/java/com/osunick/voicerecorder/ui/compose/VoiceLogsScreen.kt @@ -76,7 +76,6 @@ import com.osunick.voicerecorder.model.VoiceMessage import com.osunick.voicerecorder.ui.theme.VRTypography import com.osunick.voicerecorder.ui.theme.VoiceRecorderTheme import com.osunick.voicerecorder.ui.theme.onPrimaryContainerLight -import com.osunick.voicerecorder.ui.theme.onSurfaceVariantLight import com.osunick.voicerecorder.ui.theme.primaryContainerLight import com.osunick.voicerecorder.viewmodel.LogEvent import com.osunick.voicerecorder.viewmodel.LogsUiState @@ -428,7 +427,7 @@ fun EditVoiceLog( horizontalAlignment = Alignment.Start) { Text( text = formatDateTime(message.dateTime), - color = onSurfaceVariantLight, + color = MaterialTheme.colorScheme.onSurfaceVariant, style = VRTypography.labelMedium ) OutlinedTextField( @@ -509,16 +508,16 @@ fun VoiceLogList( .padding(horizontal = 8.dp, vertical = 0.dp) , text = formatDate(message.dateTime), - color = onSurfaceVariantLight, - style = VRTypography.labelMedium + color = MaterialTheme.colorScheme.onSurfaceVariant, + style = VRTypography.labelLarge ) Text( modifier = Modifier .padding(horizontal = 8.dp, vertical = 4.dp) , text = formatTime(message.dateTime), - color = onSurfaceVariantLight, - style = VRTypography.labelMedium + color = MaterialTheme.colorScheme.onSurfaceVariant, + style = VRTypography.labelLarge ) } @@ -535,7 +534,7 @@ fun VoiceLogList( }, text = message.text, color = onPrimaryContainerLight, - style = VRTypography.labelSmall + style = VRTypography.labelMedium ) } diff --git a/app/src/main/java/com/osunick/voicerecorder/ui/theme/Color.kt b/app/src/main/java/com/osunick/voicerecorder/ui/theme/Color.kt index 4ce6b2e..abc2cf0 100644 --- a/app/src/main/java/com/osunick/voicerecorder/ui/theme/Color.kt +++ b/app/src/main/java/com/osunick/voicerecorder/ui/theme/Color.kt @@ -23,7 +23,7 @@ val onBackgroundLight = Color(0xFF201B13) val surfaceLight = Color(0xFFFFF8F4) val onSurfaceLight = Color(0xFF201B13) val surfaceVariantLight = Color(0xFFF0E0CF) -val onSurfaceVariantLight = Color(0xFF4F4539) +val onSurfaceVariantLight = Color(0xFF111111) val outlineLight = Color(0xFF817567) val outlineVariantLight = Color(0xFFD3C4B4) val scrimLight = Color(0xFF000000) @@ -131,7 +131,7 @@ val onBackgroundDark = Color(0xFFEDE0D4) val surfaceDark = Color(0xFF18120B) val onSurfaceDark = Color(0xFFEDE0D4) val surfaceVariantDark = Color(0xFF4F4539) -val onSurfaceVariantDark = Color(0xFFD3C4B4) +val onSurfaceVariantDark = Color(0xFFFFFFFF) val outlineDark = Color(0xFF9B8F80) val outlineVariantDark = Color(0xFF4F4539) val scrimDark = Color(0xFF000000) diff --git a/gradle.properties b/gradle.properties index 20e2a01..4540b75 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,14 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true +android.defaults.buildfeatures.resvalues=true +android.sdk.defaultTargetSdkToCompileSdkIfUnset=false +android.enableAppCompileTimeRClass=false +android.usesSdkInManifest.disallowed=false +android.uniquePackageNames=false +android.dependency.useConstraints=true +android.r8.strictFullModeForKeepRules=false +android.r8.optimizedResourceShrinking=false +android.builtInKotlin=false +android.newDsl=false \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 537949d..15c814f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] adaptive = "1.1.0" -agp = "8.13.2" +agp = "9.1.1" hiltCompiler = "2.57" -kotlin = "2.1.0" -ksp = "2.1.0-1.0.29" +kotlin = "2.2.10" +ksp = "2.3.2" coreKtx = "1.16.0" junit = "4.13.2" junitVersion = "1.2.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d3f49b5..e3aedaf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon May 06 08:40:39 PDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists