remove bitmap icon

cinit · Dec 26, 2021 · 98cacb9 · 98cacb9
1 parent 1e2efea
commit 98cacb9
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 17 deletions.
diff --git a/app/src/main/java/cc/ioctl/nfcdevicehost/util/config/GenericConfig.java b/app/src/main/java/cc/ioctl/nfcdevicehost/util/config/GenericConfig.java
@@ -13,7 +13,7 @@ public class GenericConfig {
     public static final NonNullConfigItem<String> cfgCustomSuCommand =
             new LazyNonNullMmkvItemConfig<>("core", "cfg_custom_su_command", "");
     public static final NonNullConfigItem<String> cfgNfcDeviceType =
-            new LazyNonNullMmkvItemConfig<>("core", "cfg_nfc_device_type", "sn100x");
+            new LazyNonNullMmkvItemConfig<>("core", "cfg_nfc_device_type", "unknown");
     public static final NonNullConfigItem<Boolean> cfgDisableNfcDiscoverySound =
             new LazyNonNullMmkvItemConfig<>("core", "cfg_disable_nfc_discovery_sound", false);
     public static final NonNullConfigItem<Boolean> cfgEnableNfcEmulationWhenScreenOff =

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_project_properties.png b/app/src/main/res/drawable-xxxhdpi/ic_project_properties.png
diff --git a/app/src/main/res/drawable/ic_baseline_swap_horiz_24.xml b/app/src/main/res/drawable/ic_baseline_swap_horiz_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M9.01,14L2,14v2h7.01v3L13,15l-3.99,-4v3zM14.99,13v-3L22,10L22,8h-7.01L14.99,5L11,9l3.99,4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_handyman_24.xml b/app/src/main/res/drawable/ic_outline_handyman_24.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="m21.67,18.17-5.3-5.3h-0.99l-2.54,2.54v0.99l5.3,5.3c0.39,0.39,1.020,0.39,1.41,0l2.12-2.12c0.39-0.38,0.39-1.02,0-1.41zm-2.83,1.42-4.24-4.24,0.71-0.71,4.24,4.24-0.71,0.71z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="m17.34,10.19,1.41-1.41,2.12,2.12c1.17-1.17,1.17-3.07,0-4.24l-3.54-3.54-1.41,1.41V1.71l-0.7-0.71-3.54,3.54,0.71,0.71h2.83l-1.41,1.41,1.06,1.06-2.89,2.89-4.13-4.13V5.06L4.83,2.04,2,4.87,5.03,7.9h1.41l4.13,4.13-0.85,0.85H7.6l-5.3,5.3c-0.39,0.39-0.39,1.02,0,1.41l2.12,2.12c0.39,0.39,1.02,0.39,1.41,0l5.3-5.3v-2.12l5.15-5.15,1.06,1.05zm-7.98,5.15-4.24,4.24-0.71-0.71,4.24-4.24,0.71,0.71z" />
+
+</vector>
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
@@ -10,7 +10,7 @@
             android:title="@string/menu_fragment_home" />
         <item
             android:id="@+id/nav_main_dump_live"
-            android:icon="@drawable/ic_baseline_swap_vert_24"
+            android:icon="@drawable/ic_baseline_swap_horiz_24"
             android:title="@string/menu_fragment_dump" />
         <item
             android:id="@+id/nav_main_cards"

diff --git a/app/src/main/res/menu/menu_main_fragment_dump_common.xml b/app/src/main/res/menu/menu_main_fragment_dump_common.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_decoder_config"
-        android:icon="@drawable/ic_project_properties"
+        android:icon="@drawable/ic_outline_handyman_24"
         android:menuCategory="alternative"
         android:orderInCategory="99"
         android:title="@string/action_decoder_config"

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -1,30 +1,27 @@
 <resources>
-    <!-- Reply Preference -->
     <string-array name="nfc_dev_entries">
-        <item>SN100x</item>
-        <item>SN200x</item>
-        <item>NQ3xx</item>
-        <item>NQ2xx</item>
-        <item>PN71xx</item>
-        <item>PN80T</item>
-        <item>PN66T</item>
-        <item>PN55x</item>
-        <item>PN54x</item>
-        <item>PN53x</item>
+        <item>SN200/SN220(JCOP6.0)</item>
+        <item>SN100/SN110(JCOP5.1)</item>
+        <item>NQ330/NQ310</item>
+        <item>NQ220/NQ210</item>
+        <item>PN71xx(none)</item>
+        <item>PN80T/PN81T</item>
+        <item>PN66T/PN54xC2</item>
+        <item>PN553/PN557</item>
+        <item>PN53x(none)</item>
         <item>Other NCI device</item>
         <item>Other non-NCI device</item>
     </string-array>
 
     <string-array name="nfc_dev_values">
-        <item>sn100x</item>
-        <item>sn200x</item>
+        <item>sn2xx</item>
+        <item>sn1xx</item>
         <item>nq3xx</item>
         <item>nq2xx</item>
         <item>pn71xx</item>
         <item>pn80t</item>
         <item>pn66t</item>
         <item>pn55x</item>
-        <item>pn54x</item>
         <item>pn53x</item>
         <item>generic_nci</item>
         <item>unknown</item>