Merge remote-tracking branch 'upstream/main'

.github/ISSUE_TEMPLATE/bug.yaml

@@ -1,47 +1,100 @@
 name: Bug
-description: Make sure you complete the template. Otherwise, it will be closed without further explanation!
+description: Report a bug here
 title: "[Bug] Replace this with your title"
 labels: bug
 body:
 - type: checkboxes
   attributes:
     label: Is there an existing issue for this?
-    description: _Please search to see if an issue already exists for the bug you encountered_
     options:
     - label: I have searched the existing issues
       required: true
-      
-- type: checkboxes
+
+- type: markdown
   attributes:
-    label: Have you read the FAQ?
-    description: _Make sure you visit the [**FAQ**](https://github.com/qnblackcat/YTLitePlus/wiki/FAQ) page first!_
-    options:
-    - label: Yes, I read the FAQ
-      required: true
-    
-- type: textarea
+    value: "## Device Info"
+
+- type: input
   attributes:
-    label: Device info
-    description: 
-    value: |
-        - iOS/iPadOS version:
-        - Device model:
-        - Sideload tool (AltStore, Sideloadly, TrollStore,...):
-        - The specific version of YTLitePlus (**latest** or **newest** is **NOT** a version number!):
+    label: iOS/iPadOS version
+    placeholder: iOS 17.5.1
   validations:
     required: true
 
+- type: input
+  attributes:
+    label: Device model
+    placeholder: iPhone 15 Pro Max
+  validations:
+    required: true
+
+- type: input
+  attributes:
+    label: Sideload method
+    placeholder: AltStore, Sideloadly, TrollStore, Signulous, deb, ...
+  validations:
+    required: true
+
+- type: input
+  attributes:
+    label: Tweak version
+    placeholder: YTLitePlus - v19.xx.x-4.0.1
+    description: "**latest or newest is NOT a version number!**"
+  validations:
+    required: true
+
+- type: dropdown
+  attributes:
+    label: Do you use YouTube Premium?
+    options:
+      - ❌ No, I don't use YouTube Premium
+      - ✅ Yes, I do use YouTube Premium
+  validations:
+    required: true
+
+- type: dropdown
+  attributes:
+    label: Are you using the newest version of YTLitePlus?
+    description: Update to the [latest version](https://github.com/YTLitePlus/YTLitePlus/releases) to see if it fixes your issue
+    options:
+      - ✅ Yes, I'm using the latest version
+      - ❌ No, I'll explain at the end
+  validations:
+    required: true
+
+- type: dropdown
+  attributes:
+    label: Does the issue happen with the official YouTube from AppStore?
+    options:
+      - ❌ No, I can't reproduce this issue in the official YouTube from AppStore 
+      - ✅ Yes, I can reproduce this issue in the official YouTube from AppStore 
+  validations:
+    required: true
+
+- type: dropdown
+  attributes:
+    label: Method used to build the iPA
+    options:
+      - buildapp.yml (GitHub Actions)
+      - build.sh (Shell script)
+  validations:
+    required: true
+
+- type: markdown
+  attributes:
+    value: "## Description"
+
 - type: textarea
   attributes:
     label: Describe the bug
-    description: _Please attach videos or screenshots if possible_
+    description: Please attach videos or screenshots if possible
   validations:
     required: true
 
 - type: textarea
   attributes:
     label: Steps to reproduce the issue
-    description: _Please attach videos or screenshots if possible_
+    description: Please attach videos or screenshots if possible
     value: |
         1. 
         2. 
@@ -53,34 +106,11 @@ body:
   id: logs
   attributes:
     label: Crash log (if the app crashes)
-    description: _If somehow the app crashes, **you must provide the crash log**. It can be found in your device's Settings App > Privacy > Analytics & Improvements > Analytics Data > Youtube-xxx-xxx.ips_
+    description: It can be found in Settings App > Privacy > Analytics & Improvements > Analytics Data > Youtube-xxx-xxx.ips
     render: shell
 
-- type: dropdown
-  attributes:
-    label: Are you using the newest version of YTLitePlus? If not, why?
-    description: _Developers spend time and effort to fix bugs & add improvements with every release. Why don't you update to the [latest version](https://github.com/Balackburn/YTLitePlus/releases/latest) before reporting about an issue?_
-    multiple: false
-    options:
-      - ✅ Yes, I'm using the latest version of YTLitePlus right now
-      - ❌ No, I'll explain at the end of the template
-  validations:
-    required: true
-
-- type: dropdown
-  attributes:
-    label: Does the issue happen with the official YouTube from AppStore?
-    description: _Well, YouTube itself is buggy sometimes..._
-    multiple: false
-    options:
-      - ❌ No, It doesn't
-      - ✅ Yes, It does
-  validations:
-    required: true
-
 - type: textarea
   attributes:
     label: Additional context
-    description: _Um, anything else you want to say?_
   validations:
     required: false

.github/ISSUE_TEMPLATE/feature-request.yaml

@@ -0,0 +1,32 @@
+name: Feature Request
+description: Request a new feature to be added
+title: "[Request] Replace with your question"
+labels: enhancement
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    options:
+    - label: I have searched the existing issues
+      required: true
+
+- type: dropdown
+  attributes:
+    label: Do you use YouTube Premium?
+    options:
+      - ❌ No, I don't use YouTube Premium
+      - ✅ Yes, I do use YouTube Premium
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: My feature request
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Additional context
+  validations:
+    required: false

.github/ISSUE_TEMPLATE/question.yaml

@@ -5,8 +5,7 @@ labels: question
 body:
 - type: checkboxes
   attributes:
-    label: Is there an existing issue/question for this?
-    description: _Please search to see if an issue already exists for the bug you encountered. **I DON\'T MAKE THIS TICK BOX FOR COSMETIC.**_
+    label: Is there an existing issue for this?
     options:
     - label: I have searched the existing issues
       required: true
@@ -14,7 +13,7 @@ body:
 - type: dropdown
   attributes:
     label: Do you think this is a bug?
-    description: _If you think this is a bug, please open a new issue with the bug template_
+    description: _If so, please use the bug template_
     multiple: false
     options:
       - ✅ Yes, I believe this is a bug. I will open a new issue with the bug template
@@ -25,13 +24,11 @@ body:
 - type: textarea
   attributes:
     label: My question
-    description: _Please enter your question here_
   validations:
     required: true
 
 - type: textarea
   attributes:
     label: Additional context
-    description: _Um, anything else you want to say?_
   validations:
     required: false

.github/workflows/delete-workflow-runs.yml

@@ -13,7 +13,7 @@ on:
       delete_workflow_pattern:
         description: 'Name or filename of the workflow (if not set, all workflows are targeted)'
         required: false
-        default: 'Build and Release uYouEnhanced' # default value is ""
+        default: 'Build and Release YTLitePlus' # default value is ""
       delete_workflow_by_state_pattern:
         description: 'Filter workflows by state: active, deleted, disabled_fork, disabled_inactivity, disabled_manually'
         required: true

Source/Settings.xm

@@ -138,6 +138,7 @@ static const NSInteger YTLiteSection = 789;
             BASIC_SWITCH(LOC(@"DISABLE_PULL_TO_FULLSCREEN_GESTURE"), LOC(@"DISABLE_PULL_TO_FULLSCREEN_GESTURE_DESC"), @"disablePullToFull_enabled"),
             BASIC_SWITCH(LOC(@"ALWAYS_USE_REMAINING_TIME"), LOC(@"ALWAYS_USE_REMAINING_TIME_DESC"), @"alwaysShowRemainingTime_enabled"),
             BASIC_SWITCH(LOC(@"DISABLE_TOGGLE_TIME_REMAINING"), LOC(@"DISABLE_TOGGLE_TIME_REMAINING_DESC"), @"disableRemainingTime_enabled"),
+            BASIC_SWITCH(LOC(@"DISABLE_ENGAGEMENT_OVERLAY"), LOC(@"DISABLE_ENGAGEMENT_OVERLAY_DESC"), @"disableEngagementOverlay_enabled"),
         ];        
         YTSettingsPickerViewController *picker = [[%c(YTSettingsPickerViewController) alloc] initWithNavTitle:LOC(@"VIDEO_CONTROLS_OVERLAY_OPTIONS") pickerSectionTitle:nil rows:rows selectedItemIndex:NSNotFound parentResponder:[self parentResponder]];
         [settingsViewController pushViewController:picker];

Tweaks/YouPiP

@@ -1 +1 @@
-Subproject commit 781c92d977d1af5a9866169e4c04fd3fd7abdf6f
+Subproject commit 23f6ca2f949130f6c570b9f85160021bb9bda73d

Tweaks/protobuf

@@ -1 +1 @@
-Subproject commit b1c0715cb39d2bc82bf4d655134265e4c4dd657a
+Subproject commit d0e49dfe3161714046a4ee2aeafba133b171e26f

YTLitePlus.xm

@@ -249,6 +249,14 @@ BOOL isTabSelected = NO;
 %end
 %end
 
+%group gDisableEngagementOverlay
+%hook YTFullscreenEngagementOverlayController
+- (void)setEnabled:(BOOL)enabled {
+    %orig(NO);
+}
+%end
+%end
+
 // YTNoModernUI - @arichornlover
 %group gYTNoModernUI
 %hook YTVersionUtils // YTNoModernUI Original Version
@@ -759,6 +767,9 @@ BOOL isTabSelected = NO;
     if (IsEnabled(@"disablePullToFull_enabled")) {
         %init(gDisablePullToFull);
     }
+    if (IsEnabled(@"disableEngagementOverlay_enabled")) {
+        %init(gDisableEngagementOverlay);
+    }
 
     // Change the default value of some options
     NSArray *allKeys = [[[NSUserDefaults standardUserDefaults] dictionaryRepresentation] allKeys];

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

@@ -41,6 +41,9 @@
 "DISABLE_TOGGLE_TIME_REMAINING" = "Disable toggle time remaining";
 "DISABLE_TOGGLE_TIME_REMAINING_DESC" = "Disables changing time elapsed to time remaining. Use with other setting to always show remaining time.";
 
+"DISABLE_ENGAGEMENT_OVERLAY" = "Disable fullscreen engagement overlay";
+"DISABLE_ENGAGEMENT_OVERLAY_DESC" = "Disable the swipe-up gesture and suggested videos list in fullscreen";
+
 // App settings overlay options
 "APP_SETTINGS_OVERLAY_OPTIONS" = "App Settings Overlay Options";
 

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

@@ -41,6 +41,9 @@
 "DISABLE_TOGGLE_TIME_REMAINING" = "Disable toggle time remaining";
 "DISABLE_TOGGLE_TIME_REMAINING_DESC" = "Disables changing time elapsed to time remaining. Use with other setting to always show remaining time.";
 
+"DISABLE_ENGAGEMENT_OVERLAY" = "Disable fullscreen engagement overlay";
+"DISABLE_ENGAGEMENT_OVERLAY_DESC" = "Disable the swipe-up gesture and suggested videos list in fullscreen";
+
 // App settings overlay options
 "APP_SETTINGS_OVERLAY_OPTIONS" = "Overlay-Optionen für App-Einstellungen";
 

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

@@ -41,6 +41,9 @@
 "DISABLE_TOGGLE_TIME_REMAINING" = "Disable toggle time remaining";
 "DISABLE_TOGGLE_TIME_REMAINING_DESC" = "Disables changing time elapsed to time remaining. Use with other setting to always show remaining time.";
 
+"DISABLE_ENGAGEMENT_OVERLAY" = "Disable fullscreen engagement overlay";
+"DISABLE_ENGAGEMENT_OVERLAY_DESC" = "Disable the swipe-up gesture and suggested videos list in fullscreen";
+
 // App settings overlay options
 "APP_SETTINGS_OVERLAY_OPTIONS" = "App Settings Overlay Options";
 

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

@@ -41,6 +41,9 @@
 "DISABLE_TOGGLE_TIME_REMAINING" = "Disable toggle time remaining";
 "DISABLE_TOGGLE_TIME_REMAINING_DESC" = "Disables changing time elapsed to time remaining. Use with other setting to always show remaining time.";
 
+"DISABLE_ENGAGEMENT_OVERLAY" = "Disable fullscreen engagement overlay";
+"DISABLE_ENGAGEMENT_OVERLAY_DESC" = "Disable the swipe-up gesture and suggested videos list in fullscreen";
+
 // App settings overlay options
 "APP_SETTINGS_OVERLAY_OPTIONS" = "Opciones de superposición de los ajustes de la aplicación";
 

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

@@ -41,6 +41,9 @@
 "DISABLE_TOGGLE_TIME_REMAINING" = "Disable toggle time remaining";
 "DISABLE_TOGGLE_TIME_REMAINING_DESC" = "Disables changing time elapsed to time remaining. Use with other setting to always show remaining time.";
 
+"DISABLE_ENGAGEMENT_OVERLAY" = "Disable fullscreen engagement overlay";
+"DISABLE_ENGAGEMENT_OVERLAY_DESC" = "Disable the swipe-up gesture and suggested videos list in fullscreen";
+
 // App settings overlay options
 "APP_SETTINGS_OVERLAY_OPTIONS" = "Paramètres des options d'overlay de l'application";
 

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

@@ -41,6 +41,9 @@
 "DISABLE_TOGGLE_TIME_REMAINING" = "Disable toggle time remaining";
 "DISABLE_TOGGLE_TIME_REMAINING_DESC" = "Disables changing time elapsed to time remaining. Use with other setting to always show remaining time.";
 
+"DISABLE_ENGAGEMENT_OVERLAY" = "Disable fullscreen engagement overlay";
+"DISABLE_ENGAGEMENT_OVERLAY_DESC" = "Disable the swipe-up gesture and suggested videos list in fullscreen";
+
 // App settings overlay options
 "APP_SETTINGS_OVERLAY_OPTIONS" = "アプリの設定オーバーレイの設定";
 

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

@@ -41,6 +41,9 @@
 "DISABLE_TOGGLE_TIME_REMAINING" = "Desativar alternar tempo restante";
 "DISABLE_TOGGLE_TIME_REMAINING_DESC" = "Desativa a alteração do tempo decorrido para o tempo restante. Use com outra configuração para mostrar sempre o tempo restante.";
 
+"DISABLE_ENGAGEMENT_OVERLAY" = "Disable fullscreen engagement overlay";
+"DISABLE_ENGAGEMENT_OVERLAY_DESC" = "Disable the swipe-up gesture and suggested videos list in fullscreen";
+
 // App settings overlay options
 "APP_SETTINGS_OVERLAY_OPTIONS" = "Configurações do Aplicativo";
 

lang/YTLitePlus.bundle/ro.lproj/Localizable.strings

@@ -41,6 +41,9 @@
 "DISABLE_TOGGLE_TIME_REMAINING" = "Disable toggle time remaining";
 "DISABLE_TOGGLE_TIME_REMAINING_DESC" = "Disables changing time elapsed to time remaining. Use with other setting to always show remaining time.";
 
+"DISABLE_ENGAGEMENT_OVERLAY" = "Disable fullscreen engagement overlay";
+"DISABLE_ENGAGEMENT_OVERLAY_DESC" = "Disable the swipe-up gesture and suggested videos list in fullscreen";
+
 // App settings overlay options
 "APP_SETTINGS_OVERLAY_OPTIONS" = "Opțiuni Overlay Setări Aplicație";
 

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

@@ -41,6 +41,9 @@
 "DISABLE_TOGGLE_TIME_REMAINING" = "Disable toggle time remaining";
 "DISABLE_TOGGLE_TIME_REMAINING_DESC" = "Disables changing time elapsed to time remaining. Use with other setting to always show remaining time.";
 
+"DISABLE_ENGAGEMENT_OVERLAY" = "Disable fullscreen engagement overlay";
+"DISABLE_ENGAGEMENT_OVERLAY_DESC" = "Disable the swipe-up gesture and suggested videos list in fullscreen";
+
 // App settings overlay options
 "APP_SETTINGS_OVERLAY_OPTIONS" = "App Settings Overlay Options";
 

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

@@ -56,6 +56,9 @@ https://github.com/PoomSmart/Return-YouTube-Dislikes/tree/main/layout/Library/Ap
 "DISABLE_TOGGLE_TIME_REMAINING" = "Disable toggle time remaining";
 "DISABLE_TOGGLE_TIME_REMAINING_DESC" = "Disables changing time elapsed to time remaining. Use with other setting to always show remaining time.";
 
+"DISABLE_ENGAGEMENT_OVERLAY" = "Disable fullscreen engagement overlay";
+"DISABLE_ENGAGEMENT_OVERLAY_DESC" = "Disable the swipe-up gesture and suggested videos list in fullscreen";
+
 // App settings overlay options
 "APP_SETTINGS_OVERLAY_OPTIONS" = "App Settings Overlay Options";
 

lang/YTLitePlus.bundle/tr.lproj/Localizable.strings

@@ -41,6 +41,9 @@
 "DISABLE_TOGGLE_TIME_REMAINING" = "Disable toggle time remaining";
 "DISABLE_TOGGLE_TIME_REMAINING_DESC" = "Disables changing time elapsed to time remaining. Use with other setting to always show remaining time.";
 
+"DISABLE_ENGAGEMENT_OVERLAY" = "Disable fullscreen engagement overlay";
+"DISABLE_ENGAGEMENT_OVERLAY_DESC" = "Disable the swipe-up gesture and suggested videos list in fullscreen";
+
 // App settings overlay options
 "APP_SETTINGS_OVERLAY_OPTIONS" = "App Settings Overlay Options";
 

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

@@ -50,6 +50,9 @@
 "DISABLE_TOGGLE_TIME_REMAINING" = "Disable toggle time remaining";
 "DISABLE_TOGGLE_TIME_REMAINING_DESC" = "Disables changing time elapsed to time remaining. Use with other setting to always show remaining time.";
 
+"DISABLE_ENGAGEMENT_OVERLAY" = "Disable fullscreen engagement overlay";
+"DISABLE_ENGAGEMENT_OVERLAY_DESC" = "Disable the swipe-up gesture and suggested videos list in fullscreen";
+
 // Shorts controls overlay options
 "SHORTS_CONTROLS_OVERLAY_OPTIONS" = "Tùy chọn lớp phủ điều khiển quần short";