add Timber

nilvng · Aug 27, 2023 · 273ac7f · 273ac7f
1 parent 9e28f13
commit 273ac7f
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 11 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -104,6 +104,9 @@ dependencies {
     // optional - Paging 3 Integration
     implementation "androidx.room:room-paging:$room_version"
 
+    // Timber
+    implementation 'com.jakewharton.timber:timber:5.0.1'
+
 }
 kapt {
     correctErrorTypes true

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:installLocation="auto">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:name=".MyApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -13,7 +15,6 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.MovieNight"
-        android:name=".MyApplication"
         tools:targetApi="31">
         <activity
             android:name=".ui.search.SearchActivity"

diff --git a/app/src/main/java/com/nillin/movienight/MyApplication.kt b/app/src/main/java/com/nillin/movienight/MyApplication.kt
@@ -2,7 +2,12 @@ package com.nillin.movienight
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
+import timber.log.Timber
 
 @HiltAndroidApp
 class MyApplication: Application() {
+    override fun onCreate() {
+        super.onCreate()
+        Timber.plant(Timber.DebugTree())
+    }
 }
diff --git a/app/src/main/java/com/nillin/movienight/ui/main/MainFragment.kt b/app/src/main/java/com/nillin/movienight/ui/main/MainFragment.kt
@@ -17,6 +17,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import timber.log.Timber
 
 @AndroidEntryPoint
 class MainFragment : Fragment() {
@@ -45,13 +46,16 @@ class MainFragment : Fragment() {
                 viewModel.movieRepo.getAll()
                     .map { movieList -> movieList.map { movie -> movie.asState() } }
                     .collect {
+                        it.forEach {movie ->
+                            Timber.d("Repo: $movie")
+                        }
                         (binding.rvMovies.adapter as MovieAdapter).update(it)
                     }
             }
         }
 
         binding.btnAdd.setOnClickListener {
-//            onAddClicked()
+            onAddClicked()
         }
     }
 

diff --git a/app/src/main/java/com/nillin/movienight/ui/main/MainViewModel.kt b/app/src/main/java/com/nillin/movienight/ui/main/MainViewModel.kt
@@ -1,5 +1,6 @@
 package com.nillin.movienight.ui.main
 
+import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -15,21 +16,23 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import javax.inject.Inject
 
 val dummy_data = listOf(dummy_normalpeople, dummy_silo)
 
 @HiltViewModel
 class MainViewModel @Inject constructor(
     val movieRepo: MovieRepo
-): ViewModel() {
+) : ViewModel() {
     var movies: LiveData<List<MovieUI>> = MutableLiveData(dummy_data)
-    var flowMovieUI : StateFlow<List<MovieUI>> = MutableStateFlow(dummy_data)
+    var flowMovieUI: StateFlow<List<MovieUI>> = MutableStateFlow(dummy_data)
     private val _flowMovie = MutableStateFlow(dummy_data)
 
     fun getMovies() {
         viewModelScope.launch {
-            flowMovieUI = movieRepo.getAll().map { it.map { it.asState() }}.stateIn(viewModelScope)
+            flowMovieUI = movieRepo.getAll().map { it.map { it.asState() } }.stateIn(viewModelScope)
+            Timber.d(flowMovieUI.value.toString(), null)
         }
     }
 }
diff --git a/app/src/main/java/com/nillin/movienight/ui/main/MovieAdapter.kt b/app/src/main/java/com/nillin/movienight/ui/main/MovieAdapter.kt
@@ -27,10 +27,8 @@ class MovieAdapter(private val movieUIS: ArrayList<MovieUI>) :
     }
 
     fun update(movieUIS: List<MovieUI>) {
-        if (movieUIS.isEmpty()) return
         this.movieUIS.clear()
         this.movieUIS.addAll(movieUIS)
-        notifyItemRangeChanged(0, movieUIS.count())
     }