recloudstream/cloudstream-extensions
2
2
Fork 0
mirror of https://github.com/recloudstream/cloudstream-extensions.git synced 2024-08-15 03:03:54 +00:00
Code Issues Projects Releases Wiki Activity

Nginx fixes to stop using R. integers

Browse source
This commit is contained in:
Blatzar 2022-08-18 22:31:13 +02:00
parent 83674ba755
commit 8c8be65146
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NginxProvider/build.gradle.kts
View file

@ -5,7 +5,7 @@ dependencies {
} }
// use an integer for version numbers // use an integer for version numbers
version = 5 version = 6
cloudstream { cloudstream {

26
NginxProvider/src/main/kotlin/com/lagradost/NginxSettingsFragment.kt
View file

@ -12,8 +12,6 @@ import android.widget.TextView
import androidx.core.content.res.ResourcesCompat import androidx.core.content.res.ResourcesCompat
import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
import com.lagradost.cloudstream3.R.attr.white
import com.lagradost.cloudstream3.R.string.*
import com.lagradost.cloudstream3.plugins.Plugin import com.lagradost.cloudstream3.plugins.Plugin
import com.lagradost.cloudstream3.ui.settings.SettingsAccount.Companion.showLoginInfo import com.lagradost.cloudstream3.ui.settings.SettingsAccount.Companion.showLoginInfo
import com.lagradost.cloudstream3.ui.settings.SettingsAccount.Companion.addAccount import com.lagradost.cloudstream3.ui.settings.SettingsAccount.Companion.addAccount
@ -37,11 +35,18 @@ class NginxSettingsFragment(private val plugin: Plugin, val nginxApi: NginxApi)
return this.findViewById(id) return this.findViewById(id)
} }
// val theme = plugin.resources!!.newTheme()
private fun getDrawable(name: String): Drawable? { private fun getDrawable(name: String): Drawable? {
val id = plugin.resources!!.getIdentifier(name, "drawable", "com.lagradost") val id = plugin.resources!!.getIdentifier(name, "drawable", "com.lagradost")
return ResourcesCompat.getDrawable(plugin.resources!!, id, null) //plugin.resources!!.getDrawable(id, theme) return ResourcesCompat.getDrawable(plugin.resources!!, id, null)
}
private fun getString(name: String): String {
val id = this.resources.getIdentifier(name, "string", "com.lagradost")
return this.getString(id)
}
private fun getAttr(name: String): Int {
return this.resources.getIdentifier(name, "attr", "com.lagradost")
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@ -51,18 +56,19 @@ class NginxSettingsFragment(private val plugin: Plugin, val nginxApi: NginxApi)
val infoSubTextView = view.findView<TextView>("info_sub_text") val infoSubTextView = view.findView<TextView>("info_sub_text")
val infoImageView = view.findView<ImageView>("nginx_info_imageview") val infoImageView = view.findView<ImageView>("nginx_info_imageview")
infoTextView.text = getString(nginx_info_title) infoTextView.text = getString("nginx_info_title")
infoSubTextView.text = getString(nginx_info_summary) infoSubTextView.text = getString("nginx_info_summary")
infoImageView.setImageDrawable( infoImageView.setImageDrawable(
getDrawable("nginx_question") getDrawable("nginx_question")
) )
infoImageView.imageTintList = ColorStateList.valueOf(view.context.colorFromAttribute(white)) infoImageView.imageTintList = ColorStateList.valueOf(view.context.colorFromAttribute(getAttr("white")))
val loginView = view.findView<LinearLayout>("nginx_login") val loginView = view.findView<LinearLayout>("nginx_login")
val loginTextView = view.findView<TextView>("main_text") val loginTextView = view.findView<TextView>("main_text")
val loginImageView = view.findView<ImageView>("nginx_login_imageview") val loginImageView = view.findView<ImageView>("nginx_login_imageview")
loginImageView.setImageDrawable(getDrawable("nginx")) loginImageView.setImageDrawable(getDrawable("nginx"))
loginImageView.imageTintList = ColorStateList.valueOf(view.context.colorFromAttribute(white)) loginImageView.imageTintList =
ColorStateList.valueOf(view.context.colorFromAttribute(getAttr("white")))
// object : View.OnClickListener is required to make it compile because otherwise it used invoke-customs // object : View.OnClickListener is required to make it compile because otherwise it used invoke-customs
infoView.setOnClickListener(object : View.OnClickListener { infoView.setOnClickListener(object : View.OnClickListener {
@ -72,7 +78,7 @@ class NginxSettingsFragment(private val plugin: Plugin, val nginxApi: NginxApi)
}) })
loginTextView.text = getString(login_format).format(nginxApi.name, getString(account)) loginTextView.text = getString("login_format").format(nginxApi.name, getString("account"))
loginView.setOnClickListener(object : View.OnClickListener { loginView.setOnClickListener(object : View.OnClickListener {
override fun onClick(v: View?) { override fun onClick(v: View?) {
val info = nginxApi.loginInfo() val info = nginxApi.loginInfo()