From 04a65204406247589b2a334f5367e8384a6caa92 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Tue, 9 Feb 2021 16:23:31 +0100
Subject: Messing around with some texts to learn

---
 app/src/main/res/layout/fragment_first.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/fragment_first.xml b/app/src/main/res/layout/fragment_first.xml
index 435c85b..3533ea3 100644
--- a/app/src/main/res/layout/fragment_first.xml
+++ b/app/src/main/res/layout/fragment_first.xml
@@ -8,9 +8,14 @@
 
     <TextView
         android:id="@+id/textview_first"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/purple_700"
+        android:fontFamily="@font/bangers"
         android:text="@string/hello_first_fragment"
+        android:textAlignment="center"
+        android:textColor="@color/teal_200"
+        android:textSize="36sp"
         app:layout_constraintBottom_toTopOf="@id/button_first"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -20,7 +25,7 @@
         android:id="@+id/button_first"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="PRESS ON ME"
+        android:text="@string/press_on_me"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -30,10 +35,9 @@
         android:id="@+id/button_second"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="NO, PRESS ON ME !"
+        android:text="@string/no_press_on_me"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/button_first"
         app:layout_constraintStart_toStartOf="parent"
-        />
+        app:layout_constraintTop_toBottomOf="@id/button_first" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 8064dbe9a5c2fbd9073b694fa237d457039380b2 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Tue, 9 Feb 2021 20:48:18 +0100
Subject: Adding colours and "locking" in dark mode.

---
 app/src/main/res/layout/activity_main.xml  |  6 ++++--
 app/src/main/res/layout/fragment_first.xml |  4 ++--
 app/src/main/res/values-night/themes.xml   | 10 +++++-----
 app/src/main/res/values/colors.xml         |  5 +++++
 app/src/main/res/values/strings.xml        |  1 +
 app/src/main/res/values/themes.xml         | 10 +++++-----
 6 files changed, 22 insertions(+), 14 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 616f503..aa7a1c1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".MainActivity"
+    android:background="@color/very_dark_purple">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -28,6 +29,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_dialog_email" />
+        app:srcCompat="@android:drawable/ic_dialog_info"
+        android:contentDescription="@string/info"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_first.xml b/app/src/main/res/layout/fragment_first.xml
index 3533ea3..81142cd 100644
--- a/app/src/main/res/layout/fragment_first.xml
+++ b/app/src/main/res/layout/fragment_first.xml
@@ -10,11 +10,11 @@
         android:id="@+id/textview_first"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/purple_700"
+        android:background="@color/black"
         android:fontFamily="@font/bangers"
         android:text="@string/hello_first_fragment"
         android:textAlignment="center"
-        android:textColor="@color/teal_200"
+        android:textColor="@color/strong_pink"
         android:textSize="36sp"
         app:layout_constraintBottom_toTopOf="@id/button_first"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index e1dd5d0..e8d4e2d 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -2,12 +2,12 @@
     <!-- Base application theme. -->
     <style name="Theme.Aniki" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
+        <item name="colorPrimary">@color/black</item>
+        <item name="colorPrimaryVariant">@color/strong_pink</item>
+        <item name="colorOnPrimary">@color/slightly_desaturated_magenta</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
+        <item name="colorSecondary">@color/purple_200</item>
+        <item name="colorSecondaryVariant">@color/purple_700</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..95a118e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,9 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+
+    <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>
 </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 b907069..cbf81ad 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,4 +10,5 @@
 
     <string name="hello_first_fragment">Oi Otouto !</string>
     <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
+    <string name="info">Infos about the developper of the app.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c79cf5a..2d1852e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,12 +2,12 @@
     <!-- Base application theme. -->
     <style name="Theme.Aniki" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorPrimary">@color/black</item>
+        <item name="colorPrimaryVariant">@color/strong_pink</item>
+        <item name="colorOnPrimary">@color/slightly_desaturated_magenta</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorSecondary">@color/purple_200</item>
+        <item name="colorSecondaryVariant">@color/purple_700</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-- 
cgit v1.2.3


From b96bca561c321fb259895d470b2d01d9c0f34ea9 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Fri, 12 Feb 2021 09:44:59 +0100
Subject: "locking" in dark mode through another way

---
 app/src/main/res/layout/activity_main.xml  | 3 +--
 app/src/main/res/layout/fragment_first.xml | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index aa7a1c1..bd973bc 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,8 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity"
-    android:background="@color/very_dark_purple">
+    tools:context=".MainActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_first.xml b/app/src/main/res/layout/fragment_first.xml
index 81142cd..c2b4de3 100644
--- a/app/src/main/res/layout/fragment_first.xml
+++ b/app/src/main/res/layout/fragment_first.xml
@@ -4,6 +4,7 @@
     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=".FirstFragment">
 
     <TextView
-- 
cgit v1.2.3


From 3decfd9d0d043c710f48cc145027a7b6bd45df8f Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Fri, 12 Feb 2021 11:00:47 +0100
Subject: Renaming and adding some functions for the home buttons.

---
 .../main/java/xyz/adjutor/aniki/FirstFragment.kt   | 11 +++++-
 .../main/java/xyz/adjutor/aniki/MainActivity.kt    |  6 +--
 .../main/java/xyz/adjutor/aniki/SecondFragment.kt  |  3 +-
 app/src/main/res/layout/activity_main.xml          |  2 +-
 app/src/main/res/layout/fragment_first.xml         | 46 ++++++++++++++--------
 app/src/main/res/layout/fragment_second.xml        | 10 +++--
 app/src/main/res/values/strings.xml                |  7 ++--
 7 files changed, 55 insertions(+), 30 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/java/xyz/adjutor/aniki/FirstFragment.kt b/app/src/main/java/xyz/adjutor/aniki/FirstFragment.kt
