-
Notifications
You must be signed in to change notification settings - Fork 181
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #342 from RyuNen344/feature/contributor-screen
"Contributor" screen design #23
- Loading branch information
Showing
5 changed files
with
125 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
...nt-compose/other/src/main/java/io/github/droidkaigi/feeder/contributor/ContributorItem.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package io.github.droidkaigi.feeder.contributor | ||
|
|
||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.fillMaxHeight | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.shape.CircleShape | ||
| import androidx.compose.material.Surface | ||
| import androidx.compose.material.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.layout.ContentScale | ||
| import androidx.compose.ui.text.style.TextAlign | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.compose.ui.unit.sp | ||
| import io.github.droidkaigi.feeder.Contributor | ||
| import io.github.droidkaigi.feeder.core.NetworkImage | ||
| import io.github.droidkaigi.feeder.core.theme.ConferenceAppFeederTheme | ||
| import io.github.droidkaigi.feeder.fakeContributors | ||
|
|
||
| @Composable | ||
| fun ContributorItem(contributor: Contributor, onClickItem: (Contributor) -> Unit) { | ||
| Column( | ||
| modifier = Modifier | ||
| .padding(top = 22.dp) | ||
| .fillMaxHeight() | ||
| .clickable { | ||
| onClickItem(contributor) | ||
| }, | ||
| verticalArrangement = Arrangement.Center, | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| ) { | ||
| Surface( | ||
| modifier = Modifier | ||
| .padding(top = 10.dp) | ||
| .size(60.dp), | ||
| shape = CircleShape | ||
| ) { | ||
| NetworkImage( | ||
| url = contributor.image, | ||
| modifier = Modifier.fillMaxSize(), | ||
| contentScale = ContentScale.Fit, | ||
| contentDescription = "Contributor Icon" | ||
| ) | ||
| } | ||
| Text( | ||
| text = contributor.name, | ||
| fontSize = 14.sp, | ||
| textAlign = TextAlign.Center, | ||
| modifier = Modifier | ||
| .padding(vertical = 10.dp, horizontal = 12.dp) | ||
| .fillMaxWidth() | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| fun PreviewContributorItem() { | ||
| ConferenceAppFeederTheme(false) { | ||
| val contributor = fakeContributors().first() | ||
| ProvideContributorViewModel(viewModel = fakeContributorViewModel()) { | ||
| ContributorItem(contributor = contributor) { | ||
| } | ||
| } | ||
| } | ||
| } |
47 changes: 38 additions & 9 deletions
47
...nt-compose/other/src/main/java/io/github/droidkaigi/feeder/contributor/ContributorList.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,53 @@ | ||
| package io.github.droidkaigi.feeder.contributor | ||
|
|
||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material.Text | ||
| import androidx.compose.foundation.layout.fillMaxHeight | ||
| import androidx.compose.foundation.lazy.GridCells | ||
| import androidx.compose.foundation.lazy.LazyVerticalGrid | ||
| import androidx.compose.foundation.lazy.items | ||
| import androidx.compose.material.MaterialTheme | ||
| import androidx.compose.material.Surface | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import dev.chrisbanes.accompanist.insets.LocalWindowInsets | ||
| import dev.chrisbanes.accompanist.insets.toPaddingValues | ||
| import io.github.droidkaigi.feeder.Contributor | ||
| import io.github.droidkaigi.feeder.core.theme.ConferenceAppFeederTheme | ||
| import io.github.droidkaigi.feeder.core.use | ||
|
|
||
| @Composable | ||
| fun ContributorList() { | ||
| fun ContributorList(onClickContributor: (Contributor) -> Unit) { | ||
|
|
||
| val ( | ||
| state, | ||
| effectFlow, | ||
| dispatch, | ||
| ) = use(contributeViewModel()) | ||
| Column(Modifier.padding(top = 32.dp)) { | ||
| Text("Not implemented yet. Please create this screen!") | ||
| state.contributorContents.forEach { | ||
| Text(it.name) | ||
|
|
||
| Surface( | ||
| color = MaterialTheme.colors.background, | ||
| modifier = Modifier.fillMaxHeight() | ||
| ) { | ||
| LazyVerticalGrid( | ||
| cells = GridCells.Fixed(count = 3), | ||
| contentPadding = LocalWindowInsets.current.systemBars | ||
| .toPaddingValues(top = false, start = false, end = false), | ||
| content = { | ||
| items(state.contributorContents) { contributor -> | ||
| ContributorItem(contributor = contributor, onClickContributor) | ||
| } | ||
| } | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| fun PreviewContributorScreen() { | ||
| ConferenceAppFeederTheme(false) { | ||
| ProvideContributorViewModel(viewModel = fakeContributorViewModel()) { | ||
| ContributorList() { | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters