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

add beginnings of new messages tab

Browse source
This commit is contained in:
geeksville 2020-04-08 16:49:27 -07:00
parent 4074674c41
commit e157bb0140
7 changed files with 302 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,7 @@ import com.geeksville.mesh.model.UIViewModel
import com.geeksville.mesh.service.*
import com.geeksville.mesh.ui.ChannelFragment
import com.geeksville.mesh.ui.MapFragment
import com.geeksville.mesh.ui.MessagesFragment
import com.geeksville.mesh.ui.UsersFragment
import com.geeksville.util.Exceptions
import com.geeksville.util.exceptionReporter
@ -113,6 +114,11 @@ class MainActivity : AppCompatActivity(), Logging,
// private val tabIndexes = generateSequence(0) { it + 1 } FIXME, instead do withIndex or zip? to get the ids below, also stop duplicating strings
private val tabInfos = arrayOf(
TabInfo(
"Messages",
R.drawable.ic_twotone_message_24,
MessagesFragment()
),
TabInfo(
"Users",
R.drawable.ic_twotone_people_24,
@ -129,10 +135,7 @@ class MainActivity : AppCompatActivity(), Logging,
MapFragment()
)
/*
TabInfo(
"Messages",
R.drawable.ic_twotone_message_24,
ComposeFragment("Messages", 1) { MessagesContent() }),
TabInfo(
@ -297,7 +300,7 @@ class MainActivity : AppCompatActivity(), Logging,
MeshService.ConnectionState.DEVICE_SLEEP -> R.drawable.ic_twotone_cloud_upload_24
MeshService.ConnectionState.DISCONNECTED -> R.drawable.cloud_off
}
connectStatusImage.setImageDrawable(getDrawable(image))
})
}