mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-02-06 13:53:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

turn off gestures - they are confusing with the map view

Browse Source
This commit is contained in:
geeksville
2020-04-07 12:32:42 -07:00
parent 7af7ec0843
commit 606dc0fd07
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/geeksville/mesh/MainActivity.kt
View File

@@ -301,6 +301,8 @@ class MainActivity : AppCompatActivity(), Logging,
val tab_layout = findViewById<TabLayout>(R.id.tab_layout)
val pager = findViewById<ViewPager2>(R.id.pager)
pager.adapter = tabsAdapter
pager.isUserInputEnabled =
false // Gestures for screen switching doesn't work so good with the map view
TabLayoutMediator(tab_layout, pager) { tab, position ->
// tab.text = tabInfos[position].text // I think it looks better with icons only
tab.icon = getDrawable(tabInfos[position].icon)

2
app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt
View File

@@ -316,7 +316,7 @@ class RadioInterfaceService : Service(), Logging {
debug("requested MTU result=$mtuRes")
mtuRes.getOrThrow() // FIXME - why sometimes is the result Unit!?!
fromNum = service.getCharacteristic(BTM_FROMNUM_CHARACTER)
fromNum = service.getCharacteristic(BTM_FROMNUM_CHARACTER)!!
// We must set this to true before broadcasting connectionChanged
isConnected = true

4
app/src/main/res/layout/activity_main.xml
View File

@@ -30,9 +30,7 @@
Screen.settings -> SettingsContent()
Screen.users -> UsersContent()
Screen.channel -> ChannelContent(UIState.getChannel())
Screen.map -> MapContent() -->
/--
Screen.map -> MapContent()
<com.google.android.material.tabs.TabItem
android:icon="@drawable/ic_twotone_message_24"