From dd62c0cda1be8b5687b8bceedea666052d878941 Mon Sep 17 00:00:00 2001
From: Gaurav Kushwaha <gaurav.family04@gmail.com>
Date: Wed, 16 Apr 2025 22:13:25 +0530
Subject: [PATCH 1/6] Added the `NextAlarmHomeWidget` and `AddAlarmHomeWidget`
 for android

---
 android/app/build.gradle                      |  3 +
 android/app/src/main/AndroidManifest.xml      | 22 +++++
 .../AddAlarmHomeWidget.kt                     | 65 +++++++++++++
 .../ultimate_alarm_clock/MainActivity.kt      | 95 ++++++++++++++++++-
 .../NextAlarmHomeWidget.kt                    | 53 +++++++++++
 .../drawable/add_alarm_button_background.xml  | 21 ++++
 .../main/res/layout/add_alarm_home_widget.xml | 11 +++
 .../res/layout/next_alarm_home_widget.xml     | 68 +++++++++++++
 .../src/main/res/values-night-v31/styles.xml  | 17 ++++
 .../app/src/main/res/values-night/styles.xml  | 17 ++++
 .../app/src/main/res/values-v31/styles.xml    | 17 ++++
 android/app/src/main/res/values/strings.xml   | 11 +++
 android/app/src/main/res/values/styles.xml    | 17 ++++
 .../xml-v31/add_alarm_home_widget_info.xml    | 15 +++
 .../xml-v31/next_alarm_home_widget_info.xml   | 13 +++
 .../res/xml/add_alarm_home_widget_info.xml    | 15 +++
 .../res/xml/next_alarm_home_widget_info.xml   | 13 +++
 .../controllers/alarm_ring_controller.dart    |  4 +
 .../home/controllers/home_controller.dart     | 17 +++-
 lib/main.dart                                 |  1 -
 pubspec.yaml                                  |  1 +
 21 files changed, 492 insertions(+), 4 deletions(-)
 create mode 100644 android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/AddAlarmHomeWidget.kt
 create mode 100644 android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/NextAlarmHomeWidget.kt
 create mode 100644 android/app/src/main/res/drawable/add_alarm_button_background.xml
 create mode 100644 android/app/src/main/res/layout/add_alarm_home_widget.xml
 create mode 100644 android/app/src/main/res/layout/next_alarm_home_widget.xml
 create mode 100644 android/app/src/main/res/values/strings.xml
 create mode 100644 android/app/src/main/res/xml-v31/add_alarm_home_widget_info.xml
 create mode 100644 android/app/src/main/res/xml-v31/next_alarm_home_widget_info.xml
 create mode 100644 android/app/src/main/res/xml/add_alarm_home_widget_info.xml
 create mode 100644 android/app/src/main/res/xml/next_alarm_home_widget_info.xml

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 3da777f2..ab927f33 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -86,6 +86,9 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 flutter {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 64507121..c0de01a3 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -70,6 +70,28 @@
             android:exported="true"></service>
         <service android:name="com.pravera.flutter_foreground_task.service.ForegroundService" />
 
+        <receiver
+            android:name=".NextAlarmHomeWidget"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/next_alarm_home_widget_info" />
+        </receiver>
+        <receiver
+            android:name=".AddAlarmHomeWidget"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/add_alarm_home_widget_info" />
+        </receiver>
         <receiver
             android:name=".BootReceiver"
             android:enabled="true"
diff --git a/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/AddAlarmHomeWidget.kt b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/AddAlarmHomeWidget.kt
new file mode 100644
index 00000000..1f434822
--- /dev/null
+++ b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/AddAlarmHomeWidget.kt
@@ -0,0 +1,65 @@
+package com.ccextractor.ultimate_alarm_clock
+
+import android.app.PendingIntent
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProvider
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.util.TypedValue
+import android.widget.RemoteViews
+import androidx.core.net.toUri
+
+class AddAlarmHomeWidget : AppWidgetProvider() {
+    override fun onUpdate(
+        context: Context,
+        appWidgetManager: AppWidgetManager,
+        appWidgetIds: IntArray
+    ) {
+        for (appWidgetId in appWidgetIds) {
+            setupAddAlarmButton(context, appWidgetManager, appWidgetId)
+        }
+    }
+
+    override fun onEnabled(context: Context) {
+        // Enter relevant functionality for when the first widget is created
+    }
+
+    override fun onDisabled(context: Context) {
+        // Enter relevant functionality for when the last widget is disabled
+    }
+
+    override fun onAppWidgetOptionsChanged(
+        context: Context,
+        appWidgetManager: AppWidgetManager,
+        appWidgetId: Int,
+        newOptions: Bundle?
+    ) {
+        setupAddAlarmButton(context, appWidgetManager, appWidgetId)
+        super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions)
+    }
+
+    private fun setupAddAlarmButton(
+        context: Context,
+        appWidgetManager: AppWidgetManager,
+        appWidgetId: Int,
+    ) {
+        val views = RemoteViews(context.packageName, R.layout.add_alarm_home_widget)
+
+        val intent = Intent(context, MainActivity::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+        }
+
+        val pendingIntent = PendingIntent.getActivity(
+            context,
+            0,
+            intent,
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        )
+
+        views.setOnClickPendingIntent(R.id.add_alarm_button, pendingIntent)
+        appWidgetManager.updateAppWidget(appWidgetId, views)
+    }
+}
diff --git a/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/MainActivity.kt b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/MainActivity.kt
index 4aa789b3..217d3b86 100644
--- a/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/MainActivity.kt
@@ -5,6 +5,8 @@ import android.app.ActivityManager
 import android.app.AlarmManager
 import android.app.NotificationManager
 import android.app.PendingIntent
+import android.appwidget.AppWidgetManager
+import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
@@ -12,7 +14,6 @@ import android.media.Ringtone
 import android.media.RingtoneManager
 import android.net.Uri
 import android.os.Bundle
-import android.os.SystemClock
 import android.provider.Settings
 import android.util.Log
 import android.view.WindowManager
