diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt index 6f9309fc75..1ca8a906a2 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt @@ -101,9 +101,9 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter // 19.29.42 // All modern players are broken and ignore tapping the miniplayer video. // 19.30.39 // Modern 3 is less broken when double tap expand is enabled, but cannot swipe to expand when double tap is off. // 19.31.36 // All Modern 1 buttons are missing. Unusable. - // 19.32.36 // Works without issues. - // 19.33.35 // Works without issues. - "19.34.42", // Works without issues. + // 19.32.36 // 19.32+ and beyond all work without issues. + // 19.33.35 + "19.34.42", ] ) ] @@ -140,6 +140,7 @@ object MiniplayerPatch : BytecodePatch( entriesKey = "revanced_miniplayer_type_19_16_entries", entryValuesKey = "revanced_miniplayer_type_19_16_entry_values" ) + if (VersionCheckPatch.is_19_25_or_greater) { if (!VersionCheckPatch.is_19_29_or_greater) { preferences += SwitchPreference("revanced_miniplayer_double_tap_action") @@ -147,15 +148,24 @@ object MiniplayerPatch : BytecodePatch( preferences += SwitchPreference("revanced_miniplayer_drag_and_drop") } - preferences += SwitchPreference( - key = "revanced_miniplayer_hide_expand_close", - summaryOnKey = + if (VersionCheckPatch.is_19_36_or_greater) { + preferences += SwitchPreference("revanced_miniplayer_rounded_corners") + } + + preferences += if (VersionCheckPatch.is_19_26_or_greater) { - "revanced_miniplayer_hide_expand_close_summary_on" + SwitchPreference( + key = "revanced_miniplayer_hide_expand_close", + titleKey = "revanced_miniplayer_hide_expand_close_title", + summaryOnKey = "revanced_miniplayer_hide_expand_close_summary_on", + ) } else { - "revanced_miniplayer_hide_expand_close_legacy_summary_on" + SwitchPreference( + key = "revanced_miniplayer_hide_expand_close", + titleKey = "revanced_miniplayer_hide_expand_close_legacy_title", + summaryOnKey = "revanced_miniplayer_hide_expand_close_legacy_summary_on", + ) } - ) if (!VersionCheckPatch.is_19_26_or_greater) { preferences += SwitchPreference("revanced_miniplayer_hide_rewind_forward") @@ -163,10 +173,6 @@ object MiniplayerPatch : BytecodePatch( preferences += SwitchPreference("revanced_miniplayer_hide_subtext") - if (VersionCheckPatch.is_19_36_or_greater) { - preferences += SwitchPreference("revanced_miniplayer_rounded_corners") - } - if (VersionCheckPatch.is_19_26_or_greater) { preferences += TextPreference("revanced_miniplayer_width_dip", inputType = InputType.NUMBER) } diff --git a/src/main/resources/addresources/values/strings.xml b/src/main/resources/addresources/values/strings.xml index 1df5d9c3b1..00f138b057 100644 --- a/src/main/resources/addresources/values/strings.xml +++ b/src/main/resources/addresources/values/strings.xml @@ -1010,28 +1010,30 @@ This is because Crowdin requires temporarily flattening this file and removing t Modern 1 Modern 2 Modern 3 - Miniplayer size - On screen size, in pixels - Pixel size must be between %1$s and %2$s + Enable rounded corners + Corners are rounded + Corners are square Enable double-tap and pinch to resize Double-tap action and pinch to resize is enabled\n\n• Double tap to increase miniplayer size\n• Double tap again to restore original size Double-tap action and pinch to resize is disabled Enable drag and drop Drag and drop is enabled\n\nMiniplayer can be dragged to any corner of the screen Drag and drop is disabled - Hide expand and close buttons - Buttons are hidden\n\nTap to expand, swipe to close + Hide close button + Close button is hidden + Close button is shown + Hide expand and close buttons Buttons are hidden\n\nSwipe to expand or close - Expand and close buttons are shown + Expand and close buttons are shown Hide subtexts Subtexts are hidden Subtexts are shown Hide skip forward and back buttons Skip forward and back are hidden Skip forward and back are shown - Use rounded corners - Corners are rounded - Corners are square + Initial size + Initial on screen size, in pixels + Pixel size must be between %1$s and %2$s Overlay opacity Opacity value between 0-100, where 0 is transparent Miniplayer overlay opacity must be between 0-100