Fix view not hidden on start

shadowsocks · Aug 28, 2024 · 809d3f7 · 809d3f7
1 parent 22504ba
commit 809d3f7
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/mobile/src/main/java/com/github/shadowsocks/widget/StatsBar.kt b/mobile/src/main/java/com/github/shadowsocks/widget/StatsBar.kt
@@ -28,14 +28,12 @@ import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.appcompat.widget.TooltipCompat
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.withStarted
+import androidx.core.view.doOnPreDraw
 import com.github.shadowsocks.MainActivity
 import com.github.shadowsocks.R
 import com.github.shadowsocks.bg.BaseService
 import com.github.shadowsocks.net.HttpsTest
 import com.google.android.material.bottomappbar.BottomAppBar
-import kotlinx.coroutines.launch
 
 class StatsBar @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null,
                                          defStyleAttr: Int = R.attr.bottomAppBarStyle) :
@@ -75,14 +73,11 @@ class StatsBar @JvmOverloads constructor(context: Context, attrs: AttributeSet?
 
     fun changeState(state: BaseService.State, animate: Boolean) {
         val activity = context as MainActivity
-        fun postWhenStarted(what: () -> Unit) = activity.lifecycleScope.launch {
-            activity.withStarted { what() }
-        }
         if ((state == BaseService.State.Connected).also { hideOnScroll = it }) {
-            postWhenStarted { performShow(animate) }
+            doOnPreDraw { performShow(animate) }
             tester.status.observe(activity) { it.retrieve(this::setStatus) { msg -> activity.snackbar(msg).show() } }
         } else {
-            postWhenStarted { performHide(animate) }
+            doOnPreDraw { performHide(animate) }
             updateTraffic(0, 0, 0, 0)
             tester.status.removeObservers(activity)
             if (state != BaseService.State.Idle) tester.invalidate()