Finished search manga page controller

4 files changed, 87 insertions, 58 deletions

diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/SearchMangaController.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/SearchMangaController.kt
new file mode 100644
index 0000000..572c57e
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/SearchMangaController.kt
@@ -0,0 +1,73 @@
+package xyz.adjutor.aniki.presentation.controller
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import xyz.adjutor.aniki.data.manga.SearchMangaApi
+import xyz.adjutor.aniki.presentation.model.manga.SearchManga
+import xyz.adjutor.aniki.presentation.model.manga.SearchMangaResponse
+import xyz.adjutor.aniki.presentation.view.manga.SearchMangaPage
+
+class SearchMangaController {
+
+    lateinit var gson: Gson
+    lateinit var baseUrl: String //the api's base url
+    lateinit var view: SearchMangaPage
+
+    fun onStart(searchMangaPage: SearchMangaPage) {
+
+        view = searchMangaPage
+        baseUrl = "https://api.jikan.moe/" //the api's base url
+        gson = GsonBuilder()
+            .setLenient()
+            .create()
+    }
+
+    //call the API and show the list
+    private fun makeApiCall(view: SearchMangaPage, BASE_URL: String, query: String) {
+
+        val retrofit = Retrofit.Builder()
+            .baseUrl(BASE_URL)
+            .addConverterFactory(GsonConverterFactory.create(gson))
+            .build()
+
+        val service = retrofit.create(SearchMangaApi::class.java)
+        val call =
+            service.getSearchMangaData(q = query) //fate is an exemple, we'll have to replace it by the user input.
+
+        call.enqueue(object : Callback<SearchMangaResponse> {
+            override fun onResponse(
+                call: Call<SearchMangaResponse>,
+                response: Response<SearchMangaResponse>
+            ) {
+                if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty
+
+                    val mangaList: List<SearchManga> = response.body()!!
+                        .getResults() //getting the "search" field containing our list of SearchMangas
+
+                    view.showList(
+                        view.requireView(),
+                        mangaList
+                    ) //calling the method in charge of displaying on the recyclerview
+
+                } else {
+                    view.showError() //a snackbar
+                }
+            }
+
+            override fun onFailure(call: Call<SearchMangaResponse>, t: Throwable) {
+                view.showError()
+            }
+
+        })
+    }
+
+    fun updateList(userInput: String) {
+        makeApiCall(view, baseUrl, userInput)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/SearchMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/SearchMangaPage.kt
index a571473..853ee22 100644
--- a/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/SearchMangaPage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/SearchMangaPage.kt
@@ -15,34 +15,27 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.textfield.TextInputEditText
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
 import xyz.adjutor.aniki.R
-import xyz.adjutor.aniki.data.manga.SearchMangaApi
+import xyz.adjutor.aniki.presentation.controller.SearchMangaController
 import xyz.adjutor.aniki.presentation.model.manga.SearchManga
-import xyz.adjutor.aniki.presentation.model.manga.SearchMangaResponse
 import xyz.adjutor.aniki.presentation.view.MainActivity
 
 
 class SearchMangaPage : Fragment() {
 
-    val gson: Gson = GsonBuilder()
-        .setLenient()
-        .create()
-    private var baseUrl = "https://api.jikan.moe/" //the api's base url
+    lateinit var controller: SearchMangaController
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         // Inflate the layout for this fragment
+        val view = inflater.inflate(R.layout.search_manga_page, container, false)
 
-        return inflater.inflate(R.layout.search_manga_page, container, false)
+        controller = SearchMangaController()
+        controller.onStart(this)
+
+        return view
     }
 
 
@@ -57,7 +50,7 @@ class SearchMangaPage : Fragment() {
         view.findViewById<Button>(R.id.button_query).setOnClickListener {
             val userInput = view.findViewById<TextInputEditText>(R.id.tiet_query).text.toString()
             hideKeyboard()
-            makeApiCall(view, baseUrl, userInput)
+            controller.updateList(userInput)
         }
 
         view.findViewById<TextInputEditText>(R.id.tiet_query)
@@ -66,7 +59,7 @@ class SearchMangaPage : Fragment() {
                     val userInput =
                         view.findViewById<TextInputEditText>(R.id.tiet_query).text.toString()
                     hideKeyboard()
-                    makeApiCall(view, baseUrl, userInput)
+                    controller.updateList(userInput)
                     return@OnEditorActionListener true
                 }
                 false
@@ -94,46 +87,9 @@ class SearchMangaPage : Fragment() {
         (recyclerView.adapter as SearchMangaAdapter).notifyDataSetChanged()
     }
 
-    //call the API and show the list
-    private fun makeApiCall(view: View, BASE_URL: String, query: String) {
-
-        val retrofit = Retrofit.Builder()
-            .baseUrl(BASE_URL)
-            .addConverterFactory(GsonConverterFactory.create(gson))
-            .build()
-
-        val service = retrofit.create(SearchMangaApi::class.java)
-        val call = service.getSearchMangaData(q = query) //fate is an exemple, we'll have to replace it by the user input.
-
-        call.enqueue(object : Callback<SearchMangaResponse> {
-            override fun onResponse(
-                call: Call<SearchMangaResponse>,
-                response: Response<SearchMangaResponse>
-            ) {
-                if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty
-
-                    val mangaList: List<SearchManga> = response.body()!!
-                        .getResults() //getting the "search" field containing our list of SearchMangas
-
-                    showList(
-                        view,
-                        mangaList
-                    ) //calling the method in charge of displaying on the recyclerview
-
-                } else {
-                    showError() //a snackbar
-                }
-            }
-
-            override fun onFailure(call: Call<SearchMangaResponse>, t: Throwable) {
-                showError()
-            }
-
-        })
-    }
 
     //display a snack
-    private fun showError() {
+    fun showError() {
         Snackbar.make(
             requireView(),
             "API ERROR : Verify your internet connection or your query.",
diff --git a/build.gradle b/build.gradle
index a33d7ea..cd9f6d3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,10 +3,10 @@ buildscript {
     ext.kotlin_version = "1.3.72"
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -17,7 +17,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 356bc93..3d9a37e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip