diff --git a/.github/workflows/issue_action.yml b/.github/workflows/issue_action.yml
index 79e7766c..28b737b3 100644
--- a/.github/workflows/issue_action.yml
+++ b/.github/workflows/issue_action.yml
@@ -18,7 +18,7 @@ jobs:
uses: actions-cool/issues-similarity-analysis@v1
with:
token: ${{ steps.generate_token.outputs.token }}
- filter-threshold: 0.5
+ filter-threshold: 0.60
title-excludes: ''
comment-title: |
### Your issue looks similar to these issues:
@@ -41,7 +41,7 @@ jobs:
wget --output-document check_issue.py "https://raw.githubusercontent.com/recloudstream/.github/master/.github/check_issue.py"
pip3 install httpx
RES="$(python3 ./check_issue.py)"
- echo "::set-output name=name::${RES}"
+ echo "name=${RES}" >> $GITHUB_OUTPUT
- name: Comment if issue mentions a provider
if: steps.provider_check.outputs.name != 'none'
uses: actions-cool/issues-helper@v3
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index d58caf1e..edfb24be 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -33,7 +33,7 @@ jobs:
curl -H "Authorization: token ${{ secrets.PAT }}" -o "keystore_password.txt" "https://raw.githubusercontent.com/KillerDogeEmpire/secrets/master/keystore_password.txt"
KEY_PWD="$(cat keystore_password.txt)"
echo "::add-mask::${KEY_PWD}"
- echo "::set-output name=key_pwd::$KEY_PWD"
+ echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
- name: Run Gradle
run: |
./gradlew assemblePrerelease makeJar androidSourcesJar
@@ -49,6 +49,6 @@ jobs:
prerelease: true
title: "Pre-release Build"
files: |
- app/build/outputs/apk/prerelease/*.apk
+ app/build/outputs/apk/prerelease/release/*.apk
app/build/libs/app-sources.jar
app/build/classes.jar
\ No newline at end of file
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 1a4db134..36199cd6 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -15,9 +15,9 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Run Gradle
- run: ./gradlew assembleDebug
+ run: ./gradlew assemblePrereleaseDebug
- name: Upload Artifact
uses: actions/upload-artifact@v2
with:
name: pull-request-build
- path: "app/build/outputs/apk/debug/*.apk"
+ path: "app/build/outputs/apk/prerelease/debug/*.apk"
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 652d9f3f..333d4937 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -31,5 +31,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/README.md b/README.md
index f81aa03c..79ce6a91 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@
***The list of supported languages:***
* 🇱🇧 Arabic
+* 🇧🇬 Bulgarian
* 🇭🇷 Croatian
* 🇨🇿 Czech
* 🇳🇱 Dutch
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 7cb6d2d7..00000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,233 +0,0 @@
-plugins {
- id 'com.android.application'
- id 'kotlin-android'
- id 'kotlin-kapt'
- id 'kotlin-android-extensions'
- id 'org.jetbrains.dokka'
-}
-
-def tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
-def allFilesFromDir = new File(tmpFilePath).listFiles()
-def prereleaseStoreFile = null
-if (allFilesFromDir != null) {
- prereleaseStoreFile = allFilesFromDir.first()
-}
-
-android {
- testOptions {
- unitTests.returnDefaultValues = true
- }
- signingConfigs {
- prerelease {
- if (prereleaseStoreFile != null) {
- storeFile = file(prereleaseStoreFile)
- storePassword System.getenv("SIGNING_STORE_PASSWORD")
- keyAlias System.getenv("SIGNING_KEY_ALIAS")
- keyPassword System.getenv("SIGNING_KEY_PASSWORD")
- }
- }
- }
- compileSdkVersion 31
- buildToolsVersion "30.0.3"
-
- defaultConfig {
- applicationId "com.killerdogeempire.aquastream"
- minSdkVersion 21
- targetSdkVersion 30
-
- versionCode 52
- versionName "1.0.1"
-
- resValue "string", "app_version",
- "${defaultConfig.versionName}${versionNameSuffix ?: ""}"
-
- resValue "string", "commit_hash",
- ("git rev-parse --short HEAD".execute().text.trim() ?: "")
-
- resValue "bool", "is_prerelease", "false"
-
- buildConfigField("String", "BUILDDATE", "new java.text.SimpleDateFormat(\"yyyy-MM-dd HH:mm\").format(new java.util.Date(" + System.currentTimeMillis() + "L));")
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
- kapt {
- includeCompileClasspath = true
- }
- }
-
- buildTypes {
- release {
- debuggable false
- minifyEnabled false
- shrinkResources false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- resValue "bool", "is_prerelease", "false"
- }
- prerelease {
- applicationIdSuffix ".prerelease"
- buildConfigField("boolean", "BETA", "true")
- signingConfig signingConfigs.prerelease
- versionNameSuffix '-PRE'
- debuggable false
- minifyEnabled false
- shrinkResources false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- resValue "bool", "is_prerelease", "true"
- }
- debug {
- debuggable true
- applicationIdSuffix ".debug"
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- resValue "bool", "is_prerelease", "true"
- }
- }
- compileOptions {
- coreLibraryDesugaringEnabled true
-
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
- kotlinOptions {
- jvmTarget = '1.8'
- freeCompilerArgs = ['-Xjvm-default=compatibility']
- }
- lintOptions {
- checkReleaseBuilds false
- abortOnError false
- }
-}
-
-repositories {
- maven { url 'https://jitpack.io' }
-}
-
-dependencies {
- implementation 'com.google.android.mediahome:video:1.0.0'
- implementation 'androidx.test.ext:junit-ktx:1.1.3'
- testImplementation 'org.json:json:20180813'
-
- implementation 'androidx.core:core-ktx:1.8.0'
- implementation 'androidx.appcompat:appcompat:1.4.2' // need target 32 for 1.5.0
-
- // dont change this to 1.6.0 it looks ugly af
- implementation 'com.google.android.material:material:1.5.0'
- implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
- implementation 'androidx.navigation:navigation-fragment-ktx:2.5.1'
- implementation 'androidx.navigation:navigation-ui-ktx:2.5.1'
- implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
- implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
- testImplementation 'junit:junit:4.13.2'
- androidTestImplementation 'androidx.test.ext:junit:1.1.3'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-
- //implementation "io.karn:khttp-android:0.1.2" //okhttp instead
-// implementation 'org.jsoup:jsoup:1.13.1'
- implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1"
-
- implementation "androidx.preference:preference-ktx:1.2.0"
-
- implementation 'com.github.bumptech.glide:glide:4.13.1'
- kapt 'com.github.bumptech.glide:compiler:4.13.1'
- implementation 'com.github.bumptech.glide:okhttp3-integration:4.13.0'
-
- implementation 'jp.wasabeef:glide-transformations:4.3.0'
-
- implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-
- // implementation "androidx.leanback:leanback-paging:1.1.0-alpha09"
-
- // Exoplayer
- implementation 'com.google.android.exoplayer:exoplayer:2.16.1'
- implementation 'com.google.android.exoplayer:extension-cast:2.16.1'
- implementation "com.google.android.exoplayer:extension-mediasession:2.16.1"
- implementation 'com.google.android.exoplayer:extension-okhttp:2.16.1'
-
- //implementation "com.google.android.exoplayer:extension-leanback:2.14.0"
-
- // Bug reports
- implementation "ch.acra:acra-core:5.8.4"
- implementation "ch.acra:acra-toast:5.8.4"
-
- compileOnly "com.google.auto.service:auto-service-annotations:1.0"
- //either for java sources:
- annotationProcessor "com.google.auto.service:auto-service:1.0"
- //or for kotlin sources (requires kapt gradle plugin):
- kapt "com.google.auto.service:auto-service:1.0"
-
- // subtitle color picker
- implementation 'com.jaredrummler:colorpicker:1.1.0'
-
- //run JS
- implementation 'org.mozilla:rhino:1.7.14'
-
- // TorrentStream
- //implementation 'com.github.TorrentStream:TorrentStream-Android:2.7.0'
-
- // Downloading
- implementation "androidx.work:work-runtime:2.7.1"
- implementation "androidx.work:work-runtime-ktx:2.7.1"
-
- // Networking
-// implementation "com.squareup.okhttp3:okhttp:4.9.2"
-// implementation "com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1"
- implementation 'com.github.Blatzar:NiceHttp:0.3.3'
-
- // Util to skip the URI file fuckery 🙏
- implementation "com.github.tachiyomiorg:unifile:17bec43"
-
- // API because cba maintaining it myself
- implementation "com.uwetrottmann.tmdb2:tmdb-java:2.6.0"
-
- implementation 'com.github.discord:OverlappingPanels:0.1.3'
- // debugImplementation because LeakCanary should only run in debug builds.
- // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
-
- // for shimmer when loading
- implementation 'com.facebook.shimmer:shimmer:0.5.0'
-
- implementation "androidx.tvprovider:tvprovider:1.0.0"
-
- // used for subtitle decoding https://github.com/albfernandez/juniversalchardet
- implementation 'com.github.albfernandez:juniversalchardet:2.4.0'
-
- // slow af yt
- //implementation 'com.github.HaarigerHarald:android-youtubeExtractor:master-SNAPSHOT'
-
- // newpipe yt
- implementation 'com.github.TeamNewPipe:NewPipeExtractor:dev-SNAPSHOT'
- coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
-
- // Library/extensions searching with Levenshtein distance
- implementation 'me.xdrop:fuzzywuzzy:1.4.0'
-}
-
-task androidSourcesJar(type: Jar) {
- getArchiveClassifier().set('sources')
- from android.sourceSets.main.java.srcDirs//full sources
-}
-
-// this is used by the gradlew plugin
-task makeJar(type: Copy) {
- from('build/intermediates/compile_app_classes_jar/debug')
- into('build')
- include('classes.jar')
- dependsOn('build')
-}
-
-dokkaHtml {
- moduleName.set("Cloudstream")
- dokkaSourceSets {
- main {
- sourceLink {
- // Unix based directory relative path to the root of the project (where you execute gradle respectively).
- localDirectory.set(file("src/main/java"))
-
- // URL showing where the source code can be accessed through the web browser
- remoteUrl.set(new URL(
- "https://github.com/recloudstream/cloudstream/tree/master/app/src/main/java"))
- // Suffix which is used to append the line number to the URL. Use #L for GitHub
- remoteLineSuffix.set("#L")
- }
- }
- }
-}
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 00000000..42ca93fd
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,250 @@
+import com.android.build.gradle.api.BaseVariantOutput
+import org.jetbrains.dokka.gradle.DokkaTask
+import java.io.ByteArrayOutputStream
+import java.net.URL
+
+plugins {
+ id("com.android.application")
+ id("kotlin-android")
+ id("kotlin-kapt")
+ id("kotlin-android-extensions")
+ id("org.jetbrains.dokka")
+}
+
+val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
+val prereleaseStoreFile: File? = File(tmpFilePath).listFiles()?.first()
+
+fun String.execute() = ByteArrayOutputStream().use { baot ->
+ if (project.exec {
+ workingDir = projectDir
+ commandLine = this@execute.split(Regex("\\s"))
+ standardOutput = baot
+ }.exitValue == 0)
+ String(baot.toByteArray()).trim()
+ else null
+}
+
+android {
+ testOptions {
+ unitTests.isReturnDefaultValues = true
+ }
+ signingConfigs {
+ create("prerelease") {
+ if (prereleaseStoreFile != null) {
+ storeFile = file(prereleaseStoreFile)
+ storePassword = System.getenv("SIGNING_STORE_PASSWORD")
+ keyAlias = System.getenv("SIGNING_KEY_ALIAS")
+ keyPassword = System.getenv("SIGNING_KEY_PASSWORD")
+ }
+ }
+ }
+
+ compileSdk = 31
+ buildToolsVersion = "30.0.3"
+
+ defaultConfig {
+ applicationId = "com.lagradost.cloudstream3"
+ minSdk = 21
+ targetSdk = 30
+
+ versionCode = 52
+ versionName = "3.1.6"
+
+ resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
+
+ resValue("string", "commit_hash", "git rev-parse --short HEAD".execute() ?: "")
+
+ resValue("bool", "is_prerelease", "false")
+
+ buildConfigField(
+ "String",
+ "BUILDDATE",
+ "new java.text.SimpleDateFormat(\"yyyy-MM-dd HH:mm\").format(new java.util.Date(" + System.currentTimeMillis() + "L));"
+ )
+
+ testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+ kapt {
+ includeCompileClasspath = true
+ }
+ }
+
+ buildTypes {
+ release {
+ isDebuggable = false
+ isMinifyEnabled = false
+ isShrinkResources = false
+ proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+ }
+ debug {
+ isDebuggable = true
+ applicationIdSuffix = ".debug"
+ proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+ }
+ }
+ flavorDimensions.add("state")
+ productFlavors {
+ create("stable") {
+ dimension = "state"
+ resValue("bool", "is_prerelease", "false")
+ }
+ create("prerelease") {
+ dimension = "state"
+ resValue("bool", "is_prerelease", "true")
+ buildConfigField("boolean", "BETA", "true")
+ applicationIdSuffix = ".prerelease"
+ signingConfig = signingConfigs.getByName("prerelease")
+ versionNameSuffix = "-PRE"
+ versionCode = (System.currentTimeMillis() / 60000).toInt()
+ }
+ }
+ compileOptions {
+ isCoreLibraryDesugaringEnabled = true
+
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
+ }
+ kotlinOptions {
+ jvmTarget = "1.8"
+ freeCompilerArgs = listOf("-Xjvm-default=compatibility")
+ }
+ lint {
+ abortOnError = false
+ checkReleaseBuilds = false
+ }
+ namespace = "com.lagradost.cloudstream3"
+}
+
+repositories {
+ maven("https://jitpack.io")
+}
+
+dependencies {
+ implementation("com.google.android.mediahome:video:1.0.0")
+ implementation("androidx.test.ext:junit-ktx:1.1.3")
+ testImplementation("org.json:json:20180813")
+
+ implementation("androidx.core:core-ktx:1.8.0")
+ implementation("androidx.appcompat:appcompat:1.4.2") // need target 32 for 1.5.0
+
+ // dont change this to 1.6.0 it looks ugly af
+ implementation("com.google.android.material:material:1.5.0")
+ implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+ implementation("androidx.navigation:navigation-fragment-ktx:2.5.1")
+ implementation("androidx.navigation:navigation-ui-ktx:2.5.1")
+ implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
+ implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
+ testImplementation("junit:junit:4.13.2")
+ androidTestImplementation("androidx.test.ext:junit:1.1.3")
+ androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+
+ //implementation("io.karn:khttp-android:0.1.2") //okhttp instead
+// implementation("org.jsoup:jsoup:1.13.1")
+ implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1")
+
+ implementation("androidx.preference:preference-ktx:1.2.0")
+
+ implementation("com.github.bumptech.glide:glide:4.13.1")
+ kapt("com.github.bumptech.glide:compiler:4.13.1")
+ implementation("com.github.bumptech.glide:okhttp3-integration:4.13.0")
+
+ implementation("jp.wasabeef:glide-transformations:4.3.0")
+
+ implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
+
+ // implementation("androidx.leanback:leanback-paging:1.1.0-alpha09")
+
+ // Exoplayer
+ implementation("com.google.android.exoplayer:exoplayer:2.16.1")
+ implementation("com.google.android.exoplayer:extension-cast:2.16.1")
+ implementation("com.google.android.exoplayer:extension-mediasession:2.16.1")
+ implementation("com.google.android.exoplayer:extension-okhttp:2.16.1")
+
+ //implementation("com.google.android.exoplayer:extension-leanback:2.14.0")
+
+ // Bug reports
+ implementation("ch.acra:acra-core:5.8.4")
+ implementation("ch.acra:acra-toast:5.8.4")
+
+ compileOnly("com.google.auto.service:auto-service-annotations:1.0")
+ //either for java sources:
+ annotationProcessor("com.google.auto.service:auto-service:1.0")
+ //or for kotlin sources (requires kapt gradle plugin):
+ kapt("com.google.auto.service:auto-service:1.0")
+
+ // subtitle color picker
+ implementation("com.jaredrummler:colorpicker:1.1.0")
+
+ //run JS
+ implementation("org.mozilla:rhino:1.7.14")
+
+ // TorrentStream
+ //implementation("com.github.TorrentStream:TorrentStream-Android:2.7.0")
+
+ // Downloading
+ implementation("androidx.work:work-runtime:2.7.1")
+ implementation("androidx.work:work-runtime-ktx:2.7.1")
+
+ // Networking
+// implementation("com.squareup.okhttp3:okhttp:4.9.2")
+// implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1")
+ implementation("com.github.Blatzar:NiceHttp:0.3.3")
+
+ // Util to skip the URI file fuckery 🙏
+ implementation("com.github.tachiyomiorg:unifile:17bec43")
+
+ // API because cba maintaining it myself
+ implementation("com.uwetrottmann.tmdb2:tmdb-java:2.6.0")
+
+ implementation("com.github.discord:OverlappingPanels:0.1.3")
+ // debugImplementation because LeakCanary should only run in debug builds.
+ // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
+
+ // for shimmer when loading
+ implementation("com.facebook.shimmer:shimmer:0.5.0")
+
+ implementation("androidx.tvprovider:tvprovider:1.0.0")
+
+ // used for subtitle decoding https://github.com/albfernandez/juniversalchardet
+ implementation("com.github.albfernandez:juniversalchardet:2.4.0")
+
+ // slow af yt
+ //implementation("com.github.HaarigerHarald:android-youtubeExtractor:master-SNAPSHOT")
+
+ // newpipe yt
+ implementation("com.github.TeamNewPipe:NewPipeExtractor:dev-SNAPSHOT")
+ coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
+
+ // Library/extensions searching with Levenshtein distance
+ implementation("me.xdrop:fuzzywuzzy:1.4.0")
+}
+
+tasks.register("androidSourcesJar", Jar::class) {
+ archiveClassifier.set("sources")
+ from(android.sourceSets.getByName("main").java.srcDirs) //full sources
+}
+
+// this is used by the gradlew plugin
+tasks.register("makeJar", Copy::class) {
+ from("build/intermediates/compile_app_classes_jar/prereleaseDebug")
+ into("build")
+ include("classes.jar")
+ dependsOn("build")
+}
+
+tasks.withType().configureEach {
+ moduleName.set("Cloudstream")
+ dokkaSourceSets {
+ named("main") {
+ sourceLink {
+ // Unix based directory relative path to the root of the project (where you execute gradle respectively).
+ localDirectory.set(file("src/main/java"))
+
+ // URL showing where the source code can be accessed through the web browser
+ remoteUrl.set(URL("https://github.com/recloudstream/cloudstream/tree/master/app/src/main/java"))
+ // Suffix which is used to append the line number to the URL. Use #L for GitHub
+ remoteLineSuffix.set("#L")
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 481bb434..ff59496d 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,6 +1,6 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 216a5f21..47676059 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
+ xmlns:tools="http://schemas.android.com/tools">
@@ -27,6 +26,7 @@
+
(Regex("data='(\\S+?)'").first(eval)) ?: return
+ val data = tryParseJson(Regex("data='(\\S+?)'").first(eval)) ?: return
val password = Regex("null,['|\"](\\w+)['|\"]").first(eval)
?.split(Regex("\\D+"))
?.joinToString("") {
Char(it.toInt()).toString()
}.let { Regex("var pass = \"(\\S+?)\"").first(it ?: return)?.toByteArray() }
?: throw ErrorLoadingException("can't find password")
- val decryptedData =
- cryptoAESHandler(data, password, false)?.let { getAndUnpack(it) }?.replace("\\", "")
- ?.substringAfter("sources:[")?.substringBefore("],")
+ val decryptedData = cryptoAESHandler(data, password, false)?.let { getAndUnpack(it) }?.replace("\\", "")
- Regex("\"file\":\"(\\S+?)\".*?res=(\\d+)").findAll(decryptedData ?: return).map {
+ val sourceData = decryptedData?.substringAfter("sources:[")?.substringBefore("],")
+ val subData = decryptedData?.substringAfter("tracks:[")?.substringBefore("],")
+
+ Regex("\"file\":\"(\\S+?)\".*?res=(\\d+)").findAll(sourceData ?: return).map {
it.groupValues[1] to it.groupValues[2]
}.toList().distinctBy { it.second }.map { (link, quality) ->
callback.invoke(
@@ -171,6 +181,17 @@ open class Gdriveplayer : ExtractorApi() {
)
}
+ subData?.addMarks("file")?.addMarks("kind")?.addMarks("label").let { dataSub ->
+ tryParseJson>("[$dataSub]")?.map { sub ->
+ subtitleCallback.invoke(
+ SubtitleFile(
+ sub.label,
+ httpsify(sub.file)
+ )
+ )
+ }
+ }
+
}
data class AesData(
@@ -179,4 +200,10 @@ open class Gdriveplayer : ExtractorApi() {
@JsonProperty("s") val s: String
)
+ data class Tracks(
+ @JsonProperty("file") val file: String,
+ @JsonProperty("kind") val kind: String,
+ @JsonProperty("label") val label: String
+ )
+
}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt
new file mode 100644
index 00000000..e2eb7bf0
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt
@@ -0,0 +1,40 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.M3u8Helper
+
+class Moviehab : ExtractorApi() {
+ override var name = "Moviehab"
+ override var mainUrl = "https://play.moviehab.com"
+ override val requiresReferer = false
+
+ override suspend fun getUrl(
+ url: String,
+ referer: String?,
+ subtitleCallback: (SubtitleFile) -> Unit,
+ callback: (ExtractorLink) -> Unit
+ ) {
+ val res = app.get(url)
+ res.document.select("video#player").let {
+ //should redirect first for making it works
+ val link = app.get("$mainUrl/${it.select("source").attr("src")}", referer = url).url
+ M3u8Helper.generateM3u8(
+ this.name,
+ link,
+ url
+ ).forEach(callback)
+
+ Regex("src[\"|'],\\s[\"|'](\\S+)[\"|']\\)").find(res.text)?.groupValues?.get(1).let {sub ->
+ subtitleCallback.invoke(
+ SubtitleFile(
+ it.select("track").attr("label"),
+ "$mainUrl/$sub"
+ )
+ )
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.kt
index 6153a7c1..8ef6c463 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.kt
@@ -7,7 +7,11 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.M3u8Helper
-class SpeedoStream : ExtractorApi() {
+class SpeedoStream1 : SpeedoStream() {
+ override val mainUrl = "https://speedostream.nl"
+}
+
+open class SpeedoStream : ExtractorApi() {
override val name = "SpeedoStream"
override val mainUrl = "https://speedostream.com"
override val requiresReferer = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
index 30a0496d..913b410b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
@@ -7,6 +7,11 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.M3u8Helper
+class Sbspeed : StreamSB() {
+ override var name = "Sbspeed"
+ override var mainUrl = "https://sbspeed.com"
+}
+
class Streamsss : StreamSB() {
override var mainUrl = "https://streamsss.net"
}
@@ -93,15 +98,15 @@ open class StreamSB : ExtractorApi() {
}
data class Subs (
- @JsonProperty("file") val file: String,
- @JsonProperty("label") val label: String,
+ @JsonProperty("file") val file: String? = null,
+ @JsonProperty("label") val label: String? = null,
)
data class StreamData (
@JsonProperty("file") val file: String,
@JsonProperty("cdn_img") val cdnImg: String,
@JsonProperty("hash") val hash: String,
- @JsonProperty("subs") val subs: List?,
+ @JsonProperty("subs") val subs: ArrayList? = arrayListOf(),
@JsonProperty("length") val length: String,
@JsonProperty("id") val id: String,
@JsonProperty("title") val title: String,
@@ -141,5 +146,14 @@ open class StreamSB : ExtractorApi() {
url,
headers = headers
).forEach(callback)
+
+ mapped.streamData.subs?.map {sub ->
+ subtitleCallback.invoke(
+ SubtitleFile(
+ sub.label.toString(),
+ sub.file ?: return@map null,
+ )
+ )
+ }
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
index 63634704..287fe4d4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
@@ -85,18 +85,12 @@ open class VidSrcExtractor : ExtractorApi() {
this.name,
this.name,
srcm3u8,
- this.mainUrl,
+ "https://vidsrc.stream/",
Qualities.Unknown.value,
extractorData = pass,
isM3u8 = true
)
)
-
-// M3u8Helper.generateM3u8(
-// name,
-// srcm3u8,
-// absoluteUrl
-// ).forEach(callback)
} else {
loadExtractor(linkfixed, url, subtitleCallback, callback)
}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
index 9e3585ae..15ff0436 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
@@ -1,12 +1,23 @@
package com.lagradost.cloudstream3.extractors
import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
import com.lagradost.cloudstream3.utils.ExtractorApi
import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.getQualityFromName
+class Cdnplayer: XStreamCdn() {
+ override val name: String = "Cdnplayer"
+ override val mainUrl: String = "https://cdnplayer.online"
+}
+
+class Kotakajair: XStreamCdn() {
+ override val name: String = "Kotakajair"
+ override val mainUrl: String = "https://kotakajair.xyz"
+}
+
class FEnet: XStreamCdn() {
override val name: String = "FEnet"
override val mainUrl: String = "https://fembed.net"
@@ -59,44 +70,67 @@ open class XStreamCdn : ExtractorApi() {
//val type: String // Mp4
)
+ private data class Player(
+ @JsonProperty("poster_file") val poster_file: String? = null,
+ )
+
private data class ResponseJson(
@JsonProperty("success") val success: Boolean,
- @JsonProperty("data") val data: List?
+ @JsonProperty("player") val player: Player? = null,
+ @JsonProperty("data") val data: List?,
+ @JsonProperty("captions") val captions: List?,
+ )
+
+ private data class Captions(
+ @JsonProperty("id") val id: String,
+ @JsonProperty("hash") val hash: String,
+ @JsonProperty("language") val language: String,
+ @JsonProperty("extension") val extension: String
)
override fun getExtractorUrl(id: String): String {
return "$domainUrl/api/source/$id"
}
- override suspend fun getUrl(url: String, referer: String?): List {
+ override suspend fun getUrl(
+ url: String,
+ referer: String?,
+ subtitleCallback: (SubtitleFile) -> Unit,
+ callback: (ExtractorLink) -> Unit
+ ) {
val headers = mapOf(
"Referer" to url,
"User-Agent" to "Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0",
)
val id = url.trimEnd('/').split("/").last()
val newUrl = "https://${domainUrl}/api/source/${id}"
- val extractedLinksList: MutableList = mutableListOf()
- with(app.post(newUrl, headers = headers)) {
- if (this.code != 200) return listOf()
- val text = this.text
- if (text.isEmpty()) return listOf()
- if (text == """{"success":false,"data":"Video not found or has been removed"}""") return listOf()
- AppUtils.parseJson(text)?.let {
+ app.post(newUrl, headers = headers).let { res ->
+ val sources = tryParseJson(res.text)
+ sources?.let {
if (it.success && it.data != null) {
- it.data.forEach { data ->
- extractedLinksList.add(
+ it.data.map { source ->
+ callback.invoke(
ExtractorLink(
name,
name = name,
- data.file,
+ source.file,
url,
- getQualityFromName(data.label),
+ getQualityFromName(source.label),
)
)
}
}
}
+
+ val userData = sources?.player?.poster_file?.split("/")?.get(2)
+ sources?.captions?.map {
+ subtitleCallback.invoke(
+ SubtitleFile(
+ it?.language.toString(),
+ "$mainUrl/asset/userdata/$userData/caption/${it?.hash}/${it?.id}.${it?.extension}"
+ )
+ )
+ }
}
- return extractedLinksList
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
index 0e5e544b..ce695873 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
@@ -26,6 +26,8 @@ class APIRepository(val api: MainAPI) {
fun isInvalidData(data: String): Boolean {
return data.isEmpty() || data == "[]" || data == "about:blank"
}
+
+ private val cacheHash: HashMap, LoadResponse> = hashMapOf()
}
val hasMainPage = api.hasMainPage
@@ -39,7 +41,13 @@ class APIRepository(val api: MainAPI) {
suspend fun load(url: String): Resource {
return safeApiCall {
if (isInvalidData(url)) throw ErrorLoadingException()
- api.load(api.fixUrl(url)) ?: throw ErrorLoadingException()
+ val fixedUrl = api.fixUrl(url)
+ val key = Pair(api.name,url)
+ cacheHash[key] ?: api.load(fixedUrl)?.also {
+ // we cache 20 responses because ppl often go back to the same shit + 20 because I dont want to cause too much memory leak
+ if (cacheHash.size > 20) cacheHash.remove(cacheHash.keys.random())
+ cacheHash[key] = it
+ } ?: throw ErrorLoadingException()
}
}
@@ -75,7 +83,12 @@ class APIRepository(val api: MainAPI) {
api.lastHomepageRequest = unixTimeMS
nameIndex?.let { api.mainPage.getOrNull(it) }?.let { data ->
- listOf(api.getMainPage(page, MainPageRequest(data.name, data.data, data.horizontalImages)))
+ listOf(
+ api.getMainPage(
+ page,
+ MainPageRequest(data.name, data.data, data.horizontalImages)
+ )
+ )
} ?: run {
if (api.sequentialMainPage) {
var first = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt
index 417b4408..eb4eb666 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt
@@ -5,13 +5,12 @@ import androidx.annotation.StringRes
import com.lagradost.cloudstream3.R
enum class WatchType(val internalId: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) {
- // FIX ICONS
- WATCHING(0, R.string.type_watching, R.drawable.ic_baseline_remove_red_eye_24),
- COMPLETED(1, R.string.type_completed, R.drawable.ic_baseline_check_24),
- ONHOLD(2, R.string.type_on_hold, R.drawable.ic_baseline_pause_24),
- DROPPED(3, R.string.type_dropped, R.drawable.ic_baseline_close_24),
- PLANTOWATCH(4, R.string.type_plan_to_watch, R.drawable.ic_baseline_close_24),
- NONE(5, R.string.type_none, R.drawable.ic_baseline_remove_red_eye_24);
+ WATCHING(0, R.string.type_watching, R.drawable.ic_baseline_bookmark_24),
+ COMPLETED(1, R.string.type_completed, R.drawable.ic_baseline_bookmark_24),
+ ONHOLD(2, R.string.type_on_hold, R.drawable.ic_baseline_bookmark_24),
+ DROPPED(3, R.string.type_dropped, R.drawable.ic_baseline_bookmark_24),
+ PLANTOWATCH(4, R.string.type_plan_to_watch, R.drawable.ic_baseline_bookmark_24),
+ NONE(5, R.string.type_none, R.drawable.ic_baseline_add_24);
companion object {
fun fromInternalId(id: Int?) = values().find { value -> value.internalId == id } ?: NONE
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 0d571b76..2f539a33 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -14,6 +14,8 @@ import android.view.ViewGroup
import android.widget.*
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.SearchView
+import androidx.core.content.ContextCompat
+import androidx.core.content.ContextCompat.getDrawable
import androidx.core.view.isGone
import androidx.core.view.isVisible
import androidx.core.widget.NestedScrollView
@@ -26,11 +28,14 @@ import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.button.MaterialButton
+import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipGroup
import com.lagradost.cloudstream3.*
import com.lagradost.cloudstream3.APIHolder.apis
import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
+import com.lagradost.cloudstream3.APIHolder.getId
import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
import com.lagradost.cloudstream3.MainActivity.Companion.mainPluginsLoadedEvent
@@ -43,6 +48,7 @@ import com.lagradost.cloudstream3.ui.APIRepository.Companion.randomApi
import com.lagradost.cloudstream3.ui.AutofitRecyclerView
import com.lagradost.cloudstream3.ui.WatchType
import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
+import com.lagradost.cloudstream3.ui.result.ResultViewModel2.Companion.updateWatchStatus
import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
import com.lagradost.cloudstream3.ui.result.setLinearListLayout
import com.lagradost.cloudstream3.ui.search.*
@@ -50,6 +56,7 @@ import com.lagradost.cloudstream3.ui.search.SearchHelper.handleSearchClickCallba
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
import com.lagradost.cloudstream3.utils.AppUtils.isRecyclerScrollable
+import com.lagradost.cloudstream3.utils.AppUtils.loadResult
import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
import com.lagradost.cloudstream3.utils.AppUtils.setMaxViewPoolSize
import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
@@ -61,11 +68,11 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.deleteAllResumeStateIds
import com.lagradost.cloudstream3.utils.DataStoreHelper.removeLastWatched
import com.lagradost.cloudstream3.utils.DataStoreHelper.setResultWatchState
import com.lagradost.cloudstream3.utils.Event
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showOptionSelectStringRes
import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
import com.lagradost.cloudstream3.utils.UIHelper.setImage
@@ -82,14 +89,12 @@ import kotlinx.android.synthetic.main.fragment_home.home_loading
import kotlinx.android.synthetic.main.fragment_home.home_loading_error
import kotlinx.android.synthetic.main.fragment_home.home_loading_shimmer
import kotlinx.android.synthetic.main.fragment_home.home_loading_statusbar
-import kotlinx.android.synthetic.main.fragment_home.home_main_poster_recyclerview
import kotlinx.android.synthetic.main.fragment_home.home_master_recycler
import kotlinx.android.synthetic.main.fragment_home.home_plan_to_watch_btt
import kotlinx.android.synthetic.main.fragment_home.home_provider_meta_info
import kotlinx.android.synthetic.main.fragment_home.home_provider_name
import kotlinx.android.synthetic.main.fragment_home.home_reload_connection_open_in_browser
import kotlinx.android.synthetic.main.fragment_home.home_reload_connectionerror
-import kotlinx.android.synthetic.main.fragment_home.home_statusbar
import kotlinx.android.synthetic.main.fragment_home.home_type_completed_btt
import kotlinx.android.synthetic.main.fragment_home.home_type_dropped_btt
import kotlinx.android.synthetic.main.fragment_home.home_type_on_hold_btt
@@ -100,6 +105,8 @@ import kotlinx.android.synthetic.main.fragment_home.home_watch_parent_item_title
import kotlinx.android.synthetic.main.fragment_home.result_error_text
import kotlinx.android.synthetic.main.fragment_home_tv.*
import kotlinx.android.synthetic.main.home_episodes_expanded.*
+import kotlinx.android.synthetic.main.tvtypes_chips.*
+import kotlinx.android.synthetic.main.tvtypes_chips.view.*
import java.util.*
const val HOME_BOOKMARK_VALUE_LIST = "home_bookmarked_last_list"
@@ -247,16 +254,16 @@ class HomeFragment : Fragment() {
}
fun getPairList(
- anime: MaterialButton?,
- cartoons: MaterialButton?,
- tvs: MaterialButton?,
- docs: MaterialButton?,
- movies: MaterialButton?,
- asian: MaterialButton?,
- livestream: MaterialButton?,
- nsfw: MaterialButton?,
- others: MaterialButton?,
- ): List>> {
+ anime: Chip?,
+ cartoons: Chip?,
+ tvs: Chip?,
+ docs: Chip?,
+ movies: Chip?,
+ asian: Chip?,
+ livestream: Chip?,
+ nsfw: Chip?,
+ others: Chip?,
+ ): List>> {
// This list should be same order as home screen to aid navigation
return listOf(
Pair(movies, listOf(TvType.Movie, TvType.Torrent)),
@@ -271,6 +278,59 @@ class HomeFragment : Fragment() {
)
}
+ private fun getPairList(header: ChipGroup) = getPairList(
+ header.home_select_anime,
+ header.home_select_cartoons,
+ header.home_select_tv_series,
+ header.home_select_documentaries,
+ header.home_select_movies,
+ header.home_select_asian,
+ header.home_select_livestreams,
+ header.home_select_nsfw,
+ header.home_select_others
+ )
+
+ fun validateChips(header: ChipGroup?, validTypes: List) {
+ if (header == null) return
+ val pairList = getPairList(header)
+ for ((button, types) in pairList) {
+ val isValid = validTypes.any { types.contains(it) }
+ button?.isVisible = isValid
+ }
+ }
+
+ fun updateChips(header: ChipGroup?, selectedTypes: List) {
+ if (header == null) return
+ val pairList = getPairList(header)
+ for ((button, types) in pairList) {
+ button?.isChecked =
+ button?.isVisible == true && selectedTypes.any { types.contains(it) }
+ }
+ }
+
+ fun bindChips(
+ header: ChipGroup?,
+ selectedTypes: List,
+ validTypes: List,
+ callback: (List) -> Unit
+ ) {
+ if (header == null) return
+ val pairList = getPairList(header)
+ for ((button, types) in pairList) {
+ val isValid = validTypes.any { types.contains(it) }
+ button?.isVisible = isValid
+ button?.isChecked = isValid && selectedTypes.any { types.contains(it) }
+ button?.setOnCheckedChangeListener { _, _ ->
+ val list = ArrayList()
+ for ((sbutton, vvalidTypes) in pairList) {
+ if (sbutton?.isChecked == true)
+ list.addAll(vvalidTypes)
+ }
+ callback(list)
+ }
+ }
+ }
+
fun Context.selectHomepage(selectedApiName: String?, callback: (String) -> Unit) {
val validAPIs = filterProviderByPreferredMedia().toMutableList()
@@ -296,21 +356,9 @@ class HomeFragment : Fragment() {
?.toMutableList()
?: mutableListOf(TvType.Movie, TvType.TvSeries)
- val anime = dialog.findViewById(R.id.home_select_anime)
- val cartoons = dialog.findViewById(R.id.home_select_cartoons)
- val tvs = dialog.findViewById(R.id.home_select_tv_series)
- val docs = dialog.findViewById(R.id.home_select_documentaries)
- val movies = dialog.findViewById(R.id.home_select_movies)
- val asian = dialog.findViewById(R.id.home_select_asian)
- val livestream = dialog.findViewById(R.id.home_select_livestreams)
- val nsfw = dialog.findViewById(R.id.home_select_nsfw)
- val others = dialog.findViewById(R.id.home_select_others)
val cancelBtt = dialog.findViewById(R.id.cancel_btt)
val applyBtt = dialog.findViewById(R.id.apply_btt)
- val pairList =
- getPairList(anime, cartoons, tvs, docs, movies, asian, livestream, nsfw, others)
-
cancelBtt?.setOnClickListener {
dialog.dismissSafe()
}
@@ -355,52 +403,14 @@ class HomeFragment : Fragment() {
arrayAdapter.notifyDataSetChanged()
}
- /**
- * Since fire tv is fucked we need to manually define the focus layout.
- * Since visible buttons are only known in runtime this is required.
- **/
- var lastButton: MaterialButton? = null
-
- for ((button, validTypes) in pairList) {
- val isValid =
- validAPIs.any { api -> validTypes.any { api.supportedTypes.contains(it) } }
- button?.isVisible = isValid
- if (isValid) {
-
- // Set focus navigation
- button?.let { currentButton ->
- lastButton?.nextFocusRightId = currentButton.id
- lastButton?.id?.let { currentButton.nextFocusLeftId = it }
- lastButton = currentButton
- }
-
- fun buttonContains(): Boolean {
- return preSelectedTypes.any { validTypes.contains(it) }
- }
-
- button?.isSelected = buttonContains()
- button?.setOnClickListener {
- preSelectedTypes.clear()
- preSelectedTypes.addAll(validTypes)
- for ((otherButton, _) in pairList) {
- otherButton?.isSelected = false
- }
- button.isSelected = true
- updateList()
- }
-
- button?.setOnLongClickListener {
- if (!buttonContains()) {
- button.isSelected = true
- preSelectedTypes.addAll(validTypes)
- } else {
- button.isSelected = false
- preSelectedTypes.removeAll(validTypes)
- }
- updateList()
- return@setOnLongClickListener true
- }
- }
+ bindChips(
+ dialog.home_select_group,
+ preSelectedTypes,
+ validAPIs.flatMap { it.supportedTypes }.distinct()
+ ) { list ->
+ preSelectedTypes.clear()
+ preSelectedTypes.addAll(list)
+ updateList()
}
updateList()
}
@@ -422,7 +432,6 @@ class HomeFragment : Fragment() {
}
private fun toggleMainVisibility(visible: Boolean) {
- home_main_holder?.isVisible = visible
home_main_poster_recyclerview?.isVisible = visible
}
@@ -531,6 +540,51 @@ class HomeFragment : Fragment() {
home_random?.visibility = View.GONE
}
+ observe(homeViewModel.preview) { preview ->
+ when (preview) {
+ is Resource.Success -> {
+ home_preview?.isVisible = true
+ preview.value.apply {
+ home_preview_tags?.text = tags?.joinToString(" • ") ?: ""
+ home_preview_tags?.isGone = tags.isNullOrEmpty()
+ home_preview_image?.setImage(posterUrl, posterHeaders)
+ home_preview_title?.text = name
+ home_preview_play?.setOnClickListener {
+ activity?.loadResult(url, apiName, START_ACTION_RESUME_LATEST)
+ //activity.loadSearchResult(url, START_ACTION_RESUME_LATEST)
+ }
+ home_preview_info?.setOnClickListener {
+ activity?.loadResult(url, apiName)
+ //activity.loadSearchResult(random)
+ }
+ // very ugly code, but I dont care
+ val watchType = DataStoreHelper.getResultWatchState(preview.value.getId())
+ home_preview_bookmark?.setText(watchType.stringRes)
+ home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(null,getDrawable(home_preview_bookmark.context, watchType.iconRes),null,null)
+ home_preview_bookmark?.setOnClickListener { fab ->
+ activity?.showBottomDialog(
+ WatchType.values().map { fab.context.getString(it.stringRes) }
+ .toList(),
+ DataStoreHelper.getResultWatchState(preview.value.getId()).ordinal,
+ fab.context.getString(R.string.action_add_to_bookmarks),
+ showApply = false,
+ {}) {
+ val newValue = WatchType.values()[it]
+ home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(null,getDrawable(home_preview_bookmark.context, newValue.iconRes),null,null)
+ home_preview_bookmark?.setText(newValue.stringRes)
+
+ updateWatchStatus(preview.value, newValue)
+ reloadStored()
+ }
+ }
+ }
+ }
+ else -> {
+ home_preview?.isVisible = false
+ }
+ }
+ }
+
observe(homeViewModel.apiName) { apiName ->
currentApiName = apiName
// setKey(USER_SELECTED_HOMEPAGE_API, apiName)
@@ -563,17 +617,17 @@ class HomeFragment : Fragment() {
HomeChildItemAdapter(
mutableListOf(),
R.layout.home_result_big_grid,
- nextFocusUp = home_main_poster_recyclerview.nextFocusUpId,
- nextFocusDown = home_main_poster_recyclerview.nextFocusDownId
+ nextFocusUp = home_main_poster_recyclerview?.nextFocusUpId,
+ nextFocusDown = home_main_poster_recyclerview?.nextFocusDownId
) { callback ->
homeHandleSearch(callback)
}
- home_main_poster_recyclerview.setLinearListLayout()
+ home_main_poster_recyclerview?.setLinearListLayout()
observe(homeViewModel.randomItems) { items ->
if (items.isNullOrEmpty()) {
toggleMainVisibility(false)
} else {
- val tempAdapter = home_main_poster_recyclerview.adapter as HomeChildItemAdapter?
+ val tempAdapter = home_main_poster_recyclerview?.adapter as? HomeChildItemAdapter?
// no need to reload if it has the same data
if (tempAdapter != null && tempAdapter.cardList == items) {
toggleMainVisibility(true)
@@ -938,7 +992,7 @@ class HomeFragment : Fragment() {
}
}
- context?.fixPaddingStatusbarView(home_statusbar)
+ //context?.fixPaddingStatusbarView(home_statusbar)
context?.fixPaddingStatusbar(home_loading_statusbar)
home_master_recycler.adapter =
@@ -959,33 +1013,6 @@ class HomeFragment : Fragment() {
}
} // GridLayoutManager(context, 1).also { it.supportsPredictiveItemAnimations() }
- if (!isTvSettings()) {
- LinearSnapHelper().attachToRecyclerView(home_main_poster_recyclerview) // snap
- val centerLayoutManager =
- CenterZoomLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
- centerLayoutManager.setOnSizeListener { index ->
- (home_main_poster_recyclerview?.adapter as HomeChildItemAdapter?)?.cardList?.get(
- index
- )?.let { random ->
- home_main_play?.setOnClickListener {
- activity.loadSearchResult(random, START_ACTION_RESUME_LATEST)
- }
- home_main_info?.setOnClickListener {
- activity.loadSearchResult(random)
- }
-
- home_main_text?.text =
- random.name + if (random is AnimeSearchResponse && !random.dubStatus.isNullOrEmpty()) {
- random.dubStatus?.joinToString(
- prefix = " • ",
- separator = " | "
- ) { it.name }
- } else ""
- }
- }
- home_main_poster_recyclerview?.layoutManager = centerLayoutManager // scale
- }
-
reloadStored()
loadHomePage()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
index 30fd45c1..0b928a55 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
@@ -13,6 +13,7 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.context
import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
import com.lagradost.cloudstream3.HomePageList
+import com.lagradost.cloudstream3.LoadResponse
import com.lagradost.cloudstream3.MainAPI
import com.lagradost.cloudstream3.SearchResponse
import com.lagradost.cloudstream3.mvvm.*
@@ -32,7 +33,6 @@ import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
import com.lagradost.cloudstream3.utils.VideoDownloadHelper
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.util.*
import kotlin.collections.set
@@ -58,7 +58,9 @@ class HomeViewModel : ViewModel() {
val bookmarks: LiveData>> = _bookmarks
private val _resumeWatching = MutableLiveData>()
+ private val _preview = MutableLiveData>()
val resumeWatching: LiveData> = _resumeWatching
+ val preview: LiveData> = _preview
fun loadResumeWatching() = viewModelScope.launchSafe {
val resumeWatching = withContext(Dispatchers.IO) {
@@ -207,6 +209,7 @@ class HomeViewModel : ViewModel() {
expandAndReturn(name)
}
+
private fun load(api: MainAPI?) = viewModelScope.launchSafe {
repo = if (api != null) {
APIRepository(api)
@@ -219,6 +222,7 @@ class HomeViewModel : ViewModel() {
if (repo?.hasMainPage == true) {
_page.postValue(Resource.Loading())
+ _preview.postValue(Resource.Loading())
when (val data = repo?.getMainPage(1, null)) {
is Resource.Success -> {
@@ -232,8 +236,38 @@ class HomeViewModel : ViewModel() {
ExpandableHomepageList(filteredList, 1, home.hasNext)
}
}
- _page.postValue(Resource.Success(expandable))
val items = data.value.mapNotNull { it?.items }.flatten()
+ items.randomOrNull()?.list?.randomOrNull()?.url?.let { url ->
+ // backup request in case first fails
+ var first = repo?.load(url)
+ if(first == null ||first is Resource.Failure) {
+ first = repo?.load(items.random().list.random().url)
+ }
+ first?.let {
+ _preview.postValue(it)
+ } ?: run {
+ _preview.postValue(
+ Resource.Failure(
+ false,
+ null,
+ null,
+ "No repo found, this should never happen"
+ )
+ )
+ }
+ } ?: run {
+ _preview.postValue(
+ Resource.Failure(
+ false,
+ null,
+ null,
+ "No homepage items"
+ )
+ )
+ }
+
+ _page.postValue(Resource.Success(expandable))
+
//val home = data.value
if (items.isNotEmpty()) {
@@ -263,6 +297,7 @@ class HomeViewModel : ViewModel() {
}
} else {
_page.postValue(Resource.Success(emptyMap()))
+ _preview.postValue(Resource.Failure(false, null, null, "No homepage"))
}
}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index ea466120..a838c85c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -17,10 +17,7 @@ import com.google.android.exoplayer2.text.TextRenderer
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
import com.google.android.exoplayer2.trackselection.TrackSelector
import com.google.android.exoplayer2.ui.SubtitleView
-import com.google.android.exoplayer2.upstream.DataSource
-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
-import com.google.android.exoplayer2.upstream.HttpDataSource
+import com.google.android.exoplayer2.upstream.*
import com.google.android.exoplayer2.upstream.cache.CacheDataSource
import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
import com.google.android.exoplayer2.upstream.cache.SimpleCache
@@ -880,7 +877,16 @@ class CS3IPlayer : IPlayer {
}
override fun onPlayerError(error: PlaybackException) {
- playerError?.invoke(error)
+ // If the Network fails then ignore the exception if the duration is set.
+ // This is to switch mirrors automatically if the stream has not been fetched, but
+ // allow playing the buffer without internet as then the duration is fetched.
+ if (error.errorCode == PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED
+ && exoPlayer?.duration != C.TIME_UNSET
+ ) {
+ exoPlayer?.prepare()
+ } else {
+ playerError?.invoke(error)
+ }
super.onPlayerError(error)
}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 906b652d..7c099793 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -412,6 +412,29 @@ class ResultViewModel2 : ViewModel() {
return this?.firstOrNull { it.season == season }
}
+ fun updateWatchStatus(currentResponse : LoadResponse, status: WatchType) {
+ val currentId = currentResponse.getId()
+ val resultPage = currentResponse
+
+ DataStoreHelper.setResultWatchState(currentId, status.internalId)
+ val current = DataStoreHelper.getBookmarkedData(currentId)
+ val currentTime = System.currentTimeMillis()
+ DataStoreHelper.setBookmarkedData(
+ currentId,
+ DataStoreHelper.BookmarkedData(
+ currentId,
+ current?.bookmarkedTime ?: currentTime,
+ currentTime,
+ resultPage.name,
+ resultPage.url,
+ resultPage.apiName,
+ resultPage.type,
+ resultPage.posterUrl,
+ resultPage.year
+ )
+ )
+ }
+
private fun filterName(name: String?): String? {
if (name == null) return null
Regex("[eE]pisode [0-9]*(.*)").find(name)?.groupValues?.get(1)?.let {
@@ -764,28 +787,10 @@ class ResultViewModel2 : ViewModel() {
private val _selectPopup: MutableLiveData> = MutableLiveData(Some.None)
val selectPopup: LiveData> get() = _selectPopup
- fun updateWatchStatus(status: WatchType) {
- val currentId = currentId ?: return
- val resultPage = currentResponse ?: return
- _watchStatus.postValue(status)
- DataStoreHelper.setResultWatchState(currentId, status.internalId)
- val current = DataStoreHelper.getBookmarkedData(currentId)
- val currentTime = System.currentTimeMillis()
- DataStoreHelper.setBookmarkedData(
- currentId,
- DataStoreHelper.BookmarkedData(
- currentId,
- current?.bookmarkedTime ?: currentTime,
- currentTime,
- resultPage.name,
- resultPage.url,
- resultPage.apiName,
- resultPage.type,
- resultPage.posterUrl,
- resultPage.year
- )
- )
+ fun updateWatchStatus(status: WatchType) {
+ updateWatchStatus(currentResponse ?: return,status)
+ _watchStatus.postValue(status)
}
private fun startChromecast(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index 5f108cd1..8f588bf7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -26,15 +26,19 @@ import com.lagradost.cloudstream3.APIHolder.filterSearchResultByFilmQuality
import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
import com.lagradost.cloudstream3.APIHolder.getApiSettings
+import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
+import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
import com.lagradost.cloudstream3.mvvm.Resource
import com.lagradost.cloudstream3.mvvm.logError
import com.lagradost.cloudstream3.mvvm.observe
import com.lagradost.cloudstream3.ui.APIRepository
import com.lagradost.cloudstream3.ui.home.HomeFragment
+import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.bindChips
import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.currentSpan
import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.loadHomepageList
+import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.updateChips
import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
import com.lagradost.cloudstream3.utils.Coroutines.main
@@ -46,6 +50,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
import kotlinx.android.synthetic.main.fragment_search.*
+import kotlinx.android.synthetic.main.tvtypes_chips.*
import java.util.concurrent.locks.ReentrantLock
const val SEARCH_PREF_TAGS = "search_pref_tags"
@@ -130,65 +135,26 @@ class SearchFragment : Fragment() {
// Null if defined as a variable
// This needs to be run after view created
- private fun getPairList(): List>> {
- return HomeFragment.getPairList(
- search_select_anime,
- search_select_cartoons,
- search_select_tv_series,
- search_select_documentaries,
- search_select_movies,
- search_select_asian,
- search_select_livestreams,
- search_select_nsfw,
- search_select_others
- )
- }
private fun reloadRepos(success: Boolean = false) = main {
- val pairList = getPairList()
-
searchViewModel.reloadRepos()
context?.filterProviderByPreferredMedia()?.let { validAPIs ->
- for ((button, validTypes) in pairList) {
- val isValid =
- validAPIs.any { api -> validTypes.any { api.supportedTypes.contains(it) } }
- button?.isVisible = isValid
- if (isValid) {
- fun buttonContains(): Boolean {
- return selectedSearchTypes.any { validTypes.contains(it) }
- }
-
- button?.isSelected = buttonContains()
- button?.setOnClickListener {
- val last = selectedSearchTypes.toSet()
- selectedSearchTypes.clear()
- selectedSearchTypes.addAll(validTypes)
- for ((otherButton, _) in pairList) {
- otherButton?.isSelected = false
- }
- it?.context?.setKey(SEARCH_PREF_TAGS, selectedSearchTypes)
- it?.isSelected = true
- if (last != selectedSearchTypes.toSet()) // if you click the same button again the it does nothing
- search(main_search?.query?.toString())
- }
-
- button?.setOnLongClickListener {
- if (!buttonContains()) {
- it?.isSelected = true
- selectedSearchTypes.addAll(validTypes)
- } else {
- it?.isSelected = false
- selectedSearchTypes.removeAll(validTypes)
- }
- it?.context?.setKey(SEARCH_PREF_TAGS, selectedSearchTypes)
- search(main_search?.query?.toString())
- return@setOnLongClickListener true
- }
+ bindChips(
+ home_select_group,
+ selectedSearchTypes,
+ validAPIs.flatMap { api -> api.supportedTypes }.distinct()
+ ) { list ->
+ if (selectedSearchTypes.toSet() != list.toSet()) {
+ setKey(SEARCH_PREF_TAGS, selectedSearchTypes)
+ selectedSearchTypes.clear()
+ selectedSearchTypes.addAll(list)
+ search(main_search?.query?.toString())
}
}
}
}
+
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
@@ -239,31 +205,67 @@ class SearchFragment : Fragment() {
builder.let { dialog ->
val isMultiLang = ctx.getApiProviderLangSettings().size > 1
- val anime = dialog.findViewById(R.id.home_select_anime)
- val cartoons = dialog.findViewById(R.id.home_select_cartoons)
- val tvs = dialog.findViewById(R.id.home_select_tv_series)
- val docs = dialog.findViewById(R.id.home_select_documentaries)
- val movies = dialog.findViewById(R.id.home_select_movies)
- val asian = dialog.findViewById(R.id.home_select_asian)
- val livestream =
- dialog.findViewById(R.id.home_select_livestreams)
- val nsfw = dialog.findViewById(R.id.home_select_nsfw)
- val other = dialog.findViewById(R.id.home_select_others)
val cancelBtt = dialog.findViewById(R.id.cancel_btt)
val applyBtt = dialog.findViewById(R.id.apply_btt)
- val pairList =
- HomeFragment.getPairList(
- anime,
- cartoons,
- tvs,
- docs,
- movies,
- asian,
- livestream,
- nsfw,
- other
- )
+ val listView = dialog.findViewById(R.id.listview1)
+ val arrayAdapter = ArrayAdapter(ctx, R.layout.sort_bottom_single_choice)
+ listView?.adapter = arrayAdapter
+ listView?.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
+
+ listView?.setOnItemClickListener { _, _, i, _ ->
+ if (currentValidApis.isNotEmpty()) {
+ val api = currentValidApis[i].name
+ if (currentSelectedApis.contains(api)) {
+ listView.setItemChecked(i, false)
+ currentSelectedApis -= api
+ } else {
+ listView.setItemChecked(i, true)
+ currentSelectedApis += api
+ }
+ }
+ }
+
+ fun updateList(types: List) {
+ setKey(SEARCH_PREF_TAGS, types.map {it.name})
+
+ arrayAdapter.clear()
+ currentValidApis = validAPIs.filter { api ->
+ api.supportedTypes.any {
+ types.contains(it)
+ }
+ }.sortedBy { it.name.lowercase() }
+
+ val names = currentValidApis.map {
+ if (isMultiLang) "${
+ SubtitleHelper.getFlagFromIso(
+ it.lang
+ )?.plus(" ") ?: ""
+ }${it.name}" else it.name
+ }
+ for ((index, api) in currentValidApis.map { it.name }.withIndex()) {
+ listView?.setItemChecked(index, currentSelectedApis.contains(api))
+ }
+
+ //arrayAdapter.notifyDataSetChanged()
+ arrayAdapter.addAll(names)
+ arrayAdapter.notifyDataSetChanged()
+ }
+
+ val selectedSearchTypes = getKey>(SEARCH_PREF_TAGS)
+ ?.mapNotNull { listName ->
+ TvType.values().firstOrNull { it.name == listName }
+ }
+ ?.toMutableList()
+ ?: mutableListOf(TvType.Movie, TvType.TvSeries)
+
+ bindChips(
+ dialog.home_select_group,
+ selectedSearchTypes,
+ TvType.values().toList()
+ ) { list ->
+ updateList(list)
+ }
cancelBtt?.setOnClickListener {
dialog.dismissSafe()
@@ -284,90 +286,7 @@ class SearchFragment : Fragment() {
context?.setKey(SEARCH_PREF_PROVIDERS, currentSelectedApis.toList())
selectedApis = currentSelectedApis
}
-
- val selectedSearchTypes = context?.getKey>(SEARCH_PREF_TAGS)
- ?.mapNotNull { listName ->
- TvType.values().firstOrNull { it.name == listName }
- }
- ?.toMutableList()
- ?: mutableListOf(TvType.Movie, TvType.TvSeries)
-
- val listView = dialog.findViewById(R.id.listview1)
- val arrayAdapter = ArrayAdapter(ctx, R.layout.sort_bottom_single_choice)
- listView?.adapter = arrayAdapter
- listView?.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
-
- listView?.setOnItemClickListener { _, _, i, _ ->
- if (currentValidApis.isNotEmpty()) {
- val api = currentValidApis[i].name
- if (currentSelectedApis.contains(api)) {
- listView.setItemChecked(i, false)
- currentSelectedApis -= api
- } else {
- listView.setItemChecked(i, true)
- currentSelectedApis += api
- }
- }
- }
-
- fun updateList() {
- arrayAdapter.clear()
- currentValidApis = validAPIs.filter { api ->
- api.supportedTypes.any {
- selectedSearchTypes.contains(it)
- }
- }.sortedBy { it.name.lowercase() }
-
- val names = currentValidApis.map {
- if (isMultiLang) "${
- SubtitleHelper.getFlagFromIso(
- it.lang
- )?.plus(" ") ?: ""
- }${it.name}" else it.name
- }
- for ((index, api) in currentValidApis.map { it.name }.withIndex()) {
- listView?.setItemChecked(index, currentSelectedApis.contains(api))
- }
-
- //arrayAdapter.notifyDataSetChanged()
- arrayAdapter.addAll(names)
- arrayAdapter.notifyDataSetChanged()
- }
-
- for ((button, validTypes) in pairList) {
- val isValid =
- validAPIs.any { api -> validTypes.any { api.supportedTypes.contains(it) } }
- button?.isVisible = isValid
- if (isValid) {
- fun buttonContains(): Boolean {
- return selectedSearchTypes.any { validTypes.contains(it) }
- }
-
- button?.isSelected = buttonContains()
- button?.setOnClickListener {
- selectedSearchTypes.clear()
- selectedSearchTypes.addAll(validTypes)
- for ((otherButton, _) in pairList) {
- otherButton?.isSelected = false
- }
- button.isSelected = true
- updateList()
- }
-
- button?.setOnLongClickListener {
- if (!buttonContains()) {
- button.isSelected = true
- selectedSearchTypes.addAll(validTypes)
- } else {
- button.isSelected = false
- selectedSearchTypes.removeAll(validTypes)
- }
- updateList()
- return@setOnLongClickListener true
- }
- }
- }
- updateList()
+ updateList(selectedSearchTypes.toList())
}
}
}
@@ -380,14 +299,6 @@ class SearchFragment : Fragment() {
?.toMutableList()
?: mutableListOf(TvType.Movie, TvType.TvSeries)
- val pairList = getPairList()
- fun updateSelectedList(list: MutableList) {
- selectedSearchTypes = list
- for ((button, validTypes) in pairList) {
- button?.isSelected = selectedSearchTypes.any { validTypes.contains(it) }
- }
- }
-
if (isTrueTvSettings()) {
search_filter.isFocusable = true
search_filter.isFocusableInTouchMode = true
@@ -500,7 +411,7 @@ class SearchFragment : Fragment() {
SEARCH_HISTORY_OPEN -> {
searchViewModel.clearSearch()
if (searchItem.type.isNotEmpty())
- updateSelectedList(searchItem.type.toMutableList())
+ updateChips(home_select_group, searchItem.type.toMutableList())
main_search?.setQuery(searchItem.searchText, true)
}
SEARCH_HISTORY_REMOVE -> {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 57074e74..8ea76cda 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -79,6 +79,7 @@ val appLanguages = arrayListOf(
Triple("\uD83C\uDDEE\uD83C\uDDE9", "Indonesian", "in"),
Triple("", "Czech", "cs"),
Triple("", "Croatian", "hr"),
+ Triple("", "Bulgarian", "bg"),
).sortedBy { it.second } //ye, we go alphabetical, so ppl don't put their lang on top
class SettingsGeneral : PreferenceFragmentCompat() {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
index aa302c5a..bacd26c8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
@@ -9,8 +9,9 @@ import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.TvType
import com.lagradost.cloudstream3.mvvm.observe
-import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.getPairList
+import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.bindChips
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
import com.lagradost.cloudstream3.ui.settings.appLanguages
@@ -18,6 +19,8 @@ import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
import com.lagradost.cloudstream3.utils.SubtitleHelper
import com.lagradost.cloudstream3.utils.UIHelper.toPx
import kotlinx.android.synthetic.main.fragment_plugins.*
+import kotlinx.android.synthetic.main.tvtypes_chips.*
+import kotlinx.android.synthetic.main.tvtypes_chips_scroll.*
const val PLUGINS_BUNDLE_NAME = "name"
const val PLUGINS_BUNDLE_URL = "url"
@@ -145,56 +148,10 @@ class PluginsFragment : Fragment() {
pluginViewModel.updatePluginList(context, url)
tv_types_scroll_view?.isVisible = true
- // 💀💀💀💀💀💀💀 Recyclerview when
- val pairList = getPairList(
- home_select_anime,
- home_select_cartoons,
- home_select_tv_series,
- home_select_documentaries,
- home_select_movies,
- home_select_asian,
- home_select_livestreams,
- home_select_nsfw,
- home_select_others
- )
-
-// val supportedTypes: Array =
-// pluginViewModel.filteredPlugins.value!!.second.flatMap { it -> it.plugin.second.tvTypes ?: listOf("Other") }.distinct().toTypedArray()
-
- // Copy pasted code
- for ((button, validTypes) in pairList) {
- val validTypesMapped = validTypes.map { it.name }
- val isValid = true
- //validTypes.any { it -> supportedTypes.contains(it.name) }
- button?.isVisible = isValid
- if (isValid) {
- fun buttonContains(): Boolean {
- return pluginViewModel.tvTypes.any { validTypesMapped.contains(it) }
- }
-
- button?.isSelected = buttonContains()
- button?.setOnClickListener {
- pluginViewModel.tvTypes.clear()
- pluginViewModel.tvTypes.addAll(validTypesMapped)
- for ((otherButton, _) in pairList) {
- otherButton?.isSelected = false
- }
- button.isSelected = true
- pluginViewModel.updateFilteredPlugins()
- }
-
- button?.setOnLongClickListener {
- if (!buttonContains()) {
- button.isSelected = true
- pluginViewModel.tvTypes.addAll(validTypesMapped)
- } else {
- button.isSelected = false
- pluginViewModel.tvTypes.removeAll(validTypesMapped)
- }
- pluginViewModel.updateFilteredPlugins()
- return@setOnLongClickListener true
- }
- }
+ bindChips(home_select_group, emptyList(), TvType.values().toList()) { list ->
+ pluginViewModel.tvTypes.clear()
+ pluginViewModel.tvTypes.addAll(list.map { it.name })
+ pluginViewModel.updateFilteredPlugins()
}
}
}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 8d6b1b82..ca612385 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -235,6 +235,7 @@ val extractorApis: MutableList = arrayListOf(
Vidgomunime(),
Sbflix(),
Streamsss(),
+ Sbspeed(),
Fastream(),
@@ -246,6 +247,8 @@ val extractorApis: MutableList = arrayListOf(
LayarKaca(),
Rasacintaku(),
FEnet(),
+ Kotakajair(),
+ Cdnplayer(),
// WatchSB(), 'cause StreamSB.kt works
Uqload(),
Uqload1(),
@@ -317,6 +320,7 @@ val extractorApis: MutableList = arrayListOf(
Linkbox(),
Acefile(),
SpeedoStream(),
+ SpeedoStream1(),
Zorofile(),
Embedgram(),
Mvidoo(),
@@ -324,6 +328,7 @@ val extractorApis: MutableList = arrayListOf(
Vidmoly(),
Vidmolyme(),
Voe(),
+ Moviehab(),
Gdriveplayerapi(),
Gdriveplayerapp(),
@@ -336,6 +341,7 @@ val extractorApis: MutableList = arrayListOf(
Gdriveplayerco(),
Gdriveplayer(),
DatabaseGdrive(),
+ DatabaseGdrive2(),
YoutubeExtractor(),
YoutubeShortLinkExtractor(),
diff --git a/app/src/main/res/color/chip_color.xml b/app/src/main/res/color/chip_color.xml
new file mode 100644
index 00000000..f4190551
--- /dev/null
+++ b/app/src/main/res/color/chip_color.xml
@@ -0,0 +1,5 @@
+
+
+ - @color/amoledModeLight
+
+