From c39f8d7212b8973893ef1197655a3ecafef9804f Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Tue, 23 Feb 2021 12:58:06 +0100
Subject: changed the bg color of the icon.
---
app/src/main/res/values/colors.xml | 2 --
1 file changed, 2 deletions(-)
(limited to 'app/src/main/res/values')
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 95a118e..ae0a497 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,8 +3,6 @@
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
- <color name="teal_200">#FF03DAC5</color>
- <color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
--
cgit v1.2.3
From 6d5df6250d4c060840b64d7441525f85146fb87b Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Tue, 2 Mar 2021 11:15:56 +0100
Subject: Building the basic files to display the searched mangas.
---
app/src/main/java/xyz/adjutor/aniki/HomePage.kt | 3 +
.../aniki/manga/search/SearchMangaAdapter.kt | 80 ++++++++++++++
.../adjutor/aniki/manga/search/SearchMangaPage.kt | 122 +++++++++++++++++++++
app/src/main/res/layout/home_page.xml | 11 ++
app/src/main/res/layout/search_manga_page.xml | 36 ++++++
app/src/main/res/navigation/nav_graph.xml | 13 +++
app/src/main/res/values/strings.xml | 2 +
7 files changed, 267 insertions(+)
create mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt
create mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt
create mode 100644 app/src/main/res/layout/search_manga_page.xml
(limited to 'app/src/main/res/values')
diff --git a/app/src/main/java/xyz/adjutor/aniki/HomePage.kt b/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
index b7c1d0e..0b90b49 100644
--- a/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
@@ -27,5 +27,8 @@ class HomePage : Fragment() {
view.findViewById<Button>(R.id.button_top_anime).setOnClickListener {
findNavController().navigate(R.id.action_HomePage_to_TopAnimePage)
}
+ view.findViewById<Button>(R.id.button_search_manga).setOnClickListener {
+ findNavController().navigate(R.id.action_HomePage_to_SearchMangaPage)
+ }
}
}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt
new file mode 100644
index 0000000..13b2446
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt
@@ -0,0 +1,80 @@
+package xyz.adjutor.aniki.manga.search
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
+import xyz.adjutor.aniki.R
+
+class SearchMangaAdapter(private val mangaList: List<SearchManga>) :
+ RecyclerView.Adapter<SearchMangaAdapter.MangaViewHolder>() {
+
+ // Describes an item view and its place within the RecyclerView
+ class MangaViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+ val mangaTitle: TextView = itemView.findViewById(R.id.tv_title)
+ val mangaRank: TextView = itemView.findViewById(R.id.tv_rank)
+ val mangaScore: TextView = itemView.findViewById(R.id.tv_score)
+ val mangaImage: ImageView = itemView.findViewById(R.id.iv_image)
+ //val cardview: CardView = itemView.findViewById(R.id.cv_cardView)
+ }
+
+ // Returns a new ViewHolder
+ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MangaViewHolder {
+ val view = LayoutInflater.from(parent.context)
+ .inflate(R.layout.item_layout, parent, false)
+
+ return MangaViewHolder(view)
+ }
+
+ // Returns size of data list
+ override fun getItemCount(): Int {
+ return mangaList.size
+ }
+
+ // Displays data at a certain position
+ override fun onBindViewHolder(holder: MangaViewHolder, position: Int) {
+ val currentManga: SearchManga = mangaList[position]
+ holder.mangaTitle.text = currentManga.title
+ holder.mangaRank.text = "" //the rank isnt supplied by this API
+ holder.mangaScore.text = currentManga.score.toString()
+ val image: String = currentManga.image_url.toString()
+ Glide
+ .with(holder.itemView.context)
+ .load(image)
+ .apply(RequestOptions().override(400))
+ .into(holder.mangaImage)
+
+ /*
+ //when you click on a selected cardview, some datas are sent to the other activity
+ holder.cardview.setOnClickListener {
+ val currentMangaId = "themangaid"
+ val currentMangaTitle = "themangatitle"
+ val currentMangaScore = "themangascore"
+ val currentMangaImageUrl = "themangaimageurl"
+ val currentMangaVolumes = "themangavolumes"
+ val currentMangaStartDate = "themangastartdate"
+ val currentMangaEndDate = "themangaenddate"
+ val currentMangaUrl = "themangaurl"
+
+ //intent is used to pass data to another activity
+
+ val intent: Intent =
+ Intent(holder.itemView.context, DetailSearchMangaActivity::class.java).apply {
+ putExtra(currentMangaId, currentManga.mal_id.toString())
+ putExtra(currentMangaTitle, currentManga.title)
+ putExtra(currentMangaScore, currentManga.score.toString())
+ putExtra(currentMangaImageUrl, currentManga.image_url.toString())
+ putExtra(currentMangaVolumes, currentManga.volumes.toString())
+ putExtra(currentMangaStartDate, currentManga.start_date)
+ putExtra(currentMangaEndDate, currentManga.end_date.toString())
+ putExtra(currentMangaUrl, currentManga.url.toString())
+ }
+ holder.itemView.context.startActivity(intent)
+ }
+ */
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt
new file mode 100644
index 0000000..6310dfc
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt
@@ -0,0 +1,122 @@
+package xyz.adjutor.aniki.manga.search
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.google.android.material.snackbar.Snackbar
+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
+
+class SearchMangaPage : Fragment() {
+
+ private lateinit var sharedPreferences: SharedPreferences
+ val gson: Gson = GsonBuilder()
+ .setLenient()
+ .create()
+ private var baseUrl = "https://api.jikan.moe/" //the api's base url
+
+ 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)
+
+ sharedPreferences = view.context.getSharedPreferences("sp_manga", Context.MODE_PRIVATE)
+
+
+ makeApiCall(view, baseUrl)
+
+ return view
+ }
+
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ //button to return to the home page
+ view.findViewById<Button>(R.id.button_home).setOnClickListener {
+ findNavController().navigate(R.id.action_SearchMangaPage_to_HomePage)
+ }
+
+ fun updateList() {
+ makeApiCall(view, baseUrl)
+ Snackbar.make(requireView(), "Data refreshed", Snackbar.LENGTH_LONG)
+ .setAction("Action", null).show()
+ }
+
+ val swipeRefresh: SwipeRefreshLayout = view.findViewById(R.id.swiperefresh)
+ swipeRefresh.setOnRefreshListener {
+ updateList()
+ swipeRefresh.isRefreshing = false
+ }
+
+ }
+
+ //display the recyclerview
+ fun showList(view: View, mangaList: List<SearchManga>) {
+ val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view)
+ recyclerView.setHasFixedSize(true)
+ recyclerView.layoutManager = LinearLayoutManager(view.context)
+ recyclerView.adapter = SearchMangaAdapter(mangaList)
+ (recyclerView.adapter as SearchMangaAdapter).notifyDataSetChanged()
+ }
+
+ private fun makeApiCall(view: View, BASE_URL: String) {
+
+ val retrofit = Retrofit.Builder()
+ .baseUrl(BASE_URL)
+ .addConverterFactory(GsonConverterFactory.create(gson))
+ .build()
+
+ val service = retrofit.create(SearchMangaApi::class.java)
+ val call = service.getSearchMangaData("fate") //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()
+ }
+
+ })
+ }
+
+ private fun showError() {
+ Snackbar.make(requireView(), "API ERROR", Snackbar.LENGTH_LONG)
+ .setAction("Action", null).show()
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/home_page.xml b/app/src/main/res/layout/home_page.xml
index 6456dfc..9a3ffdf 100644
--- a/app/src/main/res/layout/home_page.xml
+++ b/app/src/main/res/layout/home_page.xml
@@ -40,4 +40,15 @@
app:layout_constraintStart_toEndOf="@id/button_top_manga"
app:layout_constraintTop_toBottomOf="@id/tv_title" />
+ <Button
+ android:id="@+id/button_search_manga"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/search_manga"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/button_top_manga"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"/>
+
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_manga_page.xml b/app/src/main/res/layout/search_manga_page.xml
new file mode 100644
index 0000000..a6de772
--- /dev/null
+++ b/app/src/main/res/layout/search_manga_page.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/very_dark_purple"
+ tools:context=".manga.search.SearchMangaPage">
+
+ <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ android:id="@+id/swiperefresh"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/recycler_view"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:scrollbars="vertical"
+ app:layout_constraintBottom_toTopOf="@+id/button_home"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:listitem="@layout/item_layout" />
+ </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+ <Button
+ android:id="@+id/button_home"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/home"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 4ceeab2..2ee1921 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -17,6 +17,9 @@
<action
android:id="@+id/action_HomePage_to_TopAnimePage"
app:destination="@id/TopAnimePage" />
+ <action
+ android:id="@+id/action_HomePage_to_SearchMangaPage"
+ app:destination="@id/SearchMangaPage" />
</fragment>
@@ -40,5 +43,15 @@
android:id="@+id/action_TopAnimePage_to_HomePage"
app:destination="@id/HomePage" />
</fragment>
+ <fragment
+ android:id="@+id/SearchMangaPage"
+ android:name="xyz.adjutor.aniki.manga.search.SearchMangaPage"
+ android:label="@string/search_manga_page_label"
+ tools:layout="@layout/search_manga_page">
+
+ <action
+ android:id="@+id/action_SearchMangaPage_to_HomePage"
+ app:destination="@id/HomePage" />
+ </fragment>
</navigation>
\ 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 bb9520a..87630b3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,5 +35,7 @@
<string name="url">https://myanimelist.net/media/id/name</string>
<string name="text_episodes">"Episodes "</string>
<string name="episodes">0000</string>
+ <string name="search_manga_page_label">Search Manga Page</string>
+ <string name="search_manga">Search Manga</string>
</resources>
\ No newline at end of file
--
cgit v1.2.3
From 81a89af9aa3c35a991eced93eeaa5066804e3ee5 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Tue, 2 Mar 2021 12:05:27 +0100
Subject: Search working for mangas.
---
.../adjutor/aniki/manga/search/SearchMangaPage.kt | 28 +++++----------------
app/src/main/res/layout/search_manga_page.xml | 29 +++++++++++++++++-----
app/src/main/res/values/strings.xml | 1 +
3 files changed, 30 insertions(+), 28 deletions(-)
(limited to 'app/src/main/res/values')
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt
index 6310dfc..40f9633 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt
@@ -1,7 +1,5 @@
package xyz.adjutor.aniki.manga.search
-import android.content.Context
-import android.content.SharedPreferences
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
@@ -11,8 +9,8 @@ import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
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
@@ -24,7 +22,6 @@ import xyz.adjutor.aniki.R
class SearchMangaPage : Fragment() {
- private lateinit var sharedPreferences: SharedPreferences
val gson: Gson = GsonBuilder()
.setLenient()
.create()
@@ -37,11 +34,6 @@ class SearchMangaPage : Fragment() {
// Inflate the layout for this fragment
val view = inflater.inflate(R.layout.search_manga_page, container, false)
- sharedPreferences = view.context.getSharedPreferences("sp_manga", Context.MODE_PRIVATE)
-
-
- makeApiCall(view, baseUrl)
-
return view
}
@@ -54,18 +46,10 @@ class SearchMangaPage : Fragment() {
findNavController().navigate(R.id.action_SearchMangaPage_to_HomePage)
}
- fun updateList() {
- makeApiCall(view, baseUrl)
- Snackbar.make(requireView(), "Data refreshed", Snackbar.LENGTH_LONG)
- .setAction("Action", null).show()
+ view.findViewById<Button>(R.id.button_query).setOnClickListener{
+ val userInput = view.findViewById<TextInputEditText>(R.id.tiet_query).text.toString()
+ makeApiCall(view, baseUrl, userInput)
}
-
- val swipeRefresh: SwipeRefreshLayout = view.findViewById(R.id.swiperefresh)
- swipeRefresh.setOnRefreshListener {
- updateList()
- swipeRefresh.isRefreshing = false
- }
-
}
//display the recyclerview
@@ -77,7 +61,7 @@ class SearchMangaPage : Fragment() {
(recyclerView.adapter as SearchMangaAdapter).notifyDataSetChanged()
}
- private fun makeApiCall(view: View, BASE_URL: String) {
+ private fun makeApiCall(view: View, BASE_URL: String, query: String) {
val retrofit = Retrofit.Builder()
.baseUrl(BASE_URL)
@@ -85,7 +69,7 @@ class SearchMangaPage : Fragment() {
.build()
val service = retrofit.create(SearchMangaApi::class.java)
- val call = service.getSearchMangaData("fate") //fate is an exemple, we'll have to replace it by the user input.
+ 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(
diff --git a/app/src/main/res/layout/search_manga_page.xml b/app/src/main/res/layout/search_manga_page.xml
index a6de772..1470311 100644
--- a/app/src/main/res/layout/search_manga_page.xml
+++ b/app/src/main/res/layout/search_manga_page.xml
@@ -7,10 +7,27 @@
android:background="@color/very_dark_purple"
tools:context=".manga.search.SearchMangaPage">
- <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
- android:id="@+id/swiperefresh"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+
+ <com.google.android.material.textfield.TextInputEditText
+ android:id="@+id/tiet_query"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ app:layout_constraintBottom_toTopOf="@id/recycler_view"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/button_query"/>
+
+ <Button
+ android:id="@+id/button_query"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/recycler_view"
+ app:layout_constraintStart_toEndOf="@id/tiet_query"
+ android:text="@string/search"
+ />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
@@ -20,9 +37,8 @@
app:layout_constraintBottom_toTopOf="@+id/button_home"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tiet_query"
tools:listitem="@layout/item_layout" />
- </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<Button
android:id="@+id/button_home"
@@ -33,4 +49,5 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 87630b3..d7f7838 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,5 +37,6 @@
<string name="episodes">0000</string>
<string name="search_manga_page_label">Search Manga Page</string>
<string name="search_manga">Search Manga</string>
+ <string name="search">Search in the database</string>
</resources>
\ No newline at end of file
--
cgit v1.2.3
From d5dd918f2c8c0f29c70379fce6e40b79141c798a Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Tue, 2 Mar 2021 14:36:38 +0100
Subject: Added searching for animes. Auto keyboard hiding method when
submitting.
---
app/src/main/java/xyz/adjutor/aniki/HomePage.kt | 3 +
.../aniki/anime/search/SearchAnimeAdapter.kt | 80 ++++++++++++++
.../adjutor/aniki/anime/search/SearchAnimePage.kt | 119 +++++++++++++++++++++
.../adjutor/aniki/manga/search/SearchMangaPage.kt | 20 +++-
app/src/main/res/layout/home_page.xml | 10 ++
app/src/main/res/layout/search_anime_page.xml | 53 +++++++++
app/src/main/res/navigation/nav_graph.xml | 13 +++
app/src/main/res/values/strings.xml | 2 +
8 files changed, 297 insertions(+), 3 deletions(-)
create mode 100644 app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeAdapter.kt
create mode 100644 app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimePage.kt
create mode 100644 app/src/main/res/layout/search_anime_page.xml
(limited to 'app/src/main/res/values')
diff --git a/app/src/main/java/xyz/adjutor/aniki/HomePage.kt b/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
index 0b90b49..46dac33 100644
--- a/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
@@ -30,5 +30,8 @@ class HomePage : Fragment() {
view.findViewById<Button>(R.id.button_search_manga).setOnClickListener {
findNavController().navigate(R.id.action_HomePage_to_SearchMangaPage)
}
+ view.findViewById<Button>(R.id.button_search_anime).setOnClickListener {
+ findNavController().navigate(R.id.action_HomePage_to_SearchAnimePage)
+ }
}
}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeAdapter.kt
new file mode 100644
index 0000000..a3a4a97
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeAdapter.kt
@@ -0,0 +1,80 @@
+package xyz.adjutor.aniki.anime.search
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
+import xyz.adjutor.aniki.R
+
+class SearchAnimeAdapter(private val animeList: List<SearchAnime>) :
+ RecyclerView.Adapter<SearchAnimeAdapter.AnimeViewHolder>() {
+
+ // Describes an item view and its place within the RecyclerView
+ class AnimeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+ val animeTitle: TextView = itemView.findViewById(R.id.tv_title)
+ val animeRank: TextView = itemView.findViewById(R.id.tv_rank)
+ val animeScore: TextView = itemView.findViewById(R.id.tv_score)
+ val animeImage: ImageView = itemView.findViewById(R.id.iv_image)
+ //val cardview: CardView = itemView.findViewById(R.id.cv_cardView)
+ }
+
+ // Returns a new ViewHolder
+ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AnimeViewHolder {
+ val view = LayoutInflater.from(parent.context)
+ .inflate(R.layout.item_layout, parent, false)
+
+ return AnimeViewHolder(view)
+ }
+
+ // Returns size of data list
+ override fun getItemCount(): Int {
+ return animeList.size
+ }
+
+ // Displays data at a certain position
+ override fun onBindViewHolder(holder: AnimeViewHolder, position: Int) {
+ val currentAnime: SearchAnime = animeList[position]
+ holder.animeTitle.text = currentAnime.title
+ holder.animeRank.text = "" //the rank isnt supplied by this API
+ holder.animeScore.text = currentAnime.score.toString()
+ val image: String = currentAnime.image_url.toString()
+ Glide
+ .with(holder.itemView.context)
+ .load(image)
+ .apply(RequestOptions().override(400))
+ .into(holder.animeImage)
+
+ /*
+ //when you click on a selected cardview, some datas are sent to the other activity
+ holder.cardview.setOnClickListener {
+ val currentAnimeId = "theanimeid"
+ val currentAnimeTitle = "theanimetitle"
+ val currentAnimeScore = "theanimescore"
+ val currentAnimeImageUrl = "theanimeimageurl"
+ val currentAnimeVolumes = "theanimevolumes"
+ val currentAnimeStartDate = "theanimestartdate"
+ val currentAnimeEndDate = "theanimeenddate"
+ val currentAnimeUrl = "theanimeurl"
+
+ //intent is used to pass data to another activity
+
+ val intent: Intent =
+ Intent(holder.itemView.context, DetailSearchAnimeActivity::class.java).apply {
+ putExtra(currentAnimeId, currentAnime.mal_id.toString())
+ putExtra(currentAnimeTitle, currentAnime.title)
+ putExtra(currentAnimeScore, currentAnime.score.toString())
+ putExtra(currentAnimeImageUrl, currentAnime.image_url.toString())
+ putExtra(currentAnimeVolumes, currentAnime.volumes.toString())
+ putExtra(currentAnimeStartDate, currentAnime.start_date)
+ putExtra(currentAnimeEndDate, currentAnime.end_date.toString())
+ putExtra(currentAnimeUrl, currentAnime.url.toString())
+ }
+ holder.itemView.context.startActivity(intent)
+ }
+ */
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimePage.kt b/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimePage.kt
new file mode 100644
index 0000000..c1596c3
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimePage.kt
@@ -0,0 +1,119 @@
+package xyz.adjutor.aniki.anime.search
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.InputMethodManager
+import android.widget.Button
+import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.findNavController
+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.MainActivity
+import xyz.adjutor.aniki.R
+
+class SearchAnimePage : Fragment() {
+
+ val gson: Gson = GsonBuilder()
+ .setLenient()
+ .create()
+ private var baseUrl = "https://api.jikan.moe/" //the api's base url
+
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ // Inflate the layout for this fragment
+
+ return inflater.inflate(R.layout.search_anime_page, container, false)
+ }
+
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ //button to return to the home page
+ view.findViewById<Button>(R.id.button_home).setOnClickListener {
+ findNavController().navigate(R.id.action_SearchAnimePage_to_HomePage)
+ }
+
+ view.findViewById<Button>(R.id.button_query).setOnClickListener{
+ val userInput = view.findViewById<TextInputEditText>(R.id.tiet_query).text.toString()
+ hideKeyboard()
+ makeApiCall(view, baseUrl, userInput)
+ }
+ }
+
+ private fun hideKeyboard() {
+ val activity = activity as MainActivity
+
+ val view = activity.currentFocus
+ if (view != null) {
+ val imm = activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+ imm.hideSoftInputFromWindow(view.windowToken, 0)
+ }
+ }
+
+ //display the recyclerview
+ fun showList(view: View, animeList: List<SearchAnime>) {
+ val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view)
+ recyclerView.setHasFixedSize(true)
+ recyclerView.layoutManager = LinearLayoutManager(view.context)
+ recyclerView.adapter = SearchAnimeAdapter(animeList)
+ (recyclerView.adapter as SearchAnimeAdapter).notifyDataSetChanged()
+ }
+
+ 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(SearchAnimeApi::class.java)
+ val call = service.getSearchAnimeData(q = query) //fate is an exemple, we'll have to replace it by the user input.
+
+ call.enqueue(object : Callback<SearchAnimeResponse> {
+ override fun onResponse(
+ call: Call<SearchAnimeResponse>,
+ response: Response<SearchAnimeResponse>
+ ) {
+ if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty
+
+ val animeList: List<SearchAnime> = response.body()!!
+ .getResults() //getting the "search" field containing our list of SearchAnimes
+
+ showList(
+ view,
+ animeList
+ ) //calling the method in charge of displaying on the recyclerview
+
+ } else {
+ showError() //a snackbar
+ }
+ }
+
+ override fun onFailure(call: Call<SearchAnimeResponse>, t: Throwable) {
+ showError()
+ }
+
+ })
+ }
+
+ private fun showError() {
+ Snackbar.make(requireView(), "API ERROR : Verify your internet connection or your query.", Snackbar.LENGTH_LONG)
+ .setAction("Action", null).show()
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt
index 40f9633..f79db36 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt
@@ -1,9 +1,11 @@
package xyz.adjutor.aniki.manga.search
+import android.content.Context
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.view.inputmethod.InputMethodManager
import android.widget.Button
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
@@ -18,6 +20,7 @@ import retrofit2.Callback
import retrofit2.Response
import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory
+import xyz.adjutor.aniki.MainActivity
import xyz.adjutor.aniki.R
class SearchMangaPage : Fragment() {
@@ -32,9 +35,8 @@ class SearchMangaPage : Fragment() {
savedInstanceState: Bundle?
): View? {
// Inflate the layout for this fragment
- val view = inflater.inflate(R.layout.search_manga_page, container, false)
- return view
+ return inflater.inflate(R.layout.search_manga_page, container, false)
}
@@ -48,10 +50,22 @@ 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)
}
}
+ private fun hideKeyboard() {
+ val activity = activity as MainActivity
+
+ val view = activity.currentFocus
+ if (view != null) {
+ val imm = activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+ imm.hideSoftInputFromWindow(view.windowToken, 0)
+ }
+ }
+
+
//display the recyclerview
fun showList(view: View, mangaList: List<SearchManga>) {
val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view)
@@ -99,7 +113,7 @@ class SearchMangaPage : Fragment() {
}
private fun showError() {
- Snackbar.make(requireView(), "API ERROR", Snackbar.LENGTH_LONG)
+ Snackbar.make(requireView(), "API ERROR : Verify your internet connection or your query.", Snackbar.LENGTH_LONG)
.setAction("Action", null).show()
}
diff --git a/app/src/main/res/layout/home_page.xml b/app/src/main/res/layout/home_page.xml
index 9a3ffdf..be80747 100644
--- a/app/src/main/res/layout/home_page.xml
+++ b/app/src/main/res/layout/home_page.xml
@@ -48,6 +48,16 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/button_top_manga"
app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/button_search_anime"/>
+
+ <Button
+ android:id="@+id/button_search_anime"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/search_anime"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/button_top_anime"
+ app:layout_constraintStart_toEndOf="@id/button_search_manga"
app:layout_constraintEnd_toEndOf="parent"/>
diff --git a/app/src/main/res/layout/search_anime_page.xml b/app/src/main/res/layout/search_anime_page.xml
new file mode 100644
index 0000000..1f95b10
--- /dev/null
+++ b/app/src/main/res/layout/search_anime_page.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/very_dark_purple"
+ tools:context=".anime.search.SearchAnimePage">
+
+
+ <com.google.android.material.textfield.TextInputEditText
+ android:id="@+id/tiet_query"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ app:layout_constraintBottom_toTopOf="@id/recycler_view"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/button_query"/>
+
+ <Button
+ android:id="@+id/button_query"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/recycler_view"
+ app:layout_constraintStart_toEndOf="@id/tiet_query"
+ android:text="@string/search"
+ />
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/recycler_view"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:scrollbars="vertical"
+ app:layout_constraintBottom_toTopOf="@+id/button_home"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tiet_query"
+ tools:listitem="@layout/item_layout" />
+
+ <Button
+ android:id="@+id/button_home"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/home"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 2ee1921..89cbc89 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -20,6 +20,9 @@
<action
android:id="@+id/action_HomePage_to_SearchMangaPage"
app:destination="@id/SearchMangaPage" />
+ <action
+ android:id="@+id/action_HomePage_to_SearchAnimePage"
+ app:destination="@id/SearchAnimePage" />
</fragment>
@@ -53,5 +56,15 @@
android:id="@+id/action_SearchMangaPage_to_HomePage"
app:destination="@id/HomePage" />
</fragment>
+ <fragment
+ android:id="@+id/SearchAnimePage"
+ android:name="xyz.adjutor.aniki.anime.search.SearchAnimePage"
+ android:label="@string/search_anime_page_label"
+ tools:layout="@layout/search_anime_page">
+
+ <action
+ android:id="@+id/action_SearchAnimePage_to_HomePage"
+ app:destination="@id/HomePage" />
+ </fragment>
</navigation>
\ 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 d7f7838..2acf406 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,5 +38,7 @@
<string name="search_manga_page_label">Search Manga Page</string>
<string name="search_manga">Search Manga</string>
<string name="search">Search in the database</string>
+ <string name="search_anime">Search Anime</string>
+ <string name="search_anime_page_label">Search Anime Page</string>
</resources>
\ No newline at end of file
--
cgit v1.2.3
From dafb34569442334163eb7a249d155ec21379d9ea Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Fri, 12 Mar 2021 14:47:31 +0100
Subject: Adding colors to TextInputEditText from search pages.
---
app/src/main/res/layout/search_anime_page.xml | 8 +++++---
app/src/main/res/layout/search_manga_page.xml | 8 +++++---
app/src/main/res/values/colors.xml | 1 +
app/src/main/res/values/strings.xml | 1 +
4 files changed, 12 insertions(+), 6 deletions(-)
(limited to 'app/src/main/res/values')
diff --git a/app/src/main/res/layout/search_anime_page.xml b/app/src/main/res/layout/search_anime_page.xml
index 1f95b10..631ebde 100644
--- a/app/src/main/res/layout/search_anime_page.xml
+++ b/app/src/main/res/layout/search_anime_page.xml
@@ -7,16 +7,18 @@
android:background="@color/very_dark_purple"
tools:context=".anime.search.SearchAnimePage">
-
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/tiet_query"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:hint="@string/hint_query"
+ android:textColor="@color/very_light_magenta"
+ android:textColorHint="@color/grayish_magenta"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/recycler_view"
- app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/button_query"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toStartOf="@id/button_query"/>
+ app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button_query"
diff --git a/app/src/main/res/layout/search_manga_page.xml b/app/src/main/res/layout/search_manga_page.xml
index 1470311..02a62ff 100644
--- a/app/src/main/res/layout/search_manga_page.xml
+++ b/app/src/main/res/layout/search_manga_page.xml
@@ -7,16 +7,18 @@
android:background="@color/very_dark_purple"
tools:context=".manga.search.SearchMangaPage">
-
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/tiet_query"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:hint="@string/hint_query"
+ android:textColor="@color/very_light_magenta"
+ android:textColorHint="@color/grayish_magenta"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/recycler_view"
- app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/button_query"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toStartOf="@id/button_query"/>
+ app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button_query"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ae0a497..1dc4ee9 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,4 +10,5 @@
<color name="very_light_magenta">#FF70FF</color>
<color name="strong_pink">#D52C70</color>
<color name="slightly_desaturated_magenta">#c583b6</color>
+ <color name="grayish_magenta">#c9a6c9</color>
</resources>
\ 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 2acf406..c8c8ab9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,5 +40,6 @@
<string name="search">Search in the database</string>
<string name="search_anime">Search Anime</string>
<string name="search_anime_page_label">Search Anime Page</string>
+ <string name="hint_query">Your query …</string>
</resources>
\ No newline at end of file
--
cgit v1.2.3
From 7c9c60ae0e19946a59695186566d3ea1a67c4c47 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Fri, 12 Mar 2021 16:42:08 +0100
Subject: Detail for searched mangas is working.
---
app/src/main/AndroidManifest.xml | 4 +
.../java/xyz/adjutor/aniki/manga/MangaResponse.kt | 3 +
.../manga/search/DetailSearchMangaActivity.kt | 169 +++++++++++
.../aniki/manga/search/SearchMangaAdapter.kt | 24 +-
.../aniki/manga/topmanga/DetailTopMangaActivity.kt | 11 +-
.../res/layout/activity_detail_search_manga.xml | 313 +++++++++++++++++++++
app/src/main/res/values/strings.xml | 1 +
7 files changed, 511 insertions(+), 14 deletions(-)
create mode 100644 app/src/main/java/xyz/adjutor/aniki/manga/search/DetailSearchMangaActivity.kt
create mode 100644 app/src/main/res/layout/activity_detail_search_manga.xml
(limited to 'app/src/main/res/values')
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c24711c..4c79bd2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,10 @@
android:name="xyz.adjutor.aniki.anime.topanime.DetailTopAnimeActivity"
android:label="Details"
android:theme="@style/Theme.Aniki" />
+ <activity
+ android:name="xyz.adjutor.aniki.manga.search.DetailSearchMangaActivity"
+ android:label="Details"
+ android:theme="@style/Theme.Aniki" />
<activity
android:name=".MainActivity"
android:label="@string/app_name"
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt b/app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt
index 9b75aec..263b93c 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt
@@ -13,6 +13,9 @@ class MangaResponse { //only kept the infos I didn't have and that were interest
@SerializedName("synopsis")
var synopsis: String? = null
+ @SerializedName("rank")
+ var rank: Int? = null //added for the search feature (detail)
+
@SerializedName("background")
var background: String? = null //a bit of background story about the manga
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/DetailSearchMangaActivity.kt b/app/src/main/java/xyz/adjutor/aniki/manga/search/DetailSearchMangaActivity.kt
new file mode 100644
index 0000000..4ae01f8
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/search/DetailSearchMangaActivity.kt
@@ -0,0 +1,169 @@
+package xyz.adjutor.aniki.manga.search
+
+import android.os.Bundle
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
+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.manga.MangaApi
+import xyz.adjutor.aniki.manga.MangaResponse
+
+class DetailSearchMangaActivity : AppCompatActivity() {
+
+ private var baseUrl = "https://api.jikan.moe/"
+ private val gson = GsonBuilder()
+ .setLenient()
+ .create()
+
+ //used in the list
+ private val intentMangaImageUrl = "themangaimageurl"
+ private val intentMangaTitle = "themangatitle"
+ private val intentMangaScore = "themangascore"
+
+ //only used for the detail
+ private val intentMangaId = "themangaid"
+ private val intentMangaUrl = "themangaurl"
+ private val intentMangaChapters = "themangachapters"
+ private val intentMangaVolumes = "themangavolumes"
+ private val intentMangaStartDate = "themangastartdate"
+ private val intentMangaEndDate = "themangaenddate"
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_detail_search_manga)
+
+ val mangaImageUrl = intent.getStringExtra(intentMangaImageUrl)
+ val mangaTitle = intent.getStringExtra(intentMangaTitle)
+ val mangaScore = intent.getStringExtra(intentMangaScore)
+
+ val mangaId = intent.getStringExtra(intentMangaId)
+ val mangaUrl = intent.getStringExtra(intentMangaUrl)
+ val mangaChapters = intent.getStringExtra(intentMangaChapters)
+ val mangaVolumes = intent.getStringExtra(intentMangaVolumes)
+ val mangaStartDate = intent.getStringExtra(intentMangaStartDate)
+ val mangaEndDate = intent.getStringExtra(intentMangaEndDate)
+
+
+ val ivImage: ImageView = findViewById(R.id.iv_detail_image)
+ val tvTitle: TextView = findViewById(R.id.tv_detail_title)
+ val tvScore: TextView = findViewById(R.id.tv_detail_score)
+
+ val tvId: TextView = findViewById(R.id.tv_detail_id)
+ val tvUrl: TextView = findViewById(R.id.tv_url)
+ val tvChapters: TextView = findViewById(R.id.tv_chapters)
+ val tvVolumes: TextView = findViewById(R.id.tv_volumes)
+ val tvStartDate: TextView = findViewById(R.id.tv_start_date)
+ val tvEndDate: TextView = findViewById(R.id.tv_end_date)
+
+ Glide
+ .with(this)
+ .load(mangaImageUrl)
+ .apply(RequestOptions().override(400))
+ .into(ivImage)
+ tvTitle.text = mangaTitle
+ tvScore.text = mangaScore
+
+
+ tvId.text = mangaId
+ tvUrl.text = mangaUrl
+
+ //using null as a string because it has been converted to a string before
+ tvChapters.text = if (mangaChapters != "null") {
+ mangaChapters
+ } else {
+ fieldIsNull()
+ }
+
+ tvVolumes.text = if (mangaVolumes != "null") {
+ mangaVolumes
+ } else {
+ fieldIsNull()
+ }
+
+ tvStartDate.text = splitDate(mangaStartDate!!)
+
+ tvEndDate.text = if (mangaEndDate != "null") {
+ splitDate(mangaEndDate!!)
+ } else {
+ fieldIsNull()
+ }
+
+ makeApiCall(baseUrl, mangaId.toString())
+
+ }
+
+ private fun splitDate(mangaDate: String): CharSequence {
+ val delimiter = "T"
+ return mangaDate
+ .split(delimiter) //split between the date and the time
+ .toTypedArray()[0] //convert it to an array and take the first string
+
+ }
+
+ private fun makeApiCall(BASE_URL: String, mangaId: String) {
+
+ val retrofit = Retrofit.Builder()
+ .baseUrl(BASE_URL)
+ .addConverterFactory(GsonConverterFactory.create(gson))
+ .build()
+
+ val service = retrofit.create(MangaApi::class.java)
+ val call = service.getMangaData(mangaId) //based on the id
+
+ call.enqueue(object : Callback<MangaResponse> {
+ override fun onResponse(
+ call: Call<MangaResponse>,
+ response: Response<MangaResponse>
+ ) {
+ if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty
+
+ val manga = response.body() //getting the MangaResponse fields
+ showDetail(manga!!)
+
+ } else {
+ showError("API ERROR : is not successful")
+ }
+ }
+
+ override fun onFailure(call: Call<MangaResponse>, t: Throwable) {
+ showError("API ERROR : onFailure")
+ }
+
+ })
+ }
+
+ private fun showDetail(manga: MangaResponse) {
+ //elements from MangaResponse
+ val tvSynopsis: TextView = findViewById(R.id.tv_synopsis)
+ val tvRank: TextView = findViewById(R.id.tv_detail_rank)
+ val tvBackground: TextView = findViewById(R.id.tv_background)
+
+ tvSynopsis.text = manga.synopsis.toString()
+
+ tvRank.text = manga.rank.toString()
+
+ tvBackground.text = if (manga.background != null) {
+ manga.background.toString()
+ } else {
+ fieldIsNull()
+ }
+
+ }
+
+ fun showError(text: String) {
+ Toast.makeText(this, text, Toast.LENGTH_LONG).show()
+ }
+
+ private fun fieldIsNull(): String {
+ return "Unknown"
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt
index 13b2446..79f8cb3 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt
@@ -1,10 +1,12 @@
package xyz.adjutor.aniki.manga.search
+import android.content.Intent
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
+import androidx.cardview.widget.CardView
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.bumptech.glide.request.RequestOptions
@@ -19,7 +21,7 @@ class SearchMangaAdapter(private val mangaList: List<SearchManga>) :
val mangaRank: TextView = itemView.findViewById(R.id.tv_rank)
val mangaScore: TextView = itemView.findViewById(R.id.tv_score)
val mangaImage: ImageView = itemView.findViewById(R.id.iv_image)
- //val cardview: CardView = itemView.findViewById(R.id.cv_cardView)
+ val cardview: CardView = itemView.findViewById(R.id.cv_cardView)
}
// Returns a new ViewHolder
@@ -39,7 +41,7 @@ class SearchMangaAdapter(private val mangaList: List<SearchManga>) :
override fun onBindViewHolder(holder: MangaViewHolder, position: Int) {
val currentManga: SearchManga = mangaList[position]
holder.mangaTitle.text = currentManga.title
- holder.mangaRank.text = "" //the rank isnt supplied by this API
+ holder.mangaRank.text = "" //the rank isn't supplied by this API
holder.mangaScore.text = currentManga.score.toString()
val image: String = currentManga.image_url.toString()
Glide
@@ -48,33 +50,35 @@ class SearchMangaAdapter(private val mangaList: List<SearchManga>) :
.apply(RequestOptions().override(400))
.into(holder.mangaImage)
- /*
+
//when you click on a selected cardview, some datas are sent to the other activity
holder.cardview.setOnClickListener {
val currentMangaId = "themangaid"
- val currentMangaTitle = "themangatitle"
- val currentMangaScore = "themangascore"
+ val currentMangaUrl = "themangaurl"
val currentMangaImageUrl = "themangaimageurl"
+ val currentMangaTitle = "themangatitle"
+ val currentMangaChapters = "themangachapters"
val currentMangaVolumes = "themangavolumes"
+ val currentMangaScore = "themangascore"
val currentMangaStartDate = "themangastartdate"
val currentMangaEndDate = "themangaenddate"
- val currentMangaUrl = "themangaurl"
//intent is used to pass data to another activity
val intent: Intent =
Intent(holder.itemView.context, DetailSearchMangaActivity::class.java).apply {
putExtra(currentMangaId, currentManga.mal_id.toString())
- putExtra(currentMangaTitle, currentManga.title)
- putExtra(currentMangaScore, currentManga.score.toString())
+ putExtra(currentMangaUrl, currentManga.url.toString())
putExtra(currentMangaImageUrl, currentManga.image_url.toString())
+ putExtra(currentMangaTitle, currentManga.title)
+ putExtra(currentMangaChapters, currentManga.chapters.toString())
putExtra(currentMangaVolumes, currentManga.volumes.toString())
+ putExtra(currentMangaScore, currentManga.score.toString())
putExtra(currentMangaStartDate, currentManga.start_date)
putExtra(currentMangaEndDate, currentManga.end_date.toString())
- putExtra(currentMangaUrl, currentManga.url.toString())
}
holder.itemView.context.startActivity(intent)
}
- */
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/DetailTopMangaActivity.kt b/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/DetailTopMangaActivity.kt
index fc10e89..6d89437 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/DetailTopMangaActivity.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/DetailTopMangaActivity.kt
@@ -29,12 +29,14 @@ class DetailTopMangaActivity : AppCompatActivity() {
.setLenient()
.create()
- private val intentMangaId = "themangaid"
+ //used in the list
private val intentMangaTitle = "themangatitle"
private val intentMangaRank = "themangarank"
private val intentMangaScore = "themangascore"
private val intentMangaImageUrl = "themangaimageurl"
+ //only used for the detail
+ private val intentMangaId = "themangaid"
private val intentMangaVolumes = "themangavolumes"
private val intentMangaStartDate = "themangastartdate"
private val intentMangaEndDate = "themangaenddate"
@@ -46,29 +48,28 @@ class DetailTopMangaActivity : AppCompatActivity() {
sharedPreferences = this.getSharedPreferences("sp_manga", Context.MODE_PRIVATE)
- val mangaId = intent.getStringExtra(intentMangaId)
val mangaTitle = intent.getStringExtra(intentMangaTitle)
val mangaRank = intent.getStringExtra(intentMangaRank)
val mangaScore = intent.getStringExtra(intentMangaScore)
val mangaImageUrl = intent.getStringExtra(intentMangaImageUrl)
+ val mangaId = intent.getStringExtra(intentMangaId)
val mangaVolumes = intent.getStringExtra(intentMangaVolumes)
val mangaStartDate = intent.getStringExtra(intentMangaStartDate)
val mangaEndDate = intent.getStringExtra(intentMangaEndDate)
val mangaUrl = intent.getStringExtra(intentMangaUrl)
- val tvId: TextView = findViewById(R.id.tv_detail_id)
val tvTitle: TextView = findViewById(R.id.tv_detail_title)
val tvRank: TextView = findViewById(R.id.tv_detail_rank)
val tvScore: TextView = findViewById(R.id.tv_detail_score)
val ivImage: ImageView = findViewById(R.id.iv_detail_image)
+ val tvId: TextView = findViewById(R.id.tv_detail_id)
val tvVolumes: TextView = findViewById(R.id.tv_volumes)
val tvStartDate: TextView = findViewById(R.id.tv_start_date)
val tvEndDate: TextView = findViewById(R.id.tv_end_date)
val tvUrl: TextView = findViewById(R.id.tv_url)
- tvId.text = mangaId
tvTitle.text = mangaTitle
tvRank.text = mangaRank
tvScore.text = mangaScore
@@ -78,6 +79,8 @@ class DetailTopMangaActivity : AppCompatActivity() {
.apply(RequestOptions().override(400))
.into(ivImage)
+ tvId.text = mangaId
+
//using null as a string because it has been converted to a string before
tvVolumes.text = if (mangaVolumes != "null") {
mangaVolumes
diff --git a/app/src/main/res/layout/activity_detail_search_manga.xml b/app/src/main/res/layout/activity_detail_search_manga.xml
new file mode 100644
index 0000000..75cad74
--- /dev/null
+++ b/app/src/main/res/layout/activity_detail_search_manga.xml
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/very_dark_purple">
+
+ <androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:context=".manga.searchmanga.DetailSearchMangaActivity">
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cv_header"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="4sp"
+ app:cardBackgroundColor="@color/black"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="10dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:text="@string/text_mal_id"
+ android:textColor="@color/strong_pink"
+ app:layout_constraintEnd_toStartOf="@id/tv_detail_id" />
+
+ <TextView
+ android:id="@+id/tv_detail_id"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/id"
+ android:textColor="@color/slightly_desaturated_magenta"
+ android:textIsSelectable="true"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@id/iv_detail_image"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <ImageView
+ android:id="@+id/iv_detail_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@string/image"
+ android:src="@mipmap/ic_launcher"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/tv_detail_title"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_marginHorizontal="10sp"
+ android:fontFamily="@font/bangers"
+ android:text="@string/title"
+ android:textAlignment="center"
+ android:textColor="@color/strong_pink"
+ android:textIsSelectable="true"
+ android:textSize="30sp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@id/iv_detail_image"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/text_rank"
+ android:textColor="@color/strong_pink"
+ app:layout_constraintBottom_toBottomOf="@id/tv_detail_rank"
+ app:layout_constraintEnd_toStartOf="@id/tv_detail_rank"
+ app:layout_constraintTop_toTopOf="@id/tv_detail_rank" />
+
+ <TextView
+ android:id="@+id/tv_detail_rank"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/rank"
+ android:textColor="@color/slightly_desaturated_magenta"
+ android:textSize="20sp"
+ app:layout_constraintBottom_toTopOf="@id/tv_detail_title"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/text_score"
+ android:textColor="@color/strong_pink"
+ app:layout_constraintBottom_toBottomOf="@id/tv_detail_score"
+ app:layout_constraintEnd_toStartOf="@id/tv_detail_score"
+ app:layout_constraintTop_toTopOf="@id/tv_detail_score" />
+
+ <TextView
+ android:id="@+id/tv_detail_score"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/score"
+ android:textColor="@color/slightly_desaturated_magenta"
+ android:textSize="20sp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_detail_title" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.cardview.widget.CardView>
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cv_more_infos"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="4sp"
+ app:cardBackgroundColor="@color/black"
+ app:layout_constraintTop_toBottomOf="@id/cv_header">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="10dp">
+
+ <TextView
+ android:id="@+id/tv_text_volumes"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/text_volumes"
+ android:textColor="@color/strong_pink"
+ app:layout_constraintBottom_toBottomOf="@id/tv_volumes"
+ app:layout_constraintEnd_toStartOf="@id/tv_volumes"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="@id/tv_volumes" />
+
+ <TextView
+ android:id="@+id/tv_volumes"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/volumes"
+ android:textColor="@color/slightly_desaturated_magenta"
+ app:layout_constraintStart_toEndOf="@id/tv_text_volumes"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/tv_text_chapters"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/text_chapters"
+ android:textColor="@color/strong_pink"
+ app:layout_constraintBottom_toBottomOf="@id/tv_chapters"
+ app:layout_constraintEnd_toStartOf="@id/tv_chapters"
+ app:layout_constraintTop_toTopOf="@id/tv_chapters" />
+
+ <TextView
+ android:id="@+id/tv_chapters"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/chapters"
+ android:textColor="@color/slightly_desaturated_magenta"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toEndOf="@id/tv_text_chapters"
+ app:layout_constraintTop_toBottomOf="@id/tv_volumes" />
+
+ <TextView
+ android:id="@+id/tv_text_start_date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/text_start_date"
+ android:textColor="@color/strong_pink"
+ app:layout_constraintBottom_toBottomOf="@id/tv_start_date"
+ app:layout_constraintEnd_toStartOf="@id/tv_start_date"
+ app:layout_constraintTop_toTopOf="@id/tv_start_date" />
+
+ <TextView
+ android:id="@+id/tv_start_date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/start_date"
+ android:textColor="@color/slightly_desaturated_magenta"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/tv_text_end_date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/text_end_date"
+ android:textColor="@color/strong_pink"
+ app:layout_constraintBottom_toBottomOf="@id/tv_end_date"
+ app:layout_constraintEnd_toStartOf="@id/tv_end_date"
+ app:layout_constraintTop_toTopOf="@id/tv_end_date" />
+
+ <TextView
+ android:id="@+id/tv_end_date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/end_date"
+ android:textColor="@color/slightly_desaturated_magenta"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_start_date" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.cardview.widget.CardView>
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cv_synopsis"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="4sp"
+ app:cardBackgroundColor="@color/black"
+ app:layout_constraintTop_toBottomOf="@id/cv_more_infos">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="10dp">
+
+ <TextView
+ android:id="@+id/tv_text_synopsis"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/text_synopsis"
+ android:textColor="@color/strong_pink"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/tv_synopsis"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/slightly_desaturated_magenta"
+ android:textIsSelectable="true"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_text_synopsis" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.cardview.widget.CardView>
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cv_background"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="4sp"
+ app:cardBackgroundColor="@color/black"
+ app:layout_constraintTop_toBottomOf="@id/cv_synopsis">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="10dp">
+
+
+ <TextView
+ android:id="@+id/tv_text_background"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/text_background"
+ android:textColor="@color/strong_pink"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/tv_background"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/slightly_desaturated_magenta"
+ android:textIsSelectable="true"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_text_background" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.cardview.widget.CardView>
+
+ <androidx.cardview.widget.CardView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="4sp"
+ app:cardBackgroundColor="@color/black"
+ app:layout_constraintTop_toBottomOf="@id/cv_background">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="10dp">
+
+
+ <TextView
+ android:id="@+id/tv_text_url"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/text_url"
+ android:textColor="@color/strong_pink"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/tv_url"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:autoLink="all"
+ android:text="@string/url"
+ android:textColor="@color/slightly_desaturated_magenta"
+ android:textColorLink="@color/very_light_magenta"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_text_url" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.cardview.widget.CardView>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ 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 c8c8ab9..0c56edc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,6 +35,7 @@
<string name="url">https://myanimelist.net/media/id/name</string>
<string name="text_episodes">"Episodes "</string>
<string name="episodes">0000</string>
+
<string name="search_manga_page_label">Search Manga Page</string>
<string name="search_manga">Search Manga</string>
<string name="search">Search in the database</string>
--
cgit v1.2.3
From 1d70485121c604300ae371468f2f3c6fbdca395c Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Sun, 14 Mar 2021 13:09:20 +0100
Subject: Update README.md and colors.xml
---
README.md | 4 ++--
app/src/main/res/values/colors.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'app/src/main/res/values')
diff --git a/README.md b/README.md
index 3072d2d..49b81f2 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ It consists of colors of the pink/purple "family" :
very dark purple : #09022A
very light magenta : #FF70FF
strong pink : #D52C70
-slightly desaturated magenta : #c583b6
-
+slightly desaturated magenta : #C583B6
+grayish magenta : #C9A6C9
Development done with a Gitflow workflow.
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1dc4ee9..caca611 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,6 +9,6 @@
<color name="very_dark_purple">#09022A</color>
<color name="very_light_magenta">#FF70FF</color>
<color name="strong_pink">#D52C70</color>
- <color name="slightly_desaturated_magenta">#c583b6</color>
- <color name="grayish_magenta">#c9a6c9</color>
+ <color name="slightly_desaturated_magenta">#C583B6</color>
+ <color name="grayish_magenta">#C9A6C9</color>
</resources>
\ No newline at end of file
--
cgit v1.2.3
From d283df0f70241bb6b54bee66e8fb9564b0051376 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Tue, 23 Mar 2021 10:38:03 +0100
Subject: Feature added to mangas Display other pages by touching the bottom or
by clicking buttons
---
README.md | 4 +-
.../adjutor/aniki/manga/topmanga/TopMangaApi.kt | 5 ++-
.../adjutor/aniki/manga/topmanga/TopMangaPage.kt | 48 ++++++++++++++++++++--
app/src/main/res/layout/top_manga_page.xml | 16 ++++++++
app/src/main/res/values/strings.xml | 2 +
5 files changed, 68 insertions(+), 7 deletions(-)
(limited to 'app/src/main/res/values')
diff --git a/README.md b/README.md
index ad56981..24ea18c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
List of elements used in top manga and top anime with a recycler view
-SwipeRefresh used to refresh the list of data.
+SwipeRefresh used to refresh the list of data of the frist page.
+Thanks to the scroll listener, touch the bottom of the page to load another page, replacing the first one.
+Use the button (prev and next) to navigate with ease through the pages. The "ScrollListener" was added as a practice, it's not the best feature to navigate.
Details of a chosen element from the recycler view with an intent object
Title, synopsys and background clickable.
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaApi.kt b/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaApi.kt
index 629fe02..2688fab 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaApi.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaApi.kt
@@ -2,10 +2,11 @@ package xyz.adjutor.aniki.manga.topmanga
import retrofit2.Call
import retrofit2.http.GET
+import retrofit2.http.Path
interface TopMangaApi {
- @GET("v3/top/manga")
- fun getTopMangaData(): Call<TopMangaResponse>
+ @GET("v3/top/manga/{page}")
+ fun getTopMangaData(@Path("page") page: Int): Call<TopMangaResponse>
}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaPage.kt
index b35bcdd..ea240b9 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaPage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaPage.kt
@@ -24,6 +24,7 @@ import retrofit2.converter.gson.GsonConverterFactory
import xyz.adjutor.aniki.R
import java.lang.reflect.Type
+
class TopMangaPage : Fragment() {
private lateinit var sharedPreferences: SharedPreferences
@@ -31,6 +32,7 @@ class TopMangaPage : Fragment() {
.setLenient()
.create()
private var baseUrl = "https://api.jikan.moe/" //the api's base url
+ var page: Int = 1
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
@@ -45,10 +47,29 @@ class TopMangaPage : Fragment() {
if (mangaList != null) {
showList(view, mangaList)
} else {
- makeApiCall(view, baseUrl)
+ makeApiCall(view, baseUrl, 1)
}
+ // add other pages when we touch the bottom
+ val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view)
+ recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+ override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+ super.onScrollStateChanged(recyclerView, newState)
+ if (!recyclerView.canScrollVertically(1)) { //direction integers: -1 for up, 1 for down, 0 will always return false.
+ page += 1
+ makeApiCall(view, baseUrl, page)
+ Snackbar.make(
+ requireView(),
+ "Page $page has been loaded.",
+ Snackbar.LENGTH_LONG
+ )
+ .setAction("Action", null).show()
+ }
+ }
+ })
+
return view
+
}
private fun getDataFromCache(): List<TopManga>? {
@@ -71,16 +92,35 @@ class TopMangaPage : Fragment() {
view.findViewById<Button>(R.id.button_home).setOnClickListener {
findNavController().navigate(R.id.action_TopMangaPage_to_HomePage)
}
+ view.findViewById<Button>(R.id.button_prev).setOnClickListener {
+ if (page > 1) {
+ page -= 1
+ makeApiCall(view, baseUrl, page)
+ Snackbar.make(requireView(), "Page $page has been loaded.", Snackbar.LENGTH_LONG)
+ .setAction("Action", null).show()
+ } else {
+ Snackbar.make(requireView(), "You're already page 1.", Snackbar.LENGTH_LONG)
+ .setAction("Action", null).show()
+ }
+ }
+ view.findViewById<Button>(R.id.button_next).setOnClickListener {
+ page += 1
+ makeApiCall(view, baseUrl, page)
+ Snackbar.make(requireView(), "Page $page has been loaded.", Snackbar.LENGTH_LONG)
+ .setAction("Action", null).show()
+ }
fun updateList() {
- makeApiCall(view, baseUrl)
+ makeApiCall(view, baseUrl, 1)
Snackbar.make(requireView(), "Data refreshed", Snackbar.LENGTH_LONG)
.setAction("Action", null).show()
}
+ //refresh when swiping down at the top of the page
val swipeRefresh: SwipeRefreshLayout = view.findViewById(R.id.swiperefresh)
swipeRefresh.setOnRefreshListener {
updateList()
+ page = 1
swipeRefresh.isRefreshing = false
}
@@ -95,7 +135,7 @@ class TopMangaPage : Fragment() {
(recyclerView.adapter as TopMangaAdapter).notifyDataSetChanged()
}
- private fun makeApiCall(view: View, BASE_URL: String) {
+ private fun makeApiCall(view: View, BASE_URL: String, page: Int) {
val retrofit = Retrofit.Builder()
.baseUrl(BASE_URL)
@@ -103,7 +143,7 @@ class TopMangaPage : Fragment() {
.build()
val service = retrofit.create(TopMangaApi::class.java)
- val call = service.getTopMangaData()
+ val call = service.getTopMangaData(page)
call.enqueue(object : Callback<TopMangaResponse> {
override fun onResponse(
diff --git a/app/src/main/res/layout/top_manga_page.xml b/app/src/main/res/layout/top_manga_page.xml
index f3d0db3..2f4a9f1 100644
--- a/app/src/main/res/layout/top_manga_page.xml
+++ b/app/src/main/res/layout/top_manga_page.xml
@@ -24,6 +24,14 @@
tools:listitem="@layout/item_layout" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ <Button
+ android:id="@+id/button_prev"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/prev"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/button_home" />
+
<Button
android:id="@+id/button_home"
android:layout_width="wrap_content"
@@ -33,4 +41,12 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
+ <Button
+ android:id="@+id/button_next"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/next"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toEndOf="@id/button_home" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 0c56edc..861a440 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,5 +42,7 @@
<string name="search_anime">Search Anime</string>
<string name="search_anime_page_label">Search Anime Page</string>
<string name="hint_query">Your query …</string>
+ <string name="prev">PREV</string>
+ <string name="next">NEXT</string>
</resources>
\ No newline at end of file
--
cgit v1.2.3