diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 127028860..5d18986f2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -37,9 +37,9 @@ diff --git a/app/src/main/ic_launcher_new-playstore.png b/app/src/main/ic_launcher_new-playstore.png new file mode 100644 index 000000000..99f1c6749 Binary files /dev/null and b/app/src/main/ic_launcher_new-playstore.png differ diff --git a/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt b/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt index d93889da9..1b6a6298f 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt @@ -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 ) { diff --git a/app/src/main/java/com/geeksville/mesh/ui/NodeInfoCard.kt b/app/src/main/java/com/geeksville/mesh/ui/NodeInfoCard.kt index 764582f16..b5f32dad3 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/NodeInfoCard.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/NodeInfoCard.kt @@ -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) + } } \ No newline at end of file diff --git a/app/src/main/java/com/geeksville/mesh/ui/Status.kt b/app/src/main/java/com/geeksville/mesh/ui/Status.kt index 783943874..c05ad3ca3 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/Status.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/Status.kt @@ -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, diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 1f6bb2906..000000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable/help.xml b/app/src/main/res/drawable/help.xml new file mode 100644 index 000000000..0b2cd9765 --- /dev/null +++ b/app/src/main/res/drawable/help.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 0d025f9bf..000000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_new_background.xml b/app/src/main/res/drawable/ic_launcher_new_background.xml new file mode 100644 index 000000000..ca3826a46 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_new_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_new_foreground.xml b/app/src/main/res/drawable/ic_launcher_new_foreground.xml new file mode 100644 index 000000000..5d4c3136d --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_new_foreground.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 32c9047fb..000000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_new.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_new.xml new file mode 100644 index 000000000..4d3ddb1c9 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_new.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_new_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_new_round.xml new file mode 100644 index 000000000..4d3ddb1c9 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_new_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cfe5..000000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 898f3ed59..000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_new.png b/app/src/main/res/mipmap-hdpi/ic_launcher_new.png new file mode 100644 index 000000000..7775fe6af Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_new.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_new_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_new_round.png new file mode 100644 index 000000000..dcb457c57 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_new_round.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index dffca3601..000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 64ba76f75..000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_new.png b/app/src/main/res/mipmap-mdpi/ic_launcher_new.png new file mode 100644 index 000000000..24ba1e0e2 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_new.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_new_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_new_round.png new file mode 100644 index 000000000..4ee7a542f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_new_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index dae5e0823..000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index e5ed46597..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_new.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_new.png new file mode 100644 index 000000000..1e8fc236b Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_new.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_new_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_new_round.png new file mode 100644 index 000000000..2e8c86568 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_new_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 14ed0af35..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index b0907cac3..000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_new.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_new.png new file mode 100644 index 000000000..e7d3091d3 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_new.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_new_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_new_round.png new file mode 100644 index 000000000..0cb845ddb Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_new_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index d8ae03154..000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 2c18de9e6..000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_new.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_new.png new file mode 100644 index 000000000..ab174c1cd Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_new.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_new_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_new_round.png new file mode 100644 index 000000000..77abfd253 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_new_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index beed3cdd2..000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