Merge pull request #113 from akaMrNagar/dev

Major improvements and bug fixes

Author: akaMrNagar

.github/ISSUE_TEMPLATE/bug_report.md

@@ -26,7 +26,12 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Additional context**
+Mindful's version -
+Android version -
+Device manufacturer -
+Device OS/ROM -
+
 Add any other context about the problem here.
 
 **Log file**
-You can get the log file from: _**Settings > Advance > Share crash logs**_
+You can get the log file from: _**Settings > Database > Export crash logs**_

README.md

@@ -30,26 +30,31 @@
 
 # 💪 Features
 
-### 1. Focus Mode 
-Pause distracting apps and stay productive with session types like Study, Work, or Creative. Choose between countdown or stopwatch modes and track your progress over time.
+### Focus Mode
+Stay on track with session types like Study, Work, or Creative. Use countdown or stopwatch modes, and review your session timeline to track progress and stay consistent.
 
-### 2. Screen Time Management
-Set daily limits on apps, including addictive short-form content like Reels and YouTube Shorts. Group apps together and add shared limits for better control. Struggling with serious addiction? Turn on Invincible Mode for extra discipline.
+### Screen Time Limits
+Set daily usage limits for apps — especially for addictive short content like Reels or Shorts. Group similar apps, add shared limits, and enable Invincible Mode to lock restrictions after they're hit.
 
-### 3. Detailed Statistics
-Track your weekly app usage with insights on time spent and data consumed for each app, helping you stay aware and in control.
+### Detailed Usage Insights
+Check weekly screen time, app usage, and data consumption. Mindful helps you understand your habits so you can take control of your time.
 
-### 4. Internet Blocker
-Block internet access for distracting apps in a single tap. Filter out adult content and create a safe browsing environment. You can also block unwanted apps to stay focused.
+### App & Internet Blocking
+Block distracting apps or cut off internet access with one tap. Filter adult content and create a focused, safe environment for work or study.
 
-### 5. Bedtime Mode
-Unwind effectively by pausing distracting apps and enabling Do Not Disturb during bedtime. Start your mornings fresh as apps automatically unblock and notifications resume.
+### Notification Management
+Batch notifications, schedule delivery, or mute apps during focus time. Keep interruptions low and your attention high.
 
-### 6. Completely Ad-Free & Privacy-Focused
-Enjoy a distraction-free experience without any ads. Mindful works entirely offline, keeping your data secure on your device.
+### Bedtime Mode
+Wind down with paused apps and DND during sleep hours. Wake up to a clean slate — apps resume automatically when the day begins.
 
+### Parental Controls
+Set healthy digital habits for children with tamper-proof restrictions, invincible mode, and optional biometric lock.
 
-> ### ⚠️ Note: *INTERNET* permission
+### Privacy-First & Open Source
+No ads. No tracking. Mindful works completely offline, keeping your data on your device and it's fully open-source, forever.
+
+> [!caution] About internet permission in manifest
 > Android restricts apps from creating and protecting Local VPN tunnels without network permission. The Local VPN allows Mindful to block internet access for selected apps. This is why you see the network permission in Mindful's manifest. However, rest assured that Mindful does not collect or transmit any user data. You can verify this by checking the network usage in the app or in your device settings. 
 
 
@@ -64,19 +69,17 @@ _Note: Drop your socials along with your donation to get recognized as a support
  
 <a href="https://github.com/akaMrNagar/Mindful?tab=readme-ov-file#donate"><img src="docs/assets/donation/upi_qr.png" height="184" ></a>
 
