Merge pull request #224 from level3tjg/main

iOS 16 OnboardingKit crash fix

.github/ISSUE_TEMPLATE/bug.md

@@ -9,6 +9,8 @@ assignees: ''
 
 ## ⚠️ Have you read the [FAQ](https://github.com/qnblackcat/uYouPlus/wiki/FAQ)? Make sure you visit the FAQ page first!!! ⚠️
 
+_Make sure you complete the template. Otherwise, it will be closed without further explanation!_
+
 ### Device info
 - iOS/iPadOS version: 
 - Device model:
@@ -27,3 +29,4 @@ _(The crash log can be found in the  Settings app - Privacy - Analytics & Improv
 
 
 ### Additional context:
+ 

.github/workflows/buildapp.yml

@@ -0,0 +1,146 @@
+# Original idea by @ISnackable. Thanks to him for handling the hardest parts!
+# https://github.com/ISnackable/CercubePlus/blob/main/.github/workflows/Build.yml
+
+name: Build and Release uYouPlus
+
+on:
+  workflow_dispatch:
+    inputs:
+      uyou_version:
+        description: "The version of uYou"
+        default: "2.1"
+        required: false
+        type: string
+      decrypted_youtube_url:
+        description: "The direct URL to the decrypted YouTube ipa"
+        default: ""
+        required: true
+        type: string
+      youtube_version:
+        description: "The version of YouTube"
+        default: ""
+        required: true
+        type: string
+      create_release:
+        description: "Create a draft release"
+        default: false
+        required: false
+        type: boolean
+  
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build uYouPlus
+    runs-on: macos-latest
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout Main
+        uses: actions/checkout@v3
+        with:
+          path: main
+          submodules: recursive
+
+      - name: Install Dependencies
+        run: brew install ldid dpkg
+
+      - name: Setup Theos
+        uses: actions/checkout@v3
+        with:
+          repository: theos/theos
+          ref: master
+          path: theos
+          submodules: recursive
+
+      - name: Download iOS 15 SDK
+        run: |
+          curl -LO https://github.com/chrisharper22/sdks/archive/main.zip
+          TMP=$(mktemp -d)
+          unzip -qq main.zip -d $TMP
+          mv $TMP/sdks-main/*.sdk $THEOS/sdks
+          rm -r main.zip $TMP
+        env:
+          THEOS: ${{ github.workspace }}/theos
+
+      - name: Setup Theos Jailed
+        uses: actions/checkout@v3
+        with:
+          repository: kabiroberai/theos-jailed
+          ref: master
+          path: theos-jailed
+          submodules: recursive
+
+      - name: Install Theos Jailed
+        run: |
+          ./theos-jailed/install
+        env:
+          THEOS: ${{ github.workspace }}/theos
+
+      - name: Download Dylibs
+        run: |
+          curl "https://raw.githubusercontent.com/Muirey03/RemoteLog/master/RemoteLog.h" --output "$THEOS/include/RemoteLog.h"
+          curl "https://miro92.com/repo/debs/com.miro.uyou_${{ env.UYOU_VERSION }}_iphoneos-arm.deb" --output "./main/Tweaks/uYou/com.miro.uyou_${{ env.UYOU_VERSION }}_iphoneos-arm.deb"
+          wget "$YOUTUBE_URL" --no-verbose -O ./main/YouTube.ipa
+          dpkg-deb -x "./main/Tweaks/uYou/com.miro.uyou_${{ env.UYOU_VERSION }}_iphoneos-arm.deb" ./main/Tweaks/uYou/
+          unzip -q ./main/YouTube.ipa -d ./main/tmp
+          rm -rf ./main/tmp/Payload/YouTube.app/PlugIns/*
+          cp -R ./main/Extensions/*.appex ./main/tmp/Payload/YouTube.app/PlugIns
+
+        env:
+          THEOS: ${{ github.workspace }}/theos
+          UYOU_VERSION: ${{ inputs.uyou_version }}
+          YOUTUBE_URL: ${{ inputs.decrypted_youtube_url }}
+
+      - name: Fix compiling && Build Package
+        id: build_package
+        run: |
+          cd ${{ github.workspace }}/main
+          (cd ${{ github.workspace }}/main/Tweaks/YouPiP && sed -i '' "14s#.*#YouPiP_FRAMEWORKS = AVKit AVFoundation UIKit#g" ./Makefile)
+          make package FINALPACKAGE=1
+          (mv "packages/$(ls -t packages | head -n1)" "packages/uYouPlus_${{ env.YOUTUBE_VERSION  }}_${{ env.UYOU_VERSION }}.ipa")
+          echo "::set-output name=package::$(ls -t packages | head -n1)"
+        env:
+          THEOS: ${{ github.workspace }}/theos
+          UYOU_VERSION: ${{ inputs.uyou_version }}
+          YOUTUBE_VERSION: ${{ inputs.youtube_version }}
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        env:
+          UYOU_VERSION: ${{ inputs.uyou_version }}
+          YOUTUBE_VERSION: ${{ inputs.youtube_version }}
+        with:
+          name: uYouPlus_${{ env.YOUTUBE_VERSION  }}_${{ env.UYOU_VERSION }}
+          path: ${{ github.workspace }}/main/packages/${{ steps.build_package.outputs.package }}
+          if-no-files-found: error
+
+      - name: Create Release
+        if: ${{ inputs.create_release }}
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          UYOU_VERSION: ${{ inputs.uyou_version }}
+          YOUTUBE_VERSION: ${{ inputs.youtube_version }}
+        with:
+          tag_name: v${{ env.YOUTUBE_VERSION }}-${{ env.UYOU_VERSION }}-(${{ github.run_number }})
+          release_name: v${{ env.YOUTUBE_VERSION }}-${{ env.UYOU_VERSION }}-(${{ github.run_number }})
+          draft: true
+          prerelease: false
+
+      - name: Upload Release Asset
+        if: ${{ inputs.create_release }}
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          UYOU_VERSION: ${{ inputs.uyou_version }}
+          YOUTUBE_VERSION: ${{ inputs.youtube_version }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ${{ github.workspace }}/main/packages/${{ steps.build_package.outputs.package }}
+          asset_name: uYouPlus_${{ env.YOUTUBE_VERSION  }}_${{ env.UYOU_VERSION }}.ipa
+          asset_content_type: application/vnd.debian.binary-package

.gitignore

@@ -1,7 +1,7 @@
 .theos
 .DS_Store
-packages
-obj
-tmp
+packages/
+tmp/
 Tweaks/uYou/*
-!Tweaks/uYou/.gitkeep
+!Tweaks/uYou/.gitkeep
+Resources/

Header.h

@@ -1,15 +1,34 @@
 #import "Tweaks/YouTubeHeader/YTPlayerViewController.h"
 
-@interface YTMainAppControlsOverlayView: UIView
+#define LOC(x) [tweakBundle localizedStringForKey:x value:nil table:nil]
+#define YT_BUNDLE_ID @"com.google.ios.youtube"
+#define YT_NAME @"YouTube"
+
+// IAmYouTube
+@interface SSOConfiguration : NSObject
 @end
 
-@interface YTPlaylistHeaderViewController : UIViewController
-@property (nonatomic, strong, readwrite) UIView *downloadsButton;
+// uYouPlus
+@interface YTMainAppControlsOverlayView : UIView
 @end
 
-@interface ASWAppSwitcherCollectionViewCell: UIView
+@interface YTTransportControlsButtonView : UIView
 @end
 
+// @interface YTPlaylistHeaderViewController : UIViewController
+// @property (nonatomic, strong, readwrite) UIView *downloadsButton;
+// @end
+
+@interface OBPrivacyLinkButton : UIButton
+- (instancetype)initWithCaption:(NSString *)caption
+                     buttonText:(NSString *)buttonText
+                          image:(UIImage *)image
+                      imageSize:(CGSize)imageSize
+                   useLargeIcon:(BOOL)useLargeIcon
+                displayLanguage:(NSString *)displayLanguage;
+@end
+
+// BigYTMiniPlayer
 @interface YTMainAppVideoPlayerOverlayView : UIView
 - (UIViewController *)_viewControllerForAncestor;
 @end
@@ -17,10 +36,15 @@
 @interface YTWatchMiniBarView : UIView
 @end
 
+// YTAutoFullScreen
 @interface YTPlayerViewController (YTAFS)
 - (void)autoFullscreen;
 @end
 
+// OLED Darkmode
+@interface ASWAppSwitcherCollectionViewCell : UIView
+@end
+
 @interface ASScrollView : UIView
 @end
 
@@ -30,11 +54,17 @@
 @interface UIKeyboardDockView : UIView
 @end
 
+@interface _ASDisplayView : UIView
+@end
+
+@interface SponsorBlockSettingsController : UITableViewController
+@end
+
+@interface SponsorBlockViewController : UIViewController
+@end
+
 @interface UICandidateViewController : UIViewController
 @end
 
 @interface UIPredictionViewController : UIViewController
-@end
-
-@interface SponsorBlockSettingsController : UITableViewController 
 @end

Makefile

@@ -1,6 +1,4 @@
-uYouPlus_INJECT_DYLIBS = Tweaks/uYou/Library/MobileSubstrate/DynamicLibraries/uYou.dylib .theos/obj/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib .theos/obj/YTUHD.dylib .theos/obj/YouPiP.dylib .theos/obj/YouTubeDislikesReturn.dylib .theos/obj/YoutubeSpeed.dylib
-
-TARGET = iphone:clang:latest:12.0
+TARGET = iphone:clang:latest:13.0
 uYouPlus_USE_FLEX = 0
 uYouPlus_USE_FISHHOOK = 0
 ARCHS = arm64
@@ -12,8 +10,10 @@ TWEAK_NAME = uYouPlus
 DISPLAY_NAME = YouTube
 BUNDLE_ID = com.google.ios.youtube
  
+uYouPlus_INJECT_DYLIBS = Tweaks/uYou/Library/MobileSubstrate/DynamicLibraries/uYou.dylib .theos/obj/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib .theos/obj/YTUHD.dylib .theos/obj/YouPiP.dylib .theos/obj/YouTubeDislikesReturn.dylib .theos/obj/YoutubeSpeed.dylib
 uYouPlus_FILES = uYouPlus.xm Settings.xm
 uYouPlus_IPA = ./tmp/Payload/YouTube.app
+uYouPlus_FRAMEWORKS = UIKit
 
 include $(THEOS)/makefiles/common.mk
 include $(THEOS_MAKE_PATH)/tweak.mk
@@ -21,11 +21,12 @@ SUBPROJECTS += Tweaks/Alderis Tweaks/iSponsorBlock Tweaks/YTUHD Tweaks/YouPiP Tw
 include $(THEOS_MAKE_PATH)/aggregate.mk
 
 before-package::
-	@tput setaf 4 && echo -e "==> \033[1mMoving tweak's bundle to Resources/...\033[0m"
+	@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/iSponsorBlock/layout/Library/Application\ Support/iSponsorBlock.bundle Resources/
 	@cp -R Tweaks/uYou/Library/Application\ Support/uYouBundle.bundle Resources/
-	@tput setaf 5 && echo -e "==> \033[1mChanging the installation path of dylibs...\033[0m"
+	@cp -R lang/uYouPlus.bundle Resources/
+	@echo -e "==> \033[1mChanging the installation path of dylibs...\033[0m"
 	@codesign --remove-signature .theos/obj/iSponsorBlock.dylib && install_name_tool -change /usr/lib/libcolorpicker.dylib @rpath/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib
 	@codesign --remove-signature .theos/obj/libcolorpicker.dylib && install_name_tool -change /Library/Frameworks/Alderis.framework/Alderis @rpath/Alderis.framework/Alderis .theos/obj/libcolorpicker.dylib	

README.md

@@ -19,7 +19,7 @@
 
 - [HASHBANG Productions](https://github.com/hbang) for [Alderis Color Picker](https://github.com/hbang/Alderis) - a dependency of iSponsorBlock.
 
-- [PoomSmart](https://twitter.com/poomsmart) - the developer of many tweaks used by uYouPlus, include: [NoYTPremium](https://github.com/PoomSmart/NoYTPremium/), [YouRememberCaption](https://www.ios-repo-updates.com/repository/poomsmart/package/com.ps.youremembercaption/), [YTClassicVideoQuality](https://poomsmart.github.io/repo/depictions/ytclassicvideoquality.html), [YTNoCheckLocalNetwork](https://poomsmart.github.io/repo/depictions/ytnochecklocalnetwork.html), [YTSystemAppearance](https://poomsmart.github.io/repo/depictions/ytsystemappearance.html), [YTAutoFullScreen](https://github.com/PoomSmart/YTAutoFullScreen/), [YTReExplore](https://github.com/PoomSmart/YTReExplore/), [YTUHD](https://poomsmart.github.io/repo/depictions/ytuhd.html), [YouPiP](https://poomsmart.github.io/repo/depictions/youpip.html), and [Return YouTube Dislike](https://github.com/PoomSmart/Return-YouTube-Dislikes)
+- [PoomSmart](https://twitter.com/poomsmart) - the developer of many tweaks used by uYouPlus, include: [NoYTPremium](https://github.com/PoomSmart/NoYTPremium/), [YouRememberCaption](https://www.ios-repo-updates.com/repository/poomsmart/package/com.ps.youremembercaption/), [YTClassicVideoQuality](https://poomsmart.github.io/repo/depictions/ytclassicvideoquality.html), [YTNoCheckLocalNetwork](https://poomsmart.github.io/repo/depictions/ytnochecklocalnetwork.html), [YTSystemAppearance](https://poomsmart.github.io/repo/depictions/ytsystemappearance.html), [YTAutoFullScreen](https://github.com/PoomSmart/YTAutoFullScreen/), [YTReExplore](https://github.com/PoomSmart/YTReExplore/), [IAmYouTube](https://github.com/PoomSmart/IAmYouTube), [YTUHD](https://poomsmart.github.io/repo/depictions/ytuhd.html), [YouPiP](https://poomsmart.github.io/repo/depictions/youpip.html), and [Return YouTube Dislike](https://github.com/PoomSmart/Return-YouTube-Dislikes)
 
 - [level3tjg](https://twitter.com/level3tjg) - for [YTNoHoverCards](https://github.com/level3tjg/YTNoHoverCards) and [YTMiniplayerEnabler](https://github.com/level3tjg/YTMiniplayerEnabler).
 
@@ -78,21 +78,21 @@
 
   - My official AtlStore repo: https://qnblackcat.github.io/AltStore/
 
-  - [Open in AltStore (v17.19.3-2.1)](https://tinyurl.com/5n8c64zv) - It will take a while to install because AltStore needs to download the IPA.
+  - [Open in AltStore (v17.23.6-2.1)](https://tinyurl.com/5upjtvbv) - It will take a while to install because AltStore needs to download the IPA.
 
-- Version info: _(last update: May 20)_
+- Version info: _(last update: June 14)_
 
 <details>
-  <summary> ▶︎ Expand</summary>
+  <summary>Expand</summary>
 
 | **Tweaks/App** | **Version** | **Open source** |
 | :------------: | :----------:| :-------------: |
-| **YouTube** | 17.19.3 | ✖︎  |
+| **YouTube** | 17.23.6 | ✖︎  |
 | [uYou](https://github.com/MiRO92/uYou-for-YouTube) | 2.1 | ✖︎ |
 | [Open in YouTube](https://github.com/CokePokes/YoutubeExtensions/) | 1.2 | ✖︎ |
-| **Return YouTube Dislike** | 1.6.4 | [✔︎](https://github.com/PoomSmart/Return-YouTube-Dislikes) |
+| **Return YouTube Dislike** | 1.6.5 | [✔︎](https://github.com/PoomSmart/Return-YouTube-Dislikes) |
 | **iSponsorBlock** | 1.0-14 | [✔︎](https://github.com/Galactic-Dev/iSponsorBlock) |
-| **Alderis Color Picker** | 1.1.2| [✔︎](https://github.com/hbang/Alderis) |
+| **Alderis Color Picker** | 1.2| [✔︎](https://github.com/hbang/Alderis) |
 | **NoYTPremium** | 1.0.4 | [✔︎](https://github.com/PoomSmart/NoYTPremium/) |
 | **YouRememberCaption** | 1.0.0 | [✔︎](https://poomsmart.github.io/repo/depictions/youremembercaption.html) |
 | **YTClassicVideoQuality** | 1.0.1 | [✔︎](https://github.com/PoomSmart/YTClassicVideoQuality) |
@@ -100,7 +100,8 @@
 | **YTNoHoverCards** | 0.0.3 | [✔︎](https://github.com/level3tjg/YTNoHoverCards) |
 | **YTSystemAppearance** | 1.0.0 | [✔︎](https://poomsmart.github.io/repo/depictions/ytsystemappearance.html) |
 | **YTUHD** | 1.2.7 | [✔︎](https://github.com/PoomSmart/YTUHD) |
-| **YouPiP** | 1.7.0 | [✔︎](https://github.com/PoomSmart/YouPiP) |
+| **YouPiP** | 1.7.3 | [✔︎](https://github.com/PoomSmart/YouPiP) |
+| **IAmYouTube** | 1.2.0 | [✔︎](https://github.com/PoomSmart/IAmYouTube) |
 | **YTSpeed** | 1.0.1 | [✔︎](https://github.com/Lyvendia/YTSpeed) |
 | **YTAutoFullScreen** | 1.0.3 | [✔︎](https://github.com/PoomSmart/YTAutoFullScreen/) |
 | **YTReExplore** | 1.0.2 | [✔︎](https://github.com/PoomSmart/YTReExplore) |
@@ -116,7 +117,7 @@ See [Installation - Wiki](https://github.com/qnblackcat/uYouPlus/wiki/Installati
 # Support the developers
 
 <details>
-  <summary>▶︎ MiRO92</summary>
+  <summary>MiRO92</summary>
   
 - CashApp: https://cash.app/$MiRO92M
  
@@ -124,14 +125,14 @@ See [Installation - Wiki](https://github.com/qnblackcat/uYouPlus/wiki/Installati
 </details>
 
 <details>
-  <summary>▶︎ Poomsmart</summary>
+  <summary>Poomsmart</summary>
 
 - Paypal: https://poomsmart.github.io/
 
 </details>
 
 <details>
-  <summary>▶︎ Galactic-dev</summary>
+  <summary>Galactic-dev</summary>
   
 - Paypal: https://www.paypal.com/paypalme/DBrett684 
 

Settings.xm

@@ -1,6 +1,7 @@
 #import "Tweaks/YouTubeHeader/YTSettingsViewController.h"
 #import "Tweaks/YouTubeHeader/YTSettingsSectionItem.h"
 #import "Tweaks/YouTubeHeader/YTSettingsSectionItemManager.h"
+#import "Header.h"
 
 @interface YTSettingsSectionItemManager (YouPiP)
 - (void)updateuYouPlusSectionWithEntry:(id)entry;
@@ -8,12 +9,13 @@
 
 static const NSInteger uYouPlusSection = 500;
 
+extern NSBundle *uYouPlusBundle();
 extern BOOL hideHUD();
 extern BOOL oled();
 extern BOOL oledKB();
 extern BOOL autoFullScreen();
-extern BOOL noHoverCard();
-extern BOOL ReExplore();
+extern BOOL hideHoverCard();
+extern BOOL reExplore();
 extern BOOL bigYTMiniPlayer();
 extern BOOL hideCC();
 extern BOOL hideAutoplaySwitch();
@@ -31,14 +33,15 @@ extern BOOL hidePreviousAndNextButton();
         [mutableOrder insertObject:@(uYouPlusSection) atIndex:insertIndex + 1];
     return mutableOrder;
 }
-
 %end
 
 %hook YTSettingsSectionItemManager
-%new - (void)updateuYouPlusSectionWithEntry:(id)entry {
+%new 
+- (void)updateuYouPlusSectionWithEntry:(id)entry {
     YTSettingsViewController *delegate = [self valueForKey:@"_dataDelegate"];
+    NSBundle *tweakBundle = uYouPlusBundle();
 
-    YTSettingsSectionItem *hidePreviousAndNextButton = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Hide Previous and Next button" titleDescription:@""];
+    YTSettingsSectionItem *hidePreviousAndNextButton = [[%c(YTSettingsSectionItem) alloc] initWithTitle:LOC(@"HIDE_PREVIOUS_AND_NEXT_BUTTON") titleDescription:LOC(@"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC")];
     hidePreviousAndNextButton.hasSwitch = YES;
     hidePreviousAndNextButton.switchVisible = YES;
     hidePreviousAndNextButton.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"hidePreviousAndNextButton_enabled"];
@@ -47,7 +50,7 @@ extern BOOL hidePreviousAndNextButton();
         return YES;
     };
 
-    YTSettingsSectionItem *ytMiniPlayer = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Enable the Miniplayer for all YouTube videos" titleDescription:@""];
+    YTSettingsSectionItem *ytMiniPlayer = [[%c(YTSettingsSectionItem) alloc] initWithTitle:LOC(@"YT_MINIPLAYER") titleDescription:LOC(@"YT_MINIPLAYER_DESC")];
     ytMiniPlayer.hasSwitch = YES;
     ytMiniPlayer.switchVisible = YES;
     ytMiniPlayer.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"ytMiniPlayer_enabled"];
@@ -56,7 +59,7 @@ extern BOOL hidePreviousAndNextButton();
         return YES;
     };
 
-    YTSettingsSectionItem *castConfirm = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Confirm alert before casting (YTCastConfirm)" titleDescription:@"Show a confirm alert before casting to prevent accidentally hijacking TV."];
+    YTSettingsSectionItem *castConfirm = [[%c(YTSettingsSectionItem) alloc] initWithTitle:LOC(@"CAST_CONFIRM") titleDescription:LOC(@"CAST_CONFIRM_DESC")];
     castConfirm.hasSwitch = YES;
     castConfirm.switchVisible = YES;
     castConfirm.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"castConfirm_enabled"];
@@ -65,16 +68,16 @@ extern BOOL hidePreviousAndNextButton();
         return YES;
     };
 
-    YTSettingsSectionItem *hoverCardItem = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Hide End screens hover cards (YTNoHoverCards)" titleDescription:@"Hide creator End screens (thumbnails) at the end of videos."];
-    hoverCardItem.hasSwitch = YES;
-    hoverCardItem.switchVisible = YES;
-    hoverCardItem.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"hover_cards_enabled"];
-    hoverCardItem.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
-        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"hover_cards_enabled"];
+    YTSettingsSectionItem *hideHoverCard = [[%c(YTSettingsSectionItem) alloc] initWithTitle:LOC(@"HIDE_HOVER_CARD") titleDescription:LOC(@"HIDE_HOVER_CARD_DESC")];
+    hideHoverCard.hasSwitch = YES;
+    hideHoverCard.switchVisible = YES;
+    hideHoverCard.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"hideHoverCards_enabled"];
+    hideHoverCard.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"hideHoverCards_enabled"];
         return YES;
     };
 
-    YTSettingsSectionItem *bigYTMiniPlayer = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"New miniplayer bar style (BigYTMiniPlayer)" titleDescription:@"App restart is required."];
+    YTSettingsSectionItem *bigYTMiniPlayer = [[%c(YTSettingsSectionItem) alloc] initWithTitle:LOC(@"NEW_MINIPLAYER_STYLE") titleDescription:LOC(@"NEW_MINIPLAYER_STYLE_DESC")];
     bigYTMiniPlayer.hasSwitch = YES;
     bigYTMiniPlayer.switchVisible = YES;
     bigYTMiniPlayer.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"bigYTMiniPlayer_enabled"];
@@ -83,7 +86,7 @@ extern BOOL hidePreviousAndNextButton();
         return YES;
     };
 
-    YTSettingsSectionItem *reExplore = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Replace Shorts tab with Explore tab (YTReExplore)" titleDescription:@"App restart is required."];
+    YTSettingsSectionItem *reExplore = [[%c(YTSettingsSectionItem) alloc] initWithTitle:LOC(@"YT_RE_EXPLORE") titleDescription:LOC(@"YT_RE_EXPLORE_DESC")];
     reExplore.hasSwitch = YES;
     reExplore.switchVisible = YES;
     reExplore.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"reExplore_enabled"];
@@ -92,7 +95,7 @@ extern BOOL hidePreviousAndNextButton();
         return YES;
     };
 
-    YTSettingsSectionItem *hideCC = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Hide Subtitles button" titleDescription:@"Hide the Subtitles button in video controls overlay. "];
+    YTSettingsSectionItem *hideCC = [[%c(YTSettingsSectionItem) alloc] initWithTitle:LOC(@"HIDE_SUBTITLES_BUTTON") titleDescription:LOC(@"HIDE_SUBTITLES_BUTTON_DESC")];
     hideCC.hasSwitch = YES;
     hideCC.switchVisible = YES;
     hideCC.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"hideCC_enabled"];
@@ -101,7 +104,7 @@ extern BOOL hidePreviousAndNextButton();
         return YES;
     };
 
-    YTSettingsSectionItem *hideAutoplaySwitch = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Hide Autoplay switch" titleDescription:@"Hide the Autoplay switch button in video controls overlay."];
+    YTSettingsSectionItem *hideAutoplaySwitch = [[%c(YTSettingsSectionItem) alloc] initWithTitle:LOC(@"HIDE_AUTOPLAY_SWITCH") titleDescription:LOC(@"HIDE_AUTOPLAY_SWITCH_DESC")];
     hideAutoplaySwitch.hasSwitch = YES;
     hideAutoplaySwitch.switchVisible = YES;
     hideAutoplaySwitch.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"hideAutoplaySwitch_enabled"];
@@ -110,16 +113,16 @@ extern BOOL hidePreviousAndNextButton();
         return YES;
     };
 
-    YTSettingsSectionItem *autoFull = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Auto Full Screen (YTAutoFullScreen)" titleDescription:@"Autoplay videos at full screen."];
+    YTSettingsSectionItem *autoFull = [[%c(YTSettingsSectionItem) alloc] initWithTitle:LOC(@"AUTO_FULLSCREEN") titleDescription:LOC(@"AUTO_FULLSCREEN_DESC")];
     autoFull.hasSwitch = YES;
     autoFull.switchVisible = YES;
-    autoFull.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"autofull_enabled"];
+    autoFull.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"autoFull_enabled"];
     autoFull.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
-        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"autofull_enabled"];
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"autoFull_enabled"];
         return YES;
     };
 
-    YTSettingsSectionItem *hideHUD = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Hide HUD Messages" titleDescription:@"Example: CC is turned on/off, Video loop is on,..."];
+    YTSettingsSectionItem *hideHUD = [[%c(YTSettingsSectionItem) alloc] initWithTitle:LOC(@"HIDE_HUD_MESSAGES") titleDescription:LOC(@"HIDE_HUD_MESSAGES_DESC")];
     hideHUD.hasSwitch = YES;
     hideHUD.switchVisible = YES;
     hideHUD.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"hideHUD_enabled"];
@@ -128,7 +131,7 @@ extern BOOL hidePreviousAndNextButton();
         return YES;
     };
 
-    YTSettingsSectionItem *oledDarkMode = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"OLED Dark mode (Experimental)" titleDescription:@"App restart might be needed after switching between Light/Dark theme to fully apply changes. In case OLED Dark mode doesn't work: just switch between Light/Dark theme, then restart the app."];
+    YTSettingsSectionItem *oledDarkMode = [[%c(YTSettingsSectionItem) alloc] initWithTitle:LOC(@"OLED_DARKMODE") titleDescription:LOC(@"OLED_DARKMODE_DESC")];
     oledDarkMode.hasSwitch = YES;
     oledDarkMode.switchVisible = YES;
     oledDarkMode.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"oled_enabled"];
@@ -137,7 +140,7 @@ extern BOOL hidePreviousAndNextButton();
         return YES;
     };
 
-    YTSettingsSectionItem *oledKeyBoard = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"OLED Keyboard (Experimental)" titleDescription:@"Might not working properly in some cases. App restart is required."];
+    YTSettingsSectionItem *oledKeyBoard = [[%c(YTSettingsSectionItem) alloc] initWithTitle:LOC(@"OLED_KEYBOARD") titleDescription:LOC(@"OLED_KEYBOARD_DESC")];
     oledKeyBoard.hasSwitch = YES;
     oledKeyBoard.switchVisible = YES;
     oledKeyBoard.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"oledKeyBoard_enabled"];
@@ -146,7 +149,7 @@ extern BOOL hidePreviousAndNextButton();
         return YES;
     };
 
-    NSMutableArray <YTSettingsSectionItem *> *sectionItems = [NSMutableArray arrayWithArray:@[autoFull, castConfirm, ytMiniPlayer, hideAutoplaySwitch, hideCC, hideHUD, hidePreviousAndNextButton, hoverCardItem, bigYTMiniPlayer, oledKeyBoard, oledDarkMode,reExplore]];
+    NSMutableArray <YTSettingsSectionItem *> *sectionItems = [NSMutableArray arrayWithArray:@[autoFull, castConfirm, ytMiniPlayer, hideAutoplaySwitch, hideCC, hideHUD, hidePreviousAndNextButton, hideHoverCard, bigYTMiniPlayer, oledDarkMode, oledKeyBoard, reExplore]];
     [delegate setSectionItems:sectionItems forCategory:uYouPlusSection title:@"uYouPlus" titleDescription:nil headerHidden:NO];
 }
 

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

@@ -0,0 +1,43 @@
+// Settings
+
+"HIDE_PREVIOUS_AND_NEXT_BUTTON" = "Κρύψτε το προηγούμενο και το επόμενο κουμπί";
+"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "Κρύψτε το προηγούμενο και το επόμενο κουμπί κατά την αναπαραγωγή βίντεο.";
+
+"YT_MINIPLAYER" = "Ενεργοποιήστε το miniplayer για όλα τα βίντεο του YouTube";
+"YT_MINIPLAYER_DESC" = "Τα παιδικά βίντεο για παράδειγμα.";
+
+"CAST_CONFIRM" = "Επιβεβαιωτικό μήνυμα πριν γίνει Cast(YTCastConfirm)";
+"CAST_CONFIRM_DESC" = "Να φανεί ένα επιβεβαιωτικό μήνυμα πριν γίνει cast για να αποτρεπτεί η καταλάθως σύνδεση στην τηλεόραση.";
+
+"HIDE_HOVER_CARD" = "Κρύψτε τις τελικές καρτέλες (YTNoHoverCards)";
+"HIDE_HOVER_CARD_DESC" = "Κρύψτε τις τελικές καρτέλες από τους δημιουργούς (thumbnails) στο τέλος των βίντεο.";
+
+"NEW_MINIPLAYER_STYLE" = "Καινούργιο miniplayer θέμα στην μπάρα (BigYTMiniPlayer)";
+"NEW_MINIPLAYER_STYLE_DESC" = "Απαιτείται επανεκκίνηση της εφαρμογής.";
+
+"YT_RE_EXPLORE" = "Αντικατάσταση της καρτέλας Shorts με την καρτέλα Explore (YTReExplore)";
+"YT_RE_EXPLORE_DESC" = "Απαιτείται επανεκκίνηση της εφαρμογής.";
+
+"HIDE_SUBTITLES_BUTTON" = "Κρύψτε το κουμπί των Υπότιτλων";
+"HIDE_SUBTITLES_BUTTON_DESC" = "Κρύψτε το κουμπί των Υπότιτλων κατά την αναπαραγωγή βίντεο.";
+
+"HIDE_AUTOPLAY_SWITCH" = "Κρύψτε τον διακόπτη της αυτόματης αναπαραγωγής";
+"HIDE_AUTOPLAY_SWITCH_DESC" = "Κρύψτε τον διακόπτη της αυτόματης αναπαραγωγής κατά την αναπαραγωγή βίντεο";
+
+"AUTO_FULLSCREEN" = "Αυτόματη αναπαραγωγή σε πλήρη οθόνη (YTAutoFullScreen)";
+"AUTO_FULLSCREEN_DESC" = "Αυτόματη αναπαραγωγή των βίντεο σε πλήρη οθόνη.";
+
+"HIDE_HUD_MESSAGES" = "Κρύψτε τα μηνύματα του HUD";
+"HIDE_HUD_MESSAGES_DESC" = "Παράδειγμα: Οι Υπότιτλοι απενεργοποιήθηκαν/ενεργοποιήθηκαν...";
+
+"OLED_DARKMODE" = "OLED Μαύρο θέμα (Experimental)";
+"OLED_DARKMODE_DESC" = "Μπορεί να μην δουλέψει σε κάποιες περιπτώσεις. Απαιτείται επανεκκίνηση της εφαρμογής αφού το ενεργοποιήσετε/απενεργοποιήσετε.";
+
+"OLED_KEYBOARD" = "OLED πληκτρολόγιο (Experimental)";
+"OLED_KEYBOARD_DESC" = "Μπορεί να μην δουλέψει σε κάποιες περιπτώσεις. Απαιτείται επανεκκίνηση της εφαρμογής.";
+
+// YTCastConfirm
+"CASTING" = "Μετάδοση";
+"MSG_ARE_YOU_SURE" = "Είστε σίγουροι ότι θέλενε να ξεκινήσετε την μετάδοση;";
+"MSG_YES" = "Ναι";
+"MSG_CANCEL" = "Ακύρωση";

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

@@ -0,0 +1,43 @@
+// Settings
+
+"HIDE_PREVIOUS_AND_NEXT_BUTTON" = "Hide Previous and Next button";
+"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "Hide Previous and Next button in video controls overlay.";
+
+"YT_MINIPLAYER" = "Enable the Miniplayer for all YouTube videos";
+"YT_MINIPLAYER_DESC" = "Kid videos for example.";
+
+"CAST_CONFIRM" = "Confirm alert before casting (YTCastConfirm)";
+"CAST_CONFIRM_DESC" = "Show a confirm alert before casting to prevent accidentally hijacking TV.";
+
+"HIDE_HOVER_CARD" = "Hide End screens hover cards (YTNoHoverCards)";
+"HIDE_HOVER_CARD_DESC" = "Hide creator End screens (thumbnails) at the end of videos.";
+
+"NEW_MINIPLAYER_STYLE" = "New miniplayer bar style (BigYTMiniPlayer)";
+"NEW_MINIPLAYER_STYLE_DESC" = "App restart is required.";
+
+"YT_RE_EXPLORE" = "Replace Shorts tab with Explore tab (YTReExplore)";
+"YT_RE_EXPLORE_DESC" = "App restart is required.";
+
+"HIDE_SUBTITLES_BUTTON" = "Hide Subtitles button";
+"HIDE_SUBTITLES_BUTTON_DESC" = "Hide the Subtitles button in video controls overlay.";
+
+"HIDE_AUTOPLAY_SWITCH" = "Hide Autoplay switch";
+"HIDE_AUTOPLAY_SWITCH_DESC" = "Hide the Autoplay switch in video controls overlay.";
+
+"AUTO_FULLSCREEN" = "Auto Full Screen (YTAutoFullScreen)";
+"AUTO_FULLSCREEN_DESC" = "Autoplay videos at full screen.";
+
+"HIDE_HUD_MESSAGES" = "Hide HUD Messages";
+"HIDE_HUD_MESSAGES_DESC" = "Example: CC is turned on/off, Video loop is on,...";
+
+"OLED_DARKMODE" = "OLED Dark mode (Experimental)";
+"OLED_DARKMODE_DESC" = "Might not working correctly in some cases. App restart is required after you enable/disable this option.";
+
+"OLED_KEYBOARD" = "OLED Keyboard (Experimental)";
+"OLED_KEYBOARD_DESC" = "Might not working correctly in some cases. App restart is required.";
+
+// YTCastConfirm
+"CASTING" = "Castings";
+"MSG_ARE_YOU_SURE" = "Are you sure you want to start casting?";
+"MSG_YES" = "Yes";
+"MSG_CANCEL" = "Cancel";

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

@@ -0,0 +1,43 @@
+// Settings
+
+"HIDE_PREVIOUS_AND_NEXT_BUTTON" = "Masquer les boutons Précédent et Suivant";
+"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "Masquer les boutons Précédent et Suivant dans la superposition des contrôles vidéo";
+
+"YT_MINIPLAYER" = "Activer le mini-lecteur pour toutes les vidéos YouTube";
+"YT_MINIPLAYER_DESC" = "Vidéos pour enfants par exemple";
+
+"CAST_CONFIRM" = "Confirmer l'alerte avant le casting (YTCastConfirm)";
+"CAST_CONFIRM_DESC" = "Afficher une alerte de confirmation avant le casting pour éviter de déclancher accidentellement la télévision";
+
+"HIDE_HOVER_CARD" = "Masquer les cartes de survol des écrans de fin (YTNoHoverCards)";
+"HIDE_HOVER_CARD_DESC" = "Masquer les écrans de fin (vignettes) des créateurs à la fin des vidéos";
+
+"NEW_MINIPLAYER_STYLE" = "Nouveau style de barre de mini-lecteur (BigYTMiniPlayer)";
+"NEW_MINIPLAYER_STYLE_DESC" = "Un redémarrage de l'application est nécessaire";
+
+"YT_RE_EXPLORE" = "Remplacer l'onglet Shorts par l'onglet Explorer (YTReExplore)";
+"YT_RE_EXPLORE_DESC" = "Un redémarrage de l'application est nécessaire";
+
+"HIDE_SUBTITLES_BUTTON" = "Bouton de masquage des sous-titres";
+"HIDE_SUBTITLES_BUTTON_DESC" = "Masquer le bouton des sous-titres dans la superposition des contrôles vidéo";
+
+"HIDE_AUTOPLAY_SWITCH" = "Masquer l'interrupteur de lecture automatique";
+"HIDE_AUTOPLAY_SWITCH_DESC" = "Masquer le bouton de lecture automatique dans la superposition des contrôles vidéo";
+
+"AUTO_FULLSCREEN" = "Plein écran automatique (YTAutoFullScreen)";
+"AUTO_FULLSCREEN_DESC" = "Lecture automatique des vidéos en plein écran";
+
+"HIDE_HUD_MESSAGES" = "Masquer les messages de l'ATH";
+"HIDE_HUD_MESSAGES_DESC" = "Exemple : Les sous-titres sont activés/désactivés, la boucle vidéo est activée,...";
+
+"OLED_DARKMODE" = "Mode sombre OLED (Expérimental)";
+"OLED_DARKMODE_DESC" = "Peut ne pas fonctionner correctement dans certains cas. Un redémarrage de l'application est nécessaire après avoir activé/désactivé cette option.";
+
+"OLED_KEYBOARD" = "Clavier OLED (Expérimental)";
+"OLED_KEYBOARD_DESC" = "Peut ne pas fonctionner correctement dans certains cas. Un redémarrage de l'application est nécessaire.";
+
+// YTCastConfirm
+"CASTING" = "Castings";
+"MSG_ARE_YOU_SURE" = "Êtes-vous sûr de vouloir commencer le casting ?";
+"MSG_YES" = "Oui";
+"MSG_CANCEL" = "Annuler";

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

@@ -0,0 +1,43 @@
+// Settings
+
+"HIDE_PREVIOUS_AND_NEXT_BUTTON" = "הסתר את הקודם והבא";
+"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "הסתר את כפתורי הקודם והבא בתצוגת השליטה בסרטון.";
+
+"YT_MINIPLAYER" = "אפשר את הנגן הקטן עבור כל הסרטונים ב-YouTube";
+"YT_MINIPLAYER_DESC" = "סרטוני ילדים לדוגמה.";
+
+"CAST_CONFIRM" = "התראת אישור לפני שידור לטלוויזיה (YTCastConfirm)";
+"CAST_CONFIRM_DESC" = "הצג התראת אישור לפני שידור לטלוויזיה כדי למנוע לחיצה בטעות.";
+
+"HIDE_HOVER_CARD" = "הסתר כרטיסיות סיום סרטון (YTNoHoverCards)";
+"HIDE_HOVER_CARD_DESC" = "הסתר את מסכי הסיום של סרטונים המציגים את הערוץ וסרטונים נוספים.";
+
+"NEW_MINIPLAYER_STYLE" = "עיצוב נגן קטן חדש (BigYTMiniPlayer)";
+"NEW_MINIPLAYER_STYLE_DESC" = "נדרש לפתוח מחדש את היישום.";
+
+"YT_RE_EXPLORE" = "החלף את לשונית ה-Shorts בלשונית Explore (YTReExplore)";
+"YT_RE_EXPLORE_DESC" = "נדרש לפתוח מחדש את היישום.";
+
+"HIDE_SUBTITLES_BUTTON" = "הסתר את כפתור הכתוביות";
+"HIDE_SUBTITLES_BUTTON_DESC" = "הסתר את כפתור הכתוביות בתצוגת השליטה בסרטון.";
+
+"HIDE_AUTOPLAY_SWITCH" = "הסתר את כפתור ההפעלה האוטומטית";
+"HIDE_AUTOPLAY_SWITCH_DESC" = "הסתר את כפתור ההפעלה האוטומטית בתצוגת השליטה בסרטון.";
+
+"AUTO_FULLSCREEN" = "מסך מלא אוטומטי (YTAutoFullScreen)";
+"AUTO_FULLSCREEN_DESC" = "נגן סרטונים במסך מלא אוטומטית.";
+
+"HIDE_HUD_MESSAGES" = "הסתר הודעות קופצות";
+"HIDE_HUD_MESSAGES_DESC" = "לדוגמה: כתוביות מופעלות/מושבתות, הופעל סרטון בלופ,...";
+
+"OLED_DARKMODE" = "תצוגה כהה OLED (נסיוני)";
+"OLED_DARKMODE_DESC" = "עלול לא לעבוד נכון בחלק מהמקרים, נדרש לפתוח מחדש את היישום.";
+
+"OLED_KEYBOARD" = "מקלדת כהה OLED (נסיוני)";
+"OLED_DARKMODE_DESC" = "עלול לא לעבוד נכון בחלק מהמקרים, נדרש לפתוח מחדש את היישום.";
+
+// YTCastConfirm
+"CASTING" = "משדר";
+"MSG_ARE_YOU_SURE" = "האם להתחיל לשדר?";
+"MSG_YES" = "כן";
+"MSG_CANCEL" = "ביטול";

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

@@ -0,0 +1,43 @@
+/* uYouPlusSettings */
+
+"HIDE_PREVIOUS_AND_NEXT_BUTTON" = "Скрыть «Пред.» и «След.»";
+"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "Убирает кнопки переключения видео «Следующий» и «Предыдущий» с плеера.";
+
+"YT_MINIPLAYER" = "Мини-плеер для всех видео";
+"YT_MINIPLAYER_DESC" = "Принудительно активирует мини-плеер для всех видео, включая видео, предназначенное для детей.";
+
+"CAST_CONFIRM" = "Подтверждение «Трансляции» (YTCastConfirm)";
+"CAST_CONFIRM_DESC" = "Спрашивать подтверждение перед началом трансляции во избежание случайных подключений к ТВ.";
+
+"HIDE_HOVER_CARD" = "Скрыть рекомендации (YTNoHoverCards)";
+"HIDE_HOVER_CARD_DESC" = "Скрывает эскизы, отображаемые по окончанию видеоролика.";
+
+"NEW_MINIPLAYER_STYLE" = "Мини-плеер в стиле iPad (BigYTMiniPlayer)";
+"NEW_MINIPLAYER_STYLE_DESC" = "Потребуется перезагрузка.";
+
+"YT_RE_EXPLORE" = "Вкладка «Навигация» вместо «Shorts»";
+"YT_RE_EXPLORE_DESC" = "Потребуется перезагрузка.";
+
+"HIDE_SUBTITLES_BUTTON" = "Скрыть «Субтитры»";
+"HIDE_SUBTITLES_BUTTON_DESC" = "Скрывает кнопку субтитров с оверлея плеера.";
+
+"HIDE_AUTOPLAY_SWITCH" = "Скрыть «Автовоспроизведение»";
+"HIDE_AUTOPLAY_SWITCH_DESC" = "Убирает тумблер «Автовоспроизведение» с оверлея плеера.";
+
+"AUTO_FULLSCREEN" = "Полноэкранный режим (YTAutoFullScreen)";
+"AUTO_FULLSCREEN_DESC" = "Автоматически открывает ролики в полноэкранном режиме.";
+
+"HIDE_HUD_MESSAGES" = "Скрыть сообщения плеера";
+"HIDE_HUD_MESSAGES_DESC" = "Скрывает надписи YouTube, появляющиеся поверх видео.";
+
+"OLED_DARKMODE" = "Темный режим для OLED (Бета)";
+"OLED_DARKMODE_DESC" = "Понадобится перезагрузка при смене цветовой темы приложения. Если OLED-тема не включится, попробуйте переключиться не светлый режим и обратно, а затем перезагрузить приложение.";
+
+"OLED_KEYBOARD" = "OLED-клавиатура (Бета)";
+"OLED_KEYBOARD_DESC" = "Возможно, на некоторых устройствах будет работать криво. Потребуется перезагрузка.";
+
+/* YTCastConfirm */
+"CASTING" = "Трансляция";
+"MSG_ARE_YOU_SURE" = "Начать трансляцию экрана?";
+"MSG_YES" = "Да";
+"MSG_CANCEL" = "Отмена";

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

@@ -0,0 +1,53 @@
+// 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!
+ //
+ // Settings
+
+ "HIDE_PREVIOUS_AND_NEXT_BUTTON" = "Hide Previous and Next button";
+ "HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "Hide Previous and Next button in video controls overlay.";
+
+ "YT_MINIPLAYER" = "Enable the Miniplayer for all YouTube videos";
+ "YT_MINIPLAYER_DESC" = "Kid videos for example.";
+
+ "CAST_CONFIRM" = "Confirm alert before casting (YTCastConfirm)";
+ "CAST_CONFIRM_DESC" = "Show a confirm alert before casting to prevent accidentally hijacking TV.";
+
+ "HIDE_HOVER_CARD" = "Hide End screens hover cards (YTNoHoverCards)";
+ "HIDE_HOVER_CARD_DESC" = "Hide creator End screens (thumbnails) at the end of videos.";
+
+ "NEW_MINIPLAYER_STYLE" = "New miniplayer bar style (BigYTMiniPlayer)";
+ "NEW_MINIPLAYER_STYLE_DESC" = "App restart is required.";
+
+ "YT_RE_EXPLORE" = "Replace Shorts tab with Explore tab (YTReExplore)";
+ "YT_RE_EXPLORE_DESC" = "App restart is required.";
+
+ "HIDE_SUBTITLES_BUTTON" = "Hide Subtitles button";
+ "HIDE_SUBTITLES_BUTTON_DESC" = "Hide the Subtitles button in video controls overlay.";
+
+ "HIDE_AUTOPLAY_SWITCH" = "Hide Autoplay switch";
+ "HIDE_AUTOPLAY_SWITCH_DESC" = "Hide the Autoplay switch in video controls overlay.";
+
+ "AUTO_FULLSCREEN" = "Auto Full Screen (YTAutoFullScreen)";
+ "AUTO_FULLSCREEN_DESC" = "Autoplay videos at full screen.";
+
+ "HIDE_HUD_MESSAGES" = "Hide HUD Messages";
+ "HIDE_HUD_MESSAGES_DESC" = "Example: CC is turned on/off, Video loop is on,...";
+
+ "OLED_DARKMODE" = "OLED Dark mode (Experimental)";
+ "OLED_DARKMODE_DESC" = "Might not working correctly in some cases. App restart is required after you enable/disable this option.";
+
+ "OLED_KEYBOARD" = "OLED Keyboard (Experimental)";
+ "OLED_KEYBOARD_DESC" = "Might not working correctly in some cases. App restart is required.";
+
+ // YTCastConfirm
+ "CASTING" = "Castings";
+ "MSG_ARE_YOU_SURE" = "Are you sure you want to start casting?";
+ "MSG_YES" = "Yes";
+ "MSG_CANCEL" = "Cancel";

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

@@ -0,0 +1,43 @@
+// Settings
+
+"HIDE_PREVIOUS_AND_NEXT_BUTTON" = "Ẩn nút Next và nút Previous";
+"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "Ẩn nút Next và nút Previous trong trình phát video.";
+
+"YT_MINIPLAYER" = "Cho phép trình phát thu nhỏ chạy với mọi video";
+"YT_MINIPLAYER_DESC" = "Ví dụ: Video cho trẻ em.";
+
+"CAST_CONFIRM" = "Xác nhận trước khi cast video (YTCastConfirm)";
+"CAST_CONFIRM_DESC" = "Hiện hộp thoại xác nhận trước khi cast video sang TV để ngăn việc vô tình làm gián đoạn TV.";
+
+"HIDE_HOVER_CARD" = "Ẩn video dạng thumbnails (YTNoHoverCards)";
+"HIDE_HOVER_CARD_DESC" = "Ẩn các video dạng thu nhỏ (thumbnails) xuất hiện ở gần cuối video.";
+
+"NEW_MINIPLAYER_STYLE" = "Giao diện trình phát thu nhỏ kiểu mới (BigYTMiniPlayer)";
+"NEW_MINIPLAYER_STYLE_DESC" = "Cần khởi động lại ứng dụng.";
+
+"YT_RE_EXPLORE" = "Thay thế tab Shorts bằng tab Khám phá (YTReExplore)";
+"YT_RE_EXPLORE_DESC" = "Cần khởi động lại ứng dụng.";
+
+"HIDE_SUBTITLES_BUTTON" = "Ẩn nút bật Phụ đề";
+"HIDE_SUBTITLES_BUTTON_DESC" = "Ẩn nút bật phụ đề trong trình phát video.";
+
+"HIDE_AUTOPLAY_SWITCH" = "Ẩn công tắc Tự động phát";
+"HIDE_AUTOPLAY_SWITCH_DESC" = "Ẩn công tắc Tự động phát trong trình phát video.";
+
+"AUTO_FULLSCREEN" = "Tự động toàn màn hình (YTAutoFullScreen)";
+"AUTO_FULLSCREEN_DESC" = "Tự động phát video ở chế độ toàn màn hình.";
+
+"HIDE_HUD_MESSAGES" = "Ẩn tin nhắn HUD";
+"HIDE_HUD_MESSAGES_DESC" = "Ví dụ: Đã bật/tắt phụ đề, Tính năng phát video lặp lại đang bật,...";
+
+"OLED_DARKMODE" = "Chế độ tối OLED (Thử nghiệm)";
+"OLED_DARKMODE_DESC" = "Cần khởi động lại ứng dụng nếu bạn bật/tắt tính năng này, nhưng không cần khởi động lại ứng dụng nếu chuyển giữa chế độ Sáng và chế độ Tối.";
+
+"OLED_KEYBOARD" = "Bàn phím OLED (Thử nghiệm)";
+"OLED_KEYBOARD_DESC" = "Tính năng này có thể không hoạt động tốt trong một vài trường hợp. Cần khởi động lại ứng dụng.";
+
+// YTCastConfirm
+"CASTING" = "Truyền video";
+"MSG_ARE_YOU_SURE" = "Bạn có muốn bắt đầu truyền video không?";
+"MSG_YES" = "Có";
+"MSG_CANCEL" = "Không";

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

@@ -0,0 +1,43 @@
+// Settings
+
+"HIDE_PREVIOUS_AND_NEXT_BUTTON" = "隱藏上一個和下一個按鈕";
+"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC" = "在影片控制層中隱藏上一個和下一個按鈕";
+
+"YT_MINIPLAYER" = "為所有YouTube影片啟用迷你播放器";
+"YT_MINIPLAYER_DESC" = "例如兒童影片";
+
+"CAST_CONFIRM" = "投放前確認 (YTCastConfirm)";
+"CAST_CONFIRM_DESC" = "在投放前顯示確認訊息，以防止意外攔劫電視。";
+
+"HIDE_HOVER_CARD" = "隱藏片尾畫面懸浮卡片 (YTNoHoverCards)";
+"HIDE_HOVER_CARD_DESC" = "在影片結尾隱藏創作者結束畫面（縮略圖)。";
+
+"NEW_MINIPLAYER_STYLE" = "新的迷你播放器控制列風格 (BigYTMiniPlayer)";
+"NEW_MINIPLAYER_STYLE_DESC" = "需要重新啟動應用程式。";
+
+"YT_RE_EXPLORE" = "用探索選項卡替換Shorts選項卡 (YTReExplore)";
+"YT_RE_EXPLORE_DESC" = "需要重新啟動應用程式。";
+
+"HIDE_SUBTITLES_BUTTON" = "隱藏字幕按鈕";
+"HIDE_SUBTITLES_BUTTON_DESC" = "隱藏影片控制層中的字幕按鈕。";
+
+"HIDE_AUTOPLAY_SWITCH" = "隱藏自動播放開關";
+"HIDE_AUTOPLAY_SWITCH_DESC" = "在影片控制層中隱藏自動播放開關。";
+
+"AUTO_FULLSCREEN" = "自動全螢幕 (YTAutoFullScreen)";
+"AUTO_FULLSCREEN_DESC" = "自動全螢幕播放影片。";
+
+"HIDE_HUD_MESSAGES" = "隱藏 HUD 訊息";
+"HIDE_HUD_MESSAGES_DESC" = "舉例來說：CC字幕 開啟/關閉，影片循環開啟，...";
+
+"OLED_DARKMODE" = "OLED 深色模式（實驗性）";
+"OLED_DARKMODE_DESC" = "在某些情況下可能無法正常工作。啟用/禁用此選項後，需要重新啟動應用程式。";
+
+"OLED_KEYBOARD" = "OLED 鍵盤（實驗性）";
+"OLED_KEYBOARD_DESC" = "在某些情況下可能無法正常工作。需要重新啟動應用程式。";
+
+// YTCastConfirm
+"CASTING" = "投放中";
+"MSG_ARE_YOU_SURE" = "確定要開始投放嗎？";
+"MSG_YES" = "是";
+"MSG_CANCEL" = "取消";

uYouPlus.xm

@@ -1,6 +1,7 @@
 #import <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
 #import <objc/runtime.h>
+#import <dlfcn.h>
 #import "Header.h"
 #import "Tweaks/YouTubeHeader/YTVideoQualitySwitchOriginalController.h"
 #import "Tweaks/YouTubeHeader/YTPlayerViewController.h"
@@ -11,7 +12,21 @@
 #import "Tweaks/YouTubeHeader/YTIPivotBarRenderer.h"
 #import "Tweaks/YouTubeHeader/YTIBrowseRequest.h"
 #import "Tweaks/YouTubeHeader/YTCommonColorPalette.h"
+#import "Tweaks/YouTubeHeader/ASCollectionView.h"
 
+// Tweak's bundle for Localizations support - @PoomSmart - https://github.com/PoomSmart/YouPiP/commit/aea2473f64c75d73cab713e1e2d5d0a77675024f
+NSBundle *uYouPlusBundle() {
+    static NSBundle *bundle = nil;
+    static dispatch_once_t onceToken;
+ 	dispatch_once(&onceToken, ^{
+        NSString *tweakBundlePath = [[NSBundle mainBundle] pathForResource:@"uYouPlus" ofType:@"bundle"];
+        bundle = [NSBundle bundleWithPath:tweakBundlePath];
+    });
+    return bundle;
+}
+NSBundle *tweakBundle = uYouPlusBundle();
+
+// 
 BOOL hideHUD() {
     return [[NSUserDefaults standardUserDefaults] boolForKey:@"hideHUD_enabled"];
 }
@@ -25,12 +40,12 @@ BOOL isDarkMode() {
     return ([[NSUserDefaults standardUserDefaults] integerForKey:@"page_style"] == 1);
 }
 BOOL autoFullScreen() {
-    return [[NSUserDefaults standardUserDefaults] boolForKey:@"autofull_enabled"];
+    return [[NSUserDefaults standardUserDefaults] boolForKey:@"autoFull_enabled"];
 }
-BOOL noHoverCard() {
-    return [[NSUserDefaults standardUserDefaults] boolForKey:@"hover_cards_enabled"];
+BOOL hideHoverCard() {
+    return [[NSUserDefaults standardUserDefaults] boolForKey:@"hideHoverCards_enabled"];
 }
-BOOL ReExplore() {
+BOOL reExplore() {
     return [[NSUserDefaults standardUserDefaults] boolForKey:@"reExplore_enabled"];
 }
 BOOL bigYTMiniPlayer() {
@@ -52,7 +67,7 @@ BOOL ytMiniPlayer() {
     return [[NSUserDefaults standardUserDefaults] boolForKey:@"ytMiniPlayer_enabled"];
 }
 
-// Tweaks
+# pragma mark - Tweaks
 // YTMiniPlayerEnabler: https://github.com/level3tjg/YTMiniplayerEnabler/
 %hook YTWatchMiniBarViewController
 - (void)updateMiniBarPlayerStateFromRenderer {
@@ -61,23 +76,25 @@ BOOL ytMiniPlayer() {
 }
 %end
 
-// Hide CC / Autoplay switch
+// Hide CC / Autoplay switch / Next & Previous button
 %hook YTMainAppControlsOverlayView
-- (void)setClosedCaptionsOrSubtitlesButtonAvailable:(BOOL)arg1 { // hide CC?!
+- (void)setClosedCaptionsOrSubtitlesButtonAvailable:(BOOL)arg1 { // hide CC button
     if (hideCC()) { return %orig(NO); }   
     else { return %orig; }
 }
-- (void)setAutoplaySwitchButtonRenderer:(id)arg1 {
+- (void)setAutoplaySwitchButtonRenderer:(id)arg1 { // hide Autoplay
     if (hideAutoplaySwitch()) {}
     else { return %orig; }
 }
-- (void)layoutSubviews {
-    if (hidePreviousAndNextButton()) {
+- (void)layoutSubviews { // hide Next & Previous button
+    %orig;
+    if (hidePreviousAndNextButton()) { 
 	    MSHookIvar<YTMainAppControlsOverlayView *>(self, "_nextButton").hidden = YES;
-    	MSHookIvar<YTMainAppControlsOverlayView *>(self, "_previousButton").hidden = YES;        
-        %orig;
+    	MSHookIvar<YTMainAppControlsOverlayView *>(self, "_previousButton").hidden = YES;
+        // YouTube love beta testing :/
+    	MSHookIvar<YTTransportControlsButtonView *>(self, "_nextButtonView").hidden = YES;
+    	MSHookIvar<YTTransportControlsButtonView *>(self, "_previousButtonView").hidden = YES;
     }
-        return %orig;
 }
 %end
 
@@ -105,7 +122,7 @@ BOOL ytMiniPlayer() {
 // YTNoHoverCards: https://github.com/level3tjg/YTNoHoverCards
 %hook YTCreatorEndscreenView
 - (void)setHidden:(BOOL)hidden {
-    if (noHoverCard())
+    if (hideHoverCard())
         hidden = YES;
     %orig;
 }
@@ -115,15 +132,15 @@ BOOL ytMiniPlayer() {
 %hook MDXPlaybackRouteButtonController
 - (void)didPressButton:(id)arg1 {
     if (castConfirm()) {
-        UIAlertController* alertController = [%c(UIAlertController) alertControllerWithTitle:@"Casting"
-                                message:@"Are you sure you want to start casting?"
+        UIAlertController* alertController = [%c(UIAlertController) alertControllerWithTitle:LOC(@"CASTING")
+                                message:LOC(@"MSG_ARE_YOU_SURE")
                                 preferredStyle:UIAlertControllerStyleAlert];
-        UIAlertAction* defaultAction = [%c(UIAlertAction) actionWithTitle:@"Yes" style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+        UIAlertAction* defaultAction = [%c(UIAlertAction) actionWithTitle:LOC(@"MSG_YES") style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
             %orig;
         }];
 
         UIAlertAction* noButton = [%c(UIAlertAction)
-                                actionWithTitle:@"Cancel"
+                                actionWithTitle:LOC(@"MSG_CANCEL")
                                 style:UIAlertActionStyleDefault
                                 handler: ^(UIAlertAction * action) {
             return;
@@ -144,7 +161,6 @@ BOOL ytMiniPlayer() {
         }
         [rootViewController presentViewController:alertController animated:YES completion:nil];
 	} else { return %orig; }
-        
 }
 %end
 
@@ -201,23 +217,85 @@ BOOL ytMiniPlayer() {
 - (void)showSurveyWithRenderer:(id)arg1 surveyParentResponder:(id)arg2 {}
 %end
 
-// Hide the download playlist button of uYou cuz it's broken
-%hook YTPlaylistHeaderViewController
-- (void)viewDidLoad {
-    %orig;
-    self.downloadsButton.hidden = YES;
-}
+// Enable Shorts scroll bar - level3tjg - https://reddit.com/r/jailbreak/comments/v29yvk/_/iasl1l0/
+%hook YTReelPlayerViewControllerSub
+- (BOOL)shouldEnablePlayerBar { return YES; }
 %end
 
+// Hide the download playlist button of uYou cuz it's broken ?!
+// Why aren't you working?? :/
+// %hook YTPlaylistHeaderViewController
+// - (void)viewDidLoad {
+//     %orig;
+//     self.downloadsButton.hidden = YES;
+// }
+// %end
+
 // Workaround for issue #54
 %hook YTMainAppVideoPlayerOverlayViewController
 - (void)updateRelatedVideos {
     if ([[NSUserDefaults standardUserDefaults] boolForKey:@"relatedVideosAtTheEndOfYTVideos"] == NO) {}
     else { return %orig; }
 }
+%end 
+
+# pragma mark - IAmYouTube - https://github.com/PoomSmart/IAmYouTube/
+%hook YTVersionUtils
++ (NSString *)appName { return YT_NAME; }
++ (NSString *)appID { return YT_BUNDLE_ID; }
 %end
 
-// OLED dark mode by BandarHL
+%hook GCKBUtils
++ (NSString *)appIdentifier { return YT_BUNDLE_ID; }
+%end
+
+%hook GPCDeviceInfo
++ (NSString *)bundleId { return YT_BUNDLE_ID; }
+%end
+
+%hook OGLBundle
++ (NSString *)shortAppName { return YT_NAME; }
+%end
+
+%hook GVROverlayView
++ (NSString *)appName { return YT_NAME; }
+%end
+
+%hook OGLPhenotypeFlagServiceImpl
+- (NSString *)bundleId { return YT_BUNDLE_ID; }
+%end
+
+%hook SSOConfiguration
+- (id)initWithClientID:(id)clientID supportedAccountServices:(id)supportedAccountServices {
+    self = %orig;
+    [self setValue:YT_NAME forKey:@"_shortAppName"];
+    [self setValue:YT_BUNDLE_ID forKey:@"_applicationIdentifier"];
+    return self;
+}
+%end
+
+%hook NSBundle
+- (NSString *)bundleIdentifier {
+    NSArray *address = [NSThread callStackReturnAddresses];
+    Dl_info info = {0};
+    if (dladdr((void *)[address[2] longLongValue], &info) == 0)
+        return %orig;
+    NSString *path = [NSString stringWithUTF8String:info.dli_fname];
+    if ([path hasPrefix:NSBundle.mainBundle.bundlePath])
+        return YT_BUNDLE_ID;
+    return %orig;
+}
+- (id)objectForInfoDictionaryKey:(NSString *)key {
+    if ([key isEqualToString:@"CFBundleIdentifier"])
+        return YT_BUNDLE_ID;
+    if ([key isEqualToString:@"CFBundleDisplayName"] || [key isEqualToString:@"CFBundleName"])
+        return YT_NAME;
+    return %orig;
+}
+%end
+
+# pragma mark - OLED dark mode by BandarHL
+
 UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
 
 %group gOLED
@@ -277,50 +355,23 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
 %hook ASScrollView 
 - (void)didMoveToWindow {
     if (isDarkMode()) {
-        self.backgroundColor = oledColor;
         %orig;
+        self.backgroundColor = oledColor;
     }
 }
 %end
 
-// uYou's page
-%hook DownloadedVC
-- (UIColor *)ytBackgroundColor {
-    if (isDarkMode()) {
-        return oledColor;
+// Your videos
+%hook ASCollectionView
+- (void)didMoveToWindow {
+    if (isDarkMode() && [self.nextResponder isKindOfClass:%c(_ASDisplayView)]) { 
+        %orig;
+        self.superview.backgroundColor = [UIColor clearColor];
     }
-        return %orig;
 }
 %end
 
-%hook DownloadsPagerVC
-- (UIColor *)ytBackgroundColor {
-    if (isDarkMode()) {
-        return oledColor;
-    }
-        return %orig;
-}
-%end
-
-%hook DownloadingVC
-- (UIColor *)ytBackgroundColor {
-    if (isDarkMode()) {
-        return oledColor;
-    }
-        return %orig;
-}
-%end
-
-%hook PlayerVC
-- (UIColor *)ytBackgroundColor {
-    if (isDarkMode()) {
-        return oledColor;
-    }
-        return %orig;
-}
-%end
-
-// SponsorBlock settings
+// iSponsorBlock
 %hook SponsorBlockSettingsController
 - (void)viewDidLoad {
     if (self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) {
@@ -330,16 +381,16 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
 }
 %end
 
-// uYou & YT player, and downloading view controller
-%hook _LNPopupBarContentView
-- (void)setBackgroundColor:(UIColor *)color { 
-    if (isDarkMode()) {
-        return %orig([UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:0.9]);
-    }
-        return %orig;
+%hook SponsorBlockViewController
+- (void)viewDidLoad {
+    if (self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) {
+        %orig;
+        self.view.backgroundColor = oledColor;
+    } else { return %orig; }
 }
 %end
 
+// YT Miniplayer
 %hook YTWatchMiniBarView 
 - (void)setBackgroundColor:(UIColor *)color { 
     if (isDarkMode()) {
@@ -353,26 +404,36 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
 %hook YTSearchBarView 
 - (void)setBackgroundColor:(UIColor *)color { 
     if (isDarkMode()) {
-        return %orig (oledColor);
+        return %orig(oledColor);
     }
         return %orig;
 }
 %end
 
+// History Search view
 %hook YTSearchBoxView 
 - (void)setBackgroundColor:(UIColor *)color { 
     if (isDarkMode()) {
-        return %orig (oledColor);
+        return %orig(oledColor);
     }
         return %orig;
 }
 %end
 
 // Comment view
-%hook YTCreateCommentAccessoryView // community reply comment
+%hook YTCommentView
 - (void)setBackgroundColor:(UIColor *)color { 
     if (isDarkMode()) {
-        return %orig (oledColor);
+        return %orig(oledColor);
+    }
+        return %orig;
+}
+%end
+
+%hook YTCreateCommentAccessoryView
+- (void)setBackgroundColor:(UIColor *)color { 
+    if (isDarkMode()) {
+        return %orig(oledColor);
     }
         return %orig;
 }
@@ -381,13 +442,13 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
 %hook YTCreateCommentTextView
 - (void)setBackgroundColor:(UIColor *)color { 
     if (isDarkMode()) {
-        return %orig (oledColor);
+        return %orig(oledColor);
     }
         return %orig;
 }
 - (void)setTextColor:(UIColor *)color { // fix black text in #Shorts video's comment
     if (isDarkMode()) { 
-        return %orig ([UIColor whiteColor]); 
+        return %orig([UIColor whiteColor]); 
     }
         return %orig;
 }
@@ -396,35 +457,46 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
 %hook YTFormattedStringLabel  // YT is werid...
 - (void)setBackgroundColor:(UIColor *)color {
     if (isDarkMode()) {
-        return %orig ([UIColor clearColor]);
+        return %orig([UIColor clearColor]);
     }
         return %orig;
 }
 %end
 
-%hook YCHLiveChatActionPanelView  // live chat comment
+// Live chat comment
+%hook YCHLiveChatActionPanelView 
 - (void)setBackgroundColor:(UIColor *)color {
     if (isDarkMode()) {
-        return %orig (oledColor);
+        return %orig(oledColor);
     }
         return %orig;
 }
 %end
 
-%hook YTEmojiTextView // live chat comment
+%hook YTEmojiTextView
 - (void)setBackgroundColor:(UIColor *)color {
     if (isDarkMode()) {
-        return %orig (oledColor);
+        return %orig(oledColor);
     }
         return %orig;
 }
 %end
 
-// Separation lines
-%hook YTCollectionSeparatorView
+// Nasty stuff :/
+%hook _ASDisplayView
 - (void)didMoveToWindow {
-    if (isDarkMode()) {}
-    else { return %orig; }
+    %orig;
+    if (isDarkMode()) {
+        if ([self.accessibilityIdentifier isEqualToString:@"id.elements.components.comment_composer"]) { self.backgroundColor = oledColor; } 
+        if ([self.accessibilityIdentifier isEqualToString:@"id.elements.components.video_list_entry"]) { self.backgroundColor = oledColor; } 
+        if ([self.accessibilityIdentifier isEqualToString:@"id.elements.components.filter_chip_bar"]) { self.backgroundColor = oledColor; } 
+        if ([self.accessibilityIdentifier isEqualToString:@"id.ui.comment_cell"]) { self.backgroundColor = oledColor; } 
+        if ([self.accessibilityIdentifier isEqualToString:@"eml.cvr"]) { self.backgroundColor = oledColor; } 
+        if ([self.accessibilityIdentifier isEqualToString:@"rich_header"]) { self.backgroundColor = oledColor; } 
+        if ([self.accessibilityIdentifier isEqualToString:@"id.comment.channel_guidelines_bottom_sheet_container"]) { self.backgroundColor = oledColor; } 
+        if ([self.accessibilityIdentifier isEqualToString:@"id.comment.channel_guidelines_entry_banner_container"]) { self.backgroundColor = oledColor; } 
+        if ([self.accessibilityIdentifier isEqualToString:@"id.comment.guidelines_text"]) { self.superview.backgroundColor = oledColor; }
+    }
 }
 %end
 
@@ -432,7 +504,7 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
 %hook ASWAppSwitchingSheetHeaderView
 - (void)setBackgroundColor:(UIColor *)color {
     if (isDarkMode()) {
-        return %orig (oledColor);
+        return %orig(oledColor);
     }
 }
 %end
@@ -440,7 +512,7 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
 %hook ASWAppSwitchingSheetFooterView
 - (void)setBackgroundColor:(UIColor *)color {
     if (isDarkMode()) {
-        return %orig (oledColor);
+        return %orig(oledColor);
     }
 }
 %end
@@ -448,25 +520,16 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
 %hook ASWAppSwitcherCollectionViewCell
 - (void)didMoveToWindow {
     if (isDarkMode()) { 
+        %orig;
         self.subviews[1].backgroundColor = oledColor;
-        %orig;        
+        self.superview.backgroundColor = oledColor;
     }
 }
 %end
-
-// this sucks :/
-// %hook UIView
-// - (void)setBackgroundColor:(UIColor *)color {
-//     if (isDarkMode()) {
-//         if ([self.nextResponder isKindOfClass:%c(YTHUDMessageView)]) { color = oledColor; }
-//         %orig;
-//     }
-//         return %orig;
-// }
-// %end
 %end
 
-%group gOLEDKB // OLED keyboard by @ichitaso <3 - http://gist.github.com/ichitaso/935100fd53a26f18a9060f7195a1be0e
+# pragma mark - OLED keyboard by @ichitaso <3 - http://gist.github.com/ichitaso/935100fd53a26f18a9060f7195a1be0e
+%group gOLEDKB 
 %hook UIPredictionViewController
 - (void)loadView {
     %orig;
@@ -483,15 +546,15 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
 
 %hook UIKeyboardDockView
 - (void)didMoveToWindow {
-    self.backgroundColor = oledColor;
     %orig;
+    self.backgroundColor = oledColor;
 }
 %end
 
 %hook UIKeyboardLayoutStar 
 - (void)didMoveToWindow {
-    self.backgroundColor = oledColor;
     %orig;
+    self.backgroundColor = oledColor;
 }
 %end
 
@@ -554,23 +617,49 @@ static void replaceTab(YTIGuideResponse *response) {
     if([[self _viewControllerForAncestor].parentViewController.parentViewController isKindOfClass:%c(YTWatchMiniBarViewController)]) {
         return NO;
     }
-    return %orig;
+        return %orig;
 }
 %end
 %end
 
+// iOS 16 uYou crash fix
+%group iOS16
+%hook OBPrivacyLinkButton
+%new
+- (instancetype)initWithCaption:(NSString *)caption
+                     buttonText:(NSString *)buttonText
+                          image:(UIImage *)image
+                      imageSize:(CGSize)imageSize
+                   useLargeIcon:(BOOL)useLargeIcon {
+  return [self initWithCaption:caption
+                    buttonText:buttonText
+                         image:image
+                     imageSize:imageSize
+                  useLargeIcon:useLargeIcon
+               displayLanguage:[NSLocale currentLocale].languageCode];
+}
+%end
+%end
+
+# pragma mark - ctor
 %ctor {
     %init;
+    if (![[[[NSUserDefaults standardUserDefaults] dictionaryRepresentation] allKeys] containsObject:@"relatedVideosAtTheEndOfYTVideos"]) { 
+       [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"relatedVideosAtTheEndOfYTVideos"]; 
+    }
     if (oled()) {
        %init(gOLED);
     }
     if (oledKB()) {
        %init(gOLEDKB);
     }
-    if (ReExplore()) {
+    if (reExplore()) {
        %init(gReExplore);
     }
     if (bigYTMiniPlayer() && (UIDevice.currentDevice.userInterfaceIdiom != UIUserInterfaceIdiomPad)) {
        %init(Main);
     }
-}
+    if (@available(iOS 16, *)) {
+       %init(iOS16);
+    }
+}