From 10b7895ca8a2c820982d7eb2a61afda14060bca4 Mon Sep 17 00:00:00 2001
From: inotia00 <108592928+inotia00@users.noreply.github.com>
Date: Thu, 25 Apr 2024 02:37:34 +0900
Subject: [PATCH] chore: lint code

---
 .../navigation/NavigationBarHookPatch.kt      |  3 --
 .../youtube/settings/host/values/strings.xml  | 28 +++++++++----------
 .../youtube/settings/xml/revanced_prefs.xml   |  8 +++---
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/navigation/NavigationBarHookPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/navigation/NavigationBarHookPatch.kt
index cf792db5b..795a0cd16 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/navigation/NavigationBarHookPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/navigation/NavigationBarHookPatch.kt
@@ -17,15 +17,12 @@ import app.revanced.patches.youtube.utils.navigation.fingerprints.PivotBarButton
 import app.revanced.patches.youtube.utils.navigation.fingerprints.PivotBarConstructorFingerprint
 import app.revanced.patches.youtube.utils.playertype.PlayerTypeHookPatch
 import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch
-import app.revanced.util.addFieldAndInstructions
 import app.revanced.util.getReference
-import app.revanced.util.getTargetIndex
 import app.revanced.util.resultOrThrow
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.Instruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 import com.android.tools.smali.dexlib2.util.MethodUtil
 
diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index 368362e91..f207c74bc 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -21,9 +21,9 @@
     <string name="revanced_hide_merchandise_shelf_title">Hide merchandise shelf</string>
     <string name="revanced_hide_merchandise_shelf_summary_on">Merchandise shelves are hidden.</string>
     <string name="revanced_hide_merchandise_shelf_summary_off">Merchandise shelves are shown.</string>
-    <string name="revanced_hide_paid_promotion_banner_title">Hide paid promotion banner</string>
-    <string name="revanced_hide_paid_promotion_banner_summary_on">Paid promotion banner is hidden.</string>
-    <string name="revanced_hide_paid_promotion_banner_summary_off">Paid promotion banner is shown.</string>
+    <string name="revanced_hide_paid_promotion_label_title">Hide paid promotion label</string>
+    <string name="revanced_hide_paid_promotion_label_summary_on">Paid promotion label is hidden.</string>
+    <string name="revanced_hide_paid_promotion_label_summary_off">Paid promotion label is shown.</string>
     <string name="revanced_hide_self_sponsor_cards_title">Hide self sponsored cards</string>
     <string name="revanced_hide_self_sponsor_cards_summary_on">Self sponsored cards are hidden.</string>
     <string name="revanced_hide_self_sponsor_cards_summary_off">Self sponsored cards are shown.</string>
@@ -503,21 +503,21 @@ Instead, use the 'Settings → Autoplay → Autoplay next video' setting."</stri
     <string name="revanced_hide_comments_section_in_home_feed_title">Hide comments section in home feed</string>
     <string name="revanced_hide_comments_section_in_home_feed_summary_on">Comments section is hidden in home feed.</string>
     <string name="revanced_hide_comments_section_in_home_feed_summary_off">Comments section is shown in home feed.</string>
-    <string name="revanced_hide_create_shorts_button_title">Hide create shorts button</string>
-    <string name="revanced_hide_create_shorts_button_summary_on">Create shorts button is hidden.</string>
-    <string name="revanced_hide_create_shorts_button_summary_off">Create shorts button is shown.</string>
-    <string name="revanced_hide_emoji_picker_title">Hide emoji picker and time stamp</string>
-    <string name="revanced_hide_emoji_picker_summary_on">Emoji picker and time stamp are hidden.</string>
-    <string name="revanced_hide_emoji_picker_summary_off">Emoji picker and time stamp are shown.</string>
     <string name="revanced_hide_preview_comment_title">Hide preview comment</string>
     <string name="revanced_hide_preview_comment_on">Preview comment is hidden.</string>
     <string name="revanced_hide_preview_comment_off">Preview comment is shown.</string>
     <string name="revanced_hide_preview_comment_type_title">Hide preview comment type</string>
     <string name="revanced_hide_preview_comment_type_on">This does not change the size of the comment section, so it is possible to open the live chat replay in the comment section.</string>
     <string name="revanced_hide_preview_comment_type_off">This changes the size of the comment section, so it is impossible to open a live chat replay in the comment section.</string>
