forked from recloudstream/cloudstream
joe
This commit is contained in:
parent
89a2ffcd3e
commit
515e746626
7 changed files with 29 additions and 15 deletions
|
@ -31,8 +31,12 @@ android {
|
||||||
applicationId "com.lagradost.cloudstream3"
|
applicationId "com.lagradost.cloudstream3"
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
targetSdkVersion 30
|
targetSdkVersion 30
|
||||||
versionCode 17
|
versionCode 18
|
||||||
versionName "1.3.0"
|
versionName "1.5.2"
|
||||||
|
|
||||||
|
resValue "string", "app_version",
|
||||||
|
"${defaultConfig.versionName}${versionNameSuffix ?: ""}"
|
||||||
|
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"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
|
||||||
|
|
|
@ -104,7 +104,7 @@ class AsiaFlixProvider : MainAPI() {
|
||||||
private fun DramaPage.toLoadResponse(): TvSeriesLoadResponse {
|
private fun DramaPage.toLoadResponse(): TvSeriesLoadResponse {
|
||||||
return TvSeriesLoadResponse(
|
return TvSeriesLoadResponse(
|
||||||
name,
|
name,
|
||||||
_id,
|
"$mainUrl$dramaUrl/$_id".replace("drama-detail", "show-details"),
|
||||||
this@AsiaFlixProvider.name,
|
this@AsiaFlixProvider.name,
|
||||||
TvType.TvSeries,
|
TvType.TvSeries,
|
||||||
episodes.mapNotNull { it.toTvSeriesEpisode() }.sortedBy { it.episode },
|
episodes.mapNotNull { it.toTvSeriesEpisode() }.sortedBy { it.episode },
|
||||||
|
|
|
@ -861,7 +861,11 @@ class ResultFragment : Fragment() {
|
||||||
result_openinbrower.setOnClickListener {
|
result_openinbrower.setOnClickListener {
|
||||||
val i = Intent(ACTION_VIEW)
|
val i = Intent(ACTION_VIEW)
|
||||||
i.data = Uri.parse(d.url)
|
i.data = Uri.parse(d.url)
|
||||||
|
try {
|
||||||
startActivity(i)
|
startActivity(i)
|
||||||
|
} catch (e : Exception) {
|
||||||
|
e.printStackTrace()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
result_share.setOnClickListener {
|
result_share.setOnClickListener {
|
||||||
|
@ -1059,7 +1063,11 @@ class ResultFragment : Fragment() {
|
||||||
result_reload_connection_open_in_browser.setOnClickListener {
|
result_reload_connection_open_in_browser.setOnClickListener {
|
||||||
val i = Intent(ACTION_VIEW)
|
val i = Intent(ACTION_VIEW)
|
||||||
i.data = Uri.parse(tempUrl)
|
i.data = Uri.parse(tempUrl)
|
||||||
|
try {
|
||||||
startActivity(i)
|
startActivity(i)
|
||||||
|
} catch (e : Exception) {
|
||||||
|
e.printStackTrace()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (viewModel.resultResponse.value == null)
|
if (viewModel.resultResponse.value == null)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<vector
|
<vector
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:name="vector"
|
xmlns:tools="http://schemas.android.com/tools" android:name="vector"
|
||||||
android:width="21.378dp"
|
android:width="21.378dp"
|
||||||
android:height="24dp"
|
android:height="24dp"
|
||||||
android:viewportWidth="636"
|
android:viewportWidth="636"
|
||||||
|
@ -15,5 +15,5 @@
|
||||||
android:name="path_1"
|
android:name="path_1"
|
||||||
android:pathData="M 138.13 485.27 L 158.46 457.96 C 172.78 472.21 190.74 483.78 214.41 483.78 C 240.23 483.78 258.03 470.43 258.03 448.17 C 258.03 423.83 242.38 408.11 188.73 408.11 L 188.73 376.94 C 234.88 376.94 250.02 360.94 250.02 339.25 C 250.02 319.52 236.89 307.65 215.15 307.65 C 196.9 307.65 182.21 316.4 167.96 329.9 L 145.85 303.49 C 165.85 285.68 188.59 273.67 216.93 273.67 C 262.04 273.67 293.05 296.22 293.05 336.06 C 293.05 362.4 277.47 380.21 251.95 390.3 L 251.95 391.78 C 279.85 399.05 301.06 419.09 301.06 450.54 C 301.06 493.54 263.52 518.66 218.12 518.66 C 180.05 518.66 154.75 503.96 138.13 485.27 Z M 334.45 395.2 C 334.45 315.44 365.61 273.67 414.58 273.67 C 463.55 273.67 494.71 315.67 494.71 395.2 C 494.71 474.95 463.55 518.66 414.58 518.66 C 365.61 518.66 334.45 474.95 334.45 395.2 Z M 453.9 395.2 C 453.9 328.42 437.43 307.2 414.58 307.2 C 391.73 307.2 375.25 328.42 375.25 395.2 C 375.25 461.98 391.73 485.12 414.58 485.12 C 437.43 485.12 453.9 461.97 453.9 395.2 Z"
|
android:pathData="M 138.13 485.27 L 158.46 457.96 C 172.78 472.21 190.74 483.78 214.41 483.78 C 240.23 483.78 258.03 470.43 258.03 448.17 C 258.03 423.83 242.38 408.11 188.73 408.11 L 188.73 376.94 C 234.88 376.94 250.02 360.94 250.02 339.25 C 250.02 319.52 236.89 307.65 215.15 307.65 C 196.9 307.65 182.21 316.4 167.96 329.9 L 145.85 303.49 C 165.85 285.68 188.59 273.67 216.93 273.67 C 262.04 273.67 293.05 296.22 293.05 336.06 C 293.05 362.4 277.47 380.21 251.95 390.3 L 251.95 391.78 C 279.85 399.05 301.06 419.09 301.06 450.54 C 301.06 493.54 263.52 518.66 218.12 518.66 C 180.05 518.66 154.75 503.96 138.13 485.27 Z M 334.45 395.2 C 334.45 315.44 365.61 273.67 414.58 273.67 C 463.55 273.67 494.71 315.67 494.71 395.2 C 494.71 474.95 463.55 518.66 414.58 518.66 C 365.61 518.66 334.45 474.95 334.45 395.2 Z M 453.9 395.2 C 453.9 328.42 437.43 307.2 414.58 307.2 C 391.73 307.2 375.25 328.42 375.25 395.2 C 375.25 461.98 391.73 485.12 414.58 485.12 C 437.43 485.12 453.9 461.97 453.9 395.2 Z"
|
||||||
android:fillColor="#ffffff"
|
android:fillColor="#ffffff"
|
||||||
android:strokeWidth="1"/>
|
android:strokeWidth="1" tools:ignore="VectorPath"/>
|
||||||
</vector>
|
</vector>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<vector
|
<vector
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:name="vector"
|
xmlns:tools="http://schemas.android.com/tools" android:name="vector"
|
||||||
android:width="21.378dp"
|
android:width="21.378dp"
|
||||||
android:height="24dp"
|
android:height="24dp"
|
||||||
android:viewportWidth="636"
|
android:viewportWidth="636"
|
||||||
|
@ -15,5 +15,5 @@
|
||||||
android:name="path_1"
|
android:name="path_1"
|
||||||
android:pathData="M 138.13 485.27 L 158.46 457.96 C 172.78 472.21 190.74 483.78 214.41 483.78 C 240.23 483.78 258.03 470.43 258.03 448.17 C 258.03 423.83 242.38 408.11 188.73 408.11 L 188.73 376.94 C 234.88 376.94 250.02 360.94 250.02 339.25 C 250.02 319.52 236.89 307.65 215.15 307.65 C 196.9 307.65 182.21 316.4 167.96 329.9 L 145.85 303.49 C 165.85 285.68 188.59 273.67 216.93 273.67 C 262.04 273.67 293.05 296.22 293.05 336.06 C 293.05 362.4 277.47 380.21 251.95 390.3 L 251.95 391.78 C 279.85 399.05 301.06 419.09 301.06 450.54 C 301.06 493.54 263.52 518.66 218.12 518.66 C 180.05 518.66 154.75 503.96 138.13 485.27 Z M 334.45 395.2 C 334.45 315.44 365.61 273.67 414.58 273.67 C 463.55 273.67 494.71 315.67 494.71 395.2 C 494.71 474.95 463.55 518.66 414.58 518.66 C 365.61 518.66 334.45 474.95 334.45 395.2 Z M 453.9 395.2 C 453.9 328.42 437.43 307.2 414.58 307.2 C 391.73 307.2 375.25 328.42 375.25 395.2 C 375.25 461.98 391.73 485.12 414.58 485.12 C 437.43 485.12 453.9 461.97 453.9 395.2 Z"
|
android:pathData="M 138.13 485.27 L 158.46 457.96 C 172.78 472.21 190.74 483.78 214.41 483.78 C 240.23 483.78 258.03 470.43 258.03 448.17 C 258.03 423.83 242.38 408.11 188.73 408.11 L 188.73 376.94 C 234.88 376.94 250.02 360.94 250.02 339.25 C 250.02 319.52 236.89 307.65 215.15 307.65 C 196.9 307.65 182.21 316.4 167.96 329.9 L 145.85 303.49 C 165.85 285.68 188.59 273.67 216.93 273.67 C 262.04 273.67 293.05 296.22 293.05 336.06 C 293.05 362.4 277.47 380.21 251.95 390.3 L 251.95 391.78 C 279.85 399.05 301.06 419.09 301.06 450.54 C 301.06 493.54 263.52 518.66 218.12 518.66 C 180.05 518.66 154.75 503.96 138.13 485.27 Z M 334.45 395.2 C 334.45 315.44 365.61 273.67 414.58 273.67 C 463.55 273.67 494.71 315.67 494.71 395.2 C 494.71 474.95 463.55 518.66 414.58 518.66 C 365.61 518.66 334.45 474.95 334.45 395.2 Z M 453.9 395.2 C 453.9 328.42 437.43 307.2 414.58 307.2 C 391.73 307.2 375.25 328.42 375.25 395.2 C 375.25 461.98 391.73 485.12 414.58 485.12 C 437.43 485.12 453.9 461.97 453.9 395.2 Z"
|
||||||
android:fillColor="#ffffff"
|
android:fillColor="#ffffff"
|
||||||
android:strokeWidth="1"/>
|
android:strokeWidth="1" tools:ignore="VectorPath"/>
|
||||||
</vector>
|
</vector>
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
|
||||||
<resources>
|
<resources>
|
||||||
<string name="app_name">CloudStream</string>
|
<string name="app_name">CloudStream</string>
|
||||||
<string name="title_home">Home</string>
|
<string name="title_home">Home</string>
|
||||||
|
|
|
@ -100,6 +100,7 @@
|
||||||
/>
|
/>
|
||||||
<Preference
|
<Preference
|
||||||
android:title="Check for Update"
|
android:title="Check for Update"
|
||||||
|
app:summary="@string/app_version"
|
||||||
app:key="@string/manual_check_update_key"
|
app:key="@string/manual_check_update_key"
|
||||||
app:icon="@drawable/ic_baseline_system_update_24"
|
app:icon="@drawable/ic_baseline_system_update_24"
|
||||||
/>
|
/>
|
||||||
|
|
Loading…
Reference in a new issue