From 7e6bc0d740553b2e954a5a78f5d0a3c0cf3ad0b8 Mon Sep 17 00:00:00 2001 From: Mygod Date: Tue, 8 Dec 2015 22:34:27 +0800 Subject: [PATCH] Provide a better workaround for hiding FAB Fix #471 --- .../com/github/shadowsocks/Shadowsocks.scala | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala index cac22920..3e3d0a60 100644 --- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala +++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala @@ -450,26 +450,28 @@ class Shadowsocks bgService.getState match { case State.CONNECTING => fab.setBackgroundTintList(greyTint) - changeSwitch(checked = true) + serviceStarted = false + fab.setImageResource(R.drawable.ic_cloud_queue) setPreferenceEnabled(false) fabProgressCircle.show() case State.CONNECTED => fab.setBackgroundTintList(greenTint) - changeSwitch(checked = true) + serviceStarted = true + fab.setImageResource(R.drawable.ic_cloud) setPreferenceEnabled(false) - fabProgressCircle.show() - handler.postDelayed(() => fabProgressCircle.hide(), 1000) + fabProgressCircle.postDelayed(fabProgressCircle.hide, 100) case State.STOPPING => fab.setBackgroundTintList(greyTint) - changeSwitch(checked = false) + serviceStarted = false + fab.setImageResource(R.drawable.ic_cloud_queue) setPreferenceEnabled(false) fabProgressCircle.show() case _ => fab.setBackgroundTintList(greyTint) - changeSwitch(checked = false) + serviceStarted = false + fab.setImageResource(R.drawable.ic_cloud_off) setPreferenceEnabled(true) - fabProgressCircle.show() - handler.postDelayed(() => fabProgressCircle.hide(), 1000) + fabProgressCircle.postDelayed(fabProgressCircle.hide, 100) } state = bgService.getState }