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

Merge #141

Browse source 
141: Improve LobstersItem layout logic and make it easier to click save button r=msfjarvis a=msfjarvis

bors r+


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

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: 27 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Before After
Before After

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

@ -7,20 +7,24 @@ import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.absoluteOffset
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredSize
import androidx.compose.foundation.layout.requiredWidth import androidx.compose.foundation.layout.requiredWidth
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.sizeIn
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.IconToggleButton import androidx.compose.material.IconToggleButton
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface import androidx.compose.material.Surface
import androidx.compose.material.Text import androidx.compose.material.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
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.platform.LocalConfiguration
import androidx.compose.ui.res.stringResource 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
@ -64,9 +68,10 @@ fun LobstersItem(
Row( Row(
modifier = Modifier.padding(start = 12.dp, end = 12.dp), modifier = Modifier.padding(start = 12.dp, end = 12.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween,
) { ) {
Column( Column(
modifier = Modifier.width(LocalConfiguration.current.screenWidthDp.dp.times(0.9f)) modifier = Modifier.fillMaxWidth(),
) { ) {
Text( Text(
text = post.title, text = post.title,
@ -105,21 +110,16 @@ fun LobstersItem(
IconToggleButton( IconToggleButton(
checked = isSaved, checked = isSaved,
onCheckedChange = { onSaveButtonClick.invoke() }, onCheckedChange = { onSaveButtonClick.invoke() },
modifier = Modifier
.requiredSize(24.dp)
.absoluteOffset(x = (-24).dp),
) { ) {
Crossfade(targetState = isSaved) { Crossfade(targetState = isSaved) { saved ->
if (it) {
IconResource( IconResource(
resourceId = R.drawable.ic_favorite_24px, resourceId = if (saved) R.drawable.ic_favorite_24px else R.drawable.ic_favorite_border_24px,
tint = Color(0xFFD97373), tint = MaterialTheme.colors.secondary,
contentDescription = stringResource(R.string.remove_from_saved_posts), contentDescription = stringResource(if (saved) R.string.remove_from_saved_posts else R.string.add_to_saved_posts),
) )
} else {
IconResource(
resourceId = R.drawable.ic_favorite_border_24px,
tint = Color(0xFFD97373),
contentDescription = stringResource(R.string.add_to_saved_posts),
)
}
} }
} }
} }