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

Refactor: Create core:api module and set up publishing (#4362)

Browse source
This commit is contained in:
James Rich 2026-01-29 13:45:00 -06:00 • committed by GitHub
parent 4e7de3b73c
commit 15760da074
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 381 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mesh_service_example/src/main/kotlin/com/meshtastic/android/meshserviceexample/MainActivity.kt
View file

@ -30,8 +30,8 @@ import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.activity.viewModels
import androidx.compose.material3.MaterialTheme
import org.meshtastic.core.service.IMeshService
import org.meshtastic.core.ui.theme.AppTheme
private const val TAG: String = "MeshServiceExample"
@ -89,7 +89,7 @@ class MainActivity : ComponentActivity() {
registerReceiver(meshtasticReceiver, intentFilter)
}
setContent { AppTheme { MainScreen(viewModel) } }
setContent { MaterialTheme { MainScreen(viewModel) } }
}
override fun onDestroy() {

41
mesh_service_example/src/main/kotlin/com/meshtastic/android/meshserviceexample/MainScreen.kt
View file

@ -75,14 +75,43 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import kotlinx.coroutines.launch
import org.meshtastic.core.model.NodeInfo
import org.meshtastic.core.ui.component.ListItem
import org.meshtastic.core.ui.component.TitledCard
import org.meshtastic.core.ui.theme.StatusColors.StatusGreen
@Composable
fun ListItem(
text: String,
supportingText: String? = null,
leadingIcon: ImageVector? = null,
trailingIcon: ImageVector? = null,
) {
androidx.compose.material3.ListItem(
headlineContent = { Text(text) },
supportingContent = supportingText?.let { { Text(it) } },
leadingContent = leadingIcon?.let { { Icon(it, contentDescription = null) } },
trailingContent = trailingIcon?.let { { Icon(it, contentDescription = null) } },
)
}
@Composable
fun TitledCard(title: String, content: @Composable () -> Unit) {
Card(modifier = Modifier.fillMaxWidth()) {
Column(modifier = Modifier.padding(16.dp)) {
Text(
text = title,
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.primary,
modifier = Modifier.padding(bottom = 12.dp),
)
content()
}
}
}
@OptIn(ExperimentalMaterial3Api::class)
@Composable
@ -132,7 +161,7 @@ private fun TopBarTitle(isConnected: Boolean, connectionState: String) {
Row(verticalAlignment = Alignment.CenterVertically) {
val statusColor =
if (isConnected) {
MaterialTheme.colorScheme.StatusGreen
Color.Green
} else {
MaterialTheme.colorScheme.error
}
@ -331,7 +360,7 @@ private fun NodeItemHeader(node: NodeInfo) {
.background(MaterialTheme.colorScheme.surface)
.padding(2.dp)
.clip(CircleShape)
.background(MaterialTheme.colorScheme.StatusGreen),
.background(Color.Green),
)
}
}
@ -393,7 +422,7 @@ private fun NodeItemActions(isOnline: Boolean, onAction: (String) -> Unit) {
Icon(
imageVector = Icons.Rounded.Router,
contentDescription = "Online",
tint = MaterialTheme.colorScheme.StatusGreen.copy(alpha = 0.5f),
tint = androidx.compose.ui.graphics.Color.Green.copy(alpha = 0.5f),
modifier = Modifier.padding(start = 8.dp).size(20.dp),
)
}