YouTube - Settings: Add icon and move to the top

Author: chsbuffer

app/src/main/java/io/github/chsbuffer/revancedxposed/youtube/misc/Settings.kt

@@ -2,6 +2,7 @@ package io.github.chsbuffer.revancedxposed.youtube.misc
 
 import android.app.Activity
 import android.app.AlertDialog
+import android.content.Context
 import android.content.res.Resources
 import android.webkit.WebView
 import app.revanced.extension.shared.Logger
@@ -80,10 +81,10 @@ fun YoutubeHook.SettingsHook() {
     }.hookMethod(
         ScopedHook(inflate.toMethod()) {
             var handleWebView = false
-            after {
+            before {
                 val preferencesName = app.resources.getResourceName(outerParam.args[0] as Int)
                 Logger.printDebug { "addPreferencesFromResource $preferencesName" }
-                if (!preferencesName.contains("settings_fragment")) return@after
+                if (!preferencesName.contains("settings_fragment")) return@before
                 if (!handleWebView) {
                     // workaround "AssetManager.addAssetPath gets Invalid When WebView is created":
                     // let WebView replace the AssetManager first then addModuleAssets
@@ -92,9 +93,12 @@ fun YoutubeHook.SettingsHook() {
                     handleWebView = true
                 }
                 app.addModuleAssets()
+                (param.args[2] as Context).addModuleAssets()
+                val xml =
+                    if (preferencesName.contains("settings_fragment_cairo")) R.xml.yt_revanced_settings_cairo else R.xml.yt_revanced_settings
                 XposedBridge.invokeOriginalMethod(
                     param.method, param.thisObject, param.args.clone().apply {
-                        this[0] = app.resources.getXml(R.xml.yt_revanced_settings)
+                        this[0] = app.resources.getXml(xml)
                     })
             }
         })

app/src/main/res/xml/yt_revanced_settings.xml

@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--suppress ALL -->
+<?xml version="1.0" encoding="utf-8"?><!--suppress ALL -->
 <PreferenceCategory xmlns:android="http://schemas.android.com/apk/res/android">
     <Preference
-        android:title="ReVanced"
-        android:key="revanced_settings">
+        android:key="revanced_settings"
+        android:title="ReVanced">
         <intent
+            android:data="revanced_settings_intent"
             android:targetClass="com.google.android.libraries.social.licenses.LicenseActivity"
-            android:targetPackage="com.google.android.youtube"
-            android:data="revanced_settings_intent" />
+            android:targetPackage="com.google.android.youtube" />
     </Preference>
 </PreferenceCategory>

app/src/main/res/xml/yt_revanced_settings_cairo.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?><!--suppress ALL -->
+<PreferenceCategory xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
+        android:icon="@drawable/revanced_settings_icon"
+        android:title="@string/revanced_settings">
+        <intent
+            android:data="revanced_settings_intent"
+            android:targetClass="com.google.android.libraries.social.licenses.LicenseActivity"
+            android:targetPackage="com.google.android.youtube" />
+    </Preference>
+</PreferenceCategory>