Develop - Watermarks and a lot of fixes

.gitignore

@@ -30,5 +30,4 @@ replay_pid*
 *.DS_Store
 *app/release/
 
-Build/
-build/reports/problems/problems-report.html
+Build/

app/build.gradle.kts

@@ -105,7 +105,10 @@ dependencies {
     // SymSpell for word suggestions
     implementation("com.darkrockstudios:symspellkt:3.4.0")
 
-    // Glance for Widgets
     implementation("androidx.glance:glance-appwidget:1.1.0")
     implementation("androidx.glance:glance-material3:1.1.0")
+
+    // Watermark dependencies
+    implementation("androidx.exifinterface:exifinterface:1.3.7")
+    implementation("androidx.compose.material:material-icons-extended:1.7.0") // Compatible with Compose BOM
 }

app/src/main/AndroidManifest.xml

@@ -205,6 +205,18 @@
             android:taskAffinity=""
             android:theme="@style/Theme.Essentials.Translucent" />
 
+        <activity
+            android:name=".ui.composables.watermark.WatermarkActivity"
+            android:exported="true"
+            android:label="@string/feat_watermark_title"
+            android:theme="@style/Theme.Essentials">
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+        </activity>
+
         <service
             android:name=".services.tiles.ScreenOffAccessibilityService"
             android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
@@ -434,6 +446,16 @@
                       android:value="Automation Service" /> 
         </service>
 
+        <service
+            android:name=".services.EssentialsConditionProvider"
+            android:label="Essentials Focus"
+            android:permission="android.permission.BIND_CONDITION_PROVIDER_SERVICE"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.service.notification.ConditionProviderService" />
+            </intent-filter>
+        </service>
+
         <service
             android:name=".services.tiles.AppFreezingTileService"
             android:icon="@drawable/rounded_mode_cool_24"
@@ -511,6 +533,28 @@
             </intent-filter>
         </service>
 
+        <service
+            android:name=".services.tiles.PrivateDnsTileService"
+            android:exported="true"
+            android:icon="@drawable/rounded_dns_24"
+            android:label="@string/tile_private_dns"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
+
+        <service
+            android:name=".services.tiles.UsbDebuggingTileService"
+            android:exported="true"
+            android:icon="@drawable/rounded_adb_24"
+            android:label="@string/tile_usb_debugging"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
+
         <receiver
             android:name=".services.receivers.FlashlightActionReceiver"
             android:exported="false">

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

@@ -61,9 +61,8 @@ class SettingsRepository(private val context: Context) {
         const val KEY_DYNAMIC_NIGHT_LIGHT_ENABLED = "dynamic_night_light_enabled"
         const val KEY_DYNAMIC_NIGHT_LIGHT_SELECTED_APPS = "dynamic_night_light_selected_apps"
 
-        const val KEY_SNOOZE_DEBUGGING_ENABLED = "snooze_debugging_enabled"
-        const val KEY_SNOOZE_FILE_TRANSFER_ENABLED = "snooze_file_transfer_enabled"
-        const val KEY_SNOOZE_CHARGING_ENABLED = "snooze_charging_enabled"
+        const val KEY_SNOOZE_DISCOVERED_CHANNELS = "snooze_discovered_channels"
+        const val KEY_SNOOZE_BLOCKED_CHANNELS = "snooze_blocked_channels"
 
         const val KEY_FLASHLIGHT_ALWAYS_TURN_OFF_ENABLED = "flashlight_always_turn_off_enabled"
         const val KEY_FLASHLIGHT_FADE_ENABLED = "flashlight_fade_enabled"
@@ -118,6 +117,8 @@ class SettingsRepository(private val context: Context) {
         const val KEY_SHOW_BLUETOOTH_DEVICES = "show_bluetooth_devices"
         const val KEY_BATTERY_WIDGET_MAX_DEVICES = "battery_widget_max_devices"
         const val KEY_BATTERY_WIDGET_BACKGROUND_ENABLED = "battery_widget_background_enabled"
+
+        const val KEY_PINNED_FEATURES = "pinned_features"
     }
 
     // Observe changes
@@ -129,6 +130,17 @@ class SettingsRepository(private val context: Context) {
         awaitClose { prefs.unregisterOnSharedPreferenceChangeListener(listener) }
     }
 
+    val isPitchBlackThemeEnabled: Flow<Boolean> = callbackFlow {
+        val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
+            if (key == KEY_PITCH_BLACK_THEME_ENABLED) {
+                trySend(getBoolean(KEY_PITCH_BLACK_THEME_ENABLED))
+            }
+        }
+        trySend(getBoolean(KEY_PITCH_BLACK_THEME_ENABLED))
+        prefs.registerOnSharedPreferenceChangeListener(listener)
+        awaitClose { prefs.unregisterOnSharedPreferenceChangeListener(listener) }
+    }
+
     fun registerOnSharedPreferenceChangeListener(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
         prefs.registerOnSharedPreferenceChangeListener(listener)
     }
@@ -299,6 +311,45 @@ class SettingsRepository(private val context: Context) {
              saveAppSelection(key, current)
         }
     }
+
+    // Snooze Notifications Helper
+    fun loadSnoozeDiscoveredChannels(): List<com.sameerasw.essentials.domain.model.SnoozeChannel> {
+        val json = prefs.getString(KEY_SNOOZE_DISCOVERED_CHANNELS, null)
+        return if (json != null) {
+            val type = object : TypeToken<List<com.sameerasw.essentials.domain.model.SnoozeChannel>>() {}.type
+            try {
+                gson.fromJson(json, type) ?: emptyList()
+            } catch (e: Exception) {
+                emptyList()
+            }
+        } else {
+            emptyList()
+        }
+    }
+
+    fun saveSnoozeDiscoveredChannels(channels: List<com.sameerasw.essentials.domain.model.SnoozeChannel>) {
+        val json = gson.toJson(channels)
+        putString(KEY_SNOOZE_DISCOVERED_CHANNELS, json)
+    }
+
+    fun loadSnoozeBlockedChannels(): Set<String> {
+        val json = prefs.getString(KEY_SNOOZE_BLOCKED_CHANNELS, null)
+        return if (json != null) {
+            val type = object : TypeToken<Set<String>>() {}.type
+            try {
+                gson.fromJson(json, type) ?: emptySet()
+            } catch (e: Exception) {
+                emptySet()
+            }
+        } else {
+            emptySet()
+        }
+    }
+
+    fun saveSnoozeBlockedChannels(blockedChannels: Set<String>) {
+        val json = gson.toJson(blockedChannels)
+        putString(KEY_SNOOZE_BLOCKED_CHANNELS, json)
+    }
 
     // Config Export/Import
     fun getAllConfigsAsJsonString(): String {
@@ -312,7 +363,9 @@ class SettingsRepository(private val context: Context) {
 
                 p.all.forEach { (key, value) ->
                     // Skip app lists as requested, and stale data
-                    if (key.endsWith("_selected_apps") || key == "freeze_auto_excluded_apps" || key.startsWith("mac_battery_") || key == "airsync_mac_connected") {
+                    if (key.endsWith("_selected_apps") || key == "freeze_auto_excluded_apps" || 
+                        key.startsWith("mac_battery_") || key == "airsync_mac_connected" ||
+                        key == KEY_SNOOZE_DISCOVERED_CHANNELS) {
                         return@forEach
                     }
 
@@ -415,4 +468,18 @@ class SettingsRepository(private val context: Context) {
 
     fun isBatteryWidgetBackgroundEnabled(): Boolean = getBoolean(KEY_BATTERY_WIDGET_BACKGROUND_ENABLED, true)
     fun setBatteryWidgetBackgroundEnabled(enabled: Boolean) = putBoolean(KEY_BATTERY_WIDGET_BACKGROUND_ENABLED, enabled)
+
+    fun getPinnedFeatures(): List<String> {
+        val json = prefs.getString(KEY_PINNED_FEATURES, null)
+        return if (json != null) {
+            try {
+                gson.fromJson(json, object : TypeToken<List<String>>() {}.type) ?: emptyList()
+            } catch (e: Exception) { emptyList() }
+        } else emptyList()
+    }
+
+    fun savePinnedFeatures(features: List<String>) {
+        val json = gson.toJson(features)
+        putString(KEY_PINNED_FEATURES, json)
+    }
 }

app/src/main/java/com/sameerasw/essentials/domain/diy/Action.kt

@@ -50,4 +50,19 @@ sealed interface Action {
         override val permissions: List<String> = listOf("shizuku", "root")
         override val isConfigurable: Boolean = true
     }
+
+    data class DeviceEffects(
+        val enabled: Boolean = true,
+        val grayscale: Boolean = false,
+        val suppressAmbient: Boolean = false,
+        val dimWallpaper: Boolean = false,
+        val nightMode: Boolean = false
+    ) : Action {
+        override val title: Int get() = R.string.diy_action_device_effects
+        override val icon: Int get() = R.drawable.rounded_bed_24
+        override val permissions: List<String> = listOf("notification_policy")
+        override val isConfigurable: Boolean = true
+    }
+
+
 }

app/src/main/java/com/sameerasw/essentials/domain/diy/Automation.kt

@@ -8,10 +8,12 @@ data class Automation(
     val actions: List<Action> = emptyList(),
     val entryAction: Action? = null,
     val exitAction: Action? = null,
-    val isEnabled: Boolean = true
+    val isEnabled: Boolean = true,
+    val selectedApps: List<String> = emptyList()
 ) {
     enum class Type {
         TRIGGER,
-        STATE
+        STATE,
+        APP
     }
 }

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

@@ -0,0 +1,7 @@
+package com.sameerasw.essentials.domain.model
+
+data class SnoozeChannel(
+    val id: String,
+    val name: String,
+    val isBlocked: Boolean = false
+)

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

@@ -181,26 +181,7 @@ object FeatureRegistry {
             description = R.string.feat_snooze_notifications_desc,
             permissionKeys = listOf("NOTIFICATION_LISTENER"),
             showToggle = false,
-            searchableSettings = listOf(
-                SearchSetting(
-                    R.string.search_snooze_debug_title,
-                    R.string.search_snooze_debug_desc,
-                    "snooze_debugging",
-                    R.array.keywords_adb_debug
-                ),
-                SearchSetting(
-                    R.string.search_snooze_file_title,
-                    R.string.search_snooze_file_desc,
-                    "snooze_file_transfer",
-                    R.array.keywords_mtp
-                ),
-                SearchSetting(
-                    R.string.search_snooze_charge_title,
-                    R.string.search_snooze_charge_desc,
-                    "snooze_charging",
-                    R.array.keywords_battery_charge
-                )
-            )
+            searchableSettings = emptyList()
         ) {
             override fun isEnabled(viewModel: MainViewModel) = false
             override fun isToggleEnabled(viewModel: MainViewModel, context: Context) = viewModel.isNotificationListenerEnabled.value
@@ -319,6 +300,20 @@ object FeatureRegistry {
                     "Stay awake",
                     R.array.keywords_qs_stay_awake,
                     R.string.feat_qs_tiles_title
+                ),
+                SearchSetting(
+                    R.string.search_qs_private_dns_title,
+                    R.string.search_qs_private_dns_desc,
+                    "Private DNS",
+                    R.array.keywords_network_visibility,
+                    R.string.feat_qs_tiles_title
+                ),
+                SearchSetting(
+                    R.string.search_qs_usb_debugging_title,
+                    R.string.search_qs_usb_debugging_desc,
+                    "USB Debugging",
+                    R.array.keywords_adb_debug,
+                    R.string.feat_qs_tiles_title
                 )
             )
         ) {
@@ -523,6 +518,21 @@ object FeatureRegistry {
         ) {
             override fun isEnabled(viewModel: MainViewModel) = true
             override fun onToggle(viewModel: MainViewModel, context: Context, enabled: Boolean) {}
+        },
+
+        object : Feature(
+            id = "Watermarks",
+            title = R.string.feat_watermark_title,
+            iconRes = R.drawable.rounded_draw_24,
+            category = R.string.cat_tools,
+            description = R.string.feat_watermark_desc,
+            showToggle = false
+        ) {
+            override fun isEnabled(viewModel: MainViewModel) = true
+            override fun onToggle(viewModel: MainViewModel, context: Context, enabled: Boolean) {}
+            override fun onClick(context: Context, viewModel: MainViewModel) {
+                context.startActivity(android.content.Intent(context, com.sameerasw.essentials.ui.composables.watermark.WatermarkActivity::class.java))
+            }
         }
     )
 }

app/src/main/java/com/sameerasw/essentials/domain/watermark/MetadataProvider.kt

@@ -0,0 +1,45 @@
+package com.sameerasw.essentials.domain.watermark
+
+import android.content.Context
+import android.net.Uri
+import androidx.exifinterface.media.ExifInterface
+import java.io.InputStream
+
+data class ExifData(
+    val make: String? = null,
+    val model: String? = null,
+    val aperture: String? = null,
+    val shutterSpeed: String? = null,
+    val iso: String? = null,
+    val date: String? = null,
+    val focalLength: String? = null
+)
+
+class MetadataProvider(
+    private val context: Context
+) {
+    fun extractExif(uri: Uri): ExifData {
+        var inputStream: InputStream? = null
+        return try {
+            inputStream = context.contentResolver.openInputStream(uri)
+            if (inputStream == null) return ExifData()
+
+            val exif = ExifInterface(inputStream)
+
+            ExifData(
+                make = exif.getAttribute(ExifInterface.TAG_MAKE),
+                model = exif.getAttribute(ExifInterface.TAG_MODEL),
+                aperture = exif.getAttribute(ExifInterface.TAG_F_NUMBER)?.let { "f/$it" },
+                shutterSpeed = exif.getAttribute(ExifInterface.TAG_EXPOSURE_TIME)?.let { "${it}s" },
+                iso = exif.getAttribute(ExifInterface.TAG_PHOTOGRAPHIC_SENSITIVITY)?.let { "ISO $it" },
+                date = exif.getAttribute(ExifInterface.TAG_DATETIME_ORIGINAL),
+                focalLength = exif.getAttribute(ExifInterface.TAG_FOCAL_LENGTH)?.let { "${it}mm" }
+            )
+        } catch (e: Exception) {
+            e.printStackTrace()
+            ExifData()
+        } finally {
+            inputStream?.close()
+        }
+    }
+}