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

Merge #99

Browse source 
99: Tweak alignment and fixup build nits r=msfjarvis a=msfjarvis

bors r+

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
bors[bot] 2021-01-28 08:17:44 +00:00 • committed by GitHub
commit 2dfcc4de8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle.kts
View file

@ -21,7 +21,6 @@ android {
buildFeatures.compose = true buildFeatures.compose = true
composeOptions { composeOptions {
kotlinCompilerVersion = "1.4.21"
kotlinCompilerExtensionVersion = Dependencies.COMPOSE_VERSION kotlinCompilerExtensionVersion = Dependencies.COMPOSE_VERSION
} }
} }

11
app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt
View file

@ -16,12 +16,14 @@ import androidx.compose.material.ripple.rememberRipple
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
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 coil.transform.CircleCropTransformation import coil.transform.CircleCropTransformation
import dev.chrisbanes.accompanist.coil.CoilImage import dev.chrisbanes.accompanist.coil.CoilImage
import dev.msfjarvis.lobsters.R import dev.msfjarvis.lobsters.R
import dev.msfjarvis.lobsters.data.api.LobstersApi
import dev.msfjarvis.lobsters.model.LobstersPost import dev.msfjarvis.lobsters.model.LobstersPost
import dev.msfjarvis.lobsters.model.Submitter import dev.msfjarvis.lobsters.model.Submitter
import dev.msfjarvis.lobsters.ui.theme.LobstersTheme import dev.msfjarvis.lobsters.ui.theme.LobstersTheme
@ -94,7 +96,7 @@ fun LobstersItem(
.padding(vertical = 8.dp), .padding(vertical = 8.dp),
) )
CoilImage( CoilImage(
data = "https://lobste.rs/${post.submitterUser.avatarUrl}", data = "${LobstersApi.BASE_URL}/${post.submitterUser.avatarUrl}",
fadeIn = true, fadeIn = true,
requestBuilder = { requestBuilder = {
transformations(CircleCropTransformation()) transformations(CircleCropTransformation())
@ -108,11 +110,12 @@ fun LobstersItem(
}, },
) )
Text( Text(
text = "submitted by ${post.submitterUser.username}", text = stringResource(id = R.string.submitted_by, post.submitterUser.username),
modifier = Modifier modifier = Modifier
.padding(bottom = 4.dp) .padding(4.dp)
.constrainAs(submitter) { .constrainAs(submitter) {
top.linkTo(tags.bottom) top.linkTo(avatar.top)
bottom.linkTo(avatar.bottom)
start.linkTo(avatar.end) start.linkTo(avatar.end)
}, },
) )

1
app/src/main/res/values/strings.xml
View file

@ -4,4 +4,5 @@
<string name="no_saved_posts">You don\'t have any saved posts</string> <string name="no_saved_posts">You don\'t have any saved posts</string>
<string name="hottest_posts">Hottest</string> <string name="hottest_posts">Hottest</string>
<string name="saved_posts">Saved</string> <string name="saved_posts">Saved</string>
<string name="submitted_by">submitted by %1$s</string>
</resources> </resources>

3
gradle.properties
View file

@ -38,8 +38,7 @@ android.enableRTxtResourceShrinking=true
android.enablePartialRIncrementalBuilds=true android.enablePartialRIncrementalBuilds=true
android.experimental.enableNewResourceShrinker=true android.experimental.enableNewResourceShrinker=true
android.experimental.enableNewResourceShrinker.preciseShrinking=true android.experimental.enableNewResourceShrinker.preciseShrinking=true
# Breaks build with AGP 7.0.0-alpha04 android.generateManifestClass=true
# android.generateManifestClass=true
# Default Android build features # Default Android build features
android.defaults.buildfeatures.buildconfig=false android.defaults.buildfeatures.buildconfig=false