addressing #712 icon concerns

wiglenet · Nov 9, 2024 · 9bdae42 · 9bdae42
1 parent 0364354
commit 9bdae42
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -52,5 +52,13 @@ F-Droid (externally maintained build of the [foss-master branch](https://github.
 ## How to use it
 There aren't presently any official how-to guides, but a youtube search will provide tutorials. For detail on settings in the application, see [https://wigle.net/wiwi_settings](https://wigle.net/wiwi_settings).
 
+## Attributions
+Icon source from SVG:
+ - dashboard: https://www.figma.com/@syalankush
+ - eye, filter, map, sort: https://dazzleui.gumroad.com/l/dazzleiconsfree
+ - no wifi: https://www.figma.com/@d12da0b9_b193_4
+ - share: https://noahjacob.us/?ref=svgrepo.com
+ - user star: https://github.com/Remix-Design/remixicon
+ - wrench: https://github.com/FortAwesome/Font-Awesome
 
 This project is maintained by the WiGLE.net team
diff --git a/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/RankStatsFragment.java b/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/RankStatsFragment.java
@@ -338,18 +338,18 @@ public void onConfigurationChanged(@NonNull final Configuration newConfig ) {
     @Override
     public void onCreateOptionsMenu (final Menu menu, @NonNull final MenuInflater inflater) {
         MenuItem item = menu.add(0, MENU_USER_STATS, 0, getString(R.string.user_stats_app_name));
-        item.setIcon( android.R.drawable.ic_menu_myplaces );
+        item.setIcon( R.drawable.user_star );
         MenuItemCompat.setShowAsAction(item, MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(0, MENU_USER_STATS, 0, getString(R.string.user_stats_app_name));
-        item.setIcon(android.R.drawable.ic_menu_myplaces);
+        item.setIcon(R.drawable.user_star);
 
         item = menu.add(0, MENU_SITE_STATS, 0, getString(R.string.site_stats_app_name));
-        item.setIcon(R.drawable.ic_planet_small_white);
+        item.setIcon(R.drawable.w_logo);
         MenuItemCompat.setShowAsAction(item, MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(0, MENU_SITE_STATS, 0, getString(R.string.site_stats_app_name));
-        item.setIcon(R.drawable.ic_planet_small_white);
+        item.setIcon(R.drawable.w_logo);
         item = menu.add(0, MENU_RANK_SWAP, 0, getRankSwapString());
         item.setIcon(R.drawable.sort);
 

diff --git a/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/SiteStatsFragment.java b/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/SiteStatsFragment.java
@@ -208,18 +208,18 @@ public void onConfigurationChanged(@NonNull final Configuration newConfig ) {
     @Override
     public void onCreateOptionsMenu (final Menu menu, @NonNull final MenuInflater inflater) {
         MenuItem item = menu.add(0, MENU_USER_STATS, 0, getString(R.string.user_stats_app_name));
-        item.setIcon( android.R.drawable.ic_menu_myplaces );
+        item.setIcon( R.drawable.user_star );
         MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(0, MENU_USER_STATS, 0, getString(R.string.user_stats_app_name));
-        item.setIcon(android.R.drawable.ic_menu_myplaces);
+        item.setIcon(R.drawable.user_star);
 
         item = menu.add(0, MENU_RANK_STATS, 0, getString(R.string.rank_stats_app_name));
-        item.setIcon(android.R.drawable.ic_menu_sort_by_size);
+        item.setIcon(R.drawable.rankings);
         MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(0, MENU_RANK_STATS, 0, getString(R.string.rank_stats_app_name));
-        item.setIcon(android.R.drawable.ic_menu_sort_by_size);
+        item.setIcon(R.drawable.rankings);
 
         super.onCreateOptionsMenu(menu, inflater);
     }

diff --git a/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/UploadsFragment.java b/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/UploadsFragment.java
@@ -370,18 +370,11 @@ public void onConfigurationChanged(@NonNull final Configuration newConfig ) {
     @Override
     public void onCreateOptionsMenu (final Menu menu, @NonNull final MenuInflater inflater) {
         MenuItem item = menu.add(0, MENU_USER_STATS, 0, getString(R.string.user_stats_app_name));
-        item.setIcon( android.R.drawable.ic_menu_myplaces );
+        item.setIcon(R.drawable.user_star);
         MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(0, MENU_USER_STATS, 0, getString(R.string.user_stats_app_name));
-        item.setIcon(android.R.drawable.ic_menu_myplaces);
-
-        item = menu.add(0, MENU_SITE_STATS, 0, getString(R.string.site_stats_app_name));
-        item.setIcon( R.drawable.ic_planet_small_white );
-        MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
-
-        item = menu.add(0, MENU_SITE_STATS, 0, getString(R.string.site_stats_app_name));
-        item.setIcon(R.drawable.ic_planet_small_white);
+        item.setIcon(R.drawable.user_star);
 
         super.onCreateOptionsMenu(menu, inflater);
     }

diff --git a/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/UserStatsFragment.java b/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/UserStatsFragment.java
@@ -296,18 +296,18 @@ public void onConfigurationChanged(@NonNull final Configuration newConfig ) {
     @Override
     public void onCreateOptionsMenu (final Menu menu, @NonNull final MenuInflater inflater) {
         MenuItem item = menu.add(0, MENU_SITE_STATS, 0, getString(R.string.site_stats_app_name));
-        item.setIcon( R.drawable.ic_planet_small_white );
+        item.setIcon( R.drawable.w_logo );
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(0, MENU_SITE_STATS, 0, getString(R.string.site_stats_app_name));
-        item.setIcon(R.drawable.ic_planet_small_white);
+        item.setIcon(R.drawable.w_logo);
 
         item = menu.add(0, MENU_RANK_STATS, 0, getString(R.string.rank_stats_app_name));
-        item.setIcon(android.R.drawable.ic_menu_sort_by_size);
+        item.setIcon(R.drawable.rankings);
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(0, MENU_RANK_STATS, 0, getString(R.string.rank_stats_app_name));
-        item.setIcon(android.R.drawable.ic_menu_sort_by_size);
+        item.setIcon(R.drawable.rankings);
 
         super.onCreateOptionsMenu(menu, inflater);
     }

diff --git a/wiglewifiwardriving/src/main/res/drawable/no_scan.xml b/wiglewifiwardriving/src/main/res/drawable/no_scan.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.85" android:height="44dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="44dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/colorControlNormal" android:fillType="evenOdd" android:pathData="M3.97,5.03L18.97,20.03L20.03,18.97L5.03,3.97L3.97,5.03ZM2.925,9.675C3.711,8.889 4.574,8.226 5.489,7.686L6.59,8.787C5.868,9.179 5.179,9.656 4.539,10.217L12,17.528L13.683,15.88L14.743,16.94L12,19.628L2.389,10.21L2.925,9.675ZM19.461,10.217L15.825,13.78L16.886,14.84L21.611,10.21L21.075,9.675C17.659,6.258 12.795,5.171 8.458,6.412L9.697,7.651C13.076,6.953 16.712,7.808 19.461,10.217Z"/>
+</vector>
diff --git a/wiglewifiwardriving/src/main/res/drawable/user_star.xml b/wiglewifiwardriving/src/main/res/drawable/user_star.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.85" android:height="100dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M12,14v2a6,6 0,0 0,-6 6L4,22a8,8 0,0 1,8 -8zM12,13c-3.315,0 -6,-2.685 -6,-6s2.685,-6 6,-6 6,2.685 6,6 -2.685,6 -6,6zM12,11c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM18,21.5l-2.939,1.545 0.561,-3.272 -2.377,-2.318 3.286,-0.478L18,14l1.47,2.977 3.285,0.478 -2.377,2.318 0.56,3.272L18,21.5z"/>
+</vector>
diff --git a/wiglewifiwardriving/src/main/res/drawable/w_logo.xml b/wiglewifiwardriving/src/main/res/drawable/w_logo.xml
@@ -0,0 +1,12 @@
+<vector android:alpha="0.85" android:height="104.7619dp"
+    android:viewportHeight="200" android:viewportWidth="210"
+    android:width="110dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/colorControlNormal"
+        android:pathData="m178.28,122.81 l-34.33,40.66q-3.49,4.15 -13.12,4.15 -7.68,0 -13.96,-3.56 -1.12,-0.59 -1.54,-1.04l-26.38,-27.9q-0.98,-1.04 -0.98,-2.52 0,-2.97 4.47,-4.45 3.35,-1.19 6.84,-1.19 6.28,0 8.79,2.97l15.07,17.36 26.24,-32.5q3.35,-4.15 13.26,-4.15 5.44,0 10.33,1.78 6.84,2.23 6.84,6.83 0,1.78 -1.54,3.56zM87.42,166.44q-4.05,1.19 -8.79,1.19 -9.63,0 -13.12,-4.15l-34.33,-40.66q-1.54,-1.78 -1.54,-3.56 0,-4.6 6.84,-6.83 4.88,-1.78 10.33,-1.78 9.63,0 13.12,4.15l34.47,40.66q1.4,1.63 1.4,3.56 0,5.05 -8.37,7.42z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?attr/colorControlNormal"
+        android:pathData="M104.29,31.19A96.74,97.13 0,0 0,15.91 88.81L15.93,88.82A11.41,11.01 0,0 0,14.72 93.72A11.41,11.01 0,0 0,26.13 104.73A11.41,11.01 0,0 0,36.6 98.06L36.65,98.08A74.1,74.1 0,0 1,104.29 54.22A74.1,74.1 0,0 1,171.94 98.08L171.95,98.08A11.41,11.01 0,0 0,182.52 104.98A11.41,11.01 0,0 0,193.93 93.97A11.41,11.01 0,0 0,192.61 88.84L192.67,88.81A96.74,97.13 0,0 0,104.29 31.19z"
+        android:strokeColor="?attr/colorControlNormal" android:strokeWidth="0.264583"/>
+    <path android:fillColor="?attr/colorControlNormal"
+        android:pathData="m104.29,70.48a57.12,57.84 0,0 0,-40.63 17.3,10.05 9.71,0 0,0 -3.78,7.56 10.05,9.71 0,0 0,10.05 9.71,10.05 9.71,0 0,0 6.39,-2.23l0.08,0.07a37.63,37.88 0,0 1,27.89 -12.45,37.63 37.88,0 0,1 27.89,12.45l0.04,-0.04a10.05,9.71 0,0 0,6.48 2.3,10.05 9.71,0 0,0 10.05,-9.71 10.05,9.71 0,0 0,-3.69 -7.51,57.12 57.84,0 0,0 -40.78,-17.45z"
+        android:strokeColor="?attr/colorControlNormal" android:strokeWidth="0.264583"/>
+</vector>
diff --git a/wiglewifiwardriving/src/main/res/layout/list.xml b/wiglewifiwardriving/src/main/res/layout/list.xml
@@ -257,7 +257,7 @@
             android:layout_margin="5dip"
             android:layout_width="44dip"
             android:layout_height="44dip"
-            android:src="@android:drawable/ic_menu_close_clear_cancel"
+            android:src="@drawable/no_scan"
             android:visibility="gone"
             android:contentDescription="@string/dash_scan_off"/>
         <ImageButton

diff --git a/wiglewifiwardriving/src/main/res/menu/leftmenu.xml b/wiglewifiwardriving/src/main/res/menu/leftmenu.xml
@@ -47,7 +47,7 @@
             android:id="@+id/stats_group">
             <item
                 android:id="@+id/nav_user_stats"
-                android:icon="@android:drawable/ic_menu_myplaces"
+                android:icon="@drawable/user_star"
                 android:title="@string/user_stats_app_name"
                 android:contentDescription="@string/user_stats_app_name"
                 />
@@ -59,7 +59,7 @@
                 />
             <item
                 android:id="@+id/nav_site_stats"
-                android:icon="@drawable/ic_planet_small_white"
+                android:icon="@drawable/w_logo"
                 app:tint="?attr/colorControlNormal"
                 android:title="@string/site_stats_app_name"
                 android:contentDescription="@string/site_stats_app_name"