-    <string name="revanced_hide_comments_thanks_button_title">Hide thanks button</string>
-    <string name="revanced_hide_comments_thanks_button_summary_on">Thanks button is hidden.</string>
-    <string name="revanced_hide_comments_thanks_button_summary_off">Thanks button is shown.</string>
+    <string name="revanced_hide_comment_create_shorts_button_title">Hide create shorts button</string>
+    <string name="revanced_hide_comment_create_shorts_button_summary_on">Create shorts button is hidden.</string>
+    <string name="revanced_hide_comment_create_shorts_button_summary_off">Create shorts button is shown.</string>
+    <string name="revanced_hide_comment_thanks_button_title">Hide thanks button</string>
+    <string name="revanced_hide_comment_thanks_button_summary_on">Thanks button is hidden.</string>
+    <string name="revanced_hide_comment_thanks_button_summary_off">Thanks button is shown.</string>
+    <string name="revanced_hide_comment_timestamp_and_emoji_buttons_title">Hide timestamp and emoji buttons</string>
+    <string name="revanced_hide_comment_timestamp_and_emoji_buttons_summary_on">Timestamp and emoji buttons are hidden.</string>
+    <string name="revanced_hide_comment_timestamp_and_emoji_buttons_summary_off">Timestamp and emoji buttons are shown.</string>
 
     <!-- PreferenceScreen: Player, PreferenceCategory: Player, PreferenceScreen: Flyout menu -->
     <string name="revanced_preference_screen_player_flyout_menu_title">Flyout menu</string>
@@ -968,10 +968,10 @@ Limitation: Official headers in search results will be hidden."</string>
     <string name="revanced_ryd_enable_summary_off">Dislikes are not shown.</string>
     <string name="revanced_ryd_shorts_title">Show dislikes on Shorts</string>
     <string name="revanced_ryd_shorts_summary_on">Dislikes shown on Shorts.</string>
-    <string name="revanced_ryd_shorts_summary_off">Dislikes hidden on Shorts.</string>
-    <string name="revanced_ryd_shorts_summary_disclaimer">"Dislikes shown on Shorts.
+    <string name="revanced_ryd_shorts_summary_on_disclaimer">"Dislikes shown on Shorts.
 
 Limitation: Dislikes may not appear in incognito mode."</string>
+    <string name="revanced_ryd_shorts_summary_off">Dislikes hidden on Shorts.</string>
     <string name="revanced_ryd_dislike_percentage_title">Dislikes as percentage</string>
     <string name="revanced_ryd_dislike_percentage_summary_on">Dislikes shown as percentage.</string>
     <string name="revanced_ryd_dislike_percentage_summary_off">Dislikes shown as number.</string>
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index 8edd89cd6..0f1cf6350 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -7,7 +7,7 @@
         <SwitchPreference android:title="@string/revanced_hide_fullscreen_ads_title" android:key="revanced_hide_fullscreen_ads" android:defaultValue="true" android:summaryOn="@string/revanced_hide_fullscreen_ads_summary_on" android:summaryOff="@string/revanced_hide_fullscreen_ads_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_general_ads_title" android:key="revanced_hide_general_ads" android:defaultValue="true" android:summaryOn="@string/revanced_hide_general_ads_summary_on" android:summaryOff="@string/revanced_hide_general_ads_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_merchandise_shelf_title" android:key="revanced_hide_merchandise_shelf" android:defaultValue="true" android:summaryOn="@string/revanced_hide_merchandise_shelf_summary_on" android:summaryOff="@string/revanced_hide_merchandise_shelf_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_paid_promotion_banner_title" android:key="revanced_hide_paid_promotion_banner" android:defaultValue="true" android:summaryOn="@string/revanced_hide_paid_promotion_banner_summary_on" android:summaryOff="@string/revanced_hide_paid_promotion_banner_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_paid_promotion_label_title" android:key="revanced_hide_paid_promotion_label" android:defaultValue="true" android:summaryOn="@string/revanced_hide_paid_promotion_label_summary_on" android:summaryOff="@string/revanced_hide_paid_promotion_label_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_self_sponsor_cards_title" android:key="revanced_hide_self_sponsor_cards" android:defaultValue="true" android:summaryOn="@string/revanced_hide_self_sponsor_cards_summary_on" android:summaryOff="@string/revanced_hide_self_sponsor_cards_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_video_ads_title" android:key="revanced_hide_video_ads" android:defaultValue="true" android:summaryOn="@string/revanced_hide_video_ads_summary_on" android:summaryOff="@string/revanced_hide_video_ads_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_view_products_title" android:key="revanced_hide_view_products" android:defaultValue="true" android:summaryOn="@string/revanced_hide_view_products_summary_on" android:summaryOff="@string/revanced_hide_view_products_summary_off" />
