diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 268a53d..411c6ad 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,16 +5,28 @@ version: 2 updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + day: "saturday" + time: "03:00" + timezone: "America/New_York" - package-ecosystem: "bundler" # See documentation for possible values directory: "/" # Location of package manifests schedule: interval: "weekly" + day: "saturday" + time: "03:00" + timezone: "America/New_York" - package-ecosystem: "gradle" directory: "/" schedule: interval: "weekly" + day: "saturday" + time: "03:00" + timezone: "America/New_York" groups: - gradle-plugin-dependencies: + all-dependencies: patterns: - - "com.android.application" - - "com.android.library" \ No newline at end of file + - "*" \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 4aea891..65988c7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,7 +28,7 @@ android { applicationId "seamuslowry.daytracker" minSdk 33 targetSdk 34 - versionCode 37 + versionCode 38 versionName "0.31.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { @@ -70,8 +70,8 @@ dependencies { implementation 'androidx.compose.material:material-icons-extended' implementation "androidx.compose.material3:material3" implementation 'androidx.core:core-ktx:1.13.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.4' - implementation 'androidx.activity:activity-compose:1.9.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.5' + implementation 'androidx.activity:activity-compose:1.9.2' implementation "com.google.dagger:hilt-android:$hilt_version" implementation "androidx.hilt:hilt-navigation-compose:1.2.0" implementation "androidx.room:room-runtime:$room_version" diff --git a/app/src/main/java/seamuslowry/daytracker/ui/screens/entry/EntryScreen.kt b/app/src/main/java/seamuslowry/daytracker/ui/screens/entry/EntryScreen.kt index 3191a9a..7ff485e 100644 --- a/app/src/main/java/seamuslowry/daytracker/ui/screens/entry/EntryScreen.kt +++ b/app/src/main/java/seamuslowry/daytracker/ui/screens/entry/EntryScreen.kt @@ -187,7 +187,7 @@ fun ItemEntry( .placeholder( visible = itemWithConfiguration == null, highlight = PlaceholderHighlight.fade(), - color = MaterialTheme.colorScheme.surfaceVariant, + color = CardDefaults.cardColors().containerColor, ) .animateContentSize(), ) { @@ -316,7 +316,7 @@ fun AddConfigurationButton( val mainDuration = 500 val extraDuration = 100 val cardColor by animateColorAsState( - targetValue = if (itemConfiguration != null) MaterialTheme.colorScheme.surfaceVariant else MaterialTheme.colorScheme.primary, + targetValue = if (itemConfiguration != null) CardDefaults.cardColors().containerColor else MaterialTheme.colorScheme.primary, animationSpec = tween(durationMillis = mainDuration), label = "cardColor", ) diff --git a/build.gradle b/build.gradle index cdb7d08..c29dc16 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - compose_bom_version = '2024.08.00' + compose_bom_version = '2024.09.00' hilt_version = '2.52' room_version = '2.6.1' } @@ -12,5 +12,5 @@ plugins { id 'org.jetbrains.kotlin.plugin.compose' version '2.0.20' apply false id "com.diffplug.spotless" version "6.25.0" apply false id 'com.google.dagger.hilt.android' version '2.52' apply false - id 'com.google.devtools.ksp' version "2.0.20-1.0.24" apply false + id 'com.google.devtools.ksp' version "2.0.20-1.0.25" apply false } \ No newline at end of file