Merge branch 'main' of https://github.com/qnblackcat/uYouPlus into main

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,28 @@
+---
+name: Bug
+about: Create a report to help us improve
+title: "[Bug]"
+labels: bug
+assignees: ''
+
+---
+
+**Device info:**
+- iOS/iPadOS version: 
+- Device model:
+- Sideload tool (Ex: AltStore, Sideloadly...)
+- Version of uYouPlus: 
+
+**Describe the bug:**
+- 
+
+**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...)_
+
+
+**Additional context:**
+_(Add any other context about the problem here)_

.github/ISSUE_TEMPLATE/question-help.md

@@ -0,0 +1,11 @@
+---
+name: Question/Help
+about: Have questions? Need help?
+title: "[Questions]"
+labels: question
+assignees: ''
+
+---
+
+### Have you read the FAQ? Make sure you visit the FAQ page before asking any question!!!
+https://github.com/qnblackcat/uYouPlus/wiki/FAQ

.gitignore

@@ -2,3 +2,4 @@
 .DS_Store
 packages
 obj
+Resources/Frameworks

.gitmodules

@@ -0,0 +1,28 @@
+[submodule "Tweaks/iSponsorBlock"]
+	path = Tweaks/iSponsorBlock
+	url = https://github.com/qnblackcat/iSponsorBlock.git
+	branch = master
+[submodule "Tweaks/YTUHD"]
+	path = Tweaks/YTUHD
+	url = https://github.com/PoomSmart/YTUHD.git
+	branch = master
+[submodule "Tweaks/YouPiP"]
+	path = Tweaks/YouPiP
+	url = https://github.com/PoomSmart/YouPiP.git
+	branch = main
+[submodule "Tweaks/Return-YouTube-Dislikes"]
+	path = Tweaks/Return-YouTube-Dislikes
+	url = https://github.com/PoomSmart/Return-YouTube-Dislikes.git
+	branch = main
+[submodule "Tweaks/YouTubeHeader"]
+	path = Tweaks/YouTubeHeader
+	url = https://github.com/PoomSmart/YouTubeHeader.git
+	branch = main
+[submodule "Tweaks/Alderis"]
+	path = Tweaks/Alderis
+	url = https://github.com/qnblackcat/Alderis.git
+	branch = master
+[submodule "Tweaks/PSHeader"]
+	path = Tweaks/PSHeader
+	url = https://github.com/PoomSmart/PSHeader.git
+	branch = master

Makefile

@@ -0,0 +1,26 @@
+uYouPlus_INJECT_DYLIBS = Tweaks/uYou.dylib .theos/obj/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib .theos/obj/YTUHD.dylib .theos/obj/YouPiP.dylib .theos/obj/YouTubeDislikesReturn.dylib 
+
+uYouPlus_USE_FLEX = 0
+ARCHS = arm64
+MODULES = jailed
+FINALPACKAGE = 1
+CODESIGN_IPA = 0
+
+TWEAK_NAME = uYouPlus
+DISPLAY_NAME = YouTube
+BUNDLE_ID = com.google.ios.youtube
+ 
+uYouPlus_FILES = uYouPlus.x
+uYouPlus_IPA = /path/to/your/decrypted/YouTube.ipa
+### Important: edit the path to your decrypted YouTube IPA!!! 
+
+include $(THEOS)/makefiles/common.mk
+include $(THEOS_MAKE_PATH)/tweak.mk
+SUBPROJECTS += Tweaks/iSponsorBlock Tweaks/Alderis Tweaks/YTUHD Tweaks/YouPiP Tweaks/Return-YouTube-Dislikes
+include $(THEOS_MAKE_PATH)/aggregate.mk
+
+all::
+	rm -rf Resources/Frameworks && mkdir -p Resources/Frameworks/Alderis.framework && find .theos/obj/install/Library/Frameworks/Alderis.framework -maxdepth 1 -type f -exec cp {} Resources/Frameworks/Alderis.framework/ \;
+	install_name_tool -change /usr/lib/libcolorpicker.dylib @rpath/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib
+	install_name_tool -change /Library/Frameworks/Alderis.framework/Alderis @rpath/Alderis.framework/Alderis .theos/obj/libcolorpicker.dylib
+	

README.md

