From f2c182e69a64dbe4e891e56d6d6d25c951c672c2 Mon Sep 17 00:00:00 2001
From: MrLetsplay <mr@cringe-studios.com>
Date: Fri, 16 Jun 2023 23:04:28 +0200
Subject: [PATCH] General layout (WIP), Broken navigation

---
 .idea/deploymentTargetDropDown.xml                     |  2 +-
 .idea/misc.xml                                         |  3 ++-
 .../cringe_authenticator/MainActivity.java             | 10 +++++++++-
 app/src/main/res/layout/fragment_dynamic.xml           |  3 ++-
 app/src/main/res/menu/activity_main_drawer.xml         |  4 ----
 app/src/main/res/menu/main.xml                         |  3 ++-
 app/src/main/res/navigation/mobile_navigation.xml      |  6 ------
 build.gradle                                           |  4 ++--
 8 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index c973662..894b3b7 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -12,6 +12,6 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-06-16T19:25:50.154175976Z" />
+    <timeTargetWasSelectedWithDropDown value="2023-06-16T20:57:31.174436180Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8978d23..9f71c83 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
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 d2e8cf7..47abfaa 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
@@ -1,10 +1,13 @@
 package com.cringe_studios.cringe_authenticator;
 
 import android.os.Bundle;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.Menu;
 
 import com.cringe_studios.cringe_authenticator.ui.dynamic.DynamicFragment;
+import com.cringe_studios.cringe_authenticator.ui.home.HomeFragment;
+import com.cringe_studios.cringe_authenticator.ui.settings.SettingsFragment;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.navigation.NavigationView;
 
@@ -42,7 +45,7 @@ public class MainActivity extends AppCompatActivity {
         // Passing each menu ID as a set of Ids because each
         // menu should be considered as top level destinations.
         mAppBarConfiguration = new AppBarConfiguration.Builder(
-                R.id.nav_home, R.id.nav_settings, R.id.nav_credits)
+                R.id.nav_home, R.id.nav_credits)
                 .setOpenableLayout(drawer)
                 .build();
         NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);
@@ -57,6 +60,11 @@ public class MainActivity extends AppCompatActivity {
         return true;
     }
 
+    public void onSettings(MenuItem item) {
+        NavHostFragment f = (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment_content_main);
+        f.getChildFragmentManager().beginTransaction().replace(R.id.nav_host_fragment_content_main, new SettingsFragment()).commit();
+    }
+
     @Override
     public boolean onSupportNavigateUp() {
         NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);
diff --git a/app/src/main/res/layout/fragment_dynamic.xml b/app/src/main/res/layout/fragment_dynamic.xml
index fd0ee28..0a57991 100644
--- a/app/src/main/res/layout/fragment_dynamic.xml
+++ b/app/src/main/res/layout/fragment_dynamic.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:context=".ui.dynamic.DynamicFragment">
 
     <TextView
         android:id="@+id/text_dynamic"
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index f141510..b9d8313 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -8,10 +8,6 @@
             android:id="@+id/nav_home"
             android:icon="@drawable/ic_launcher_foreground"
             android:title="Home" />
-        <item
-            android:id="@+id/nav_settings"
-            android:icon="@drawable/ic_launcher_foreground"
-            android:title="Settings" />
         <item
             android:id="@+id/nav_credits"
             android:icon="@drawable/ic_launcher_foreground"
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 412d5f8..5cbe2eb 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -5,5 +5,6 @@
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:title="@string/action_settings"
-        app:showAsAction="never" />
+        app:showAsAction="never"
+        android:onClick="onSettings" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 9ac3939..dd472a8 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -11,12 +11,6 @@
         android:label="@string/menu_home"
         tools:layout="@layout/fragment_home" />
 
-    <fragment
-        android:id="@+id/nav_settings"
-        android:name="com.cringe_studios.cringe_authenticator.ui.settings.SettingsFragment"
-        android:label="Settings"
-        tools:layout="@layout/fragment_settings" />
-
     <fragment
         android:id="@+id/nav_credits"
         android:name="com.cringe_studios.cringe_authenticator.ui.credits.CreditsFragment"
diff --git a/build.gradle b/build.gradle
index 1454d1b..a100ce0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.0.1' apply false
-    id 'com.android.library' version '8.0.1' apply false
+    id 'com.android.application' version '8.0.2' apply false
+    id 'com.android.library' version '8.0.2' apply false
 }
\ No newline at end of file