From 73a058d69e26f10209cc2ea0af3cca067b8cbb62 Mon Sep 17 00:00:00 2001
From: junieberry <junyoung44@g.skku.edu>
Date: Sat, 16 Oct 2021 04:00:04 +0900
Subject: [PATCH 1/7] [Refactor] Convert to Repository Pattern

---
 .../mvvm2/data/repository/Repository.kt       | 20 +++++++++++++++++++
 .../repository/{ => remote}/BaseRetrofit.kt   |  2 +-
 .../repository/{ => remote}/MovieRetrofit.kt  |  2 +-
 .../repository/remote/RemoteDataSource.kt     | 17 ++++++++++++++++
 .../example/mvvm2/ui/main/MainViewModel.kt    | 14 ++++++-------
 5 files changed, 46 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/java/com/example/mvvm2/data/repository/Repository.kt
 rename app/src/main/java/com/example/mvvm2/data/repository/{ => remote}/BaseRetrofit.kt (86%)
 rename app/src/main/java/com/example/mvvm2/data/repository/{ => remote}/MovieRetrofit.kt (90%)
 create mode 100644 app/src/main/java/com/example/mvvm2/data/repository/remote/RemoteDataSource.kt

diff --git a/app/src/main/java/com/example/mvvm2/data/repository/Repository.kt b/app/src/main/java/com/example/mvvm2/data/repository/Repository.kt
new file mode 100644
index 0000000..5ab71f5
--- /dev/null
+++ b/app/src/main/java/com/example/mvvm2/data/repository/Repository.kt
@@ -0,0 +1,20 @@
+package com.example.mvvm2.data.repository
+
+import com.example.mvvm2.data.model.MovieResponse
+import com.example.mvvm2.data.repository.remote.RemoteDataSourceImpl
+import retrofit2.Call
+
+interface Repository {
+    val remoteDataSource : RemoteDataSourceImpl
+    fun getMovieList(query: String) :Call<MovieResponse>
+}
+
+class RepositoryImpl() : Repository {
+    override val remoteDataSource: RemoteDataSourceImpl
+        get() = RemoteDataSourceImpl()
+
+    override fun getMovieList(query: String): Call<MovieResponse> {
+        return remoteDataSource.getMovieList(query)
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mvvm2/data/repository/BaseRetrofit.kt b/app/src/main/java/com/example/mvvm2/data/repository/remote/BaseRetrofit.kt
similarity index 86%
rename from app/src/main/java/com/example/mvvm2/data/repository/BaseRetrofit.kt
rename to app/src/main/java/com/example/mvvm2/data/repository/remote/BaseRetrofit.kt
index ff5fb24..2541979 100644
--- a/app/src/main/java/com/example/mvvm2/data/repository/BaseRetrofit.kt
+++ b/app/src/main/java/com/example/mvvm2/data/repository/remote/BaseRetrofit.kt
@@ -1,4 +1,4 @@
-package com.example.mvvm2.data.repository
+package com.example.mvvm2.data.repository.remote
 
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
diff --git a/app/src/main/java/com/example/mvvm2/data/repository/MovieRetrofit.kt b/app/src/main/java/com/example/mvvm2/data/repository/remote/MovieRetrofit.kt
similarity index 90%
rename from app/src/main/java/com/example/mvvm2/data/repository/MovieRetrofit.kt
rename to app/src/main/java/com/example/mvvm2/data/repository/remote/MovieRetrofit.kt
index 4baa503..1f03a3f 100644
--- a/app/src/main/java/com/example/mvvm2/data/repository/MovieRetrofit.kt
+++ b/app/src/main/java/com/example/mvvm2/data/repository/remote/MovieRetrofit.kt
@@ -1,4 +1,4 @@
-package com.example.mvvm2.data.repository
+package com.example.mvvm2.data.repository.remote
 
 import com.example.mvvm2.data.model.MovieResponse
 import retrofit2.Call
diff --git a/app/src/main/java/com/example/mvvm2/data/repository/remote/RemoteDataSource.kt b/app/src/main/java/com/example/mvvm2/data/repository/remote/RemoteDataSource.kt
new file mode 100644
index 0000000..6ecbab9
--- /dev/null
+++ b/app/src/main/java/com/example/mvvm2/data/repository/remote/RemoteDataSource.kt
@@ -0,0 +1,17 @@
+package com.example.mvvm2.data.repository.remote
+
+import com.example.mvvm2.data.model.Movie
+import com.example.mvvm2.data.model.MovieResponse
+import retrofit2.Call
+import retrofit2.Response
+
+interface RemoteDataSource {
+    fun getMovieList(query: String):Call<MovieResponse>
+}
+
+class RemoteDataSourceImpl() : RemoteDataSource {
+
+    override fun getMovieList(query: String): Call<MovieResponse> {
+        return BaseRetrofit.retrofit.create(MovieRetrofit::class.java).getMovieList(query)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt b/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt
index c67f559..711e045 100644
--- a/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt
+++ b/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt
@@ -1,23 +1,23 @@
 package com.example.mvvm2.ui.main
 
-import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.example.mvvm2.data.model.Movie
 import com.example.mvvm2.data.model.MovieResponse
-import com.example.mvvm2.data.repository.BaseRetrofit
-import com.example.mvvm2.data.repository.MovieRetrofit
+import com.example.mvvm2.data.repository.Repository
+import com.example.mvvm2.data.repository.RepositoryImpl
+import com.example.mvvm2.data.repository.remote.BaseRetrofit
+import com.example.mvvm2.data.repository.remote.MovieRetrofit
 import retrofit2.Call
 import retrofit2.Response
 
 class MainViewModel :ViewModel() {
-    var query:String = "Harry potter"
+    var query:String = ""
     val movieList: MutableLiveData<ArrayList<Movie>> = MutableLiveData()
+    val repository: RepositoryImpl = RepositoryImpl()
 
     fun getMoveList () {
-        val api = BaseRetrofit.retrofit.create(MovieRetrofit::class.java).getMovieList(query)
-
-        api.enqueue(object : retrofit2.Callback<MovieResponse> {
+        repository.getMovieList(query).enqueue(object : retrofit2.Callback<MovieResponse> {
             override fun onResponse(call: Call<MovieResponse>, response: Response<MovieResponse>) {
                 if (response.isSuccessful){
                     movieList.value = response.body()!!.items

From 0c30ca114a27a6a0599a6a8deb8b09bbdeb91579 Mon Sep 17 00:00:00 2001
From: junieberry <junyoung44@g.skku.edu>
Date: Sat, 16 Oct 2021 04:47:33 +0900
Subject: [PATCH 2/7] [Feat] Add Preference

---
 .idea/misc.xml                                |  2 +-
 .../mvvm2/data/repository/Repository.kt       | 19 ++++++++++--
 .../data/repository/local/LocalDataSource.kt  | 19 ++++++++++++
 .../data/repository/local/SharedPreference.kt | 29 +++++++++++++++++++
 .../repository/remote/RemoteDataSource.kt     |  2 --
 app/src/main/res/layout/activity_main.xml     | 10 +++++++
 app/src/main/res/values/strings.xml           |  2 ++
 7 files changed, 78 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/com/example/mvvm2/data/repository/local/LocalDataSource.kt
 create mode 100644 app/src/main/java/com/example/mvvm2/data/repository/local/SharedPreference.kt

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3d451ac..da559e7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
-        <entry key="..\:/Users/82108/MVVM2/app/src/main/res/layout/activity_main.xml" value="0.1" />
+        <entry key="..\:/Users/82108/MVVM2/app/src/main/res/layout/activity_main.xml" value="0.25" />
         <entry key="..\:/Users/82108/MVVM2/app/src/main/res/layout/activity_movie.xml" value="0.17552083333333332" />
         <entry key="..\:/Users/82108/MVVM2/app/src/main/res/layout/item_main.xml" value="0.33" />
       </map>
diff --git a/app/src/main/java/com/example/mvvm2/data/repository/Repository.kt b/app/src/main/java/com/example/mvvm2/data/repository/Repository.kt
index 5ab71f5..30e48a3 100644
--- a/app/src/main/java/com/example/mvvm2/data/repository/Repository.kt
+++ b/app/src/main/java/com/example/mvvm2/data/repository/Repository.kt
@@ -1,20 +1,35 @@
 package com.example.mvvm2.data.repository
 
 import com.example.mvvm2.data.model.MovieResponse
+import com.example.mvvm2.data.repository.local.LocalDataSource
+import com.example.mvvm2.data.repository.local.LocalDataSourceImpl
 import com.example.mvvm2.data.repository.remote.RemoteDataSourceImpl
 import retrofit2.Call
 
 interface Repository {
-    val remoteDataSource : RemoteDataSourceImpl
-    fun getMovieList(query: String) :Call<MovieResponse>
+    val remoteDataSource: RemoteDataSourceImpl
+    val localDataSource: LocalDataSourceImpl
+
+    fun getMovieList(query: String): Call<MovieResponse>
+    fun getHistory(): ArrayList<String>
+    fun setHistory(title:String)
 }
 
 class RepositoryImpl() : Repository {
     override val remoteDataSource: RemoteDataSourceImpl
         get() = RemoteDataSourceImpl()
+    override val localDataSource: LocalDataSourceImpl
+        get() = LocalDataSourceImpl()
 
     override fun getMovieList(query: String): Call<MovieResponse> {
         return remoteDataSource.getMovieList(query)
+    }
+
+    override fun getHistory(): ArrayList<String> {
+        return localDataSource.getHistory()
+    }
 
+    override fun setHistory(title: String) {
+        return localDataSource.setHistory(title)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mvvm2/data/repository/local/LocalDataSource.kt b/app/src/main/java/com/example/mvvm2/data/repository/local/LocalDataSource.kt
new file mode 100644
index 0000000..45ad339
--- /dev/null
+++ b/app/src/main/java/com/example/mvvm2/data/repository/local/LocalDataSource.kt
@@ -0,0 +1,19 @@
+package com.example.mvvm2.data.repository.local
+
+interface LocalDataSource {
+    val pref: SharedPreference
+        get() = SharedPreference
+
+    fun getHistory(): ArrayList<String>
+    fun setHistory(title:String)
+}
+
+class LocalDataSourceImpl():LocalDataSource{
+    override fun getHistory(): ArrayList<String> {
+        return pref.getHistory()
+    }
+
+    override fun setHistory(title: String) {
+        pref.setHistory(title)
+    }
+}
diff --git a/app/src/main/java/com/example/mvvm2/data/repository/local/SharedPreference.kt b/app/src/main/java/com/example/mvvm2/data/repository/local/SharedPreference.kt
new file mode 100644
index 0000000..3d2b800
--- /dev/null
+++ b/app/src/main/java/com/example/mvvm2/data/repository/local/SharedPreference.kt
@@ -0,0 +1,29 @@
+package com.example.mvvm2.data.repository.local
+
+import android.content.Context
+import android.content.SharedPreferences
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+
+object SharedPreference {
+    private const val PREF_NAME = "PREF"
+    private const val PREF_MODE = Context.MODE_PRIVATE
+    private lateinit var pref:SharedPreferences
+
+    fun init(context: Context) {
+        pref = context.getSharedPreferences(PREF_NAME, PREF_MODE)
+    }
+
+    private const val HISTORY_KEY = "HISTORY"
+    fun getHistory(): ArrayList<String>{
+        val history = pref.getString(HISTORY_KEY, null)
+        return Gson().fromJson(history, object : TypeToken<ArrayList<String>>() {}.type)}
+    fun setHistory(h:String) {
+        val history:ArrayList<String> = getHistory()
+        if (history.size == 5) {
+            history.removeAt(-1)
+        }
+        history.add(h)
+        pref.edit().putString(HISTORY_KEY, Gson().toJson(history)).apply()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mvvm2/data/repository/remote/RemoteDataSource.kt b/app/src/main/java/com/example/mvvm2/data/repository/remote/RemoteDataSource.kt
index 6ecbab9..98f3ad3 100644
--- a/app/src/main/java/com/example/mvvm2/data/repository/remote/RemoteDataSource.kt
+++ b/app/src/main/java/com/example/mvvm2/data/repository/remote/RemoteDataSource.kt
@@ -1,9 +1,7 @@
 package com.example.mvvm2.data.repository.remote
 
-import com.example.mvvm2.data.model.Movie
 import com.example.mvvm2.data.model.MovieResponse
 import retrofit2.Call
-import retrofit2.Response
 
 interface RemoteDataSource {
     fun getMovieList(query: String):Call<MovieResponse>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4e09659..28ffe8c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -27,11 +27,21 @@
         <Button
             android:id="@+id/main_search_btn"
             android:onClick="@{()->vm.getMoveList()}"
+            android:text="@string/main_search"
             android:layout_width="0dp"
             android:layout_height="50dp"
             app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/main_history_btn"/>
+
+        <Button
+            android:id="@+id/main_history_btn"
+            android:text="@string/main_history"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
             app:layout_constraintEnd_toEndOf="parent"/>
 
+
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/main_movie_recycler"
             bind_movie_list="@{vm.movieList}"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b1f4449..6b350e5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
 <resources>
     <string name="app_name">MVVM2</string>
+    <string name="main_search">검색</string>
+    <string name="main_history">검색기록</string>
 </resources>
\ No newline at end of file

From 602ac8d055d715d0ccb7dd94daefe9d3fc3cb696 Mon Sep 17 00:00:00 2001
From: junieberry <junyoung44@g.skku.edu>
Date: Sat, 16 Oct 2021 15:58:03 +0900
Subject: [PATCH 3/7] [Fix] Fix Preference

---
 app/src/main/AndroidManifest.xml              |  1 +
 app/src/main/java/com/example/mvvm2/App.kt    | 28 +++++++++++++++
 .../mvvm2/data/repository/Repository.kt       |  4 +--
 .../data/repository/local/LocalDataSource.kt  |  8 +++--
 .../data/repository/local/SharedPreference.kt | 36 +++++++++++--------
 .../example/mvvm2/ui/main/MainViewModel.kt    |  3 ++
 6 files changed, 60 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/java/com/example/mvvm2/App.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4b5cf57..1ccbd5a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/java/com/example/mvvm2/App.kt b/app/src/main/java/com/example/mvvm2/App.kt
new file mode 100644
index 0000000..4bd440c
--- /dev/null
+++ b/app/src/main/java/com/example/mvvm2/App.kt
@@ -0,0 +1,28 @@
+package com.example.mvvm2
+
+import android.app.Application
+import android.content.SharedPreferences
+import com.example.mvvm2.data.repository.local.SharedPreference
+
+class App: Application() {
+    override fun onCreate() {
+        super.onCreate()
+        instance = this
+    }
+
+    companion object {
+        lateinit var instance: App
+    }
+}
+
+//override fun onCreate() {
+//    super.onCreate()
+//    instance = this
+//    MultiDex.install(this)
+//
+//}
+//
+//
+//companion object {
+//    lateinit var instance: PillowApplication
+//}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mvvm2/data/repository/Repository.kt b/app/src/main/java/com/example/mvvm2/data/repository/Repository.kt
index 30e48a3..bbc8d99 100644
--- a/app/src/main/java/com/example/mvvm2/data/repository/Repository.kt
+++ b/app/src/main/java/com/example/mvvm2/data/repository/Repository.kt
@@ -11,7 +11,7 @@ interface Repository {
     val localDataSource: LocalDataSourceImpl
 
     fun getMovieList(query: String): Call<MovieResponse>
-    fun getHistory(): ArrayList<String>
+    fun getHistory(): ArrayList<String>?
     fun setHistory(title:String)
 }
 
@@ -25,7 +25,7 @@ class RepositoryImpl() : Repository {
         return remoteDataSource.getMovieList(query)
     }
 
-    override fun getHistory(): ArrayList<String> {
+    override fun getHistory(): ArrayList<String>? {
         return localDataSource.getHistory()
     }
 
diff --git a/app/src/main/java/com/example/mvvm2/data/repository/local/LocalDataSource.kt b/app/src/main/java/com/example/mvvm2/data/repository/local/LocalDataSource.kt
index 45ad339..8d4d723 100644
--- a/app/src/main/java/com/example/mvvm2/data/repository/local/LocalDataSource.kt
+++ b/app/src/main/java/com/example/mvvm2/data/repository/local/LocalDataSource.kt
@@ -1,15 +1,17 @@
 package com.example.mvvm2.data.repository.local
 
+import com.example.mvvm2.App
+
 interface LocalDataSource {
     val pref: SharedPreference
-        get() = SharedPreference
+        get() = SharedPreference(App.instance.applicationContext)
 
-    fun getHistory(): ArrayList<String>
+    fun getHistory(): ArrayList<String>?
     fun setHistory(title:String)
 }
 
 class LocalDataSourceImpl():LocalDataSource{
-    override fun getHistory(): ArrayList<String> {
+    override fun getHistory(): ArrayList<String>? {
         return pref.getHistory()
     }
 
diff --git a/app/src/main/java/com/example/mvvm2/data/repository/local/SharedPreference.kt b/app/src/main/java/com/example/mvvm2/data/repository/local/SharedPreference.kt
index 3d2b800..cce7eb0 100644
--- a/app/src/main/java/com/example/mvvm2/data/repository/local/SharedPreference.kt
+++ b/app/src/main/java/com/example/mvvm2/data/repository/local/SharedPreference.kt
@@ -2,28 +2,34 @@ package com.example.mvvm2.data.repository.local
 
 import android.content.Context
 import android.content.SharedPreferences
+import android.util.Log
+import com.example.mvvm2.App
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 
-object SharedPreference {
-    private const val PREF_NAME = "PREF"
-    private const val PREF_MODE = Context.MODE_PRIVATE
-    private lateinit var pref:SharedPreferences
+class SharedPreference(context: Context) {
+    private val PREF_NAME = "PREF"
+    private val PREF_MODE = Context.MODE_PRIVATE
+    private var pref: SharedPreferences = context.getSharedPreferences(PREF_NAME, PREF_MODE)
 
-    fun init(context: Context) {
-        pref = context.getSharedPreferences(PREF_NAME, PREF_MODE)
+
+    private val HISTORY = "HISTORY"
+    fun getHistory(): ArrayList<String>? {
+        val history = pref.getString(HISTORY, null)
+        return Gson().fromJson(history, object : TypeToken<ArrayList<String>>() {}.type)
     }
 
-    private const val HISTORY_KEY = "HISTORY"
-    fun getHistory(): ArrayList<String>{
-        val history = pref.getString(HISTORY_KEY, null)
-        return Gson().fromJson(history, object : TypeToken<ArrayList<String>>() {}.type)}
-    fun setHistory(h:String) {
-        val history:ArrayList<String> = getHistory()
-        if (history.size == 5) {
-            history.removeAt(-1)
+    fun setHistory(h: String) {
+        var history: ArrayList<String>? = getHistory()
+        if (history != null) {
+            if (history.size == 5) {
+                history.removeAt(0)
+            }
+        }
+        else {
+            history = arrayListOf()
         }
         history.add(h)
-        pref.edit().putString(HISTORY_KEY, Gson().toJson(history)).apply()
+        pref.edit().putString(HISTORY, Gson().toJson(history)).apply()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt b/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt
index 711e045..42fcca4 100644
--- a/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt
+++ b/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt
@@ -1,5 +1,6 @@
 package com.example.mvvm2.ui.main
 
+import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.example.mvvm2.data.model.Movie
@@ -17,6 +18,8 @@ class MainViewModel :ViewModel() {
     val repository: RepositoryImpl = RepositoryImpl()
 
     fun getMoveList () {
+        repository.setHistory(query)
+        Log.d("로그",repository.getHistory().toString())
         repository.getMovieList(query).enqueue(object : retrofit2.Callback<MovieResponse> {
             override fun onResponse(call: Call<MovieResponse>, response: Response<MovieResponse>) {
                 if (response.isSuccessful){

From 544e315ab8d21dc86e333652663c2e651e663107 Mon Sep 17 00:00:00 2001
From: junieberry <junyoung44@g.skku.edu>
Date: Sun, 17 Oct 2021 11:49:18 +0900
Subject: [PATCH 4/7] [Feat] Add HistoryActivity

---
 .idea/misc.xml                                |  1 +
 app/src/main/AndroidManifest.xml              |  3 ++
 app/src/main/java/com/example/mvvm2/App.kt    | 14 +-------
 .../mvvm2/ui/history/HistoryActivity.kt       | 33 +++++++++++++++++++
 .../mvvm2/ui/history/HistoryViewModel.kt      |  6 ++++
 .../com/example/mvvm2/ui/main/MainActivity.kt |  7 ++++
 .../mvvm2/ui/main/MainRecyclerAdapter.kt      | 15 +++++----
 .../example/mvvm2/ui/main/MainViewModel.kt    |  4 +--
 app/src/main/res/layout/activity_history.xml  | 19 +++++++++++
 9 files changed, 80 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/java/com/example/mvvm2/ui/history/HistoryActivity.kt
 create mode 100644 app/src/main/java/com/example/mvvm2/ui/history/HistoryViewModel.kt
 create mode 100644 app/src/main/res/layout/activity_history.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index da559e7..90847d0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,7 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/Users/82108/MVVM2/app/src/main/res/layout/activity_history.xml" value="0.22146739130434784" />
         <entry key="..\:/Users/82108/MVVM2/app/src/main/res/layout/activity_main.xml" value="0.25" />
         <entry key="..\:/Users/82108/MVVM2/app/src/main/res/layout/activity_movie.xml" value="0.17552083333333332" />
         <entry key="..\:/Users/82108/MVVM2/app/src/main/res/layout/item_main.xml" value="0.33" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1ccbd5a..688ba38 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.MVVM2">
+        <activity
+            android:name=".ui.history.HistoryActivity"
+            android:exported="true" />
         <activity
             android:name=".ui.moive.MovieActivity"
             android:exported="true" />
diff --git a/app/src/main/java/com/example/mvvm2/App.kt b/app/src/main/java/com/example/mvvm2/App.kt
index 4bd440c..ae76b94 100644
--- a/app/src/main/java/com/example/mvvm2/App.kt
+++ b/app/src/main/java/com/example/mvvm2/App.kt
@@ -13,16 +13,4 @@ class App: Application() {
     companion object {
         lateinit var instance: App
     }
-}
-
-//override fun onCreate() {
-//    super.onCreate()
-//    instance = this
-//    MultiDex.install(this)
-//
-//}
-//
-//
-//companion object {
-//    lateinit var instance: PillowApplication
-//}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mvvm2/ui/history/HistoryActivity.kt b/app/src/main/java/com/example/mvvm2/ui/history/HistoryActivity.kt
new file mode 100644
index 0000000..9ead0d4
--- /dev/null
+++ b/app/src/main/java/com/example/mvvm2/ui/history/HistoryActivity.kt
@@ -0,0 +1,33 @@
+package com.example.mvvm2.ui.history
+
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.ViewModelProvider
+import com.example.mvvm2.R
+import com.example.mvvm2.databinding.ActivityHistoryBinding
+import com.example.mvvm2.databinding.ActivityMainBinding
+import com.example.mvvm2.ui.main.MainRecyclerAdapter
+import com.example.mvvm2.ui.main.MainViewModel
+import com.example.mvvm2.ui.moive.MovieActivity
+
+class HistoryActivity : AppCompatActivity() {
+    private lateinit var  vm:HistoryViewModel
+    private lateinit var binding: ActivityHistoryBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        //viewmodel
+        vm = ViewModelProvider(
+            this,
+            ViewModelProvider.NewInstanceFactory()
+        )[HistoryViewModel::class.java]
+
+        //binding
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_history)
+        binding.vm = vm
+        binding.lifecycleOwner = this
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mvvm2/ui/history/HistoryViewModel.kt b/app/src/main/java/com/example/mvvm2/ui/history/HistoryViewModel.kt
new file mode 100644
index 0000000..c5a20cf
--- /dev/null
+++ b/app/src/main/java/com/example/mvvm2/ui/history/HistoryViewModel.kt
@@ -0,0 +1,6 @@
+package com.example.mvvm2.ui.history
+
+import androidx.lifecycle.ViewModel
+
+class HistoryViewModel:ViewModel() {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mvvm2/ui/main/MainActivity.kt b/app/src/main/java/com/example/mvvm2/ui/main/MainActivity.kt
index 19499c7..95cb082 100644
--- a/app/src/main/java/com/example/mvvm2/ui/main/MainActivity.kt
+++ b/app/src/main/java/com/example/mvvm2/ui/main/MainActivity.kt
@@ -7,6 +7,7 @@ import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.ViewModelProvider
 import com.example.mvvm2.R
 import com.example.mvvm2.databinding.ActivityMainBinding
+import com.example.mvvm2.ui.history.HistoryActivity
 import com.example.mvvm2.ui.moive.MovieActivity
 import javax.security.auth.callback.Callback
 import kotlin.math.log
@@ -36,5 +37,11 @@ class MainActivity : AppCompatActivity() {
             }
             startActivity(movieIntent)
         }
+
+        //History button clickListener
+        binding.mainHistoryBtn.setOnClickListener{
+            val historyIntent = Intent(this, HistoryActivity::class.java)
+            startActivity(historyIntent)
+        }
     }
 }
diff --git a/app/src/main/java/com/example/mvvm2/ui/main/MainRecyclerAdapter.kt b/app/src/main/java/com/example/mvvm2/ui/main/MainRecyclerAdapter.kt
index 4009d60..6aa3c41 100644
--- a/app/src/main/java/com/example/mvvm2/ui/main/MainRecyclerAdapter.kt
+++ b/app/src/main/java/com/example/mvvm2/ui/main/MainRecyclerAdapter.kt
@@ -8,8 +8,10 @@ import com.example.mvvm2.data.model.Movie
 import com.example.mvvm2.databinding.ItemMainBinding
 import com.example.mvvm2.ui.moive.MovieActivity
 
-class MainRecyclerAdapter ( val movieClickListener: (Movie)->Unit) : RecyclerView.Adapter<MainRecyclerAdapter.ViewHolder>() {
-    var movies:ArrayList<Movie> = arrayListOf()
+class MainRecyclerAdapter(val movieClickListener: (Movie) -> Unit) :
+    RecyclerView.Adapter<MainRecyclerAdapter.ViewHolder>() {
+
+    var movies: ArrayList<Movie> = arrayListOf()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val binding = ItemMainBinding.inflate(LayoutInflater.from(parent.context), parent, false)
@@ -18,24 +20,23 @@ class MainRecyclerAdapter ( val movieClickListener: (Movie)->Unit) : RecyclerVie
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         holder.bind(movies[position])
-        holder.itemView.setOnClickListener{movieClickListener(movies[position])}
+        holder.itemView.setOnClickListener { movieClickListener(movies[position]) }
     }
 
     override fun getItemCount(): Int {
         return movies.size
     }
 
-    fun setItem(movies : ArrayList<Movie>) {
+    fun setItem(movies: ArrayList<Movie>) {
         this.movies.clear()
         this.movies.addAll(movies)
         notifyDataSetChanged()
     }
 
-    class ViewHolder(private val binding: ItemMainBinding) :RecyclerView.ViewHolder(binding.root) {
-        fun bind (movie:Movie) {
+    class ViewHolder(private val binding: ItemMainBinding) : RecyclerView.ViewHolder(binding.root) {
+        fun bind(movie: Movie) {
             binding.movie = movie
         }
-
     }
 
 }
diff --git a/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt b/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt
index 42fcca4..1f51506 100644
--- a/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt
+++ b/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt
@@ -1,5 +1,6 @@
 package com.example.mvvm2.ui.main
 
+import android.content.Intent
 import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -9,6 +10,7 @@ import com.example.mvvm2.data.repository.Repository
 import com.example.mvvm2.data.repository.RepositoryImpl
 import com.example.mvvm2.data.repository.remote.BaseRetrofit
 import com.example.mvvm2.data.repository.remote.MovieRetrofit
+import com.example.mvvm2.ui.history.HistoryActivity
 import retrofit2.Call
 import retrofit2.Response
 
@@ -19,7 +21,6 @@ class MainViewModel :ViewModel() {
 
     fun getMoveList () {
         repository.setHistory(query)
-        Log.d("로그",repository.getHistory().toString())
         repository.getMovieList(query).enqueue(object : retrofit2.Callback<MovieResponse> {
             override fun onResponse(call: Call<MovieResponse>, response: Response<MovieResponse>) {
                 if (response.isSuccessful){
@@ -30,7 +31,6 @@ class MainViewModel :ViewModel() {
             }
         }
         )
-
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_history.xml b/app/src/main/res/layout/activity_history.xml
new file mode 100644
index 0000000..9a0b31c
--- /dev/null
+++ b/app/src/main/res/layout/activity_history.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+    <data>
+        <variable
+            name="vm"
+            type="com.example.mvvm2.ui.history.HistoryViewModel" />
+    </data>
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".ui.history.HistoryActivity">
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file

From 1221d7e6058718681e79f720416fa79ae43aaba7 Mon Sep 17 00:00:00 2001
From: junieberry <junyoung44@g.skku.edu>
Date: Sun, 17 Oct 2021 12:32:15 +0900
Subject: [PATCH 5/7] [Feat] Add History Recycler View

---
 .idea/misc.xml                                |  1 +
 .../mvvm2/ui/history/HistoryActivity.kt       |  9 +++++
 .../ui/history/HistoryRecyclerAdapter.kt      | 40 +++++++++++++++++++
 .../mvvm2/ui/history/HistoryViewModel.kt      |  9 +++++
 .../com/example/mvvm2/ui/main/MainActivity.kt |  6 +++
 .../mvvm2/ui/main/MainBindingAdapter.kt       |  8 ++++
 app/src/main/res/layout/activity_history.xml  | 10 +++++
 app/src/main/res/layout/activity_main.xml     |  1 +
 app/src/main/res/layout/item_history.xml      | 22 ++++++++++
 9 files changed, 106 insertions(+)
 create mode 100644 app/src/main/java/com/example/mvvm2/ui/history/HistoryRecyclerAdapter.kt
 create mode 100644 app/src/main/res/layout/item_history.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 90847d0..942c66b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,6 +6,7 @@
         <entry key="..\:/Users/82108/MVVM2/app/src/main/res/layout/activity_history.xml" value="0.22146739130434784" />
         <entry key="..\:/Users/82108/MVVM2/app/src/main/res/layout/activity_main.xml" value="0.25" />
         <entry key="..\:/Users/82108/MVVM2/app/src/main/res/layout/activity_movie.xml" value="0.17552083333333332" />
+        <entry key="..\:/Users/82108/MVVM2/app/src/main/res/layout/item_history.xml" value="0.20572916666666666" />
         <entry key="..\:/Users/82108/MVVM2/app/src/main/res/layout/item_main.xml" value="0.33" />
       </map>
     </option>
diff --git a/app/src/main/java/com/example/mvvm2/ui/history/HistoryActivity.kt b/app/src/main/java/com/example/mvvm2/ui/history/HistoryActivity.kt
index 9ead0d4..52f8b47 100644
--- a/app/src/main/java/com/example/mvvm2/ui/history/HistoryActivity.kt
+++ b/app/src/main/java/com/example/mvvm2/ui/history/HistoryActivity.kt
@@ -8,6 +8,7 @@ import androidx.lifecycle.ViewModelProvider
 import com.example.mvvm2.R
 import com.example.mvvm2.databinding.ActivityHistoryBinding
 import com.example.mvvm2.databinding.ActivityMainBinding
+import com.example.mvvm2.ui.main.MainActivity
 import com.example.mvvm2.ui.main.MainRecyclerAdapter
 import com.example.mvvm2.ui.main.MainViewModel
 import com.example.mvvm2.ui.moive.MovieActivity
@@ -24,10 +25,18 @@ class HistoryActivity : AppCompatActivity() {
             this,
             ViewModelProvider.NewInstanceFactory()
         )[HistoryViewModel::class.java]
+        vm.getHistory()
 
         //binding
         binding = DataBindingUtil.setContentView(this, R.layout.activity_history)
         binding.vm = vm
         binding.lifecycleOwner = this
+        binding.historyRecycler.adapter = HistoryRecyclerAdapter(){
+            val mainIntent = Intent(this, MainActivity::class.java).apply {
+                putExtra("title", it)
+            }
+            startActivity(mainIntent)
+        }
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mvvm2/ui/history/HistoryRecyclerAdapter.kt b/app/src/main/java/com/example/mvvm2/ui/history/HistoryRecyclerAdapter.kt
new file mode 100644
index 0000000..062d5af
--- /dev/null
+++ b/app/src/main/java/com/example/mvvm2/ui/history/HistoryRecyclerAdapter.kt
@@ -0,0 +1,40 @@
+package com.example.mvvm2.ui.history
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.example.mvvm2.databinding.ItemHistoryBinding
+
+class HistoryRecyclerAdapter(val historyClickListener: (String) -> Unit) :
+    RecyclerView.Adapter<HistoryRecyclerAdapter.ViewHolder>() {
+
+    private val histories:ArrayList<String> = arrayListOf()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): HistoryRecyclerAdapter.ViewHolder {
+        val binding = ItemHistoryBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: HistoryRecyclerAdapter.ViewHolder, position: Int) {
+        holder.bind(histories[position])
+        holder.itemView.setOnClickListener { historyClickListener(histories[position])}
+    }
+
+    override fun getItemCount(): Int = histories.size
+
+    @SuppressLint("NotifyDataSetChanged")
+    fun setItem(histories: ArrayList<String>) {
+        this.histories.clear()
+        this.histories.addAll(histories)
+        notifyDataSetChanged()
+    }
+
+    class ViewHolder(private val binding:ItemHistoryBinding):RecyclerView.ViewHolder(binding.root){
+        fun bind(history:String) {
+            binding.history = history
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mvvm2/ui/history/HistoryViewModel.kt b/app/src/main/java/com/example/mvvm2/ui/history/HistoryViewModel.kt
index c5a20cf..a7687e4 100644
--- a/app/src/main/java/com/example/mvvm2/ui/history/HistoryViewModel.kt
+++ b/app/src/main/java/com/example/mvvm2/ui/history/HistoryViewModel.kt
@@ -1,6 +1,15 @@
 package com.example.mvvm2.ui.history
 
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.example.mvvm2.data.repository.RepositoryImpl
 
 class HistoryViewModel:ViewModel() {
+    val repository:RepositoryImpl = RepositoryImpl()
+
+    val historyList: MutableLiveData<ArrayList<String>?> = MutableLiveData()
+
+    fun getHistory () {
+        historyList.value = repository.getHistory()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mvvm2/ui/main/MainActivity.kt b/app/src/main/java/com/example/mvvm2/ui/main/MainActivity.kt
index 95cb082..b46c6ec 100644
--- a/app/src/main/java/com/example/mvvm2/ui/main/MainActivity.kt
+++ b/app/src/main/java/com/example/mvvm2/ui/main/MainActivity.kt
@@ -27,6 +27,12 @@ class MainActivity : AppCompatActivity() {
             ViewModelProvider.NewInstanceFactory()
         )[MainViewModel::class.java]
 
+
+        if (intent.getStringExtra("title") != null) {
+            vm.query = intent.getStringExtra("title").toString()
+            vm.getMoveList()
+        }
+
         // binding
         binding = DataBindingUtil.setContentView(this, R.layout.activity_main)
         binding.vm = vm
diff --git a/app/src/main/java/com/example/mvvm2/ui/main/MainBindingAdapter.kt b/app/src/main/java/com/example/mvvm2/ui/main/MainBindingAdapter.kt
index 533d1b2..ec7736f 100644
--- a/app/src/main/java/com/example/mvvm2/ui/main/MainBindingAdapter.kt
+++ b/app/src/main/java/com/example/mvvm2/ui/main/MainBindingAdapter.kt
@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.example.mvvm2.R
 import com.example.mvvm2.data.model.Movie
+import com.example.mvvm2.ui.history.HistoryRecyclerAdapter
 
 @BindingAdapter("bind_movie_list")
 fun setMovie(recyclerView: RecyclerView, movies:ArrayList<Movie>?){
@@ -23,4 +24,11 @@ fun setImage(imageView: ImageView, url:String) {
         .load(url)
         .error(R.drawable.ic_launcher_foreground)
         .into(imageView)
+}
+
+@BindingAdapter("bind_history_list")
+fun setHistory(recyclerView: RecyclerView, histories: ArrayList<String>?) {
+    if (histories != null) {
+        (recyclerView.adapter as HistoryRecyclerAdapter).setItem(histories)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_history.xml b/app/src/main/res/layout/activity_history.xml
index 9a0b31c..b91ad33 100644
--- a/app/src/main/res/layout/activity_history.xml
+++ b/app/src/main/res/layout/activity_history.xml
@@ -15,5 +15,15 @@
         android:layout_height="match_parent"
         tools:context=".ui.history.HistoryActivity">
 
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/history_recycler"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            bind_history_list="@{vm.historyList}"/>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 28ffe8c..ead5272 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -38,6 +38,7 @@
             android:text="@string/main_history"
             android:layout_width="0dp"
             android:layout_height="50dp"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"/>
 
 
diff --git a/app/src/main/res/layout/item_history.xml b/app/src/main/res/layout/item_history.xml
new file mode 100644
index 0000000..abfa222
--- /dev/null
+++ b/app/src/main/res/layout/item_history.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <data>
+        <variable
+            name="history"
+            type="String" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp">
+
+        <TextView
+            android:id="@+id/history_title"
+            android:text="@{history}"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_horizontal|center_vertical"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

From 6aeab68058870e3661392bf0c15a4539a13c08a3 Mon Sep 17 00:00:00 2001
From: junieberry <junyoung44@g.skku.edu>
Date: Sun, 17 Oct 2021 12:57:34 +0900
Subject: [PATCH 6/7] [Feat] Add error messages

---
 .../com/example/mvvm2/ui/main/MainBindingAdapter.kt | 13 +++++++++++++
 .../java/com/example/mvvm2/ui/main/MainViewModel.kt |  5 +++++
 app/src/main/res/layout/activity_main.xml           | 11 +++++++++++
 app/src/main/res/values/strings.xml                 |  1 +
 4 files changed, 30 insertions(+)

diff --git a/app/src/main/java/com/example/mvvm2/ui/main/MainBindingAdapter.kt b/app/src/main/java/com/example/mvvm2/ui/main/MainBindingAdapter.kt
index ec7736f..fc50925 100644
--- a/app/src/main/java/com/example/mvvm2/ui/main/MainBindingAdapter.kt
+++ b/app/src/main/java/com/example/mvvm2/ui/main/MainBindingAdapter.kt
@@ -1,7 +1,9 @@
 package com.example.mvvm2.ui.main
 
 import android.util.Log
+import android.view.View
 import android.widget.ImageView
+import android.widget.TextView
 import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -9,6 +11,17 @@ import com.bumptech.glide.Glide
 import com.example.mvvm2.R
 import com.example.mvvm2.data.model.Movie
 import com.example.mvvm2.ui.history.HistoryRecyclerAdapter
+import org.w3c.dom.Text
+
+@BindingAdapter("bind_visible_if")
+fun setVisibility(textView:TextView, empty:Boolean) {
+    if (empty) {
+        textView.visibility = View.VISIBLE
+    }
+    else {
+        textView.visibility = View.GONE
+    }
+}
 
 @BindingAdapter("bind_movie_list")
 fun setMovie(recyclerView: RecyclerView, movies:ArrayList<Movie>?){
diff --git a/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt b/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt
index 1f51506..d264f59 100644
--- a/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt
+++ b/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt
@@ -2,8 +2,10 @@ package com.example.mvvm2.ui.main
 
 import android.content.Intent
 import android.util.Log
+import android.widget.Toast
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.example.mvvm2.App
 import com.example.mvvm2.data.model.Movie
 import com.example.mvvm2.data.model.MovieResponse
 import com.example.mvvm2.data.repository.Repository
@@ -16,6 +18,7 @@ import retrofit2.Response
 
 class MainViewModel :ViewModel() {
     var query:String = ""
+    var empty:MutableLiveData<Boolean> = MutableLiveData(false)
     val movieList: MutableLiveData<ArrayList<Movie>> = MutableLiveData()
     val repository: RepositoryImpl = RepositoryImpl()
 
@@ -25,9 +28,11 @@ class MainViewModel :ViewModel() {
             override fun onResponse(call: Call<MovieResponse>, response: Response<MovieResponse>) {
                 if (response.isSuccessful){
                     movieList.value = response.body()!!.items
+                    empty.value = movieList.value!!.size == 0
                 }
             }
             override fun onFailure(call: Call<MovieResponse>, t: Throwable) {
+                Toast.makeText(App.instance.applicationContext, "검색 도중 오류가 발생했습니다.", Toast.LENGTH_SHORT).show()
             }
         }
         )
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ead5272..eba5a08 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -52,5 +52,16 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/main_search_btn" />
 
+        <TextView
+            bind_visible_if="@{vm.empty}"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/main_none"
+            android:gravity="center_vertical|center_horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6b350e5..bbcd577 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,4 +2,5 @@
     <string name="app_name">MVVM2</string>
     <string name="main_search">검색</string>
     <string name="main_history">검색기록</string>
+    <string name="main_none">검색 결과가 존재하지 않습니다.</string>
 </resources>
\ No newline at end of file

From 9de780165698b079ecfaf4279dfb1e86027e5ce1 Mon Sep 17 00:00:00 2001
From: junieberry <junyoung44@g.skku.edu>
Date: Sun, 17 Oct 2021 13:03:59 +0900
Subject: [PATCH 7/7] [Update] Deduplication movie history, imporve code

---
 .../data/repository/local/SharedPreference.kt     | 15 ++++++---------
 .../com/example/mvvm2/ui/main/MainViewModel.kt    |  4 +++-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/example/mvvm2/data/repository/local/SharedPreference.kt b/app/src/main/java/com/example/mvvm2/data/repository/local/SharedPreference.kt
index cce7eb0..58355dc 100644
--- a/app/src/main/java/com/example/mvvm2/data/repository/local/SharedPreference.kt
+++ b/app/src/main/java/com/example/mvvm2/data/repository/local/SharedPreference.kt
@@ -20,16 +20,13 @@ class SharedPreference(context: Context) {
     }
 
     fun setHistory(h: String) {
-        var history: ArrayList<String>? = getHistory()
-        if (history != null) {
-            if (history.size == 5) {
-                history.removeAt(0)
-            }
-        }
-        else {
-            history = arrayListOf()
+        var history: ArrayList<String>? = if (getHistory().isNullOrEmpty()) arrayListOf() else getHistory()
+        history!!.add(h)
+        history = history.distinct() as ArrayList<String>
+
+        if (history.size == 6) {
+            history.removeAt(0)
         }
-        history.add(h)
         pref.edit().putString(HISTORY, Gson().toJson(history)).apply()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt b/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt
index d264f59..6c80127 100644
--- a/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt
+++ b/app/src/main/java/com/example/mvvm2/ui/main/MainViewModel.kt
@@ -23,7 +23,9 @@ class MainViewModel :ViewModel() {
     val repository: RepositoryImpl = RepositoryImpl()
 
     fun getMoveList () {
-        repository.setHistory(query)
+        if (query.isNotEmpty()) {
+            repository.setHistory(query)
+        }
         repository.getMovieList(query).enqueue(object : retrofit2.Callback<MovieResponse> {
             override fun onResponse(call: Call<MovieResponse>, response: Response<MovieResponse>) {
                 if (response.isSuccessful){