From bb6518cd9831aeec15e407b51182039d83631bb0 Mon Sep 17 00:00:00 2001
From: rimthekid <farbod@nigge.rs>
Date: Fri, 28 Jan 2022 21:46:11 +0400
Subject: [PATCH] temp workaround for backstack

---
 .idea/misc.xml                                        |  1 +
 .../main/java/xyz/btcland/libretube/MainActivity.kt   | 11 ++++++++++-
 app/src/main/res/drawable/ic_libretube_foreground.xml |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index ecfa9ae2a..0737a9c2b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,6 +4,7 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="app/src/main/res/drawable/ic_close.xml" value="0.17135416666666667" />
+        <entry key="app/src/main/res/drawable/ic_libretube_foreground.xml" value="0.17135416666666667" />
         <entry key="app/src/main/res/drawable/ic_play.xml" value="0.17135416666666667" />
         <entry key="app/src/main/res/drawable/ic_search2.xml" value="0.17135416666666667" />
         <entry key="app/src/main/res/drawable/libretube.xml" value="0.17135416666666667" />
diff --git a/app/src/main/java/xyz/btcland/libretube/MainActivity.kt b/app/src/main/java/xyz/btcland/libretube/MainActivity.kt
index 3125aff05..1e9b452a2 100644
--- a/app/src/main/java/xyz/btcland/libretube/MainActivity.kt
+++ b/app/src/main/java/xyz/btcland/libretube/MainActivity.kt
@@ -20,6 +20,7 @@ import com.google.android.exoplayer2.ExoPlayer
 class MainActivity : AppCompatActivity() {
     lateinit var bottomNavigationView: BottomNavigationView
     lateinit var toolbar: Toolbar
+    var f = false
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         supportActionBar?.hide()
@@ -44,6 +45,7 @@ class MainActivity : AppCompatActivity() {
                     val navController = findNavController(R.id.fragment)
                     navController.popBackStack()
                     navController.navigate(R.id.searchFragment)
+                    f = true
                     true
                 }
                 R.id.action_settings -> {
@@ -55,7 +57,14 @@ 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()}
+    }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
diff --git a/app/src/main/res/drawable/ic_libretube_foreground.xml b/app/src/main/res/drawable/ic_libretube_foreground.xml
index 4ea7dce4a..d5e5d703f 100644
--- a/app/src/main/res/drawable/ic_libretube_foreground.xml
+++ b/app/src/main/res/drawable/ic_libretube_foreground.xml
@@ -25,7 +25,7 @@
         android:strokeColor="#00000000"
         android:fillType="nonZero"/>
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#5e3d3d"
         android:pathData="m212.553,211.009c-8.922,2.015 -15.168,5.152 -15.168,9.296l0,24.176c0,3.885 5.468,6.879 13.469,8.922 -2.446,3.598 -1.554,5.929 -0.518,8.318 0.72,1.641 1.439,3.367 1.238,5.871 -0.029,0.863 -0.489,1.612 -0.979,2.504 -0.748,1.324 -1.612,2.821 -1.209,4.922 0.23,1.381 0.892,2.302 1.525,3.08 0.576,0.748 1.094,1.41 1.209,2.475 0.144,0.921 0.029,1.928 -0.086,2.964 -0.201,1.698 -0.374,3.454 0.403,5.209 0.518,1.151 1.295,1.813 2.015,2.389 0.662,0.576 1.209,1.007 1.381,1.813 0.201,0.863 0.173,1.756 0.144,2.705 -0.029,1.41 -0.058,2.878 0.662,4.375 0.921,1.928 3.569,4.058 4.519,4.806 0.086,1.842 0.547,9.21 0.604,11.512 0.086,3.511 1.525,6.13 4.231,7.857 4.288,2.705 9.383,2.59 11.368,2.418 0.777,2.993 3.425,13.844 4.403,17.24 2.389,8.548 4.058,17.412 5.699,25.989l2.705,14.131c1.497,7.742 3.051,15.513 4.605,23.255 -12.203,13.383 -21.758,29.788 -30.047,45.301 -1.9,3.569 -2.763,7.339 -1.18,11.052 2.015,4.806 4.288,9.498 7.08,13.93 1.842,2.936 4.26,5.699 5.756,8.778 2.907,6.015 -4.029,9.987 -3.108,15.772 0.633,3.972 2.821,7.224 5.843,9.929l248.351,0c-2.043,-3.972 -4.95,-7.425 -7.8,-10.764 -1.094,-1.295 -2.187,-2.562 -3.223,-3.885 -0.806,-1.007 -1.641,-2.043 -2.504,-3.08 -4.26,-5.181 -9.095,-11.052 -10.476,-17.412 -0.604,-2.821 0.489,-5.468 1.641,-8.289 0.662,-1.583 1.324,-3.195 1.669,-4.864 1.612,-7.397 -0.777,-12.808 -3.31,-18.535 -1.094,-2.504 -2.245,-5.094 -3.08,-7.915 -1.324,-4.663 -0.23,-9.181 0.95,-13.959 0.921,-3.799 1.871,-7.742 1.525,-11.771 -0.259,-2.964 -0.835,-5.929 -1.583,-8.836l49.762,-20.607c0.748,-0.317 1.122,-1.094 0.892,-1.842 -0.201,-0.748 -0.863,-1.238 -1.698,-1.151l-55.173,6.792c-0.921,-1.928 -1.784,-3.828 -2.677,-5.641 -1.122,-2.302 -2.389,-4.749 -3.799,-7.195l36.926,-39.631c0.547,-0.576 0.576,-1.468 0.086,-2.043 -0.489,-0.604 -1.381,-0.777 -2.043,-0.345L438.253,358.828C435.577,356.036 432.583,353.475 429.159,351.46 427.259,350.337 425.244,349.416 423.23,348.495l11.225,-56.353c0.144,-0.777 -0.259,-1.525 -1.007,-1.784 -0.748,-0.288 -1.554,0.086 -1.9,0.777l-26.335,52.295c-2.648,-0.317 -5.296,-0.518 -8.001,-0.518 -2.533,0 -4.95,0.201 -7.368,0.489L359.163,289.437c-0.374,-0.662 -1.209,-0.979 -1.957,-0.662 -0.72,0.288 -1.122,1.065 -0.921,1.842l14.678,58.195c-5.209,2.562 -9.958,5.871 -14.074,9.958 -0.173,0.173 -0.288,0.345 -0.432,0.489L303.99,334.076c-0.691,-0.345 -1.525,-0.115 -1.986,0.547 -0.403,0.662 -0.288,1.525 0.288,2.043L345.579,374.427c-0.892,1.784 -1.698,3.511 -2.302,5.209 -1.324,3.626 -2.187,7.483 -2.734,11.426l-34.364,10.361c-1.007,-6.188 -1.986,-12.376 -4.346,-17.988 -1.353,-3.252 -4.749,-2.475 -7.598,-1.698 -1.698,0.46 -3.31,1.007 -4.922,1.554 -11.081,-30.076 -20.032,-55.087 -20.118,-57.274 0,-0.576 -0.23,-2.072 -0.604,-4.144 -1.007,-6.015 -2.907,-17.269 -1.928,-25.097 0.72,-5.843 -1.036,-19.427 -1.813,-25.011 -0.892,-6.389 -1.957,-12.433 -4.231,-16.722 12.289,-1.842 21.73,-5.411 21.73,-10.534l0,-24.176c0,-4.547 -7.425,-7.857 -17.671,-9.843 -34.94,-4.403 -52.122,0.518 -52.122,0.518zM310.466,418.922C309.257,415.987 308.451,412.907 307.789,409.828l32.868,-0.748c0.432,3.77 0.892,7.541 1.381,11.311l-21.614,11.685c-3.626,-4.202 -7.857,-8.087 -9.958,-13.153zM353.781,468.023c-3.482,-5.468 -6.965,-11.023 -12.462,-14.65 -2.13,-1.381 -5.584,-2.418 -8.03,-2.964 -1.036,-0.23 -2.187,0.144 -3.252,0.029 -0.979,-0.115 -1.525,-0.691 -2.59,-0.662 -0.432,-3.799 -0.835,-6.677 -1.842,-9.44l18.103,-4.144c0.317,4.547 0.806,9.124 2.619,12.894 1.065,2.216 3.08,3.252 4.893,4.173 1.554,0.806 3.022,1.554 3.799,2.964 0.748,1.381 0.173,6.476 -1.238,11.8z"/>
     <group>
       <clip-path