typo :/

Update Portuguese strings

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
 
@@ -80,16 +80,16 @@
 
   - 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.36.4-2.1)](https://tinyurl.com/bdezph3t) - 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 17)_
 
 <details>
   <summary>Expand</summary>
 
 | **Tweaks/App** | **Developer** | **Version** | **Open source** |
 | - | - | :-: | :-:  |
-| **YouTube** | Google Inc | 17.33.2 | ✖︎ |
+| **YouTube** | Google Inc | 17.36.4 | ✖︎ |
 | [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) |
-| **YouPiP** | [PoomSmart](https://twitter.com/poomsmart) | 1.7.7 | [✔︎](https://github.com/PoomSmart/YouPiP) |
+| **YTUHD** | [PoomSmart](https://twitter.com/poomsmart) | 1.2.10 | [✔︎](https://github.com/PoomSmart/YTUHD) |
+| **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
-
-<details>
-  <summary>MiRO92</summary>
-  
-- https://github.com/MiRO92/uYou-for-YouTube#support
-</details>
-
-<details>
-  <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>
-
+- [**MiRO92**](https://twitter.com/miro92): https://github.com/MiRO92/uYou-for-YouTube#support
+- [**Poomsmart**](https://twitter.com/poomsmart): https://poomsmart.github.io
+- [**level3tjg**](https://twitter.com/level3tjg): https://ko-fi.com/level3tjg
+- [**BandarHL**](https://twitter.com/bandarhl): https://www.paypal.com/paypalme/BandarHL
+- [**julioverne**](https://twitter.com/ijulioverne): https://www.patreon.com/julioverne
+- [**Galactic-dev**](https://twitter.com/dev_galactic):   
+  - Paypal: https://www.paypal.com/paypalme/DBrett684 
+  - Venmo: https://venmo.com/u/DavidBrett
 
 # FAQ
 

Settings.xm

@@ -23,6 +23,8 @@ extern BOOL castConfirm();
 extern BOOL ytMiniPlayer();
 extern BOOL hidePreviousAndNextButton();
 extern BOOL hidePaidPromotionCard();
+extern BOOL fixGoogleSignIn();
+extern BOOL replacePreviousAndNextButton();
 
 // Settings
 %hook YTAppSettingsPresentationData
@@ -51,6 +53,24 @@ extern BOOL hidePaidPromotionCard();
         exit(0);
     }];
 
+    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 +188,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, replacePreviousAndNextButton, reExplore]];
     [delegate setSectionItems:sectionItems forCategory:uYouPlusSection title:@"uYouPlus" titleDescription:nil headerHidden:NO];
 }
 

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

@@ -1,10 +1,16 @@
 // Settings
 
+"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_DESC" = "إخفاء زرّي السابق والتالي من أزرار التحكم على الفيديو.";
+"HIDE_PREVIOUS_AND_NEXT_BUTTON" = "إخفاء زرّي السابق والتالي";
+"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "إخفاء زرّي المقطع السابق والمقطع التالي من أزرار التحكم على الفيديو.";
 
 "YT_MINIPLAYER" = "السماح بالمشغل المصغّر لكل فيديوهات يوتيوب";
 "YT_MINIPLAYER_DESC" = "عند تصغير فيديوهات الأطفال مثلاً (قبل إغلاق المقطع).";

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

@@ -1,5 +1,11 @@
 // Settings
 
+"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/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_DESC" = "誤ってテレビにキャストしないよう、前に確認画面を表示します。";
+"CAST_CONFIRM" = "キャストする前に確認をする (YTCastConfirm)";
+"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,5 +1,11 @@
 // Settings
 
+"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 앱을 닫으려면 여기를 탭하세요!";
 

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

@@ -1,4 +1,9 @@
 // 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" = "Funciona apenas quando o app foi instalado via TrollStore: ative esta opção para que você possa fazer login com sua conta do Google. A reinicialização do app é necessária.";
 
 "KILL_APP" = "Fechar o YouTube";
 "KILL_APP_DESC" = "Toque aqui para fechar o YouTube!";

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

@@ -12,6 +12,12 @@
 //
 // Settings
 
+"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,5 +1,11 @@
 // Settings
 
+"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

@@ -30,6 +30,7 @@ NSBundle *uYouPlusBundle() {
 }
 NSBundle *tweakBundle = uYouPlusBundle();
 
+// Keychain patching
 static NSString *accessGroupID() {
     NSDictionary *query = [NSDictionary dictionaryWithObjectsAndKeys:
                            (__bridge NSString *)kSecClassGenericPassword, (__bridge NSString *)kSecClass,
@@ -48,6 +49,7 @@ static NSString *accessGroupID() {
     return accessGroup;
 }
 
+// 
 BOOL hideHUD() {
     return [[NSUserDefaults standardUserDefaults] boolForKey:@"hideHUD_enabled"];
 }
@@ -90,6 +92,12 @@ 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"];
+}
 
 # pragma mark - Tweaks
 // Enable Reorder videos from playlist while on the Watch page - @PoomSmart
@@ -111,7 +119,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 +129,22 @@ BOOL hidePaidPromotionCard() {
     if (hideAutoplaySwitch()) {}
     else { return %orig; }
 }
-- (void)layoutSubviews { // hide Next & Previous button
-    %orig;
-    if (hidePreviousAndNextButton()) { 
-	    MSHookIvar<YTMainAppControlsOverlayView *>(self, "_nextButton").hidden = YES;
-    	MSHookIvar<YTMainAppControlsOverlayView *>(self, "_previousButton").hidden = YES;
-    	MSHookIvar<YTTransportControlsButtonView *>(self, "_nextButtonView").hidden = YES;
-    	MSHookIvar<YTTransportControlsButtonView *>(self, "_previousButtonView").hidden = YES;
-    }
-}
+%end
+
+// Hide Next & Previous button
+%group gHidePreviousAndNextButton
+%hook YTColdConfig
+- (BOOL)removeNextPaddleForSingletonVideos { return 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 +262,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 +319,11 @@ BOOL hidePaidPromotionCard() {
 }
 %end
 
+%hook YTReelContentView
+- (void)didTapOverflowButton:(id)sender {
+}
+%end
+
 %hook NSLayoutConstraint
 + (instancetype)constraintWithItem:(UIView *)view1
                          attribute:(NSLayoutAttribute)attr1
@@ -342,9 +363,9 @@ BOOL hidePaidPromotionCard() {
 // Prevent uYou player bar from showing when not playing downloaded media
 %hook PlayerManager
 - (void)pause {
-  if (isnan([self progress]))
-    return;
-  %orig;
+    if (isnan([self progress]))
+        return;
+    %orig;
 }
 %end
 
@@ -425,6 +446,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 +463,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 +483,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 +525,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 +774,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;
     }
@@ -864,7 +913,16 @@ static void replaceTab(YTIGuideResponse *response) {
     if (bigYTMiniPlayer() && (UIDevice.currentDevice.userInterfaceIdiom != UIUserInterfaceIdiomPad)) {
        %init(Main);
     }
+    if (hidePreviousAndNextButton()) {
+       %init(gHidePreviousAndNextButton);
+    }
+    if (replacePreviousAndNextButton()) {
+       %init(gReplacePreviousAndNextButton);
+    }
     if (@available(iOS 16, *)) {
        %init(iOS16);
     }
+    if (!fixGoogleSignIn()) {
+       %init(gFixGoogleSignIn);
+    }
 }