msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-18 03:17:03 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions

Merge #138

Browse source 
138: Tweak month header design r=msfjarvis a=msfjarvis

bors r+

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
bors[bot] 2021-03-05 19:39:50 +00:00 • committed by GitHub
commit 00c6cbd7a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/src/main/AndroidManifest.xml
View file

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="dev.msfjarvis.lobsters.model" />

BIN
app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_doesNotShowRefreshIconWhenOnSavedPostsScreen_DarkTheme.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Before After
Before After

BIN
app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_doesNotShowRefreshIconWhenOnSavedPostsScreen_LightTheme.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Before After
Before After

BIN
app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_showsRefreshIconWhenOnHottestPostsScreen_DarkTheme.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Before After
Before After

BIN
app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_showsRefreshIconWhenOnHottestPostsScreen_LightTheme.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Before After
Before After

BIN
app/screenshots/debug/dev.msfjarvis.lobsters.ui.navigation.LobstersBottomNavTest_bottomNavIsRenderedCorrectlyOnScreen.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Before After
Before After

BIN
app/screenshots/debug/dev.msfjarvis.lobsters.ui.navigation.LobstersBottomNavTest_bottomNavUpdatesCorrectly.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Before After
Before After

BIN
app/screenshots/debug/dev.msfjarvis.lobsters.ui.posts.HeaderTest_headerDoesNotHaveATransparentBackground.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

BIN
app/screenshots/debug/dev.msfjarvis.lobsters.ui.posts.LobstersItemTest_postsAreRenderedCorrectlyOnScreen.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 27 KiB

Before After
Before After

10
app/src/main/java/dev/msfjarvis/lobsters/ui/posts/Header.kt
View file

@ -9,10 +9,10 @@ import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text import androidx.compose.material.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import dev.msfjarvis.lobsters.ui.theme.LobstersTheme import dev.msfjarvis.lobsters.ui.theme.LobstersTheme
import dev.msfjarvis.lobsters.ui.theme.titleColor
import java.time.Month import java.time.Month
import java.util.Locale import java.util.Locale
import java.time.format.TextStyle as JTextStyle import java.time.format.TextStyle as JTextStyle
@ -22,12 +22,16 @@ fun MonthHeader(month: Month) {
Box( Box(
Modifier Modifier
.fillMaxWidth() .fillMaxWidth()
.background(MaterialTheme.colors.background) .background(MaterialTheme.colors.secondary)
.wrapContentHeight() .wrapContentHeight()
.padding(4.dp)
) { ) {
Text( Text(
text = month.getDisplayName(JTextStyle.FULL, Locale.getDefault()), 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), modifier = Modifier.padding(horizontal = 12.dp),
) )
} }

2
buildSrc/src/main/java/Dependencies.kt
View file

@ -11,7 +11,7 @@ object Plugins {
const val hilt = "com.google.dagger:hilt-android-gradle-plugin:${DAGGER_HILT_VERSION}" 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 kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30"
const val jsemver = "com.github.zafarkhaja:java-semver:0.9.0" 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" const val sqldelight = "com.squareup.sqldelight:gradle-plugin:1.4.4"
} }

4
database/src/main/AndroidManifest.xml
View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="dev.msfjarvis.lobsters.database">
</manifest>