Merge #138
138: Tweak month header design r=msfjarvis a=msfjarvis bors r+ Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
|
@ -1,2 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest package="dev.msfjarvis.lobsters.model" />
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 8 KiB After Width: | Height: | Size: 4.8 KiB |
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 4.8 KiB |
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 4.9 KiB |
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 5.3 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 27 KiB |
|
@ -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),
|
||||
)
|
||||
}
|
||||
|
|
|
@ -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"
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest package="dev.msfjarvis.lobsters.database">
|
||||
|
||||
</manifest>
|