@@ -6,18 +6,20 @@
 * [Credits](#credits)
 * [Features](#features)
 * [Known issues](#known-issues)
-* [Download (IPA)](#download-ipa)
+* [Download](#download)
+* [Support the developers!](#support-the-developers)
+* [FAQ](#faq)
 * [Building (optional)](#building-optional)
-   * [Method 1: azule (simple way)](#method-1-azule-simple-way)
-   * [Method 2: theos-jailed (complex way)](#method-2-theos-jailed-complex-way)
 
 
 # Credits
 
-- [MiRO92](https://twitter.com/miro92?s=21) for [Cercube](https://github.com/MiRO92/uYou-for-YouTube).
+- [MiRO92](https://twitter.com/miro92?s=21) for [uYou](https://github.com/MiRO92/uYou-for-YouTube).
 
 - [Galactic-Dev](https://github.com/Galactic-Dev) and [Luewii](https://github.com/Luewii) for [iSponsorBlock](https://github.com/Galactic-Dev/iSponsorBlock).
 
+- [Lillie](https://github.com/LillieWeeb001), [PoomSmart](https://twitter.com/poomsmart?s=21) and [kirb](https://twitter.com/hbkirb?s=21) for [YouTube Dislike Return](https://github.com/PoomSmart/Return-YouTube-Dislikes)
+
 - [HASHBANG Productions](https://github.com/hbang) for [Alderis Color Picker](https://github.com/hbang/Alderis) - a dependency of iSponsorBlock.
 
 - [PoomSmart](https://twitter.com/poomsmart?s=21) - the developer of many tweaks used by uYouPlus, include: [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), [YTUHD](https://poomsmart.github.io/repo/depictions/ytuhd.html) and [YouPiP](https://poomsmart.github.io/repo/depictions/youpip.html).
@@ -31,100 +33,102 @@
 
 # Features
 
-1. **uYou:** uYou has a ton of features that I can't list them all. Visit his [here](https://miro92.com/repo/depictions/?p=com.miro.uyou) for more info!
+1. **uYou:** uYou has a ton of features that I can't list them all. Visit [here](https://miro92.com/repo/depictions/?p=com.miro.uyou) for more info!
 
-2. **iSponsorBlock:** Skips annoying sponsor ads inside videos. iSponsorBlock is based on [SponsorBlock engine](https://sponsor.ajay.app/). This is the iOS version of the SponsorBlock extension.
+2. **iSponsorBlock:** Skips annoying sponsor ads inside videos. iSponsorBlock is based on [SponsorBlock engine](https://sponsor.ajay.app/). Basically, this is the iOS version of the SponsorBlock extension.
 
-3. **YouRememberCaption**: make YouTube remember your video caption setting (if not already).
+3. **YouPiP:** enable YouTube's **native PiP**. More options are in YouTube Settings - General.
 
-4. **YTClassicVideoQuality:** since YouTube v16.xx, you need one more step to change the video quality. YTClassicVideoQuality brings back the old video quality selector, which is a lot better than the new one.
+4. **YTUHD:** unlock VP9 codec and in effect, enables video quality of 2K and 4K. You can enable/disable YTUHD in YouTube Settings - Video quality preferences.
 
-5. **YTNoCheckLocalNetwork**: block the Local Network permission popup.
+<details>
+  <summary>And more...!</summary>
+
+5. **YTClassicVideoQuality:** since YouTube v16.xx, you need one more step to change the video quality. YTClassicVideoQuality brings back the old video quality selector, which is a lot better than the new one.
 
 6. **YTNoHoverCards:** offer an option to enable/disable the annoying suggested videos show up at the end of the videos.
 
 7. **YTSystemAppearance**: sync the YouTube theme (dark/light) with the system theme.
 
-8. **YTUHD:** unlock VP9 codec and in effect, enables video quality of 2K and 4K. You can enable/disable YTUHD in YouTube Settings => Video quality preferences.
+8. **YTNoCheckLocalNetwork**: block the Local Network permission popup.
 
-9. **YouPiP:** enable YouTube's **native PiP**. More options are in YouTube Settings => General.
+9. **YouRememberCaption**: make YouTube remember your video caption setting (if not already).
+</details>
+
+# Known issues 
+
+- **uYou**: all known-issues of uYou are listed [here](https://github.com/MiRO92/uYou-for-YouTube/issues). Make sure you take a look at it before reporting any bugs! ***Also, keep in mind that uYou+ is a modified version of uYou, DO NOT bother MiRO92 with problems unrelated to uYou!!!***
+
+- Issues that related to **uYouPlus** are [here](https://github.com/qnblackcat/uYouPlus/issues/)
 
 
-# Known issues
+# Download
 
-1. **uYou**: all known-issues of uYou are listed [here](https://github.com/MiRO92/uYou-for-YouTube/issues). **Make sure you take a look at it before reporting any bugs**!
+- **uYouPlus** (or you can call it uYou+) requires iOS & iPadOS 13.0 or later. The latest version of **uYouPlus** can be found in the [Release tab](https://github.com/qnblackcat/uYouPlus/releases).
 
-3. **iSponsorBlock**: the modified time doesn't show up in the seek bar.
+- For AltStore user: 
 
-3. **YTUHD**: Stuttering on 4K videos (sometimes).
+  - My official AtlStore repo: https://qnblackcat.github.io/AltStore/
 
-4. **YouPiP** (iOS 14.0 - 14.4.2): due to Apple's fault, you may encounter the *speedup-bug* as described [here](https://drive.google.com/file/d/1NKdv1fr_KRWgD8nhkMDfG2eLBnbdeVtX/view?usp=sharing). The bug also happens when you try to play multi-sources of sound at the same time. Enable **LegacyPiP** is a workaround. Keep in mind that LegacyPiP also removes UHD quality and breaks YouTube Autoplay next. Use it at your own risk.
+  - [Open in AltStore (v17.04.3-2.1)](https://tinyurl.com/mr39s9hf) - It will take a while to install because AltStore needs to download the IPA.
 
-5. **Not a bug**: 
+- Version info: _(last update: Feb 07)_
 
-> - The app won't be able to receive push notifications if you use a free developer account to sideload it. 
+<details>
->
+  <summary>  Expand</summary>
-> - appdb PRO users: follow [**this guide**](https://www.reddit.com/r/sideloaded/comments/pub39h/guide_how_to_fix_uyouuyou_download_not_working/) to fix uYou download not working.
->
-> - It's impossible to fix deep-link (a.k.a Open in the YouTube app). However, you can use this [Shortcuts](https://shortcutsgallery.com/shortcuts/open-in-youtube/) as a workaround (tested on iOS 14). **Credit:** RandomAccessMemories#5025
-
-
-# Download (IPA)
-
-- **uYouPlus** (or you can call it uYou+) requires iOS & iPadOS 13.0 and later. The latest version of **uYouPlus** can be found in the [Release tab](https://github.com/qnblackcat/uYouPlus/releases).
-
-- Version info: _(last update: Oct 01)_
 
 | **Tweaks/App** | **Version** | **Open source** |
-| :-------------: | :------------:| :------------: |
+| :------------: | :----------:| :-------------: |
-| **YouTube** | 16.38.2 | ✖︎  |
+| **YouTube** | 17.04.3 | ✖︎  |
-| **uYou** | 2.0 | ✖︎ |
+| **uYou** | 2.1 | ✖︎ |
-| **iSponsorBlock** | 1.0-10 | [✔︎](https://github.com/Galactic-Dev/iSponsorBlock) |
+| **Return YouTube Dislike** | 1.6.2 | [✔︎](https://github.com/PoomSmart/Return-YouTube-Dislikes) |
+| **iSponsorBlock** | 1.0-13 | [✔︎](https://github.com/Galactic-Dev/iSponsorBlock) |
 | **Alderis Color Picker** | 1.1.2| [✔︎](https://github.com/hbang/Alderis) |
 | **YouRememberCaption** | 1.0.0 | [✔︎](https://www.ios-repo-updates.com/repository/poomsmart/package/com.ps.youremembercaption/) |
 | **YTClassicVideoQuality** | 1.0.1 | [✔︎](https://github.com/PoomSmart/YTClassicVideoQuality) |
 | **YTNoCheckLocalNetwork** | 1.0.2 | [✔︎](https://poomsmart.github.io/repo/depictions/ytnochecklocalnetwork.html) |
 | **YTNoHoverCards** | 0.0.3 | [✔︎](https://github.com/level3tjg/YTNoHoverCards) |
 | **YTSystemAppearance** | 1.0.0 | [✔︎](https://poomsmart.github.io/repo/depictions/ytsystemappearance.html) |
-| **YTUHD** | 1.2.4 | [✔︎](https://github.com/PoomSmart/YTUHD) |
+| **YTUHD** | 1.2.5 | [✔︎](https://github.com/PoomSmart/YTUHD) |
-| **YouPiP** | 1.5.10 | [✔︎](https://github.com/PoomSmart/YouPiP) |
+| **YouPiP** | 1.6.6 | [✔︎](https://github.com/PoomSmart/YouPiP) |
 
+</details>
+
+# Support the developers
+
+<details>
+  <summary>MiRO92</summary>
+  
+- CashApp: https://cash.app/$MiRO92M
+ 
+- Other payment methods are available in uYou's settings.
+</details>
+
+<details>
+  <summary>Poomsmart</summary>
+
+- Paypal: https://poomsmart.github.io/
+
+</details>
+
+<details>
+  <summary>Galactic-dev</summary>
+  
+- Paypal: https://www.paypal.com/paypalme/DBrett684 
+
+- Venmo: https://venmo.com/u/DavidBrett
+</details>
+
+<details>
+  <summary>Lillie</summary>
+
+- Patreon: https://patreon.com/lillieweeb
+</details>
+
+# FAQ
+
+See [FAQ - Wiki](https://github.com/qnblackcat/uYouPlus/wiki/FAQ).
 
 # Building (optional)
 
-## Method 1: azule (simple way)
+See [Building - Wiki](https://github.com/qnblackcat/uYouPlus/wiki/Building).
-
-1. Setup [Azule](https://github.com/Al4ise/Azule) on your machine (macOS/Linux/iOS).
-
-2. Download all the tweaks you want to inject. 
-
-> - [**iOS Repo Updates**](https://www.ios-repo-updates.com/) is a trust-able source. [**cydownload**](https://github.com/borishonman/cydownload) and [**Windows Repo Tool**](https://github.com/SarahH12099/Windows-Repo-Tool) are good alternative.
->
-> - The sideloaded version of iSponsorBlock is here ([Luewii's fork](https://github.com/Luewii/iSponsorBlock)).
-
-3. Prepare the **decrypted** YouTube IPA.
-
-4. Run `azule` in any Terminal window and follow the instruction.
-
-5. Select `1. Inject tweaks`, then Drag & drop the **decrypted** YouTube IPA and your prepared tweaks into the azule window. Other options are optional.
-
-6. Done! Azule will take care of the rest!
-
-## Method 2: theos-jailed (complex way)
-
-1. Setup [theos-jailed](https://github.com/kabiroberai/theos-jailed/wiki/Installation)
-
-2. Clone this repo:
-
-```
-git clone https://github.com/qnblackcat/uYouPlus.git
-```
-
-3. **Important:** Open `Makefile` and edit the path to your decrypted YouTube IPA. 
-
-4. Optional: Modify the app the way you want. I suggest you take a look at the [theos-jailed wiki](https://github.com/kabiroberai/theos-jailed/wiki/Usage) and my `Makefile`.
-
-5. `cd` to the project folder, run:
-```
-make clean package
-```

uYouPlus.x

@@ -1,9 +1,17 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
+// Workaround for https://github.com/MiRO92/uYou-for-YouTube/issues/12
+
+%hook YTAdsInnerTubeContextDecorator
+- (void)decorateContext:(id)arg1 {
+    %orig(nil);
+}
+%end
+
+
+// YouRememberCaption: https://www.ios-repo-updates.com/repository/poomsmart/package/com.ps.youremembercaption/
 
-// YouRememberCaption
-//Source code: https://www.ios-repo-updates.com/repository/poomsmart/package/com.ps.youremembercaption/
 %hook YTColdConfig
 - (BOOL)respectDeviceCaptionSetting {
     return NO;
@@ -11,8 +19,7 @@
 %end
 
 
-// YTClassicVideoQuality
+// YTClassicVideoQuality: https://github.com/PoomSmart/YTClassicVideoQuality
-// Source code: https://github.com/PoomSmart/YTClassicVideoQuality
 
 @interface YTVideoQualitySwitchOriginalController : NSObject
 - (instancetype)initWithParentResponder:(id)responder;
@@ -27,8 +34,7 @@
 %end
 
 
-// YTNoCheckLocalNetwork
+// YTNoCheckLocalNetwork: https://poomsmart.github.io/repo/depictions/ytnochecklocalnetwork.html
-// Source code: https://poomsmart.github.io/repo/depictions/ytnochecklocalnetwork.html
 
 %hook YTHotConfig
 
@@ -37,8 +43,7 @@
 }
 %end
 
-// YTNoHoverCards
+// YTNoHoverCards: https://github.com/level3tjg/YTNoHoverCards
-// Source code: https://github.com/level3tjg/YTNoHoverCards
 
 @interface YTCollectionViewCell : UICollectionViewCell
 @end
@@ -86,8 +91,7 @@
 %end
 
 
-// YTSystemAppearance
+// YTSystemAppearance: https://poomsmart.github.io/repo/depictions/ytsystemappearance.html
-// Source code: https://poomsmart.github.io/repo/depictions/ytsystemappearance.html
 
 %hook YTColdConfig
 - (BOOL)shouldUseAppThemeSetting {