fix(youtube/alternative-thumbnails): minor refactor

This commit is contained in:
inotia00 2023-09-28 16:55:51 +09:00
parent 63b7812dc3
commit 80c81d46ba
4 changed files with 8 additions and 11 deletions

View File

@ -17,6 +17,7 @@ import app.revanced.patches.youtube.alternativethumbnails.general.fingerprints.M
import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch.Companion.contexts import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch.Companion.contexts
import app.revanced.util.integrations.Constants.ALTERNATIVE_THUMBNAILS
import app.revanced.util.resources.ResourceUtils.copyXmlNode import app.revanced.util.resources.ResourceUtils.copyXmlNode
@Patch @Patch
@ -45,7 +46,7 @@ class AlternativeThumbnailsPatch : BytecodePatch(
it.mutableMethod.apply { it.mutableMethod.apply {
addInstructions( addInstructions(
0, """ 0, """
invoke-static { p1 }, $INTEGRATIONS_CLASS_DESCRIPTOR->overrideImageURL(Ljava/lang/String;)Ljava/lang/String; invoke-static { p1 }, $ALTERNATIVE_THUMBNAILS->overrideImageURL(Ljava/lang/String;)Ljava/lang/String;
move-result-object p1 move-result-object p1
""" """
) )
@ -68,7 +69,7 @@ class AlternativeThumbnailsPatch : BytecodePatch(
it.mutableMethod.apply { it.mutableMethod.apply {
addInstruction( addInstruction(
0, 0,
"invoke-static { p2 }, $INTEGRATIONS_CLASS_DESCRIPTOR->handleCronetSuccess(Lorg/chromium/net/UrlResponseInfo;)V" "invoke-static { p2 }, $ALTERNATIVE_THUMBNAILS->handleCronetSuccess(Lorg/chromium/net/UrlResponseInfo;)V"
) )
} }
} ?: throw CronetURLRequestCallbackOnSucceededFingerprint.exception } ?: throw CronetURLRequestCallbackOnSucceededFingerprint.exception
@ -90,9 +91,4 @@ class AlternativeThumbnailsPatch : BytecodePatch(
SettingsPatch.updatePatchStatus("alternative-thumbnails") SettingsPatch.updatePatchStatus("alternative-thumbnails")
} }
internal companion object {
private const val INTEGRATIONS_CLASS_DESCRIPTOR =
"Lapp/revanced/integrations/alternativethumbnails/AlternativeThumbnailsPatch;"
}
} }

View File

