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

fix node id lookups

Browse source
This commit is contained in:
geeksville 2020-02-25 10:30:10 -08:00
parent 2c8c7ac8d6
commit b5fc637f30
5 changed files with 37 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/ui/Channel.kt
View file

@ -1,6 +1,8 @@
package com.geeksville.mesh.ui
import androidx.compose.Composable
import androidx.compose.ambient
import androidx.ui.core.ContextAmbient
import androidx.ui.core.Text
import androidx.ui.foundation.Clickable
import androidx.ui.foundation.DrawImage
@ -10,7 +12,9 @@ import androidx.ui.material.ripple.Ripple
import androidx.ui.res.imageResource
import androidx.ui.tooling.preview.Preview
import androidx.ui.unit.dp
import com.geeksville.android.GeeksvilleApplication
import com.geeksville.android.Logging
import com.geeksville.android.toast
import com.geeksville.mesh.R
/// The Compose IDE preview doesn't like the protobufs
@ -21,6 +25,7 @@ object ChannelLog : Logging
@Composable
fun ChannelContent(channel: Channel = Channel("Default", 7)) {
val typography = MaterialTheme.typography()
val context = ambient(ContextAmbient)
Column(modifier = LayoutSize.Fill + LayoutPadding(16.dp)) {
Text(
@ -37,7 +42,8 @@ fun ChannelContent(channel: Channel = Channel("Default", 7)) {
Ripple(bounded = false) {
Clickable(onClick = {
TODO()
GeeksvilleApplication.analytics.track("channel_share") // track how many times users share channels
context.toast("Channel sharing is not yet implemented")
}) {
VectorImage(
id = R.drawable.ic_twotone_share_24,

24
app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
View file

@ -48,17 +48,19 @@ fun HomeContent() {
Column {
Text("Connected")
/// Create a software update button
val context = ambient(ContextAmbient)
RadioInterfaceService.getBondedDeviceAddress(context)?.let { macAddress ->
Button(text = "Update firmware",
onClick = {
SoftwareUpdateService.enqueueWork(
context,
SoftwareUpdateService.startUpdateIntent(macAddress)
)
}
)
if (false) { // hide the firmware update button for now, it is kinda ugly and users don't need it yet
/// Create a software update button
val context = ambient(ContextAmbient)
RadioInterfaceService.getBondedDeviceAddress(context)?.let { macAddress ->
Button(text = "Update firmware",
onClick = {
SoftwareUpdateService.enqueueWork(
context,
SoftwareUpdateService.startUpdateIntent(macAddress)
)
}
)
}
}
}
} else {