Skip to content

Fixed themes for legibility and to actually use the correct colors fo… #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
osunick wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed themes for legibility and to actually use the correct colors fo… #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
13 changes: 6 additions & 7 deletions app/src/main/java/com/osunick/voicerecorder/ui/compose/VoiceLogsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -428,7 +427,7 @@ fun EditVoiceLog(
horizontalAlignment = Alignment.Start) {
Text(
text = formatDateTime(message.dateTime),
color = onSurfaceVariantLight,
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = VRTypography.labelMedium
)
OutlinedTextField(
Expand Down Expand Up @@ -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
)
}

Expand All @@ -535,7 +534,7 @@ fun VoiceLogList(
},
text = message.text,
color = onPrimaryContainerLight,
style = VRTypography.labelSmall
style = VRTypography.labelMedium
)
}

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/osunick/voicerecorder/ui/theme/Color.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
12 changes: 11 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[versions]
adaptive = "1.1.0"
agp = "8.13.2"
agp = "9.1.1"
hiltCompiler = "2.57"
kotlin = "2.1.0"

@nmullaney nmullaney May 15, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are pretty big lib changes, why did you add them in with a color change?

Normally, I'd ask for more testing, but i believe you've already pushed to production, so 🤷‍♀️

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"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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