meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #105 from lgoix/vmodel

Browse source 
Fix bad connection status #84
This commit is contained in:
Kevin Hester 2020-07-18 14:30:04 -07:00 • committed by GitHub
commit fed2615d96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/geeksville/mesh/MainActivity.kt
View file

@ -123,8 +123,6 @@ class MainActivity : AppCompatActivity(), Logging,
bluetoothManager.adapter
}
private var actionBarMenu: Menu? = null
val model: UIViewModel by viewModels()
data class TabInfo(val text: String, val icon: Int, val content: Fragment)
@ -421,7 +419,7 @@ class MainActivity : AppCompatActivity(), Logging,
private fun updateConnectionStatusImage(connected: MeshService.ConnectionState) {
if (actionBarMenu == null)
if (model.actionBarMenu == null)
return
val (image, tooltip) = when (connected) {
@ -434,10 +432,9 @@ class MainActivity : AppCompatActivity(), Logging,
R.drawable.cloud_off,
R.string.disconnected
)
// else -> Pair(R.drawable.cloud_off, R.string.disconnected)
}
val item = actionBarMenu?.findItem(R.id.connectStatusImage)
val item = model.actionBarMenu?.findItem(R.id.connectStatusImage)
if (item != null) {
item.setIcon(image)
item.setTitle(tooltip)
@ -844,7 +841,10 @@ class MainActivity : AppCompatActivity(), Logging,
override fun onCreateOptionsMenu(menu: Menu): Boolean {
// Inflate the menu; this adds items to the action bar if it is present.
menuInflater.inflate(R.menu.menu_main, menu)
actionBarMenu = menu
model.actionBarMenu = menu
updateConnectionStatusImage(model.isConnected.value!!)
return true
}