Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

services: smoother initialization (fixes #1950) #2027

Merged
merged 1 commit into from
Jun 3, 2024
+32 −31
Merged

services: smoother initialization (fixes #1950) #2027

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 32 additions & 31 deletions app/src/main/kotlin/io/treehouses/remote/fragments/ServiceCardFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import io.treehouses.remote.pojo.ServiceInfo

class ServiceCardFragment : Fragment(), View.OnClickListener {
private var actionListener: ServiceActionListener? = null
private var binding: ServiceCardBinding? = null
private lateinit var binding: ServiceCardBinding
private lateinit var serviceData: ServiceInfo

override fun onCreate(savedInstanceState: Bundle?) {
Expand All @@ -30,27 +30,27 @@ class ServiceCardFragment : Fragment(), View.OnClickListener {

override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
binding = ServiceCardBinding.inflate(inflater, container, false)
binding!!.serviceInfo.movementMethod = LinkMovementMethod.getInstance()
binding!!.serviceInfo.isFocusable = true
binding.serviceInfo.movementMethod = LinkMovementMethod.getInstance()
binding.serviceInfo.isFocusable = true
if (!serviceData.isHeader) {
setServiceInfo(serviceData.info)
setServiceSize(serviceData.size)
showIcon(serviceData.icon)
updateButtons(serviceData.serviceStatus)
setAutorun(serviceData.autorun)
binding!!.installButton.setOnClickListener(this)
binding!!.startButton.setOnClickListener(this)
binding!!.openLink.setOnClickListener(this)
binding!!.editEnvButton.setOnClickListener(this)
binding!!.autorunChecked.setOnClickListener {
actionListener!!.onClickAutorun(serviceData, binding?.autorunChecked?.isChecked ?: false)
binding.installButton.setOnClickListener(this)
binding.startButton.setOnClickListener(this)
binding.openLink.setOnClickListener(this)
binding.editEnvButton.setOnClickListener(this)
binding.autorunChecked.setOnClickListener {
actionListener?.onClickAutorun(serviceData, binding.autorunChecked.isChecked)
}
}
return binding!!.root
return binding.root
}

private fun setAutorun(autorun: String?) {
binding!!.autorunChecked.isChecked = autorun!!.contains("true")
binding.autorunChecked.isChecked = autorun?.contains("true") ?: false
}

private fun setButtons(started: Boolean, installed: Boolean) {
Expand All @@ -66,8 +66,8 @@ class ServiceCardFragment : Fragment(), View.OnClickListener {
var visibility2 = View.GONE
var visibility3 = View.GONE

binding!!.startButton.text = string1
binding!!.openLink.visibility = visibility1
binding.startButton.text = string1
binding.openLink.visibility = visibility1

if (installed) {
string2 = "Uninstall"
Expand All @@ -79,10 +79,10 @@ class ServiceCardFragment : Fragment(), View.OnClickListener {
if (installed && !started && serviceData.usesEnv == "true")
visibility4 = View.VISIBLE

binding!!.installButton.text = string2
binding!!.startButton.visibility = visibility2
binding!!.autorunChecked.visibility = visibility3
binding!!.editEnvButton.visibility = visibility4
binding.installButton.text = string2
binding.startButton.visibility = visibility2
binding.autorunChecked.visibility = visibility3
binding.editEnvButton.visibility = visibility4

}

Expand All @@ -98,37 +98,38 @@ class ServiceCardFragment : Fragment(), View.OnClickListener {
try {
val svg = SVG.getFromString(s)
val pd = PictureDrawable(svg.renderToPicture())
binding!!.serviceLogo.setImageDrawable(pd)
binding.serviceLogo.setImageDrawable(pd)
} catch (e: Exception) {
e.printStackTrace()
}
}

private fun setServiceInfo(s: String?) {
val spannableString = SpannableString(s)
val spannableString = SpannableString(s ?: "")
Linkify.addLinks(spannableString, Linkify.ALL)
binding!!.serviceInfo.text = spannableString
binding!!.serviceInfo.movementMethod = LinkMovementMethod.getInstance()
binding.serviceInfo.text = spannableString
binding.serviceInfo.movementMethod = LinkMovementMethod.getInstance()
}

private fun setServiceSize(sz: Int) {
if(sz != -1)
binding!!.serviceSize.text = "$sz MB"
if(sz != -1) {
binding.serviceSize.text = "$sz MB"
}
}

override fun onClick(v: View) {
when {
binding!!.installButton == v -> {
actionListener!!.onClickInstall(serviceData)
binding.installButton == v -> {
actionListener?.onClickInstall(serviceData)
}
binding!!.startButton == v -> {
actionListener!!.onClickStart(serviceData)
binding.startButton == v -> {
actionListener?.onClickStart(serviceData)
}
binding!!.openLink == v -> {
actionListener!!.onClickLink(serviceData)
binding.openLink == v -> {
actionListener?.onClickLink(serviceData)
}
binding!!.editEnvButton == v -> {
actionListener!!.onClickEditEnvVar(serviceData)
binding.editEnvButton == v -> {
actionListener?.onClickEditEnvVar(serviceData)
}
}
}
Expand Down