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

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