Sergey Tarasov homework 4 (Note Database additions)

EpicDatabseExample/app/src/main/java/com/example/epicdatabaseexample/db/NoteDatabase.kt

@@ -12,7 +12,7 @@ import com.example.epicdatabaseexample.db.note.NoteDao
 import com.example.epicdatabaseexample.db.note.NoteEntity
 
 @Database(
-    version = 2,
+    version = 3,
     exportSchema = false,
     entities = [
         NoteEntity::class,
@@ -48,7 +48,14 @@ abstract class NoteDatabase : RoomDatabase() {
                             "DEFAULT ('${PersonEntity.DEFAULT_PERSON_NAME}')")
                 }
             },
-            // TODO Добавить миграцию.
+            object : Migration(2, 3) {
+                override fun migrate(database: SupportSQLiteDatabase) {
+                    database.execSQL("ALTER TABLE $NOTE_TABLE " +
+                            "ADD COLUMN ${NoteEntity.COLUMN_IS_COMPLETED} TEXT NOT NULL " +
+                            "DEFAULT ('${NoteEntity.DEFAULT_IS_COMPLETED}')")
+                }
+            },
+            // [DONE] TODO Добавить миграцию.
         )
 
         private fun createDatabaseInstance(application: Application): NoteDatabase {

EpicDatabseExample/app/src/main/java/com/example/epicdatabaseexample/db/note/NoteDao.kt

@@ -26,7 +26,10 @@ abstract class NoteDao {
     @Query("DELETE FROM note_table")
     abstract fun deleteAllNote(): Completable
 
-    // TODO Добавить метод для обновления одного элемента.
+    @Update(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun updateNote(note: NoteEntity): Completable
+
+    // [DONE] TODO Добавить метод для обновления одного элемента.
     //  Что можно указать в качестве возвращаемого типа?
     //  Напомню, что выше есть метод observeNoteList, который будет вызываться при любом
     //  изменении списка в Базе Данных.

EpicDatabseExample/app/src/main/java/com/example/epicdatabaseexample/db/note/NoteEntity.kt

@@ -22,7 +22,10 @@ data class NoteEntity(
     @ColumnInfo(name = COLUMN_PERSON_NAME)
     var personName: String = PersonEntity.DEFAULT_PERSON_NAME,
 
-    // TODO Нужно добавить нове поле isCompleted типа Boolean.
+    @ColumnInfo(name = COLUMN_IS_COMPLETED)
+    var isCompleted: Boolean = false
+
+    // [DONE] TODO Нужно добавить нове поле isCompleted типа Boolean.
     //  В SQLite не поддерживается Boolean, но в Room его можно использовать.
     //  Поэтому поле делаем именно Boolean, а при добавлении миграции - нужно будет погуглить,
     //  как обойти это ограничение.
@@ -33,5 +36,7 @@ data class NoteEntity(
         const val COLUMN_TITLE = "title"
         const val COLUMN_DESCRIPTION = "descriptions"
         const val COLUMN_PERSON_NAME = "person_name"
+        const val COLUMN_IS_COMPLETED = "is_completed"
+        const val DEFAULT_IS_COMPLETED = "false"
     }
 }

EpicDatabseExample/app/src/main/java/com/example/epicdatabaseexample/ui/note_list/NoteDiffUtilCallback.kt

@@ -5,11 +5,20 @@ import com.example.epicdatabaseexample.db.note.NoteEntity
 
 class NoteDiffUtilCallback : DiffUtil.ItemCallback<NoteEntity>() {
 
+    data class Payload(
+        val isCompletedChanged: Boolean
+    )
+
     override fun areItemsTheSame(oldItem: NoteEntity, newItem: NoteEntity): Boolean {
         return oldItem.id == newItem.id
     }
 
     override fun areContentsTheSame(oldItem: NoteEntity, newItem: NoteEntity): Boolean {
-        return false
+        return oldItem == newItem
+    }
+
+    override fun getChangePayload(oldItem: NoteEntity, newItem: NoteEntity): Any? {
+        val isCompletedChanged = oldItem.isCompleted != newItem.isCompleted
+        return if (isCompletedChanged) {Payload(isCompletedChanged)} else null
     }
 }

EpicDatabseExample/app/src/main/java/com/example/epicdatabaseexample/ui/note_list/NoteListAdapter.kt

@@ -20,15 +20,34 @@ class NoteListAdapter(
             onNoteClick.invoke(note.id)
         }
         holder.personName.text = note.personName
-        // TODO Раскомментировать, после добавления нового поля в NoteEntity.
-//        holder.isCompleted.setOnClickListener {
-//            onIsCompletedClick.invoke(note.copy(
-//                isCompleted = !note.isCompleted
-//            ))
-//        }
-//        val isCompletedChanged = note.isCompleted != holder.isCompleted.isChecked
-//        if (isCompletedChanged) {
-//            holder.isCompleted.isChecked = note.isCompleted
-//        }
+        // [DONE] TODO Раскомментировать, после добавления нового поля в NoteEntity.
+        holder.isCompleted.setOnClickListener {
+            onIsCompletedClick.invoke(
+                note.copy(
+                    isCompleted = !note.isCompleted
+                )
+            )
+        }
+        val isCompletedChanged = note.isCompleted != holder.isCompleted.isChecked
+        if (isCompletedChanged) {
+            holder.isCompleted.isChecked = note.isCompleted
+        }
+    }
+
+    override fun onBindViewHolder(
+        holder: NoteViewHolder,
+        position: Int,
+        payloads: MutableList<Any>
+    ) {
+        val payload: NoteDiffUtilCallback.Payload? =
+            payloads.firstOrNull() as? NoteDiffUtilCallback.Payload
+        if (payload != null) {
+            if (payload.isCompletedChanged) {
+                val note = getItem(position)
+                holder.isCompleted.isChecked = note.isCompleted
+            }
+        } else {
+            super.onBindViewHolder(holder, position, payloads)
+        }
     }
 }

EpicDatabseExample/app/src/main/java/com/example/epicdatabaseexample/ui/note_list/NoteListViewModel.kt

@@ -64,7 +64,11 @@ class NoteListViewModel constructor(
     }
 
     fun onIsCompletedClick(note: NoteEntity) {
-        // TODO Добавить вызов noteDao для обновления элемента в таблице.
+        compositeDisposable.add(noteDao.updateNote(note)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe())
+        // [DONE] TODO Добавить вызов noteDao для обновления элемента в таблице.
     }
 
     override fun onCleared() {

HomeWorkNetwork/app/build.gradle

@@ -7,14 +7,20 @@ plugins {
 android {
     compileSdk 31
 
+    packagingOptions {
+        pickFirst 'META-INF/DEPENDENCIES'
+        pickFirst 'META-INF/INDEX.LIST'
+        pickFirst 'META-INF/io.netty.versions.properties'
+    }
+
     defaultConfig {
 
         buildConfigField "String", "API_BASE_URL", '"api.themoviedb.org"'
-        buildConfigField "String", "API_KEY", '"/*ваш ap_key*/"'
+        buildConfigField "String", "API_KEY", '"6259c72d2e1c19b81663e5e9e9ef7356"'
         buildConfigField "String", "API_IMAGE_BASE_URL", '"https://image.tmdb.org/t/p/w500"'
 
         applicationId "com.pg.homeworknetwork"
-        minSdk 30
+        minSdk 21
         targetSdk 31
         versionCode 1
         versionName "1.0"
@@ -46,4 +52,22 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
+
+    //Coroutine
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'
+
+    //Interceptor
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.8.1'
+
+    // ktor
+    implementation 'io.ktor:ktor-client-core:1.6.7'
+    implementation 'io.ktor:ktor-client-android:1.6.7'
+    implementation 'io.ktor:ktor-client-serialization:1.6.7'
+    implementation 'io.ktor:ktor-client-logging:1.6.7'
+    implementation 'io.ktor:ktor-client-cio:1.6.7'
+    implementation 'io.ktor:ktor-server-core:1.6.7'
+    implementation 'io.ktor:ktor-server-netty:1.6.7'
 }

HomeWorkNetwork/app/src/main/java/com/pg/homeworknetwork/Models.kt

@@ -1,5 +1,32 @@
 package com.pg.homeworknetwork
 
-class Movies
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
-class Movie
+//https://developers.themoviedb.org/3/movies/get-movie-lists
+@Serializable
+data class Movies(
+    @SerialName("page")
+    val page: Int,
+    @SerialName("results")
+    val results: List<Movie> = ArrayList()
+)
+
+//https://developers.themoviedb.org/3/movies/get-movie-details
+@Serializable
+data class Movie(
+    @SerialName("id")
+    val id: Int,
+    @SerialName("title")
+    val title: String? = null,
+    @SerialName("poster_path")
+    val posterPath: String? = null,
+    @SerialName("overview")
+    val overview: String? = null,
+    @SerialName("popularity")
+    val popularity: Double? = null,
+    @SerialName("original_title")
+    val originalTitle: String? = null,
+    @SerialName("release_date")
+    val releaseDate: String? = null
+)

HomeWorkNetwork/app/src/main/java/com/pg/homeworknetwork/MovieDetailFragment.kt

@@ -10,6 +10,10 @@ import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
 import coil.load
 import coil.transform.RoundedCornersTransformation
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
 
 class MovieDetailFragment : Fragment(R.layout.fragment_movie_preview) {
     lateinit var poster: ImageView
@@ -18,6 +22,8 @@ class MovieDetailFragment : Fragment(R.layout.fragment_movie_preview) {
     lateinit var popularity: TextView
     lateinit var releaseDate: TextView
 
+    private val corScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         with(view) {
@@ -28,24 +34,29 @@ class MovieDetailFragment : Fragment(R.layout.fragment_movie_preview) {
             releaseDate = findViewById(R.id.releaseDate)
         }
 
-        val movieId = arguments?.getInt(ARG_ID) ?: 550
-        val movie = //получаем фильм
-        poster.load("${BuildConfig.API_IMAGE_BASE_URL}${movie.posterPath}") {
-            transformations(RoundedCornersTransformation(16f))
-        }
-        originalTitle.text = movie.originalTitle
-        overview.text = movie.overview
-        popularity.text = movie.popularity.toString()
-        releaseDate.text = movie.releaseDate
-
-        activity?.onBackPressedDispatcher?.addCallback(this.viewLifecycleOwner, object : OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                val manager: FragmentManager = parentFragmentManager
-                val transaction: FragmentTransaction = manager.beginTransaction()
-                transaction.replace(R.id.mainFragment, MovieListFragment())
-                transaction.commit()
+        corScope.launch {
+            val movieId = arguments?.getInt(ARG_ID) ?: 550
+            val movie = Api().getMovieById(movieId) //получаем фильм
+            poster.load("${BuildConfig.API_IMAGE_BASE_URL}${movie.posterPath}") {
+                transformations(RoundedCornersTransformation(16f))
             }
-        })
+            originalTitle.text = movie.originalTitle
+            overview.text = movie.overview
+            popularity.text = movie.popularity.toString()
+            releaseDate.text = movie.releaseDate
+        }
+
+
+        activity?.onBackPressedDispatcher?.addCallback(
+            this.viewLifecycleOwner,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    val manager: FragmentManager = parentFragmentManager
+                    val transaction: FragmentTransaction = manager.beginTransaction()
+                    transaction.replace(R.id.mainFragment, MovieListFragment())
+                    transaction.commit()
+                }
+            })
     }
 
     companion object {

HomeWorkNetwork/app/src/main/java/com/pg/homeworknetwork/MovieItemAdapter.kt

@@ -50,7 +50,7 @@ internal class MovieItemAdapter : ListAdapter<Movie, MovieItemAdapter.ViewHolder
                 clickListener?.onItemClick(movie)
             }
             image.requestLayout()
-            itemTitle.text = movie.title
+            itemTitle.text = movie.originalTitle
 
             image.load("${BuildConfig.API_IMAGE_BASE_URL}${movie.posterPath}") {
                 transformations(RoundedCornersTransformation(16f))

HomeWorkNetwork/app/src/main/java/com/pg/homeworknetwork/MovieListFragment.kt

@@ -7,16 +7,23 @@ import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
 
 class MovieListFragment : Fragment(R.layout.fragment_movie_list) {
     lateinit var recycler: RecyclerView
 
+    private val corScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+
     private val goToDetails = object : MovieItemAdapter.IOnItemClick {
         override fun onItemClick(movie: Movie) {
             val manager: FragmentManager = parentFragmentManager
             val transaction: FragmentTransaction = manager.beginTransaction()
             val detailsFragment = MovieDetailFragment()
-            detailsFragment.arguments = Bundle().apply { putInt(MovieDetailFragment.ARG_ID, movie.id) }
+            detailsFragment.arguments =
+                Bundle().apply { putInt(MovieDetailFragment.ARG_ID, movie.id) }
             transaction.replace(R.id.mainFragment, detailsFragment)
             transaction.commit()
         }
@@ -31,8 +38,10 @@ class MovieListFragment : Fragment(R.layout.fragment_movie_list) {
             }
         }
         val adapter = (recycler.adapter as MovieItemAdapter)
-        val movies = //получаем фильмы
-        adapter.submitList(movies)
+        corScope.launch(Dispatchers.IO) {
+            val movies: Movies = Api().getTopRatedMovies() //получаем фильмы
+            adapter.submitList(movies.results)
+        }
         super.onViewCreated(view, savedInstanceState)
     }