From eb903a41a48d8543f394fd5e710fecdf43797840 Mon Sep 17 00:00:00 2001 From: self-similarity <137652432+self-similarity@users.noreply.github.com> Date: Sat, 12 Aug 2023 01:49:29 +0000 Subject: [PATCH 1/3] Update styles.xml --- app/src/main/res/values/styles.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 4d1fa924..3ef56c22 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -738,7 +738,7 @@ @@ -844,4 +844,4 @@ @drawable/cast_ic_mini_controller_closed_caption - \ No newline at end of file + From 0021718b5bee6853789d1be8598cda324fa7aa7e Mon Sep 17 00:00:00 2001 From: self-similarity <137652432+self-similarity@users.noreply.github.com> Date: Sat, 12 Aug 2023 03:51:23 +0200 Subject: [PATCH 2/3] Simkl fixes --- .../cloudstream3/syncproviders/providers/SimklApi.kt | 5 +---- .../lagradost/cloudstream3/ui/settings/SettingsAccount.kt | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/styles.xml | 2 +- app/src/main/res/xml/settings_account.xml | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt index 0b427cbe..f2a77764 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt @@ -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 } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt index 6ba77fbd..b3225d5c 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt @@ -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, ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e019ae2b..8f07d243 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -450,7 +450,7 @@ Put the title under the poster anilist_key - trakt_key + simkl_key mal_key opensubtitles_key nginx_key diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 4d1fa924..5a4869c6 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -738,7 +738,7 @@ diff --git a/app/src/main/res/xml/settings_account.xml b/app/src/main/res/xml/settings_account.xml index 53165a61..d3dbcb31 100644 --- a/app/src/main/res/xml/settings_account.xml +++ b/app/src/main/res/xml/settings_account.xml @@ -11,7 +11,7 @@ + android:key="@string/simkl_key" /> Date: Sat, 12 Aug 2023 04:01:46 +0200 Subject: [PATCH 3/3] Workflow --- .github/workflows/build_to_archive.yml | 2 ++ .github/workflows/prerelease.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/build_to_archive.yml b/.github/workflows/build_to_archive.yml index 9cd2c523..3b7aa9ae 100644 --- a/.github/workflows/build_to_archive.yml +++ b/.github/workflows/build_to_archive.yml @@ -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" diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 856d267c..58009a7a 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -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: