Develop - OTP in island, customizable battery levels for Duo, Camera position based island improvements, fix battery alerts, balance island option, fix background conscious gate haptics, fix island notification reply text, prioritize progress over timer for island, keep island notifications always, fix calls in island, secondary island bubble toggle, local network permission, watch face is live, fix search input persistency and more

app/build.gradle.kts

@@ -115,10 +115,10 @@ android {
         applicationId = "com.sameerasw.essentials"
         minSdk = 26
         targetSdk = 37
-        versionCode = 68
-        versionName = "19.1-beta.3"
+        versionCode = 69
+        versionName = "20.0"
 
-        val whatsNewCounter = 6
+        val whatsNewCounter = 7
         buildConfigField("int", "WHATS_NEW_COUNTER", whatsNewCounter.toString())
         buildConfigField("int", "REQUIRED_WEAR_VERSION_CODE", "7")
 

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_LOCAL_NETWORK" />
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.WRITE_CALENDAR" />
     <uses-permission android:name="android.permission.DETECT_SCREEN_RECORDING" />

app/src/main/java/com/sameerasw/essentials/data/repository/SettingsRepository.kt

@@ -26,6 +26,7 @@ import com.sameerasw.essentials.domain.model.AppSelection
 import com.sameerasw.essentials.domain.model.BackGestureAppConfig
 import com.sameerasw.essentials.domain.model.AppTag
 import com.sameerasw.essentials.domain.model.DnsPreset
+import com.sameerasw.essentials.utils.DuoBatteryLevels
 import com.sameerasw.essentials.domain.model.HilightEffect
 import com.sameerasw.essentials.domain.model.HilightProgressColorMode
 import com.sameerasw.essentials.domain.model.NotificationLightingColorMode
@@ -493,6 +494,8 @@ class SettingsRepository(
         const val KEY_ISLAND_BATTERY_IDLE_COLOR = "island_battery_idle_color"
         const val KEY_DUO_BATTERY_CRITICAL_COLOR_ENABLED = "duo_battery_critical_color_enabled"
         const val KEY_DUO_BATTERY_CRITICAL_COLOR = "duo_battery_critical_color"
+        const val KEY_DUO_BATTERY_LOW_LEVEL = "duo_battery_low_level"
+        const val KEY_DUO_BATTERY_CRITICAL_LEVEL = "duo_battery_critical_level"
         const val KEY_DUO_SHOW_NETWORKS = "duo_show_networks"
         const val KEY_DUO_DIFFERENTIATE_WIFI = "duo_differentiate_wifi"
         const val KEY_DUO_SHOW_TIME = "duo_show_time"
@@ -587,6 +590,8 @@ class SettingsRepository(
         const val KEY_ISLAND_DISABLE_INTERACTIONS_IN_FULLSCREEN = "island_disable_interactions_in_fullscreen"
         const val KEY_ISLAND_LANDSCAPE_TOP_SPACING = "island_landscape_top_spacing"
         const val KEY_ISLAND_BOND_EDGE = "island_bond_edge"
+        const val KEY_ISLAND_BALANCE_COMPACT = "island_balance_compact"
+        const val KEY_ISLAND_SECONDARY_BUBBLE = "island_secondary_bubble"
         const val KEY_ISLAND_MAX_ITEMS = "island_max_items"
         const val KEY_ISLAND_ALWAYS_GESTURES = "island_always_gestures"
         const val KEY_ISLAND_DISMISS_ON_OUTSIDE = "island_dismiss_on_outside"
@@ -676,6 +681,11 @@ class SettingsRepository(
         const val KEY_ISLAND_NOTIF_FILTER_APPS_LIST = "island_notif_filter_apps_list"
         const val KEY_ISLAND_SHOW_NOTIFICATIONS = "island_show_notifications"
         const val KEY_ISLAND_NOTIF_TAP_TO_OPEN = "island_notif_tap_to_open"
+        const val KEY_ISLAND_OTP_ENABLED = "island_otp_enabled"
+        const val KEY_ISLAND_OTP_TAP_TO_COPY = "island_otp_tap_to_copy"
+        const val KEY_ISLAND_OTP_DISMISS_AFTER_COPY = "island_otp_dismiss_after_copy"
+        const val KEY_ISLAND_OTP_BYPASS_FILTER = "island_otp_bypass_filter"
+        const val KEY_ISLAND_OTP_TIMEOUT_MS = "island_otp_timeout_ms"
         const val KEY_ISLAND_BORDER_OUTLINE_ENABLED = "island_border_outline_enabled"
         const val KEY_ISLAND_BORDER_OUTLINE_COLOR = "island_border_outline_color"
         const val KEY_ISLAND_BORDER_OUTLINE_DYNAMIC = "island_border_outline_dynamic"
@@ -3903,6 +3913,14 @@ class SettingsRepository(
     fun getDuoBatteryCriticalColor(): String = getString(KEY_DUO_BATTERY_CRITICAL_COLOR, "#F44336") ?: "#F44336"
     fun setDuoBatteryCriticalColor(colorHex: String) = putString(KEY_DUO_BATTERY_CRITICAL_COLOR, colorHex)
 
+    fun getDuoBatteryLowLevel(): Int = getInt(KEY_DUO_BATTERY_LOW_LEVEL, DuoBatteryLevels.DEFAULT_LOW)
+    fun getDuoBatteryCriticalLevel(): Int = getInt(KEY_DUO_BATTERY_CRITICAL_LEVEL, DuoBatteryLevels.DEFAULT_CRITICAL)
+
+    fun setDuoBatteryLevels(low: Int, critical: Int) {
+        putInt(KEY_DUO_BATTERY_LOW_LEVEL, low)
+        putInt(KEY_DUO_BATTERY_CRITICAL_LEVEL, critical)
+    }
+
     fun isDuoShowNetworksEnabled(): Boolean = getBoolean(KEY_DUO_SHOW_NETWORKS, true)
     fun setDuoShowNetworksEnabled(enabled: Boolean) = putBoolean(KEY_DUO_SHOW_NETWORKS, enabled)
 
@@ -4279,6 +4297,14 @@ class SettingsRepository(
 
     fun setIslandBondEdgeEnabled(enabled: Boolean) = putBoolean(KEY_ISLAND_BOND_EDGE, enabled)
 
+    fun isIslandBalanceCompactEnabled(): Boolean = getBoolean(KEY_ISLAND_BALANCE_COMPACT, true)
+
+    fun setIslandBalanceCompactEnabled(enabled: Boolean) = putBoolean(KEY_ISLAND_BALANCE_COMPACT, enabled)
+
+    fun isIslandSecondaryBubbleEnabled(): Boolean = getBoolean(KEY_ISLAND_SECONDARY_BUBBLE, true)
+
+    fun setIslandSecondaryBubbleEnabled(enabled: Boolean) = putBoolean(KEY_ISLAND_SECONDARY_BUBBLE, enabled)
+
     fun getIslandLandscapeTopSpacing(): Float = getFloat(KEY_ISLAND_LANDSCAPE_TOP_SPACING, 0f)
 
     fun setIslandLandscapeTopSpacing(value: Float) = putFloat(KEY_ISLAND_LANDSCAPE_TOP_SPACING, value)
@@ -4380,6 +4406,14 @@ class SettingsRepository(
     fun isIslandNotifTapToOpenEnabled(): Boolean = getBoolean(KEY_ISLAND_NOTIF_TAP_TO_OPEN, false)
     fun setIslandNotifTapToOpenEnabled(enabled: Boolean) = putBoolean(KEY_ISLAND_NOTIF_TAP_TO_OPEN, enabled)
 
+    fun isIslandOtpEnabled(): Boolean = getBoolean(KEY_ISLAND_OTP_ENABLED, false)
+    fun setIslandOtpEnabled(enabled: Boolean) = putBoolean(KEY_ISLAND_OTP_ENABLED, enabled)
+    fun isIslandOtpTapToCopyEnabled(): Boolean = getBoolean(KEY_ISLAND_OTP_TAP_TO_COPY, true)
+    fun isIslandOtpDismissAfterCopyEnabled(): Boolean = getBoolean(KEY_ISLAND_OTP_DISMISS_AFTER_COPY, false)
+    fun isIslandOtpBypassFilterEnabled(): Boolean = getBoolean(KEY_ISLAND_OTP_BYPASS_FILTER, true)
+    fun getIslandOtpTimeoutMs(): Long = getLong(KEY_ISLAND_OTP_TIMEOUT_MS, 60_000L)
+    fun setIslandOtpTimeoutMs(ms: Long) = putLong(KEY_ISLAND_OTP_TIMEOUT_MS, ms)
+
     fun isIslandNotifCompactHeadsUpEnabled(): Boolean = getBoolean(KEY_ISLAND_NOTIF_COMPACT_HEADS_UP, true)
     fun setIslandNotifCompactHeadsUpEnabled(enabled: Boolean) = putBoolean(KEY_ISLAND_NOTIF_COMPACT_HEADS_UP, enabled)
 

app/src/main/java/com/sameerasw/essentials/domain/model/ActiveNotificationAlert.kt

@@ -28,5 +28,6 @@ data class ActiveNotificationAlert(
     val chatIcon: Bitmap? = null,
     val isSilent: Boolean = false,
     val blockedByDnd: Boolean = false,
+    val otpCode: String? = null,
 )
 

app/src/main/java/com/sameerasw/essentials/domain/model/AppPermission.kt

@@ -13,6 +13,7 @@ import android.content.Context
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import com.sameerasw.essentials.R
+import com.sameerasw.essentials.utils.PermissionGrantUtil
 import com.sameerasw.essentials.utils.PermissionUtils
 import com.sameerasw.essentials.utils.ShellUtils
 
@@ -131,6 +132,17 @@ enum class AppPermission(
         iconRes = R.drawable.rounded_image_24,
         aliases = listOf("READ_MEDIA_IMAGES", "READ_MEDIA_VIDEO", "READ_MEDIA_AUDIO", "READ_EXTERNAL_STORAGE", "MANAGE_EXTERNAL_STORAGE"),
     ),
+    SENSITIVE_NOTIFICATIONS(
+        key = "SENSITIVE_NOTIFICATIONS",
+        titleRes = R.string.perm_sensitive_notifications_title,
+        iconRes = R.drawable.rounded_vpn_key_24,
+    ),
+    LOCAL_NETWORK(
+        key = "LOCAL_NETWORK",
+        titleRes = R.string.perm_local_network_title,
+        iconRes = R.drawable.rounded_lan_24,
+        aliases = listOf("ACCESS_LOCAL_NETWORK"),
+    ),
     NOTIFICATION_BUBBLES(
         key = "NOTIFICATION_BUBBLES",
         titleRes = R.string.perm_bubbles_title,
@@ -145,6 +157,8 @@ enum class AppPermission(
             DRAW_OVERLAYS -> PermissionUtils.canDrawOverlays(context)
             WRITE_SETTINGS -> PermissionUtils.canWriteSystemSettings(context)
             NOTIFICATION_POLICY -> PermissionUtils.hasNotificationPolicyAccess(context)
+            SENSITIVE_NOTIFICATIONS -> PermissionGrantUtil.hasSensitiveNotifications(context)
+            LOCAL_NETWORK -> PermissionUtils.hasLocalNetworkPermission(context)
             ROOT, SHIZUKU -> ShellUtils.isAvailable(context) && ShellUtils.hasPermission(context)
             else -> true
         }

app/src/main/java/com/sameerasw/essentials/domain/registry/FeatureRegistry.kt

@@ -1008,6 +1008,16 @@ object FeatureRegistry {
                             R.string.island_line_peek_desc,
                             "island_line_stage_enabled",
                         ),
+                        SearchSetting(
+                            R.string.island_secondary_bubble_title,
+                            R.string.island_section_behavior,
+                            "island_secondary_bubble",
+                        ),
+                        SearchSetting(
+                            R.string.island_balance_compact_title,
+                            R.string.island_section_behavior,
+                            "island_balance_compact",
+                        ),
                     ),
             ) {
                 override fun isEnabled(viewModel: MainViewModel) = true
@@ -1084,6 +1094,31 @@ object FeatureRegistry {
                             R.string.island_catch_up_desc,
                             "island_catch_up",
                         ),
+                        SearchSetting(
+                            R.string.island_otp_enabled_title,
+                            R.string.island_otp_enabled_desc,
+                            "island_otp_enabled",
+                        ),
+                        SearchSetting(
+                            R.string.island_otp_tap_to_copy_title,
+                            R.string.island_otp_tap_to_copy_desc,
+                            "island_otp_tap_to_copy",
+                        ),
+                        SearchSetting(
+                            R.string.island_otp_dismiss_after_copy_title,
+                            R.string.island_otp_section,
+                            "island_otp_dismiss_after_copy",
+                        ),
+                        SearchSetting(
+                            R.string.island_otp_timeout_title,
+                            R.string.island_otp_section,
+                            "island_otp_timeout_ms",
+                        ),
+                        SearchSetting(
+                            R.string.island_otp_bypass_filter_title,
+                            R.string.island_otp_bypass_filter_desc,
+                            "island_otp_bypass_filter",
+                        ),
                     ),
             ) {
                 override fun isEnabled(viewModel: MainViewModel) = viewModel.isIslandEnabled.value
@@ -2605,6 +2640,7 @@ object FeatureRegistry {
                 iconRes = R.drawable.rounded_adb_24,
                 category = R.string.cat_tools,
                 description = R.string.feat_watch_wireless_debugging_desc,
+                permissionKeys = listOf("LOCAL_NETWORK"),
                 parentFeatureId = "Watch",
                 hasMoreSettings = true,
                 showToggle = true,

app/src/main/java/com/sameerasw/essentials/domain/registry/PermissionRegistry.kt

@@ -141,6 +141,8 @@ fun initPermissionRegistry() {
 
     // Post notifications permission
     PermissionRegistry.register("POST_NOTIFICATIONS", R.string.feat_caffeinate_title)
+    PermissionRegistry.register("LOCAL_NETWORK", R.string.feat_watch_wireless_debugging_title)
+    PermissionRegistry.register("SENSITIVE_NOTIFICATIONS", R.string.island_otp_section)
     PermissionRegistry.register("POST_NOTIFICATIONS", R.string.feat_battery_notification_title)
 
     // Read phone state permission

app/src/main/java/com/sameerasw/essentials/island/model/IslandModels.kt

@@ -77,6 +77,7 @@ class InteractionOverrides(
     val onTap: (() -> Boolean)? = null,
     val onLongPress: (() -> Unit)? = null,
     val onExpandedTap: (() -> Boolean)? = null,
+    val onLineTap: (() -> Boolean)? = null,
 ) {
     companion object {
         val Default = InteractionOverrides()

app/src/main/java/com/sameerasw/essentials/island/model/IslandPlugin.kt

@@ -27,6 +27,7 @@ interface IslandPlugin {
     fun stop()
     fun refresh() {}
     fun onScreenStateChanged() = refresh()
+    fun onSuppressionChanged(suppressed: Boolean) {}
     fun onUserInteraction(focusedKey: String?) {}
     fun onFocusChanged(stage: IslandStage, focusedKey: String?) {}
 }

app/src/main/java/com/sameerasw/essentials/island/plugins/batteryalerts/BatteryAlertsPlugin.kt

@@ -24,6 +24,7 @@ class BatteryAlertsPlugin : BaseIslandPlugin() {
     override val id = "battery_alerts_plugin"
 
     override val settingKeys = setOf(
+        SettingsRepository.KEY_ISLAND_SHOW_BATTERY,
         SettingsRepository.KEY_ISLAND_SHOW_BATTERY_ALERTS,
         SettingsRepository.KEY_ISLAND_BATTERY_ALERT_CHARGING,
         SettingsRepository.KEY_ISLAND_BATTERY_ALERT_LOW,
@@ -55,7 +56,10 @@ class BatteryAlertsPlugin : BaseIslandPlugin() {
                 readBattery(intent)
                 val newAlertState = currentAlertState()
 
-                if ((isCharging && !wasCharging && newAlertState == "charging") || (newAlertState != prevAlertState && newAlertState.isNotEmpty())) {
+                if (!enabled()) {
+                    if (peeking) stopPeek()
+                    render()
+                } else if ((isCharging && !wasCharging && newAlertState == "charging") || (newAlertState != prevAlertState && newAlertState.isNotEmpty())) {
                     peekAlert()
                 } else if (!peeking) {
                     render()
@@ -80,9 +84,18 @@ class BatteryAlertsPlugin : BaseIslandPlugin() {
 
     override fun refresh() {
         readBattery(null)
+        if (!enabled() && peeking) stopPeek()
         render()
     }
 
+    private fun enabled() =
+        settings.isIslandShowBatteryEnabled() && settings.isIslandShowBatteryAlertsEnabled()
+
+    private fun stopPeek() {
+        ctx?.mainHandler?.removeCallbacks(endPeek)
+        peeking = false
+    }
+
     private fun readBattery(intent: Intent?) {
         val batteryIntent = intent ?: context.registerReceiver(
             null, IntentFilter(Intent.ACTION_BATTERY_CHANGED)
@@ -140,6 +153,7 @@ class BatteryAlertsPlugin : BaseIslandPlugin() {
 
     private fun peekAlert() {
         val c = ctx ?: return
+        if (!enabled()) return
         val duration = settings.getIslandPeekDurationMs()
         peeking = true
         render()
@@ -154,8 +168,7 @@ class BatteryAlertsPlugin : BaseIslandPlugin() {
             return
         }
 
-        val masterEnabled = settings.getBoolean(SettingsRepository.KEY_ISLAND_SHOW_BATTERY_ALERTS, true)
-        if (!masterEnabled || !peeking || level < 0) {
+        if (!enabled() || !peeking || level < 0) {
             publish(emptyList())
             return
         }