Merge pull request #4 from Urdzik/No_Binding_Adapter

Error Correction

.gitignore

@@ -1,14 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
+
+.idea
+
 /build
-/captures
-.externalNativeBuild
-.cxx

app/src/main/java/com/example/movieapp/BindingAdapter.kt

@@ -2,7 +2,6 @@ package com.example.movieapp
 
 import android.view.View
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.net.toUri
 import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.RecyclerView
@@ -15,7 +14,12 @@ import com.example.movieapp.overview.MovieAdapter
 @BindingAdapter("imageUrl")
 fun bindImage(imageView: ImageView, imgUrl: String?) {
     imgUrl?.let {
-        val imgUri = imgUrl.toUri().buildUpon().scheme("https").build()
+        val imgUri = imgUrl
+            .toUri()
+            .buildUpon()
+            .scheme("https")
+            .build()
+
         Glide.with(imageView.context)
             .load(imgUri)
             .apply(
@@ -27,70 +31,6 @@ fun bindImage(imageView: ImageView, imgUrl: String?) {
     }
 }
 
-//Binding adapter used to display title from object
-@BindingAdapter("title")
-fun bindTitle(textView: TextView, title: String?) {
-    title?.let {
-        textView.text = title
-    }
-}
-
-//Binding adapter used to display plot from object
-@BindingAdapter("plot")
-fun TextView.bindPlot(plot: String?) {
-    plot?.let {
-        text = plot
-    }
-}
-
-//Binding adapter used to display year from object
-@BindingAdapter("year")
-fun TextView.bindYear(year: Int?) {
-    year?.let {
-        text = year.toString()
-    }
-}
-
-//Binding adapter used to display time from object
-@BindingAdapter("time")
-fun TextView.bindTime(time: String?) {
-    time?.let {
-        text = time
-    }
-}
-
-//Binding adapter used to display language from object
-@BindingAdapter("language")
-fun TextView.bindLanguage(language: String?) {
-    language?.let {
-        text = language
-    }
-}
-
-//Binding adapter used to display writer from object
-@BindingAdapter("writer")
-fun TextView.bindWriter(writer: String?) {
-    writer?.let {
-        text = writer
-    }
-}
-
-//Binding adapter used to display actors from object
-@BindingAdapter("actors")
-fun TextView.bindActors(actors: String?) {
-    actors?.let {
-        text = actors
-    }
-}
-
-//Binding adapter used to display genre from object
-@BindingAdapter("genre")
-fun TextView.bindGenre(genre: String?) {
-    genre?.let {
-        text = genre
-    }
-}
-
 
 //Binding adapter used to set adapter of RecyclerView
 @BindingAdapter("listData")
@@ -108,21 +48,4 @@ fun hideIfNetworkError(view: View, isNetWorkError: Boolean, playlist: Any?) {
     if (isNetWorkError) {
         view.visibility = View.GONE
     }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+}

app/src/main/java/com/example/movieapp/MainActivity.kt

@@ -20,4 +20,4 @@ class MainActivity : AppCompatActivity() {
         val graph = inflater.inflate(R.navigation.navigation)
         myNavHostFragment.navController.graph = graph
     }
-}
+}

app/src/main/java/com/example/movieapp/database/DatabaseEntities.kt

@@ -43,4 +43,4 @@ fun List<DatabaseMovie>.asDomainModel(): List<Movie> {
 
         )
     }
-}
+}

app/src/main/java/com/example/movieapp/detail/DetailFragment.kt

@@ -9,7 +9,6 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.findNavController
 import com.example.movieapp.databinding.DetailFragmentBinding
