recloudstream/cloudstream
2
2
Fork 1
mirror of https://github.com/recloudstream/cloudstream.git synced 2024-08-15 01:53:11 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/recloudstream/cloudstream into content_ratings

Browse source
This commit is contained in:
Luna712 2023-11-11 11:33:40 -07:00
commit 0ea69f071b
48 changed files with 540 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/prerelease.yml vendored
View file

@ -43,7 +43,8 @@ jobs:
echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
- name: Run Gradle
run: |
./gradlew assemblePrerelease makeJar androidSourcesJar
./gradlew assemblePrerelease build androidSourcesJar
./gradlew makeJar # for classes.jar, has to be done after assemblePrerelease
env:
SIGNING_KEY_ALIAS: "key0"
SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}

1
.idea/gradle.xml generated
View file

@ -8,6 +8,7 @@
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="jbr-17" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />

40
app/build.gradle.kts
View file

@ -1,10 +1,12 @@
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.io.ByteArrayOutputStream
import java.net.URL
plugins {
id("com.android.application")
id("com.google.devtools.ksp")
id("kotlin-android")
id("kotlin-kapt")
id("org.jetbrains.dokka")
@ -87,6 +89,11 @@ android {
)
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
ksp {
arg("room.schemaLocation", "$projectDir/schemas")
arg("exportSchema", "true")
}
kapt {
includeCompileClasspath = true
}
@ -127,10 +134,6 @@ android {
versionCode = (System.currentTimeMillis() / 60000).toInt()
}
}
//toolchain {
// languageVersion.set(JavaLanguageVersion.of(17))
// }
// jvmToolchain(17)
compileOptions {
isCoreLibraryDesugaringEnabled = true
@ -138,10 +141,6 @@ android {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"
freeCompilerArgs = listOf("-Xjvm-default=compatibility")
}
lint {
abortOnError = false
checkReleaseBuilds = false
@ -164,8 +163,8 @@ dependencies {
implementation("com.google.android.material:material:1.10.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.navigation:navigation-fragment-ktx:2.7.4")
implementation("androidx.navigation:navigation-ui-ktx:2.7.4")
implementation("androidx.navigation:navigation-fragment-ktx:2.7.5")
implementation("androidx.navigation:navigation-ui-ktx:2.7.5")
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
@ -181,9 +180,13 @@ dependencies {
implementation("androidx.preference:preference-ktx:1.2.1")
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("com.github.bumptech.glide:glide:4.15.1")
ksp("com.github.bumptech.glide:ksp:4.15.1")
implementation("com.github.bumptech.glide:okhttp3-integration:4.15.1")
// for ksp
ksp("dev.zacsweers.autoservice:auto-service-ksp:1.1.0")
implementation("dev.zacsweers.autoservice:auto-service-ksp:1.1.0")
implementation("com.google.guava:guava:32.1.2-android")
implementation("jp.wasabeef:glide-transformations:4.3.0")
@ -207,9 +210,6 @@ dependencies {
implementation("ch.acra:acra-core:5.11.2")
implementation("ch.acra:acra-toast:5.11.2")
compileOnly("com.google.auto.service:auto-service-annotations:1.1.1")
//either for java sources:
annotationProcessor("com.google.auto.service:auto-service:1.1.1")
//or for kotlin sources (requires kapt gradle plugin):
kapt("com.google.auto.service:auto-service:1.1.1")
@ -276,7 +276,13 @@ tasks.register("makeJar", Copy::class) {
from("build/intermediates/compile_app_classes_jar/prereleaseDebug")
into("build")
include("classes.jar")
dependsOn("build")
}
tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "1.8"
freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
}
}
tasks.withType<DokkaTask>().configureEach {

16
app/src/main/AndroidManifest.xml
View file

@ -6,7 +6,7 @@
<uses-permission android:name="android.permission.INTERNET" /> <!-- unless you only use cs3 as a player for downloaded stuff, you need this -->
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- Downloads -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- Downloads on low api devices -->
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> <!-- Plugin API -->
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" /> <!-- Plugin API -->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <!-- some dependency needs this -->
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <!-- Used for player vertical slide -->
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <!-- Used for app update -->
@ -17,7 +17,11 @@
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" /> <!-- Required for getting arbitrary Aniyomi packages -->
<!-- Required for getting arbitrary Aniyomi packages -->
<uses-permission
android:name="android.permission.QUERY_ALL_PACKAGES"
tools:ignore="QueryAllPackagesPermission" />
<!-- Fixes android tv fuckery -->
<uses-feature
android:name="android.hardware.touchscreen"
@ -37,9 +41,11 @@
<application
android:name=".AcraApplication"
android:allowBackup="true"
android:enableOnBackInvokedCallback="true"
android:appCategory="video"
android:banner="@mipmap/ic_banner"
android:fullBackupContent="@xml/backup_descriptor"
android:dataExtractionRules="@xml/data_extraction_rules"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:largeHeap="true"
@ -47,7 +53,7 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
tools:targetApi="o">
tools:targetApi="tiramisu">
<meta-data
android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
@ -182,8 +188,8 @@
<receiver
android:name=".receivers.VideoDownloadRestartReceiver"
android:enabled="false"
android:exported="true">
<intent-filter android:exported="true">
android:exported="false">
<intent-filter android:exported="false">
<action android:name="restart_service" />
</intent-filter>
</receiver>

3
app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
View file

@ -8,7 +8,6 @@ import android.content.Intent
import android.widget.Toast
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import com.google.auto.service.AutoService
import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
import com.lagradost.cloudstream3.plugins.PluginManager
@ -37,7 +36,6 @@ import java.lang.ref.WeakReference
import kotlin.concurrent.thread
import kotlin.system.exitProcess
class CustomReportSender : ReportSender {
// Sends all your crashes to google forms
override fun send(context: Context, errorContent: CrashReportData) {
@ -65,7 +63,6 @@ class CustomReportSender : ReportSender {
}
}
@AutoService(ReportSenderFactory::class)
class CustomSenderFactory : ReportSenderFactory {
override fun create(context: Context, config: CoreConfiguration): ReportSender {
return CustomReportSender()

75
app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
View file

@ -19,6 +19,7 @@ import android.view.View
import android.view.ViewGroup
import android.view.WindowManager
import android.widget.Toast
import androidx.activity.OnBackPressedCallback
import androidx.activity.result.ActivityResultLauncher
import androidx.annotation.IdRes
import androidx.annotation.MainThread
@ -132,7 +133,6 @@ import com.lagradost.cloudstream3.utils.DataStore.setKey
import com.lagradost.cloudstream3.utils.DataStoreHelper
import com.lagradost.cloudstream3.utils.DataStoreHelper.migrateResumeWatching
import com.lagradost.cloudstream3.utils.Event
import com.lagradost.cloudstream3.utils.IOnBackPressed
import com.lagradost.cloudstream3.utils.InAppUpdater.Companion.runAutoUpdate
import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
import com.lagradost.cloudstream3.utils.UIHelper.changeStatusBarState
@ -650,34 +650,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
builder.show().setDefaultFocus()
}
private fun backPressed() {
this.window?.navigationBarColor =
this.colorFromAttribute(R.attr.primaryGrayBackground)
this.updateLocale()
this.updateLocale()
val navHostFragment =
supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as? NavHostFragment
val navController = navHostFragment?.navController
val isAtHome =
navController?.currentDestination?.matchDestination(R.id.navigation_home) == true
if (isAtHome && isTvSettings()) {
showConfirmExitDialog()
} else {
super.onBackPressed()
}
}
override fun onBackPressed() {
((supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as? NavHostFragment?)?.childFragmentManager?.primaryNavigationFragment as? IOnBackPressed)?.onBackPressed()
?.let { runNormal ->
if (runNormal) backPressed()
} ?: run {
backPressed()
}
}
override fun onDestroy() {
val broadcastIntent = Intent()
broadcastIntent.action = "restart_service"
@ -1087,6 +1059,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
} catch (_: Throwable) {
}
}
override fun onCreate(savedInstanceState: Bundle?) {
app.initClient(this)
val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
@ -1384,6 +1357,12 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
this.putString(SearchFragment.SEARCH_QUERY, nextSearchQuery)
}
}
if (isTvSettings()) {
if (navDestination.matchDestination(R.id.navigation_home)) {
attachBackPressedCallback()
} else detachBackPressedCallback()
}
}
//val navController = findNavController(R.id.nav_host_fragment)
@ -1598,6 +1577,44 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
// }
// }
onBackPressedDispatcher.addCallback(
this,
object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
window?.navigationBarColor = colorFromAttribute(R.attr.primaryGrayBackground)
updateLocale()
// If we don't disable we end up in a loop with default behavior calling
// this callback as well, so we disable it, run default behavior,
// then re-enable this callback so it can be used for next back press.
isEnabled = false
onBackPressedDispatcher.onBackPressed()
isEnabled = true
}
}
)
}
private var backPressedCallback: OnBackPressedCallback? = null
private fun attachBackPressedCallback() {
if (backPressedCallback == null) {
backPressedCallback = object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
showConfirmExitDialog()
window?.navigationBarColor =
colorFromAttribute(R.attr.primaryGrayBackground)
updateLocale()
}
}
}
backPressedCallback?.isEnabled = true
onBackPressedDispatcher.addCallback(this, backPressedCallback ?: return)
}
private fun detachBackPressedCallback() {
backPressedCallback?.isEnabled = false
}
suspend fun checkGithubConnectivity(): Boolean {

36
app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt
View file

@ -16,13 +16,13 @@ import javax.crypto.Cipher
import javax.crypto.spec.IvParameterSpec
import javax.crypto.spec.SecretKeySpec
// No License found in https://github.com/enimax-anime/key
// special credits to @enimax for providing key
// Code found in https://github.com/theonlymo/keys
// special credits to @theonlymo for providing key
class Megacloud : Rabbitstream() {
override val name = "Megacloud"
override val mainUrl = "https://megacloud.tv"
override val embed = "embed-2/ajax/e-1"
override val key = "https://raw.githubusercontent.com/enimax-anime/key/e6/key.txt"
override val key = "https://raw.githubusercontent.com/theonlymo/keys/e1/key"
}
class Dokicloud : Rabbitstream() {
@ -35,7 +35,7 @@ open class Rabbitstream : ExtractorApi() {
override val mainUrl = "https://rabbitstream.net"
override val requiresReferer = false
open val embed = "ajax/embed-4"
open val key = "https://raw.githubusercontent.com/enimax-anime/key/e4/key.txt"
open val key = "https://raw.githubusercontent.com/theonlymo/keys/e4/key"
override suspend fun getUrl(
url: String,
@ -86,21 +86,23 @@ open class Rabbitstream : ExtractorApi() {
private suspend fun getRawKey(): String = app.get(key).text
private fun extractRealKey(originalString: String?, stops: String): Pair<String, String> {
val table = parseJson<List<List<Int>>>(stops)
val decryptedKey = StringBuilder()
var offset = 0
var encryptedString = originalString
private fun extractRealKey(sources: String, stops: String): Pair<String, String> {
val decryptKey = parseJson<List<List<Int>>>(stops)
val sourcesArray = sources.toCharArray()
table.forEach { (start, end) ->
decryptedKey.append(encryptedString?.substring(start - offset, end - offset))
encryptedString = encryptedString?.substring(
0,
start - offset
) + encryptedString?.substring(end - offset)
offset += end - start
var extractedKey = ""
var currentIndex = 0
for (index in decryptKey) {
val start = index[0] + currentIndex
val end = start + index[1]
for (i in start until end) {
extractedKey += sourcesArray[i].toString()
sourcesArray[i] = ' '
}
currentIndex += index[1]
}
return decryptedKey.toString() to encryptedString.toString()
return extractedKey to sourcesArray.joinToString("")
}
private inline fun <reified T> decryptMapped(input: String, key: String): T? {

8
app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt
View file

@ -43,14 +43,6 @@ class AccountAdapter(
LayoutInflater.from(parent.context), parent, false
)
if (isTvSettings()) {
val layoutParams = binding.root.layoutParams as RecyclerView.LayoutParams
val marginInDp = 5 // Set the margin to 5dp
val marginInPixels = (marginInDp * parent.resources.displayMetrics.density).toInt()
layoutParams.setMargins(marginInPixels, marginInPixels, marginInPixels, marginInPixels)
binding.root.layoutParams = layoutParams
}
return AccountViewHolder(binding)
}

101
app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountDialog.kt
View file

@ -1,18 +1,17 @@
package com.lagradost.cloudstream3.ui.account
import android.content.Context
import android.text.Editable
import android.text.TextWatcher
import android.view.LayoutInflater
import android.view.View
import android.view.inputmethod.EditorInfo
import android.view.inputmethod.InputMethodManager
import android.widget.TextView
import androidx.annotation.StringRes
import androidx.appcompat.app.AlertDialog
import androidx.core.view.isVisible
import androidx.core.widget.doOnTextChanged
import com.lagradost.cloudstream3.R
import com.lagradost.cloudstream3.databinding.LockPinDialogBinding
import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
import com.lagradost.cloudstream3.utils.UIHelper.showInputMethod
object AccountDialog {
// TODO add account creation dialog to allow creating accounts directly from AccountSelectActivity
@ -21,14 +20,18 @@ object AccountDialog {
context: Context,
currentPin: String?,
editAccount: Boolean,
errorText: String? = null,
callback: (String?) -> Unit
) {
fun TextView.visibleWithText(@StringRes textRes: Int) {
visibility = View.VISIBLE
isVisible = true
setText(textRes)
}
fun View.isVisible() = visibility == View.VISIBLE
fun TextView.visibleWithText(text: String?) {
isVisible = true
setText(text)
}
val binding = LockPinDialogBinding.inflate(LayoutInflater.from(context))
@ -38,7 +41,9 @@ object AccountDialog {
val titleRes = if (isEditPin) R.string.enter_current_pin else R.string.enter_pin
val dialog = AlertDialog.Builder(context, R.style.AlertDialogCustom)
var isPinValid = false
val builder = AlertDialog.Builder(context, R.style.AlertDialogCustom)
.setView(binding.root)
.setTitle(titleRes)
.setNegativeButton(R.string.cancel) { _, _ ->
@ -48,46 +53,59 @@ object AccountDialog {
callback.invoke(null)
}
.setOnDismissListener {
if (binding.pinEditTextError.isVisible()) {
if (!isPinValid) {
callback.invoke(null)
}
}
.create()
var isPinValid = false
binding.pinEditText.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
val enteredPin = s.toString()
val isEnteredPinValid = enteredPin.length == 4
if (isEnteredPinValid) {
if (isPinSet) {
if (enteredPin != currentPin) {
binding.pinEditTextError.visibleWithText(R.string.pin_error_incorrect)
binding.pinEditText.text = null
isPinValid = false
} else {
binding.pinEditTextError.visibility = View.GONE
isPinValid = true
callback.invoke(enteredPin)
dialog.dismissSafe()
}
} else {
binding.pinEditTextError.visibility = View.GONE
isPinValid = true
}
} else if (isNewPin) {
binding.pinEditTextError.visibleWithText(R.string.pin_error_length)
isPinValid = false
if (isNewPin) {
if (errorText != null) binding.pinEditTextError.visibleWithText(errorText)
builder.setPositiveButton(R.string.setup_done) { _, _ ->
if (!isPinValid) {
// If the done button is pressed and there is an error,
// ask again, and mention the error that caused this.
showPinInputDialog(
context = binding.root.context,
currentPin = null,
editAccount = true,
errorText = binding.pinEditTextError.text.toString(),
callback = callback
)
} else {
val enteredPin = binding.pinEditText.text.toString()
callback.invoke(enteredPin)
}
}
}
override fun afterTextChanged(s: Editable?) {}
})
val dialog = builder.create()
binding.pinEditText.doOnTextChanged { text, _, _, _ ->
val enteredPin = text.toString()
val isEnteredPinValid = enteredPin.length == 4
if (isEnteredPinValid) {
if (isPinSet) {
if (enteredPin != currentPin) {
binding.pinEditTextError.visibleWithText(R.string.pin_error_incorrect)
binding.pinEditText.text = null
isPinValid = false
} else {
binding.pinEditTextError.isVisible = false
isPinValid = true
callback.invoke(enteredPin)
dialog.dismissSafe()
}
} else {
binding.pinEditTextError.isVisible = false
isPinValid = true
}
} else if (isNewPin) {
binding.pinEditTextError.visibleWithText(R.string.pin_error_length)
isPinValid = false
}
}
// Detect IME_ACTION_DONE
binding.pinEditText.setOnEditorActionListener { _, actionId, _ ->
@ -108,8 +126,7 @@ object AccountDialog {
// Auto focus on PIN input and show keyboard
binding.pinEditText.requestFocus()
binding.pinEditText.postDelayed({
val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
imm.showSoftInput(binding.pinEditText, InputMethodManager.SHOW_IMPLICIT)
showInputMethod(binding.pinEditText)
}, 200)
}
}

18
app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
View file

@ -4,14 +4,12 @@ import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.lagradost.cloudstream3.CommonActivity
import com.lagradost.cloudstream3.CommonActivity.loadThemes
import com.lagradost.cloudstream3.MainActivity
import com.lagradost.cloudstream3.R
import com.lagradost.cloudstream3.databinding.ActivityAccountSelectBinding
import com.lagradost.cloudstream3.databinding.ActivityAccountSelectTvBinding
import com.lagradost.cloudstream3.ui.account.AccountDialog.showPinInputDialog
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
import com.lagradost.cloudstream3.utils.DataStoreHelper
@ -36,13 +34,11 @@ class AccountSelectActivity : AppCompatActivity() {
window.navigationBarColor = colorFromAttribute(R.attr.primaryBlackBackground)
val binding = if (isTvSettings()) {
ActivityAccountSelectTvBinding.inflate(layoutInflater)
} else ActivityAccountSelectBinding.inflate(layoutInflater)
val binding = ActivityAccountSelectBinding.inflate(layoutInflater)
setContentView(binding.root)
val recyclerView: RecyclerView = binding.root.findViewById(R.id.account_recycler_view)
val recyclerView: RecyclerView = binding.accountRecyclerView
val adapter = AccountAdapter(accounts) { selectedAccount ->
@ -51,9 +47,13 @@ class AccountSelectActivity : AppCompatActivity() {
}
recyclerView.adapter = adapter
recyclerView.layoutManager = if (isTvSettings()) {
LinearLayoutManager(this)
} else GridLayoutManager(this, 2)
if (isTvSettings()) {
val spanSize = if (accounts.count() <= 6) {
accounts.count()
} else 6
recyclerView.layoutManager = GridLayoutManager(this, spanSize)
}
}
private fun onAccountSelected(selectedAccount: DataStoreHelper.Account) {

6
app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt
View file

@ -60,7 +60,7 @@ class DownloadChildFragment : Fragment() {
}
}.sortedBy { it.data.episode + (it.data.season ?: 0) * 100000 }
if (eps.isEmpty()) {
activity?.onBackPressed()
activity?.onBackPressedDispatcher?.onBackPressed()
return@main
}
@ -78,7 +78,7 @@ class DownloadChildFragment : Fragment() {
val folder = arguments?.getString("folder")
val name = arguments?.getString("name")
if (folder == null) {
activity?.onBackPressed() // TODO FIX
activity?.onBackPressedDispatcher?.onBackPressed() // TODO FIX
return
}
fixPaddingStatusbar(binding?.downloadChildRoot)
@ -87,7 +87,7 @@ class DownloadChildFragment : Fragment() {
title = name
setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
setNavigationOnClickListener {
activity?.onBackPressed()
activity?.onBackPressedDispatcher?.onBackPressed()
}
}

10
app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
View file

@ -27,6 +27,7 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
import androidx.viewpager2.widget.ViewPager2
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.tabs.TabLayout
import com.google.android.material.tabs.TabLayoutMediator
import com.lagradost.cloudstream3.APIHolder
@ -137,6 +138,10 @@ class LibraryFragment : Fragment() {
binding?.libraryRoot?.findViewById<TextView>(R.id.search_src_text)?.apply {
tag = "tv_no_focus_tag"
//Expand the Appbar when search bar is focused, fixing scroll up issue
setOnFocusChangeListener { _, _ ->
binding?.searchBar?.setExpanded(true)
}
}
// Set the color for the search exit icon to the correct theme text color
@ -342,6 +347,7 @@ class LibraryFragment : Fragment() {
binding?.apply {
viewpager.offscreenPageLimit = 2
viewpager.reduceDragSensitivity()
searchBar.setExpanded(true)
}
val startLoading = Runnable {
@ -441,6 +447,10 @@ class LibraryFragment : Fragment() {
val distance = abs(position - currentItem)
hideViewpager(distance)
}
//Expand the appBar on tab focus
tab.view.setOnFocusChangeListener { view, b ->
binding?.searchBar?.setExpanded(true)
}
}.attach()
}
}

17
app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt
View file

@ -1,14 +1,18 @@
package com.lagradost.cloudstream3.ui.library
import android.os.Build
import android.util.Log
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.core.view.doOnAttach
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView.OnFlingListener
import com.google.android.material.appbar.AppBarLayout
import com.lagradost.cloudstream3.R
import com.lagradost.cloudstream3.databinding.LibraryViewpagerPageBinding
import com.lagradost.cloudstream3.syncproviders.SyncAPI
import com.lagradost.cloudstream3.ui.search.SearchClickCallback
import com.lagradost.cloudstream3.ui.settings.SettingsFragment
import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
class ViewpagerAdapter(
@ -67,6 +71,17 @@ class ViewpagerAdapter(
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
setOnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
val diff = scrollY - oldScrollY
//Expand the top Appbar based on scroll direction up/down, simulate phone behavior
if (SettingsFragment.isTvSettings()) {
binding.root.rootView.findViewById<AppBarLayout>(R.id.search_bar)
.apply {
if (diff <= 0)
setExpanded(true)
else
setExpanded(false)
}
}
if (diff == 0) return@setOnScrollChangeListener
scrollCallback.invoke(diff > 0)
@ -80,8 +95,6 @@ class ViewpagerAdapter(
}
}
}
}
}

2
app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
View file

@ -1254,7 +1254,7 @@ class CS3IPlayer : IPlayer {
.setMimeType(sub.mimeType)
.setLanguage("_${sub.name}")
.setId(sub.getId())
.setSelectionFlags(SELECTION_FLAG_DEFAULT)
.setSelectionFlags(0)
.build()
when (sub.origin) {
SubtitleOrigin.DOWNLOADED_FILE -> {

14
app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
View file

@ -6,6 +6,7 @@ import android.net.Uri
import android.os.Bundle
import android.util.Log
import android.view.KeyEvent
import androidx.activity.OnBackPressedCallback
import androidx.appcompat.app.AppCompatActivity
import com.lagradost.cloudstream3.CommonActivity
import com.lagradost.cloudstream3.R
@ -34,10 +35,6 @@ class DownloadedPlayerActivity : AppCompatActivity() {
CommonActivity.onUserLeaveHint(this)
}
override fun onBackPressed() {
finish()
}
private fun playLink(url: String) {
this.navigate(
R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
@ -109,6 +106,15 @@ class DownloadedPlayerActivity : AppCompatActivity() {
finish()
return
}
onBackPressedDispatcher.addCallback(
this,
object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
finish()
}
}
)
}
override fun onResume() {

37
app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
View file

@ -7,6 +7,7 @@ import android.os.Bundle
import android.view.View
import android.view.ViewGroup
import android.widget.FrameLayout
import androidx.activity.OnBackPressedCallback
import androidx.core.view.isGone
import androidx.core.view.isVisible
import com.lagradost.cloudstream3.CommonActivity.screenHeight
@ -15,10 +16,8 @@ import com.lagradost.cloudstream3.R
import com.lagradost.cloudstream3.ui.player.CSPlayerEvent
import com.lagradost.cloudstream3.ui.player.PlayerEventSource
import com.lagradost.cloudstream3.ui.player.SubtitleData
import com.lagradost.cloudstream3.utils.IOnBackPressed
open class ResultTrailerPlayer : ResultFragmentPhone(), IOnBackPressed {
open class ResultTrailerPlayer : ResultFragmentPhone() {
override var lockRotation = false
override var isFullScreenPlayer = false
@ -28,7 +27,7 @@ open class ResultTrailerPlayer : ResultFragmentPhone(), IOnBackPressed {
const val TAG = "RESULT_TRAILER"
}
var playerWidthHeight: Pair<Int, Int>? = null
private var playerWidthHeight: Pair<Int, Int>? = null
override fun nextEpisode() {}
@ -154,6 +153,10 @@ open class ResultTrailerPlayer : ResultFragmentPhone(), IOnBackPressed {
}
fixPlayerSize()
uiReset()
if (isFullScreenPlayer) {
attachBackPressedCallback()
} else detachBackPressedCallback()
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@ -172,12 +175,26 @@ open class ResultTrailerPlayer : ResultFragmentPhone(), IOnBackPressed {
}
}
override fun onBackPressed(): Boolean {
return if (isFullScreenPlayer) {
updateFullscreen(false)
false
} else {
true
private var backPressedCallback: OnBackPressedCallback? = null
private fun attachBackPressedCallback() {
if (backPressedCallback == null) {
backPressedCallback = object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
updateFullscreen(false)
}
}
}
backPressedCallback?.isEnabled = true
activity?.onBackPressedDispatcher?.addCallback(
activity ?: return,
backPressedCallback ?: return
)
}
private fun detachBackPressedCallback() {
backPressedCallback?.isEnabled = false
}
}

2
app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
View file

@ -30,6 +30,7 @@ import com.lagradost.cloudstream3.syncproviders.OAuth2API
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
@ -248,6 +249,7 @@ class SettingsAccount : PreferenceFragmentCompat() {
super.onViewCreated(view, savedInstanceState)
setUpToolbar(R.string.category_account)
setPaddingBottom()
setToolBarScrollFlags()
}
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {

23
app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
View file

@ -12,10 +12,12 @@ import android.widget.ImageView
import androidx.annotation.StringRes
import androidx.core.view.children
import androidx.core.view.isVisible
import androidx.core.view.updateLayoutParams
import androidx.fragment.app.Fragment
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceManager
import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.appbar.MaterialToolbar
import com.lagradost.cloudstream3.R
import com.lagradost.cloudstream3.databinding.MainSettingsBinding
@ -54,7 +56,24 @@ class SettingsFragment : Fragment() {
listView?.setPadding(0, 0, 0, 100.toPx)
}
}
fun PreferenceFragmentCompat.setToolBarScrollFlags() {
if (isTvSettings()) {
val settingsAppbar = view?.findViewById<MaterialToolbar>(R.id.settings_toolbar)
settingsAppbar?.updateLayoutParams<AppBarLayout.LayoutParams> {
scrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL
}
}
}
fun Fragment?.setToolBarScrollFlags() {
if (isTvSettings()) {
val settingsAppbar = this?.view?.findViewById<MaterialToolbar>(R.id.settings_toolbar)
settingsAppbar?.updateLayoutParams<AppBarLayout.LayoutParams> {
scrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL
}
}
}
fun Fragment?.setUpToolbar(title: String) {
if (this == null) return
val settingsToolbar = view?.findViewById<MaterialToolbar>(R.id.settings_toolbar) ?: return
@ -63,7 +82,7 @@ class SettingsFragment : Fragment() {
setTitle(title)
setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
setNavigationOnClickListener {
activity?.onBackPressed()
activity?.onBackPressedDispatcher?.onBackPressed()
}
}
fixPaddingStatusbar(settingsToolbar)
@ -78,7 +97,7 @@ class SettingsFragment : Fragment() {
setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
children.firstOrNull { it is ImageView }?.tag = getString(R.string.tv_no_focus_tag)
setNavigationOnClickListener {
activity?.onBackPressed()
activity?.onBackPressedDispatcher?.onBackPressed()
}
}
fixPaddingStatusbar(settingsToolbar)

3
app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
View file

@ -28,6 +28,7 @@ import com.lagradost.cloudstream3.network.initClient
import com.lagradost.cloudstream3.ui.EasterEggMonke
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
@ -115,6 +116,7 @@ class SettingsGeneral : PreferenceFragmentCompat() {
super.onViewCreated(view, savedInstanceState)
setUpToolbar(R.string.category_general)
setPaddingBottom()
setToolBarScrollFlags()
}
data class CustomSite(
@ -192,7 +194,6 @@ class SettingsGeneral : PreferenceFragmentCompat() {
return@setOnPreferenceClickListener true
}
fun showAdd() {
val providers = synchronized(allProviders) { allProviders.distinctBy { it.javaClass }.sortedBy { it.name } }
activity?.showDialog(

2
app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt
View file

@ -10,6 +10,7 @@ import com.lagradost.cloudstream3.mvvm.logError
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getFolderSize
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
import com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment
import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
@ -23,6 +24,7 @@ class SettingsPlayer : PreferenceFragmentCompat() {
super.onViewCreated(view, savedInstanceState)
setUpToolbar(R.string.category_player)
setPaddingBottom()
setToolBarScrollFlags()
}
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
hideKeyboard()

2
app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
View file

@ -13,6 +13,7 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
import com.lagradost.cloudstream3.ui.APIRepository
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
import com.lagradost.cloudstream3.utils.DataStoreHelper
import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
@ -25,6 +26,7 @@ class SettingsProviders : PreferenceFragmentCompat() {
super.onViewCreated(view, savedInstanceState)
setUpToolbar(R.string.category_providers)
setPaddingBottom()
setToolBarScrollFlags()
}
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {

2
app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
View file

@ -11,6 +11,7 @@ import com.lagradost.cloudstream3.mvvm.logError
import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.updateTv
import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
@ -23,6 +24,7 @@ class SettingsUI : PreferenceFragmentCompat() {
super.onViewCreated(view, savedInstanceState)
setUpToolbar(R.string.category_ui)
setPaddingBottom()
setToolBarScrollFlags()
}
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {

2
app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
View file

@ -22,6 +22,7 @@ import com.lagradost.cloudstream3.network.initClient
import com.lagradost.cloudstream3.services.BackupWorkManager
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
import com.lagradost.cloudstream3.utils.BackupUtils
import com.lagradost.cloudstream3.utils.BackupUtils.restorePrompt
@ -42,6 +43,7 @@ class SettingsUpdates : PreferenceFragmentCompat() {
super.onViewCreated(view, savedInstanceState)
setUpToolbar(R.string.category_updates)
setPaddingBottom()
setToolBarScrollFlags()
}
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {

3
app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
View file

@ -30,6 +30,7 @@ import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
import com.lagradost.cloudstream3.ui.result.setLinearListLayout
import com.lagradost.cloudstream3.ui.result.setText
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
import com.lagradost.cloudstream3.utils.AppUtils.downloadAllPluginsDialog
import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
@ -85,7 +86,7 @@ class ExtensionsFragment : Fragment() {
//context?.fixPaddingStatusbar(extensions_root)
setUpToolbar(R.string.extensions)
setToolBarScrollFlags()
binding?.repoRecyclerView?.apply {
setLinearListLayout(

3
app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt
View file

@ -21,7 +21,6 @@ import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueT
import com.lagradost.cloudstream3.utils.AppUtils.html
import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
import com.lagradost.cloudstream3.utils.Coroutines.main
import com.lagradost.cloudstream3.utils.GlideApp
import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTwoLettersToLanguage
import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
import com.lagradost.cloudstream3.utils.UIHelper.setImage
@ -87,7 +86,7 @@ class PluginAdapter(
override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
if (holder is PluginViewHolder) {
holder.binding.entryIcon.let { pluginIcon ->
GlideApp.with(pluginIcon).clear(pluginIcon)
com.bumptech.glide.Glide.with(pluginIcon).clear(pluginIcon)
}
}
super.onViewRecycled(holder)

6
app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
View file

@ -18,6 +18,7 @@ import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.bindChips
import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
import com.lagradost.cloudstream3.ui.result.setLinearListLayout
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
import com.lagradost.cloudstream3.ui.settings.appLanguages
import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
@ -69,10 +70,11 @@ class PluginsFragment : Fragment() {
val isLocal = arguments?.getBoolean(PLUGINS_BUNDLE_LOCAL) == true
if (url == null || name == null) {
activity?.onBackPressed()
activity?.onBackPressedDispatcher?.onBackPressed()
return
}
setToolBarScrollFlags()
setUpToolbar(name)
binding?.settingsToolbar?.apply {
setOnMenuItemClickListener { menuItem ->
@ -117,7 +119,7 @@ class PluginsFragment : Fragment() {
if (searchView?.isIconified == false) {
searchView.isIconified = true
} else {
activity?.onBackPressed()
activity?.onBackPressedDispatcher?.onBackPressed()
}
}
searchView?.setOnQueryTextFocusChangeListener { _, hasFocus ->

2
app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
View file

@ -12,6 +12,7 @@ import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
import com.lagradost.cloudstream3.mvvm.observe
import com.lagradost.cloudstream3.mvvm.observeNullable
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
@ -27,6 +28,7 @@ class TestFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
setUpToolbar(R.string.category_provider_test)
setToolBarScrollFlags()
super.onViewCreated(view, savedInstanceState)
binding?.apply {

2
app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
View file

@ -1,6 +1,7 @@
package com.lagradost.cloudstream3.utils
import android.net.Uri
import com.fasterxml.jackson.annotation.JsonIgnore
import com.lagradost.cloudstream3.SubtitleFile
import com.lagradost.cloudstream3.TvType
import com.lagradost.cloudstream3.USER_AGENT
@ -378,6 +379,7 @@ open class ExtractorLink constructor(
val isM3u8 : Boolean get() = type == ExtractorLinkType.M3U8
val isDash : Boolean get() = type == ExtractorLinkType.DASH
@JsonIgnore
fun getAllHeaders() : Map<String, String> {
if (referer.isBlank()) {
return headers

5
app/src/main/java/com/lagradost/cloudstream3/utils/IOnBackPressed.kt
View file

@ -1,5 +0,0 @@
package com.lagradost.cloudstream3.utils
interface IOnBackPressed {
fun onBackPressed(): Boolean
}

8
app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
View file

@ -301,7 +301,7 @@ object UIHelper {
} ?: return false
return try {
var builder = GlideApp.with(this)
var builder = com.bumptech.glide.Glide.with(this)
.load(glideImage)
.skipMemoryCache(true)
.diskCacheStrategy(DiskCacheStrategy.ALL).let { req ->
@ -368,7 +368,7 @@ object UIHelper {
) {
if (this == null || url.isNullOrBlank()) return
try {
val res = GlideApp.with(this)
val res = com.bumptech.glide.Glide.with(this)
.load(GlideUrl(url) { headers ?: emptyMap() })
.apply(bitmapTransform(BlurTransformation(radius, sample)))
.transition(
@ -418,7 +418,7 @@ object UIHelper {
}
fun FragmentActivity.popCurrentPage() {
this.onBackPressed()
this.onBackPressedDispatcher.onBackPressed()
/*val currentFragment = supportFragmentManager.fragments.lastOrNull {
it.isVisible
} ?: return
@ -438,7 +438,7 @@ object UIHelper {
val currentFragment = supportFragmentManager.fragments.lastOrNull {
it.isVisible
}
?: //this.onBackPressed()
?: //this.onBackPressedDispatcher.onBackPressed()
return
/*

2
app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
View file

@ -234,7 +234,7 @@ object VideoDownloadManager {
return cachedBitmaps[url]
}
val bitmap = GlideApp.with(this)
val bitmap = com.bumptech.glide.Glide.with(this)
.asBitmap()
.load(GlideUrl(url) { headers ?: emptyMap() })
.into(720, 720)

2
app/src/main/res/layout/activity_account_select.xml
View file

@ -17,7 +17,7 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp" />
<androidx.recyclerview.widget.RecyclerView
<com.lagradost.cloudstream3.ui.AutofitRecyclerView
android:id="@+id/account_recycler_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

27
app/src/main/res/layout/activity_account_select_tv.xml
View file

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:background="?attr/primaryBlackBackground"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="36dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textAlignment="center"
android:text="@string/select_an_account"
android:textSize="24sp"
android:textStyle="bold"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/account_recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp" />
</LinearLayout>

25
app/src/main/res/layout/fragment_library_tv.xml
View file

@ -27,7 +27,8 @@
android:id="@+id/search_status_bar_padding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
app:layout_scrollFlags="scroll|enterAlways">
<ImageView
android:id="@+id/provider_selector"
@ -108,6 +109,7 @@
</androidx.appcompat.widget.SearchView>
</FrameLayout>
</LinearLayout>
<com.google.android.material.tabs.TabLayout
android:id="@+id/library_tab_layout"
style="@style/Theme.Widget.Tabs"
@ -117,7 +119,7 @@
android:nextFocusDown="@id/search_result_root"
android:background="?attr/primaryGrayBackground"
android:paddingHorizontal="5dp"
app:layout_scrollFlags="noScroll"
android:focusable="true"
app:tabGravity="center"
app:tabIndicator="@drawable/indicator_background"
app:tabIndicatorColor="?attr/white"
@ -134,15 +136,15 @@
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/viewpager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingBottom="40dp"
android:focusable="true"
android:tag="@string/tv_no_focus_tag"
tools:listitem="@layout/library_viewpager_page" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/viewpager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingBottom="40dp"
android:focusable="true"
android:tag="@string/tv_no_focus_tag"
tools:listitem="@layout/library_viewpager_page" />
<LinearLayout
android:id="@+id/library_loading_overlay"
@ -182,7 +184,6 @@
tools:listitem="@layout/loading_poster_dynamic" />
</com.facebook.shimmer.ShimmerFrameLayout>
</LinearLayout>
</FrameLayout>
<FrameLayout

48
app/src/main/res/values-ar/strings.xml
View file

@ -12,8 +12,8 @@
<!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
<string name="player_speed_text_format" formatted="true">سرعة (%.2fx)</string>
<string name="rated_format" formatted="true">تقييم: %.1f</string>
<string name="new_update_format" formatted="true">!تم العثور على تحديث جديد
\n%s -&gt; %s</string>
<string name="new_update_format" formatted="true">يوجد تحديث جديد!
\n%1$s -&gt; %2$s</string>
<string name="duration_format" formatted="true">%d دقيقة</string>
<string name="app_name">CloudStream</string>
<string name="play_with_app_name">تشغيل بواسطة CloudStream</string>
@ -319,7 +319,7 @@
<string name="kitsu_account_settings" translatable="false">Kitsu</string>
<string name="trakt_account_settings" translatable="false">Trakt</string>
-->
<string name="login_format" formatted="true">%s %s</string>
<string name="login_format" formatted="true">%1$s %2$s</string>
<string name="account">حساب</string>
<string name="logout">تسجيل الخروج</string>
<string name="login">تسجيل الدخول</string>
@ -418,8 +418,8 @@
<string name="plugin_deleted">تم إزالة الإضافة</string>
<string name="plugin_load_fail" formatted="true">تعذر التحميل %s</string>
<string name="is_adult">18+</string>
<string name="batch_download_start_format" formatted="true">بدأ تنزيل %d %s …</string>
<string name="batch_download_finish_format" formatted="true">تم التنزيل %d %s</string>
<string name="batch_download_start_format" formatted="true">بدأ تنزيل %1$d %2$s…</string>
<string name="batch_download_finish_format" formatted="true">تم تنزيل %1$d %2$s</string>
<string name="batch_download_nothing_to_download_format" formatted="true">جميع %s محملة بالفعل</string>
<string name="batch_download">تحميل مكثف</string>
<string name="plugin_singular">إضافة</string>
@ -461,11 +461,11 @@
<string name="history">السجل</string>
<string name="enable_skip_op_from_database_des">عرض زر تخطي المقدمة/الخاتمة</string>
<string name="cast_format" formatted="true">طاقم العمل: %s</string>
<string name="next_episode_time_day_format" formatted="true">%d يوم %d ساعة %d دقيقة</string>
<string name="next_episode_time_hour_format" formatted="true">%d ساعة %d دقيقة</string>
<string name="next_episode_time_day_format" formatted="true">%1$d يوم %2$d ساعة %3$d دقيقة</string>
<string name="next_episode_time_hour_format" formatted="true">%1$d ساعة %2$d دقيقة</string>
<string name="filler" formatted="true">الفيلير</string>
<string name="action_open_play">فتح(تشغيل)</string>
<string name="season_format">%s %d%s</string>
<string name="season_format">%1$s %2$d%3$s</string>
<string name="plugins_updated" formatted="true">المكونات الإضافية المحدثة %d</string>
<string name="player_settings_play_in_vlc">VLC</string>
<string name="player_settings_play_in_mpv">MPV</string>
@ -482,7 +482,7 @@
<string name="action_mark_as_watched">علّمه كفيديو تمت مشاهدته</string>
<string name="yes">نعم</string>
<string name="no">ﻻ</string>
<string name="app_dub_sub_episode_text_format" formatted="true">%s الحلقة %d</string>
<string name="app_dub_sub_episode_text_format" formatted="true">%1$s الحلقة %2$d</string>
<string name="next_episode_format" formatted="true">سيتم إصدار الحلقة %d في</string>
<string name="update_notification_failed">تعذر تثبيت الإصدار الجديد من التطبيق</string>
<string name="extension_install_first">تثبيت الإضافة أولا</string>
@ -493,8 +493,8 @@
<string name="update_notification_downloading">‌تنزيل تحديث التطبيق…</string>
<string name="update_notification_installing">‏تثبيت تحديث التطبيق…</string>
<string name="next_episode_time_min_format" formatted="true">%d دقيقة</string>
<string name="episodes_range">%d-%d</string>
<string name="episode_format" formatted="true">%d %s</string>
<string name="episodes_range">%1$d-%2$d</string>
<string name="episode_format" formatted="true">%1$d %2$s</string>
<string name="confirm_exit_dialog">هل أنت متأكد أنك تريد الخروج؟</string>
<string name="automatic_plugin_download_summary">قم بتثبيت جميع المكونات الإضافية التي لم يتم تثبيتها بعد تلقائيا من المستودعات المضافة.</string>
<string name="apk_installer_settings">مثبت الحزم</string>
@ -584,4 +584,30 @@
<string name="no_repository_found_error">المستودع لم يتم العثور عليه، تحقق من العنوان اوجرب شبكة افتراضية خاصة(vpn)</string>
<string name="already_voted">لقد صوتت بالفعل</string>
<string name="backup_frequency">معدل النسخ الإحتياطي</string>
<string name="favorite_removed">تمت إزالة %s من المفضلة</string>
<string name="favorites_list_name">المفضلة</string>
<string name="favorite_added">تمت إضافة %s إلى المفضلة</string>
<string name="duplicate_message_multiple" formatted="true">احتمال وجود تكرارات في مكتبتك.
\n
\n%s
\n
\nهل تريد الاضافة على اي حال مستبدلاً النسخة الموجودة بالفعل, أم تفضل إلغاء العملية؟</string>
<string name="duplicate_title">احتمال أن يكون موجود بالفعل</string>
<string name="lock_profile">قفل الحساب</string>
<string name="action_add_to_favorites">اضافة الى المفضلة</string>
<string name="duplicate_replace_all">تبديل الكل</string>
<string name="pin_error_incorrect">رقم PIN غير صحيح. برجاء المحاولة مرة اخرى.</string>
<string name="action_unsubscribe">إلغاء الاشتراك</string>
<string name="pin_error_length">رقم ال PIN يجب ان يكون 4 ارقام</string>
<string name="duplicate_replace">استبدال</string>
<string name="duplicate_add">اضافة</string>
<string name="action_subscribe">إشترك</string>
<string name="action_remove_from_favorites">إزالة من المفضلة</string>
<string name="select_an_account">اختار حساب</string>
<string name="duplicate_message_single">من الظاهر أن \"%1$s\" موجود بالفعل في مكتبتك.
\n
\nهل تريد الاضافة على أي حال مستبدلاً القديم أو إلغاء العملية؟</string>
<string name="enter_pin">ادخال ال PIN</string>
<string name="pin">PIN</string>
<string name="enter_current_pin">أدخل ال PIN الحالي</string>
</resources>

47
app/src/main/res/values-cs/strings.xml
View file

@ -2,7 +2,7 @@
<resources>
<!-- KEYS DON'T TRANSLATE -->
<!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
<string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
<string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep %2$d</string>
<string name="cast_format" formatted="true">Hrají: %s</string>
<!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
<string name="result_poster_img_des">Plakát</string>
@ -17,7 +17,7 @@
<string name="player_speed_text_format" formatted="true">Rychlost (%.2fx)</string>
<string name="rated_format" formatted="true">Hodnocení: %.1f</string>
<string name="new_update_format" formatted="true">Nalezena nová aktualizace!
\n%s -&gt; %s</string>
\n%1$s -&gt; %2$s</string>
<string name="filler" formatted="true">Výplň</string>
<string name="duration_format" formatted="true">%d min</string>
<string name="app_name">CloudStream</string>
@ -292,7 +292,7 @@
<string name="kitsu_account_settings" translatable="false">Kitsu</string>
<string name="trakt_account_settings" translatable="false">Trakt</string>
-->
<string name="login_format" formatted="true">%s %s</string>
<string name="login_format" formatted="true">%1$s %2$s</string>
<string name="account">účet</string>
<string name="logout">Odhlásit se</string>
<string name="login">Přihlásit se</string>
@ -410,17 +410,17 @@
<string name="clipboard_too_large">Příliš mnoho textu. Nepodařilo se uložit do schránky.</string>
<string name="yes">Ano</string>
<string name="browser">Prohlížeč</string>
<string name="episodes_range">%d-%d</string>
<string name="episodes_range">%1$d-%2$d</string>
<string name="library">Knihovna</string>
<string name="kitsu_settings">Zobrazit plakáty z Kitsu</string>
<string name="automatic_plugin_download">Automaticky stahovat doplňky</string>
<string name="redo_setup_process">Znovu provést proces nastavení</string>
<string name="apk_installer_settings">Instalátor APK</string>
<string name="episode_format" formatted="true">%d %s</string>
<string name="episode_format" formatted="true">%1$d %2$s</string>
<string name="apk_installer_settings_des">Některé telefony nepodporují nový instalátor balíčků. Pokud se aktualizace nenainstalují, zkuste použít starší možnost.</string>
<string name="pref_category_cache">Mezipaměť</string>
<string name="next_episode_format" formatted="true">Epizoda %d bude vydána za</string>
<string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
<string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
<string name="play_livestream_button">Přehrát přímý přenos</string>
<string name="pref_category_extensions">Rozšíření</string>
<string name="pref_category_actions">Akce</string>
@ -436,7 +436,7 @@
<string name="preferred_media_subtext">Co chcete vidět</string>
<string name="plugin_downloaded">Doplněk stažen</string>
<string name="is_adult">18+</string>
<string name="batch_download_start_format" formatted="true">Spuštěno stahování %d %s…</string>
<string name="batch_download_start_format" formatted="true">Spuštěno stahování %1$d %2$s…</string>
<string name="blank_repo_message">CloudStream nemá ve výchozím nastavení nainstalované žádné weby. Stránky je třeba nainstalovat z úložišť.
\n
\nKvůli nesmyslnému podání stížnosti DMCA společností Sky UK Limited 🤮 nemůžeme v aplikaci propojit stránky repozitářů.
@ -505,12 +505,12 @@
<string name="pref_category_app_updates">Aktualizace aplikace</string>
<string name="setup_done">Hotovo</string>
<string name="extension_types">Podporováno</string>
<string name="season_format">%s %d%s</string>
<string name="season_format">%1$s %2$d%3$s</string>
<string name="live_singular">Živý přenos</string>
<string name="nsfw_singular">NSFW</string>
<string name="extensions">Rozšíření</string>
<string name="play_trailer_button">Přehrát trailer</string>
<string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
<string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
<string name="view_public_repositories_button">Zobrazit komunitní repozitáře</string>
<string name="update_started">Aktualizace zahájena</string>
<string name="stream">Stream</string>
@ -520,7 +520,7 @@
<string name="referer">Referent</string>
<string name="next">Další</string>
<string name="provider_languages_tip">Sledovat videa v těchto jazycích</string>
<string name="batch_download_finish_format" formatted="true">Staženo %d %s</string>
<string name="batch_download_finish_format" formatted="true">Staženo %1$d %2$s</string>
<string name="batch_download_nothing_to_download_format" formatted="true">Všechny %s jsou již staženy</string>
<string name="batch_download">Hromadné stahování</string>
<string name="plugin_singular">doplněk</string>
@ -575,4 +575,31 @@
<string name="no_plugins_found_error">V repozitáři nebyly nalezeny žádné doplňky</string>
<string name="no_repository_found_error">Repozitář nenalezen, zkontrolujte adresu URL a zkuste použít VPN</string>
<string name="already_voted">Již jste hlasovali</string>
<string name="favorite_removed">%s odebráno z oblíbených</string>
<string name="favorites_list_name">Oblíbené</string>
<string name="favorite_added">%s přidáno do oblíbených</string>
<string name="duplicate_message_multiple" formatted="true">Ve vaší knihovně byl nalezen potenciální duplikát:
\n
\n%s
\n
\nChcete přesto přidat tuto položku, nahradit existující nebo zrušit akci\?</string>
<string name="backup_frequency">Frekvence záloh</string>
<string name="duplicate_title">Nalezena potenciální duplicita</string>
<string name="lock_profile">Zamknout profil</string>
<string name="action_add_to_favorites">Přidat do oblíbených</string>
<string name="duplicate_replace_all">Nahradit vše</string>
<string name="pin_error_incorrect">Nesprávný PIN. Zkuste to prosím znovu.</string>
<string name="action_unsubscribe">Zrušit odběr</string>
<string name="pin_error_length">PIN musí obsahovat 4 znaky</string>
<string name="duplicate_replace">Nahradit</string>
<string name="duplicate_add">Přidat</string>
<string name="action_subscribe">Odebírat</string>
<string name="action_remove_from_favorites">Odebrat z oblíbených</string>
<string name="select_an_account">Vyberte účet</string>
<string name="duplicate_message_single">Vypadá to, že ve vaší knihovně již existuje potenciální duplikát: „%1$s“.
\n
\nChcete přesto přidat tuto položku, nahradit existující nebo zrušit akci\?</string>
<string name="enter_pin">Zadejte PIN</string>
<string name="pin">PIN</string>
<string name="enter_current_pin">Zadejte současný PIN</string>
</resources>

56
app/src/main/res/values-es/strings.xml
View file

@ -4,10 +4,10 @@
<string name="setup_extensions_subtext">Descargue la lista de sitios que quiera utilizar</string>
<string name="plugins_downloaded" formatted="true">Descargado:%d</string>
<string name="downloaded">Descargado</string>
<string name="batch_download_finish_format" formatted="true">Descargado %d %s</string>
<string name="batch_download_finish_format" formatted="true">Descargado %1$d %2$s</string>
<string name="delete_repository">Borrar repositorio</string>
<string name="next_episode_format" formatted="true">El episodio %d se lanzará en</string>
<string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
<string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
<string name="next_episode_time_min_format" formatted="true">%dm</string>
<string name="result_poster_img_des">Poster</string>
<string name="extensions">Extensiones</string>
@ -97,12 +97,12 @@
<string name="search_poster_img_des">Poster</string>
<string name="home_next_random_img_des">Siguiente al azar</string>
<string name="all_languages_preference">Todos los Idiomas</string>
<string name="go_back_img_des">Volver</string>
<string name="go_back_img_des">Regresar</string>
<string name="home_change_provider_img_des">Cambiar proveedor</string>
<string name="preview_background_img_des">Vista previa del fondo</string>
<string name="rated_format" formatted="true">Nota:%.1f</string>
<string name="new_update_format" formatted="true">Nueva actualización encontrada!
\n%s -&gt; %s</string>
<string name="new_update_format" formatted="true">¡Nueva actualización encontrada!
\n%1$s -&gt; %2$s</string>
<string name="download">Descargar</string>
<string name="popup_pause_download">Pausar Descarga</string>
<string name="subs_font">Formato de fuente</string>
@ -110,8 +110,8 @@
<string name="subs_font_size">Tamaño de Fuente</string>
<string name="player_speed_text_format" formatted="true">Velocidad (%.2fx)</string>
<string name="skip_loading">Omitir carga</string>
<string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
<string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
<string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep. %2$d</string>
<string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
<string name="cast_format" formatted="true">Elenco %s</string>
<string name="filler" formatted="true">Relleno</string>
<string name="duration_format" formatted="true">%d min</string>
@ -145,7 +145,7 @@
<string name="play_torrent_button">Transmitir Torrent</string>
<string name="pick_source">Fuentes</string>
<string name="reload_error">Reintentar conexión…</string>
<string name="go_back">Volver</string>
<string name="go_back">Regresar</string>
<string name="downloading">Descargando</string>
<string name="download_paused">Descarga pausada</string>
<string name="download_started">Descarga iniciada</string>
@ -218,8 +218,8 @@
<string name="play_episode_toast">Reproducir Episodio</string>
<string name="episode">Episodio</string>
<string name="episodes">Episodios</string>
<string name="episodes_range">%d-%d</string>
<string name="episode_format" formatted="true">%d %s</string>
<string name="episodes_range">%1$d-%2$d</string>
<string name="episode_format" formatted="true">%1$d %2$s</string>
<string name="episode_short">E</string>
<string name="restore_failed_format" formatted="true">Falló la restauración de los datos desde el archivo %s</string>
<string name="backup_success">Datos guardados</string>
@ -233,7 +233,7 @@
<string name="advanced_search_des">Mostrar los resultados de la búsqueda por proveedor</string>
<string name="bug_report_settings_off">Solo envíar los datos si la App se cierra / falla inesperadamente</string>
<string name="bug_report_settings_on">No enviar datos</string>
<string name="show_trailers_settings">Mostrar Trailers (avances)</string>
<string name="show_trailers_settings">Mostrar los trailers</string>
<string name="kitsu_settings">Mostrar pósters de Kitsu</string>
<string name="uprereleases_settings">Actualizar a las versiones preliminares</string>
<string name="uprereleases_settings_des">Buscar actualizaciones preliminares (beta) en lugar de solo versiones completas (stable releases)</string>
@ -249,7 +249,7 @@
<string name="subs_default_reset_toast">Reiniciar a valores predefinidos</string>
<string name="acra_report_toast">Lo sentimos, la aplicación se bloqueó. Se enviará un informe de error anónimo a los desarrolladores</string>
<string name="season">Temporada</string>
<string name="season_format">%s %d%s</string>
<string name="season_format">%1$s %2$d%3$s</string>
<string name="no_season">Ninguna Temporada</string>
<string name="season_short">T</string>
<string name="delete_file">Borrar Archivo</string>
@ -311,7 +311,7 @@
<string name="switch_account">Cambiar cuenta</string>
<string name="add_account">Añadir cuenta</string>
<string name="upload_sync">Sincronizar</string>
<string name="sync_score">Calificación</string>
<string name="sync_score">Clasificado</string>
<string name="authenticated_user" formatted="true">%s autenticado</string>
<string name="authenticated_user_fail" formatted="true">No se pudo autenticar a %s</string>
<string name="recommended">Recomendado</string>
@ -345,7 +345,7 @@
<string name="primary_color_settings">Color primario</string>
<string name="app_theme_settings">Tema de la aplicación</string>
<string name="example_email">hola@mundo.com</string>
<string name="login_format" formatted="true">%s %s</string>
<string name="login_format" formatted="true">%1$s %2$s</string>
<string name="all">Todo</string>
<string name="subtitle_offset_hint">1000ms</string>
<string name="subtitle_offset_extra_hint_none_format">Sin retraso de subtítulos</string>
@ -448,7 +448,7 @@
<string name="setup_done">Hecho</string>
<string name="plugin_loaded">Plugin Cargado</string>
<string name="is_adult">18+</string>
<string name="batch_download_start_format" formatted="true">Iniciada la descarga %d %s…</string>
<string name="batch_download_start_format" formatted="true">Comenzó la descarga de %1$d %2$s…</string>
<string name="batch_download">Descarga por lotes</string>
<string name="plugin_singular">plugin</string>
<string name="plugin">plugins</string>
@ -552,4 +552,30 @@
<string name="no_repository_found_error">Repositorio no encontrado, comprueba la URL y prueba la VPN</string>
<string name="already_voted">Ya has votado</string>
<string name="backup_frequency">Frecuencia de la copia de seguridad</string>
<string name="favorite_removed">%s eliminado de favoritos</string>
<string name="favorites_list_name">Favoritos</string>
<string name="favorite_added">%s añadido a favoritos</string>
<string name="duplicate_message_multiple" formatted="true">Se han encontrado posibles elementos duplicados en su biblioteca:
\n
\n%s
\n
\n¿Desea añadir este elemento de todos modos, sustituir los existentes o cancelar la acción\?</string>
<string name="duplicate_title">Posible duplicado encontrado</string>
<string name="lock_profile">Perfil de bloqueo</string>
<string name="action_add_to_favorites">Añadido a favoritos</string>
<string name="duplicate_replace_all">Sustituir todo</string>
<string name="pin_error_incorrect">PIN incorrecto. Por favor, inténtelo de nuevo.</string>
<string name="action_unsubscribe">Cancelar la suscripción</string>
<string name="pin_error_length">El PIN debe tener 4 caracteres</string>
<string name="duplicate_replace">Sustituir</string>
<string name="duplicate_add">Añadir</string>
<string name="action_subscribe">Suscríbase</string>
<string name="action_remove_from_favorites">Eliminar de favoritos</string>
<string name="select_an_account">Seleccione una cuenta</string>
<string name="duplicate_message_single">Parece que ya existe un elemento potencialmente duplicado en su biblioteca: \'%s.\'
\n
\n¿Desea añadir este elemento de todos modos, sustituir el existente o cancelar la acción\?</string>
<string name="enter_pin">Introducir el PIN</string>
<string name="pin">PIN</string>
<string name="enter_current_pin">Introduzca el PIN actual</string>
</resources>

32
app/src/main/res/values-it/strings.xml
View file

@ -20,7 +20,7 @@
<string name="player_speed_text_format" formatted="true">Velocità (%.2fx)</string>
<string name="rated_format" formatted="true">Valutato: %.1f</string>
<string name="new_update_format" formatted="true">Nuovo aggiornamento trovato!
\n%s -&gt; %s</string>
\n%1$s -&gt; %2$s</string>
<string name="filler" formatted="true">Filler</string>
<string name="duration_format" formatted="true">%d min</string>
<!-- <string name="app_name">CloudStream</string> -->
@ -409,8 +409,8 @@
<string name="plugin_deleted">Plugin eliminato</string>
<string name="plugin_load_fail" formatted="true">Impossibile caricare %s</string>
<string name="is_adult">18+</string>
<string name="batch_download_start_format" formatted="true">Download iniziato %d %s…</string>
<string name="batch_download_finish_format" formatted="true">Scaricato %d %s</string>
<string name="batch_download_start_format" formatted="true">Download iniziato %1$d %2$s…</string>
<string name="batch_download_finish_format" formatted="true">Scaricato %1$d %2$s</string>
<string name="batch_download_nothing_to_download_format" formatted="true">Tutti %s già scaricati</string>
<string name="batch_download">Download in blocco</string>
<string name="plugin_singular">plugin</string>
@ -573,4 +573,30 @@
<string name="automatic_plugin_download_mode_title">Seleziona la modalità per filtrare il download dei plugin</string>
<string name="disable">Disabilita</string>
<string name="already_voted">Hai già votato</string>
<string name="favorite_removed">%s rimosso dai preferiti</string>
<string name="favorites_list_name">Preferiti</string>
<string name="favorite_added">%s aggiunto ai preferiti</string>
<string name="duplicate_message_multiple" formatted="true">Dei possibili duplicati sono stati trovati nella tua libreria:
\n
\n%s
\n
\nVorresti aggiungere l\'oggetto alla libreria comunque, rimpiazzare l\'esistente, o cancellare l\'azione\?</string>
<string name="backup_frequency">Frequenza di backup</string>
<string name="duplicate_title">Trovato Possibile Duplicato</string>
<string name="action_add_to_favorites">Aggiungi ai preferiti</string>
<string name="duplicate_replace_all">Rimpiazza tutti</string>
<string name="pin_error_incorrect">PIN non corretto. Riprova.</string>
<string name="action_unsubscribe">Disiscriviti</string>
<string name="pin_error_length">Il PIN deve essere almeno di 4 caratteri</string>
<string name="duplicate_replace">Rimpiazza</string>
<string name="duplicate_add">Aggiungi</string>
<string name="action_subscribe">Iscriviti</string>
<string name="action_remove_from_favorites">Rimuovi dai preferiti</string>
<string name="select_an_account">Seleziona un Account</string>
<string name="duplicate_message_single">Sembra che un oggetto potenziale duplicato sia già presente nella tua libreria: \'%1$s.\'
\n
\nVorresti aggiungere l\'oggetto lo stesso, rimpiazzare l\'esistente, o cancellare l\'azione\?</string>
<string name="enter_pin">Inserisci PIN</string>
<string name="pin">PIN</string>
<string name="enter_current_pin">Inserisci PIN Corrente</string>
</resources>

52
app/src/main/res/values-uk/strings.xml
View file

@ -9,16 +9,16 @@
<string name="cast_format" formatted="true">Актори: %s</string>
<string name="next_episode_format" formatted="true">Епізод %d вийде через</string>
<string name="result_poster_img_des">Poster</string>
<string name="app_dub_sub_episode_text_format" formatted="true">%s Еп. %d</string>
<string name="next_episode_time_day_format" formatted="true">%dд %dгод %dхв</string>
<string name="next_episode_time_hour_format" formatted="true">%dгод %dхв</string>
<string name="app_dub_sub_episode_text_format" formatted="true">%1$s Еп. %2$d</string>
<string name="next_episode_time_day_format" formatted="true">%1$dд %2$dгод %3$dхв</string>
<string name="next_episode_time_hour_format" formatted="true">%1$dгод %2$dхв</string>
<string name="next_episode_time_min_format" formatted="true">%dхв</string>
<string name="home_main_poster_img_des">Головний постер</string>
<string name="home_next_random_img_des">Наступний випадковий</string>
<string name="preview_background_img_des">Попередній перегляд фону</string>
<string name="player_speed_text_format" formatted="true">Швидкість (%.2fx)</string>
<string name="new_update_format" formatted="true">Знайдено нове оновлення!
\n%s –&gt; %s</string>
\n%1$s –&gt; %2$s</string>
<string name="title_search">Пошук</string>
<string name="title_downloads">Завантаження</string>
<string name="duration_format" formatted="true">%d хв</string>
@ -112,7 +112,7 @@
<string name="popup_play_file">Переглянути файл</string>
<string name="home_more_info">Детальніше</string>
<string name="filter_bookmarks">Фільтр закладок</string>
<string name="sort_clear">Очистити</string>
<string name="sort_clear">Очистити</string>
<string name="subtitles_settings">Налаштування субтитрів</string>
<string name="subs_background_color">Колір фону</string>
<string name="subs_subtitle_elevation">Висота субтитрів</string>
@ -167,7 +167,7 @@
<string name="subs_default_reset_toast">Скинути до значення за замовчуванням</string>
<string name="no_season">Немає сезону</string>
<string name="episodes">епізодів</string>
<string name="episode_format" formatted="true">%d %s</string>
<string name="episode_format" formatted="true">%1$d %2$s</string>
<string name="season_short">С</string>
<string name="episode_short">Е</string>
<string name="delete_file">Видалити файл</string>
@ -238,9 +238,9 @@
<string name="year">Рік</string>
<string name="go_forward_30">+30</string>
<string name="acra_report_toast">Вибачте, у застосунку стався збій. Анонімне повідомлення про помилку буде відправлено розробникам</string>
<string name="season_format">%s %d%s</string>
<string name="season_format">%1$s %2$d%3$s</string>
<string name="episode">Епізод</string>
<string name="episodes_range">%d-%d</string>
<string name="episodes_range">%1$d-%2$d</string>
<string name="no_episodes_found">Епізодів не знайдено</string>
<string name="pause">Пауза</string>
<string name="season">Сезон</string>
@ -364,7 +364,7 @@
<string name="category_ui">Макет</string>
<string name="category_providers">Постачальники</string>
<string name="example_site_url">example.com</string>
<string name="login_format" formatted="true">%s %s</string>
<string name="login_format" formatted="true">%2$s %1$s</string>
<string name="subtitles_depressed">Депресивний</string>
<string name="account">обліковий запис</string>
<string name="create_account">Створити</string>
@ -414,8 +414,8 @@
<string name="plugin_loaded">Плагін завантажено</string>
<string name="plugin_downloaded">Плагін завантажено</string>
<string name="plugin_load_fail" formatted="true">Не вдалося завантажити %s</string>
<string name="batch_download_start_format" formatted="true">Почалося завантаження %d %s…</string>
<string name="batch_download_finish_format" formatted="true">Завантажено %d %s</string>
<string name="batch_download_start_format" formatted="true">Почалося завантаження %1$d %2$s…</string>
<string name="batch_download_finish_format" formatted="true">Завантажено %1$d %2$s</string>
<string name="batch_download_nothing_to_download_format" formatted="true">Всі %s вже завантажено</string>
<string name="batch_download">Завантажити пакети</string>
<string name="plugin_singular">плагін</string>
@ -499,7 +499,7 @@
<string name="empty_library_no_accounts_message">Ваша бібліотека порожня :(
\nУвійдіть в обліковий запис бібліотеки або додайте фільми до вашої локальної бібліотеки.</string>
<string name="sort_alphabetical_z">Алфавітом (від Я до А)</string>
<string name="select_library">Виберіть бібліотеку</string>
<string name="select_library">Оберіть бібліотеку</string>
<string name="open_with">Відкрити</string>
<string name="browser">Браузер</string>
<string name="empty_library_logged_in_message">Цей список порожній. Спробуйте перейти до іншого.</string>
@ -546,10 +546,36 @@
<string name="qualities">Якості</string>
<string name="profile_background_des">Фон профілю</string>
<string name="unable_to_inflate">Не вдалося створити UI коректно, це ВАЖЛИВА ПОМИЛКА, про яку слід негайно повідомити %s</string>
<string name="automatic_plugin_download_mode_title">Виберіть режим для фільтрації завантаження плагінів</string>
<string name="automatic_plugin_download_mode_title">Оберіть режим для фільтрації завантаження плагінів</string>
<string name="disable">Вимкнути</string>
<string name="no_repository_found_error">Репозиторій не знайдено, перевірте URL-адресу та спробуйте VPN</string>
<string name="no_plugins_found_error">Не знайдено жодних плагінів у репозиторії</string>
<string name="already_voted">Ви вже проголосували</string>
<string name="backup_frequency">Частота резервного копіювання</string>
<string name="favorite_removed">%s вилучено з обраного</string>
<string name="favorites_list_name">Обране</string>
<string name="favorite_added">%s додано до обраного</string>
<string name="duplicate_message_multiple" formatted="true">У вашій бібліотеці знайдено потенційні дублікати:
\n
\n%s
\n
\nВсе одно хочете додати цей елемент, замінити наявні чи скасувати дію\?</string>
<string name="duplicate_title">Знайдено потенційний дублікат</string>
<string name="lock_profile">Розблокувати профіль</string>
<string name="action_add_to_favorites">Додати до обраного</string>
<string name="duplicate_replace_all">Замінити усе</string>
<string name="pin_error_incorrect">Неправильний PIN-код. Спробуйте ще раз.</string>
<string name="action_unsubscribe">Відписатись</string>
<string name="pin_error_length">PIN-код повинен складатися з 4 символів</string>
<string name="duplicate_replace">Замінити</string>
<string name="duplicate_add">Додати</string>
<string name="action_subscribe">Підписатись</string>
<string name="action_remove_from_favorites">Вилучити з обраного</string>
<string name="select_an_account">Оберіть обліковий запис</string>
<string name="duplicate_message_single">Виявилося, що у вашій бібліотеці вже є потенційно повторюваний елемент: \'%1$s.\'
\n
\nВсе одно хочете додати цей елемент, замінити наявний чи скасувати дію\?</string>
<string name="enter_pin">Введіть PIN-код</string>
<string name="pin">PIN-код</string>
<string name="enter_current_pin">Введіть поточний PIN-код</string>
</resources>

31
app/src/main/res/values-vi/strings.xml
View file

@ -409,8 +409,8 @@
<string name="plugin_deleted">Plugin đã xoá</string>
<string name="plugin_load_fail" formatted="true">Không tải được %s</string>
<string name="is_adult">18+</string>
<string name="batch_download_start_format" formatted="true">Bắt đầu tải %d %s…</string>
<string name="batch_download_finish_format" formatted="true">Tải xuống %d %s thành công</string>
<string name="batch_download_start_format" formatted="true">Đã bắt đầu tải xuống %1$d %2$s…</string>
<string name="batch_download_finish_format" formatted="true">Đã tải xuống %1$d %2$s</string>
<string name="batch_download_nothing_to_download_format" formatted="true">Toàn bộ %s đã được tải xuống</string>
<string name="batch_download">Tải hàng loạt</string>
<string name="plugin_singular">plugin</string>
@ -566,4 +566,31 @@
<string name="no_plugins_found_error">Không tìm thấy plugin</string>
<string name="unable_to_inflate">Không thể khởi tạo UI, đây là một LỖI LỚN và cần được báo cáo ngay lập tức tới %s</string>
<string name="automatic_plugin_download_mode_title">Chọn chế độ để lọc plugin tải xuống</string>
<string name="favorite_removed">%s đã loại bỏ khỏi mục yêu thích</string>
<string name="favorites_list_name">Yêu thích</string>
<string name="favorite_added">%s đã thêm vào mục yêu thích</string>
<string name="duplicate_message_multiple" formatted="true">Các mục có thể trùng lặp đã được tìm thấy trong thư viện của bạn:
\n
\n%s
\n
\nBạn vẫn muốn thêm mục này, thay thế những mục hiện có hay hủy hành động\?</string>
<string name="backup_frequency">Tần suất sao lưu</string>
<string name="duplicate_title">Đã tìm thấy bản sao tiềm năng</string>
<string name="lock_profile">Khóa hồ sơ</string>
<string name="action_add_to_favorites">Thêm vào mục yêu thích</string>
<string name="duplicate_replace_all">Thay thế tất cả</string>
<string name="pin_error_incorrect">Mã PIN không chính xác. Vui lòng thử lại.</string>
<string name="action_unsubscribe">Hủy đăng ký</string>
<string name="pin_error_length">Mã PIN phải có 4 ký tự</string>
<string name="duplicate_replace">Thay thế</string>
<string name="duplicate_add">Thêm vào</string>
<string name="action_subscribe">Đăng ký</string>
<string name="action_remove_from_favorites">Loại bỏ khỏi mục yêu thích</string>
<string name="select_an_account">Chọn một tài khoản</string>
<string name="duplicate_message_single">Có vẻ như một mục có khả năng trùng lặp đã tồn tại trong thư viện của bạn: \'%1$s.\'
\n
\nBạn vẫn muốn thêm mục này, thay thế mục hiện có hay hủy hành động\?</string>
<string name="enter_pin">Nhập PIN</string>
<string name="pin">PIN</string>
<string name="enter_current_pin">Nhập mã PIN hiện tại</string>
</resources>

6
app/src/main/res/values/strings.xml
View file

@ -701,9 +701,9 @@
<string name="duplicate_add">Add</string>
<string name="duplicate_replace">Replace</string>
<string name="duplicate_replace_all">Replace All</string>
<string name="duplicate_cancel" translatable="false">@string/sort_cancel</string>
<string name="duplicate_message_single">
It appears that a potentially duplicate item already exists in your library: \'%1$s.\'
<string name="duplicate_cancel" translatable="false">@string/cancel</string>
<string name="duplicate_message_single" formatted="true">
It appears that a potentially duplicate item already exists in your library: \'%s.\'
\n\nWould you like to add this item anyway, replace the existing one, or cancel the action?
</string>

3
app/src/main/res/xml/data_extraction_rules.xml Normal file
View file

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<data-extraction-rules>
</data-extraction-rules>

11
build.gradle.kts
View file

@ -5,10 +5,9 @@ buildscript {
mavenCentral()
}
dependencies {
// we stay on low ver because prerelease build gradle is fucked
classpath("com.android.tools.build:gradle:7.3.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.0")
classpath("com.android.tools.build:gradle:8.1.3")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle.kts files
@ -22,6 +21,10 @@ allprojects {
}
}
plugins {
id("com.google.devtools.ksp") version "1.9.20-1.0.14" apply false
}
tasks.register("clean", Delete::class) {
delete(rootProject.buildDir)
}

1
fastlane/metadata/android/es-ES/changelogs/2.txt Normal file
View file

@ -0,0 +1 @@
- ¡Cambios añadidos!

10
fastlane/metadata/android/es-ES/full_description.txt Normal file
View file

@ -0,0 +1,10 @@
CloudStream-3 te permite ver y descargar películas, series de TV y anime.
La aplicación viene sin ningún tipo de anuncios y análisis y
soporta múltiples tráilers y páginas de películas, y más, por ejemplo
Marcadores
Descargas de subtítulos
Compatible con Chromecast

1
fastlane/metadata/android/es-ES/short_description.txt Normal file
View file

@ -0,0 +1 @@
Vea y descargue películas, series de televisión y anime.

1
fastlane/metadata/android/es-ES/title.txt Normal file
View file

@ -0,0 +1 @@
CloudStream

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Fri Apr 30 17:11:15 CEST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME