From 8b5e4863770c4e4d4d247ad969f6fa076feea91a Mon Sep 17 00:00:00 2001 From: LagradOst <11805592+LagradOst@users.noreply.github.com> Date: Tue, 1 Mar 2022 22:15:18 +0100 Subject: [PATCH] bump --- app/build.gradle | 8 ++++---- .../lagradost/cloudstream3/ui/player/GeneratorPlayer.kt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cdfa5399..74651e89 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,7 +36,7 @@ android { targetSdkVersion 30 versionCode 44 - versionName "2.7.14" + versionName "2.7.15" resValue "string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}" @@ -96,8 +96,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'com.google.android.material:material:1.5.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.3' - implementation 'androidx.navigation:navigation-fragment-ktx:2.5.0-alpha02' - implementation 'androidx.navigation:navigation-ui-ktx:2.5.0-alpha02' + implementation 'androidx.navigation:navigation-fragment-ktx:2.5.0-alpha03' + implementation 'androidx.navigation:navigation-ui-ktx:2.5.0-alpha03' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1' testImplementation 'junit:junit:4.13.2' @@ -154,7 +154,7 @@ dependencies { // Networking implementation "com.squareup.okhttp3:okhttp:4.9.2" implementation "com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1" - implementation 'com.google.android.exoplayer:extension-okhttp:2.16.1' + implementation 'com.google.android.exoplayer:extension-okhttp:2.17.0' // Util to skip the URI file fuckery 🙏 implementation "com.github.tachiyomiorg:unifile:17bec43" diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt index a4cee447..cb81f80f 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt @@ -156,7 +156,7 @@ class GeneratorPlayer : FullScreenPlayer() { MimeTypes.APPLICATION_SUBRIP, ) ) - } catch (e : Exception) { + } catch (e: Exception) { logError(e) } } @@ -480,12 +480,12 @@ class GeneratorPlayer : FullScreenPlayer() { @SuppressLint("SetTextI18n") fun setTitle() { var headerName: String? = null - var subName : String? = null + var subName: String? = null var episode: Int? = null var season: Int? = null var tvType: TvType? = null - var isFiller : Boolean? = null + var isFiller: Boolean? = null when (val meta = currentMeta) { is ResultEpisode -> { isFiller = meta.isFiller @@ -513,7 +513,7 @@ class GeneratorPlayer : FullScreenPlayer() { " - ${getString(R.string.episode)} $episode" else " \"${getString(R.string.season_short)}${season}:${getString(R.string.episode_short)}${episode}\"" - else "") + if(subName.isNullOrBlank()) "" else " - $subName" + else "") + if (subName.isNullOrBlank() || subName == headerName) "" else " - $subName" } else { "" }