From b541cae3de7c714f0685a0e600996bc9c0b7b39a Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Thu, 22 Sep 2022 18:19:06 +0200
Subject: [PATCH 1/2] bump version

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ab5cf0313..07d05b471 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId 'com.github.libretube'
         minSdk 21
         targetSdk 33
-        versionCode 18
-        versionName '0.5.1'
+        versionCode 19
+        versionName '0.6.0'
         multiDexEnabled true
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         resValue "string", "app_name", "LibreTube"

From 5ec053b3b14fc6ddb1d0f7fd1aa1eb8dbbb8e804 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Thu, 22 Sep 2022 18:34:13 +0200
Subject: [PATCH 2/2] fix the backpress behavior

---
 .../libretube/ui/activities/MainActivity.kt      | 16 ----------------
 .../libretube/ui/activities/SettingsActivity.kt  |  2 +-
 app/src/main/res/layout/fragment_channel.xml     |  2 --
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
index 74374a1c8..84316eef2 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
@@ -279,22 +279,6 @@ class MainActivity : BaseActivity() {
                 return true
             }
         })
-
-        searchItem.setOnActionExpandListener(
-            object : MenuItem.OnActionExpandListener {
-                override fun onMenuItemActionExpand(p0: MenuItem): Boolean {
-                    return true
-                }
-
-                override fun onMenuItemActionCollapse(p0: MenuItem): Boolean {
-                    val currentFragmentId = navController.currentDestination?.id
-                    if (currentFragmentId == R.id.searchFragment || currentFragmentId == R.id.searchResultFragment) {
-                        navController.popBackStack()
-                    }
-                    return true
-                }
-            }
-        )
         return super.onCreateOptionsMenu(menu)
     }
 
diff --git a/app/src/main/java/com/github/libretube/ui/activities/SettingsActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/SettingsActivity.kt
index 416bdc213..f2c29bd19 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/SettingsActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/SettingsActivity.kt
@@ -18,7 +18,7 @@ class SettingsActivity : BaseActivity() {
         setContentView(binding.root)
 
         binding.backImageButton.setOnClickListener {
-            onBackPressed()
+            onBackPressedDispatcher.onBackPressed()
         }
 
         if (savedInstanceState == null) {
diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
index e3028d0d8..7b8d14da6 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -107,8 +107,6 @@
                     android:id="@+id/channel_recView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
                     android:nestedScrollingEnabled="false" />
 
             </RelativeLayout>