-import java.util.*
 
 
 class DetailFragment : Fragment() {
@@ -30,12 +29,13 @@ class DetailFragment : Fragment() {
         // Create Toolbar and button of back in toolbar
         val myToolbar = binding.toolbar
 
-        @Suppress("UNNECESSARY_SAFE_CALL")
-        Objects.requireNonNull((activity as AppCompatActivity)).apply {
+        (activity as AppCompatActivity).apply {
             setSupportActionBar(myToolbar)
-            supportActionBar?.setDisplayHomeAsUpEnabled(true)
-            supportActionBar?.setHomeButtonEnabled(true)
-            supportActionBar?.setDisplayShowTitleEnabled(false)
+            supportActionBar?.apply {
+                setDisplayHomeAsUpEnabled(true)
+                setHomeButtonEnabled(true)
+                setDisplayShowTitleEnabled(false)
+            }
             title = movie.title
         }
 

app/src/main/java/com/example/movieapp/detail/DetailViewModel.kt

@@ -15,4 +15,4 @@ class DetailViewModel(movieProperty: Movie) : ViewModel() {
     init {
         _selectProperty.value = movieProperty
     }
-}
+}

app/src/main/java/com/example/movieapp/domain/Movie.kt

@@ -1,6 +1,7 @@
 package com.example.movieapp.domain
 
 import android.os.Parcelable
+import android.view.View
 import kotlinx.android.parcel.Parcelize
 
 /**
@@ -23,6 +24,6 @@ data class Movie(
     val writer: String,
     val actors: String
 ) : Parcelable {
-    val isR
-        get() = rated == "R"
+
+    val plus18 = if (rated == "R") View.GONE else View.VISIBLE
 }

app/src/main/java/com/example/movieapp/network/MovieApi.kt

@@ -0,0 +1,19 @@
+package com.example.movieapp.network
+
+import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+
+private const val BASE_URL = "https://api.myjson.com/bins/"
+
+//Main entry point for network access
+object MovieApi {
+
+    private val retrofit = Retrofit.Builder()
+        .addConverterFactory(MoshiConverterFactory.create())
+        .addCallAdapterFactory(CoroutineCallAdapterFactory())
+        .baseUrl(BASE_URL)
+        .build()
+
+    val retrofitService: MovieApiService = retrofit.create(MovieApiService::class.java)
+}

app/src/main/java/com/example/movieapp/network/MovieApiService.kt

@@ -1,11 +1,7 @@
 package com.example.movieapp.network
 
-import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
-import retrofit2.Retrofit
-import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.http.GET
 
-private const val BASE_URL = "https://api.myjson.com/bins/"
 
 //A retrofit service to fetch movie playlist.
 interface MovieApiService {
@@ -14,14 +10,3 @@ interface MovieApiService {
 }
 
 
-//Main entry point for network access
-object MovieApi {
-
-    private val retrofit = Retrofit.Builder()
-        .addConverterFactory(MoshiConverterFactory.create())
-        .addCallAdapterFactory(CoroutineCallAdapterFactory())
-        .baseUrl(BASE_URL)
-        .build()
-
-    val retrofitService: MovieApiService = retrofit.create(MovieApiService::class.java)
-}

app/src/main/java/com/example/movieapp/network/MovieProperty.kt

@@ -17,8 +17,7 @@ data class MovieProperty(
     @Json(name = "Runtime") val time: String,
     @Json(name = "Language") val language: String,
     @Json(name = "Writer") val writer: String,
-    @Json(name = "Actors") val actors:String
-
+    @Json(name = "Actors") val actors: String
 )
 
 //Convert network result to database object

app/src/main/java/com/example/movieapp/overview/MovieAdapter.kt

@@ -34,7 +34,6 @@ class MovieAdapter(private val onClickListener: ClickListener) :
         }
     }
 
-
     //Class for comparing the old list and the new one, and updating it
     class DiffCallback : DiffUtil.ItemCallback<Movie>() {
         override fun areItemsTheSame(oldItem: Movie, newItem: Movie): Boolean {
@@ -50,5 +49,4 @@ class MovieAdapter(private val onClickListener: ClickListener) :
     class ClickListener(val clickListener: (movie: Movie) -> Unit) {
         fun onClick(movie: Movie) = clickListener(movie)
     }
-}
-
+}

app/src/main/java/com/example/movieapp/overview/OverviewFragment.kt

@@ -51,9 +51,7 @@ class OverviewFragment : Fragment() {
         })
 
         //Looking for the internet connection
-        viewModel.eventNetworkError.observe(
-            viewLifecycleOwner,
-            Observer<Boolean> { isNetworkError ->
+        viewModel.eventNetworkError.observe(viewLifecycleOwner, Observer<Boolean> { isNetworkError ->
                 if (isNetworkError) onNetworkError()
             })
 
@@ -71,4 +69,4 @@ class OverviewFragment : Fragment() {
             viewModel.onNetworkErrorShown()
         }
     }
-}
+}

app/src/main/java/com/example/movieapp/overview/OverviewViewModel.kt

@@ -10,7 +10,6 @@ import com.example.movieapp.domain.Movie
 import com.example.movieapp.repository.MoviesRepository
 import kotlinx.coroutines.launch
 
-
 class OverviewViewModel(application: Application) : ViewModel() {
 
     //LiveData object of movie
@@ -42,7 +41,7 @@ class OverviewViewModel(application: Application) : ViewModel() {
                 _eventNetworkError.value = false
                 _isNetworkErrorShown.value = false
             } catch (e: Exception) {
-                if (playList.value!!.isEmpty()) {
+                if (playList.value.isNullOrEmpty()) {
                     _eventNetworkError.value = true
                 }
             }
@@ -60,4 +59,4 @@ class OverviewViewModel(application: Application) : ViewModel() {
     fun onNetworkErrorShown() {
         _isNetworkErrorShown.value = true
     }
-}
+}

app/src/main/java/com/example/movieapp/repository/MoviesRepository.kt

@@ -24,4 +24,4 @@ class MoviesRepository(private val movieDatabase: MovieDatabase) {
     val movies: LiveData<List<Movie>> = Transformations.map(movieDatabase.movieDao.getMovies()) {
         it.asDomainModel()
     }
-}
+}