-<a href="https://buymeacoffee.com/akamrnagar"><img src="https://img.shields.io/badge/-Buy%20Me%20A%20Coffee-394379?logo=Buy-Me-A-Coffee&logoColor=ffdd00" height="32"></a>
-&emsp;
-<a href="https://github.com/akaMrNagar/Mindful?tab=readme-ov-file#donate"><img src="https://img.shields.io/badge/akamrnagar@upi-394379?logo=zalando&logoColor=f47820" height="32"></a>
-&emsp;
-<a href="https://github.com/sponsors/akaMrNagar"><img src="https://img.shields.io/badge/GitHub%20Sponser-394379?logo=GitHub-Sponsors&logoColor=f92f60" height="32"></a>
+[![Buy Me a Coffee](https://img.shields.io/badge/Buy%20Me%20a%20Coffee-🖤-ffdd00)](https://www.buymeacoffee.com/akamrnagar)
+[![UPI](https://img.shields.io/badge/akamrnagar@upi-🖤-f47820)](upi://pay?pa=akamrnagar@upi&pn=Pawan%20Nagar&cu=INR$tn=Donation%20for%20Mindful)
+[![Sponsor Me on GitHub](https://img.shields.io/badge/Sponsor%20Me%20on%20GitHub-🖤-db61a2)](https://github.com/sponsors/akamrnagar)
 
 
 # Feedback and Support
 
 Your feedback is invaluable to us! If you have suggestions, encounter issues, or simply want to share your thoughts, please reach out to us through the following channels : 
 
 * **[GitHub (bug)](https://github.com/akaMrNagar/Mindful/issues/new?&template=bug_report.md)**
-* **[GitHub (enhancement)](https://github.com/akaMrNagar/Mindful/issues/new?&tem**plate=feature_request.md)**
+* **[GitHub (enhancement)](https://github.com/akaMrNagar/Mindful/issues/new?&template=feature_request.md)**
 * **[GitHub (vulnerability)](https://github.com/akaMrNagar/Mindful/security/advisories/new)**
 * **[Write to us via email](mailto:[email protected])**
 

…om/mindful/android/utils/AppConstants.kt …java/com/mindful/android/AppConstants.ktandroid/app/src/main/java/com/mindful/android/utils/AppConstants.kt renamed to android/app/src/main/java/com/mindful/android/AppConstants.kt android/app/src/main/java/com/mindful/android/utils/AppConstants.kt renamed to android/app/src/main/java/com/mindful/android/AppConstants.kt

@@ -9,7 +9,7 @@
  *  *
  *
  */
-package com.mindful.android.utils
+package com.mindful.android
 
 object AppConstants {
     const val FLUTTER_METHOD_CHANNEL_FG: String = "com.mindful.android.methodchannel.fg"
@@ -22,7 +22,6 @@ object AppConstants {
 
     // Extra intent data
     const val INTENT_EXTRA_IS_SELF_RESTART: String = "com.mindful.android.isSelfRestart"
-    const val INTENT_EXTRA_PACKAGE_NAME: String = "com.mindful.android.packageName"
 
     // Notification IDs
     const val TRACKER_SERVICE_NOTIFICATION_ID: Int = 101
@@ -34,6 +33,7 @@ object AppConstants {
     const val NOTIFICATION_BATCH_SCHEDULE_NOTIFICATION_ID: Int = 107
 
     const val SETTINGS_PACKAGE: String = "com.android.settings"
+    const val SYSTEM_UI_PACKAGE: String = "com.android.systemui"
 
     // Platforms package names
     const val SYSTEM_SETTINGS_PACKAGE: String = "com.android.settings"

android/app/src/main/java/com/mindful/android/FgMethodCallHandler.kt

@@ -19,21 +19,23 @@ import com.mindful.android.helpers.device.NotificationHelper
 import com.mindful.android.helpers.device.PermissionsHelper
 import com.mindful.android.helpers.storage.SharedPrefsHelper
 import com.mindful.android.helpers.usages.AppsUsageHelper.getAppsUsageForInterval
-import com.mindful.android.models.AppRestrictions
-import com.mindful.android.models.BedtimeSettings
+import com.mindful.android.models.AppRestriction
+import com.mindful.android.models.BedtimeSchedule
 import com.mindful.android.models.FocusSession
+import com.mindful.android.models.Notification
+import com.mindful.android.models.NotificationSettings
 import com.mindful.android.models.RestrictionGroup
 import com.mindful.android.services.notification.MindfulNotificationListenerService
 import com.mindful.android.services.timer.EmergencyPauseService
 import com.mindful.android.services.timer.FocusSessionService
 import com.mindful.android.services.tracking.MindfulTrackerService
 import com.mindful.android.services.vpn.MindfulVpnService
-import com.mindful.android.utils.JsonDeserializer
+import com.mindful.android.utils.AppUtils
+import com.mindful.android.utils.JsonUtils
 import com.mindful.android.utils.Utils
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler
-import org.json.JSONObject
 import java.util.Locale
 
 class FgMethodCallHandler(
@@ -111,7 +113,7 @@ class FgMethodCallHandler(
             }
 
             "getDeviceInfo" -> {
-                result.success(Utils.getDeviceInfoMap(context))
+                result.success(AppUtils.getDeviceInfoMap(context))
             }
 
             "getDeviceAppsInfo" -> {
@@ -137,16 +139,12 @@ class FgMethodCallHandler(
                 )
             }
 
-            "getUpComingNotifications" -> {
-                result.success(SharedPrefsHelper.getSerializedNotificationsJson(context))
-            }
-
             "getShortsScreenTimeMs" -> {
                 result.success(SharedPrefsHelper.getSetShortsScreenTimeMs(context, null))
             }
 
             "getNativeCrashLogs" -> {
-                result.success(SharedPrefsHelper.getCrashLogsArrayString(context))
+                result.success(SharedPrefsHelper.getCrashLogsArrayJsonString(context))
             }
 
             "clearNativeCrashLogs" -> {
@@ -159,15 +157,15 @@ class FgMethodCallHandler(
             // ==============================================================================================================
 
             "updateAppRestrictions" -> {
-                val appRestrictions = JsonDeserializer.jsonStrToAppRestrictionsHashMap(
+                val appRestrictions = JsonUtils.parseAppRestrictionsMap(
                     call.arguments() ?: ""
                 )
                 updateTrackerServiceRestrictions(appRestrictions, null)
                 result.success(true)
             }
 
             "updateRestrictionsGroups" -> {
-                val restrictionGroups = JsonDeserializer.jsonStrToRestrictionGroupsHashMap(
+                val restrictionGroups = JsonUtils.parseRestrictionGroupsMap(
                     call.arguments() ?: ""
                 )
                 updateTrackerServiceRestrictions(null, restrictionGroups)
@@ -176,7 +174,7 @@ class FgMethodCallHandler(
 
             "updateInternetBlockedApps" -> {
                 val blockedApps =
-                    JsonDeserializer.jsonStrToStringHashSet(call.arguments() ?: "")
+                    JsonUtils.parseStringSet(call.arguments() ?: "")
                 if (vpnServiceConn.isActive) {
                     vpnServiceConn.service?.updateBlockedApps(blockedApps)
                 } else if (blockedApps.isNotEmpty() && getAndAskVpnPermission(false)) {
@@ -201,7 +199,7 @@ class FgMethodCallHandler(
 
             "updateBedtimeSchedule" -> {
                 val jsonBedtimeSettings = call.arguments() ?: ""
-                val bedtimeSettings = BedtimeSettings(JSONObject(jsonBedtimeSettings))
+                val bedtimeSettings = BedtimeSchedule.fromJson(jsonBedtimeSettings)
                 if (bedtimeSettings.isScheduleOn) {
                     scheduleBedtimeRoutineTasks(context, jsonBedtimeSettings)
                 } else {
@@ -229,7 +227,7 @@ class FgMethodCallHandler(
             }
 
             "updateFocusSession" -> {
-                val focusSession = FocusSession(JSONObject(call.arguments() ?: ""))
+                val focusSession = FocusSession.fromJson(call.arguments() ?: "")
                 if (focusServiceConn.isActive) {
                     focusServiceConn.service?.updateFocusSession(focusSession)
                 } else {
@@ -251,29 +249,27 @@ class FgMethodCallHandler(
                 result.success(true)
             }
 
-            "updateDistractingNotificationApps" -> {
-                val distractingApps =
-                    JsonDeserializer.jsonStrToStringHashSet(call.arguments() ?: "")
+            "updateNotificationSettings" -> {
+                val settingsJson = call.arguments() ?: ""
+                val settings = NotificationSettings.fromJson(settingsJson)
+
+                /// Update service
                 if (notificationServiceConn.isActive) {
-                    notificationServiceConn.service?.updateDistractingApps(distractingApps)
-                } else if (distractingApps.isNotEmpty()) {
+                    notificationServiceConn.service?.updateNotificationSettings(settings)
+                } else if (settings.batchedApps.isNotEmpty() || settings.storeNonBatchedToo) {
                     notificationServiceConn.setOnConnectedCallback { service: MindfulNotificationListenerService ->
-                        service.updateDistractingApps(
-                            distractingApps
-                        )
+                        service.updateNotificationSettings(settings)
                     }
                     notificationServiceConn.bindService()
                 }
-                result.success(true)
-            }
 
-            "updateNotificationBatchSchedules" -> {
-                val jsonScheduleTods = call.arguments() ?: ""
-                if (jsonScheduleTods.isNotBlank()) {
-                    scheduleNotificationBatchTask(context, jsonScheduleTods)
+                /// Schedule batches
+                if (settings.schedules.isNotEmpty()) {
+                    scheduleNotificationBatchTask(context, settingsJson)
                 } else {
                     cancelNotificationBatchTask(context)
                 }
+
                 result.success(true)
             }
 
@@ -389,6 +385,18 @@ class FgMethodCallHandler(
                 result.success(true)
             }
 
+            "openAppWithNotificationThread" -> {
+                val notification = Notification.fromJson(call.arguments() ?: "")
+                NewActivitiesLaunchHelper.openAppWithNotificationThread(
+                    context = context,
+                    notification = notification,
+                    pendingIntent = notificationServiceConn.service?.getPendingIntentForKey(
+                        notification.key
+                    ),
+                )
+                result.success(true)
+            }
+
             "openAppSettingsForPackage" -> {
                 NewActivitiesLaunchHelper.openSettingsForPackage(
                     context,
@@ -438,7 +446,7 @@ class FgMethodCallHandler(
      * or null if only app-specific restrictions are being updated.
      */
     private fun updateTrackerServiceRestrictions(
-        appRestrictions: HashMap<String, AppRestrictions>?,
+        appRestrictions: HashMap<String, AppRestriction>?,
         restrictionGroups: HashMap<Int, RestrictionGroup>?,
     ) {
         if (trackerServiceConn.isActive) {

android/app/src/main/java/com/mindful/android/MainActivity.kt

@@ -18,7 +18,6 @@ import androidx.activity.result.contract.ActivityResultContracts
 import com.mindful.android.helpers.AlarmTasksSchedulingHelper.scheduleMidnightResetTask
 import com.mindful.android.helpers.device.NotificationHelper
 import com.mindful.android.helpers.storage.SharedPrefsHelper
-import com.mindful.android.utils.AppConstants
 import io.flutter.embedding.android.FlutterFragmentActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel

android/app/src/main/java/com/mindful/android/enums/PlatformFeatures.kt

@@ -10,5 +10,20 @@ enum class PlatformFeatures {
     SNAPCHAT_DISCOVER,
     FACEBOOK_REELS,
     REDDIT_SHORTS,
-    YOUTUBE_SHORTS,
-}
+    YOUTUBE_SHORTS;
+
+    companion object {
+        fun fromName(name: String): PlatformFeatures? {
+            return when (name) {
+                "instagramReels" -> INSTAGRAM_REELS
+                "instagramExplore" -> INSTAGRAM_EXPLORE
+                "snapchatSpotlight" -> SNAPCHAT_SPOTLIGHT
+                "snapchatDiscover" -> SNAPCHAT_DISCOVER
+                "facebookReels" -> FACEBOOK_REELS
+                "redditShorts" -> REDDIT_SHORTS
+                "youtubeShorts" -> YOUTUBE_SHORTS
+                else -> null
+            }
+        }
+    }
+}