mirror of
https://github.com/recloudstream/cloudstream.git
synced 2024-08-15 01:53:11 +00:00
fixed navController and android manifest
This commit is contained in:
parent
3a78f41aad
commit
42f76c1c5c
2 changed files with 44 additions and 47 deletions
|
@ -38,14 +38,20 @@
|
||||||
<category android:name="android.intent.category.BROWSABLE"/>
|
<category android:name="android.intent.category.BROWSABLE"/>
|
||||||
<category android:name="android.intent.category.DEFAULT"/>
|
<category android:name="android.intent.category.DEFAULT"/>
|
||||||
|
|
||||||
<data android:scheme="https" android:host="bestdubbedanime.com" android:pathPrefix="/"/>
|
<data android:scheme="https" android:host="gogoanime.vc" android:pathPrefix="/"/>
|
||||||
|
<data android:scheme="https" android:host="animeflick.net" android:pathPrefix="/"/>
|
||||||
|
<data android:scheme="https" android:host="kawaiifu.com" android:pathPrefix="/"/>
|
||||||
<data android:scheme="https" android:host="tenshi.moe" android:pathPrefix="/"/>
|
<data android:scheme="https" android:host="tenshi.moe" android:pathPrefix="/"/>
|
||||||
<data android:scheme="https" android:host="www.wcostream.com" android:pathPrefix="/"/>
|
|
||||||
<data android:scheme="https" android:host="wcostream.cc" android:pathPrefix="/"/>
|
<data android:scheme="https" android:host="wcostream.cc" android:pathPrefix="/"/>
|
||||||
|
<data android:scheme="https" android:host="bestdubbedanime.com" android:pathPrefix="/"/>
|
||||||
<data android:scheme="https" android:host="hdm.to" android:pathPrefix="/"/>
|
<data android:scheme="https" android:host="hdm.to" android:pathPrefix="/"/>
|
||||||
<data android:scheme="https" android:host="lookmovie.io" android:pathPrefix="/"/>
|
|
||||||
<data android:scheme="https" android:host="trailers.to" android:pathPrefix="/"/>
|
|
||||||
<data android:scheme="https" android:host="www.vmovee.watch" android:pathPrefix="/"/>
|
<data android:scheme="https" android:host="www.vmovee.watch" android:pathPrefix="/"/>
|
||||||
|
<data android:scheme="https" android:host="www.wcostream.com" android:pathPrefix="/"/>
|
||||||
|
<data android:scheme="https" android:host="allmoviesforyou.co" android:pathPrefix="/"/>
|
||||||
|
<data android:scheme="https" android:host="asiaflix.app" android:pathPrefix="/"/>
|
||||||
|
<data android:scheme="https" android:host="www.thenos.org" android:pathPrefix="/"/>
|
||||||
|
<data android:scheme="https" android:host="vidembed.cc" android:pathPrefix="/"/>
|
||||||
|
<data android:scheme="https" android:host="trailers.to" android:pathPrefix="/"/>
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
|
|
|
@ -12,20 +12,14 @@ import android.content.res.Resources
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.*
|
import android.view.*
|
||||||
import android.view.View.GONE
|
|
||||||
import android.view.View.VISIBLE
|
|
||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.annotation.StringRes
|
import androidx.annotation.StringRes
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.constraintlayout.widget.ConstraintLayout
|
|
||||||
import androidx.core.view.isVisible
|
import androidx.core.view.isVisible
|
||||||
import androidx.core.view.marginBottom
|
|
||||||
import androidx.navigation.findNavController
|
import androidx.navigation.findNavController
|
||||||
import androidx.navigation.ui.setupWithNavController
|
import androidx.navigation.ui.setupWithNavController
|
||||||
import androidx.preference.PreferenceManager
|
import androidx.preference.PreferenceManager
|
||||||
import androidx.transition.ChangeBounds
|
|
||||||
import androidx.transition.TransitionManager
|
|
||||||
import com.google.android.gms.cast.framework.*
|
import com.google.android.gms.cast.framework.*
|
||||||
import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
|
import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
|
||||||
import com.lagradost.cloudstream3.APIHolder.apis
|
import com.lagradost.cloudstream3.APIHolder.apis
|
||||||
|
@ -83,7 +77,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
|
||||||
|
|
||||||
var mCastSession: CastSession? = null
|
var mCastSession: CastSession? = null
|
||||||
lateinit var mSessionManager: SessionManager
|
lateinit var mSessionManager: SessionManager
|
||||||
val mSessionManagerListener: SessionManagerListener<Session> by lazy { SessionManagerListenerImpl() }
|
private val mSessionManagerListener: SessionManagerListener<Session> by lazy { SessionManagerListenerImpl() }
|
||||||
|
|
||||||
private inner class SessionManagerListenerImpl : SessionManagerListener<Session> {
|
private inner class SessionManagerListenerImpl : SessionManagerListener<Session> {
|
||||||
override fun onSessionStarting(session: Session) {
|
override fun onSessionStarting(session: Session) {
|
||||||
|
@ -119,11 +113,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
try {
|
try {
|
||||||
if(isCastApiAvailable()) {
|
if (isCastApiAvailable()) {
|
||||||
mCastSession = mSessionManager.currentCastSession
|
mCastSession = mSessionManager.currentCastSession
|
||||||
mSessionManager.addSessionManagerListener(mSessionManagerListener)
|
mSessionManager.addSessionManagerListener(mSessionManagerListener)
|
||||||
}
|
}
|
||||||
} catch (e : Exception) {
|
} catch (e: Exception) {
|
||||||
logError(e)
|
logError(e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -131,11 +125,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
|
||||||
override fun onPause() {
|
override fun onPause() {
|
||||||
super.onPause()
|
super.onPause()
|
||||||
try {
|
try {
|
||||||
if(isCastApiAvailable()) {
|
if (isCastApiAvailable()) {
|
||||||
mSessionManager.removeSessionManagerListener(mSessionManagerListener)
|
mSessionManager.removeSessionManagerListener(mSessionManagerListener)
|
||||||
mCastSession = null
|
mCastSession = null
|
||||||
}
|
}
|
||||||
} catch (e : Exception) {
|
} catch (e: Exception) {
|
||||||
logError(e)
|
logError(e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -294,10 +288,10 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
|
||||||
updateLocale()
|
updateLocale()
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
try {
|
try {
|
||||||
if(isCastApiAvailable()) {
|
if (isCastApiAvailable()) {
|
||||||
mSessionManager = CastContext.getSharedInstance(this).sessionManager
|
mSessionManager = CastContext.getSharedInstance(this).sessionManager
|
||||||
}
|
}
|
||||||
} catch (e : Exception) {
|
} catch (e: Exception) {
|
||||||
logError(e)
|
logError(e)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -325,7 +319,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
|
||||||
.build()*/
|
.build()*/
|
||||||
nav_view.setupWithNavController(navController)
|
nav_view.setupWithNavController(navController)
|
||||||
|
|
||||||
var startUp = true
|
|
||||||
navController.addOnDestinationChangedListener { _, destination, _ ->
|
navController.addOnDestinationChangedListener { _, destination, _ ->
|
||||||
// nav_view.hideKeyboard()
|
// nav_view.hideKeyboard()
|
||||||
/*if (destination.id != R.id.navigation_player) {
|
/*if (destination.id != R.id.navigation_player) {
|
||||||
|
@ -339,33 +332,13 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
|
||||||
// Fucks up anime info layout since that has its own layout
|
// Fucks up anime info layout since that has its own layout
|
||||||
cast_mini_controller_holder?.isVisible = destination.id != R.id.navigation_results
|
cast_mini_controller_holder?.isVisible = destination.id != R.id.navigation_results
|
||||||
|
|
||||||
if (listOf(
|
nav_view.isVisible = listOf(
|
||||||
R.id.navigation_home,
|
R.id.navigation_home,
|
||||||
R.id.navigation_search,
|
R.id.navigation_search,
|
||||||
R.id.navigation_downloads,
|
R.id.navigation_downloads,
|
||||||
R.id.navigation_settings,
|
R.id.navigation_settings,
|
||||||
R.id.navigation_download_child
|
R.id.navigation_download_child
|
||||||
).contains(destination.id)
|
).contains(destination.id)
|
||||||
) {
|
|
||||||
nav_view.visibility = VISIBLE
|
|
||||||
if (nav_view.marginBottom < 0) {
|
|
||||||
nav_view.layoutParams = nav_view.layoutParams.apply {
|
|
||||||
val transition = ChangeBounds()
|
|
||||||
transition.duration = 100 // DURATION OF ANIMATION IN MS
|
|
||||||
TransitionManager.beginDelayedTransition(homeRoot, transition)
|
|
||||||
(this as ConstraintLayout.LayoutParams).setMargins(0, 0, 0, 0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (startUp) nav_view.visibility = GONE
|
|
||||||
nav_view.layoutParams = nav_view.layoutParams.apply {
|
|
||||||
val transition = ChangeBounds()
|
|
||||||
transition.duration = 100 // DURATION OF ANIMATION IN MS
|
|
||||||
TransitionManager.beginDelayedTransition(homeRoot, transition)
|
|
||||||
(this as ConstraintLayout.LayoutParams).setMargins(0, 0, 0, -nav_view.height)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
startUp = false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*nav_view.setOnNavigationItemSelectedListener { item ->
|
/*nav_view.setOnNavigationItemSelectedListener { item ->
|
||||||
|
@ -458,11 +431,29 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
var providersString = "Current providers are:\n"
|
var providersString = "Current providers are:\n"
|
||||||
|
var providersAndroidManifestString = "Current androidmanifest should be:\n"
|
||||||
for (api in apis) {
|
for (api in apis) {
|
||||||
providersString += "+ ${api.mainUrl}\n"
|
providersString += "+ ${api.mainUrl}\n"
|
||||||
|
providersAndroidManifestString += "<data android:scheme=\"https\" android:host=\"${
|
||||||
|
api.mainUrl.removePrefix(
|
||||||
|
"https://"
|
||||||
|
)
|
||||||
|
}\" android:pathPrefix=\"/\"/>\n"
|
||||||
|
}
|
||||||
|
|
||||||
|
for (api in restrictedApis) {
|
||||||
|
providersString += "+ ${api.mainUrl}\n"
|
||||||
|
providersAndroidManifestString += "<data android:scheme=\"https\" android:host=\"${
|
||||||
|
api.mainUrl.removePrefix(
|
||||||
|
"https://"
|
||||||
|
)
|
||||||
|
}\" android:pathPrefix=\"/\"/>\n"
|
||||||
}
|
}
|
||||||
println(providersString)
|
println(providersString)
|
||||||
|
|
||||||
|
|
||||||
|
println(providersAndroidManifestString)
|
||||||
|
|
||||||
handleAppIntent(intent)
|
handleAppIntent(intent)
|
||||||
|
|
||||||
thread {
|
thread {
|
||||||
|
|
Loading…
Reference in a new issue