@@ -20,7 +21,9 @@ import androidx.annotation.NonNull
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
-
+import android.os.Handler
+import android.os.Looper
+import android.widget.RemoteViews
 
 class MainActivity : FlutterActivity() {
     companion object {
@@ -40,6 +43,8 @@ class MainActivity : FlutterActivity() {
         intentFilter.addAction("com.ccextractor.ultimate_alarm_clock.START_TIMERNOTIF")
         intentFilter.addAction("com.ccextractor.ultimate_alarm_clock.STOP_TIMERNOTIF")
         context.registerReceiver(TimerNotification(), intentFilter, Context.RECEIVER_EXPORTED)
+        // Start periodic updates of rings_in
+        handler.post(updateWidgetRunnable)
     }
 
 
@@ -294,4 +299,90 @@ class MainActivity : FlutterActivity() {
         startActivity(intent)
     }
 
+    // Update the rings_in home_widget in a loop of 1 minute
+    private val handler = Handler(Looper.getMainLooper())
+    private val updateInterval: Long = 60000
+
+    private val updateWidgetRunnable = object : Runnable {
+        override fun run() {
+            val appWidgetManager = AppWidgetManager.getInstance(applicationContext)
+            val componentName = ComponentName(applicationContext, NextAlarmHomeWidget::class.java)
+            val appWidgetIds = appWidgetManager.getAppWidgetIds(componentName)
+
+            for (appWidgetId in appWidgetIds) {
+                val views = RemoteViews(packageName, R.layout.next_alarm_home_widget)
+                val alarmTime = getAlarmTimeText()
+                if (alarmTime != "No upcoming alarms!") {
+                    views.setTextViewText(R.id.rings_in, alarmTime)
+                } else {
+                    views.setTextViewText(R.id.alarm_date_n_time, "No upcoming alarms!")
+                    views.setTextViewText(R.id.rings_in, "")
+                }
+                appWidgetManager.updateAppWidget(appWidgetId, views)
+            }
+
+            handler.postDelayed(this, updateInterval)
+        }
+    }
+
+    private fun getAlarmTimeText(): String {
+        val dbHelper = DatabaseHelper(applicationContext)
+        val db = dbHelper.readableDatabase
+        val sharedPreferences = getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE)
+        val profile = sharedPreferences.getString("flutter.profile", "Default") ?: "Default"
+        val ringTime = getLatestAlarm(db, true, profile, applicationContext)
+
+        return if (ringTime != null) {
+            val interval = ringTime["interval"] as? Long
+            if (interval != null) {
+                "Rings in " + formatInterval(interval)
+            } else {
+                "No upcoming alarms!"
+            }
+        } else {
+            "No upcoming alarms!"
+        }
+    }
+
+    private fun formatInterval(interval: Long): String {
+        val totalMinutes = interval / 60000
+        val hours = totalMinutes / 60
+        val remainingMinutes = totalMinutes % 60
+        val days = hours / 24
+
+        if (hours == (0).toLong() && remainingMinutes < 1) {
+            return "less than 1 minute"
+        } else if (hours < 24) {
+            if (hours == (0).toLong()) {
+                return if (remainingMinutes == (1).toLong()) {
+                    "$remainingMinutes minute"
+                } else {
+                    "$remainingMinutes minutes"
+                }
+            } else if (remainingMinutes == (0).toLong()) {
+                return if (hours == (1).toLong()) {
+                    "$hours hour"
+                } else {
+                    "$hours hours"
+                }
+            } else if (hours == (1).toLong()) {
+                return if (remainingMinutes == (1).toLong()) {
+                    "$hours hour $remainingMinutes minute"
+                } else {
+                    "$hours hour $remainingMinutes minutes"
+                }
+            } else {
+                return "$hours hour $remainingMinutes minutes";
+            }
+        } else if (days == (1).toLong()) {
+            return "1 day"
+        } else {
+            return "$days days"
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        handler.removeCallbacks(updateWidgetRunnable)
+    }
 }
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/NextAlarmHomeWidget.kt b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/NextAlarmHomeWidget.kt
new file mode 100644
index 00000000..94313e88
--- /dev/null
+++ b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/NextAlarmHomeWidget.kt
@@ -0,0 +1,53 @@
+package com.ccextractor.ultimate_alarm_clock
+
+import android.app.PendingIntent
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProvider
+import android.content.Context
+import android.content.Intent
+import android.widget.RemoteViews
+import es.antonborri.home_widget.HomeWidgetPlugin
+
+
+class NextAlarmHomeWidget : AppWidgetProvider() {
+    override fun onUpdate(
+        context: Context,
+        appWidgetManager: AppWidgetManager,
+        appWidgetIds: IntArray
+    ) {
+        // There may be multiple widgets active, so update all of them
+        for (appWidgetId in appWidgetIds) {
+            // Handling next alarm content
+            val data = HomeWidgetPlugin.getData(context);
+            val views = RemoteViews(context.packageName, R.layout.next_alarm_home_widget)
+            var ringsIn = data.getString("rings_in", "No upcoming alarms!")
+            var alarmTime = data.getString("alarm_time", "")
+            if (ringsIn == "No upcoming alarms!") {
+                alarmTime = "No upcoming alarms!";
+                ringsIn = "";
+            }
+            views.setTextViewText(R.id.rings_in, ringsIn)
+            views.setTextViewText(R.id.alarm_date_n_time, alarmTime)
+            // handling on tap of add-alarm button
+            val intent = Intent(context, MainActivity::class.java).apply {
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+            }
+            val pendingIntent = PendingIntent.getActivity(
+                context,
+                0,
+                intent,
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            )
+            views.setOnClickPendingIntent(R.id.add_alarm_button_next_alarm_widget, pendingIntent)
+            appWidgetManager.updateAppWidget(appWidgetId, views)
+        }
+    }
+
+    override fun onEnabled(context: Context) {
+        // Enter relevant functionality for when the first widget is created
+    }
+
+    override fun onDisabled(context: Context) {
+        // Enter relevant functionality for when the last widget is disabled
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/add_alarm_button_background.xml b/android/app/src/main/res/drawable/add_alarm_button_background.xml
new file mode 100644
index 00000000..e129308b
--- /dev/null
+++ b/android/app/src/main/res/drawable/add_alarm_button_background.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#AFFC41" />
+            <corners android:radius="15dp" />
+        </shape>
+    </item>
+    <item android:gravity="center">
+        <vector
+            android:width="35dp"
+            android:height="35dp"
+            android:viewportWidth="24"
+            android:viewportHeight="24">
+            <path
+                android:fillColor="#000000"
+                android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6V13z" />
+        </vector>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/add_alarm_home_widget.xml b/android/app/src/main/res/layout/add_alarm_home_widget.xml
new file mode 100644
index 00000000..56949d20
--- /dev/null
+++ b/android/app/src/main/res/layout/add_alarm_home_widget.xml
@@ -0,0 +1,11 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <Button
+        android:id="@+id/add_alarm_button"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_gravity="center"
+        android:background="@drawable/add_alarm_button_background" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/next_alarm_home_widget.xml b/android/app/src/main/res/layout/next_alarm_home_widget.xml
new file mode 100644
index 00000000..6f265c13
--- /dev/null
+++ b/android/app/src/main/res/layout/next_alarm_home_widget.xml
@@ -0,0 +1,68 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/Widget.Android.AppWidget.Container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/add_alarm_button_next_alarm_widget"
+            android:layout_height="50dp"
+            android:layout_width="50dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:layout_marginStart="5dp"
+            android:layout_gravity="center_vertical"
+            android:scaleType="fitCenter"
+            android:adjustViewBounds="true"
+            android:background="@drawable/add_alarm_button_background" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/next_alarm"
+                style="@style/Widget.Android.AppWidget.InnerView"
+                android:layout_weight="1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="2dp"
+                android:text="@string/next_alarm"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/alarm_date_n_time"
+                style="@style/Widget.Android.AppWidget.RingsIn"
+                android:layout_weight="1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="2dp"
+                android:text="@string/next_alarm_date_n_time"
+                android:textSize="15sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/rings_in"
+                style="@style/Widget.Android.AppWidget.RingsIn"
+                android:layout_weight="1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:alpha="190"
+                android:text="@string/rings_in"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-night-v31/styles.xml b/android/app/src/main/res/values-night-v31/styles.xml
index a3653cb1..9d07b060 100644
--- a/android/app/src/main/res/values-night-v31/styles.xml
+++ b/android/app/src/main/res/values-night-v31/styles.xml
@@ -16,4 +16,21 @@
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
+
+    <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
+        <item name="android:id">@android:id/background</item>
+        <item name="android:background">#16171c</item>
+    </style>
+
+    <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
+        <item name="android:textColor">#595f6b</item>
+        <item name="fontWeight">800</item>
+        <item name="android:letterSpacing">0.05</item>
+    </style>
+
+    <style name="Widget.Android.AppWidget.RingsIn" parent="android:Widget">
+        <item name="android:textColor">#ffffff</item>
+        <item name="fontWeight">600</item>
+        <item name="android:letterSpacing">0.05</item>
+    </style>
 </resources>
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index dbc9ea9f..1bb3b7de 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -19,4 +19,21 @@
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
+
+    <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
+        <item name="android:id">@android:id/background</item>
+        <item name="android:background">#16171c</item>
+    </style>
+
+    <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
+        <item name="android:textColor">#595f6b</item>
+        <item name="fontWeight">800</item>
+        <item name="android:letterSpacing">0.05</item>
+    </style>
+
+    <style name="Widget.Android.AppWidget.RingsIn" parent="android:Widget">
+        <item name="android:textColor">#ffffff</item>
+        <item name="fontWeight">600</item>
+        <item name="android:letterSpacing">0.05</item>
+    </style>
 </resources>
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
index d0a68e92..32513fee 100644
--- a/android/app/src/main/res/values-v31/styles.xml
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -16,4 +16,21 @@
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
+
+    <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
+        <item name="android:id">@android:id/background</item>
+        <item name="android:background">#ffffff</item>
+    </style>
+
+    <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
+        <item name="android:textColor">#ACACAB</item>
+        <item name="fontWeight">800</item>
+        <item name="android:letterSpacing">0.05</item>
+    </style>
+
+    <style name="Widget.Android.AppWidget.RingsIn" parent="android:Widget">
+        <item name="android:textColor">#444444</item>
+        <item name="fontWeight">800</item>
+        <item name="android:letterSpacing">0.05</item>
+    </style>
 </resources>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
new file mode 100644
index 00000000..ad5da446
--- /dev/null
+++ b/android/app/src/main/res/values/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="ultimate_alarm_clock">Ultimate Alarm Clock</string>
+    <string name="next_alarm">Next alarm</string>
+    <string name="rings_in">No upcoming alarms!</string>
+    <string name="appwidget_text">EXAMPLE</string>
+    <string name="add_widget">Add widget</string>
+    <string name="app_widget_description">This is an app widget description</string>
+    <string name="next_alarm_date_n_time"> </string>
+    <string name="add_new_alarm">Add new alarm</string>
+</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 0d1fa8fc..36e0c784 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -19,4 +19,21 @@
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
+
+    <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
+        <item name="android:id">@android:id/background</item>
+        <item name="android:background">#ffffff</item>
+    </style>
+
+    <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
+        <item name="android:textColor">#ACACAB</item>
+        <item name="fontWeight">800</item>
+        <item name="android:letterSpacing">0.05</item>
+    </style>
+
+    <style name="Widget.Android.AppWidget.RingsIn" parent="android:Widget">
+        <item name="android:textColor">#444444</item>
+        <item name="fontWeight">800</item>
+        <item name="android:letterSpacing">0.05</item>
+    </style>
 </resources>
diff --git a/android/app/src/main/res/xml-v31/add_alarm_home_widget_info.xml b/android/app/src/main/res/xml-v31/add_alarm_home_widget_info.xml
new file mode 100644
index 00000000..4cd63218
--- /dev/null
+++ b/android/app/src/main/res/xml-v31/add_alarm_home_widget_info.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:initialKeyguardLayout="@layout/add_alarm_home_widget"
+    android:initialLayout="@layout/add_alarm_home_widget"
+    android:minWidth="40dp"
+    android:minHeight="40dp"
+    android:resizeMode="none"
+    android:previewImage="@mipmap/ic_launcher"
+    android:previewLayout="@layout/add_alarm_home_widget"
+    android:targetCellWidth="1"
+    android:targetCellHeight="1"
+    android:updatePeriodMillis="86400000"
+    android:widgetCategory="home_screen"
+    tools:targetApi="31" />
\ No newline at end of file
diff --git a/android/app/src/main/res/xml-v31/next_alarm_home_widget_info.xml b/android/app/src/main/res/xml-v31/next_alarm_home_widget_info.xml
new file mode 100644
index 00000000..73a322e0
--- /dev/null
+++ b/android/app/src/main/res/xml-v31/next_alarm_home_widget_info.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:initialKeyguardLayout="@layout/next_alarm_home_widget"
+    android:initialLayout="@layout/next_alarm_home_widget"
+    android:previewImage="@mipmap/ic_launcher"
+    android:previewLayout="@layout/next_alarm_home_widget"
+    android:resizeMode="none"
+    android:targetCellWidth="4"
+    android:targetCellHeight="1"
+    android:updatePeriodMillis="86400000"
+    android:widgetCategory="home_screen"
+    tools:targetApi="31" />
\ No newline at end of file
diff --git a/android/app/src/main/res/xml/add_alarm_home_widget_info.xml b/android/app/src/main/res/xml/add_alarm_home_widget_info.xml
new file mode 100644
index 00000000..a4c94da2
--- /dev/null
+++ b/android/app/src/main/res/xml/add_alarm_home_widget_info.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:initialKeyguardLayout="@layout/add_alarm_home_widget"
+    android:initialLayout="@layout/add_alarm_home_widget"
+    android:minWidth="40dp"
+    android:minHeight="40dp"
+    android:previewImage="@mipmap/ic_launcher"
+    android:previewLayout="@layout/add_alarm_home_widget"
+    android:resizeMode="none"
+    android:targetCellWidth="1"
+    android:targetCellHeight="1"
+    android:updatePeriodMillis="86400000"
+    android:widgetCategory="home_screen"
+    tools:targetApi="31" />
\ No newline at end of file
diff --git a/android/app/src/main/res/xml/next_alarm_home_widget_info.xml b/android/app/src/main/res/xml/next_alarm_home_widget_info.xml
new file mode 100644
index 00000000..73a322e0
--- /dev/null
+++ b/android/app/src/main/res/xml/next_alarm_home_widget_info.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:initialKeyguardLayout="@layout/next_alarm_home_widget"
+    android:initialLayout="@layout/next_alarm_home_widget"
+    android:previewImage="@mipmap/ic_launcher"
+    android:previewLayout="@layout/next_alarm_home_widget"
+    android:resizeMode="none"
+    android:targetCellWidth="4"
+    android:targetCellHeight="1"
+    android:updatePeriodMillis="86400000"
+    android:widgetCategory="home_screen"
+    tools:targetApi="31" />
\ No newline at end of file
diff --git a/lib/app/modules/alarmRing/controllers/alarm_ring_controller.dart b/lib/app/modules/alarmRing/controllers/alarm_ring_controller.dart
index cee4e80c..52640974 100644
--- a/lib/app/modules/alarmRing/controllers/alarm_ring_controller.dart
+++ b/lib/app/modules/alarmRing/controllers/alarm_ring_controller.dart
@@ -416,6 +416,10 @@ class AlarmControlController extends GetxController {
         }
       }
     }
+
+    // Refresh the next alarm and update the HomeWidget
+    await homeController.refreshUpcomingAlarms();
+
     _subscription.cancel();
     _currentTimeTimer?.cancel();
     _sensorSubscription?.cancel();
diff --git a/lib/app/modules/home/controllers/home_controller.dart b/lib/app/modules/home/controllers/home_controller.dart
index 449ca94f..9073c51e 100644
--- a/lib/app/modules/home/controllers/home_controller.dart
+++ b/lib/app/modules/home/controllers/home_controller.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/services.dart';
 import 'package:googleapis/calendar/v3.dart' as CalendarApi;
+import 'package:home_widget/home_widget.dart';
 import 'package:intl/intl.dart';
 import 'package:rxdart/rxdart.dart' as rx;
 import 'package:cloud_firestore/cloud_firestore.dart';
@@ -16,6 +17,7 @@ import 'package:ultimate_alarm_clock/app/data/providers/firestore_provider.dart'
 import 'package:ultimate_alarm_clock/app/data/providers/get_storage_provider.dart';
 import 'package:ultimate_alarm_clock/app/data/providers/isar_provider.dart';
 import 'package:ultimate_alarm_clock/app/data/providers/secure_storage_provider.dart';
+import 'package:ultimate_alarm_clock/app/modules/settings/controllers/settings_controller.dart';
 import 'package:ultimate_alarm_clock/app/modules/settings/controllers/theme_controller.dart';
 import 'package:ultimate_alarm_clock/app/utils/constants.dart';
 import 'package:ultimate_alarm_clock/app/utils/utils.dart';
@@ -384,6 +386,19 @@ class HomeController extends GetxController {
       } else {
         alarmTime.value = 'No upcoming alarms!';
       }
+
+      SettingsController settingsController = Get.find<SettingsController>();
+      DateTime alarmDateTime = DateTime.parse('${latestAlarm.alarmDate}${latestAlarm.alarmTime}');
+      String formattedDateTime = '';
+      if (settingsController.is24HrsEnabled.value == true) {
+        formattedDateTime = DateFormat('HH:mm, dd MMM yyyy').format(alarmDateTime);
+      } else {
+        formattedDateTime = DateFormat('hh:mm a, dd MMM yyyy').format(alarmDateTime);
+      }
+      // Updating Home Widget with latest alarms.
+      HomeWidget.saveWidgetData('rings_in', alarmTime.value);
+      HomeWidget.saveWidgetData('alarm_time', formattedDateTime);
+      HomeWidget.updateWidget(androidName: 'NextAlarmHomeWidget');
     });
   }
 