index 05e5673..e2fa6eb 100644
--- a/app/src/main/java/xyz/adjutor/aniki/FirstFragment.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/FirstFragment.kt
@@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.navigation.fragment.findNavController
+import com.google.android.material.snackbar.Snackbar
 
 /**
  * A simple [Fragment] subclass as the default destination in the navigation.
@@ -24,8 +25,16 @@ class FirstFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        view.findViewById<Button>(R.id.button_first).setOnClickListener {
+        view.findViewById<Button>(R.id.news).setOnClickListener {
             findNavController().navigate(R.id.action_FirstFragment_to_SecondFragment)
         }
+        view.findViewById<Button>(R.id.article).setOnClickListener {
+            Snackbar.make(view, "HA? YOU THOUGHT IT WAS AN ARTICLE !? BUT IT WAS I, DIO !", Snackbar.LENGTH_LONG)
+                    .setAction("Action", null).show()
+        }
+        view.findViewById<Button>(R.id.top_manga).setOnClickListener {
+            Snackbar.make(view, "HA? YOU THOUGHT IT WAS A TOP !? BUT IT WAS I, DIO !", Snackbar.LENGTH_LONG)
+                    .setAction("Action", null).show()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt b/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt
index 162ed95..4ccae64 100644
--- a/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt
@@ -14,12 +14,10 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
         setSupportActionBar(findViewById(R.id.toolbar))
 
-        findViewById<FloatingActionButton>(R.id.fab).setOnClickListener { view ->
-            Snackbar.make(view, "HA? YOU THOUGHT IT WAS A FEATURE !? BUT IT WAS I, DIO !", Snackbar.LENGTH_LONG)
+        findViewById<FloatingActionButton>(R.id.info).setOnClickListener { view ->
+            Snackbar.make(view, "HA? YOU THOUGHT IT WAS AN INFO !? BUT IT WAS I, DIO !", Snackbar.LENGTH_LONG)
                     .setAction("Action", null).show()
         }
-        val industryNews = News(0,"Horror Manga Ajin Ends Nine-Year Serialization","Gamon Sakurai's Ajin (Ajin: Demi-Human) manga ended its nine-year run in the March issue of good! Afternoon on Friday.")
-
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
diff --git a/app/src/main/java/xyz/adjutor/aniki/SecondFragment.kt b/app/src/main/java/xyz/adjutor/aniki/SecondFragment.kt
index a994c61..2e215c4 100644
--- a/app/src/main/java/xyz/adjutor/aniki/SecondFragment.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/SecondFragment.kt
@@ -24,8 +24,9 @@ class SecondFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        view.findViewById<Button>(R.id.button_second).setOnClickListener {
+        view.findViewById<Button>(R.id.home).setOnClickListener {
             findNavController().navigate(R.id.action_SecondFragment_to_FirstFragment)
         }
+        val industryNews = News(0,"Horror Manga Ajin Ends Nine-Year Serialization","Gamon Sakurai's Ajin (Ajin: Demi-Human) manga ended its nine-year run in the March issue of good! Afternoon on Friday.")
     }
 }
\ 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 bd973bc..b0826f8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -23,7 +23,7 @@
     <include layout="@layout/content_main" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab"
+        android:id="@+id/info"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
diff --git a/app/src/main/res/layout/fragment_first.xml b/app/src/main/res/layout/fragment_first.xml
index c2b4de3..46033be 100644
--- a/app/src/main/res/layout/fragment_first.xml
+++ b/app/src/main/res/layout/fragment_first.xml
@@ -4,41 +4,55 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    tools:context=".FirstFragment"
     android:background="@color/very_dark_purple"
-    tools:context=".FirstFragment">
+    >
 
     <TextView
-        android:id="@+id/textview_first"
+        android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/black"
         android:fontFamily="@font/bangers"
-        android:text="@string/hello_first_fragment"
+        android:text="@string/app_name"
         android:textAlignment="center"
         android:textColor="@color/strong_pink"
-        android:textSize="36sp"
-        app:layout_constraintBottom_toTopOf="@id/button_first"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:textSize="40sp"
+        app:layout_constraintBottom_toTopOf="@id/news"
+        app:layout_constraintTop_toTopOf="parent"
+        />
 
     <Button
-        android:id="@+id/button_first"
+        android:id="@+id/news"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/press_on_me"
+        android:text="@string/news"
+        app:layout_constraintTop_toBottomOf="@id/title"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/textview_first" />
+        app:layout_constraintEnd_toStartOf="@id/article"
+        />
+
+    <Button
+        android:id="@+id/article"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/article"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/news"
+        app:layout_constraintEnd_toStartOf="@id/top_manga"
+        />
 
     <Button
-        android:id="@+id/button_second"
+        android:id="@+id/top_manga"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/no_press_on_me"
+        android:text="@string/top_manga"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/article"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/button_first" />
+        />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_second.xml b/app/src/main/res/layout/fragment_second.xml
index bd90524..daabf01 100644
--- a/app/src/main/res/layout/fragment_second.xml
+++ b/app/src/main/res/layout/fragment_second.xml
@@ -4,22 +4,24 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SecondFragment">
+    tools:context=".SecondFragment"
+    android:background="@color/very_dark_purple"
+    >
 
     <TextView
         android:id="@+id/textview_second"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/button_second"
+        app:layout_constraintBottom_toTopOf="@id/home"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <Button
-        android:id="@+id/button_second"
+        android:id="@+id/home"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/previous"
+        android:text="@string/home"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cbf81ad..3eed9c6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,11 +4,12 @@
     <!-- Strings used for fragments for navigation -->
     <string name="first_fragment_label">First Fragment</string>
     <string name="second_fragment_label">Second Fragment</string>
-    <string name="press_on_me">PRESS ON ME</string>
-    <string name="no_press_on_me">NO, PRESS ON ME !</string>
-    <string name="previous">Previous</string>
 
     <string name="hello_first_fragment">Oi Otouto !</string>
     <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
     <string name="info">Infos about the developper of the app.</string>
+    <string name="news">News</string>
+    <string name="article">Article</string>
+    <string name="top_manga">Top Manga</string>
+    <string name="home">Home</string>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 416450b33960588984d88659d596703e84c8c2d5 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Fri, 12 Feb 2021 11:26:07 +0100
Subject: Renaming.

---
 .../main/java/xyz/adjutor/aniki/FirstFragment.kt   | 40 ---------------
 app/src/main/java/xyz/adjutor/aniki/HomePage.kt    | 40 +++++++++++++++
 app/src/main/java/xyz/adjutor/aniki/News.kt        |  6 +--
 app/src/main/java/xyz/adjutor/aniki/NewsPage.kt    | 32 ++++++++++++
 .../main/java/xyz/adjutor/aniki/SecondFragment.kt  | 32 ------------
 app/src/main/res/layout/fragment_first.xml         | 58 ----------------------
 app/src/main/res/layout/fragment_second.xml        | 29 -----------
 app/src/main/res/layout/home_page.xml              | 58 ++++++++++++++++++++++
 app/src/main/res/layout/news_page.xml              | 29 +++++++++++
 app/src/main/res/navigation/nav_graph.xml          | 26 +++++-----
 app/src/main/res/values/strings.xml                |  5 +-
 11 files changed, 177 insertions(+), 178 deletions(-)
 delete mode 100644 app/src/main/java/xyz/adjutor/aniki/FirstFragment.kt
 create mode 100644 app/src/main/java/xyz/adjutor/aniki/HomePage.kt
 create mode 100644 app/src/main/java/xyz/adjutor/aniki/NewsPage.kt
 delete mode 100644 app/src/main/java/xyz/adjutor/aniki/SecondFragment.kt
 delete mode 100644 app/src/main/res/layout/fragment_first.xml
 delete mode 100644 app/src/main/res/layout/fragment_second.xml
 create mode 100644 app/src/main/res/layout/home_page.xml
 create mode 100644 app/src/main/res/layout/news_page.xml

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/java/xyz/adjutor/aniki/FirstFragment.kt b/app/src/main/java/xyz/adjutor/aniki/FirstFragment.kt
deleted file mode 100644
index e2fa6eb..0000000
--- a/app/src/main/java/xyz/adjutor/aniki/FirstFragment.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package xyz.adjutor.aniki
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import androidx.navigation.fragment.findNavController
-import com.google.android.material.snackbar.Snackbar
-
-/**
- * A simple [Fragment] subclass as the default destination in the navigation.
- */
-class FirstFragment : Fragment() {
-
-    override fun onCreateView(
-            inflater: LayoutInflater, container: ViewGroup?,
-            savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_first, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        view.findViewById<Button>(R.id.news).setOnClickListener {
-            findNavController().navigate(R.id.action_FirstFragment_to_SecondFragment)
-        }
-        view.findViewById<Button>(R.id.article).setOnClickListener {
-            Snackbar.make(view, "HA? YOU THOUGHT IT WAS AN ARTICLE !? BUT IT WAS I, DIO !", Snackbar.LENGTH_LONG)
-                    .setAction("Action", null).show()
-        }
-        view.findViewById<Button>(R.id.top_manga).setOnClickListener {
-            Snackbar.make(view, "HA? YOU THOUGHT IT WAS A TOP !? BUT IT WAS I, DIO !", Snackbar.LENGTH_LONG)
-                    .setAction("Action", null).show()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/HomePage.kt b/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
new file mode 100644
index 0000000..377a523
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
@@ -0,0 +1,40 @@
+package xyz.adjutor.aniki
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import androidx.navigation.fragment.findNavController
+import com.google.android.material.snackbar.Snackbar
+
+/**
+ * A simple [Fragment] subclass as the default destination in the navigation.
+ */
+class HomePage : Fragment() {
+
+    override fun onCreateView(
+            inflater: LayoutInflater, container: ViewGroup?,
+            savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.home_page, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        view.findViewById<Button>(R.id.news).setOnClickListener {
+            findNavController().navigate(R.id.action_HomePage_to_NewsPage)
+        }
+        view.findViewById<Button>(R.id.article).setOnClickListener {
+            Snackbar.make(view, "HA? YOU THOUGHT IT WAS AN ARTICLE !? BUT IT WAS I, DIO !", Snackbar.LENGTH_LONG)
+                    .setAction("Action", null).show()
+        }
+        view.findViewById<Button>(R.id.top_manga).setOnClickListener {
+            Snackbar.make(view, "HA? YOU THOUGHT IT WAS A TOP !? BUT IT WAS I, DIO !", Snackbar.LENGTH_LONG)
+                    .setAction("Action", null).show()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/News.kt b/app/src/main/java/xyz/adjutor/aniki/News.kt
index dea3516..d38a556 100644
--- a/app/src/main/java/xyz/adjutor/aniki/News.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/News.kt
@@ -1,7 +1,7 @@
 package xyz.adjutor.aniki
 
 data class News (
-    val id: Int,
-    val title: String,
-    val description: String
+        val id: Int,
+        val title: String,
+        val description: String
 )
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/NewsPage.kt b/app/src/main/java/xyz/adjutor/aniki/NewsPage.kt
new file mode 100644
index 0000000..88427fa
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/NewsPage.kt
@@ -0,0 +1,32 @@
+package xyz.adjutor.aniki
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import androidx.navigation.fragment.findNavController
+
+/**
+ * A simple [Fragment] subclass as the second destination in the navigation.
+ */
+class NewsPage : Fragment() {
+
+    override fun onCreateView(
+            inflater: LayoutInflater, container: ViewGroup?,
+            savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.news_page, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        view.findViewById<Button>(R.id.home).setOnClickListener {
+            findNavController().navigate(R.id.action_NewsPage_to_HomePage)
+        }
+        val industryNews = News(0,"Horror Manga Ajin Ends Nine-Year Serialization","Gamon Sakurai's Ajin (Ajin: Demi-Human) manga ended its nine-year run in the March issue of good! Afternoon on Friday.")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/SecondFragment.kt b/app/src/main/java/xyz/adjutor/aniki/SecondFragment.kt
deleted file mode 100644
index 2e215c4..0000000
--- a/app/src/main/java/xyz/adjutor/aniki/SecondFragment.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package xyz.adjutor.aniki
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import androidx.navigation.fragment.findNavController
-
-/**
- * A simple [Fragment] subclass as the second destination in the navigation.
- */
-class SecondFragment : Fragment() {
-
-    override fun onCreateView(
-            inflater: LayoutInflater, container: ViewGroup?,
-            savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_second, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        view.findViewById<Button>(R.id.home).setOnClickListener {
-            findNavController().navigate(R.id.action_SecondFragment_to_FirstFragment)
-        }
-        val industryNews = News(0,"Horror Manga Ajin Ends Nine-Year Serialization","Gamon Sakurai's Ajin (Ajin: Demi-Human) manga ended its nine-year run in the March issue of good! Afternoon on Friday.")
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_first.xml b/app/src/main/res/layout/fragment_first.xml
deleted file mode 100644
index 46033be..0000000
--- a/app/src/main/res/layout/fragment_first.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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"
-    tools:context=".FirstFragment"
-    android:background="@color/very_dark_purple"
-    >
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/black"
-        android:fontFamily="@font/bangers"
-        android:text="@string/app_name"
-        android:textAlignment="center"
-        android:textColor="@color/strong_pink"
-        android:textSize="40sp"
-        app:layout_constraintBottom_toTopOf="@id/news"
-        app:layout_constraintTop_toTopOf="parent"
-        />
-
-    <Button
-        android:id="@+id/news"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/news"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/article"
-        />
-
-    <Button
-        android:id="@+id/article"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/article"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/news"
-        app:layout_constraintEnd_toStartOf="@id/top_manga"
-        />
-
-    <Button
-        android:id="@+id/top_manga"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/top_manga"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/article"
-        app:layout_constraintEnd_toEndOf="parent"
-        />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_second.xml b/app/src/main/res/layout/fragment_second.xml
deleted file mode 100644
index daabf01..0000000
--- a/app/src/main/res/layout/fragment_second.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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"
-    tools:context=".SecondFragment"
-    android:background="@color/very_dark_purple"
-    >
-
-    <TextView
-        android:id="@+id/textview_second"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/home"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Button
-        android:id="@+id/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"
-        app:layout_constraintTop_toBottomOf="@id/textview_second" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ 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
new file mode 100644
index 0000000..bf81de4
--- /dev/null
+++ b/app/src/main/res/layout/home_page.xml
@@ -0,0 +1,58 @@
+<?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"
+    tools:context=".HomePage"
+    android:background="@color/very_dark_purple"
+    >
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/black"
+        android:fontFamily="@font/bangers"
+        android:text="@string/app_name"
+        android:textAlignment="center"
+        android:textColor="@color/strong_pink"
+        android:textSize="40sp"
+        app:layout_constraintBottom_toTopOf="@id/news"
+        app:layout_constraintTop_toTopOf="parent"
+        />
+
+    <Button
+        android:id="@+id/news"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/news"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/article"
+        />
+
+    <Button
+        android:id="@+id/article"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/article"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/news"
+        app:layout_constraintEnd_toStartOf="@id/top_manga"
+        />
+
+    <Button
+        android:id="@+id/top_manga"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/top_manga"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/article"
+        app:layout_constraintEnd_toEndOf="parent"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/news_page.xml b/app/src/main/res/layout/news_page.xml
new file mode 100644
index 0000000..5d9018c
--- /dev/null
+++ b/app/src/main/res/layout/news_page.xml
@@ -0,0 +1,29 @@
+<?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"
+    tools:context=".NewsPage"
+    android:background="@color/very_dark_purple"
+    >
+
+    <TextView
+        android:id="@+id/textview_second"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/home"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/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"
+        app:layout_constraintTop_toBottomOf="@id/textview_second" />
+</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 5441348..78eb7f0 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -3,26 +3,26 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_graph"
-    app:startDestination="@id/FirstFragment">
+    app:startDestination="@id/HomePage">
 
     <fragment
-        android:id="@+id/FirstFragment"
-        android:name="xyz.adjutor.aniki.FirstFragment"
-        android:label="@string/first_fragment_label"
-        tools:layout="@layout/fragment_first">
+        android:id="@+id/HomePage"
+        android:name="xyz.adjutor.aniki.HomePage"
+        android:label="@string/home_page_label"
+        tools:layout="@layout/home_page">
 
         <action
-            android:id="@+id/action_FirstFragment_to_SecondFragment"
-            app:destination="@id/SecondFragment" />
+            android:id="@+id/action_HomePage_to_NewsPage"
+            app:destination="@id/NewsPage" />
     </fragment>
     <fragment
-        android:id="@+id/SecondFragment"
-        android:name="xyz.adjutor.aniki.SecondFragment"
-        android:label="@string/second_fragment_label"
-        tools:layout="@layout/fragment_second">
+        android:id="@+id/NewsPage"
+        android:name="xyz.adjutor.aniki.NewsPage"
+        android:label="@string/news_page_label"
+        tools:layout="@layout/news_page">
 
         <action
-            android:id="@+id/action_SecondFragment_to_FirstFragment"
-            app:destination="@id/FirstFragment" />
+            android:id="@+id/action_NewsPage_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 3eed9c6..b0be6b2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,14 +2,13 @@
     <string name="app_name">Aniki</string>
     <string name="action_settings">Settings</string>
     <!-- Strings used for fragments for navigation -->
-    <string name="first_fragment_label">First Fragment</string>
-    <string name="second_fragment_label">Second Fragment</string>
 
-    <string name="hello_first_fragment">Oi Otouto !</string>
     <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
     <string name="info">Infos about the developper of the app.</string>
     <string name="news">News</string>
     <string name="article">Article</string>
     <string name="top_manga">Top Manga</string>
     <string name="home">Home</string>
+    <string name="home_page_label">First Fragment</string>
+    <string name="news_page_label">Second Fragment</string>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 97ff499413e5dae958ac3741616e2ee84a188871 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Fri, 12 Feb 2021 12:35:33 +0100
Subject: Adding Article and Top Manga pages.

---
 app/src/main/java/xyz/adjutor/aniki/ArticlePage.kt | 31 ++++++++++++++++++++++
 app/src/main/java/xyz/adjutor/aniki/HomePage.kt    |  6 ++---
 app/src/main/java/xyz/adjutor/aniki/NewsPage.kt    |  2 +-
 .../main/java/xyz/adjutor/aniki/TopMangaPage.kt    | 31 ++++++++++++++++++++++
 app/src/main/res/layout/article_page.xml           | 29 ++++++++++++++++++++
 app/src/main/res/layout/top_manga_page.xml         | 29 ++++++++++++++++++++
 app/src/main/res/navigation/nav_graph.xml          | 30 +++++++++++++++++++++
 app/src/main/res/values/strings.xml                |  6 +++--
 8 files changed, 157 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/xyz/adjutor/aniki/ArticlePage.kt
 create mode 100644 app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
 create mode 100644 app/src/main/res/layout/article_page.xml
 create mode 100644 app/src/main/res/layout/top_manga_page.xml

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/java/xyz/adjutor/aniki/ArticlePage.kt b/app/src/main/java/xyz/adjutor/aniki/ArticlePage.kt
new file mode 100644
index 0000000..68af902
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/ArticlePage.kt
@@ -0,0 +1,31 @@
+package xyz.adjutor.aniki
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import androidx.navigation.fragment.findNavController
+
+/**
+ * A simple [Fragment] subclass as the second destination in the navigation.
+ */
+class ArticlePage : Fragment() {
+
+    override fun onCreateView(
+            inflater: LayoutInflater, container: ViewGroup?,
+            savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.article_page, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        view.findViewById<Button>(R.id.home).setOnClickListener {
+            findNavController().navigate(R.id.action_ArticlePage_to_HomePage)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/HomePage.kt b/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
index 377a523..8b932ee 100644
--- a/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
@@ -29,12 +29,10 @@ class HomePage : Fragment() {
             findNavController().navigate(R.id.action_HomePage_to_NewsPage)
         }
         view.findViewById<Button>(R.id.article).setOnClickListener {
-            Snackbar.make(view, "HA? YOU THOUGHT IT WAS AN ARTICLE !? BUT IT WAS I, DIO !", Snackbar.LENGTH_LONG)
-                    .setAction("Action", null).show()
+            findNavController().navigate(R.id.action_HomePage_to_ArticlePage)
         }
         view.findViewById<Button>(R.id.top_manga).setOnClickListener {
-            Snackbar.make(view, "HA? YOU THOUGHT IT WAS A TOP !? BUT IT WAS I, DIO !", Snackbar.LENGTH_LONG)
-                    .setAction("Action", null).show()
+            findNavController().navigate(R.id.action_HomePage_to_TopMangaPage)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/NewsPage.kt b/app/src/main/java/xyz/adjutor/aniki/NewsPage.kt
index 88427fa..6d7b10d 100644
--- a/app/src/main/java/xyz/adjutor/aniki/NewsPage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/NewsPage.kt
@@ -27,6 +27,6 @@ class NewsPage : Fragment() {
         view.findViewById<Button>(R.id.home).setOnClickListener {
             findNavController().navigate(R.id.action_NewsPage_to_HomePage)
         }
-        val industryNews = News(0,"Horror Manga Ajin Ends Nine-Year Serialization","Gamon Sakurai's Ajin (Ajin: Demi-Human) manga ended its nine-year run in the March issue of good! Afternoon on Friday.")
+        //val industryNews = News(0,"Horror Manga Ajin Ends Nine-Year Serialization","Gamon Sakurai's Ajin (Ajin: Demi-Human) manga ended its nine-year run in the March issue of good! Afternoon on Friday.")
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
new file mode 100644
index 0000000..c64b9fe
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
@@ -0,0 +1,31 @@
+package xyz.adjutor.aniki
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import androidx.navigation.fragment.findNavController
+
+/**
+ * A simple [Fragment] subclass as the second destination in the navigation.
+ */
+class TopMangaPage : Fragment() {
+
+    override fun onCreateView(
+            inflater: LayoutInflater, container: ViewGroup?,
+            savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.top_manga_page, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        view.findViewById<Button>(R.id.home).setOnClickListener {
+            findNavController().navigate(R.id.action_TopMangaPage_to_HomePage)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/article_page.xml b/app/src/main/res/layout/article_page.xml
new file mode 100644
index 0000000..58674de
--- /dev/null
+++ b/app/src/main/res/layout/article_page.xml
@@ -0,0 +1,29 @@
+<?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"
+    tools:context=".ArticlePage"
+    android:background="@color/very_dark_purple"
+    >
+
+    <TextView
+        android:id="@+id/textview_second"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/home"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/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"
+        app:layout_constraintTop_toBottomOf="@id/textview_second" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/top_manga_page.xml b/app/src/main/res/layout/top_manga_page.xml
new file mode 100644
index 0000000..6a2f86b
--- /dev/null
+++ b/app/src/main/res/layout/top_manga_page.xml
@@ -0,0 +1,29 @@
+<?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"
+    tools:context=".TopMangaPage"
+    android:background="@color/very_dark_purple"
+    >
+
+    <TextView
+        android:id="@+id/textview_second"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/home"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/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"
+        app:layout_constraintTop_toBottomOf="@id/textview_second" />
+</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 78eb7f0..d8d3b26 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -14,7 +14,14 @@
         <action
             android:id="@+id/action_HomePage_to_NewsPage"
             app:destination="@id/NewsPage" />
+        <action
+            android:id="@+id/action_HomePage_to_ArticlePage"
+            app:destination="@id/ArticlePage" />
+        <action
+            android:id="@+id/action_HomePage_to_TopMangaPage"
+            app:destination="@id/TopMangaPage" />
     </fragment>
+
     <fragment
         android:id="@+id/NewsPage"
         android:name="xyz.adjutor.aniki.NewsPage"
@@ -25,4 +32,27 @@
             android:id="@+id/action_NewsPage_to_HomePage"
             app:destination="@id/HomePage" />
     </fragment>
+
+    <fragment
+        android:id="@+id/ArticlePage"
+        android:name="xyz.adjutor.aniki.ArticlePage"
+        android:label="@string/article_page_label"
+        tools:layout="@layout/article_page">
+
+        <action
+            android:id="@+id/action_ArticlePage_to_HomePage"
+            app:destination="@id/HomePage" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/TopMangaPage"
+        android:name="xyz.adjutor.aniki.TopMangaPage"
+        android:label="@string/top_manga_page_label"
+        tools:layout="@layout/top_manga_page">
+
+        <action
+            android:id="@+id/action_TopMangaPage_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 b0be6b2..e076855 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,6 +9,8 @@
     <string name="article">Article</string>
     <string name="top_manga">Top Manga</string>
     <string name="home">Home</string>
-    <string name="home_page_label">First Fragment</string>
-    <string name="news_page_label">Second Fragment</string>
+    <string name="home_page_label">Home Page</string>
+    <string name="news_page_label">News Page</string>
+    <string name="article_page_label">Article Page</string>
+    <string name="top_manga_page_label">Top Manga Page</string>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 7288d5ae154f895d71727acc92828aa555e8108b Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Tue, 16 Feb 2021 11:37:58 +0100
Subject: Starting to work on recycler view feature

---
 app/build.gradle                                   |  7 ++-
 app/src/main/java/xyz/adjutor/aniki/ListAdapter.kt | 45 ++++++++++++++++
 .../main/java/xyz/adjutor/aniki/MainActivity.kt    |  1 +
 .../main/java/xyz/adjutor/aniki/TopMangaPage.kt    |  1 +
 app/src/main/res/layout/activity_main.xml          |  3 +-
 app/src/main/res/layout/item_layout.xml            | 63 ++++++++++++++++++++++
 app/src/main/res/layout/row_layout.xml             | 47 ++++++++++++++++
 app/src/main/res/layout/top_manga_page.xml         | 21 ++++----
 app/src/main/res/values/strings.xml                |  3 ++
 gradle/wrapper/gradle-wrapper.properties           |  4 +-
 10 files changed, 180 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/java/xyz/adjutor/aniki/ListAdapter.kt
 create mode 100644 app/src/main/res/layout/item_layout.xml
 create mode 100644 app/src/main/res/layout/row_layout.xml

(limited to 'app/src/main/res/layout')

diff --git a/app/build.gradle b/app/build.gradle
index aa8bfbb..5de4ebb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,13 +35,16 @@ android {
 dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.3'
     implementation 'androidx.navigation:navigation-ui-ktx:2.3.3'
-    testImplementation 'junit:junit:4.+'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/ListAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/ListAdapter.kt
new file mode 100644
index 0000000..74ba9c4
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/ListAdapter.kt
@@ -0,0 +1,45 @@
+package xyz.adjutor.aniki
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+
+class ListAdapter(private val dataSet: Array<String>) :
+    RecyclerView.Adapter<ListAdapter.ViewHolder>() {
+
+    /**
+     * Provide a reference to the type of views that you are using
+     * (custom ViewHolder).
+     */
+    class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        // Define click listener for the ViewHolder's View.
+        val firstLine: TextView = view.findViewById(R.id.firstLine)
+        val secondLine: TextView = view.findViewById(R.id.secondLine)
+
+    }
+
+    // Create new views (invoked by the layout manager)
+    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
+        // Create a new view, which defines the UI of the list item
+        val view = LayoutInflater.from(viewGroup.context)
+            .inflate(R.layout.row_layout, viewGroup, false)
+
+        return ViewHolder(view)
+    }
+
+    // Replace the contents of a view (invoked by the layout manager)
+    override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
+
+        // Get element from your dataset at this position and replace the
+        // contents of the view with that element
+        viewHolder.firstLine.text = dataSet[position]
+        viewHolder.secondLine.text = dataSet[position]
+    }
+
+    // Return the size of your dataset (invoked by the layout manager)
+    override fun getItemCount() = dataSet.size
+
+}
+
diff --git a/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt b/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt
index 4ccae64..3ae1bf2 100644
--- a/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt
@@ -6,6 +6,7 @@ import com.google.android.material.snackbar.Snackbar
 import androidx.appcompat.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
+import androidx.recyclerview.widget.RecyclerView
 
 class MainActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
index c64b9fe..a59e038 100644
--- a/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
@@ -27,5 +27,6 @@ class TopMangaPage : Fragment() {
         view.findViewById<Button>(R.id.home).setOnClickListener {
             findNavController().navigate(R.id.action_TopMangaPage_to_HomePage)
         }
+
     }
 }
\ 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 b0826f8..12a61d8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    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"
diff --git a/app/src/main/res/layout/item_layout.xml b/app/src/main/res/layout/item_layout.xml
new file mode 100644
index 0000000..e03e874
--- /dev/null
+++ b/app/src/main/res/layout/item_layout.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cv_cardView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="4dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?selectableItemBackground"
+    app:cardCornerRadius="10dp"
+    >
+
+    <RelativeLayout
+        android:id="@+id/rl_wrapper"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="20dp"
+        >
+
+        <ImageView
+            android:id="@+id/iv_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_margin="10dp"
+            android:src="@mipmap/ic_launcher_round"
+            android:contentDescription="@string/rv_image" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignTop="@id/iv_image"
+            android:layout_alignBottom="@id/iv_image"
+            android:layout_toEndOf="@id/iv_image"
+            android:orientation="vertical"
+            >
+
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:text="@string/rv_title"
+                android:textColor="@color/strong_pink"
+                android:textSize="20sp"/>
+
+            <TextView
+                android:id="@+id/tv_description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:text="@string/rv_description"
+                android:textColor="@color/slightly_desaturated_magenta"
+                android:textSize="20sp"
+                />
+
+        </LinearLayout>
+
+
+    </RelativeLayout>
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_layout.xml b/app/src/main/res/layout/row_layout.xml
new file mode 100644
index 0000000..1c74476
--- /dev/null
+++ b/app/src/main/res/layout/row_layout.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:layout_marginStart="?android:attr/listPreferredItemPaddingLeft"
+    android:layout_marginEnd="?android:attr/listPreferredItemPaddingRight"
+    android:gravity="center_vertical"
+    android:padding="6dip">
+
+<ImageView
+    android:id="@+id/icon"
+    android:layout_width="wrap_content"
+    android:layout_height="fill_parent"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentTop="true"
+    android:layout_marginEnd="6dip"
+    android:contentDescription="@string/rv_image"
+    android:src="@mipmap/ic_launcher"
+    tools:ignore="MissingConstraints" />
+
+<TextView
+    android:id="@+id/secondLine"
+    android:layout_height="26dip"
+    android:ellipsize="marquee"
+    android:text="@string/rv_description"
+    android:textSize="12sp"
+    app:layout_constraintStart_toEndOf="@id/icon"
+    app:layout_constraintTop_toBottomOf="@id/firstLine"
+    android:layout_width="0dp" />
+
+<TextView
+    android:id="@+id/firstLine"
+    android:layout_height="wrap_content"
+    android:layout_toEndOf="@id/icon"
+    android:gravity="center_vertical"
+    android:text="@string/rv_title"
+    android:textSize="16sp"
+    app:layout_constraintStart_toEndOf="@id/icon"
+    app:layout_constraintEnd_toEndOf="parent"
+    android:layout_width="0dp"
+    tools:ignore="MissingConstraints" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/top_manga_page.xml b/app/src/main/res/layout/top_manga_page.xml
index 6a2f86b..f8d2510 100644
--- a/app/src/main/res/layout/top_manga_page.xml
+++ b/app/src/main/res/layout/top_manga_page.xml
@@ -5,17 +5,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".TopMangaPage"
-    android:background="@color/very_dark_purple"
-    >
+    android:background="@color/very_dark_purple">
 
-    <TextView
-        android:id="@+id/textview_second"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/home"
-        app:layout_constraintEnd_toEndOf="parent"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/home"
+        tools:listitem="@layout/item_layout" />
 
     <Button
         android:id="@+id/home"
@@ -25,5 +25,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/textview_second" />
+        />
+
 </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 e076855..a16e804 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,4 +13,7 @@
     <string name="news_page_label">News Page</string>
     <string name="article_page_label">Article Page</string>
     <string name="top_manga_page_label">Top Manga Page</string>
+    <string name="rv_title">Title</string>
+    <string name="rv_description">This is a description</string>
+    <string name="rv_image">image</string>
 </resources>
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3f5e8f1..356bc93 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Feb 09 10:05:45 CET 2021
+#Sat Feb 13 10:18:54 CET 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
-- 
cgit v1.2.3


From d49771c90315897e0fe6eb8d4034e36853bf6650 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Wed, 17 Feb 2021 08:00:07 +0100
Subject: Trying to mimic the Flower exemple from google.

---
 app/src/main/java/xyz/adjutor/aniki/ListAdapter.kt | 45 ---------------------
 .../main/java/xyz/adjutor/aniki/MangaAdapter.kt    | 40 ++++++++++++++++++
 app/src/main/java/xyz/adjutor/aniki/MangaSource.kt | 11 +++++
 .../main/java/xyz/adjutor/aniki/TopMangaPage.kt    | 11 +++--
 app/src/main/res/layout/item_layout.xml            | 34 +++++++---------
 app/src/main/res/layout/row_layout.xml             | 47 ----------------------
 app/src/main/res/layout/top_manga_page.xml         |  9 +++--
 app/src/main/res/values/strings.xml                | 21 +++++++++-
 8 files changed, 98 insertions(+), 120 deletions(-)
 delete mode 100644 app/src/main/java/xyz/adjutor/aniki/ListAdapter.kt
 create mode 100644 app/src/main/java/xyz/adjutor/aniki/MangaAdapter.kt
 create mode 100644 app/src/main/java/xyz/adjutor/aniki/MangaSource.kt
 delete mode 100644 app/src/main/res/layout/row_layout.xml

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/java/xyz/adjutor/aniki/ListAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/ListAdapter.kt
deleted file mode 100644
index 74ba9c4..0000000
--- a/app/src/main/java/xyz/adjutor/aniki/ListAdapter.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package xyz.adjutor.aniki
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-
-class ListAdapter(private val dataSet: Array<String>) :
-    RecyclerView.Adapter<ListAdapter.ViewHolder>() {
-
-    /**
-     * Provide a reference to the type of views that you are using
-     * (custom ViewHolder).
-     */
-    class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        // Define click listener for the ViewHolder's View.
-        val firstLine: TextView = view.findViewById(R.id.firstLine)
-        val secondLine: TextView = view.findViewById(R.id.secondLine)
-
-    }
-
-    // Create new views (invoked by the layout manager)
-    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
-        // Create a new view, which defines the UI of the list item
-        val view = LayoutInflater.from(viewGroup.context)
-            .inflate(R.layout.row_layout, viewGroup, false)
-
-        return ViewHolder(view)
-    }
-
-    // Replace the contents of a view (invoked by the layout manager)
-    override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
-
-        // Get element from your dataset at this position and replace the
-        // contents of the view with that element
-        viewHolder.firstLine.text = dataSet[position]
-        viewHolder.secondLine.text = dataSet[position]
-    }
-
-    // Return the size of your dataset (invoked by the layout manager)
-    override fun getItemCount() = dataSet.size
-
-}
-
diff --git a/app/src/main/java/xyz/adjutor/aniki/MangaAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/MangaAdapter.kt
new file mode 100644
index 0000000..8e1c8f2
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/MangaAdapter.kt
@@ -0,0 +1,40 @@
+package xyz.adjutor.aniki
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import java.util.ArrayList
+
+class MangaAdapter(val mangaList: Array<String>) :
+        RecyclerView.Adapter<MangaAdapter.MangaViewHolder>() {
+
+    // Describes an item view and its place within the RecyclerView
+    class MangaViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        private val mangaTextView: TextView = itemView.findViewById(R.id.tv_title)
+
+        fun bind(word: String) {
+            mangaTextView.text = word
+        }
+    }
+
+    // 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) {
+        holder.bind(mangaList[position])
+    }
+}
+
diff --git a/app/src/main/java/xyz/adjutor/aniki/MangaSource.kt b/app/src/main/java/xyz/adjutor/aniki/MangaSource.kt
new file mode 100644
index 0000000..86e46e2
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/MangaSource.kt
@@ -0,0 +1,11 @@
+package xyz.adjutor.aniki
+
+import android.content.Context
+
+class MangaSource(val context: Context) {
+    fun getMangaList(): Array<String> {
+
+        // Return manga list from string resources
+        return context.resources.getStringArray(R.array.manga_array)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
index a59e038..32d3ce6 100644
--- a/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
@@ -6,11 +6,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.RecyclerView
 
-/**
- * A simple [Fragment] subclass as the second destination in the navigation.
- */
 class TopMangaPage : Fragment() {
 
     override fun onCreateView(
@@ -28,5 +27,11 @@ class TopMangaPage : Fragment() {
             findNavController().navigate(R.id.action_TopMangaPage_to_HomePage)
         }
 
+        // Retrieves data from mangasource
+        val mangaList = MangaSource(requireActivity().applicationContext).getMangaList()
+
+        val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view)
+        recyclerView.adapter = MangaAdapter(mangaList)
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_layout.xml b/app/src/main/res/layout/item_layout.xml
index e03e874..c4b662c 100644
--- a/app/src/main/res/layout/item_layout.xml
+++ b/app/src/main/res/layout/item_layout.xml
@@ -2,6 +2,7 @@
 <androidx.cardview.widget.CardView
     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:id="@+id/cv_cardView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -10,10 +11,10 @@
     android:focusable="true"
     android:foreground="?selectableItemBackground"
     app:cardCornerRadius="10dp"
+    app:cardBackgroundColor="@color/black"
     >
 
-    <RelativeLayout
-        android:id="@+id/rl_wrapper"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:padding="20dp"
@@ -23,30 +24,25 @@
             android:id="@+id/iv_image"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_margin="10dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             android:src="@mipmap/ic_launcher_round"
             android:contentDescription="@string/rv_image" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignTop="@id/iv_image"
-            android:layout_alignBottom="@id/iv_image"
-            android:layout_toEndOf="@id/iv_image"
-            android:orientation="vertical"
-            >
-
             <TextView
                 android:id="@+id/tv_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
+                app:layout_constraintStart_toEndOf="@id/iv_image"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
                 android:text="@string/rv_title"
                 android:textColor="@color/strong_pink"
-                android:textSize="20sp"/>
+                android:textSize="30sp"/>
 
-            <TextView
+            <!--TextView
                 android:id="@+id/tv_description"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -54,10 +50,8 @@
                 android:text="@string/rv_description"
                 android:textColor="@color/slightly_desaturated_magenta"
                 android:textSize="20sp"
-                />
-
-        </LinearLayout>
+                /-->
 
 
-    </RelativeLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_layout.xml b/app/src/main/res/layout/row_layout.xml
deleted file mode 100644
index 1c74476..0000000
--- a/app/src/main/res/layout/row_layout.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:layout_marginStart="?android:attr/listPreferredItemPaddingLeft"
-    android:layout_marginEnd="?android:attr/listPreferredItemPaddingRight"
-    android:gravity="center_vertical"
-    android:padding="6dip">
-
-<ImageView
-    android:id="@+id/icon"
-    android:layout_width="wrap_content"
-    android:layout_height="fill_parent"
-    android:layout_alignParentBottom="true"
-    android:layout_alignParentTop="true"
-    android:layout_marginEnd="6dip"
-    android:contentDescription="@string/rv_image"
-    android:src="@mipmap/ic_launcher"
-    tools:ignore="MissingConstraints" />
-
-<TextView
-    android:id="@+id/secondLine"
-    android:layout_height="26dip"
-    android:ellipsize="marquee"
-    android:text="@string/rv_description"
-    android:textSize="12sp"
-    app:layout_constraintStart_toEndOf="@id/icon"
-    app:layout_constraintTop_toBottomOf="@id/firstLine"
-    android:layout_width="0dp" />
-
-<TextView
-    android:id="@+id/firstLine"
-    android:layout_height="wrap_content"
-    android:layout_toEndOf="@id/icon"
-    android:gravity="center_vertical"
-    android:text="@string/rv_title"
-    android:textSize="16sp"
-    app:layout_constraintStart_toEndOf="@id/icon"
-    app:layout_constraintEnd_toEndOf="parent"
-    android:layout_width="0dp"
-    tools:ignore="MissingConstraints" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/top_manga_page.xml b/app/src/main/res/layout/top_manga_page.xml
index f8d2510..4a807f1 100644
--- a/app/src/main/res/layout/top_manga_page.xml
+++ b/app/src/main/res/layout/top_manga_page.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -11,10 +12,10 @@
         android:id="@+id/recycler_view"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/home"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:listitem="@layout/item_layout" />
 
     <Button
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a16e804..41bd064 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,6 @@
 <resources>
     <string name="app_name">Aniki</string>
     <string name="action_settings">Settings</string>
-    <!-- Strings used for fragments for navigation -->
 
     <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
     <string name="info">Infos about the developper of the app.</string>
@@ -16,4 +15,24 @@
     <string name="rv_title">Title</string>
     <string name="rv_description">This is a description</string>
     <string name="rv_image">image</string>
+    <string name="manga_image_content_description">Image of manga</string>
+
+    <string-array name="manga_array">
+        <item>Dragon Ball</item>
+        <item>Naruto</item>
+        <item>Fairy Tail</item>
+        <item>Shokugeki no Souma</item>
+        <item>Ajin</item>
+        <item>Komi-san no Komyushu</item>
+        <item>Hunter x Hunter</item>
+        <item>Detective Conan</item>
+        <item>Swortd Art Online</item>
+        <item>Scumbag Loser</item>
+        <item>Ana Satsujin</item>
+        <item>Samurai Deeper Kyou</item>
+        <item>Sebsei, Ore ni Kamawazu Itte Kudasai!!</item>
+    </string-array>
+
+    <string name="manga1_name">Dragon Ball</string>
+
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 7e0e688d4bc59bddfd5e9e69b0da57607c1e56ed Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Wed, 17 Feb 2021 22:18:26 +0100
Subject: Renaming to avoid issues with the "home" id.

---
 app/src/main/java/xyz/adjutor/aniki/ArticlePage.kt |  2 +-
 app/src/main/java/xyz/adjutor/aniki/HomePage.kt    |  6 +++---
 app/src/main/java/xyz/adjutor/aniki/NewsPage.kt    |  2 +-
 .../main/java/xyz/adjutor/aniki/TopMangaPage.kt    |  2 +-
 app/src/main/res/layout/article_page.xml           |  4 ++--
 app/src/main/res/layout/home_page.xml              | 24 +++++++++++-----------
 app/src/main/res/layout/item_layout.xml            | 11 ----------
 app/src/main/res/layout/news_page.xml              |  4 ++--
 app/src/main/res/layout/top_manga_page.xml         |  4 ++--
 9 files changed, 24 insertions(+), 35 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/java/xyz/adjutor/aniki/ArticlePage.kt b/app/src/main/java/xyz/adjutor/aniki/ArticlePage.kt
index 68af902..4579c69 100644
--- a/app/src/main/java/xyz/adjutor/aniki/ArticlePage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/ArticlePage.kt
@@ -24,7 +24,7 @@ class ArticlePage : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        view.findViewById<Button>(R.id.home).setOnClickListener {
+        view.findViewById<Button>(R.id.button_home).setOnClickListener {
             findNavController().navigate(R.id.action_ArticlePage_to_HomePage)
         }
     }
diff --git a/app/src/main/java/xyz/adjutor/aniki/HomePage.kt b/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
index 8b932ee..d252755 100644
--- a/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
@@ -25,13 +25,13 @@ class HomePage : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        view.findViewById<Button>(R.id.news).setOnClickListener {
+        view.findViewById<Button>(R.id.button_news).setOnClickListener {
             findNavController().navigate(R.id.action_HomePage_to_NewsPage)
         }
-        view.findViewById<Button>(R.id.article).setOnClickListener {
+        view.findViewById<Button>(R.id.button_article).setOnClickListener {
             findNavController().navigate(R.id.action_HomePage_to_ArticlePage)
         }
-        view.findViewById<Button>(R.id.top_manga).setOnClickListener {
+        view.findViewById<Button>(R.id.button_top_manga).setOnClickListener {
             findNavController().navigate(R.id.action_HomePage_to_TopMangaPage)
         }
     }
diff --git a/app/src/main/java/xyz/adjutor/aniki/NewsPage.kt b/app/src/main/java/xyz/adjutor/aniki/NewsPage.kt
index 6d7b10d..90be1bd 100644
--- a/app/src/main/java/xyz/adjutor/aniki/NewsPage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/NewsPage.kt
@@ -24,7 +24,7 @@ class NewsPage : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        view.findViewById<Button>(R.id.home).setOnClickListener {
+        view.findViewById<Button>(R.id.button_home).setOnClickListener {
             findNavController().navigate(R.id.action_NewsPage_to_HomePage)
         }
         //val industryNews = News(0,"Horror Manga Ajin Ends Nine-Year Serialization","Gamon Sakurai's Ajin (Ajin: Demi-Human) manga ended its nine-year run in the March issue of good! Afternoon on Friday.")
diff --git a/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
index 32d3ce6..17d124e 100644
--- a/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
@@ -23,7 +23,7 @@ class TopMangaPage : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        view.findViewById<Button>(R.id.home).setOnClickListener {
+        view.findViewById<Button>(R.id.button_home).setOnClickListener {
             findNavController().navigate(R.id.action_TopMangaPage_to_HomePage)
         }
 
diff --git a/app/src/main/res/layout/article_page.xml b/app/src/main/res/layout/article_page.xml
index 58674de..380ba00 100644
--- a/app/src/main/res/layout/article_page.xml
+++ b/app/src/main/res/layout/article_page.xml
@@ -12,13 +12,13 @@
         android:id="@+id/textview_second"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/home"
+        app:layout_constraintBottom_toTopOf="@id/button_home"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <Button
-        android:id="@+id/home"
+        android:id="@+id/button_home"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/home"
diff --git a/app/src/main/res/layout/home_page.xml b/app/src/main/res/layout/home_page.xml
index bf81de4..036800c 100644
--- a/app/src/main/res/layout/home_page.xml
+++ b/app/src/main/res/layout/home_page.xml
@@ -9,7 +9,7 @@
     >
 
     <TextView
-        android:id="@+id/title"
+        android:id="@+id/tv_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/black"
@@ -18,40 +18,40 @@
         android:textAlignment="center"
         android:textColor="@color/strong_pink"
         android:textSize="40sp"
-        app:layout_constraintBottom_toTopOf="@id/news"
+        app:layout_constraintBottom_toTopOf="@id/button_news"
         app:layout_constraintTop_toTopOf="parent"
         />
 
     <Button
-        android:id="@+id/news"
+        android:id="@+id/button_news"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/news"
-        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintTop_toBottomOf="@id/tv_title"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/article"
+        app:layout_constraintEnd_toStartOf="@id/button_article"
         />
 
     <Button
-        android:id="@+id/article"
+        android:id="@+id/button_article"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/article"
-        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintTop_toBottomOf="@id/tv_title"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/news"
-        app:layout_constraintEnd_toStartOf="@id/top_manga"
+        app:layout_constraintStart_toEndOf="@id/button_news"
+        app:layout_constraintEnd_toStartOf="@id/button_top_manga"
         />
 
     <Button
-        android:id="@+id/top_manga"
+        android:id="@+id/button_top_manga"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/top_manga"
-        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintTop_toBottomOf="@id/tv_title"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/article"
+        app:layout_constraintStart_toEndOf="@id/button_article"
         app:layout_constraintEnd_toEndOf="parent"
         />
 
diff --git a/app/src/main/res/layout/item_layout.xml b/app/src/main/res/layout/item_layout.xml
index c4b662c..af4b9b0 100644
--- a/app/src/main/res/layout/item_layout.xml
+++ b/app/src/main/res/layout/item_layout.xml
@@ -2,7 +2,6 @@
 <androidx.cardview.widget.CardView
     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:id="@+id/cv_cardView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -42,16 +41,6 @@
                 android:textColor="@color/strong_pink"
                 android:textSize="30sp"/>
 
-            <!--TextView
-                android:id="@+id/tv_description"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:text="@string/rv_description"
-                android:textColor="@color/slightly_desaturated_magenta"
-                android:textSize="20sp"
-                /-->
-
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/news_page.xml b/app/src/main/res/layout/news_page.xml
index 5d9018c..2e41ad0 100644
--- a/app/src/main/res/layout/news_page.xml
+++ b/app/src/main/res/layout/news_page.xml
@@ -12,13 +12,13 @@
         android:id="@+id/textview_second"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/home"
+        app:layout_constraintBottom_toTopOf="@id/button_home"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <Button
-        android:id="@+id/home"
+        android:id="@+id/button_home"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/home"
diff --git a/app/src/main/res/layout/top_manga_page.xml b/app/src/main/res/layout/top_manga_page.xml
index 4a807f1..ba19596 100644
--- a/app/src/main/res/layout/top_manga_page.xml
+++ b/app/src/main/res/layout/top_manga_page.xml
@@ -12,14 +12,14 @@
         android:id="@+id/recycler_view"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/home"
+        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" />
 
     <Button
-        android:id="@+id/home"
+        android:id="@+id/button_home"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/home"
-- 
cgit v1.2.3


From c1d5a3e8fb8b3f8ac28d1e7818b5b33c0ab41b49 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Wed, 17 Feb 2021 22:57:15 +0100
Subject: Recycler view now working in a fragment.

---
 app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt | 21 ++++++++++++---------
 app/src/main/res/layout/item_layout.xml             |  2 +-
 app/src/main/res/values/strings.xml                 |  1 +
 3 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
index 17d124e..ac585c7 100644
--- a/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
@@ -1,13 +1,13 @@
 package xyz.adjutor.aniki
 
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
-import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 
 class TopMangaPage : Fragment() {
@@ -17,7 +17,16 @@ class TopMangaPage : Fragment() {
             savedInstanceState: Bundle?
     ): View? {
         // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.top_manga_page, container, false)
+        val view = inflater.inflate(R.layout.top_manga_page, container, false)
+
+        // Retrieves data from mangasource
+        val mangaList = MangaSource(view.context).getMangaList()
+
+        val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view)
+        recyclerView.setHasFixedSize(true)
+        recyclerView.layoutManager = LinearLayoutManager(view.context)
+        recyclerView.adapter = MangaAdapter(mangaList)
+        return view
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -27,11 +36,5 @@ class TopMangaPage : Fragment() {
             findNavController().navigate(R.id.action_TopMangaPage_to_HomePage)
         }
 
-        // Retrieves data from mangasource
-        val mangaList = MangaSource(requireActivity().applicationContext).getMangaList()
-
-        val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view)
-        recyclerView.adapter = MangaAdapter(mangaList)
-
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_layout.xml b/app/src/main/res/layout/item_layout.xml
index af4b9b0..8500bc7 100644
--- a/app/src/main/res/layout/item_layout.xml
+++ b/app/src/main/res/layout/item_layout.xml
@@ -39,7 +39,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 android:text="@string/rv_title"
                 android:textColor="@color/strong_pink"
-                android:textSize="30sp"/>
+                android:textSize="20sp"/>
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 41bd064..d69fb60 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,6 +31,7 @@
         <item>Ana Satsujin</item>
         <item>Samurai Deeper Kyou</item>
         <item>Sebsei, Ore ni Kamawazu Itte Kudasai!!</item>
+        <item>Mondaiji-tachi ga Isekai Kara Kuru Sou Desu yo</item>
     </string-array>
 
     <string name="manga1_name">Dragon Ball</string>
-- 
cgit v1.2.3


From eaef2672c25baaf370c72158d5236f40f6fea01f Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Thu, 18 Feb 2021 21:55:37 +0100
Subject: Preparing Preparing the implementation of the API datas to our
 recycerview in a fragment.

---
 .../main/java/xyz/adjutor/aniki/MangaAdapter.kt    | 12 ++++----
 .../java/xyz/adjutor/aniki/RestTopMangaResponse.kt |  4 +++
 .../main/java/xyz/adjutor/aniki/TopMangaPage.kt    | 29 +++++++++----------
 app/src/main/res/layout/item_layout.xml            | 33 ++++++++++++++--------
 app/src/main/res/values/strings.xml                |  2 +-
 5 files changed, 48 insertions(+), 32 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/java/xyz/adjutor/aniki/MangaAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/MangaAdapter.kt
index 8e1c8f2..9f7a373 100644
--- a/app/src/main/java/xyz/adjutor/aniki/MangaAdapter.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/MangaAdapter.kt
@@ -3,6 +3,7 @@ package xyz.adjutor.aniki
 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 java.util.ArrayList
@@ -12,11 +13,10 @@ class MangaAdapter(val mangaList: Array<String>) :
 
     // Describes an item view and its place within the RecyclerView
     class MangaViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        private val mangaTextView: TextView = itemView.findViewById(R.id.tv_title)
+        val mangaTitle: TextView = itemView.findViewById(R.id.tv_title)
+        val mangaRank: TextView = itemView.findViewById(R.id.tv_rank)
+        val mangaImage: ImageView = itemView.findViewById(R.id.iv_image)
 
-        fun bind(word: String) {
-            mangaTextView.text = word
-        }
     }
 
     // Returns a new ViewHolder
@@ -34,7 +34,9 @@ class MangaAdapter(val mangaList: Array<String>) :
 
     // Displays data at a certain position
     override fun onBindViewHolder(holder: MangaViewHolder, position: Int) {
-        holder.bind(mangaList[position])
+        holder.mangaTitle.text = mangaList[position] //use specific json data
+        holder.mangaRank.text = position.toString() //replace by the actual rank
+        //holder.mangaImage.setImageResource(mangaList[position]) //replace by the manga image
     }
 }
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/RestTopMangaResponse.kt b/app/src/main/java/xyz/adjutor/aniki/RestTopMangaResponse.kt
index 8cd5f2b..46b3bd3 100644
--- a/app/src/main/java/xyz/adjutor/aniki/RestTopMangaResponse.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/RestTopMangaResponse.kt
@@ -12,4 +12,8 @@ class RestTopMangaResponse {
     var request_cached_expiry: Int? = null
     @SerializedName("top")
     var top = ArrayList<TopManga>()
+
+    fun getResults(): ArrayList<TopManga> {
+        return top
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
index 9496053..729ff6f 100644
--- a/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
@@ -26,17 +26,8 @@ class TopMangaPage : Fragment() {
         // Inflate the layout for this fragment
         val view = inflater.inflate(R.layout.top_manga_page, container, false)
 
-        // Retrieves data from mangasource
-        val mangaList = MangaSource(view.context).getMangaList()
+        makeApiCall(view, base_url)
 
-
-        makeApiCall(base_url)
-
-
-        val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view)
-        recyclerView.setHasFixedSize(true)
-        recyclerView.layoutManager = LinearLayoutManager(view.context)
-        recyclerView.adapter = MangaAdapter(mangaList)
         return view
     }
 
@@ -49,7 +40,14 @@ class TopMangaPage : Fragment() {
 
     }
 
-    fun makeApiCall(BASE_URL: String) {
+    fun showList(view: View, mangaList: Array<String> ){
+        val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view)
+        recyclerView.setHasFixedSize(true)
+        recyclerView.layoutManager = LinearLayoutManager(view.context)
+        recyclerView.adapter = MangaAdapter(mangaList)
+    }
+
+    fun makeApiCall(view: View, BASE_URL: String) {
         val gson = GsonBuilder()
                 .setLenient()
                 .create()
@@ -62,9 +60,12 @@ class TopMangaPage : Fragment() {
         call.enqueue(object : Callback<RestTopMangaResponse> {
             override fun onResponse(call: Call<RestTopMangaResponse>, response: Response<RestTopMangaResponse>) {
                 if(response.isSuccessful && response.body() != null){
-                    val topMangaResponse = response.body()
+                    val topMangaResponse = response.body()!!.getResults()
                     Snackbar.make(requireView(), "HA? YOU THOUGHT IT WAS AN ERROR !? BUT IT WAS I, API !", Snackbar.LENGTH_LONG)
                             .setAction("Action", null).show()
+                    // Retrieves data from mangasource
+                    val mangaList = MangaSource(view.context).getMangaList()
+                    showList(view, mangaList)
                 } else {
                     showError()
                 }
@@ -74,9 +75,7 @@ class TopMangaPage : Fragment() {
                 showError()
             }
 
-
-        }
-        )
+        })
     }
 
     private fun showError() {
diff --git a/app/src/main/res/layout/item_layout.xml b/app/src/main/res/layout/item_layout.xml
index 8500bc7..eb65d60 100644
--- a/app/src/main/res/layout/item_layout.xml
+++ b/app/src/main/res/layout/item_layout.xml
@@ -29,17 +29,28 @@
             android:src="@mipmap/ic_launcher_round"
             android:contentDescription="@string/rv_image" />
 
-            <TextView
-                android:id="@+id/tv_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintStart_toEndOf="@id/iv_image"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                android:text="@string/rv_title"
-                android:textColor="@color/strong_pink"
-                android:textSize="20sp"/>
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toEndOf="@id/iv_image"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:text="@string/rv_title"
+            android:textColor="@color/strong_pink"
+            android:textSize="30sp"/>
+
+        <TextView
+            android:id="@+id/tv_rank"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/very_dark_purple"
+            android:text="@string/rv_rank"
+            android:textColor="@color/slightly_desaturated_magenta"
+            android:textSize="20sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ccd2ae8..5301008 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,7 +13,7 @@
     <string name="article_page_label">Article Page</string>
     <string name="top_manga_page_label">Top Manga Page</string>
     <string name="rv_title">Title</string>
-    <string name="rv_description">This is a description</string>
+    <string name="rv_rank">0</string>
     <string name="rv_image">image</string>
     <string name="manga_image_content_description">Image of manga</string>
 
-- 
cgit v1.2.3


From 64bd7c1aa8c5a9e75db10cdcb98b8dee9a7612c6 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Fri, 19 Feb 2021 12:19:21 +0100
Subject: Modifying, a bit, the layout.

---
 app/src/main/res/layout/item_layout.xml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/item_layout.xml b/app/src/main/res/layout/item_layout.xml
index eb65d60..cb6e87e 100644
--- a/app/src/main/res/layout/item_layout.xml
+++ b/app/src/main/res/layout/item_layout.xml
@@ -31,15 +31,18 @@
 
         <TextView
             android:id="@+id/tv_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toEndOf="@id/iv_image"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:fontFamily="@font/bangers"
             android:text="@string/rv_title"
+            android:textAlignment="center"
             android:textColor="@color/strong_pink"
-            android:textSize="30sp"/>
+            android:textSize="30sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/iv_image"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginHorizontal="10sp"/>
 
         <TextView
             android:id="@+id/tv_rank"
@@ -50,7 +53,8 @@
             android:textColor="@color/slightly_desaturated_magenta"
             android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/tv_title"/>
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-- 
cgit v1.2.3


From 41bb476749fa84164726b728676b144531009446 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Fri, 19 Feb 2021 12:53:57 +0100
Subject: Deleting useless files and adding image support.

---
 .../main/java/xyz/adjutor/aniki/MangaAdapter.kt    | 33 ++++++++++++++++++++--
 app/src/main/java/xyz/adjutor/aniki/MangaSource.kt | 11 --------
 .../main/java/xyz/adjutor/aniki/TopMangaPage.kt    | 19 ++++++-------
 app/src/main/res/layout/item_layout.xml            |  2 +-
 4 files changed, 40 insertions(+), 25 deletions(-)
 delete mode 100644 app/src/main/java/xyz/adjutor/aniki/MangaSource.kt

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/java/xyz/adjutor/aniki/MangaAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/MangaAdapter.kt
index f378c65..3116062 100644
--- a/app/src/main/java/xyz/adjutor/aniki/MangaAdapter.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/MangaAdapter.kt
@@ -1,5 +1,12 @@
+@file:Suppress("DEPRECATION")
+
 package xyz.adjutor.aniki
 
+import android.annotation.SuppressLint
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.os.AsyncTask
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -34,9 +41,29 @@ class MangaAdapter(val mangaList: List<TopManga>) :
     // Displays data at a certain position
     override fun onBindViewHolder(holder: MangaViewHolder, position: Int) {
         val currentManga: TopManga = mangaList[position]
-        holder.mangaTitle.text = currentManga.title //use specific json data
-        holder.mangaRank.text = currentManga.rank.toString() //replace by the actual rank
-        //holder.mangaImage.setImageResource(mangaList[position]) //replace by the manga image
+        holder.mangaTitle.text = currentManga.title
+        holder.mangaRank.text = currentManga.rank.toString()
+        DownloadImageFromInternet(holder.mangaImage).execute(currentManga.image_url)
+    }
+
+    @SuppressLint("StaticFieldLeak")
+    private inner class DownloadImageFromInternet(var imageView: ImageView) : AsyncTask<String, Void, Bitmap?>() {
+        override fun doInBackground(vararg urls: String): Bitmap? {
+            val imageURL = urls[0]
+            var image: Bitmap? = null
+            try {
+                val `in` = java.net.URL(imageURL).openStream()
+                image = BitmapFactory.decodeStream(`in`)
+            }
+            catch (e: Exception) {
+                Log.e("Error Message", e.message.toString())
+                e.printStackTrace()
+            }
+            return image
+        }
+        override fun onPostExecute(result: Bitmap?) {
+            imageView.setImageBitmap(result)
+        }
     }
 }
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/MangaSource.kt b/app/src/main/java/xyz/adjutor/aniki/MangaSource.kt
deleted file mode 100644
index 86e46e2..0000000
--- a/app/src/main/java/xyz/adjutor/aniki/MangaSource.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package xyz.adjutor.aniki
-
-import android.content.Context
-
-class MangaSource(val context: Context) {
-    fun getMangaList(): Array<String> {
-
-        // Return manga list from string resources
-        return context.resources.getStringArray(R.array.manga_array)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
index 45e714a..ee8a510 100644
--- a/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
@@ -48,27 +48,26 @@ class TopMangaPage : Fragment() {
     }
 
     fun makeApiCall(view: View, BASE_URL: String) {
+
         val gson = GsonBuilder()
                 .setLenient()
                 .create()
+
         val retrofit = Retrofit.Builder()
                 .baseUrl(BASE_URL)
                 .addConverterFactory(GsonConverterFactory.create(gson))
                 .build()
+
         val service = retrofit.create(TopMangaApi::class.java)
         val call = service.getTopMangaData()
+
         call.enqueue(object : Callback<RestTopMangaResponse> {
             override fun onResponse(call: Call<RestTopMangaResponse>, response: Response<RestTopMangaResponse>) {
-                if(response.isSuccessful && response.body() != null){
-                    val topMangaResponse = response.body()!!.getResults()
-                    Snackbar.make(requireView(), "HA? YOU THOUGHT IT WAS AN ERROR !? BUT IT WAS I, API !", Snackbar.LENGTH_LONG)
-                            .setAction("Action", null).show()
-                    // Retrieves data from mangasource
-                    //val mangaList = MangaSource(view.context).getMangaList()
-                    val mangaList=topMangaResponse
-                    showList(view, mangaList)
+                if(response.isSuccessful && response.body() != null){ //if the code returned is >= 200 and < 300 AND the the body ain't empty
+                    val mangaList = response.body()!!.getResults() //getting the "top" field containing our list of TopMangas
+                    showList(view, mangaList) // calling the method in charge of displaying on the recyclerview
                 } else {
-                    showError()
+                    showError() //a snackbar
                 }
             }
 
@@ -85,7 +84,7 @@ class TopMangaPage : Fragment() {
     }
 
     companion object {
-        var base_url = "https://api.jikan.moe/"
+        var base_url = "https://api.jikan.moe/" //the api's base url
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_layout.xml b/app/src/main/res/layout/item_layout.xml
index cb6e87e..32bea24 100644
--- a/app/src/main/res/layout/item_layout.xml
+++ b/app/src/main/res/layout/item_layout.xml
@@ -16,7 +16,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="20dp"
+        android:padding="10dp"
         >
 
         <ImageView
-- 
cgit v1.2.3


From fa849021bf137fc4b245a8c0e7a2a8fc46d574df Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Fri, 19 Feb 2021 14:00:42 +0100
Subject: Cleaning. Removing some useless files. Adding comments. Updating the
 home page.

---
 app/build.gradle                                   |  8 +++
 app/src/main/java/xyz/adjutor/aniki/ArticlePage.kt | 31 ----------
 app/src/main/java/xyz/adjutor/aniki/HomePage.kt    | 11 ----
 .../main/java/xyz/adjutor/aniki/MainActivity.kt    |  6 --
 .../main/java/xyz/adjutor/aniki/MangaAdapter.kt    | 69 ----------------------
 app/src/main/java/xyz/adjutor/aniki/NewsPage.kt    | 32 ----------
 app/src/main/java/xyz/adjutor/aniki/TopManga.kt    |  1 +
 .../main/java/xyz/adjutor/aniki/TopMangaAdapter.kt | 69 ++++++++++++++++++++++
 .../main/java/xyz/adjutor/aniki/TopMangaPage.kt    |  4 +-
 app/src/main/res/layout/activity_main.xml          |  9 ---
 app/src/main/res/layout/article_page.xml           | 29 ---------
 app/src/main/res/layout/home_page.xml              | 26 +-------
 app/src/main/res/layout/news_page.xml              | 29 ---------
 13 files changed, 83 insertions(+), 241 deletions(-)
 delete mode 100644 app/src/main/java/xyz/adjutor/aniki/ArticlePage.kt
 delete mode 100644 app/src/main/java/xyz/adjutor/aniki/MangaAdapter.kt
 delete mode 100644 app/src/main/java/xyz/adjutor/aniki/NewsPage.kt
 create mode 100644 app/src/main/java/xyz/adjutor/aniki/TopMangaAdapter.kt
 delete mode 100644 app/src/main/res/layout/article_page.xml
 delete mode 100644 app/src/main/res/layout/news_page.xml

(limited to 'app/src/main/res/layout')

diff --git a/app/build.gradle b/app/build.gradle
index 79284ac..4a23638 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,4 +51,12 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.6.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.6.0'
 
+    // Required for local unit tests (JUnit 4 framework)
+    testImplementation 'junit:junit:4.13.2'
+
+    // Required for instrumented tests
+    androidTestImplementation 'com.android.support:support-annotations:28.0.0'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/ArticlePage.kt b/app/src/main/java/xyz/adjutor/aniki/ArticlePage.kt
deleted file mode 100644
index 4579c69..0000000
--- a/app/src/main/java/xyz/adjutor/aniki/ArticlePage.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package xyz.adjutor.aniki
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import androidx.navigation.fragment.findNavController
-
-/**
- * A simple [Fragment] subclass as the second destination in the navigation.
- */
-class ArticlePage : Fragment() {
-
-    override fun onCreateView(
-            inflater: LayoutInflater, container: ViewGroup?,
-            savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.article_page, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        view.findViewById<Button>(R.id.button_home).setOnClickListener {
-            findNavController().navigate(R.id.action_ArticlePage_to_HomePage)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/HomePage.kt b/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
index d252755..b6d45c3 100644
--- a/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
@@ -7,11 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.navigation.fragment.findNavController
-import com.google.android.material.snackbar.Snackbar
 
-/**
- * A simple [Fragment] subclass as the default destination in the navigation.
- */
 class HomePage : Fragment() {
 
     override fun onCreateView(
@@ -24,13 +20,6 @@ class HomePage : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
-        view.findViewById<Button>(R.id.button_news).setOnClickListener {
-            findNavController().navigate(R.id.action_HomePage_to_NewsPage)
-        }
-        view.findViewById<Button>(R.id.button_article).setOnClickListener {
-            findNavController().navigate(R.id.action_HomePage_to_ArticlePage)
-        }
         view.findViewById<Button>(R.id.button_top_manga).setOnClickListener {
             findNavController().navigate(R.id.action_HomePage_to_TopMangaPage)
         }
diff --git a/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt b/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt
index 3ae1bf2..50cd24f 100644
--- a/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt
@@ -6,7 +6,6 @@ import com.google.android.material.snackbar.Snackbar
 import androidx.appcompat.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
-import androidx.recyclerview.widget.RecyclerView
 
 class MainActivity : AppCompatActivity() {
 
@@ -14,11 +13,6 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
         setSupportActionBar(findViewById(R.id.toolbar))
-
-        findViewById<FloatingActionButton>(R.id.info).setOnClickListener { view ->
-            Snackbar.make(view, "HA? YOU THOUGHT IT WAS AN INFO !? BUT IT WAS I, DIO !", Snackbar.LENGTH_LONG)
-                    .setAction("Action", null).show()
-        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
diff --git a/app/src/main/java/xyz/adjutor/aniki/MangaAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/MangaAdapter.kt
deleted file mode 100644
index 3116062..0000000
--- a/app/src/main/java/xyz/adjutor/aniki/MangaAdapter.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-@file:Suppress("DEPRECATION")
-
-package xyz.adjutor.aniki
-
-import android.annotation.SuppressLint
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.os.AsyncTask
-import android.util.Log
-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
-
-class MangaAdapter(val mangaList: List<TopManga>) :
-        RecyclerView.Adapter<MangaAdapter.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 mangaImage: ImageView = itemView.findViewById(R.id.iv_image)
-
-    }
-
-    // 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: TopManga = mangaList[position]
-        holder.mangaTitle.text = currentManga.title
-        holder.mangaRank.text = currentManga.rank.toString()
-        DownloadImageFromInternet(holder.mangaImage).execute(currentManga.image_url)
-    }
-
-    @SuppressLint("StaticFieldLeak")
-    private inner class DownloadImageFromInternet(var imageView: ImageView) : AsyncTask<String, Void, Bitmap?>() {
-        override fun doInBackground(vararg urls: String): Bitmap? {
-            val imageURL = urls[0]
-            var image: Bitmap? = null
-            try {
-                val `in` = java.net.URL(imageURL).openStream()
-                image = BitmapFactory.decodeStream(`in`)
-            }
-            catch (e: Exception) {
-                Log.e("Error Message", e.message.toString())
-                e.printStackTrace()
-            }
-            return image
-        }
-        override fun onPostExecute(result: Bitmap?) {
-            imageView.setImageBitmap(result)
-        }
-    }
-}
-
diff --git a/app/src/main/java/xyz/adjutor/aniki/NewsPage.kt b/app/src/main/java/xyz/adjutor/aniki/NewsPage.kt
deleted file mode 100644
index 90be1bd..0000000
--- a/app/src/main/java/xyz/adjutor/aniki/NewsPage.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package xyz.adjutor.aniki
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import androidx.navigation.fragment.findNavController
-
-/**
- * A simple [Fragment] subclass as the second destination in the navigation.
- */
-class NewsPage : Fragment() {
-
-    override fun onCreateView(
-            inflater: LayoutInflater, container: ViewGroup?,
-            savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.news_page, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        view.findViewById<Button>(R.id.button_home).setOnClickListener {
-            findNavController().navigate(R.id.action_NewsPage_to_HomePage)
-        }
-        //val industryNews = News(0,"Horror Manga Ajin Ends Nine-Year Serialization","Gamon Sakurai's Ajin (Ajin: Demi-Human) manga ended its nine-year run in the March issue of good! Afternoon on Friday.")
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/adjutor/aniki/TopManga.kt b/app/src/main/java/xyz/adjutor/aniki/TopManga.kt
index acedf56..9cba192 100644
--- a/app/src/main/java/xyz/adjutor/aniki/TopManga.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/TopManga.kt
@@ -2,6 +2,7 @@ package xyz.adjutor.aniki
 
 import com.google.gson.annotations.SerializedName
 
+//Content of the top field from the api of top manga
 class TopManga{
 
     @SerializedName("mal_id")
diff --git a/app/src/main/java/xyz/adjutor/aniki/TopMangaAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/TopMangaAdapter.kt
new file mode 100644
index 0000000..1478111
--- /dev/null
+++ b/app/src/main/java/xyz/adjutor/aniki/TopMangaAdapter.kt
@@ -0,0 +1,69 @@
+@file:Suppress("DEPRECATION")
+
+package xyz.adjutor.aniki
+
+import android.annotation.SuppressLint
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.os.AsyncTask
+import android.util.Log
+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
+
+class TopMangaAdapter(val mangaList: List<TopManga>) :
+        RecyclerView.Adapter<TopMangaAdapter.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 mangaImage: ImageView = itemView.findViewById(R.id.iv_image)
+
+    }
+
+    // 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: TopManga = mangaList[position]
+        holder.mangaTitle.text = currentManga.title
+        holder.mangaRank.text = currentManga.rank.toString()
+        DownloadImageFromInternet(holder.mangaImage).execute(currentManga.image_url)
+    }
+
+    @SuppressLint("StaticFieldLeak")
+    private inner class DownloadImageFromInternet(var imageView: ImageView) : AsyncTask<String, Void, Bitmap?>() {
+        override fun doInBackground(vararg urls: String): Bitmap? {
+            val imageURL = urls[0]
+            var image: Bitmap? = null
+            try {
+                val `in` = java.net.URL(imageURL).openStream()
+                image = BitmapFactory.decodeStream(`in`)
+            }
+            catch (e: Exception) {
+                Log.e("Error Message", e.message.toString())
+                e.printStackTrace()
+            }
+            return image
+        }
+        override fun onPostExecute(result: Bitmap?) {
+            imageView.setImageBitmap(result)
+        }
+    }
+}
+
diff --git a/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
index ee8a510..6606b6c 100644
--- a/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/TopMangaPage.kt
@@ -34,17 +34,19 @@ class TopMangaPage : Fragment() {
     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_TopMangaPage_to_HomePage)
         }
 
     }
 
+    //display the recyclerview
     fun showList(view: View, mangaList: List<TopManga> ){
         val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view)
         recyclerView.setHasFixedSize(true)
         recyclerView.layoutManager = LinearLayoutManager(view.context)
-        recyclerView.adapter = MangaAdapter(mangaList)
+        recyclerView.adapter = TopMangaAdapter(mangaList)
     }
 
     fun makeApiCall(view: View, BASE_URL: String) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 12a61d8..dd69e51 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -23,13 +23,4 @@
 
     <include layout="@layout/content_main" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/info"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_dialog_info"
-        android:contentDescription="@string/info"/>
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/article_page.xml b/app/src/main/res/layout/article_page.xml
deleted file mode 100644
index 380ba00..0000000
--- a/app/src/main/res/layout/article_page.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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"
-    tools:context=".ArticlePage"
-    android:background="@color/very_dark_purple"
-    >
-
-    <TextView
-        android:id="@+id/textview_second"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/button_home"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <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"
-        app:layout_constraintTop_toBottomOf="@id/textview_second" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 036800c..68d9f81 100644
--- a/app/src/main/res/layout/home_page.xml
+++ b/app/src/main/res/layout/home_page.xml
@@ -18,32 +18,10 @@
         android:textAlignment="center"
         android:textColor="@color/strong_pink"
         android:textSize="40sp"
-        app:layout_constraintBottom_toTopOf="@id/button_news"
+        app:layout_constraintBottom_toBottomOf="@id/button_top_manga"
         app:layout_constraintTop_toTopOf="parent"
         />
 
-    <Button
-        android:id="@+id/button_news"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/news"
-        app:layout_constraintTop_toBottomOf="@id/tv_title"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/button_article"
-        />
-
-    <Button
-        android:id="@+id/button_article"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/article"
-        app:layout_constraintTop_toBottomOf="@id/tv_title"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/button_news"
-        app:layout_constraintEnd_toStartOf="@id/button_top_manga"
-        />
-
     <Button
         android:id="@+id/button_top_manga"
         android:layout_width="wrap_content"
@@ -51,7 +29,7 @@
         android:text="@string/top_manga"
         app:layout_constraintTop_toBottomOf="@id/tv_title"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/button_article"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         />
 
diff --git a/app/src/main/res/layout/news_page.xml b/app/src/main/res/layout/news_page.xml
deleted file mode 100644
index 2e41ad0..0000000
--- a/app/src/main/res/layout/news_page.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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"
-    tools:context=".NewsPage"
-    android:background="@color/very_dark_purple"
-    >
-
-    <TextView
-        android:id="@+id/textview_second"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/button_home"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <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"
-        app:layout_constraintTop_toBottomOf="@id/textview_second" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3