Merge branch 'feat/search' into development

Author: Pedrobam

app/src/main/java/com/arctouch/codechallenge/api/TmdbApi.kt

@@ -36,4 +36,11 @@ interface TmdbApi {
         @Query("api_key") apiKey: String = API_KEY,
         @Query("language") language: String = DEFAULT_LANGUAGE
     ): Observable<Movie>
+
+    @GET("search/movie")
+    suspend fun getMoviesByName(
+        @Query("query") title: String,
+        @Query("api_key") apiKey: String = API_KEY,
+        @Query("language") language: String = DEFAULT_LANGUAGE
+    ): UpcomingMoviesResponse
 }

app/src/main/java/com/arctouch/codechallenge/di/TmbRepository.kt

@@ -25,4 +25,12 @@ class TmbRepositoryImpl(private val api: TmdbApi) : TmbRepository {
         return api.movie(id, apiKey, language)
     }
 
+    override suspend fun getMoviesByName(
+        title: String,
+        apiKey: String,
+        language: String
+    ): UpcomingMoviesResponse {
+        return api.getMoviesByName(title)
+    }
+
 }

app/src/main/java/com/arctouch/codechallenge/ui/home/HomeFragment.kt

@@ -1,10 +1,11 @@
 package com.arctouch.codechallenge.ui.home
 
+import android.app.SearchManager
+import android.content.Context
 import android.nfc.tech.MifareUltralight.PAGE_SIZE
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
+import androidx.appcompat.widget.SearchView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.Observer
@@ -21,7 +22,9 @@ class HomeFragment : Fragment() {
 
     private val mViewModel: HomeViewModel by viewModel()
     private var isLoading = false
+    private var isSearching = false
     private lateinit var adapter: HomeAdapter
+    private lateinit var searchView: SearchView
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -33,17 +36,61 @@ class HomeFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        setHasOptionsMenu(true)
         setUpAdapter(mViewModel.upcomingMovies.value)
         configScrollListener(recyclerView)
         observeViewModel()
     }
 
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.search_menu, menu)
+        val searchAction = menu.findItem(R.id.search_action)
+        searchAction.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
+            override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
+                isSearching = true
+                return true
+            }
+
+            override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
+                isSearching = false
+                return true
+            }
+        })
+        searchView = searchAction?.actionView as SearchView
+        configSearchView()
+        super.onCreateOptionsMenu(menu, inflater)
+    }
+
+    private fun configSearchView() {
+        val searchManager = activity?.getSystemService(Context.SEARCH_SERVICE) as SearchManager
+        searchView.setSearchableInfo(searchManager.getSearchableInfo(activity?.componentName))
+        searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+            override fun onQueryTextChange(newText: String?): Boolean {
+                if (newText.isNullOrEmpty()) {
+                    setUpAdapter(mViewModel.upcomingMovies.value)
+                    mViewModel.getUpComingMovies()
+                    isSearching = false
+                } else {
+                    mViewModel.searchMovies(newText)
+                }
+                return true
+            }
+
+            override fun onQueryTextSubmit(query: String?): Boolean {
+                return true
+            }
+        })
+    }
+
     private fun observeViewModel() {
         mViewModel.upcomingMovies.observe(this as LifecycleOwner, Observer {
             isLoading = false
             progressBar.visibility = View.GONE
             adapter.notifyDataSetChanged()
         })
+        mViewModel.searchLiveData.observe(this as LifecycleOwner, Observer {
+            setUpAdapter(it.toMutableList())
+        })
     }
 
     private fun loadMoreMovies() {
@@ -72,6 +119,9 @@ class HomeFragment : Fragment() {
 
             override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                 super.onScrolled(recyclerView, dx, dy)
+                if (isSearching) {
+                    return
+                }
                 val layoutManager = recyclerView
                     .layoutManager as LinearLayoutManager
                 val visibleItemCount: Int = layoutManager.childCount

app/src/main/java/com/arctouch/codechallenge/ui/home/HomeViewModel.kt

@@ -5,16 +5,19 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.arctouch.codechallenge.App
-import com.arctouch.codechallenge.api.TmdbApi
 import com.arctouch.codechallenge.data.Cache
 import com.arctouch.codechallenge.model.Movie
+import com.arctouch.codechallenge.model.UpcomingMoviesResponse
 import kotlinx.coroutines.launch
 
 class HomeViewModel : ViewModel() {
 
     private val api = App.api
     private val _upcomingMovies = MutableLiveData<MutableList<Movie>>()
     val upcomingMovies: LiveData<MutableList<Movie>> = _upcomingMovies
+    private val _searchLiveData = MutableLiveData<MutableList<Movie>>()
+    var searchLiveData: LiveData<MutableList<Movie>> = _searchLiveData
+
     private var page: Long = 0
 
     init {
@@ -26,12 +29,24 @@ class HomeViewModel : ViewModel() {
         page = page.plus(1)
         viewModelScope.launch {
             val upcomingMoviesResponse = api.upcomingMovies(page = page)
-            val moviesWithGenres = upcomingMoviesResponse.results.map { movie ->
-                movie.copy(genres = Cache.genres.filter { movie.genreIds?.contains(it.id) == true })
-            }
-            val teste = _upcomingMovies.value
-            teste?.addAll(moviesWithGenres)
-            _upcomingMovies.postValue(teste)
+            val moviesWithGenres = addGenres(upcomingMoviesResponse)
+            val list = _upcomingMovies.value
+            list?.addAll(moviesWithGenres)
+            _upcomingMovies.postValue(list)
+        }
+    }
+
+    fun searchMovies(query: String) {
+        viewModelScope.launch {
+            val upcomingMoviesResponse = api.getMoviesByName(query)
+            val moviesWithGenres = addGenres(upcomingMoviesResponse)
+            _searchLiveData.postValue(moviesWithGenres.toMutableList())
+        }
+    }
+
+    private fun addGenres(upcomingMoviesResponse: UpcomingMoviesResponse): List<Movie> {
+        return upcomingMoviesResponse.results.map { movie ->
+            movie.copy(genres = Cache.genres.filter { movie.genreIds?.contains(it.id) == true })
         }
     }
 }

app/src/main/res/drawable/ic_search_white_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>

app/src/main/res/menu/search_menu.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/search_action"
+        android:icon="@drawable/ic_search_white_24dp"
+        android:title="@string/search"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="always" />
+
+</menu>

app/src/main/res/values/strings.xml

@@ -2,4 +2,5 @@
     <string name="app_name">Code Challenge</string>
     <string name="movie_genres">Gêneros: %1s</string>
     <string name="release_date">Data de Lançamento: %1$s</string>
+    <string name="search">Search</string>
 </resources>