From 8ab6686b6c8d9c49620e91583890aa56353a81ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Thu, 3 Oct 2019 22:11:47 +0200
Subject: [PATCH] Add Discovery Indicator to Android

---
 .../drawable/ic_discovered_on_secondary.xml   |  9 +++
 .../app/src/main/res/drawable/ic_triangle.xml | 15 +++++
 .../src/main/res/layout/item_display_host.xml | 39 +++++++++++-
 assets/triangle.svg                           | 63 +++++++++++++++++++
 4 files changed, 123 insertions(+), 3 deletions(-)
 create mode 100644 android/app/src/main/res/drawable/ic_discovered_on_secondary.xml
 create mode 100644 android/app/src/main/res/drawable/ic_triangle.xml
 create mode 100644 assets/triangle.svg

diff --git a/android/app/src/main/res/drawable/ic_discovered_on_secondary.xml b/android/app/src/main/res/drawable/ic_discovered_on_secondary.xml
new file mode 100644
index 0000000..6eb9b72
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_discovered_on_secondary.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="?attr/colorOnSecondary"
+        android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3 3,-3c-1.65,-1.66 -4.34,-1.66 -6,0zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/>
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_triangle.xml b/android/app/src/main/res/drawable/ic_triangle.xml
new file mode 100644
index 0000000..fe7ccda
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_triangle.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="135.46666"
+    android:viewportHeight="135.46667">
+  <path
+      android:pathData="M0,0L0,135.467L135.467,0Z"
+      android:strokeAlpha="1"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.85611618"
+      android:fillColor="?attr/colorSecondary"
+      android:strokeColor="#00000000"
+      android:fillAlpha="1"
+      android:strokeLineCap="butt"/>
+</vector>
diff --git a/android/app/src/main/res/layout/item_display_host.xml b/android/app/src/main/res/layout/item_display_host.xml
index 0b44552..f8936ac 100644
--- a/android/app/src/main/res/layout/item_display_host.xml
+++ b/android/app/src/main/res/layout/item_display_host.xml
@@ -17,18 +17,51 @@
         android:layout_marginBottom="0dp"
         android:elevation="8dp">
 
+        <ImageView
+            android:layout_width="72dp"
+            android:layout_height="72dp"
+            android:src="@drawable/ic_triangle"
+            android:layout_gravity="left|top" />
+
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:padding="8dp">
 
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_discovered_on_secondary" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/nameTextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-condensed-medium"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="Name"
+                android:textSize="32sp"
+                android:gravity="center"
+                android:textColor="?attr/colorOnSurface"/>
+
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/hostTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif-condensed-medium"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="Host"
+                app:layout_constraintTop_toBottomOf="@id/nameTextView"
+                tools:text="Address: Host"
+                android:textSize="16sp"
+                android:gravity="center"
+                android:textColor="?attr/colorOnSurface"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/idTextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-condensed-medium"
+                app:layout_constraintTop_toBottomOf="@id/hostTextView"
+                tools:text="ID: C0FFEE1337"
                 android:textSize="16sp"
                 android:gravity="center"
                 android:textColor="?attr/colorOnSurface"/>
@@ -37,7 +70,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:src="@drawable/ic_console"
-                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/idTextView"
                 app:layout_constraintBottom_toBottomOf="parent"
                 android:layout_marginLeft="32dp"
                 android:layout_marginRight="32dp" />
diff --git a/assets/triangle.svg b/assets/triangle.svg
new file mode 100644
index 0000000..89d0e25
--- /dev/null
+++ b/assets/triangle.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="512"
+   height="512"
+   viewBox="0 0 135.46666 135.46667"
+   version="1.1"
+   id="svg1573"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   sodipodi:docname="triangle.svg">
+  <defs
+     id="defs1567" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="172.50702"
+     inkscape:cy="273.7207"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1918"
+     inkscape:window-height="1048"
+     inkscape:window-x="0"
+     inkscape:window-y="15"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata1570">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-161.53332)">
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.85611618;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0,161.53332 V 296.99999 L 135.46667,161.53332 Z"
+       id="rect2120"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>