sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1863 from Hafizzle/Hafiz/wear-black-screen-fix

Browse source 
Black screen when launching wear app first time fix
This commit is contained in:
Phillip Thelen 2022-11-15 14:25:51 +01:00 committed by GitHub
commit 9223ee3705
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
View file

@ -5,6 +5,7 @@ import android.os.Bundle
import android.widget.LinearLayout
import androidx.activity.viewModels
import androidx.core.view.isVisible
import androidx.lifecycle.Observer
import androidx.lifecycle.lifecycleScope
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.databinding.ActivityRyaBinding
@ -26,15 +27,21 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
binding = ActivityRyaBinding.inflate(layoutInflater)
super.onCreate(savedInstanceState)
viewModel.tasks.observe(this) {
if (!viewModel.hasTaskData) return@observe
if (it.isEmpty()) {
runCron()
return@observe
viewModel.tasks.observe(
this,
object : Observer<List<Task>> {
override fun onChanged(list: List<Task>) {
if (list.isEmpty()) {
runCron()
viewModel.tasks.removeObserver(this)
} else {
binding.scrollView.isVisible = true
createTaskListViews(list)
viewModel.tasks.removeObserver(this)
}
}
}
binding.scrollView.isVisible = true
createTaskListViews(it)
}
)
binding.ryaButton.setOnClickListener {
binding.titleView.text = getString(R.string.check_off_yesterday)
@ -58,9 +65,9 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
if (!viewModel.hasRunCron) {
startActivity(
Intent(this, RYAActivity::class.java)
.apply {
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
})
.apply {
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
})
}
super.onDestroy()
}

2
wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/RYAViewModel.kt
View file

@ -26,7 +26,6 @@ class RYAViewModel @Inject constructor(
) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
var hasRunCron: Boolean = false
val tasks = MutableLiveData<List<Task>>()
var hasTaskData = false
private val tasksToComplete = mutableListOf<Task>()
@ -36,7 +35,6 @@ class RYAViewModel @Inject constructor(
.map { it.filter { task -> task.isDue == true && !task.completed } }
.first()
tasks.value = taskList
hasTaskData = true
}
}