Merge pull request #1 from self-similarity/master

merge
This commit is contained in:
self-similarity 2023-08-12 02:06:06 +00:00 committed by GitHub
commit fe342b254c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 9 deletions

View file

@ -56,6 +56,8 @@ jobs:
SIGNING_KEY_ALIAS: "key0"
SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
- uses: actions/checkout@v3
with:
repository: "recloudstream/cloudstream-archive"

View file

@ -48,6 +48,8 @@ jobs:
SIGNING_KEY_ALIAS: "key0"
SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
- name: Create pre-release
uses: "marvinpinto/action-automatic-releases@latest"
with:

View file

@ -124,7 +124,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
}
fun getPosterUrl(poster: String): String {
return "https://wsrv.nl/?url=https://simkl.in/posters/${poster}_m.jpg"
return "https://wsrv.nl/?url=https://simkl.in/posters/${poster}_m.webp"
}
private fun getUrlFromId(id: Int): String {
@ -744,9 +744,6 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
activities?.tv_shows?.all,
activities?.anime?.all,
activities?.movies?.all,
activities?.tv_shows?.rated_at,
activities?.anime?.rated_at,
activities?.movies?.rated_at,
).maxOf {
getUnixTime(it) ?: -1
}

View file

@ -258,7 +258,7 @@ class SettingsAccount : PreferenceFragmentCompat() {
listOf(
R.string.mal_key to malApi,
R.string.anilist_key to aniListApi,
R.string.trakt_key to simklApi,
R.string.simkl_key to simklApi,
R.string.opensubtitles_key to openSubtitlesApi,
)

View file

@ -450,7 +450,7 @@
<string name="bottom_title_settings_des">Put the title under the poster</string>
<!-- account stuff -->
<string name="anilist_key" translatable="false">anilist_key</string>
<string name="trakt_key" translatable="false">trakt_key</string>
<string name="simkl_key" translatable="false">simkl_key</string>
<string name="mal_key" translatable="false">mal_key</string>
<string name="opensubtitles_key" translatable="false">opensubtitles_key</string>
<string name="nginx_key" translatable="false">nginx_key</string>

View file

@ -738,7 +738,7 @@
</style>
<style name="SelectableButtonTV" parent="RegularButtonTV">
<item name="icon">@drawable/cpv_preset_checked</item>
<item name="icon">@drawable/ic_baseline_check_24_listview</item>
<item name="iconTint">@color/button_selector_color</item>
</style>
@ -844,4 +844,4 @@
@drawable/cast_ic_mini_controller_closed_caption
</item>
</style>
</resources>
</resources>

View file

@ -11,7 +11,7 @@
<Preference
android:icon="@drawable/simkl_logo"
android:key="@string/trakt_key" />
android:key="@string/simkl_key" />
<Preference
android:icon="@drawable/open_subtitles_icon"