From 0693d7786d65767c2bcea87dd6bd9330e80a62ae Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Sat, 30 Jan 2021 14:59:28 +0800
Subject: [PATCH] use new icons from @thepoweroftwo

---
 .../mesh/service/MeshServiceNotifications.kt  |   2 +-
 app/src/main/res/drawable-anydpi/app_icon.xml |  18 ++++++++++++++++++
 app/src/main/res/drawable-hdpi/app_icon.png   | Bin 0 -> 335 bytes
 app/src/main/res/drawable-mdpi/app_icon.png   | Bin 0 -> 251 bytes
 app/src/main/res/drawable-xhdpi/app_icon.png  | Bin 0 -> 400 bytes
 app/src/main/res/drawable-xxhdpi/app_icon.png | Bin 0 -> 718 bytes
 app/src/main/res/drawable/app_icon2.xml       |   7 -------
 app/src/main/res/layout/activity_main.xml     |   5 +++--
 design                                        |   2 +-
 9 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/drawable-anydpi/app_icon.xml
 create mode 100644 app/src/main/res/drawable-hdpi/app_icon.png
 create mode 100644 app/src/main/res/drawable-mdpi/app_icon.png
 create mode 100644 app/src/main/res/drawable-xhdpi/app_icon.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/app_icon.png
 delete mode 100644 app/src/main/res/drawable/app_icon2.xml

diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt b/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt
index 70a2b7d12..ddf55a306 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt
@@ -73,7 +73,7 @@ class MeshServiceNotifications(
         val builder = NotificationCompat.Builder(context, channelId).setOngoing(true)
             .setPriority(NotificationCompat.PRIORITY_MIN)
             .setCategory(category)
-            .setSmallIcon(android.R.drawable.stat_sys_data_bluetooth)
+            .setSmallIcon(R.drawable.app_icon)
             .setContentTitle(summaryString) // leave this off for now so our notification looks smaller
             .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
             .setContentIntent(openAppIntent)
diff --git a/app/src/main/res/drawable-anydpi/app_icon.xml b/app/src/main/res/drawable-anydpi/app_icon.xml
new file mode 100644
index 000000000..3b5436367
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/app_icon.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF"
+    android:alpha="0.8">
+  <group android:scaleX="0.24"
+      android:scaleY="0.24"
+      android:translateY="5.4">
+    <path
+        android:pathData="M64.716,13.073L37.867,52.447L32.204,48.585L61.878,5.068C62.516,4.132 63.575,3.572 64.707,3.571C65.839,3.57 66.899,4.128 67.538,5.063L97.281,48.512L91.625,52.384L64.716,13.073Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M8.379,52.406L39.741,6.415L34.078,2.553L2.716,48.544L8.379,52.406Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable-hdpi/app_icon.png b/app/src/main/res/drawable-hdpi/app_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f86071ee863c2b5528558c30dc69cf8ed99a620
GIT binary patch
literal 335
zcmV-V0kHmwP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0003NNkl<Zc-rlj
zZw-Sm5XCWo0Sq7j0~nYA1YiII6R-)WfFS?_tpGf+YjPx)Zf&on{XlXrxeuh5=Dq&<
zho%vUL?ThXj^pT{6jaaX9ie8Zwx%I#X2<FReLa-MzE>?X6EU+ydRNkGYpQ|jOuU9L
zAg0|Z9a_;GLo{(8LA4X(1Nl~^%+SPhs&R|A7&<p`g7L{?RC7*f2~<HePOwi^RCa?y
zZP;ggn>Pi043&!XviAsg#j_G~P<euyBy`-wDaLaz*rdcT{v^HQg(qkzfodcZzB6zB
z6W#Xr=66s%BB(Sm-e#U+Kf08}c03mqdoFSuP2}P1uAuU)w)uGpaA4si#*ME^{dggr
hrRtBINF);7SzqoZ*-j)2i`oDH002ovPDHLkV1mnii_-uA

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/app_icon.png b/app/src/main/res/drawable-mdpi/app_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f432e8db3a5b0d8d58d9c75d8ebc1de32c3c1180
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjhdf;zLn>}1CrGd^Zdmr<|NsB5
z9BhO;mToxV>G<@D=Eej`f%ym1IIa{-xD!;w>)$Ljq0Lo~OKZF2bg85!wk3sXd^`UJ
z-2eFKv#Q=<$602K9~os5`;!!|9Ab817Y#@>ywaeN)Xb}SqKi{9&qpD{q3CqMi&ocN
zhM`St?wf2GOq<2yFZ`G^X;BB4)`AA+kVVs{Bpgok)DPLqTy)`0dsRP(FMNf4LE5K7
xEK(25lC<=WO<Tkf@rdE-aqFlDeN3kq85T&DM#lGi(FOX3!PC{xWt~$(697PdVT=F(

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/app_icon.png b/app/src/main/res/drawable-xhdpi/app_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f295a5a228d0efc6a9e876dfb26df0c446571dbe
GIT binary patch
literal 400
zcmV;B0dM|^P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00043Nkl<Zc-rlk
zQ4xbM42Cf<0~n})89=}=Faa2-feF|IAOHlc0+@h#V&$$6y{vF)Xekf>f0q}Ie@)YG
z39Tv!f*=TjAV{Qno-a0f8%p49ZQM$4;AP|MqKoi#o==xbzVVV+;>GkS;#;CAfzIS5
z@L8TQy<=bl6W5;uoh7aUbZ9(}O1>ovYo_l?e0`u0P447tf{x)Fy+iIzkgMJE&tWLJ
zs!7n%#CP91nOw==Q=t>H!CdH!d(c^V&k&UAlpCO}PceND?w>RpN`cnbF@4d4E;&kp
zsW}!HbgBe8;{F~e+HiVwQmwsJg<gn`kq#y?O5E0$a?ouQ(Vx--s~FNwARTl`e^c6v
zrQb+NPxUP5tQ5yb=^ZRi0G+lJI?-$FydF-mgD%k}s-f%~!PHcw-KmTl@b3=h4^#Jo
umfVWm;OVN&a-`@(@6QkfK@bE%C)N+cQ^iV`)fhwo0000<MNUMnLSTY)(XW62

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/app_icon.png b/app/src/main/res/drawable-xxhdpi/app_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee1231857813e428466567d67e1630b6dc6e7dd9
GIT binary patch
literal 718
zcmV;<0x|uGP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!0007&Nkl<Zc-rlm
zu}i~16vj)z!J&vlm*6P63dN~Q!NJL?Tc%FkI&~97CqZaH-8wiXv)G}7lm;9G$^TUE
z-~<Wxu4(RGa?$UDM<GdHk}vt)<=$(xAP9mW2!bF8f*=TjAP9oI&}Oq~i+B`q!I1m(
zFBmiuk*RnPap=Mr5o?uG{tlXI&asHkUk1r|7jbTpvm@dyms6S)G|ikn5lQYwWPFG?
zvdBBt<diXQnn4rdMurwSdqmEk2%BQgnTRjV4LmzWE7PEM>bp7nB3=o!x)ynFx0v%2
zvF`>=8PFOKIa6Z$_`jjGCd}y&6G7%3Y6i4cmT1ig0|sh;K)gw@Zw6fxH*(2<)?Mzn
zkT`DYi#dJb0`D2nTF8Bx<LAUR^y)U}K*UmWVRGAnMc$om*nrxb&d@3ix;KpxC3BWS
zM(n@x3N<;tFrXFef|ln0kr${bv{rSaMT}i3@s-{20j)j*TH_t_P_y5xZnUl))p&kK
zQZirUdTcCu;x2)f{7Brl$Q!%-B37s^Do0H&8#E`C%ZoFMoMVnPm7zQ`<1%MRoN!`^
zR^|$=9Tv}_YjciN$wG(Lo@2C9SBuRps0A(!dZ`et(DB3Vv6g9>(CSrLTV{J02DFm0
zXc@|<DQ9=WdF@Cw{d8!_R?dm{184CGAugM6L?j$F1ueEu3i*a;ntqvjquLB;RklvD
zMvbxQcU#NnfAQK;T<Ad=ntq|hMNtdLsHRd)xiYOn>x%)cb=_!LmsS|jn)!g1b(xl_
zpI)dlQKL!4%d}$Sjpo272N#f*DW6toQdD@_S1p{Si>6=hRi1m(iZPdIldaRe`on`w
z)6Xz-c-c2sL&3BKK@bE%5ClOG1VIo4K@eo6Z|{KszeOdQ5C8xG07*qoM6N<$f*Y?$
Az5oCK

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/app_icon2.xml b/app/src/main/res/drawable/app_icon2.xml
deleted file mode 100644
index ef8c94b55..000000000
--- a/app/src/main/res/drawable/app_icon2.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="108dp" android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="108dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <group android:scaleX="0.5" android:scaleY="0.5" android:translateX="6" android:translateY="6">
-    <path android:fillColor="@android:color/white" android:pathData="M12,5c-3.87,0 -7,3.13 -7,7h2c0,-2.76 2.24,-5 5,-5s5,2.24 5,5h2c0,-3.87 -3.13,-7 -7,-7zM13,14.29c0.88,-0.39 1.5,-1.26 1.5,-2.29 0,-1.38 -1.12,-2.5 -2.5,-2.5S9.5,10.62 9.5,12c0,1.02 0.62,1.9 1.5,2.29v3.3L7.59,21 9,22.41l3,-3 3,3L16.41,21 13,17.59v-3.3zM12,1C5.93,1 1,5.93 1,12h2c0,-4.97 4.03,-9 9,-9s9,4.03 9,9h2c0,-6.07 -4.93,-11 -11,-11z"/>
-    </group>
-</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 55c6134bc..cf7de3c07 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -37,12 +37,13 @@
                         android:id="@+id/imageView5"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
                         android:contentDescription="@string/application_icon"
                         android:scaleType="center"
                         android:scaleX="1.5"
                         android:scaleY="1.5"
-                        app:srcCompat="@drawable/ic_baseline_settings_input_antenna_24" />
+                        app:srcCompat="@drawable/app_icon"
+                        tools:layout_editor_absoluteX="16dp"
+                        tools:layout_editor_absoluteY="18dp" />
 
                     <TextView
                         android:id="@+id/title"
diff --git a/design b/design
index 73ba05cee..9f340a534 160000
--- a/design
+++ b/design
@@ -1 +1 @@
-Subproject commit 73ba05ceef8beff81eb546a0b9e8ecad03a1216d
+Subproject commit 9f340a53463ad38516c372adac80e966ccf7a21a