@ -5,6 +5,7 @@ internal object Constants {
const val PATCHES_PATH = "$INTEGRATIONS_PATH/patches" const val PATCHES_PATH = "$INTEGRATIONS_PATH/patches"
const val ADS_PATH = "$PATCHES_PATH/ads" const val ADS_PATH = "$PATCHES_PATH/ads"
const val ALTERNATIVE_THUMBNAILS = "$PATCHES_PATH/layout/AlternativeThumbnailsPatch;"
const val SWIPE_PATH = "$PATCHES_PATH/swipe" const val SWIPE_PATH = "$PATCHES_PATH/swipe"
const val FLYOUT_PANEL = "$PATCHES_PATH/layout/FlyoutPanelPatch;" const val FLYOUT_PANEL = "$PATCHES_PATH/layout/FlyoutPanelPatch;"
const val FULLSCREEN = "$PATCHES_PATH/layout/FullscreenPatch;" const val FULLSCREEN = "$PATCHES_PATH/layout/FullscreenPatch;"

View File

@ -10,12 +10,12 @@
<string name="revanced_alt_thumbnails">Alternative thumbnails</string> <string name="revanced_alt_thumbnails">Alternative thumbnails</string>
<string name="revanced_alt_thumbnail_about_summary">Alternative thumbnails are still images from the beginning/middle/end of each video. No external API is used, as these images are built into YouTube</string> <string name="revanced_alt_thumbnail_about_summary">Alternative thumbnails are still images from the beginning/middle/end of each video. No external API is used, as these images are built into YouTube</string>
<string name="revanced_alt_thumbnail_about_title">About</string> <string name="revanced_alt_thumbnail_about_title">About</string>
<string name="revanced_alt_thumbnail_enabled_summary_off">Original YouTube thumbnails shown</string>
<string name="revanced_alt_thumbnail_enabled_summary_on">YouTube thumbnails replaced with alternative ones</string>
<string name="revanced_alt_thumbnail_enabled_title">Enable alternative thumbnails</string>
<string name="revanced_alt_thumbnail_fast_quality_summary_off">Using high quality stills but will have more delay</string> <string name="revanced_alt_thumbnail_fast_quality_summary_off">Using high quality stills but will have more delay</string>
<string name="revanced_alt_thumbnail_fast_quality_summary_on">Using medium quality stills. Thumbnails will load faster, but live streams, unreleased, or very old videos may show blank thumbnails</string> <string name="revanced_alt_thumbnail_fast_quality_summary_on">Using medium quality stills. Thumbnails will load faster, but live streams, unreleased, or very old videos may show blank thumbnails</string>
<string name="revanced_alt_thumbnail_fast_quality_title">Use fast alternative thumbnails</string> <string name="revanced_alt_thumbnail_fast_quality_title">Use fast alternative thumbnails</string>
<string name="revanced_alt_thumbnail_summary_off">Original YouTube thumbnails shown</string>
<string name="revanced_alt_thumbnail_summary_on">YouTube thumbnails replaced with alternative ones</string>
<string name="revanced_alt_thumbnail_title">Enable alternative thumbnails</string>
<string name="revanced_alt_thumbnail_type_entry_1">Beginning of video</string> <string name="revanced_alt_thumbnail_type_entry_1">Beginning of video</string>
<string name="revanced_alt_thumbnail_type_entry_2">Middle of video</string> <string name="revanced_alt_thumbnail_type_entry_2">Middle of video</string>
<string name="revanced_alt_thumbnail_type_entry_3">End of video</string> <string name="revanced_alt_thumbnail_type_entry_3">End of video</string>

View File

@ -30,7 +30,7 @@
<!-- PREFERENCE: ALTERNATIVE_THUMBNAILS_SETTINGS <!-- PREFERENCE: ALTERNATIVE_THUMBNAILS_SETTINGS
<PreferenceScreen android:title="@string/revanced_alt_thumbnails" android:key="alt_thumbnails"> <PreferenceScreen android:title="@string/revanced_alt_thumbnails" android:key="alt_thumbnails">
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_alt_thumbnails" /> <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_alt_thumbnails" />
<SwitchPreference android:title="@string/revanced_alt_thumbnail_title" android:key="revanced_alt_thumbnail" android:defaultValue="false" android:summaryOn="@string/revanced_alt_thumbnail_summary_on" android:summaryOff="@string/revanced_alt_thumbnail_summary_off" /> <SwitchPreference android:title="@string/revanced_alt_thumbnail_enabled_title" android:key="revanced_alt_thumbnail_enabled" android:defaultValue="false" android:summaryOn="@string/revanced_alt_thumbnail_enabled_summary_on" android:summaryOff="@string/revanced_alt_thumbnail_enabled_summary_off" />
<ListPreference android:title="@string/revanced_alt_thumbnail_type_title" android:key="revanced_alt_thumbnail_type" android:entries="@array/revanced_alt_thumbnail_type_entries" android:defaultValue="1" android:entryValues="@array/revanced_alt_thumbnail_type_entry_values" /> <ListPreference android:title="@string/revanced_alt_thumbnail_type_title" android:key="revanced_alt_thumbnail_type" android:entries="@array/revanced_alt_thumbnail_type_entries" android:defaultValue="1" android:entryValues="@array/revanced_alt_thumbnail_type_entry_values" />
<SwitchPreference android:title="@string/revanced_alt_thumbnail_fast_quality_title" android:key="revanced_alt_thumbnail_fast_quality" android:defaultValue="false" android:summaryOn="@string/revanced_alt_thumbnail_fast_quality_summary_on" android:summaryOff="@string/revanced_alt_thumbnail_fast_quality_summary_off" /> <SwitchPreference android:title="@string/revanced_alt_thumbnail_fast_quality_title" android:key="revanced_alt_thumbnail_fast_quality" android:defaultValue="false" android:summaryOn="@string/revanced_alt_thumbnail_fast_quality_summary_on" android:summaryOff="@string/revanced_alt_thumbnail_fast_quality_summary_off" />
<Preference android:title="@string/revanced_alt_thumbnail_about_title" android:selectable="false" android:summary="@string/revanced_alt_thumbnail_about_summary" /> <Preference android:title="@string/revanced_alt_thumbnail_about_title" android:selectable="false" android:summary="@string/revanced_alt_thumbnail_about_summary" />