cleanup

Gurupreet · Gurupreet · commit a3dadf99ccba · 2020-09-26T00:17:59.000+08:00
diff --git a/app/src/main/java/com/guru/composecookbook/ui/moviesappmvi/data/repository/MovieRepositoryImpl.kt b/app/src/main/java/com/guru/composecookbook/ui/moviesappmvi/data/repository/MovieRepositoryImpl.kt
@@ -42,7 +42,7 @@ class MovieRepositoryImpl(
     }
 
     override suspend fun addToMyWatchlist(movie: Movie) {
-         moviesDao.addToWatchList(movie)
+        moviesDao.addToWatchList(movie)
     }
 
     override suspend fun removeFromMyWatchlist(movie: Movie) {
diff --git a/app/src/main/java/com/guru/composecookbook/ui/moviesappmvi/ui/details/MovieDetailActivity.kt b/app/src/main/java/com/guru/composecookbook/ui/moviesappmvi/ui/details/MovieDetailActivity.kt
@@ -16,11 +16,9 @@ import androidx.compose.foundation.lazy.LazyRowFor
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Button
 import androidx.compose.material.IconButton
-import androidx.compose.material.IconToggleButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.LibraryAdd
-import androidx.compose.material.icons.outlined.LibraryAdd
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@@ -73,6 +71,7 @@ class MovieDetailActivity : AppCompatActivity() {
             Intent(context, MovieDetailActivity::class.java).apply {
                 putExtra(MOVIE, movie)
             }
+
         fun newIntent(context: Context, movie: Movie, imageId: Int) =
             Intent(context, MovieDetailActivity::class.java).apply {
                 putExtra(MOVIE, movie)
diff --git a/app/src/main/java/com/guru/composecookbook/ui/moviesappmvi/ui/home/MoviePagerItem.kt b/app/src/main/java/com/guru/composecookbook/ui/moviesappmvi/ui/home/MoviePagerItem.kt
@@ -46,8 +46,8 @@ fun MoviePagerItem(
     val animateElevation = if (isSelected) 12.dp else 2.dp
     val posterFullPath = "https://image.tmdb.org/t/p/w500/${movie.poster_path}"
 
-    val movieGenres = movie.genre_ids?.let {
-            movieGenreIds -> genres.filter { movieGenreIds.contains(it.id) }.take(3)
+    val movieGenres = movie.genre_ids?.let { movieGenreIds ->
+        genres.filter { movieGenreIds.contains(it.id) }.take(3)
     }
 
     Card(
@@ -87,8 +87,10 @@ fun MoviePagerItem(
                         asset = Icons.Default.LibraryAdd,
                         tint = MaterialTheme.colors.primary,
                         modifier = Modifier
-                            .drawLayer(rotationY = animate(
-                                if (clicked.value) 720f else 0f, tween(400))
+                            .drawLayer(
+                                rotationY = animate(
+                                    if (clicked.value) 720f else 0f, tween(400)
+                                )
                             )
                     )
                 }
diff --git a/app/src/main/java/com/guru/composecookbook/ui/moviesappmvi/ui/home/MoviesHomeActivity.kt b/app/src/main/java/com/guru/composecookbook/ui/moviesappmvi/ui/home/MoviesHomeActivity.kt
@@ -16,7 +16,6 @@ import androidx.compose.material.Scaffold
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.LibraryAdd
 import androidx.compose.material.icons.outlined.MovieCreation
-import androidx.compose.material.icons.outlined.Search
 import androidx.compose.material.icons.outlined.Subscriptions
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
@@ -30,7 +29,9 @@ import com.guru.composecookbook.ui.moviesappmvi.data.models.Movie
 import com.guru.composecookbook.ui.moviesappmvi.ui.details.MovieDetailActivity
 
 sealed class MoviesHomeInteractionEvents {
-    data class OpenMovieDetail(val movie: Movie, val imageId: Int = 0) : MoviesHomeInteractionEvents()
+    data class OpenMovieDetail(val movie: Movie, val imageId: Int = 0) :
+        MoviesHomeInteractionEvents()
+
     data class AddToMyWatchlist(val movie: Movie) : MoviesHomeInteractionEvents()
     data class RemoveFromMyWatchlist(val movie: Movie) : MoviesHomeInteractionEvents()
 }
@@ -59,7 +60,7 @@ class MoviesHomeActivity : AppCompatActivity() {
                                 }
                             )
                             MovieNavType.WATCHLIST -> WatchlistScreen(
-                                moviesHomeInteractionEvents =  {
+                                moviesHomeInteractionEvents = {
                                     handleInteractionEvents(it, viewModel)
                                 }
                             )
@@ -78,8 +79,11 @@ class MoviesHomeActivity : AppCompatActivity() {
     ) {
         when (interactionEvents) {
             is MoviesHomeInteractionEvents.OpenMovieDetail -> {
-                startActivity(MovieDetailActivity.newIntent(
-                    this, interactionEvents.movie, interactionEvents.imageId))
+                startActivity(
+                    MovieDetailActivity.newIntent(
+                        this, interactionEvents.movie, interactionEvents.imageId
+                    )
+                )
                 overridePendingTransition(0, 0)
             }
             is MoviesHomeInteractionEvents.AddToMyWatchlist -> {
diff --git a/app/src/main/java/com/guru/composecookbook/ui/moviesappmvi/ui/home/MoviesHomeScreen.kt b/app/src/main/java/com/guru/composecookbook/ui/moviesappmvi/ui/home/MoviesHomeScreen.kt
@@ -82,7 +82,8 @@ fun MoviesPager(
                 { moviesHomeInteractionEvents(MoviesHomeInteractionEvents.AddToMyWatchlist(movie)) }
             ) {
                 moviesHomeInteractionEvents(
-                    MoviesHomeInteractionEvents.OpenMovieDetail(movie, imageId.value))
+                    MoviesHomeInteractionEvents.OpenMovieDetail(movie, imageId.value)
+                )
             }
         }
     } else {
@@ -100,7 +101,6 @@ fun MoviesPager(
     }
 }
 
-
 val imageIds =
     listOf(
         R.drawable.camelia,
diff --git a/app/src/main/java/com/guru/composecookbook/ui/moviesappmvi/ui/home/MoviewsHomeViewModel.kt b/app/src/main/java/com/guru/composecookbook/ui/moviesappmvi/ui/home/MoviewsHomeViewModel.kt
@@ -44,8 +44,8 @@ class MoviesHomeViewModel(
     }
 
     fun addToMyWatchlist(movie: Movie) = viewModelScope.launch(Dispatchers.IO) {
-            movieRepository.addToMyWatchlist(movie)
-        }
+        movieRepository.addToMyWatchlist(movie)
+    }
 
     fun removeFromMyWatchlist(movie: Movie) = viewModelScope.launch(Dispatchers.IO) {
         movieRepository.removeFromMyWatchlist(movie)
diff --git a/app/src/main/java/com/guru/composecookbook/ui/moviesappmvi/ui/home/WatchlistScreen.kt b/app/src/main/java/com/guru/composecookbook/ui/moviesappmvi/ui/home/WatchlistScreen.kt
@@ -1,38 +1,27 @@
 package com.guru.composecookbook.ui.moviesappmvi.ui.home
 
-import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.layout.ColumnScope.align
-import androidx.compose.foundation.layout.RowScope.align
-import androidx.compose.foundation.lazy.LazyColumnFor
 import androidx.compose.foundation.lazy.LazyColumnForIndexed
-import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.IconButton
 import androidx.compose.material.Surface
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.RemoveCircleOutline
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.draw.drawOpacity
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.viewModel
-import com.guru.composecookbook.theme.graySurface
 import com.guru.composecookbook.theme.typography
 import com.guru.composecookbook.ui.demoui.spotify.data.SpotifyDataProvider
 import com.guru.composecookbook.ui.moviesappmvi.data.models.Movie
 import com.guru.composecookbook.ui.utils.horizontalGradientBackground
-import com.guru.composecookbook.ui.utils.verticalGradientBackground
 import dev.chrisbanes.accompanist.coil.CoilImage
 
 @Composable
@@ -47,14 +36,18 @@ fun WatchlistScreen(moviesHomeInteractionEvents: (MoviesHomeInteractionEvents) -
             ) { index, movie ->
                 MovieWatchlistItem(
                     movie,
-                    { moviesHomeInteractionEvents(
-                        MoviesHomeInteractionEvents.OpenMovieDetail(movie))
+                    {
+                        moviesHomeInteractionEvents(
+                            MoviesHomeInteractionEvents.OpenMovieDetail(movie)
+                        )
                     },
-                    { moviesHomeInteractionEvents(
-                        MoviesHomeInteractionEvents.RemoveFromMyWatchlist(movie))
+                    {
+                        moviesHomeInteractionEvents(
+                            MoviesHomeInteractionEvents.RemoveFromMyWatchlist(movie)
+                        )
                     }
                 )
-                if (index == myWatchlist.size -1) {
+                if (index == myWatchlist.size - 1) {
                     Spacer(modifier = Modifier.padding(30.dp))
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class MovieRepositoryImpl(`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`override suspend fun addToMyWatchlist(movie: Movie) {`
`45`		`- moviesDao.addToWatchList(movie)`
	`45`	`+ moviesDao.addToWatchList(movie)`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`override suspend fun removeFromMyWatchlist(movie: Movie) {`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ fun MoviePagerItem(`
`46`	`46`	`val animateElevation = if (isSelected) 12.dp else 2.dp`
`47`	`47`	`val posterFullPath = "https://image.tmdb.org/t/p/w500/${movie.poster_path}"`
`48`	`48`
`49`		`- val movieGenres = movie.genre_ids?.let {`
`50`		`- movieGenreIds -> genres.filter { movieGenreIds.contains(it.id) }.take(3)`
	`49`	`+ val movieGenres = movie.genre_ids?.let { movieGenreIds ->`
	`50`	`+ genres.filter { movieGenreIds.contains(it.id) }.take(3)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`Card(`
`@@ -87,8 +87,10 @@ fun MoviePagerItem(`
`87`	`87`	`asset = Icons.Default.LibraryAdd,`
`88`	`88`	`tint = MaterialTheme.colors.primary,`
`89`	`89`	`modifier = Modifier`
`90`		`- .drawLayer(rotationY = animate(`
`91`		`- if (clicked.value) 720f else 0f, tween(400))`
	`90`	`+ .drawLayer(`
	`91`	`+ rotationY = animate(`
	`92`	`+ if (clicked.value) 720f else 0f, tween(400)`
	`93`	`+ )`
`92`	`94`	`)`
`93`	`95`	`)`
`94`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,8 @@ fun MoviesPager(`
`82`	`82`	`{ moviesHomeInteractionEvents(MoviesHomeInteractionEvents.AddToMyWatchlist(movie)) }`
`83`	`83`	`) {`
`84`	`84`	`moviesHomeInteractionEvents(`
`85`		`- MoviesHomeInteractionEvents.OpenMovieDetail(movie, imageId.value))`
	`85`	`+ MoviesHomeInteractionEvents.OpenMovieDetail(movie, imageId.value)`
	`86`	`+ )`
`86`	`87`	`}`
`87`	`88`	`}`
`88`	`89`	`} else {`
`@@ -100,7 +101,6 @@ fun MoviesPager(`
`100`	`101`	`}`
`101`	`102`	`}`
`102`	`103`
`103`		`-`
`104`	`104`	`val imageIds =`
`105`	`105`	`listOf(`
`106`	`106`	`R.drawable.camelia,`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ class MoviesHomeViewModel(`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`fun addToMyWatchlist(movie: Movie) = viewModelScope.launch(Dispatchers.IO) {`
`47`		`- movieRepository.addToMyWatchlist(movie)`
`48`		`- }`
	`47`	`+ movieRepository.addToMyWatchlist(movie)`
	`48`	`+ }`
`49`	`49`
`50`	`50`	`fun removeFromMyWatchlist(movie: Movie) = viewModelScope.launch(Dispatchers.IO) {`
`51`	`51`	`movieRepository.removeFromMyWatchlist(movie)`