forked from recloudstream/cloudstream
bump
This commit is contained in:
parent
8c7312e492
commit
8b5e486377
2 changed files with 8 additions and 8 deletions
|
@ -36,7 +36,7 @@ android {
|
||||||
targetSdkVersion 30
|
targetSdkVersion 30
|
||||||
|
|
||||||
versionCode 44
|
versionCode 44
|
||||||
versionName "2.7.14"
|
versionName "2.7.15"
|
||||||
|
|
||||||
resValue "string", "app_version",
|
resValue "string", "app_version",
|
||||||
"${defaultConfig.versionName}${versionNameSuffix ?: ""}"
|
"${defaultConfig.versionName}${versionNameSuffix ?: ""}"
|
||||||
|
@ -96,8 +96,8 @@ dependencies {
|
||||||
implementation 'androidx.appcompat:appcompat:1.4.1'
|
implementation 'androidx.appcompat:appcompat:1.4.1'
|
||||||
implementation 'com.google.android.material:material:1.5.0'
|
implementation 'com.google.android.material:material:1.5.0'
|
||||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
|
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
|
||||||
implementation 'androidx.navigation:navigation-fragment-ktx:2.5.0-alpha02'
|
implementation 'androidx.navigation:navigation-fragment-ktx:2.5.0-alpha03'
|
||||||
implementation 'androidx.navigation:navigation-ui-ktx:2.5.0-alpha02'
|
implementation 'androidx.navigation:navigation-ui-ktx:2.5.0-alpha03'
|
||||||
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
|
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
|
||||||
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
|
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
|
||||||
testImplementation 'junit:junit:4.13.2'
|
testImplementation 'junit:junit:4.13.2'
|
||||||
|
@ -154,7 +154,7 @@ dependencies {
|
||||||
// Networking
|
// Networking
|
||||||
implementation "com.squareup.okhttp3:okhttp:4.9.2"
|
implementation "com.squareup.okhttp3:okhttp:4.9.2"
|
||||||
implementation "com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1"
|
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 🙏
|
// Util to skip the URI file fuckery 🙏
|
||||||
implementation "com.github.tachiyomiorg:unifile:17bec43"
|
implementation "com.github.tachiyomiorg:unifile:17bec43"
|
||||||
|
|
|
@ -156,7 +156,7 @@ class GeneratorPlayer : FullScreenPlayer() {
|
||||||
MimeTypes.APPLICATION_SUBRIP,
|
MimeTypes.APPLICATION_SUBRIP,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
} catch (e : Exception) {
|
} catch (e: Exception) {
|
||||||
logError(e)
|
logError(e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -480,12 +480,12 @@ class GeneratorPlayer : FullScreenPlayer() {
|
||||||
@SuppressLint("SetTextI18n")
|
@SuppressLint("SetTextI18n")
|
||||||
fun setTitle() {
|
fun setTitle() {
|
||||||
var headerName: String? = null
|
var headerName: String? = null
|
||||||
var subName : String? = null
|
var subName: String? = null
|
||||||
var episode: Int? = null
|
var episode: Int? = null
|
||||||
var season: Int? = null
|
var season: Int? = null
|
||||||
var tvType: TvType? = null
|
var tvType: TvType? = null
|
||||||
|
|
||||||
var isFiller : Boolean? = null
|
var isFiller: Boolean? = null
|
||||||
when (val meta = currentMeta) {
|
when (val meta = currentMeta) {
|
||||||
is ResultEpisode -> {
|
is ResultEpisode -> {
|
||||||
isFiller = meta.isFiller
|
isFiller = meta.isFiller
|
||||||
|
@ -513,7 +513,7 @@ class GeneratorPlayer : FullScreenPlayer() {
|
||||||
" - ${getString(R.string.episode)} $episode"
|
" - ${getString(R.string.episode)} $episode"
|
||||||
else
|
else
|
||||||
" \"${getString(R.string.season_short)}${season}:${getString(R.string.episode_short)}${episode}\""
|
" \"${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 {
|
} else {
|
||||||
""
|
""
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue