Skip to content

Commit

Permalink
Implement text theme and styles with typography
Browse files Browse the repository at this point in the history
  • Loading branch information
yasinkacmaz committed Oct 6, 2020
1 parent cd33fa4 commit 4ed2f45
Show file tree
Hide file tree
Showing 9 changed files with 301 additions and 195 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@ import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material.BottomNavigation
import androidx.compose.material.BottomNavigationItem
import androidx.compose.material.Scaffold
import androidx.compose.material.Switch
import androidx.compose.material.TopAppBar
import androidx.compose.material.*
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Movie
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -56,7 +52,7 @@ fun TopAppBar(initialTheme: Boolean, onThemeChanged: (Boolean) -> Unit) {

@Composable
private fun ChangeTheme(initialTheme: Boolean, onThemeChanged: (Boolean) -> Unit) {
Text(text = stringResource(id = R.string.change_theme))
Text(text = stringResource(id = R.string.change_theme), color = MaterialTheme.colors.onPrimary)
Switch(checked = initialTheme, onCheckedChange = onThemeChanged)
}

Expand All @@ -66,7 +62,14 @@ fun BottomNavigation(genres: List<Genre>, selectedGenre: MutableState<Genre>) {
genres.forEach { genre ->
val selected = genre == selectedGenre.value
BottomNavigationItem(
label = { Text(genre.name, maxLines = 1, overflow = TextOverflow.Ellipsis) },
label = {
Text(
genre.name,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
color = MaterialTheme.colors.onPrimary
)
},
icon = { Icon(Icons.Default.Movie) },
selected = selected,
onClick = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ fun MovieDetailContent(movieId: Int) {
private fun MovieDetail(movieDetail: MovieDetail) {
val navigator = NavigatorAmbient.current
BackIcon { navigator.goBack() }
ScrollableColumn(modifier = Modifier.fillMaxSize().background(MaterialTheme.colors.surface)) {
ScrollableColumn(modifier = Modifier.fillMaxSize().background(MaterialTheme.colors.background)) {
Backdrop(movieDetail.backdropUrl)
PosterAndInformation(movieDetail, Modifier.offset(y = (-80).dp))
}
Expand Down Expand Up @@ -126,7 +126,7 @@ private fun PosterAndInformation(movieDetail: MovieDetail, modifier: Modifier) =

Text(
text = movieDetail.title.toUpperCase(Locale.getDefault()),
style = TextStyle(
style = MaterialTheme.typography.h2.copy(
fontSize = 22.sp,
letterSpacing = 4.sp,
fontWeight = FontWeight.Medium,
Expand All @@ -138,10 +138,10 @@ private fun PosterAndInformation(movieDetail: MovieDetail, modifier: Modifier) =
end.linkTo(endGuideline)
}
)

Text(
text = "(${movieDetail.originalTitle})",
style = TextStyle(
fontSize = 12.sp,
style = MaterialTheme.typography.subtitle2.copy(
fontStyle = FontStyle.Italic,
letterSpacing = 2.sp
),
Expand All @@ -154,7 +154,7 @@ private fun PosterAndInformation(movieDetail: MovieDetail, modifier: Modifier) =

Text(
text = movieDetail.genres.take(4).map(Genre::name).joinToString(),
style = TextStyle(fontSize = 14.sp, letterSpacing = 2.sp),
style = MaterialTheme.typography.subtitle1.copy(letterSpacing = 2.sp),
modifier = Modifier.constrainAs(genres) {
top.linkTo(originalTitle.bottom, 12.dp)
start.linkTo(startGuideline)
Expand All @@ -176,8 +176,7 @@ private fun PosterAndInformation(movieDetail: MovieDetail, modifier: Modifier) =

Text(
text = movieDetail.overview,
style = TextStyle(
fontSize = 16.sp,
style = MaterialTheme.typography.body2.copy(
letterSpacing = 2.sp,
lineHeight = 30.sp,
fontFamily = FontFamily.SansSerif,
Expand Down Expand Up @@ -232,13 +231,12 @@ private fun MovieField(name: String, value: String) {
Column {
Text(
text = name,
style = TextStyle(fontSize = 13.sp),
style = MaterialTheme.typography.subtitle2.copy(fontSize = 13.sp, letterSpacing = 1.sp),
modifier = Modifier.align(Alignment.CenterHorizontally)
)

Text(
text = value,
style = TextStyle(fontSize = 14.sp, fontWeight = FontWeight.SemiBold),
style = MaterialTheme.typography.subtitle1.copy(fontWeight = FontWeight.SemiBold),
modifier = Modifier.align(Alignment.CenterHorizontally).padding(top = 4.dp)
)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
package com.yasinkacmaz.jetflix.ui.main.movies

import androidx.compose.foundation.Icon
import androidx.compose.foundation.Text
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Card
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.DateRange
import androidx.compose.material.icons.filled.Movie
import androidx.compose.material.icons.filled.ThumbUp
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.VectorAsset
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.ui.tooling.preview.Preview
import com.yasinkacmaz.jetflix.ui.theme.JetflixTheme
import dev.chrisbanes.accompanist.coil.CoilImage

@Composable
fun MovieContent(movie: Movie, modifier: Modifier = Modifier, onMovieClicked: (Int) -> Unit = {}) {
Box(modifier = modifier) {
MovieRate(movie.voteAverage, modifier = Modifier.align(Alignment.TopCenter))
Card(
modifier = Modifier.fillMaxSize().offset(y = 8.dp).clickable(onClick = { onMovieClicked(movie.id) }),
shape = RoundedCornerShape(size = 8.dp),
elevation = 8.dp
) {
Box {
MoviePoster(movie.posterPath)
MovieInfo(movie, modifier = Modifier.align(Alignment.BottomCenter).fillMaxWidth())
}
}
}
}

@Composable
private fun MoviePoster(posterPath: String) {
CoilImage(
data = posterPath,
contentScale = ContentScale.None,
modifier = Modifier.fillMaxSize(),
loading = {
Icon(
asset = Icons.Default.Movie,
tint = Color.DarkGray,
modifier = Modifier.background(color = Color.LightGray).fillMaxSize()
)
}
)
}

@Composable
private fun MovieRate(rate: Double, modifier: Modifier) {
Surface(
shape = RoundedCornerShape(10.dp),
color = Color(255, 177, 10),
elevation = 12.dp,
modifier = modifier
) {
Text(
text = rate.toString(),
style = MaterialTheme.typography.body2.copy(color = Color.White),
modifier = Modifier.padding(horizontal = 8.dp)
)
}
}

@Composable
private fun MovieInfo(movie: Movie, modifier: Modifier) {
Column(modifier = modifier.background(Color(0x97000000)).padding(horizontal = 8.dp, vertical = 4.dp)) {
MovieName(name = movie.name)
Spacer(modifier = Modifier.height(4.dp))
Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
MovieFeature(Icons.Default.DateRange, movie.releaseDate)
MovieFeature(Icons.Default.ThumbUp, movie.voteCount.toString())
}
}
}

@Composable
private fun MovieName(name: String) {
Text(
text = name,
style = MaterialTheme.typography.subtitle1.copy(
color = Color.White,
letterSpacing = 2.sp,
fontFamily = FontFamily.Serif,
fontWeight = FontWeight.W500,
),
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
}

@Composable
private fun MovieFeature(icon: VectorAsset, field: String) {
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(asset = icon, tint = Color.White, modifier = Modifier.size(14.dp))
Text(
text = field,
style = MaterialTheme.typography.subtitle2.copy(
color = Color.White,
letterSpacing = 2.sp,
fontFamily = FontFamily.SansSerif,
fontWeight = FontWeight.W400
),
overflow = TextOverflow.Ellipsis,
maxLines = 1,
modifier = Modifier.padding(horizontal = 4.dp)
)
}
}

@Composable
@Preview
private fun MoviePreview() {
MovieContent(fakeMovie)
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ import androidx.ui.tooling.preview.Preview
@Preview(name = "Wide", widthDp = 400, group = "Size")
@Composable
fun MovieMultiPreview() {
MovieItem(fakeMovie)
MovieContent(fakeMovie)
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import androidx.ui.tooling.preview.PreviewParameter
import androidx.ui.tooling.preview.PreviewParameterProvider
import androidx.ui.tooling.preview.datasource.CollectionPreviewParameterProvider

val fakeMovie = Movie(1337, "01.03.1337", "Movie Name", "", "", "", 9.24, 1337)
val fakeMovie = Movie(1337, "Movie Name", "", "", "01.03.1337", "", 9.24, 1337)

class MovieProvider : PreviewParameterProvider<Movie> {
override val values: Sequence<Movie>
Expand All @@ -20,7 +20,7 @@ class MovieProvider : PreviewParameterProvider<Movie> {
@Preview(group = "Series")
fun Series(@PreviewParameter(MovieProvider::class) movie: Movie) {
MaterialTheme {
MovieItem(movie)
MovieContent(movie)
}
}

Expand All @@ -34,6 +34,6 @@ class MovieCollectionProvider : CollectionPreviewParameterProvider<Movie>(
@Preview(group = "Films")
fun Films(@PreviewParameter(MovieCollectionProvider::class) movie: Movie) {
MaterialTheme {
MovieItem(movie)
MovieContent(movie)
}
}
Loading

0 comments on commit 4ed2f45

Please sign in to comment.