@@ -696,7 +711,7 @@ class HomeController extends GetxController {
                       );
                     },
                     style: OutlinedButton.styleFrom(
-                      side: BorderSide(
+                      side: const BorderSide(
                         color: Colors.red,
                         width: 1,
                       ),
diff --git a/lib/main.dart b/lib/main.dart
index 000c7157..da648825 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -6,7 +6,6 @@ import 'package:get/get.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:ultimate_alarm_clock/app/data/providers/get_storage_provider.dart';
 import 'package:ultimate_alarm_clock/app/modules/settings/controllers/theme_controller.dart';
-import 'package:sqflite/sqflite.dart';
 import 'package:ultimate_alarm_clock/app/utils/language.dart';
 import 'package:ultimate_alarm_clock/app/utils/constants.dart';
 import 'package:ultimate_alarm_clock/app/utils/custom_error_screen.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index ea1939f0..fbca4405 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -58,6 +58,7 @@ dependencies:
   intl_phone_number_input: ^0.7.4
   firebase_messaging: ^14.7.19
   shared_preferences: ^2.2.3
+  home_widget: ^0.2.1
 
 dev_dependencies:
   flutter_lints: ^4.0.0

From 620958c0b05eb18b9b3c7f188a0b73521c1995da Mon Sep 17 00:00:00 2001
From: mahendra kasula <kasulamahi624@gmail.com>
Date: Sun, 20 Apr 2025 18:35:32 +0530
Subject: [PATCH 2/6] added (#818)

---
 lib/app/modules/settings/views/customize_undo_duration.dart | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/app/modules/settings/views/customize_undo_duration.dart b/lib/app/modules/settings/views/customize_undo_duration.dart
index 0d49abfb..73a4a771 100644
--- a/lib/app/modules/settings/views/customize_undo_duration.dart
+++ b/lib/app/modules/settings/views/customize_undo_duration.dart
@@ -109,8 +109,9 @@ class CustomizeUndoDuration extends StatelessWidget{
                       ),
                     ),
                     Icon(
-                      Icons.chevron_right,
-                      color: themeController.primaryDisabledTextColor.value,
+                      Icons.arrow_forward_ios,
+                      size: 18,
+                      color: themeController.primaryTextColor.value.withOpacity(0.8),
                     ),
                   ],
                 ),

From d6cc9417878fe9d3b79114940593bb7804f824e1 Mon Sep 17 00:00:00 2001
From: Gaurav Kushwaha <gaurav.family04@gmail.com>
Date: Sat, 26 Apr 2025 18:28:39 +0530
Subject: [PATCH 3/6] Updates

---
 .../ultimate_alarm_clock/GetLatestAlarm.kt    |   5 +-
 .../ultimate_alarm_clock/MainActivity.kt      | 151 +++++++++++----
 .../NextAlarmHomeWidget.kt                    |  58 ++++--
 .../next_alarm_home_widget_background.xml     |   6 +
 .../next_alarm_home_widget_background.xml     |   6 +
 .../next_alarm_home_widget_background.xml     |   6 +
 .../app/src/main/res/drawable/ic_activity.xml |  10 +
 .../app/src/main/res/drawable/ic_location.xml |  10 +
 .../app/src/main/res/drawable/ic_maths.xml    |  25 +++
 .../src/main/res/drawable/ic_pedometer.xml    |  10 +
 android/app/src/main/res/drawable/ic_qr.xml   |  40 ++++
 .../app/src/main/res/drawable/ic_shake.xml    |  10 +
 .../src/main/res/drawable/ic_shared_alarm.xml |  10 +
 .../app/src/main/res/drawable/ic_weather.xml  |  10 +
 .../next_alarm_home_widget_background.xml     |   6 +
 .../res/layout/next_alarm_home_widget.xml     | 179 +++++++++++++-----
 android/app/src/main/res/values/strings.xml   |   4 +-
 .../xml-v31/next_alarm_home_widget_info.xml   |   2 +-
 .../res/xml/next_alarm_home_widget_info.xml   |   2 +-
 19 files changed, 440 insertions(+), 110 deletions(-)
 create mode 100644 android/app/src/main/res/drawable-night-v21/next_alarm_home_widget_background.xml
 create mode 100644 android/app/src/main/res/drawable-night/next_alarm_home_widget_background.xml
 create mode 100644 android/app/src/main/res/drawable-v21/next_alarm_home_widget_background.xml
 create mode 100644 android/app/src/main/res/drawable/ic_activity.xml
 create mode 100644 android/app/src/main/res/drawable/ic_location.xml
 create mode 100644 android/app/src/main/res/drawable/ic_maths.xml
 create mode 100644 android/app/src/main/res/drawable/ic_pedometer.xml
 create mode 100644 android/app/src/main/res/drawable/ic_qr.xml
 create mode 100644 android/app/src/main/res/drawable/ic_shake.xml
 create mode 100644 android/app/src/main/res/drawable/ic_shared_alarm.xml
 create mode 100644 android/app/src/main/res/drawable/ic_weather.xml
 create mode 100644 android/app/src/main/res/drawable/next_alarm_home_widget_background.xml

diff --git a/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/GetLatestAlarm.kt b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/GetLatestAlarm.kt
index f3a4c103..c1e00e7e 100644
--- a/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/GetLatestAlarm.kt
+++ b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/GetLatestAlarm.kt
@@ -149,7 +149,10 @@ fun getLatestAlarm(db: SQLiteDatabase, wantNextAlarm: Boolean, profile: String,c
                 "location" to setAlarm.location,
                 "isWeather" to setAlarm.isWeatherEnabled,
                 "weatherTypes" to setAlarm.weatherTypes,
-                "alarmID" to setAlarm.alarmId
+                "alarmID" to setAlarm.alarmId,
+                "days" to setAlarm.days,
+                "alarmTime" to setAlarm.alarmTime,
+                "alarmDate" to setAlarm.alarmDate,
             )
             Log.d("s", "sdsd ${a}")
             return a
diff --git a/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/MainActivity.kt b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/MainActivity.kt
index 217d3b86..424c369f 100644
--- a/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/MainActivity.kt
@@ -23,7 +23,12 @@ import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
 import android.os.Handler
 import android.os.Looper
+import android.view.View
 import android.widget.RemoteViews
+import java.sql.Time
+import java.util.Calendar
+import java.util.Date
+import java.util.concurrent.TimeUnit
 
 class MainActivity : FlutterActivity() {
     companion object {
@@ -301,7 +306,7 @@ class MainActivity : FlutterActivity() {
 
     // Update the rings_in home_widget in a loop of 1 minute
     private val handler = Handler(Looper.getMainLooper())
-    private val updateInterval: Long = 60000
+    private val updateInterval: Long = 10000
 
     private val updateWidgetRunnable = object : Runnable {
         override fun run() {
@@ -313,8 +318,10 @@ class MainActivity : FlutterActivity() {
                 val views = RemoteViews(packageName, R.layout.next_alarm_home_widget)
                 val alarmTime = getAlarmTimeText()
                 if (alarmTime != "No upcoming alarms!") {
+                    views.setViewVisibility(R.id.repeat_days, View.VISIBLE)
                     views.setTextViewText(R.id.rings_in, alarmTime)
                 } else {
+                    views.setViewVisibility(R.id.repeat_days, View.GONE)
                     views.setTextViewText(R.id.alarm_date_n_time, "No upcoming alarms!")
                     views.setTextViewText(R.id.rings_in, "")
                 }
@@ -330,57 +337,123 @@ class MainActivity : FlutterActivity() {
         val db = dbHelper.readableDatabase
         val sharedPreferences = getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE)
         val profile = sharedPreferences.getString("flutter.profile", "Default") ?: "Default"
-        val ringTime = getLatestAlarm(db, true, profile, applicationContext)
+        val latestAlarm = getLatestAlarm(db, true, profile, applicationContext)
 
-        return if (ringTime != null) {
-            val interval = ringTime["interval"] as? Long
-            if (interval != null) {
-                "Rings in " + formatInterval(interval)
-            } else {
-                "No upcoming alarms!"
+        return if (latestAlarm != null) {
+            val alarmTime = latestAlarm["alarmTime"] as? String ?: ""
+            val days = latestAlarm["days"] as? String ?: ""
+            val alarmDate = latestAlarm["alarmDate"] as? String ?: ""
+
+            if (alarmTime.isEmpty() || days.isEmpty() || alarmDate.isEmpty()) {
+                return "No upcoming alarms!"
             }
+            return "Rings in " + timeUntilAlarm(stringToTime(alarmTime), days.map { it == '1' }, stringToDate(alarmDate))
         } else {
             "No upcoming alarms!"
         }
     }
 
-    private fun formatInterval(interval: Long): String {
-        val totalMinutes = interval / 60000
-        val hours = totalMinutes / 60
-        val remainingMinutes = totalMinutes % 60
-        val days = hours / 24
-
-        if (hours == (0).toLong() && remainingMinutes < 1) {
-            return "less than 1 minute"
-        } else if (hours < 24) {
-            if (hours == (0).toLong()) {
-                return if (remainingMinutes == (1).toLong()) {
-                    "$remainingMinutes minute"
-                } else {
-                    "$remainingMinutes minutes"
-                }
-            } else if (remainingMinutes == (0).toLong()) {
-                return if (hours == (1).toLong()) {
-                    "$hours hour"
-                } else {
-                    "$hours hours"
-                }
-            } else if (hours == (1).toLong()) {
-                return if (remainingMinutes == (1).toLong()) {
-                    "$hours hour $remainingMinutes minute"
-                } else {
-                    "$hours hour $remainingMinutes minutes"
-                }
+    private fun timeUntilAlarm(alarmTime: Time, days: List<Boolean>, alarmDate: Date): String {
+        val now = Calendar.getInstance()
+
+        val todayAlarm = Calendar.getInstance().apply {
+            set(Calendar.HOUR_OF_DAY, alarmTime.hours)
+            set(Calendar.MINUTE, alarmTime.minutes)
+            set(Calendar.SECOND, 0)
+            set(Calendar.MILLISECOND, 0)
+        }
+
+        var durationMillis: Long
+
+        // If the alarm is for a specific future date
+        if (alarmDate.after(now.time)) {
+            val specificDateAlarm = Calendar.getInstance().apply {
+                set(Calendar.YEAR, alarmDate.year)
+                set(Calendar.MONTH, alarmDate.month)
+                set(Calendar.DATE, alarmDate.date)
+                set(Calendar.HOUR_OF_DAY, alarmTime.hours)
+                set(Calendar.MINUTE, alarmTime.minutes)
+                set(Calendar.SECOND, 0)
+                set(Calendar.MILLISECOND, 0)
+            }
+            durationMillis = specificDateAlarm.timeInMillis - now.timeInMillis
+            return formatInterval(durationMillis)
+        }
+
+        // One-time alarm (no repeat days)
+        if (days.all { !it }) {
+            durationMillis = if (now.before(todayAlarm)) {
+                todayAlarm.timeInMillis - now.timeInMillis
             } else {
-                return "$hours hour $remainingMinutes minutes";
+                val nextAlarm = todayAlarm
+                nextAlarm.add(Calendar.DAY_OF_YEAR, 1)
+                nextAlarm.timeInMillis - now.timeInMillis
             }
-        } else if (days == (1).toLong()) {
-            return "1 day"
+        } else if (now.before(todayAlarm) && days[now.get(Calendar.DAY_OF_WEEK) - 1]) {
+            durationMillis = todayAlarm.timeInMillis - now.timeInMillis
         } else {
-            return "$days days"
+            // var daysUntilNextAlarm = 7
+            var nextAlarm: Calendar? = null
+
+            for (i in 1..7) {
+                val nextDayIndex = (now.get(Calendar.DAY_OF_WEEK) + i - 1) % 7;
+                if (days[nextDayIndex]) {
+                    // daysUntilNextAlarm = i;
+                    nextAlarm = Calendar.getInstance().apply {
+                        add(Calendar.DAY_OF_YEAR, i)
+                        set(Calendar.HOUR_OF_DAY, alarmTime.hours)
+                        set(Calendar.MINUTE, alarmTime.minutes)
+                        set(Calendar.SECOND, 0)
+                        set(Calendar.MILLISECOND, 0)
+                    }
+                    break
+                }
+            }
+
+            if (nextAlarm != null) {
+                durationMillis = nextAlarm.timeInMillis - now.timeInMillis;
+            } else {
+                return "No upcoming alarms"
+            }
+        }
+        return formatInterval(durationMillis)
+    }
+
+    private fun formatInterval(durationMillis: Long): String {
+        val minutes = TimeUnit.MILLISECONDS.toMinutes(durationMillis)
+        val hours = TimeUnit.MILLISECONDS.toHours(durationMillis)
+        val days = TimeUnit.MILLISECONDS.toDays(durationMillis)
+
+        return when {
+            minutes < 1 -> "less than 1 minute"
+            hours < 24 -> {
+                val remainingMinutes = minutes % 60
+                when {
+                    hours == 0L -> "$remainingMinutes minute${if (remainingMinutes == 1L) "" else "s"}"
+                    remainingMinutes == 0L -> "$hours hour${if (hours == 1L) "" else "s"}"
+                    else -> "$hours hour${if (hours == 1L) "" else "s"} $remainingMinutes minute${if (remainingMinutes == 1L) "" else "s"}"
+                }
+            }
+            days == 1L -> "1 day"
+            else -> "$days days"
         }
     }
 
+    private fun stringToDate(date: String): Date {
+        val parts = date.split("-")
+        val year = parts[0].trim().toInt() - 1900
+        val month = parts[1].trim().toInt() - 1
+        val day = parts[2].trim().toInt()
+        return Date(year, month, day)
+    }
+
+    private fun stringToTime(time: String): Time {
+        val parts = time.split(':')
+        val hour = parts[0].toInt()
+        val minute = parts[1].toInt()
+        return Time(hour, minute, 0);
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         handler.removeCallbacks(updateWidgetRunnable)
diff --git a/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/NextAlarmHomeWidget.kt b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/NextAlarmHomeWidget.kt
index 94313e88..e8f643ac 100644
--- a/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/NextAlarmHomeWidget.kt
+++ b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/NextAlarmHomeWidget.kt
@@ -5,6 +5,7 @@ import android.appwidget.AppWidgetManager
 import android.appwidget.AppWidgetProvider
 import android.content.Context
 import android.content.Intent
+import android.view.View
 import android.widget.RemoteViews
 import es.antonborri.home_widget.HomeWidgetPlugin
 
@@ -20,25 +21,50 @@ class NextAlarmHomeWidget : AppWidgetProvider() {
             // Handling next alarm content
             val data = HomeWidgetPlugin.getData(context);
             val views = RemoteViews(context.packageName, R.layout.next_alarm_home_widget)
-            var ringsIn = data.getString("rings_in", "No upcoming alarms!")
-            var alarmTime = data.getString("alarm_time", "")
+            val ringsIn = data.getString("rings_in", "No upcoming alarms!")
+            val alarmTime = data.getString("alarm_time", "")
+            val repeatDays = data.getString("alarm_repeat_days", "One Time")
             if (ringsIn == "No upcoming alarms!") {
-                alarmTime = "No upcoming alarms!";
-                ringsIn = "";
+                views.setViewVisibility(R.id.repeat_days, View.GONE);
+                views.setTextViewText(R.id.repeat_days, "")
+                views.setTextViewText(R.id.alarm_date_n_time, "No upcoming alarms!")
+                views.setTextViewText(R.id.rings_in, "")
+            } else {
+                views.setViewVisibility(R.id.repeat_days, View.VISIBLE)
+                views.setTextViewText(R.id.rings_in, ringsIn)
+                views.setTextViewText(R.id.repeat_days, repeatDays)
+                views.setTextViewText(R.id.alarm_date_n_time, alarmTime)
             }
-            views.setTextViewText(R.id.rings_in, ringsIn)
-            views.setTextViewText(R.id.alarm_date_n_time, alarmTime)
+
+            // Handle feature icons visibility
+            views.setViewVisibility(R.id.shared_alarm_icon, 
+                if (data.getBoolean("isSharedAlarmEnabled", false)) View.VISIBLE else View.GONE)
+            views.setViewVisibility(R.id.location_icon, 
+                if (data.getBoolean("isLocationEnabled", false)) View.VISIBLE else View.GONE)
+            views.setViewVisibility(R.id.activity_icon, 
+                if (data.getBoolean("isActivityEnabled", false)) View.VISIBLE else View.GONE)
+            views.setViewVisibility(R.id.weather_icon, 
+                if (data.getBoolean("isWeatherEnabled", false)) View.VISIBLE else View.GONE)
+            views.setViewVisibility(R.id.qr_icon, 
+                if (data.getBoolean("isQrEnabled", false)) View.VISIBLE else View.GONE)
+            views.setViewVisibility(R.id.shake_icon, 
+                if (data.getBoolean("isShakeEnabled", false)) View.VISIBLE else View.GONE)
+            views.setViewVisibility(R.id.maths_icon, 
+                if (data.getBoolean("isMathsEnabled", false)) View.VISIBLE else View.GONE)
+            views.setViewVisibility(R.id.pedometer_icon, 
+                if (data.getBoolean("isPedometerEnabled", false)) View.VISIBLE else View.GONE)
+
             // handling on tap of add-alarm button
-            val intent = Intent(context, MainActivity::class.java).apply {
-                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-            }
-            val pendingIntent = PendingIntent.getActivity(
-                context,
-                0,
-                intent,
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-            )
-            views.setOnClickPendingIntent(R.id.add_alarm_button_next_alarm_widget, pendingIntent)
+//            val intent = Intent(context, MainActivity::class.java).apply {
+//                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+//            }
+//            val pendingIntent = PendingIntent.getActivity(
+//                context,
+//                0,
+//                intent,
+//                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+//            )
+//            views.setOnClickPendingIntent(R.id.add_alarm_button_next_alarm_widget, pendingIntent)
             appWidgetManager.updateAppWidget(appWidgetId, views)
         }
     }
diff --git a/android/app/src/main/res/drawable-night-v21/next_alarm_home_widget_background.xml b/android/app/src/main/res/drawable-night-v21/next_alarm_home_widget_background.xml
new file mode 100644
index 00000000..22059bbf
--- /dev/null
+++ b/android/app/src/main/res/drawable-night-v21/next_alarm_home_widget_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#16171C"/>
+    <corners android:radius="20dp" />
+</shape>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable-night/next_alarm_home_widget_background.xml b/android/app/src/main/res/drawable-night/next_alarm_home_widget_background.xml
new file mode 100644
index 00000000..22059bbf
--- /dev/null
+++ b/android/app/src/main/res/drawable-night/next_alarm_home_widget_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#16171C"/>
+    <corners android:radius="20dp" />
+</shape>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable-v21/next_alarm_home_widget_background.xml b/android/app/src/main/res/drawable-v21/next_alarm_home_widget_background.xml
new file mode 100644
index 00000000..968f82bf
--- /dev/null
+++ b/android/app/src/main/res/drawable-v21/next_alarm_home_widget_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFFFFF" />
+    <corners android:radius="20dp" />
+</shape>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/ic_activity.xml b/android/app/src/main/res/drawable/ic_activity.xml
new file mode 100644
index 00000000..ec7d6d2f
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_activity.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M13.49,5.48c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.89,19.38l1,-4.4 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3c1.3,1.5 3.3,2.5 5.5,2.5v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1l-5.2,2.2v4.7h2v-3.4l1.8,-0.7 -1.6,8.1 -4.9,-1 -0.4,2z"/>
+</vector>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/ic_location.xml b/android/app/src/main/res/drawable/ic_location.xml
new file mode 100644
index 00000000..0a8bda9b
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_location.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
+</vector>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/ic_maths.xml b/android/app/src/main/res/drawable/ic_maths.xml
new file mode 100644
index 00000000..797d8c11
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_maths.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+android:viewportWidth="24"
+android:viewportHeight="24"
+android:width="24dp"
+android:height="24dp">
+<path
+    android:pathData="M19 3H5C3.9 3 3 3.9 3 5v14c0 1.1 0.9 2 2 2h14c1.1 0 2 -0.9 2 -2V5C21 3.9 20.1 3 19 3zM19 19H5V5h14V19z"
+    android:fillColor="#000000" />
+<path
+    android:pathData="M6.25 7.72H11.25V9.22H6.25V7.72Z"
+    android:fillColor="#000000" />
+<path
+    android:pathData="M13 15.75H18V17.25H13V15.75Z"
+    android:fillColor="#000000" />
+<path
+    android:pathData="M13 13.25H18V14.75H13V13.25Z"
+    android:fillColor="#000000" />
+<path
+    android:pathData="M8 18L9.5 18 9.5 16 11.5 16 11.5 14.5 9.5 14.5 9.5 12.5 8 12.5 8 14.5 6 14.5 6 16 8 16Z"
+    android:fillColor="#000000" />
+<path
+    android:pathData="M14.09 10.95L15.5 9.54 16.91 10.95 17.97 9.89 16.56 8.47 17.97 7.06 16.91 6 15.5 7.41 14.09 6 13.03 7.06 14.44 8.47 13.03 9.89Z"
+    android:fillColor="#000000" />
+</vector>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/ic_pedometer.xml b/android/app/src/main/res/drawable/ic_pedometer.xml
new file mode 100644
index 00000000..b171c28f
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_pedometer.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M13.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.8,8.9L7,23h2.1l1.8,-8 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3C14.8,12 16.8,13 19,13v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1L6,8.3V13h2V9.6l1.8,-0.7"/>
+</vector>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/ic_qr.xml b/android/app/src/main/res/drawable/ic_qr.xml
new file mode 100644
index 00000000..1bfbb59f
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_qr.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M3,11h8V3H3V11zM5,5h4v4H5V5z"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M3,21h8v-8H3V21zM5,15h4v4H5V15z"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M13,3v8h8V3H13zM19,9h-4V5h4V9z"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M19,19h2v2h-2z"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M13,13h2v2h-2z"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M15,15h2v2h-2z"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M13,17h2v2h-2z"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M15,19h2v2h-2z"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M17,17h2v2h-2z"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M17,13h2v2h-2z"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M19,15h2v2h-2z"/>
+</vector>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/ic_shake.xml b/android/app/src/main/res/drawable/ic_shake.xml
new file mode 100644
index 00000000..1eb0d624
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_shake.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:width="24dp"
+    android:height="24dp">
+    <path
+        android:pathData="M0 15h2V9H0v6zm3 2h2V7H3v10zm19 -8v6h2V9h-2zm-3 8h2V7h-2v10zM16.5 3h-9C6.67 3 6 3.67 6 4.5v15c0 0.83 0.67 1.5 1.5 1.5h9c0.83 0 1.5 -0.67 1.5 -1.5v-15c0 -0.83 -0.67 -1.5 -1.5 -1.5zM16 19H8V5h8v14z"
+        android:fillColor="#000000" />
+</vector>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/ic_shared_alarm.xml b/android/app/src/main/res/drawable/ic_shared_alarm.xml
new file mode 100644
index 00000000..1655cd43
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_shared_alarm.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960" >
+    <path
+        android:fillColor="#000000"
+        android:pathData="M401,960Q318,960 245,928.5Q172,897 117.5,842.5Q63,788 31.5,715Q0,642 0,560Q0,477 31.5,404Q63,331 117.5,276.5Q172,222 245,190.5Q318,159 401,159Q411,159 420.5,159.5Q430,160 440,161L440,241Q430,240 420.5,239.5Q411,239 401,239Q267,239 173.5,332.5Q80,426 80,560Q80,693 173.5,786.5Q267,880 401,880Q534,880 627.5,786.5Q721,693 721,560Q721,560 721,560Q721,560 721,560L801,560Q801,560 801,560Q801,560 801,560Q801,642 769.5,715Q738,788 683.5,842.5Q629,897 556.5,928.5Q484,960 401,960ZM532,748L360,576L360,360L440,360L440,544L588,692L532,748ZM874,480Q851,338 754,233.5Q657,129 520,94L520,12Q691,49 810.5,177Q930,305 955,480L874,480ZM711,480Q692,405 641.5,348Q591,291 520,262L520,177Q623,209 697,290.5Q771,372 793,480L711,480Z"/>
+</vector>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/ic_weather.xml b/android/app/src/main/res/drawable/ic_weather.xml
new file mode 100644
index 00000000..39ea6daf
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_weather.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960" >
+    <path
+        android:fillColor="#000000"
+        android:pathData="M720,760Q703,760 691.5,748.5Q680,737 680,720Q680,703 691.5,691.5Q703,680 720,680Q737,680 748.5,691.5Q760,703 760,720Q760,737 748.5,748.5Q737,760 720,760ZM280,880Q263,880 251.5,868.5Q240,857 240,840Q240,823 251.5,811.5Q263,800 280,800Q297,800 308.5,811.5Q320,823 320,840Q320,857 308.5,868.5Q297,880 280,880ZM240,760Q223,760 211.5,748.5Q200,737 200,720Q200,703 211.5,691.5Q223,680 240,680L600,680Q617,680 628.5,691.5Q640,703 640,720Q640,737 628.5,748.5Q617,760 600,760L240,760ZM400,880Q383,880 371.5,868.5Q360,857 360,840Q360,823 371.5,811.5Q383,800 400,800L680,800Q697,800 708.5,811.5Q720,823 720,840Q720,857 708.5,868.5Q697,880 680,880L400,880ZM300,640Q209,640 144.5,575.5Q80,511 80,420Q80,337 135,275Q190,213 271,202Q303,145 358.5,112.5Q414,80 480,80Q570,80 636.5,137.5Q703,195 717,281Q786,287 833,338Q880,389 880,460Q880,535 827.5,587.5Q775,640 700,640L300,640ZM300,560L700,560Q742,560 771,531Q800,502 800,460Q800,418 771,389Q742,360 700,360L640,360L640,320Q640,254 593,207Q546,160 480,160Q432,160 392.5,186Q353,212 333,256L323,280L298,280Q241,282 200.5,322.5Q160,363 160,420Q160,478 201,519Q242,560 300,560ZM480,360L480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360L480,360L480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360L480,360L480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Z"/>
+</vector>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/next_alarm_home_widget_background.xml b/android/app/src/main/res/drawable/next_alarm_home_widget_background.xml
new file mode 100644
index 00000000..968f82bf
--- /dev/null
+++ b/android/app/src/main/res/drawable/next_alarm_home_widget_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFFFFF" />
+    <corners android:radius="20dp" />
+</shape>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/next_alarm_home_widget.xml b/android/app/src/main/res/layout/next_alarm_home_widget.xml
index 6f265c13..77bd6d41 100644
--- a/android/app/src/main/res/layout/next_alarm_home_widget.xml
+++ b/android/app/src/main/res/layout/next_alarm_home_widget.xml
@@ -1,68 +1,149 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/Widget.Android.AppWidget.Container"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="@drawable/next_alarm_home_widget_background" >
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
-        android:orientation="horizontal">
+        android:layout_margin="12dp"
+        android:orientation="vertical">
 
-        <Button
-            android:id="@+id/add_alarm_button_next_alarm_widget"
-            android:layout_height="50dp"
-            android:layout_width="50dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:layout_marginStart="5dp"
-            android:layout_gravity="center_vertical"
-            android:scaleType="fitCenter"
-            android:adjustViewBounds="true"
-            android:background="@drawable/add_alarm_button_background" />
+<!--        <Button-->
+<!--            android:id="@+id/add_alarm_button_next_alarm_widget"-->
+<!--            android:layout_height="50dp"-->
+<!--            android:layout_width="50dp"-->
+<!--            android:layout_margin="5dp"-->
+<!--            android:layout_gravity="center_vertical"-->
+<!--            android:scaleType="fitCenter"-->
+<!--            android:adjustViewBounds="true"-->
+<!--            android:background="@drawable/add_alarm_button_background" />-->
+
+        <TextView
+            android:id="@+id/next_alarm"
+            style="@style/Widget.Android.AppWidget.InnerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/next_alarm"
+            android:textSize="16sp"
+            android:layout_marginBottom="5dp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/repeat_days"
+            style="@style/Widget.Android.AppWidget.RingsIn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="@string/next_alarm_repeat_days_and_label"
+            android:textColor="#AFFC41"
+            android:layout_marginBottom="5dp"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/alarm_date_n_time"
+            style="@style/Widget.Android.AppWidget.RingsIn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="@string/next_alarm_date_n_time"
+            android:textSize="15sp"
+            android:layout_marginBottom="5dp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/rings_in"
+            style="@style/Widget.Android.AppWidget.RingsIn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:alpha="190"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="@string/rings_in"
+            android:textSize="14sp" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:gravity="center_vertical"
+            android:layout_marginBottom="5dp"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/shared_alarm_icon"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:layout_marginEnd="4dp"
+                android:src="@drawable/ic_shared_alarm"
+                android:tint="#AFFC41"
+                android:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/location_icon"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:layout_marginEnd="4dp"
+                android:src="@drawable/ic_location"
+                android:tint="#AFFC41"
+                android:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/activity_icon"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:layout_marginEnd="4dp"
+                android:src="@drawable/ic_activity"
+                android:tint="#AFFC41"
+                android:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/weather_icon"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:layout_marginEnd="4dp"
+                android:src="@drawable/ic_weather"
+                android:tint="#AFFC41"
+                android:visibility="gone" />
 
-            <TextView
-                android:id="@+id/next_alarm"
-                style="@style/Widget.Android.AppWidget.InnerView"
-                android:layout_weight="1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="2dp"
-                android:text="@string/next_alarm"
-                android:textSize="16sp"
-                android:textStyle="bold" />
+            <ImageView
+                android:id="@+id/qr_icon"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:layout_marginEnd="4dp"
+                android:src="@drawable/ic_qr"
+                android:tint="#AFFC41"
+                android:visibility="gone" />
 
-            <TextView
-                android:id="@+id/alarm_date_n_time"
-                style="@style/Widget.Android.AppWidget.RingsIn"
-                android:layout_weight="1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="2dp"
-                android:text="@string/next_alarm_date_n_time"
-                android:textSize="15sp"
-                android:textStyle="bold" />
+            <ImageView
+                android:id="@+id/shake_icon"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:layout_marginEnd="4dp"
+                android:src="@drawable/ic_shake"
+                android:tint="#AFFC41"
+                android:visibility="gone" />
 
-            <TextView
-                android:id="@+id/rings_in"
-                style="@style/Widget.Android.AppWidget.RingsIn"
-                android:layout_weight="1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:alpha="190"
-                android:text="@string/rings_in"
-                android:textSize="14sp" />
+            <ImageView
+                android:id="@+id/maths_icon"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:layout_marginEnd="4dp"
+                android:src="@drawable/ic_maths"
+                android:tint="#AFFC41"
+                android:visibility="gone" />
 
+            <ImageView
+                android:id="@+id/pedometer_icon"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:layout_marginEnd="4dp"
+                android:src="@drawable/ic_pedometer"
+                android:tint="#AFFC41"
+                android:visibility="gone" />
         </LinearLayout>
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index ad5da446..08476392 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -3,9 +3,7 @@
     <string name="ultimate_alarm_clock">Ultimate Alarm Clock</string>
     <string name="next_alarm">Next alarm</string>
     <string name="rings_in">No upcoming alarms!</string>
-    <string name="appwidget_text">EXAMPLE</string>
-    <string name="add_widget">Add widget</string>
-    <string name="app_widget_description">This is an app widget description</string>
     <string name="next_alarm_date_n_time"> </string>
     <string name="add_new_alarm">Add new alarm</string>
+    <string name="next_alarm_repeat_days_and_label"> </string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/xml-v31/next_alarm_home_widget_info.xml b/android/app/src/main/res/xml-v31/next_alarm_home_widget_info.xml
index 73a322e0..beca1a67 100644
--- a/android/app/src/main/res/xml-v31/next_alarm_home_widget_info.xml
+++ b/android/app/src/main/res/xml-v31/next_alarm_home_widget_info.xml
@@ -7,7 +7,7 @@
     android:previewLayout="@layout/next_alarm_home_widget"
     android:resizeMode="none"
     android:targetCellWidth="4"
-    android:targetCellHeight="1"
+    android:targetCellHeight="2"
     android:updatePeriodMillis="86400000"
     android:widgetCategory="home_screen"
     tools:targetApi="31" />
\ No newline at end of file
diff --git a/android/app/src/main/res/xml/next_alarm_home_widget_info.xml b/android/app/src/main/res/xml/next_alarm_home_widget_info.xml
index 73a322e0..beca1a67 100644
--- a/android/app/src/main/res/xml/next_alarm_home_widget_info.xml
+++ b/android/app/src/main/res/xml/next_alarm_home_widget_info.xml
@@ -7,7 +7,7 @@
     android:previewLayout="@layout/next_alarm_home_widget"
     android:resizeMode="none"
     android:targetCellWidth="4"
-    android:targetCellHeight="1"
+    android:targetCellHeight="2"
     android:updatePeriodMillis="86400000"
     android:widgetCategory="home_screen"
     tools:targetApi="31" />
\ No newline at end of file

From f32dfe2d745a26864c10fde2de707a4cb6f67135 Mon Sep 17 00:00:00 2001
From: Gaurav Kushwaha <gaurav.family04@gmail.com>
Date: Sun, 27 Apr 2025 11:52:48 +0530
Subject: [PATCH 4/6] Enabled features completed

---
 .../home/controllers/home_controller.dart     | 56 ++++++++++++++++---
 1 file changed, 47 insertions(+), 9 deletions(-)

diff --git a/lib/app/modules/home/controllers/home_controller.dart b/lib/app/modules/home/controllers/home_controller.dart
index 9073c51e..b1f1485c 100644
--- a/lib/app/modules/home/controllers/home_controller.dart
+++ b/lib/app/modules/home/controllers/home_controller.dart
@@ -386,20 +386,58 @@ class HomeController extends GetxController {
       } else {
         alarmTime.value = 'No upcoming alarms!';
       }
+      updateHomeWidgetData(latestAlarm);
+    });
+  }
 
-      SettingsController settingsController = Get.find<SettingsController>();
-      DateTime alarmDateTime = DateTime.parse('${latestAlarm.alarmDate}${latestAlarm.alarmTime}');
-      String formattedDateTime = '';
-      if (settingsController.is24HrsEnabled.value == true) {
+  // Helper method to update home widget data
+  Future<void> updateHomeWidgetData(AlarmModel latestAlarm) async {
+    SettingsController settingsController = Get.find<SettingsController>();
+    DateTime alarmDateTime = DateTime.parse('${latestAlarm.alarmDate}${latestAlarm.alarmTime}');
+    String formattedDateTime = '';
+    String repeatDays = Utils.getRepeatDays(latestAlarm.days).replaceAll('Never', 'One Time');
+    
+    // Format the date and time based on user preferences
+    if (settingsController.is24HrsEnabled.value == true) {
+      if (repeatDays == 'One Time') {
         formattedDateTime = DateFormat('HH:mm, dd MMM yyyy').format(alarmDateTime);
       } else {
+        formattedDateTime = DateFormat('HH:mm').format(alarmDateTime);
+      }
+    } else {
+      if (repeatDays == 'One Time') {
         formattedDateTime = DateFormat('hh:mm a, dd MMM yyyy').format(alarmDateTime);
+      } else {
+        formattedDateTime = DateFormat('hh:mm a').format(alarmDateTime);
       }
-      // Updating Home Widget with latest alarms.
-      HomeWidget.saveWidgetData('rings_in', alarmTime.value);
-      HomeWidget.saveWidgetData('alarm_time', formattedDateTime);
-      HomeWidget.updateWidget(androidName: 'NextAlarmHomeWidget');
-    });
+    }
+    
+    // Add label to repeat days if present
+    if (latestAlarm.label.isNotEmpty) {
+      repeatDays += ' | ${latestAlarm.label}';
+    }
+
+    // Save basic alarm data
+    await HomeWidget.saveWidgetData('alarm_repeat_days', repeatDays);
+    await HomeWidget.saveWidgetData('alarm_time', formattedDateTime);
+    await HomeWidget.saveWidgetData('rings_in', alarmTime.value);
+    
+    // Save feature states
+    await _updateFeatureStates(latestAlarm);
+    
+    // Update widget UI
+    await HomeWidget.updateWidget(androidName: 'NextAlarmHomeWidget');
+  }
+
+  Future<void> _updateFeatureStates(AlarmModel alarm) async {
+    await HomeWidget.saveWidgetData('isSharedAlarmEnabled', alarm.isSharedAlarmEnabled);
+    await HomeWidget.saveWidgetData('isLocationEnabled', alarm.isLocationEnabled);
+    await HomeWidget.saveWidgetData('isActivityEnabled', alarm.isActivityEnabled);
+    await HomeWidget.saveWidgetData('isWeatherEnabled', alarm.isWeatherEnabled);
+    await HomeWidget.saveWidgetData('isQrEnabled', alarm.isQrEnabled);
+    await HomeWidget.saveWidgetData('isShakeEnabled', alarm.isShakeEnabled);
+    await HomeWidget.saveWidgetData('isMathsEnabled', alarm.isMathsEnabled);
+    await HomeWidget.saveWidgetData('isPedometerEnabled', alarm.isPedometerEnabled);
   }
 
   scheduleNextAlarm(

From 6b9cda34b204d3a151f8a0539fe2dbdedc539150 Mon Sep 17 00:00:00 2001
From: Gaurav Kushwaha <gaurav.family04@gmail.com>
Date: Sun, 27 Apr 2025 17:00:19 +0530
Subject: [PATCH 5/6] AddAlarmHomeWidget Updated

---
 .../AddAlarmHomeWidget.kt                     |  2 ++
 .../ultimate_alarm_clock/MainActivity.kt      | 15 ++++++---
 .../NextAlarmHomeWidget.kt                    | 28 +++++++++--------
 .../res/layout/next_alarm_home_widget.xml     |  2 ++
 .../controllers/splash_screen_controller.dart | 31 ++++++++++++++++---
 5 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/AddAlarmHomeWidget.kt b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/AddAlarmHomeWidget.kt
index 1f434822..ccd49281 100644
--- a/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/AddAlarmHomeWidget.kt
+++ b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/AddAlarmHomeWidget.kt
@@ -48,8 +48,10 @@ class AddAlarmHomeWidget : AppWidgetProvider() {
     ) {
         val views = RemoteViews(context.packageName, R.layout.add_alarm_home_widget)
 
+        // Intent to open the Add or Update Alarm screen
         val intent = Intent(context, MainActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+            putExtra("initialRoute", "/add-update-alarm")
         }
 
         val pendingIntent = PendingIntent.getActivity(
diff --git a/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/MainActivity.kt b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/MainActivity.kt
index 424c369f..27e74633 100644
--- a/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/MainActivity.kt
@@ -149,6 +149,15 @@ class MainActivity : FlutterActivity() {
                 result.notImplemented()
             }
         }
+
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "flutter/platform").setMethodCallHandler { call, result ->
+            if (call.method == "getInitialRoute") {
+                val initialRoute = intent.getStringExtra("initialRoute")
+                result.success(mapOf("initialRoute" to initialRoute))
+            } else {
+                result.notImplemented()
+            }
+        }
     }
 
 
@@ -306,7 +315,7 @@ class MainActivity : FlutterActivity() {
 
     // Update the rings_in home_widget in a loop of 1 minute
     private val handler = Handler(Looper.getMainLooper())
-    private val updateInterval: Long = 10000
+    private val updateInterval: Long = 60000
 
     private val updateWidgetRunnable = object : Runnable {
         override fun run() {
@@ -368,9 +377,7 @@ class MainActivity : FlutterActivity() {
         // If the alarm is for a specific future date
         if (alarmDate.after(now.time)) {
             val specificDateAlarm = Calendar.getInstance().apply {
-                set(Calendar.YEAR, alarmDate.year)
-                set(Calendar.MONTH, alarmDate.month)
-                set(Calendar.DATE, alarmDate.date)
+                time = alarmDate
                 set(Calendar.HOUR_OF_DAY, alarmTime.hours)
                 set(Calendar.MINUTE, alarmTime.minutes)
                 set(Calendar.SECOND, 0)
diff --git a/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/NextAlarmHomeWidget.kt b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/NextAlarmHomeWidget.kt
index e8f643ac..5f602b3a 100644
--- a/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/NextAlarmHomeWidget.kt
+++ b/android/app/src/main/kotlin/com/ccextractor/ultimate_alarm_clock/ultimate_alarm_clock/NextAlarmHomeWidget.kt
@@ -25,15 +25,17 @@ class NextAlarmHomeWidget : AppWidgetProvider() {
             val alarmTime = data.getString("alarm_time", "")
             val repeatDays = data.getString("alarm_repeat_days", "One Time")
             if (ringsIn == "No upcoming alarms!") {
-                views.setViewVisibility(R.id.repeat_days, View.GONE);
+                views.setViewVisibility(R.id.repeat_days, View.GONE)
+                views.setViewVisibility(R.id.rings_in, View.GONE)
                 views.setTextViewText(R.id.repeat_days, "")
                 views.setTextViewText(R.id.alarm_date_n_time, "No upcoming alarms!")
                 views.setTextViewText(R.id.rings_in, "")
             } else {
                 views.setViewVisibility(R.id.repeat_days, View.VISIBLE)
-                views.setTextViewText(R.id.rings_in, ringsIn)
+                views.setViewVisibility(R.id.rings_in, View.VISIBLE)
                 views.setTextViewText(R.id.repeat_days, repeatDays)
                 views.setTextViewText(R.id.alarm_date_n_time, alarmTime)
+                views.setTextViewText(R.id.rings_in, ringsIn)
             }
 
             // Handle feature icons visibility
@@ -54,17 +56,17 @@ class NextAlarmHomeWidget : AppWidgetProvider() {
             views.setViewVisibility(R.id.pedometer_icon, 
                 if (data.getBoolean("isPedometerEnabled", false)) View.VISIBLE else View.GONE)
 
-            // handling on tap of add-alarm button
-//            val intent = Intent(context, MainActivity::class.java).apply {
-//                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-//            }
-//            val pendingIntent = PendingIntent.getActivity(
-//                context,
-//                0,
-//                intent,
-//                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-//            )
-//            views.setOnClickPendingIntent(R.id.add_alarm_button_next_alarm_widget, pendingIntent)
+        //     // handling on tap of add-alarm button
+        //    val intent = Intent(context, MainActivity::class.java).apply {
+        //        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+        //    }
+        //    val pendingIntent = PendingIntent.getActivity(
+        //        context,
+        //        0,
+        //        intent,
+        //        PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        //    )
+        //    views.setOnClickPendingIntent(R.id.add_alarm_button_next_alarm_widget, pendingIntent)
             appWidgetManager.updateAppWidget(appWidgetId, views)
         }
     }
diff --git a/android/app/src/main/res/layout/next_alarm_home_widget.xml b/android/app/src/main/res/layout/next_alarm_home_widget.xml
index 77bd6d41..e688d5a6 100644
--- a/android/app/src/main/res/layout/next_alarm_home_widget.xml
+++ b/android/app/src/main/res/layout/next_alarm_home_widget.xml
@@ -40,6 +40,7 @@
             android:text="@string/next_alarm_repeat_days_and_label"
             android:textColor="#AFFC41"
             android:layout_marginBottom="5dp"
+            android:visibility="gone"
             android:textSize="14sp" />
 
         <TextView
@@ -64,6 +65,7 @@
             android:ellipsize="end"
             android:maxLines="1"
             android:text="@string/rings_in"
+            android:visibility="gone"
             android:textSize="14sp" />
 
         <LinearLayout
diff --git a/lib/app/modules/splashScreen/controllers/splash_screen_controller.dart b/lib/app/modules/splashScreen/controllers/splash_screen_controller.dart
index a9c95c81..d11bf32f 100644
--- a/lib/app/modules/splashScreen/controllers/splash_screen_controller.dart
+++ b/lib/app/modules/splashScreen/controllers/splash_screen_controller.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:get/get.dart';
@@ -99,6 +101,23 @@ class SplashScreenController extends GetxController {
   @override
   void onInit() async {
     super.onInit();
+    // Check for initialRoute from the intent when coming from home widgets
+    String? initialRoute;
+    if (Platform.isAndroid) {
+      final intent = await MethodChannel('flutter/platform').invokeMethod<Map>('getInitialRoute');
+      initialRoute = intent?['initialRoute'] as String?;
+    }
+    // For add alarm home screen widget
+    if (initialRoute != null && initialRoute == '/add-update-alarm') {
+      Get.offNamed('/bottom-navigation-bar');
+      Utils.hapticFeedback();
+      homeController.isProfile.value = false;
+      Get.toNamed(
+        '/add-update-alarm',
+        arguments: homeController.genFakeAlarmModel(),
+      );
+    }
+
     currentlyRingingAlarm.value = homeController.genFakeAlarmModel();
     alarmChannel.setMethodCallHandler((call) async {
       if (call.method == 'appStartup') {
@@ -170,10 +189,12 @@ class SplashScreenController extends GetxController {
       }
     });
     // Necessary when hot restarting
-    Future.delayed(const Duration(seconds: 0), () {
-      if (shouldNavigate == true) {
-        Get.offNamed('/bottom-navigation-bar');
-      }
-    });
+    if (initialRoute == null) {
+      Future.delayed(const Duration(seconds: 0), () {
+        if (shouldNavigate) {
+          Get.offNamed('/bottom-navigation-bar');
+        }
+      });
+    } 
   }
 }

From 14bd5a82cf3107bb2c379da4db5a8cc09305968b Mon Sep 17 00:00:00 2001
From: Gaurav Kushwaha <gaurav.family04@gmail.com>
Date: Sun, 27 Apr 2025 19:07:37 +0530
Subject: [PATCH 6/6] Updates

---
 .../controllers/splash_screen_controller.dart | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/app/modules/splashScreen/controllers/splash_screen_controller.dart b/lib/app/modules/splashScreen/controllers/splash_screen_controller.dart
index d11bf32f..e2638c44 100644
--- a/lib/app/modules/splashScreen/controllers/splash_screen_controller.dart
+++ b/lib/app/modules/splashScreen/controllers/splash_screen_controller.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
@@ -8,6 +9,7 @@ import 'package:ultimate_alarm_clock/app/data/models/user_model.dart';
 import 'package:ultimate_alarm_clock/app/data/providers/firestore_provider.dart';
 import 'package:ultimate_alarm_clock/app/data/providers/isar_provider.dart';
 import 'package:ultimate_alarm_clock/app/data/providers/secure_storage_provider.dart';
+import 'package:ultimate_alarm_clock/app/modules/bottomNavigationBar/controllers/bottom_navigation_bar_controller.dart';
 import 'package:ultimate_alarm_clock/app/utils/utils.dart';
 
 import '../../home/controllers/home_controller.dart';
@@ -109,13 +111,18 @@ class SplashScreenController extends GetxController {
     }
     // For add alarm home screen widget
     if (initialRoute != null && initialRoute == '/add-update-alarm') {
-      Get.offNamed('/bottom-navigation-bar');
-      Utils.hapticFeedback();
-      homeController.isProfile.value = false;
-      Get.toNamed(
-        '/add-update-alarm',
-        arguments: homeController.genFakeAlarmModel(),
-      );
+      Get.offAllNamed('/bottom-navigation-bar');
+
+      Timer(const Duration(milliseconds: 500), () {
+        HomeController homeController = Get.find<HomeController>();
+        Get.toNamed('/add-update-alarm', arguments: homeController.genFakeAlarmModel());
+        Utils.hapticFeedback();
+        homeController.isProfile.value = false;
+      });
+    } else {
+      if (shouldNavigate) {
+        Get.offNamed('/bottom-navigation-bar');
+      }
     }
 
     currentlyRingingAlarm.value = homeController.genFakeAlarmModel();