Переименовано movieProperty в movie для лучшего понимания

Переименовано domian в domain
Urdzik · Jan 30, 2020 · aeceea5 · aeceea5
1 parent 0a597ba
commit aeceea5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/app/src/main/java/com/example/movieapp/detail/DetailFragment.kt b/app/src/main/java/com/example/movieapp/detail/DetailFragment.kt
@@ -22,9 +22,9 @@ class DetailFragment : Fragment() {
         val binding = DetailFragmentBinding.inflate(inflater)
 
         //Get movie object
-        val movieProperty = DetailFragmentArgs.fromBundle(arguments!!).movieProperty
+        val movie = DetailFragmentArgs.fromBundle(arguments!!).movie
 
-        val viewModel = ViewModelProvider(this, DetailViewModelFactory(movieProperty))
+        val viewModel = ViewModelProvider(this, DetailViewModelFactory(movie))
             .get(DetailViewModel::class.java)
 
         // Create Toolbar and button of back in toolbar
@@ -36,7 +36,7 @@ class DetailFragment : Fragment() {
             supportActionBar?.setDisplayHomeAsUpEnabled(true)
             supportActionBar?.setHomeButtonEnabled(true)
             supportActionBar?.setDisplayShowTitleEnabled(false)
-            title = movieProperty.title
+            title = movie.title
         }
 
         //Button of back

diff --git a/app/src/main/java/com/example/movieapp/detail/DetailViewModelFactory.kt b/app/src/main/java/com/example/movieapp/detail/DetailViewModelFactory.kt
@@ -4,10 +4,10 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import com.example.movieapp.domain.Movie
 
-class DetailViewModelFactory(private val movieProperty: Movie) : ViewModelProvider.Factory {
+class DetailViewModelFactory(private val movie: Movie) : ViewModelProvider.Factory {
     override fun <T : ViewModel?> create(modelClass: Class<T>): T {
         if (modelClass.isAssignableFrom(DetailViewModel::class.java)) {
-            return DetailViewModel(movieProperty) as T
+            return DetailViewModel(movie) as T
         }
         throw IllegalArgumentException("Unknown ViewModel class")
     }

diff --git a/app/src/main/java/com/example/movieapp/network/MovieProperty.kt b/app/src/main/java/com/example/movieapp/network/MovieProperty.kt
@@ -5,6 +5,8 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 
+
+//
 @JsonClass(generateAdapter = true)
 data class MovieProperty(
     @Json(name = "imdbID") val id: String,

diff --git a/app/src/main/res/navigation/navigation.xml b/app/src/main/res/navigation/navigation.xml
@@ -21,8 +21,8 @@
         android:label="DetailFragment"
         tools:layout="@layout/detail_fragment">
         <argument
-           android:name="movieProperty"
-            app:argType="com.example.movieapp.domian.Movie"
+           android:name="movie"
+            app:argType="com.example.movieapp.domain.Movie"
             />
         <action
             android:id="@+id/action_detailFragment_to_overviewFragment"