change the default value of some uYou's options

Update Arabic Localization

.github/ISSUE_TEMPLATE/bug.md

@@ -1,6 +1,6 @@
 ---
 name: Bug
-about: Create a report to help us improve
+about: Make sure you complete the template. Otherwise, it will be closed without further explanation!
 title: "[Bug]"
 labels: bug
 assignees: ''
@@ -14,8 +14,8 @@ _Make sure you complete the template. Otherwise, it will be closed without furth
 ### Device info
 - iOS/iPadOS version: 
 - Device model:
-- Sideload tool (Ex: AltStore, Sideloadly...)
+- Sideload tool (Ex: AltStore, Sideloadly, TrollStore,...)
-- Version of uYouPlus: _**latest** or **newest** is NOT a version number!!_
+- The specific version of uYouPlus: _**latest** or **newest** is NOT a version number!!_
 
 ### Describe the bug
 
@@ -23,9 +23,11 @@ _Make sure you complete the template. Otherwise, it will be closed without furth
 ### How to reproduce the bug
 _(Please attach videos or screenshots if possible)_
 
-
 ### Crash log (if possible)
-_(The crash log can be found in the  Settings app - Privacy - Analytics & Improvements - Analytics Data - Youtube...)_
+_(The crash log can be found in the Settings app > Privacy > Analytics & Improvements > Analytics Data > Youtube...)_
+
+### Are you using the newest version of uYouPlus? If not, why?
+_(Developers spend time and effort to fix bugs & add improvements with every release. Why don't you update to the latest version before reporting about an issue???)_
 
 ### Does the issue happen with the official YouTube from AppStore?
 _(Well, YouTube itself is buggy sometimes...)_

.github/workflows/buildapp.yml

@@ -9,7 +9,7 @@ on:
       uyou_version:
         description: "The version of uYou"
         default: "2.1"
-        required: false
+        required: true
         type: string
       decrypted_youtube_url:
         description: "The direct URL to the decrypted YouTube ipa"
@@ -66,7 +66,7 @@ jobs:
       - name: Setup Theos Jailed
         uses: actions/checkout@v3
         with:
-          repository: kabiroberai/theos-jailed
+          repository: qnblackcat/theos-jailed
           ref: master
           path: theos-jailed
           submodules: recursive

Header.h

@@ -3,6 +3,8 @@
 #define LOC(x) [tweakBundle localizedStringForKey:x value:nil table:nil]
 #define YT_BUNDLE_ID @"com.google.ios.youtube"
 #define YT_NAME @"YouTube"
+#define UNSUPPORTED_DEVICES @[@"iPhone14,3", @"iPhone14,6", @"iPhone14,8"] // DontEatMycontent
+#define THRESHOLD 1.99 // DontEatMycontent
 
 // IAmYouTube
 @interface SSOConfiguration : NSObject
@@ -37,6 +39,28 @@
 - (float)progress;
 @end
 
+// DontEatMyContent
+NSString* deviceName();
+BOOL isDeviceSupported();
+void activate(); 
+void deactivate();
+void center();
+
+@interface YTPlayerView : UIView
+- (BOOL)zoomToFill;
+- (id)renderingView;
+- (id)playerView;
+@end
+
+@interface MLHAMSBDLSampleBufferRenderingView : UIView
+@end
+
+@interface YTMainAppVideoPlayerOverlayViewController : UIViewController
+- (BOOL)isFullscreen;
+- (id)videoPlayerOverlayView;
+- (id)activeVideoPlayerOverlay;
+@end
+
 // iOS16 fix
 @interface OBPrivacyLinkButton : UIButton
 - (instancetype)initWithCaption:(NSString *)caption
@@ -63,6 +87,8 @@
 // YTAutoFullScreen
 @interface YTPlayerViewController (YTAFS)
 - (void)autoFullscreen;
+- (id)activeVideoPlayerOverlay; // DontEatMycontent
+- (id)playerView; // DontEatMycontent
 @end
 
 // OLED Darkmode
@@ -94,4 +120,4 @@
 @end
 
 @interface UIPredictionViewController : UIViewController
-@end
+@end

Makefile

@@ -25,6 +25,8 @@ before-package::
 	@echo -e "==> \033[1mMoving tweak's bundle to Resources/...\033[0m"
 	@mkdir -p Resources/Frameworks/Alderis.framework && find .theos/obj/install/Library/Frameworks/Alderis.framework -maxdepth 1 -type f -exec cp {} Resources/Frameworks/Alderis.framework/ \;
 	@cp -R Tweaks/YouPiP/layout/Library/Application\ Support/YouPiP.bundle Resources/
+	@cp -R Tweaks/YTUHD/layout/Library/Application\ Support/YTUHD.bundle Resources/
+	@cp -R Tweaks/Return-YouTube-Dislikes/layout/Library/Application\ Support/RYD.bundle Resources/
 	@cp -R Tweaks/iSponsorBlock/layout/Library/Application\ Support/iSponsorBlock.bundle Resources/
 	@cp -R Tweaks/uYou/Library/Application\ Support/uYouBundle.bundle Resources/
 	@cp -R lang/uYouPlus.bundle Resources/

README.md

@@ -1,4 +1,4 @@
-![cydia-1900000830-iphone-0-1628105716 3](https://user-images.githubusercontent.com/52943116/135612614-3d3138cb-2a3d-4ed1-9244-905bab8f5c9f.PNG)
+![IMG_2196](https://user-images.githubusercontent.com/52943116/189822859-8a0952db-9264-4b5b-9cbe-d0a87b2db5a0.PNG)
 
 # Table of Contents
 
@@ -74,22 +74,22 @@
 
 # Download
 
-- **uYouPlus** (or you can call it uYou+) requires iOS or iPadOS 13.0 or later. The latest version of **uYouPlus** can be found in the [Release tab](https://github.com/qnblackcat/uYouPlus/releases).
+- **uYouPlus** (or you can call it uYou+) requires iOS or iPadOS 13.0 or later. The latest version of **uYouPlus** can be found in the [Release tab](https://github.com/qnblackcat/uYouPlus/releases). 
 
 - For AltStore user: 
 
   - My official AltStore repo: https://qnblackcat.github.io/AltStore/
 
-  - [Open in AltStore (v17.33.2-2.1)](https://tinyurl.com/33mv77u6) - It will take a while to install because AltStore needs to download the IPA.
+  - [Open in AltStore (v17.37.3-2.1)](https://tinyurl.com/2p8pd9n7) - It will take a while to install because AltStore needs to download the IPA.
 
-- Version info: _(last update: Aug 26)_
+- Version info: _(last update: Sep 24)_
 
 <details>
   <summary>Expand</summary>
 
 | **Tweaks/App** | **Developer** | **Version** | **Open source** |
 | - | - | :-: | :-:  |
-| **YouTube** | Google Inc | 17.33.2 | ✖︎ |
+| **YouTube** | Google Inc | 17.37.3 | ✖︎ |
 | [uYou](https://github.com/MiRO92/uYou-for-YouTube) | [MiRO92](https://twitter.com/miro92) | 2.1 | ✖︎ |
 | [Open in YouTube](https://github.com/CokePokes/YoutubeExtensions) | [CokePokes](https://github.com/CokePokes) | 1.2 | ✖︎ |
 | **iSponsorBlock** | [Galactic-Dev](https://github.com/Galactic-Dev) | 1.0-15 | [✔︎](https://github.com/Galactic-Dev/iSponsorBlock) |
@@ -99,8 +99,8 @@
 | **YTSpeed** | [Lyvendia](https://github.com/Lyvendia) | 1.0.1 | [✔︎](https://github.com/Lyvendia/YTSpeed) |
 | **YTCastConfirm** | [JamieBerghmans](https://github.com/JamieBerghmans) | 1.0.0 | [✔︎](https://github.com/JamieBerghmans/YTCastConfirm) |
 | **Alderis Color Picker** | [HASHBANG Productions](https://github.com/hbang) | 1.2| [✔︎](https://github.com/hbang/Alderis) |
-| **YTUHD** | [PoomSmart](https://twitter.com/poomsmart) | 1.2.9 | [✔︎](https://github.com/PoomSmart/YTUHD) |
+| **YTUHD** | [PoomSmart](https://twitter.com/poomsmart) | 1.2.10 | [✔︎](https://github.com/PoomSmart/YTUHD) |
-| **YouPiP** | [PoomSmart](https://twitter.com/poomsmart) | 1.7.7 | [✔︎](https://github.com/PoomSmart/YouPiP) |
+| **YouPiP** | [PoomSmart](https://twitter.com/poomsmart) | 1.7.9 | [✔︎](https://github.com/PoomSmart/YouPiP) |
 | **IAmYouTube** | [PoomSmart](https://twitter.com/poomsmart) | 1.2.0 | [✔︎](https://github.com/PoomSmart/IAmYouTube) |
 | **YTReExplore** | [PoomSmart](https://twitter.com/poomsmart) | 1.0.2 | [✔︎](https://github.com/PoomSmart/YTReExplore) |
 | **NoYTPremium** | [PoomSmart](https://twitter.com/poomsmart) | 1.0.4 | [✔︎](https://github.com/PoomSmart/NoYTPremium) |
@@ -108,7 +108,7 @@
 | **YTAutoFullScreen** | [PoomSmart](https://twitter.com/poomsmart) | 1.0.3 | [✔︎](https://github.com/PoomSmart/YTAutoFullScreen) |
 | **YouRememberCaption** | [PoomSmart](https://twitter.com/poomsmart) | 1.0.0 | [✔︎](https://poomsmart.github.io/repo/depictions/youremembercaption.html) |
 | **YTClassicVideoQuality** | [PoomSmart](https://twitter.com/poomsmart) | 1.0.1 | [✔︎](https://github.com/PoomSmart/YTClassicVideoQuality) |
-| **Return YouTube Dislike** | [PoomSmart](https://twitter.com/poomsmart) | 1.6.6 | [✔︎](https://github.com/PoomSmart/Return-YouTube-Dislikes) |
+| **Return YouTube Dislike** | [PoomSmart](https://twitter.com/poomsmart) | 1.6.8 | [✔︎](https://github.com/PoomSmart/Return-YouTube-Dislikes) |
 | **YTNoCheckLocalNetwork** | [PoomSmart](https://twitter.com/poomsmart) | 1.0.2 | [✔︎](https://poomsmart.github.io/repo/depictions/ytnochecklocalnetwork.html) |
 
 </details>
@@ -117,34 +117,14 @@
 See [Installation - Wiki](https://github.com/qnblackcat/uYouPlus/wiki/Installation)
 
 # Support the developers
-
+- [**MiRO92**](https://twitter.com/miro92): https://github.com/MiRO92/uYou-for-YouTube#support
-<details>
+- [**Poomsmart**](https://twitter.com/poomsmart): https://poomsmart.github.io
-  <summary>MiRO92</summary>
+- [**level3tjg**](https://twitter.com/level3tjg): https://ko-fi.com/level3tjg
-  
+- [**BandarHL**](https://twitter.com/bandarhl): https://www.paypal.com/paypalme/BandarHL
-- https://github.com/MiRO92/uYou-for-YouTube#support
+- [**julioverne**](https://twitter.com/ijulioverne): https://www.patreon.com/julioverne
-</details>
+- [**Galactic-dev**](https://twitter.com/dev_galactic):   
-
+  - Paypal: https://www.paypal.com/paypalme/DBrett684 
-<details>
+  - Venmo: https://venmo.com/u/DavidBrett
-  <summary>PoomSmart</summary>
-
-- Paypal: https://poomsmart.github.io/
-
-</details>
-
-<details>
-  <summary>Bandar Alruwaili (BandarHL)</summary>
-
-- Paypal: https://www.paypal.com/paypalme/BandarHL
-</details>
-
-<details>
-  <summary>Galactic-dev</summary>
-  
-- Paypal: https://www.paypal.com/paypalme/DBrett684 
-
-- Venmo: https://venmo.com/u/DavidBrett
-</details>
-
 
 # FAQ
 

Settings.xm

@@ -23,6 +23,9 @@ extern BOOL castConfirm();
 extern BOOL ytMiniPlayer();
 extern BOOL hidePreviousAndNextButton();
 extern BOOL hidePaidPromotionCard();
+extern BOOL fixGoogleSignIn();
+extern BOOL replacePreviousAndNextButton();
+extern BOOL dontEatMyContent();
 
 // Settings
 %hook YTAppSettingsPresentationData
@@ -51,6 +54,33 @@ extern BOOL hidePaidPromotionCard();
         exit(0);
     }];
 
+    YTSettingsSectionItem *dontEatMyContent = [[%c(YTSettingsSectionItem) alloc] initWithTitle:LOC(@"DONT_EAT_MY_CONTENT") titleDescription:LOC(@"DONT_EAT_MY_CONTENT_DESC")];
+    dontEatMyContent.hasSwitch = YES;
+    dontEatMyContent.switchVisible = YES;
+    dontEatMyContent.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"dontEatMyContent_enabled"];
+    dontEatMyContent.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"dontEatMyContent_enabled"];
+        return YES;
+    };
+
+    YTSettingsSectionItem *replacePreviousAndNextButton = [[%c(YTSettingsSectionItem) alloc] initWithTitle:LOC(@"REPLACE_PREVIOUS_NEXT_BUTTON") titleDescription:LOC(@"REPLACE_PREVIOUS_NEXT_BUTTON_DESC")];
+    replacePreviousAndNextButton.hasSwitch = YES;
+    replacePreviousAndNextButton.switchVisible = YES;
+    replacePreviousAndNextButton.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"replacePreviousAndNextButton_enabled"];
+    replacePreviousAndNextButton.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"replacePreviousAndNextButton_enabled"];
+        return YES;
+    };
+
+    YTSettingsSectionItem *fixGoogleSignIn = [[%c(YTSettingsSectionItem) alloc] initWithTitle:LOC(@"FIX_GOOGLE_SIGNIN") titleDescription:LOC(@"FIX_GOOGLE_SIGNIN_DESC")];
+    fixGoogleSignIn.hasSwitch = YES;
+    fixGoogleSignIn.switchVisible = YES;
+    fixGoogleSignIn.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"fixGoogleSignIn_enabled"];
+    fixGoogleSignIn.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"fixGoogleSignIn_enabled"];
+        return YES;
+    };
+
     YTSettingsSectionItem *hidePaidPromotionCard = [[%c(YTSettingsSectionItem) alloc] initWithTitle:LOC(@"HIDE_PAID_PROMOTION_CARDS") titleDescription:LOC(@"HIDE_PAID_PROMOTION_CARDS_DESC")];
     hidePaidPromotionCard.hasSwitch = YES;
     hidePaidPromotionCard.switchVisible = YES;
@@ -168,7 +198,7 @@ extern BOOL hidePaidPromotionCard();
         return YES;
     };
 
-    NSMutableArray <YTSettingsSectionItem *> *sectionItems = [NSMutableArray arrayWithArray:@[killApp, autoFull, castConfirm, ytMiniPlayer, hideAutoplaySwitch, hideCC, hideHUD, hidePaidPromotionCard, hidePreviousAndNextButton, hideHoverCard, bigYTMiniPlayer, oledDarkMode, oledKeyBoard, reExplore]];
+    NSMutableArray <YTSettingsSectionItem *> *sectionItems = [NSMutableArray arrayWithArray:@[killApp, autoFull, castConfirm, ytMiniPlayer, fixGoogleSignIn, hideAutoplaySwitch, hideCC, hideHUD, hidePaidPromotionCard, hidePreviousAndNextButton, hideHoverCard, bigYTMiniPlayer, oledDarkMode, oledKeyBoard, dontEatMyContent, replacePreviousAndNextButton, reExplore]];
     [delegate setSectionItems:sectionItems forCategory:uYouPlusSection title:@"uYouPlus" titleDescription:nil headerHidden:NO];
 }
 
@@ -179,4 +209,4 @@ extern BOOL hidePaidPromotionCard();
     }
     %orig;
 }
-%end
+%end

lang/uYouPlus.bundle/ar.lproj/Localizable.strings

@@ -1,10 +1,19 @@
 // Settings
 
+"DONT_EAT_MY_CONTENT" = "منع النوتش/الجزيرة التفاعلية على مقاطع 2:1 (أداة DontEatMyContent)";
+"DONT_EAT_MY_CONTENT_DESC" = "منع النوتش/الجزيرة التفاعلية من قص المقاطع التي تكون نسبة العرض إلى الارتفاع فيها تساوي 2:1. يتطلب إعادة تشغيل التطبيق.";
+
+"REPLACE_PREVIOUS_NEXT_BUTTON" = "تقدم وتراجع بدلاً من السابق والتالي";
+"REPLACE_PREVIOUS_NEXT_BUTTON_DESC" = "استبدال زرّي المقطع السابق والمقطع التالي بزرّي تقدم وتراجع. يتطلب إعادة تشغيل التطبيق.";
+
+"FIX_GOOGLE_SIGNIN" = "إصلاح تسجيل الدخول بحساب جوجل (لمستخدمي TrollStore فقط)";
+"FIX_GOOGLE_SIGNIN_DESC" = "هذا الخيار لا يعمل إلا إذا كان التطبيق مثبت بواسطة TrollStore: فعل هذا الخيار لتتمكن من تسجيل الدخول بحساب جوجل. يتطلب إعادة تشغيل التطبيق.";
+
 "KILL_APP" = "إغلاق تطبيق يوتيوب";
 "KILL_APP_DESC" = "المس هنا لإغلاق تطبيق يوتيوب!";
 
-"HIDE_PREVIOUS_AND_NEXT_BUTTON" = "إخفاء زر السابق والتالي";
+"HIDE_PREVIOUS_AND_NEXT_BUTTON" = "إخفاء زرّي السابق والتالي";
-"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "إخفاء زرّي السابق والتالي من أزرار التحكم على الفيديو.";
+"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "إخفاء زرّي المقطع السابق والمقطع التالي من أزرار التحكم على الفيديو.";
 
 "YT_MINIPLAYER" = "السماح بالمشغل المصغّر لكل فيديوهات يوتيوب";
 "YT_MINIPLAYER_DESC" = "عند تصغير فيديوهات الأطفال مثلاً (قبل إغلاق المقطع).";
@@ -46,4 +55,4 @@
 "CASTING" = "البث";
 "MSG_ARE_YOU_SURE" = "هل أنت متأكد أنك تريد بدء البث؟";
 "MSG_YES" = "نعم";
-"MSG_CANCEL" = "إلغاء";
+"MSG_CANCEL" = "إلغاء";

lang/uYouPlus.bundle/cz.lproj/Localizable.strings

@@ -1,16 +1,15 @@
-// How to translate uYouPlus to your languate:
-//
-// 1. Fork uYouPlus repo
-// 2. Duplicate the template.lproj folder, and edit the duplicated folder's name to your <lang_code>.lproj id.  
-// For example: <ru.lproj> for Russia. For more details, visit: https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes
-// 3. Translate each line below after each =
-// 4. Open a Pull Request
-//
-// If your language already exists then feel free to check it and/or improve it!
-// You can also add your localiztion to YouPiP here, the process is the same
-// https://github.com/PoomSmart/YouPiP/tree/main/layout/Library/Application%20Support/YouPiP.bundle
-//
 // Settings
+"DONT_EAT_MY_CONTENT" = "Zabránit zářezu/ostrovu na videoobsahu 2:1 (DontEatMyContent)";
+"DONT_EAT_MY_CONTENT_DESC" = "Zabraňte tomu, aby zářez/Dynamic Island žvýkal video obsah 2:1 na YouTube. Je vyžadován restart aplikace.";
+
+"REPLACE_PREVIOUS_NEXT_BUTTON" = "Nahradit předchozí a další tlačítko";
+"REPLACE_PREVIOUS_NEXT_BUTTON_DESC" = "Nahradit předchozí a následující tlačítko tlačítkem Přetočit vpřed a vzad. Je vyžadován restart aplikace.";
+
+"FIX_GOOGLE_SIGNIN" = "Opravit přihlášení přes Google (pouze pro uživatele TrollStore)";
+"FIX_GOOGLE_SIGNIN_DESC" = "Tuto možnost zapněte pouze v případě, že se nemůžete přihlásit pomocí svého účtu Google a aplikace byla nainstalována prostřednictvím TrollStore. Pokud se můžete normálně přihlásit, ponechte ji deaktivovanou. Je vyžadován restart aplikace.";
+
+"KILL_APP" = "Zavřít YouTube";
+"KILL_APP_DESC" = "Klepnutím sem zavřete YouTube!";
 
 "HIDE_PREVIOUS_AND_NEXT_BUTTON" = "Skrýt tlačítka předchozí a následující";
 "HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "Skryje tlačítka předchozí a následující v překrytí ovládání videa.";

lang/uYouPlus.bundle/de.lproj/Localizable.strings

@@ -1,16 +1,36 @@
 // Settings
+"DONT_EAT_MY_CONTENT" = "Kerbe/Insel bei 2:1-Videoinhalten verhindern (DontEatMyContent)";
+"DONT_EAT_MY_CONTENT_DESC" = "Verhindert, dass die Notch/Dynamic Island 2:1-Videoinhalte auf YouTube kaut. Neustart der App erforderlich.";
+
+"REPLACE_PREVIOUS_NEXT_BUTTON" = "Zurück- und Weiter-Schaltfläche ersetzen";
+"REPLACE_PREVIOUS_NEXT_BUTTON_DESC" = "Ersetzen Sie die Schaltflächen „Zurück“ und „Weiter“ durch die Schaltflächen „Schnellvorlauf“ und „Rücklauf“. App-Neustart ist erforderlich.“;
+
+"FIX_GOOGLE_SIGNIN" = "Google-Anmeldung reparieren (nur für TrollStore-Benutzer)";
+"FIX_GOOGLE_SIGNIN_DESC" = "Aktivieren Sie diese Option nur, wenn Sie sich nicht mit Ihrem Google-Konto anmelden können und die App über den TrollStore installiert wurde. Wenn Sie sich normal anmelden können, lassen Sie sie deaktiviert. Ein Neustart der App ist erforderlich.";
+
+"KILL_APP" = "YouTube schließen";
+"KILL_APP_DESC" = "Hier tippen, um YouTube zu schließen!";
+
+"REPLACE_PREVIOUS_NEXT_BUTTON" = "Vor- und Zurücktasten ersetzen";
+"REPLACE_PREVIOUS_NEXT_BUTTON_DESC" = "Vor- und Zurücktasten mit  Vor- und Zurückspultasten ersetzen. App restart is required.";
+
+"FIX_GOOGLE_SIGNIN" = "Google-Anmeldung beheben (nur für TrollStore Benutzer!)";
+"FIX_GOOGLE_SIGNIN_DESC" = "Aktiviere diese Option nur, wenn Sie sich nicht mit Ihrem Google-Account anmelden können und die App über TrollStore installiert wurde. Wenn Sie sich normal anmelden können, halte diese Option deaktiviert! App-Neustart erforderlich!";
+
+"KILL_APP" = "YouTube crashen";
+"KILL_APP_DESC" = "Tippe hier, um YouTube zum Abstürzen zu bringen!";
 
 "HIDE_PREVIOUS_AND_NEXT_BUTTON" = "Vor- und Zurücktasten ausblenden";
-"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "Vor- und Zurückspultasten vom Videoplayer ausblenden.";
+"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "Vor- und Zurücktasten vom Videoplayer ausblenden.";
 
-"YT_MINIPLAYER" = "Miniplayer für alle YT Videos aktivieren";
+"YT_MINIPLAYER" = "Miniplayer für alle YouTube-Videos aktivieren";
-"YT_MINIPLAYER_DESC" = "z.B. bei Videos für Kinder";
+"YT_MINIPLAYER_DESC" = "z.B. bei Videos für Kinder.";
 
 "CAST_CONFIRM" = "Warnung vor TV-Übertragungen (YTCastConfirm)";
 "CAST_CONFIRM_DESC" = "Zeigt eine Warnung an, um eine ausversehene TV-Übertragung zu verhindern.";
 
 "HIDE_HOVER_CARD" = "Endkarten ausblenden (YTNoHoverCards)";
-"HIDE_HOVER_CARD_DESC" = "Endkarten (Thumbnails) am Ende des Videos ausblenden.";
+"HIDE_HOVER_CARD_DESC" = "Creator-Endkarten (Thumbnails) am Ende des Videos ausblenden.";
 
 "NEW_MINIPLAYER_STYLE" = "Neuer Miniplayer Style (BigYTMiniPlayer)";
 "NEW_MINIPLAYER_STYLE_DESC" = "App-Neustart erforderlich!";
@@ -34,7 +54,7 @@
 "OLED_DARKMODE_DESC" = "Könnte in manchen Fällen nicht richtig funktionieren. App-Neustart ist erforderlich, wenn diese Option akti-/deaktiviert wird!";
 
 "OLED_KEYBOARD" = "OLED-Tastatur (Experimental)";
-"OLED_KEYBOARD_DESC" = "Könnte in manchen Fällen nicht richtig funktionieren. App-Neustart erforderlich1";
+"OLED_KEYBOARD_DESC" = "Könnte in manchen Fällen nicht richtig funktionieren. App-Neustart erforderlich!";
 
 "HIDE_PAID_PROMOTION_CARDS" = "Enthält bezahlte Werbung Info ausblenden";
 "HIDE_PAID_PROMOTION_CARDS_DESC" = "Enthält bezahlte Werbung Infobanner bei manchen Videos ausblenden.";

lang/uYouPlus.bundle/el.lproj/Localizable.strings

@@ -1,4 +1,15 @@
 // Settings
+"DONT_EAT_MY_CONTENT" = "Αποτροπή Notch/Island σε περιεχόμενο βίντεο 2:1 (DontEatMyContent)";
+"DONT_EAT_MY_CONTENT_DESC" = "Αποτρέψτε το notch/Dynamic Island από το να μασουλάει περιεχόμενο βίντεο 2:1 στο YouTube. Απαιτείται επανεκκίνηση της εφαρμογής.";
+
+"REPLACE_PREVIOUS_NEXT_BUTTON" = "Αντικατάσταση του Προηγούμενου και του Επόμενου Κουμπιού";
+"REPLACE_PREVIOUS_NEXT_BUTTON_DESC" = "Αντικατάσταση του Προηγούμενου και του Επόμενου κουμπιού με το κουμπί Γρήγορη κίνηση προς τα εμπρός και προς τα πίσω. Απαιτείται επανεκκίνηση της εφαρμογής.";
+
+"FIX_GOOGLE_SIGNIN" = "Διόρθωση σύνδεσης Google (μόνο για χρήστες του TrollStore)";
+"FIX_GOOGLE_SIGNIN_DESC" = "Ενεργοποιήστε αυτήν την επιλογή μόνο όταν δεν μπορείτε να συνδεθείτε με τον λογαριασμό σας Google και η εφαρμογή έχει εγκατασταθεί μέσω του TrollStore. Εάν μπορείτε να συνδεθείτε κανονικά, διατηρήστε την απενεργοποιημένη. Απαιτείται επανεκκίνηση της εφαρμογής.";
+
+"KILL_APP" = "Κλείσιμο YouTube";
+"KILL_APP_DESC" = "Πατήστε εδώ για να κλείσετε το YouTube!";
 
 "HIDE_PREVIOUS_AND_NEXT_BUTTON" = "Κρύψτε το προηγούμενο και το επόμενο κουμπί";
 "HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "Κρύψτε το προηγούμενο και το επόμενο κουμπί κατά την αναπαραγωγή βίντεο.";

lang/uYouPlus.bundle/en.lproj/Localizable.strings

@@ -1,5 +1,14 @@
 // Settings
 
+"DONT_EAT_MY_CONTENT" = "Prevent Notch/Island on 2:1 Video Content (DontEatMyContent)";
+"DONT_EAT_MY_CONTENT_DESC" = "Prevent the notch/Dynamic Island from munching on 2:1 video content in YouTube. App restart is required.";
+
+"REPLACE_PREVIOUS_NEXT_BUTTON" = "Replace Previous and Next Button";
+"REPLACE_PREVIOUS_NEXT_BUTTON_DESC" = "Replace Previous and Next Button with Fast forward and Rewind button. App restart is required.";
+
+"FIX_GOOGLE_SIGNIN" = "Fix Google Sign in (for TrollStore user only)";
+"FIX_GOOGLE_SIGNIN_DESC" = "Turn on this option only when you can't sign in with your Google account and the app was installed via TrollStore. If you can log in normally, keep it disabled. App restart is required.";
+
 "KILL_APP" = "Close YouTube";
 "KILL_APP_DESC" = "Tap here to close YouTube!";
 

lang/uYouPlus.bundle/es.lproj/Localizable.strings

@@ -1,4 +1,12 @@
 // Settings
+"DONT_EAT_MY_CONTENT" = "Evitar Notch/Island en contenido de video 2:1 (DontEatMyContent)";
+"DONT_EAT_MY_CONTENT_DESC" = "Evite que la muesca/Dynamic Island se trague contenido de video 2:1 en YouTube. Es necesario reiniciar la aplicación.";
+
+"REPLACE_PREVIOUS_NEXT_BUTTON" = "Reemplazar botón anterior y siguiente";
+"REPLACE_PREVIOUS_NEXT_BUTTON_DESC" = "Reemplace el botón Anterior y Siguiente con el botón Avance rápido y Rebobinado. Es necesario reiniciar la aplicación.";
+
+"FIX_GOOGLE_SIGNIN" = "Reparar el inicio de sesión de Google (solo para usuarios de TrollStore)";
+"FIX_GOOGLE_SIGNIN_DESC" = "Active esta opción solo cuando no pueda iniciar sesión con su cuenta de Google y la aplicación se instaló a través de TrollStore. Si puede iniciar sesión normalmente, manténgala desactivada. Es necesario reiniciar la aplicación.";
 
 "KILL_APP" = "Cerrar YouTube";
 "KILL_APP_DESC" = "Toca aquí para cerrar YouTube!";

lang/uYouPlus.bundle/fr.lproj/Localizable.strings

@@ -1,4 +1,12 @@
 // Settings
+"DONT_EAT_MY_CONTENT" = "Evitar Notch/Island en contenido de video 2:1 (DontEatMyContent)";
+"DONT_EAT_MY_CONTENT_DESC" = "Evite que la muesca/Dynamic Island se trague contenido de video 2:1 en YouTube. Es necesario reiniciar la aplicación.";
+
+"REPLACE_PREVIOUS_NEXT_BUTTON" = "Reemplazar botón anterior y siguiente";
+"REPLACE_PREVIOUS_NEXT_BUTTON_DESC" = "Reemplace el botón Anterior y Siguiente con el botón Avance rápido y Rebobinado. Es necesario reiniciar la aplicación.";
+
+"FIX_GOOGLE_SIGNIN" = "Reparar el inicio de sesión de Google (solo para usuarios de TrollStore)";
+"FIX_GOOGLE_SIGNIN_DESC" = "Active esta opción solo cuando no pueda iniciar sesión con su cuenta de Google y la aplicación se instaló a través de TrollStore. Si puede iniciar sesión normalmente, manténgala desactivada. Es necesario reiniciar la aplicación.";
 
 "KILL_APP" = "Fermer YouTube";
 "KILL_APP_DESC" = "Appuyez ici pour fermer YouTube !";

lang/uYouPlus.bundle/he.lproj/Localizable.strings

@@ -1,4 +1,15 @@
 // Settings
+"DONT_EAT_MY_CONTENT" = "מנע חריץ/אי בתוכן וידאו 2:1 (DontEatMyContent)";
+"DONT_EAT_MY_CONTENT_DESC" = "מנע מהחריץ/האי הדינמי ללעוס תוכן וידאו 2:1 ב-YouTube. נדרשת הפעלה מחדש של האפליקציה.";
+
+"REPLACE_PREVIOUS_NEXT_BUTTON" = "החלף את הלחצן הקודם והבא";
+"REPLACE_PREVIOUS_NEXT_BUTTON_DESC" = "החלף את הלחצן הקודם והבא בלחצן הרצה קדימה והאחורה. נדרשת הפעלה מחדש של האפליקציה.";
+
+"FIX_GOOGLE_SIGNIN" = "תקן כניסה של Google (עבור משתמש TrollStore בלבד)";
+"FIX_GOOGLE_SIGNIN_DESC" = "הפעל אפשרות זו רק כאשר אינך יכול להיכנס עם חשבון Google שלך והאפליקציה הותקנה דרך TrollStore. אם אתה יכול להתחבר כרגיל, השאר אותה מושבתת. נדרשת הפעלה מחדש של האפליקציה.";
+
+"KILL_APP" = "סגור את YouTube";
+"KILL_APP_DESC" = "הקש כאן כדי לסגור את YouTube!";
 
 "HIDE_PREVIOUS_AND_NEXT_BUTTON" = "הסתר את הקודם והבא";
 "HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "הסתר את כפתורי הקודם והבא בתצוגת השליטה בסרטון.";

lang/uYouPlus.bundle/ja.lproj/Localizable.strings

@@ -1,16 +1,22 @@
 // Settings
 
+"REPLACE_PREVIOUS_NEXT_BUTTON" = "前後の動画のボタンを置き換える";
+"REPLACE_PREVIOUS_NEXT_BUTTON_DESC" = "前後の動画を再生するボタンを早送り、巻き戻しボタンに置き換えます。アプリの再起動が必要です。";
+
+"FIX_GOOGLE_SIGNIN" = "Googleのサインイン (TrollStoreユーザーのみ)";
+"FIX_GOOGLE_SIGNIN_DESC" = "アプリがTrollStoreでインストールされた場合のみ機能します。このオプションを有効にしてGoogleアカウントでサインインできるようにします。アプリの再起動が必要です。";
+
 "KILL_APP" = "YouTubeを閉じる";
 "KILL_APP_DESC" = "ここをタップしてYouTubeを終了できます！";
 
 "HIDE_PREVIOUS_AND_NEXT_BUTTON" = "前後の動画のボタンを非表示";
-"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "コントロールのオーバーレイで前後の動画のボタンを非表示にします。";
+"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "動画コントロールのオーバーレイで前後の動画のボタンを非表示にします。";
 
 "YT_MINIPLAYER" = "すべての動画でミニプレーヤーを有効にする";
 "YT_MINIPLAYER_DESC" = "例: 子ども向けの動画";
 
-"CAST_CONFIRM" = "キャストする前に確認画面を表示する (YTCastConfirm)";
+"CAST_CONFIRM" = "キャストする前に確認をする (YTCastConfirm)";
-"CAST_CONFIRM_DESC" = "誤ってテレビにキャストしないよう、前に確認画面を表示します。";
+"CAST_CONFIRM_DESC" = "誤ってテレビにキャストしないように、確認の警告を表示します。";
 
 "HIDE_HOVER_CARD" = "動画終わりのホバーカードを非表示 (YTNoHoverCards)";
 "HIDE_HOVER_CARD_DESC" = "動画の最後のホバーカード(サムネイル)を非表示にします。";
@@ -31,16 +37,16 @@
 "AUTO_FULLSCREEN_DESC" = "動画を自動でフルスクリーンにします。";
 
 "HIDE_HUD_MESSAGES" = "HUDのメッセージを非表示";
-"HIDE_HUD_MESSAGES_DESC" = "例: 字幕がオン/オフになりました、ループ再生はオンになっています 等";
+"HIDE_HUD_MESSAGES_DESC" = "例: 字幕がオン/オフになりました、ループ再生はオンになっています、等";
 
 "OLED_DARKMODE" = "有機ELダークモード (実験的機能)";
-"OLED_DARKMODE_DESC" = "一部では正しく動作しない可能性があります。この設定を変更したあとはアプリの再起動が必要です。";
+"OLED_DARKMODE_DESC" = "正しく動作しない可能性があります。この設定を変更した場合、アプリの再起動が必要です。";
 
 "OLED_KEYBOARD" = "有機ELキーボード (実験的機能)";
-"OLED_KEYBOARD_DESC" = "一部では正しく動作しない可能性があります。この設定を変更したあとはアプリの再起動が必要です。";
+"OLED_KEYBOARD_DESC" = "正しく動作しない可能性があります。この設定を変更した場合、アプリの再起動が必要です。";
 
 "HIDE_PAID_PROMOTION_CARDS" = "プロモーションバナーを非表示";
-"HIDE_PAID_PROMOTION_CARDS_DESC" = "一部の動画にある「プロモーションを含みます」のバナーを非表示にします。";
+"HIDE_PAID_PROMOTION_CARDS_DESC" = "一部の動画で表示される「プロモーションを含みます」のバナーを非表示にします。";
 
 // YTCastConfirm
 "CASTING" = "キャスト";

lang/uYouPlus.bundle/ko.lproj/Localizable.strings

@@ -1,4 +1,12 @@
 // Settings
+"DONT_EAT_MY_CONTENT" = "노치/아일랜드 영역이 2:1 비율 비디오를 가리지 않게 함 (DontEatMyContent)";
+"DONT_EAT_MY_CONTENT_DESC" = "노치/다이내믹 아일랜드 영역이 유튜브의 2:1 비율 영상 일부를 가리는 것을 막아줍니다. 앱을 다시 시작해야 합니다.";
+
+"REPLACE_PREVIOUS_NEXT_BUTTON" = "이전, 다음 재생 버튼 교체";
+"REPLACE_PREVIOUS_NEXT_BUTTON_DESC" = "이전 재생, 다음 재생 버튼을 빨리 감기, 되감기 버튼으로 교체합니다. 앱을 다시 시작해야 합니다.";
+
+"FIX_GOOGLE_SIGNIN" = "구글 로그인 문제 수정 (TrollStore 사용자만 해당)";
+"FIX_GOOGLE_SIGNIN_DESC" = "TrollStore를 통해 설치된 앱에서만 동작합니다: 구글 계정으로 로그인하려면 이 옵션을 켜 주세요. 앱을 다시 시작해야 합니다.";
 
 "KILL_APP" = "YouTube 닫기";
 "KILL_APP_DESC" = "YouTube 앱을 닫으려면 여기를 탭하세요!";
@@ -7,7 +15,7 @@
 "HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "비디오 재생 오버레이에서 이전 재생, 다음 재생 버튼을 숨깁니다.";
 
 "YT_MINIPLAYER" = "모든 YouTube 영상에서 미니 플레이어 활성화";
-"YT_MINIPLAYER_DESC" = "아동용 영상일 경우.";
+"YT_MINIPLAYER_DESC" = "유튜브 키즈의 영상 같은 경우.";
 
 "CAST_CONFIRM" = "TV 전송 알림 (YTCastConfirm)";
 "CAST_CONFIRM_DESC" = "의도치 않게 TV로 영상을 전송하지 않도록 보내기 전에 확인 메시지를 표시합니다.";

lang/uYouPlus.bundle/pt.lproj/Localizable.strings

@@ -1,5 +1,11 @@
 // Settings
 
+"REPLACE_PREVIOUS_NEXT_BUTTON" = "Substituir o botão Anterior e Próximo";
+"REPLACE_PREVIOUS_NEXT_BUTTON_DESC" = "Substitui o botão Anterior e Próximo pelo botão Avançar e Retroceder. A reinicialização do app é necessária.";
+
+"FIX_GOOGLE_SIGNIN" = "Corrigir o login do Google (somente para usuários da TrollStore)";
+"FIX_GOOGLE_SIGNIN_DESC" = "Ative esta opção somente quando você não conseguir fazer login com sua conta do Google e o aplicativo foi instalado via TrollStore. Se você conseguir fazer login normalmente, mantenha-o desativado. A reinicialização do app é necessária.";
+
 "KILL_APP" = "Fechar o YouTube";
 "KILL_APP_DESC" = "Toque aqui para fechar o YouTube!";
 

lang/uYouPlus.bundle/ru.lproj/Localizable.strings

@@ -1,4 +1,15 @@
 /* uYouPlusSettings */
+"DONT_EAT_MY_CONTENT" = "Предотвратить выемку/остров на видеоконтенте 2:1 (DontEatMyContent)";
+"DONT_EAT_MY_CONTENT_DESC" = "Не позволяйте вырезу/Dynamic Island поглощать видеоконтент 2:1 на YouTube. Требуется перезапуск приложения.";
+
+"REPLACE_PREVIOUS_NEXT_BUTTON" = "Заменить кнопку "Назад" и "Далее";
+"REPLACE_PREVIOUS_NEXT_BUTTON_DESC" = "Замените кнопки «Назад» и «Далее» на кнопки «Перемотка вперед» и «Назад». Требуется перезапуск приложения.";
+
+"FIX_GOOGLE_SIGNIN" = "Исправить вход через Google (только для пользователя TrollStore)";
+"FIX_GOOGLE_SIGNIN_DESC" = "Включайте эту опцию, только если вы не можете войти в свою учетную запись Google и приложение было установлено через TrollStore. Если вы можете нормально войти в систему, оставьте ее отключенной. Требуется перезапуск приложения.";
+
+"KILL_APP" = "Закрыть YouTube";
+"KILL_APP_DESC" = "Нажмите здесь, чтобы закрыть YouTube!";
 
 "HIDE_PREVIOUS_AND_NEXT_BUTTON" = "Скрыть «Пред.» и «След.»";
 "HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "Убирает кнопки переключения видео «Следующий» и «Предыдущий» с плеера.";

lang/uYouPlus.bundle/template.lproj/Localizable.strings

@@ -1,16 +1,26 @@
-// How to translate uYouPlus to your language:
+/* Read me:
-//
+- How to translate uYouPlus (if your language already exists then feel free to check it and/or improve it):
-// 1. Fork uYouPlus repo
+1. Fork uYouPlus repo
-// 2. Duplicate the template.lproj folder, and edit the duplicated folder's name to your <lang_code>.lproj id.  
+2. Duplicate the template.lproj folder, and edit the duplicated folder's name to your <lang_code>.lproj id.
-// For example: <ru.lproj> for Russia. For more details, visit: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
+For example: <ru.lproj> for Russia. For more details, visit: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
-// 3. Translate each line below after each =
+3. Translate each line below after each =
-// 4. Open a Pull Request
+4. Open a Pull Request
-//
+
-// If your language already exists then feel free to check it and/or improve it!
+- You can also add your localization to YouPiP, YTUHD and Return YouTube Dislike. The process is the same:
-// You can also add your localization to YouPiP here, the process is the same
+https://github.com/PoomSmart/YouPiP/tree/main/layout/Library/Application%20Support/YouPiP.bundle
-// https://github.com/PoomSmart/YouPiP/tree/main/layout/Library/Application%20Support/YouPiP.bundle
+https://github.com/PoomSmart/YTUHD/tree/master/layout/Library/Application%20Support/YTUHD.bundle
-//
+https://github.com/PoomSmart/Return-YouTube-Dislikes/tree/main/layout/Library/Application%20Support/RYD.bundle
+*/
+
 // Settings
+"DONT_EAT_MY_CONTENT" = "Prevent Notch/Island on 2:1 Video Content (DontEatMyContent)";
+"DONT_EAT_MY_CONTENT_DESC" = "Prevent the notch/Dynamic Island from munching on 2:1 video content in YouTube. App restart is required.";
+
+"REPLACE_PREVIOUS_NEXT_BUTTON" = "Replace Previous and Next Button";
+"REPLACE_PREVIOUS_NEXT_BUTTON_DESC" = "Replace Previous and Next Button with Fast forward and Rewind button. App restart is required.";
+
+"FIX_GOOGLE_SIGNIN" = "Fix Google Sign in (for TrollStore user only)";
+"FIX_GOOGLE_SIGNIN_DESC" = "Turn on this option only when you can't sign in with your Google account and the app was installed via TrollStore. If you can log in normally, keep it disabled. App restart is required.";
 
 "KILL_APP" = "Close YouTube";
 "KILL_APP_DESC" = "Tap here to close YouTube!";

lang/uYouPlus.bundle/vi.lproj/Localizable.strings

@@ -1,4 +1,12 @@
 // Settings
+"DONT_EAT_MY_CONTENT" = "Ẩn tai thỏ/Dynamic Island (DontEatMyContent)";
+"DONT_EAT_MY_CONTENT_DESC" = "Ẩn tai thỏ/Dynamic Island chèn vào các video có tỷ lệ 2:1. Cần khởi động lại ứng dụng.";
+
+"REPLACE_PREVIOUS_NEXT_BUTTON" = "Thay thế nút chuyển video";
+"REPLACE_PREVIOUS_NEXT_BUTTON_DESC" = "Thay thế nút chuyển video bằng nút tua nhanh. Cần khởi động lại ứng dụng.";
+
+"FIX_GOOGLE_SIGNIN" = "Sửa lỗi không thể đăng nhập tài khoản Google";
+"FIX_GOOGLE_SIGNIN_DESC" = "Chỉ bật tính năng này khi bạn không thể đăng nhập tài khoản Google và ứng dụng được cài qua TrollStore. Nếu bạn có thể đăng nhập bình thường thì hãy tắt tính năng này. Cần khởi động lại ứng dụng.";
 
 "KILL_APP" = "Đóng ứng dụng";
 "KILL_APP_DESC" = "Chạm để đóng YouTube!";

lang/uYouPlus.bundle/zh_cn.lproj/Localizable.strings

@@ -1,5 +1,11 @@
 // Settings
 
+"REPLACE_PREVIOUS_NEXT_BUTTON" = "替换上一个/下一个按钮";
+"REPLACE_PREVIOUS_NEXT_BUTTON_DESC" = "将播放器控制界面上的上一个/下一个按钮替换成快进/快退按钮。更改本设置后需要重启App。";
+
+"FIX_GOOGLE_SIGNIN" = "修复Google账号登录问题（仅针对TrollStore用户）";
+"FIX_GOOGLE_SIGNIN_DESC" = "仅在使用TrollStore安装本App的情况下生效：启用本选项后可正常登录您的Google账号。更改本设置后需要重启App。";
+
 "KILL_APP" = "关闭YouTube";
 "KILL_APP_DESC" = "点击此处关闭YouTube!";
 
@@ -31,7 +37,7 @@
 "AUTO_FULLSCREEN_DESC" = "自动全屏播放视频。";
 
 "HIDE_HUD_MESSAGES" = "隐藏系统提醒";
-"HIDE_HUD_MESSAGES_DESC" = "例如：\"已启用/停用字幕\"、\"已开启/关闭视频循环播放\"等。";
+"HIDE_HUD_MESSAGES_DESC" = "例如：“已启用/停用字幕”、“已开启/关闭视频循环播放”等。";
 
 "OLED_DARKMODE" = "OLED 深色模式（实验性功能）";
 "OLED_DARKMODE_DESC" = "在某些情况下可能不会正常工作。更改本设置后需要重启App。";
@@ -40,10 +46,10 @@
 "OLED_KEYBOARD_DESC" = "在某些情况下可能不会正常工作。更改本设置后需要重启App。";
 
 "HIDE_PAID_PROMOTION_CARDS" = "隐藏付费宣传内容提醒横幅";
-"HIDE_PAID_PROMOTION_CARDS_DESC" = "隐藏出现在部分视频中的\"包含付费宣传内容\"横幅。";
+"HIDE_PAID_PROMOTION_CARDS_DESC" = "隐藏出现在部分视频中的“包含付费宣传内容”横幅。";
 
 // YTCastConfirm
-"CASTING" = "正在投屏";
+"CASTING" = "准备投屏";
 "MSG_ARE_YOU_SURE" = "您确定要开始投屏吗？";
 "MSG_YES" = "确定";
 "MSG_CANCEL" = "取消";

lang/uYouPlus.bundle/zh_tw.lproj/Localizable.strings

@@ -1,5 +1,8 @@
 // Settings
 
+"KILL_APP" = "關閉YouTube";
+"KILL_APP_DESC" = "按這裡關閉YouTube!";
+
 "HIDE_PREVIOUS_AND_NEXT_BUTTON" = "隱藏上一個和下一個按鈕";
 "HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "在影片控制層中隱藏上一個和下一個按鈕";
 

uYouPlus.xm

@@ -2,6 +2,8 @@
 #import <Foundation/Foundation.h>
 #import <objc/runtime.h>
 #import <dlfcn.h>
+#import <sys/utsname.h>
+#import <substrate.h>
 #import "Header.h"
 #import "Tweaks/YouTubeHeader/YTVideoQualitySwitchOriginalController.h"
 #import "Tweaks/YouTubeHeader/YTPlayerViewController.h"
@@ -30,6 +32,7 @@ NSBundle *uYouPlusBundle() {
 }
 NSBundle *tweakBundle = uYouPlusBundle();
 
+// Keychain patching
 static NSString *accessGroupID() {
     NSDictionary *query = [NSDictionary dictionaryWithObjectsAndKeys:
                            (__bridge NSString *)kSecClassGenericPassword, (__bridge NSString *)kSecClass,
@@ -48,6 +51,7 @@ static NSString *accessGroupID() {
     return accessGroup;
 }
 
+// 
 BOOL hideHUD() {
     return [[NSUserDefaults standardUserDefaults] boolForKey:@"hideHUD_enabled"];
 }
@@ -90,14 +94,17 @@ BOOL ytMiniPlayer() {
 BOOL hidePaidPromotionCard() {
     return [[NSUserDefaults standardUserDefaults] boolForKey:@"hidePaidPromotionCard_enabled"];
 }
+BOOL fixGoogleSignIn() {
+    return [[NSUserDefaults standardUserDefaults] boolForKey:@"fixGoogleSignIn_enabled"];
+}
+BOOL replacePreviousAndNextButton() {
+    return [[NSUserDefaults standardUserDefaults] boolForKey:@"replacePreviousAndNextButton_enabled"];
+}
+BOOL dontEatMyContent() {
+    return [[NSUserDefaults standardUserDefaults] boolForKey:@"dontEatMyContent_enabled"];
+}
 
 # pragma mark - Tweaks
-// Enable Reorder videos from playlist while on the Watch page - @PoomSmart
-%hook YTIPlaylistPanelVideoRenderer 
-%new 
-- (BOOL)canReorder { return YES; }
-%end
-
 // Skips content warning before playing *some videos - @PoomSmart
 %hook YTPlayabilityResolutionUserActionUIController
 - (void)showConfirmAlert { [self confirmAlertDidPressConfirm]; }
@@ -111,7 +118,7 @@ BOOL hidePaidPromotionCard() {
 }
 %end
 
-// Hide CC / Autoplay switch / Next & Previous button
+// Hide CC / Autoplay switch
 %hook YTMainAppControlsOverlayView
 - (void)setClosedCaptionsOrSubtitlesButtonAvailable:(BOOL)arg1 { // hide CC button
     if (hideCC()) { return %orig(NO); }   
@@ -121,15 +128,22 @@ BOOL hidePaidPromotionCard() {
     if (hideAutoplaySwitch()) {}
     else { return %orig; }
 }
-- (void)layoutSubviews { // hide Next & Previous button
+%end
-    %orig;
+
-    if (hidePreviousAndNextButton()) { 
+// Hide Next & Previous button
-	    MSHookIvar<YTMainAppControlsOverlayView *>(self, "_nextButton").hidden = YES;
+%group gHidePreviousAndNextButton
-    	MSHookIvar<YTMainAppControlsOverlayView *>(self, "_previousButton").hidden = YES;
+%hook YTColdConfig
-    	MSHookIvar<YTTransportControlsButtonView *>(self, "_nextButtonView").hidden = YES;
+- (BOOL)removeNextPaddleForSingletonVideos { return YES; }
-    	MSHookIvar<YTTransportControlsButtonView *>(self, "_previousButtonView").hidden = YES;
+- (BOOL)removePreviousPaddleForSingletonVideos { return YES; }
-    }
+%end
-}
+%end
+
+// Replace Next & Previous button with Fast forward & Rewind button
+%group gReplacePreviousAndNextButton
+%hook YTColdConfig
+- (BOOL)replaceNextPaddleWithFastForwardButtonForSingletonVods { return YES; }
+- (BOOL)replacePreviousPaddleWithRewindButtonForSingletonVods { return YES; }
+%end
 %end
 
 // Hide HUD Messages
@@ -247,6 +261,7 @@ BOOL hidePaidPromotionCard() {
 // YouRememberCaption: https://poomsmart.github.io/repo/depictions/youremembercaption.html
 %hook YTColdConfig
 - (BOOL)respectDeviceCaptionSetting { return NO; }
+- (BOOL)isLandscapeEngagementPanelSwipeRightToDismissEnabled { return YES; }
 %end
 
 // NOYTPremium - https://github.com/PoomSmart/NoYTPremium/
@@ -303,6 +318,11 @@ BOOL hidePaidPromotionCard() {
 }
 %end
 
+%hook YTReelContentView
+- (void)didTapOverflowButton:(id)sender {
+}
+%end
+
 %hook NSLayoutConstraint
 + (instancetype)constraintWithItem:(UIView *)view1
                          attribute:(NSLayoutAttribute)attr1
@@ -342,9 +362,9 @@ BOOL hidePaidPromotionCard() {
 // Prevent uYou player bar from showing when not playing downloaded media
 %hook PlayerManager
 - (void)pause {
-  if (isnan([self progress]))
+    if (isnan([self progress]))
-    return;
+        return;
-  %orig;
+    %orig;
 }
 %end
 
@@ -425,6 +445,14 @@ BOOL hidePaidPromotionCard() {
 - (NSString *)bundleId { return YT_BUNDLE_ID; }
 %end
 
+%hook APMAEU
++ (BOOL)isFAS { return YES; }
+%end
+
+%hook GULAppEnvironmentUtil
++ (BOOL)isFromAppStore { return YES; }
+%end
+
 %hook SSOConfiguration
 - (id)initWithClientID:(id)clientID supportedAccountServices:(id)supportedAccountServices {
     self = %orig;
@@ -434,14 +462,6 @@ BOOL hidePaidPromotionCard() {
 }
 %end
 
-%hook APMAEU
-+ (BOOL)isFAS { return YES; }
-%end
-
-%hook GULAppEnvironmentUtil
-+ (BOOL)isFromAppStore { return YES; }
-%end
-
 %hook NSBundle
 - (NSString *)bundleIdentifier {
     NSArray *address = [NSThread callStackReturnAddresses];
@@ -462,9 +482,35 @@ BOOL hidePaidPromotionCard() {
 }
 %end
 
+// Fix "Google couldn't confirm this attempt to sign in is safe. If you think this is a mistake, you can close and try again to sign in" - qnblackcat/uYouPlus#420
+// Thanks to @AhmedBafkir and @kkirby - https://github.com/qnblackcat/uYouPlus/discussions/447#discussioncomment-3672881
+%group gFixGoogleSignIn
+%hook SSORPCService
++ (id)URLFromURL:(id)arg1 withAdditionalFragmentParameters:(NSDictionary *)arg2 {
+    NSURL *orig = %orig;
+    NSURLComponents *urlComponents = [[NSURLComponents alloc] initWithURL:orig resolvingAgainstBaseURL:NO];
+    NSMutableArray *newQueryItems = [urlComponents.queryItems mutableCopy];
+    for (NSURLQueryItem *queryItem in urlComponents.queryItems) {
+        if ([queryItem.name isEqualToString:@"system_version"]
+         || [queryItem.name isEqualToString:@"app_version"]
+         || [queryItem.name isEqualToString:@"kdlc"]
+         || [queryItem.name isEqualToString:@"kss"]
+         || [queryItem.name isEqualToString:@"lib_ver"]
+         || [queryItem.name isEqualToString:@"device_model"]) {
+            [newQueryItems removeObject:queryItem];
+        }
+    }
+    urlComponents.queryItems = [newQueryItems copy];
+    return urlComponents.URL;
+}
+%end
+%end
+
 // Fix "You can't sign in to this app because Google can't confirm that it's safe" warning when signing in. by julioverne & PoomSmart
 // https://gist.github.com/PoomSmart/ef5b172fd4c5371764e027bea2613f93
 // https://github.com/qnblackcat/uYouPlus/pull/398
+/* 
+%group gDevice_challenge_request_hack
 %hook SSOService
 + (id)fetcherWithRequest:(NSMutableURLRequest *)request configuration:(id)configuration {
     if ([request isKindOfClass:[NSMutableURLRequest class]] && request.HTTPBody) {
@@ -478,13 +524,14 @@ BOOL hidePaidPromotionCard() {
     return %orig;
 }
 %end
+%end
+*/
 
 // Fix login for YouTube 17.33.2 and higher
 %hook SSOKeychainCore
 + (NSString *)accessGroup {
     return accessGroupID();
 }
-
 + (NSString *)sharedAccessGroup {
     return accessGroupID();
 }
@@ -726,6 +773,7 @@ UIColor* raisedColor = [UIColor colorWithRed:0.035 green:0.035 blue:0.035 alpha:
 - (void)didMoveToWindow {
     %orig;
     if (isDarkMode()) { 
+        self.backgroundColor = raisedColor;
         self.subviews[1].backgroundColor = raisedColor;
         self.superview.backgroundColor = raisedColor;
     }
@@ -827,6 +875,142 @@ static void replaceTab(YTIGuideResponse *response) {
 %end
 %end
 
+// DontEatMyContent - @therealFoxster: https://github.com/therealFoxster/DontEatMyContent
+double aspectRatio = 16/9;
+bool zoomedToFill = false;
+
+MLHAMSBDLSampleBufferRenderingView *renderingView;
+NSLayoutConstraint *widthConstraint, *heightConstraint, *centerXConstraint, *centerYConstraint;
+
+%group gDontEatMyContent
+%hook YTPlayerViewController
+- (void)viewDidAppear:(BOOL)animated {
+    YTPlayerView *playerView = [self playerView];
+    UIView *renderingViewContainer = MSHookIvar<UIView *>(playerView, "_renderingViewContainer");
+    renderingView = [playerView renderingView];
+
+    CGFloat constant = 23; // Make renderingView a bit larger since safe area has sizeable margins from the notch and side borders; tested on iPhone 13 mini
+
+    widthConstraint = [renderingView.widthAnchor constraintEqualToAnchor:renderingViewContainer.safeAreaLayoutGuide.widthAnchor constant:constant];
+    heightConstraint = [renderingView.heightAnchor constraintEqualToAnchor:renderingViewContainer.safeAreaLayoutGuide.heightAnchor constant:constant];
+    centerXConstraint = [renderingView.centerXAnchor constraintEqualToAnchor:renderingViewContainer.centerXAnchor];
+    centerYConstraint = [renderingView.centerYAnchor constraintEqualToAnchor:renderingViewContainer.centerYAnchor];
+    
+    // playerView.backgroundColor = [UIColor greenColor];
+    // renderingViewContainer.backgroundColor = [UIColor redColor];
+    // renderingView.backgroundColor = [UIColor blueColor];
+
+    YTMainAppVideoPlayerOverlayViewController *activeVideoPlayerOverlay = [self activeVideoPlayerOverlay];
+
+    // Must check class since YTInlineMutedPlaybackPlayerOverlayViewController doesn't have -(BOOL)isFullscreen
+    if ([NSStringFromClass([activeVideoPlayerOverlay class]) isEqualToString:@"YTMainAppVideoPlayerOverlayViewController"] && [activeVideoPlayerOverlay isFullscreen]) {
+        activate();
+    } else {
+        center();
+    }
+
+    %orig(animated);
+}
+- (void)didPressToggleFullscreen {  
+    YTMainAppVideoPlayerOverlayViewController *activeVideoPlayerOverlay = [self activeVideoPlayerOverlay];
+    
+    if (![activeVideoPlayerOverlay isFullscreen]) // Entering fullscreen
+        activate();
+    else // Exiting fullscreen
+        deactivate();
+    
+    %orig;
+}
+- (void)didSwipeToEnterFullscreen { 
+    %orig; activate(); 
+}
+- (void)didSwipeToExitFullscreen { 
+    %orig; deactivate();
+}
+- (void)singleVideo:(id)arg1 aspectRatioDidChange:(CGFloat)arg2 {
+    aspectRatio = arg2;
+    if (aspectRatio == 0.0) { 
+        // App backgrounded
+    } else if (aspectRatio < THRESHOLD) {
+        deactivate();
+    } else {
+        activate();
+    }
+    %orig(arg1, arg2);
+}
+%end
+
+%hook YTVideoZoomOverlayView
+- (void)didRecognizePinch:(UIPinchGestureRecognizer *)pinchGestureRecognizer {
+    // %log((CGFloat) [pinchGestureRecognizer scale], (CGFloat) [pinchGestureRecognizer velocity]);
+    if ([pinchGestureRecognizer velocity] <= 0.0) { // >>Zoom out<<
+        zoomedToFill = false;
+        activate();
+    } else if ([pinchGestureRecognizer velocity] > 0.0) { // <<Zoom in>>
+        zoomedToFill = true;
+        deactivate();
+    }
+    %orig(pinchGestureRecognizer);
+}
+- (void)flashAndHideSnapIndicator {}
+// https://github.com/lgariv/UniZoom/blob/master/Tweak.xm
+- (void)setSnapIndicatorVisible:(bool)arg1 {
+    %orig(NO);
+}
+%end
+%end // gDontEatMyContent
+
+// DontEatMycontent - detecting device model
+// https://stackoverflow.com/a/11197770/19227228
+NSString* deviceName() {
+    struct utsname systemInfo;
+    uname(&systemInfo);
+    return [NSString stringWithCString:systemInfo.machine encoding:NSUTF8StringEncoding];
+}
+
+BOOL isDeviceSupported() {
+    NSString *identifier = deviceName();
+    NSArray *unsupportedDevices = UNSUPPORTED_DEVICES;
+    
+    for (NSString *device in unsupportedDevices) {
+        if ([device isEqualToString:identifier]) {
+            return NO;
+        }
+    }
+
+    if ([identifier containsString:@"iPhone"]) {
+        NSString *model = [identifier stringByReplacingOccurrencesOfString:@"iPhone" withString:@""];
+        model = [model stringByReplacingOccurrencesOfString:@"," withString:@"."];
+        if ([identifier isEqualToString:@"iPhone13,1"]) { // iPhone 12 mini
+            return YES; 
+        } else if ([model floatValue] >= 14.0) { // iPhone 13 series and newer
+            return YES;
+        } else return NO;
+    } else return NO;
+}
+
+void activate() {
+    if (aspectRatio < THRESHOLD || zoomedToFill) return;
+    // NSLog(@"activate");
+    center();
+    renderingView.translatesAutoresizingMaskIntoConstraints = NO;
+    widthConstraint.active = YES;
+    heightConstraint.active = YES;
+}
+
+void deactivate() {
+    // NSLog(@"deactivate");
+    center();
+    renderingView.translatesAutoresizingMaskIntoConstraints = YES;
+    widthConstraint.active = NO;
+    heightConstraint.active = NO;
+}
+
+void center() {
+    centerXConstraint.active = YES;
+    centerYConstraint.active = YES;
+}
+
 // iOS 16 uYou crash fix - @level3tjg: https://github.com/qnblackcat/uYouPlus/pull/224
 %group iOS16
 %hook OBPrivacyLinkButton
@@ -849,9 +1033,6 @@ static void replaceTab(YTIGuideResponse *response) {
 # pragma mark - ctor
 %ctor {
     %init;
-    if (![[[[NSUserDefaults standardUserDefaults] dictionaryRepresentation] allKeys] containsObject:@"relatedVideosAtTheEndOfYTVideos"]) { 
-       [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"relatedVideosAtTheEndOfYTVideos"]; 
-    }
     if (oled()) {
        %init(gOLED);
     }
@@ -864,7 +1045,40 @@ static void replaceTab(YTIGuideResponse *response) {
     if (bigYTMiniPlayer() && (UIDevice.currentDevice.userInterfaceIdiom != UIUserInterfaceIdiomPad)) {
        %init(Main);
     }
+    if (hidePreviousAndNextButton()) {
+       %init(gHidePreviousAndNextButton);
+    }
+    if (replacePreviousAndNextButton()) {
+       %init(gReplacePreviousAndNextButton);
+    }
+    if (dontEatMyContent() && isDeviceSupported()) {
+       %init(gDontEatMyContent);
+    }
     if (@available(iOS 16, *)) {
        %init(iOS16);
     }
+    if (!fixGoogleSignIn()) {
+       %init(gFixGoogleSignIn);
+    }
+
+    // Disable broken options of uYou
+    [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"removeYouTubeAds"]; 
+    [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"disableAgeRestriction"]; 
+    
+    // Change the default value of some uYou's options
+    if (![[[[NSUserDefaults standardUserDefaults] dictionaryRepresentation] allKeys] containsObject:@"relatedVideosAtTheEndOfYTVideos"]) { 
+       [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"relatedVideosAtTheEndOfYTVideos"]; 
+    }
+    if (![[[[NSUserDefaults standardUserDefaults] dictionaryRepresentation] allKeys] containsObject:@"uYouButtonVideoControlsOverlay"]) { 
+       [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"uYouButtonVideoControlsOverlay"]; 
+    }
+    if (![[[[NSUserDefaults standardUserDefaults] dictionaryRepresentation] allKeys] containsObject:@"uYouPiPButtonVideoControlsOverlay"]) { 
+       [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"uYouPiPButtonVideoControlsOverlay"]; 
+    }
+    // if (![[[[NSUserDefaults standardUserDefaults] dictionaryRepresentation] allKeys] containsObject:@"uYouRepeatButtonVideoControlsOverlay"]) { 
+    //    [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"uYouRepeatButtonVideoControlsOverlay"]; 
+    // }
+    // if (![[[[NSUserDefaults standardUserDefaults] dictionaryRepresentation] allKeys] containsObject:@"uYouRightRotateButtonVideoControlsOverlay"]) { 
+    //    [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"uYouRightRotateButtonVideoControlsOverlay"]; 
+    // }
 }