From 2d902d0c7ca4810f90e19d0947bf1fa2e0aff126 Mon Sep 17 00:00:00 2001
From: archroid <archroid.dev@gmail.com>
Date: Wed, 2 Feb 2022 19:40:37 +0330
Subject: [PATCH] Fixed backstack bugs

---
 .idea/misc.xml                                |  4 +--
 .../java/com/github/libretube/MainActivity.kt | 29 ++++++++++---------
 .../com/github/libretube/PlayerFragment.kt    |  1 +
 app/src/main/res/values-night/themes.xml      |  4 +--
 app/src/main/res/values/themes.xml            |  4 +--
 5 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 97d6032fc..6bb60df3e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -13,11 +13,11 @@
         <entry key="app/src/main/res/drawable/ic_share.xml" value="0.329" />
         <entry key="app/src/main/res/drawable/libretube.xml" value="0.17135416666666667" />
         <entry key="app/src/main/res/layout-land/fragment_player.xml" value="0.1" />
-        <entry key="app/src/main/res/layout/activity_main.xml" value="0.17" />
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.18703703703703703" />
         <entry key="app/src/main/res/layout/activity_player.xml" value="0.27685185185185185" />
         <entry key="app/src/main/res/layout/channel_search_row.xml" value="0.33" />
         <entry key="app/src/main/res/layout/exo_styled_player_control_view.xml" value="0.12" />
-        <entry key="app/src/main/res/layout/fragment_home.xml" value="0.16" />
+        <entry key="app/src/main/res/layout/fragment_home.xml" value="0.35208333333333336" />
         <entry key="app/src/main/res/layout/fragment_library.xml" value="0.11956521739130435" />
         <entry key="app/src/main/res/layout/fragment_player.xml" value="0.2" />
         <entry key="app/src/main/res/layout/fragment_search.xml" value="0.25" />
diff --git a/app/src/main/java/com/github/libretube/MainActivity.kt b/app/src/main/java/com/github/libretube/MainActivity.kt
index 8d09dd9d8..802125a98 100644
--- a/app/src/main/java/com/github/libretube/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/MainActivity.kt
@@ -4,6 +4,7 @@ import android.content.res.Configuration
 import android.content.res.Resources
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -12,6 +13,7 @@ import androidx.appcompat.widget.Toolbar
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.Fragment
+import androidx.navigation.NavController
 import androidx.navigation.Navigation
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import androidx.navigation.findNavController
@@ -24,6 +26,8 @@ import com.google.android.material.color.DynamicColors
 class MainActivity : AppCompatActivity() {
     lateinit var bottomNavigationView: BottomNavigationView
     lateinit var toolbar: Toolbar
+    lateinit var navController : NavController
+
     var f = false
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -33,13 +37,12 @@ class MainActivity : AppCompatActivity() {
 
         setContentView(R.layout.activity_main)
         bottomNavigationView = findViewById<BottomNavigationView>(R.id.bottomNav)
-        val navController = findNavController(R.id.fragment)
+
+
+        navController = findNavController(R.id.fragment)
         bottomNavigationView.setupWithNavController(navController)
 
-/*        bottomNavigationView.setOnItemSelectedListener {
-            println("fuckoff")
-            onNavDestinationSelected(it,navController)
-        }*/
+
 
 
 
@@ -52,16 +55,14 @@ class MainActivity : AppCompatActivity() {
         toolbar.setTitle(appName)
 
         toolbar.setNavigationOnClickListener{
+            //settings fragment stuff
             true
         }
 
         toolbar.setOnMenuItemClickListener{
             when (it.itemId){
                 R.id.action_search -> {
-                    val navController = findNavController(R.id.fragment)
-                    navController.popBackStack()
                     navController.navigate(R.id.searchFragment)
-                    f = true
                     true
                 }
             }
@@ -71,12 +72,12 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onBackPressed() {
-        if (f){
-            val navController = findNavController(R.id.fragment)
-            navController.popBackStack()
-            navController.navigate(R.id.home2)
-            f = false
-        }else {super.onBackPressed()}
+
+        navController.popBackStack()
+        if (navController.currentBackStackEntry == null){
+            finish()
+        }
+
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
diff --git a/app/src/main/java/com/github/libretube/PlayerFragment.kt b/app/src/main/java/com/github/libretube/PlayerFragment.kt
index 35b579086..70e194774 100644
--- a/app/src/main/java/com/github/libretube/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/PlayerFragment.kt
@@ -412,4 +412,5 @@ class PlayerFragment : Fragment() {
     override fun onResume() {
         super.onResume()
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index b023b3b3f..6058efa75 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -28,8 +28,8 @@
         <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_dark_primaryInverse</item>
 
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
-        <item name="android:navigationBarColor">#342625</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 </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 82c1739f2..71b2593f0 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -28,8 +28,8 @@
         <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_light_primaryInverse</item>
 
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
-        <item name="android:navigationBarColor">#f5e9eb</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 </resources>
\ No newline at end of file