@@ -208,11 +208,11 @@
             <SwitchPreference android:title="@string/revanced_hide_comments_by_members_title" android:key="revanced_hide_comments_by_members" android:defaultValue="false" android:summaryOn="@string/revanced_hide_comments_by_members_summary_on" android:summaryOff="@string/revanced_hide_comments_by_members_summary_off" />
             <SwitchPreference android:title="@string/revanced_hide_comments_section_title" android:key="revanced_hide_comments_section" android:defaultValue="false" android:summaryOn="@string/revanced_hide_comments_section_summary_on" android:summaryOff="@string/revanced_hide_comments_section_summary_off" />
             <SwitchPreference android:title="@string/revanced_hide_comments_section_in_home_feed_title" android:key="revanced_hide_comments_section_in_home_feed" android:defaultValue="false" android:summaryOn="@string/revanced_hide_comments_section_in_home_feed_summary_on" android:summaryOff="@string/revanced_hide_comments_section_in_home_feed_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_create_shorts_button_title" android:key="revanced_hide_create_shorts_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_create_shorts_button_summary_on" android:summaryOff="@string/revanced_hide_create_shorts_button_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_emoji_picker_title" android:key="revanced_hide_emoji_picker" android:defaultValue="false" android:summaryOn="@string/revanced_hide_emoji_picker_summary_on" android:summaryOff="@string/revanced_hide_emoji_picker_summary_off" />
             <SwitchPreference android:title="@string/revanced_hide_preview_comment_title" android:key="revanced_hide_preview_comment" android:defaultValue="false" android:summaryOn="@string/revanced_hide_preview_comment_on" android:summaryOff="@string/revanced_hide_preview_comment_off" />
             <SwitchPreference android:title="@string/revanced_hide_preview_comment_type_title" android:key="revanced_hide_preview_comment_type" android:defaultValue="false" android:summaryOn="@string/revanced_hide_preview_comment_type_on" android:summaryOff="@string/revanced_hide_preview_comment_type_off" android:dependency="revanced_hide_preview_comment" />
-            <SwitchPreference android:title="@string/revanced_hide_comments_thanks_button_title" android:key="revanced_hide_comments_thanks_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_comments_thanks_button_summary_on" android:summaryOff="@string/revanced_hide_comments_thanks_button_summary_off" />
+            <SwitchPreference android:title="@string/revanced_hide_comment_create_shorts_button_title" android:key="revanced_hide_comment_create_shorts_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_comment_create_shorts_button_summary_on" android:summaryOff="@string/revanced_hide_comment_create_shorts_button_summary_off" />
+            <SwitchPreference android:title="@string/revanced_hide_comment_thanks_button_title" android:key="revanced_hide_comment_thanks_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_comment_thanks_button_summary_on" android:summaryOff="@string/revanced_hide_comment_thanks_button_summary_off" />
+            <SwitchPreference android:title="@string/revanced_hide_comment_timestamp_and_emoji_buttons_title" android:key="revanced_hide_comment_timestamp_and_emoji_buttons" android:defaultValue="false" android:summaryOn="@string/revanced_hide_comment_timestamp_and_emoji_buttons_summary_on" android:summaryOff="@string/revanced_hide_comment_timestamp_and_emoji_buttons_summary_off" />
         </PreferenceScreen>SETTINGS: HIDE_COMMENTS_COMPONENTS -->
 
         <!-- PREFERENCE_SCREENS: FLYOUT_MENU