From 10a2b777f254d38eb0afaf5b9c362942d1154cba Mon Sep 17 00:00:00 2001 From: Mygod Date: Wed, 3 Apr 2019 15:56:54 +0800 Subject: [PATCH] New icon for temp hotspot --- mobile/src/main/AndroidManifest.xml | 2 +- .../mygod/vpnhotspot/manage/LocalOnlyHotspotManager.kt | 5 +---- .../vpnhotspot/manage/LocalOnlyHotspotTileService.kt | 2 +- .../src/main/res/drawable/ic_action_perm_scan_wifi.xml | 9 +++++++++ 4 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 mobile/src/main/res/drawable/ic_action_perm_scan_wifi.xml diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml index 293052ae..a1ef8945 100644 --- a/mobile/src/main/AndroidManifest.xml +++ b/mobile/src/main/AndroidManifest.xml @@ -91,7 +91,7 @@ android:name=".manage.LocalOnlyHotspotTileService" android:directBootAware="true" android:enabled="@bool/api_ge_26" - android:icon="@drawable/ic_device_wifi_tethering" + android:icon="@drawable/ic_action_perm_scan_wifi" android:label="@string/tethering_temp_hotspot" android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"> diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/LocalOnlyHotspotManager.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/LocalOnlyHotspotManager.kt index 45001b1d..219a8680 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/LocalOnlyHotspotManager.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/LocalOnlyHotspotManager.kt @@ -75,10 +75,7 @@ class LocalOnlyHotspotManager(private val parent: TetheringFragment) : Manager() private inner class Data : be.mygod.vpnhotspot.manage.Data() { private val lookup: Map get() = parent.ifaceLookup - override val icon: Int get() { - val iface = binder?.iface - return (if (iface.isNullOrBlank()) TetherType.WIFI else TetherType.ofInterface(iface)).icon - } + override val icon get() = R.drawable.ic_action_perm_scan_wifi override val title: CharSequence get() { val configuration = binder?.configuration ?: return parent.getString(R.string.tethering_temp_hotspot) return SpannableStringBuilder("${configuration.SSID} - ").apply { diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/LocalOnlyHotspotTileService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/LocalOnlyHotspotTileService.kt index cabfe4bb..32c8fd79 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/LocalOnlyHotspotTileService.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/LocalOnlyHotspotTileService.kt @@ -15,7 +15,7 @@ import be.mygod.vpnhotspot.util.stopAndUnbind @RequiresApi(26) class LocalOnlyHotspotTileService : KillableTileService() { - private val tile by lazy { Icon.createWithResource(application, R.drawable.ic_device_wifi_tethering) } + private val tile by lazy { Icon.createWithResource(application, R.drawable.ic_action_perm_scan_wifi) } private var binder: LocalOnlyHotspotService.Binder? = null diff --git a/mobile/src/main/res/drawable/ic_action_perm_scan_wifi.xml b/mobile/src/main/res/drawable/ic_action_perm_scan_wifi.xml new file mode 100644 index 00000000..a71c7496 --- /dev/null +++ b/mobile/src/main/res/drawable/ic_action_perm_scan_wifi.xml @@ -0,0 +1,9 @@ + + +