From 66dd981654442b214524aae12d7aa3cb2530fa2d Mon Sep 17 00:00:00 2001
From: inotia00 <108592928+inotia00@users.noreply.github.com>
Date: Tue, 28 Nov 2023 15:06:48 +0900
Subject: [PATCH] fix(YouTube/Settings): matches the initialization process
 with the official ReVanced

---
 .../utils/settings/SettingsBytecodePatch.kt   |  1 +
 .../youtube/utils/settings/SettingsPatch.kt   |  4 +--
 .../layout/revanced_settings_toolbar.xml      |  4 ---
 .../layout/revanced_settings_with_toolbar.xml | 33 +++++++++++++++++--
 .../revanced_settings_with_toolbar_layout.xml |  5 ---
 5 files changed, 33 insertions(+), 14 deletions(-)
 delete mode 100644 src/main/resources/youtube/settings/layout/revanced_settings_toolbar.xml
 delete mode 100644 src/main/resources/youtube/settings/layout/revanced_settings_with_toolbar_layout.xml

diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsBytecodePatch.kt
index 4d5d17fb5..1f6ff8f6f 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsBytecodePatch.kt
@@ -49,6 +49,7 @@ object SettingsBytecodePatch : BytecodePatch(
         context.injectInit("InitializationPatch", "initializeReVancedSettings", true)
 
     }
+
     internal lateinit var contexts: BytecodeContext
 
     private const val SET_THEME =
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt
index 4061de042..19fade301 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt
@@ -120,9 +120,7 @@ object SettingsPatch : AbstractSettingsResourcePatch(
         arrayOf(
             ResourceUtils.ResourceGroup(
                 "layout",
-                "revanced_settings_toolbar.xml",
-                "revanced_settings_with_toolbar.xml",
-                "revanced_settings_with_toolbar_layout.xml"
+                "revanced_settings_with_toolbar.xml"
             ),
             ResourceUtils.ResourceGroup(
                 "values-v21",
diff --git a/src/main/resources/youtube/settings/layout/revanced_settings_toolbar.xml b/src/main/resources/youtube/settings/layout/revanced_settings_toolbar.xml
deleted file mode 100644
index ea1df1280..000000000
--- a/src/main/resources/youtube/settings/layout/revanced_settings_toolbar.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@color/yt_white1" android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="0dp">
-    <android.support.v7.widget.Toolbar android:id="@+id/toolbar" android:background="?attr/ytBrandBackgroundSolid" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" app:navigationIcon="@drawable/yt_outline_arrow_left_white_24" app:title="@string/revanced_extended_settings_title"/>
-</FrameLayout>
\ No newline at end of file
diff --git a/src/main/resources/youtube/settings/layout/revanced_settings_with_toolbar.xml b/src/main/resources/youtube/settings/layout/revanced_settings_with_toolbar.xml
index 21ff59780..e06d99d5b 100644
--- a/src/main/resources/youtube/settings/layout/revanced_settings_with_toolbar.xml
+++ b/src/main/resources/youtube/settings/layout/revanced_settings_with_toolbar.xml
@@ -1,4 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge>
-    <include layout="@layout/revanced_settings_with_toolbar_layout"/>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
+        android:orientation="vertical"
+        android:transitionGroup="true">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/yt_white1"
+            android:elevation="0dp">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/revanced_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?attr/ytBrandBackgroundSolid"
+                app:navigationIcon="@drawable/yt_outline_arrow_left_black_24"
+                app:title="@string/revanced_extended_settings_title" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/revanced_settings_fragments"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/src/main/resources/youtube/settings/layout/revanced_settings_with_toolbar_layout.xml b/src/main/resources/youtube/settings/layout/revanced_settings_with_toolbar_layout.xml
deleted file mode 100644
index 31b20d945..000000000
--- a/src/main/resources/youtube/settings/layout/revanced_settings_with_toolbar_layout.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:fitsSystemWindows="true" android:layout_width="match_parent" android:layout_height="match_parent" android:transitionGroup="true">
-    <include layout="@layout/revanced_settings_toolbar"/>
-    <FrameLayout android:id="@+id/revanced_settings_fragments" android:layout_width="match_parent" android:layout_height="match_parent"/>
-</LinearLayout>
\ No newline at end of file