From 4e030eba38ed5c0bdd14b7378e6d932670f11c91 Mon Sep 17 00:00:00 2001
From: MrLetsplay <mr@cringe-studios.com>
Date: Tue, 4 Jul 2023 21:19:56 +0200
Subject: [PATCH] Add settings labels, Add placeholder AboutFragment

---
 .../cringe_authenticator/MainActivity.java    |  5 ++
 .../fragment/AboutFragment.java               | 28 +++++++++
 app/src/main/res/layout/fragment_about.xml    | 61 +++++++++++++++++++
 app/src/main/res/layout/fragment_settings.xml | 10 +++
 app/src/main/res/menu/menu_groups.xml         |  6 ++
 app/src/main/res/menu/menu_main.xml           |  6 ++
 app/src/main/res/values-de-rDE/strings.xml    |  5 +-
 app/src/main/res/values/strings.xml           |  3 +-
 8 files changed, 122 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/cringe_studios/cringe_authenticator/fragment/AboutFragment.java
 create mode 100644 app/src/main/res/layout/fragment_about.xml

diff --git a/app/src/main/java/com/cringe_studios/cringe_authenticator/MainActivity.java b/app/src/main/java/com/cringe_studios/cringe_authenticator/MainActivity.java
index b46b757..bacf573 100644
--- a/app/src/main/java/com/cringe_studios/cringe_authenticator/MainActivity.java
+++ b/app/src/main/java/com/cringe_studios/cringe_authenticator/MainActivity.java
@@ -24,6 +24,7 @@ import androidx.fragment.app.Fragment;
 
 import com.cringe_studios.cringe_authenticator.databinding.ActivityMainBinding;
 import com.cringe_studios.cringe_authenticator.databinding.DialogInputCodeChoiceBinding;
+import com.cringe_studios.cringe_authenticator.fragment.AboutFragment;
 import com.cringe_studios.cringe_authenticator.fragment.GroupFragment;
 import com.cringe_studios.cringe_authenticator.fragment.HomeFragment;
 import com.cringe_studios.cringe_authenticator.fragment.MenuFragment;
@@ -182,6 +183,10 @@ public class MainActivity extends AppCompatActivity {
         NavigationUtil.navigate(this, SettingsFragment.class, null);
     }
 
+    public void openAbout(MenuItem item) {
+        NavigationUtil.navigate(this, AboutFragment.class, null);
+    }
+
     public void scanCode() {
         startQRCodeScan.launch(null);
     }
diff --git a/app/src/main/java/com/cringe_studios/cringe_authenticator/fragment/AboutFragment.java b/app/src/main/java/com/cringe_studios/cringe_authenticator/fragment/AboutFragment.java
new file mode 100644
index 0000000..97b8a95
--- /dev/null
+++ b/app/src/main/java/com/cringe_studios/cringe_authenticator/fragment/AboutFragment.java
@@ -0,0 +1,28 @@
+package com.cringe_studios.cringe_authenticator.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.cringe_studios.cringe_authenticator.databinding.FragmentAboutBinding;
+
+public class AboutFragment extends NamedFragment {
+
+    private FragmentAboutBinding binding;
+
+    @Override
+    public String getName() {
+        return "About";
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = FragmentAboutBinding.inflate(inflater);
+        return binding.getRoot();
+    }
+}
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
new file mode 100644
index 0000000..d230d9c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".fragment.HomeFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="16dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/about_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:text="@string/app_name"
+            android:textAlignment="center"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:id="@+id/linearLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/about_jg_cody"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_weight="1"
+                android:src="@drawable/ic_hamburger" />
+
+            <ImageView
+                android:id="@+id/about_cringe_studios"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_weight="1"
+                android:src="@drawable/ic_hamburger" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/about_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:text="Developed by Cringe Studios and JG-Cody"
+            android:textAlignment="center" />
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index e0e9e69..ed1dbb2 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -11,6 +11,11 @@
         android:padding="16dp"
         android:orientation="vertical">
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/language" />
+
         <Spinner
             android:id="@+id/settings_language"
             android:layout_width="match_parent"
@@ -30,6 +35,11 @@
             android:layout_height="wrap_content"
             android:text="@string/settings_biometric_lock" />
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/theme" />
+
         <Spinner
             android:id="@+id/settings_theme"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/menu/menu_groups.xml b/app/src/main/res/menu/menu_groups.xml
index 2c11002..fde52fd 100644
--- a/app/src/main/res/menu/menu_groups.xml
+++ b/app/src/main/res/menu/menu_groups.xml
@@ -14,4 +14,10 @@
         android:title="@string/action_settings"
         app:showAsAction="never"
         android:onClick="openSettings" />
+    <item
+        android:id="@+id/action_about"
+        android:orderInCategory="100"
+        android:title="@string/action_about"
+        app:showAsAction="never"
+        android:onClick="openAbout" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 7e17392..045ecb7 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -8,4 +8,10 @@
         android:title="@string/action_settings"
         app:showAsAction="never"
         android:onClick="openSettings" />
+    <item
+        android:id="@+id/action_about"
+        android:orderInCategory="100"
+        android:title="@string/action_about"
+        app:showAsAction="never"
+        android:onClick="openAbout" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 412accc..37e5599 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <string name="app_name">Cringe Authenticator</string>
     <string name="action_settings">Einstellungen</string>
+    <string name="action_about">Über</string>
     <string name="next">Weiter</string>
     <string name="previous">Zurück</string>
     <string name="edit">Bearbeiten</string>
@@ -11,7 +12,6 @@
     <string name="no">Nein</string>
     <string name="yes">Ja</string>
     <string name="invalid_input">Ungültige Eingabe</string>
-    <string name="about">Über</string>
     <string name="haptic_feedback">Vibration</string>
     <string name="reset_app">App zurücksetzen</string>
     <string name="import_export">Importieren / Exportieren</string>
@@ -36,6 +36,9 @@
     <string name="edit_group_title">Gruppe bearbeiten</string>
     <string name="settings_enable_intro_video">Intro-Video zeigen</string>
     <string name="settings_biometric_lock">Biometrische Authentifizierung aktivieren</string>
+    <string name="uri_handler_code_added">Code hinzugefügt</string>
+    <string name="uri_handler_add_code_title">Code hinzufügen</string>
+    <string name="theme">Theme</string>
     <string-array name="view_edit_delete">
         <item>Anzeigen</item>
         <item>Bearbeiten</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a7a12b9..138fa69 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <resources>
     <string name="app_name">Cringe Authenticator</string>
     <string name="action_settings">Settings</string>
+    <string name="action_about">About</string>
     <!-- Strings used for fragments for navigation -->
     <string name="first_fragment_label" translatable="false">First Fragment</string>
     <string name="second_fragment_label" translatable="false">Second Fragment</string>
@@ -51,7 +52,6 @@
     <string name="no">No</string>
     <string name="yes">Yes</string>
     <string name="invalid_input">Invalid Input</string>
-    <string name="about">About</string>
     <string name="haptic_feedback">Haptic Feedback</string>
     <string name="reset_app">Reset App</string>
     <string name="import_export">Import / Export</string>
@@ -78,6 +78,7 @@
     <string name="settings_biometric_lock">Require biometric unlock</string>
     <string name="uri_handler_code_added">Code added</string>
     <string name="uri_handler_add_code_title">Add Code</string>
+    <string name="theme">Theme</string>
     <string-array name="view_edit_delete">
         <item>View</item>
         <item>Edit</item>