Commit 7b7614db authored by Mygod's avatar Mygod

Misc bugfixes for FAB Progress Circle

parent d6c45df3
...@@ -786,11 +786,17 @@ class Shadowsocks ...@@ -786,11 +786,17 @@ class Shadowsocks
super.onResume() super.onResume()
if (bgService != null) { if (bgService != null) {
bgService.getState match { bgService.getState match {
case State.CONNECTED =>
changeSwitch(checked = true)
case State.CONNECTING => case State.CONNECTING =>
fabProgressCircle.show()
changeSwitch(checked = true)
case State.CONNECTED =>
fabProgressCircle.hide()
changeSwitch(checked = true) changeSwitch(checked = true)
case State.STOPPING =>
fabProgressCircle.show()
changeSwitch(checked = false)
case _ => case _ =>
fabProgressCircle.hide()
changeSwitch(checked = false) changeSwitch(checked = false)
} }
state = bgService.getState state = bgService.getState
...@@ -1036,7 +1042,7 @@ class Shadowsocks ...@@ -1036,7 +1042,7 @@ class Shadowsocks
changeSwitch(checked = true) changeSwitch(checked = true)
setPreferenceEnabled(enabled = false) setPreferenceEnabled(enabled = false)
case State.STOPPED => case State.STOPPED =>
fabProgressCircle.hide() handler.post(() => fabProgressCircle.hide())
fab.setEnabled(true) fab.setEnabled(true)
changeSwitch(checked = false) changeSwitch(checked = false)
if (m != null) Snackbar.make(getWindow.getDecorView.findViewById(android.R.id.content), if (m != null) Snackbar.make(getWindow.getDecorView.findViewById(android.R.id.content),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment