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')

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