placeholder app icon

This commit is contained in:
geeksville
2020-02-10 14:06:50 -08:00
parent 67eea21ea4
commit 370cb264af
34 changed files with 137 additions and 224 deletions

View File

@@ -63,7 +63,7 @@ fun HomeScreen(openDrawer: () -> Unit) {
TopAppBar(
title = { Text(text = "Meshtastic") },
navigationIcon = {
VectorImageButton(R.drawable.ic_launcher_foreground) {
VectorImageButton(R.drawable.ic_launcher_new_foreground) {
openDrawer()
}
}
@@ -129,15 +129,15 @@ private fun AppDrawer(
Spacer(LayoutHeight(24.dp))
Row(modifier = LayoutPadding(16.dp)) {
VectorImage(
id = R.drawable.ic_launcher_foreground,
id = R.drawable.ic_launcher_new_foreground,
tint = (MaterialTheme.colors()).primary
)
Spacer(LayoutWidth(8.dp))
VectorImage(id = R.drawable.ic_launcher_foreground)
VectorImage(id = R.drawable.ic_launcher_new_foreground)
}
Divider(color = Color(0x14333333))
DrawerButton(
icon = R.drawable.ic_launcher_foreground,
icon = R.drawable.ic_launcher_new_foreground,
label = "Home",
isSelected = currentScreen == Screen.Home
) {

View File

@@ -31,10 +31,14 @@ fun NodeIcon(modifier: Modifier = Modifier.None, node: NodeInfo) {
@Composable
fun CompassHeading(modifier: Modifier = Modifier.None, node: NodeInfo) {
Column {
Container(modifier = modifier + LayoutSize(40.dp, 40.dp)) {
VectorImage(id = R.drawable.navigation)
if (node.position != null) {
Container(modifier = modifier + LayoutSize(40.dp, 40.dp)) {
VectorImage(id = R.drawable.navigation)
}
Text("2.3 km")
} else Container(modifier = modifier + LayoutSize(40.dp, 40.dp)) {
VectorImage(id = R.drawable.help)
}
Text("2.3 km")
}
}
@@ -74,5 +78,8 @@ fun NodeInfoCard(node: NodeInfo) {
@Preview
@Composable
fun nodeInfoPreview() {
NodeInfoCard(UIState.testNodes[0])
Column {
NodeInfoCard(UIState.testNodes[0])
NodeInfoCard(UIState.testNodeNoPosition)
}
}

View File

@@ -29,6 +29,13 @@ object UIState {
Position(32.912901, -96.781776, 35) // north dallas
)
val testNodeNoPosition = NodeInfo(
8,
MeshUser("+6508765308".format(8), "Kevin MesterNoLoc", "KLO"),
null,
12345
)
val testNodes = testPositions.mapIndexed { index, it ->
NodeInfo(
9 + index,