diff --git a/api/src/main/AndroidManifest.xml b/api/src/main/AndroidManifest.xml deleted file mode 100644 index 48e8717e..00000000 --- a/api/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_doesNotShowRefreshIconWhenOnSavedPostsScreen_DarkTheme.png b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_doesNotShowRefreshIconWhenOnSavedPostsScreen_DarkTheme.png index db9e4bad..f466a343 100644 Binary files a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_doesNotShowRefreshIconWhenOnSavedPostsScreen_DarkTheme.png and b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_doesNotShowRefreshIconWhenOnSavedPostsScreen_DarkTheme.png differ diff --git a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_doesNotShowRefreshIconWhenOnSavedPostsScreen_LightTheme.png b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_doesNotShowRefreshIconWhenOnSavedPostsScreen_LightTheme.png index b19f1d4c..88f90348 100644 Binary files a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_doesNotShowRefreshIconWhenOnSavedPostsScreen_LightTheme.png and b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_doesNotShowRefreshIconWhenOnSavedPostsScreen_LightTheme.png differ diff --git a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_showsRefreshIconWhenOnHottestPostsScreen_DarkTheme.png b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_showsRefreshIconWhenOnHottestPostsScreen_DarkTheme.png index d5ad3fa9..c7429fba 100644 Binary files a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_showsRefreshIconWhenOnHottestPostsScreen_DarkTheme.png and b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_showsRefreshIconWhenOnHottestPostsScreen_DarkTheme.png differ diff --git a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_showsRefreshIconWhenOnHottestPostsScreen_LightTheme.png b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_showsRefreshIconWhenOnHottestPostsScreen_LightTheme.png index 59102fc1..eb62d879 100644 Binary files a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_showsRefreshIconWhenOnHottestPostsScreen_LightTheme.png and b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_showsRefreshIconWhenOnHottestPostsScreen_LightTheme.png differ diff --git a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.navigation.LobstersBottomNavTest_bottomNavIsRenderedCorrectlyOnScreen.png b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.navigation.LobstersBottomNavTest_bottomNavIsRenderedCorrectlyOnScreen.png index a40d7ce0..3f8e4dd3 100644 Binary files a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.navigation.LobstersBottomNavTest_bottomNavIsRenderedCorrectlyOnScreen.png and b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.navigation.LobstersBottomNavTest_bottomNavIsRenderedCorrectlyOnScreen.png differ diff --git a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.navigation.LobstersBottomNavTest_bottomNavUpdatesCorrectly.png b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.navigation.LobstersBottomNavTest_bottomNavUpdatesCorrectly.png index 64e78d3a..d8bddfdd 100644 Binary files a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.navigation.LobstersBottomNavTest_bottomNavUpdatesCorrectly.png and b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.navigation.LobstersBottomNavTest_bottomNavUpdatesCorrectly.png differ diff --git a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.posts.HeaderTest_headerDoesNotHaveATransparentBackground.png b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.posts.HeaderTest_headerDoesNotHaveATransparentBackground.png index 24a81e5a..34ae464f 100644 Binary files a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.posts.HeaderTest_headerDoesNotHaveATransparentBackground.png and b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.posts.HeaderTest_headerDoesNotHaveATransparentBackground.png differ diff --git a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.posts.LobstersItemTest_postsAreRenderedCorrectlyOnScreen.png b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.posts.LobstersItemTest_postsAreRenderedCorrectlyOnScreen.png index bc13682e..5735ba1d 100644 Binary files a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.posts.LobstersItemTest_postsAreRenderedCorrectlyOnScreen.png and b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.posts.LobstersItemTest_postsAreRenderedCorrectlyOnScreen.png differ diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/Header.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/Header.kt index eed90631..43c17d07 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/Header.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/Header.kt @@ -9,10 +9,10 @@ import androidx.compose.material.MaterialTheme import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import dev.msfjarvis.lobsters.ui.theme.LobstersTheme -import dev.msfjarvis.lobsters.ui.theme.titleColor import java.time.Month import java.util.Locale import java.time.format.TextStyle as JTextStyle @@ -22,12 +22,16 @@ fun MonthHeader(month: Month) { Box( Modifier .fillMaxWidth() - .background(MaterialTheme.colors.background) + .background(MaterialTheme.colors.secondary) .wrapContentHeight() + .padding(4.dp) ) { Text( text = month.getDisplayName(JTextStyle.FULL, Locale.getDefault()), - style = MaterialTheme.typography.h4.copy(color = titleColor), + style = MaterialTheme.typography.h5.copy( + color = MaterialTheme.colors.onSecondary, + textAlign = TextAlign.Center, + ), modifier = Modifier.padding(horizontal = 12.dp), ) } diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index f747202c..0109496b 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -11,7 +11,7 @@ object Plugins { const val hilt = "com.google.dagger:hilt-android-gradle-plugin:${DAGGER_HILT_VERSION}" const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30" const val jsemver = "com.github.zafarkhaja:java-semver:0.9.0" - const val shot = "com.karumi:shot:5.8.0" + const val shot = "com.karumi:shot:5.10.0" const val sqldelight = "com.squareup.sqldelight:gradle-plugin:1.4.4" } diff --git a/database/src/main/AndroidManifest.xml b/database/src/main/AndroidManifest.xml deleted file mode 100644 index 1acef971..00000000 --- a/database/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - -