From 5a43287b11aa26e78a39de79bac717359105e1b6 Mon Sep 17 00:00:00 2001
From: siddhigupta075 <siddhigupta075@gmail.com>
Date: Sat, 11 Apr 2026 04:37:41 +0530
Subject: [PATCH 1/6] feat: add per-meal notification toggle

---
 .../theayushyadav11/MessEase/MainActivity.kt  | 13 ++++++-
 .../MessEase/ui/more/SettingsActivity.kt      | 36 +++++++++++++++++++
 .../theayushyadav11/MessEase/utils/Mess.kt    |  8 +++++
 app/src/main/res/layout/activity_settings.xml | 32 +++++++++++++++++
 4 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/theayushyadav11/MessEase/MainActivity.kt b/app/src/main/java/com/theayushyadav11/MessEase/MainActivity.kt
index 6409800..5e4862d 100644
--- a/app/src/main/java/com/theayushyadav11/MessEase/MainActivity.kt
+++ b/app/src/main/java/com/theayushyadav11/MessEase/MainActivity.kt
@@ -367,8 +367,19 @@ class MainActivity : AppCompatActivity() {
             mess.log("Setting alarms: Breakfast ${times[0]}, Lunch ${times[1]}, " +
                     "Snack ${times[2]}, Dinner ${times[3]}")
 
+            val enabledStates = listOf(
+                mess.isMealEnabled("bt_enabled"),
+                mess.isMealEnabled("lt_enabled"),
+                mess.isMealEnabled("st_enabled"),
+                mess.isMealEnabled("dt_enabled")
+            )
+
             for (i in times.indices) {
-                scheduleAlarm(i, times[i], intent)
+                if (enabledStates[i]) {
+                    scheduleAlarm(i, times[i], intent)
+                } else {
+                    cancelAllAlarms(this, i)
+                }
             }
         } catch (e: Exception) {
             mess.log("Error setting alarms: ${e.message}")
diff --git a/app/src/main/java/com/theayushyadav11/MessEase/ui/more/SettingsActivity.kt b/app/src/main/java/com/theayushyadav11/MessEase/ui/more/SettingsActivity.kt
index 936c881..73f8252 100644
--- a/app/src/main/java/com/theayushyadav11/MessEase/ui/more/SettingsActivity.kt
+++ b/app/src/main/java/com/theayushyadav11/MessEase/ui/more/SettingsActivity.kt
@@ -3,7 +3,10 @@ package com.theayushyadav11.MessEase.ui.more
 import android.app.TimePickerDialog
 import android.graphics.Color
 import android.os.Bundle
+import android.widget.Switch
+import android.widget.TextView
 import android.widget.Toast
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import com.theayushyadav11.MessEase.databinding.ActivitySettingsBinding
@@ -14,6 +17,7 @@ class SettingsActivity : AppCompatActivity() {
     private lateinit var binding:ActivitySettingsBinding
     private lateinit var mess:Mess
     override fun onCreate(savedInstanceState: Bundle?) {
+
         super.onCreate(savedInstanceState)
        binding= ActivitySettingsBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -21,6 +25,10 @@ class SettingsActivity : AppCompatActivity() {
         setUpToolBar()
         initialise()
         listeners()
+        setupToggle("bt_enabled", binding.switchBreakfast, binding.timeb, binding.pickb)
+        setupToggle("lt_enabled", binding.switchLunch, binding.timel, binding.pickl)
+        setupToggle("st_enabled", binding.switchSnacks, binding.times, binding.picks)
+        setupToggle("dt_enabled", binding.switchDinner, binding.timed, binding.pickd)
 
     }
 
@@ -131,4 +139,32 @@ class SettingsActivity : AppCompatActivity() {
         val formattedTime = timeFormat.format(selectedTime.time)
         return formattedTime
     }
+    private fun setupToggle(
+        key: String,
+        switch: Switch,
+        timeView: TextView,
+        picker: View
+    ) {
+        val isEnabled = mess.isMealEnabled(key)
+        switch.isChecked = isEnabled
+
+        updateUIState(isEnabled, timeView, picker)
+
+        switch.setOnCheckedChangeListener { _, checked ->
+            mess.setMealEnabled(key, checked)
+            updateUIState(checked, timeView, picker)
+        }
+    }
+
+    private fun updateUIState(
+        isEnabled: Boolean,
+        timeView: TextView,
+        picker: View
+    ) {
+        timeView.alpha = if (isEnabled) 1f else 0.4f
+        picker.isEnabled = isEnabled
+    }
+
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/theayushyadav11/MessEase/utils/Mess.kt b/app/src/main/java/com/theayushyadav11/MessEase/utils/Mess.kt
index 712c96d..f6942a4 100644
--- a/app/src/main/java/com/theayushyadav11/MessEase/utils/Mess.kt
+++ b/app/src/main/java/com/theayushyadav11/MessEase/utils/Mess.kt
@@ -587,6 +587,14 @@ class Mess(context: Context) {
        return get("isSkipped","false").toBoolean()
     }
 
+    fun setMealEnabled(key: String, value: Boolean) {
+        sharedPreferences.edit().putBoolean(key, value).apply()
+    }
+
+    fun isMealEnabled(key: String): Boolean {
+        return sharedPreferences.getBoolean(key, true)
+    }
+
 }
 
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 2400b41..2e3150b 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -75,6 +75,14 @@
                         android:textStyle="bold"
                         app:layout_constraintStart_toEndOf="@id/v"
                         app:layout_constraintTop_toTopOf="parent" />
+                    <Switch
+                        android:id="@+id/switchBreakfast"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintEnd_toStartOf="@id/pickb"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        android:layout_marginEnd="8dp"/>
 
                     <TextView
                         android:id="@+id/timeb"
@@ -137,6 +145,14 @@
                         android:textStyle="bold"
                         app:layout_constraintStart_toEndOf="@id/v2"
                         app:layout_constraintTop_toTopOf="parent" />
+                    <Switch
+                        android:id="@+id/switchLunch"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintEnd_toStartOf="@id/pickl"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        android:layout_marginEnd="8dp"/>
 
                     <TextView
                         android:id="@+id/timel"
@@ -201,6 +217,14 @@
                         android:textStyle="bold"
                         app:layout_constraintStart_toEndOf="@id/v3"
                         app:layout_constraintTop_toTopOf="parent" />
+                    <Switch
+                        android:id="@+id/switchSnacks"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintEnd_toStartOf="@id/picks"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        android:layout_marginEnd="8dp"/>
 
                     <TextView
                         android:id="@+id/times"
@@ -267,6 +291,14 @@
                         android:textStyle="bold"
                         app:layout_constraintStart_toEndOf="@id/v5"
                         app:layout_constraintTop_toTopOf="parent" />
+                    <Switch
+                        android:id="@+id/switchDinner"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintEnd_toStartOf="@id/pickd"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        android:layout_marginEnd="8dp"/>
 
                     <TextView
                         android:id="@+id/timed"

From 0b96f079d9f086da837d5ef668be1c6e6441c4e3 Mon Sep 17 00:00:00 2001
From: siddhigupta075 <siddhigupta075@gmail.com>
Date: Sat, 11 Apr 2026 04:59:00 +0530
Subject: [PATCH 2/6] reduce the opacity of alarm icon when toggle is off

---
 .../com/theayushyadav11/MessEase/ui/more/SettingsActivity.kt     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/theayushyadav11/MessEase/ui/more/SettingsActivity.kt b/app/src/main/java/com/theayushyadav11/MessEase/ui/more/SettingsActivity.kt
index 73f8252..6c00e7a 100644
--- a/app/src/main/java/com/theayushyadav11/MessEase/ui/more/SettingsActivity.kt
+++ b/app/src/main/java/com/theayushyadav11/MessEase/ui/more/SettingsActivity.kt
@@ -162,6 +162,7 @@ class SettingsActivity : AppCompatActivity() {
         picker: View
     ) {
         timeView.alpha = if (isEnabled) 1f else 0.4f
+        picker.alpha = if (isEnabled) 1f else 0.4f
         picker.isEnabled = isEnabled
     }
 

From 00684c764c6a03bd17e2f7c527dc023f0f79d424 Mon Sep 17 00:00:00 2001
From: siddhigupta075 <siddhigupta075@gmail.com>
Date: Sat, 11 Apr 2026 17:09:08 +0530
Subject: [PATCH 3/6] fix: resolve alarm scheduling, data overwrite and state
 inconsistency issues

---
 .../theayushyadav11/MessEase/MainActivity.kt  |  7 ++++--
 .../MessEase/ui/more/SettingsActivity.kt      | 23 ++++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/theayushyadav11/MessEase/MainActivity.kt b/app/src/main/java/com/theayushyadav11/MessEase/MainActivity.kt
index 5e4862d..99a9a60 100644
--- a/app/src/main/java/com/theayushyadav11/MessEase/MainActivity.kt
+++ b/app/src/main/java/com/theayushyadav11/MessEase/MainActivity.kt
@@ -374,11 +374,14 @@ class MainActivity : AppCompatActivity() {
                 mess.isMealEnabled("dt_enabled")
             )
 
+            for (i in times.indices) {
+                cancelAllAlarms(this, i)
+            }
+
+
             for (i in times.indices) {
                 if (enabledStates[i]) {
                     scheduleAlarm(i, times[i], intent)
-                } else {
-                    cancelAllAlarms(this, i)
                 }
             }
         } catch (e: Exception) {
diff --git a/app/src/main/java/com/theayushyadav11/MessEase/ui/more/SettingsActivity.kt b/app/src/main/java/com/theayushyadav11/MessEase/ui/more/SettingsActivity.kt
index 6c00e7a..68a2887 100644
--- a/app/src/main/java/com/theayushyadav11/MessEase/ui/more/SettingsActivity.kt
+++ b/app/src/main/java/com/theayushyadav11/MessEase/ui/more/SettingsActivity.kt
@@ -16,6 +16,9 @@ import java.util.Calendar
 class SettingsActivity : AppCompatActivity() {
     private lateinit var binding:ActivitySettingsBinding
     private lateinit var mess:Mess
+
+    private val tempStates = mutableMapOf<String, Boolean>()
+
     override fun onCreate(savedInstanceState: Bundle?) {
 
         super.onCreate(savedInstanceState)
@@ -29,6 +32,10 @@ class SettingsActivity : AppCompatActivity() {
         setupToggle("lt_enabled", binding.switchLunch, binding.timel, binding.pickl)
         setupToggle("st_enabled", binding.switchSnacks, binding.times, binding.picks)
         setupToggle("dt_enabled", binding.switchDinner, binding.timed, binding.pickd)
+        tempStates["bt_enabled"] = mess.isMealEnabled("bt_enabled")
+        tempStates["lt_enabled"] = mess.isMealEnabled("lt_enabled")
+        tempStates["st_enabled"] = mess.isMealEnabled("st_enabled")
+        tempStates["dt_enabled"] = mess.isMealEnabled("dt_enabled")
 
     }
 
@@ -42,7 +49,12 @@ class SettingsActivity : AppCompatActivity() {
 
     fun listeners()
     {
-        val b= mutableListOf("07:30","12:0","16:30","19:0")
+        val b = mutableListOf(
+            mess.get("bt","7:30"),
+            mess.get("lt","12:0"),
+            mess.get("st","16:30"),
+            mess.get("dt","19:0")
+        )
         binding.pickb.setOnClickListener{
             showTimePicker(0, 0, 10, 0) {it,p->
                 binding.timeb.text = it
@@ -75,8 +87,13 @@ class SettingsActivity : AppCompatActivity() {
             mess.save("st",b[2])
             mess.save("dt",b[3])
             mess.log(b)
-            mess.toast("Timings Updated")
             //cancelAllAlarms(this@SettingsActivity)
+            mess.setMealEnabled("bt_enabled", tempStates["bt_enabled"]!!)
+            mess.setMealEnabled("lt_enabled", tempStates["lt_enabled"]!!)
+            mess.setMealEnabled("st_enabled", tempStates["st_enabled"]!!)
+            mess.setMealEnabled("dt_enabled", tempStates["dt_enabled"]!!)
+
+            mess.toast("Settings Updated")
             finish()
         }
 
@@ -151,7 +168,7 @@ class SettingsActivity : AppCompatActivity() {
         updateUIState(isEnabled, timeView, picker)
 
         switch.setOnCheckedChangeListener { _, checked ->
-            mess.setMealEnabled(key, checked)
+            tempStates[key] = checked
             updateUIState(checked, timeView, picker)
         }
     }

From 1f9743d9ec003182363e91763192fd44d8573a76 Mon Sep 17 00:00:00 2001
From: siddhigupta075 <siddhigupta075@gmail.com>
Date: Sat, 11 Apr 2026 22:49:48 +0530
Subject: [PATCH 4/6] Apply the Dark/Light theme in the Write Review section

---
 app/src/main/AndroidManifest.xml            |  2 +-
 app/src/main/res/layout/fragment_review.xml |  7 +++++--
 app/src/main/res/values-night/colors.xml    | 12 +++++++++++-
 app/src/main/res/values-night/themes.xml    | 20 ++++++++++++++------
 app/src/main/res/values/colors.xml          | 11 ++++++++++-
 app/src/main/res/values/themes.xml          | 20 +++++++++++++++-----
 6 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8785958..9a1d43b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,7 +46,7 @@
         <activity
             android:name=".ui.splash.fragments.LoginAndSignUpActivity"
             android:exported="false"
-            android:theme="@style/Theme.Material3.Light.NoActionBar"
+            android:theme="@style/Theme.MyApplication"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.more.ReviewActivity"
diff --git a/app/src/main/res/layout/fragment_review.xml b/app/src/main/res/layout/fragment_review.xml
index 5500b2a..2007c83 100644
--- a/app/src/main/res/layout/fragment_review.xml
+++ b/app/src/main/res/layout/fragment_review.xml
@@ -5,14 +5,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg"
+    android:background="?attr/colorPrimary"
     tools:context=".ui.MessCommittee.fragments.ReviewFragment">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
+        android:elevation="4dp"
         android:layout_width="match_parent"
         android:layout_height="59dp"
-        app:titleTextColor="@color/white"
+        app:titleTextColor="?attr/colorOnPrimary"
         android:background="@color/food"
         android:title="Upload Menu"
         android:paddingBottom="5dp"
@@ -29,6 +30,7 @@
         android:layout_height="match_parent"
         android:gravity="center"
         android:text="No Reviews."
+        android:textColor="?attr/colorOnBackground"
 
         android:textSize="30sp"
         android:textStyle="bold"
@@ -40,6 +42,7 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv"
         android:layout_width="match_parent"
+        android:background="?attr/colorSurface"
         android:layout_height="0dp"
         android:padding="20dp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 6185a5c..eb8bfbe 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -12,8 +12,18 @@
     <color name="food">#1972f0</color>
     <color name="medium">#82B5FE</color>
     <color name="grey">#cfd8df</color>
-    <color name="bg">#2E2D2D</color>
     <color name="nav_black">#131313</color>
     <color name="nav_element">#a0a0a2</color>
+    <color name="primary">#3B82F6</color>
+    <color name="primary_variant">#1E3A8A</color>
+    <color name="accent">#FBBF24</color>
+    <color name="accent_soft">#78350F</color>
+    <color name="bg">#0F172A</color>
+    <color name="surface">#1E293B</color>
+    <color name="text_primary">#F9FAFB</color>
+    <color name="text_secondary">#94A3B8</color>
+    <color name="divider">#334155</color>
+    <color name="error">#F87171</color>
+
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 139254d..fb8bb82 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,16 +1,24 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Theme.Messease" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Theme.MyApplication" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/food</item>
-        <item name="colorOnPrimary">@color/white</item>
+
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/white</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor">@color/food</item>
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryVariant">@color/primary_variant</item>
+        <item name="colorOnPrimary">@color/white</item>
+
+        <item name="colorSecondary">@color/accent</item>
+        <item name="colorOnSecondary">@color/black</item>
+
+        <item name="android:colorBackground">@color/bg</item>
+        <item name="colorSurface">@color/surface</item>
+
+        <item name="colorOnBackground">@color/text_primary</item>
+        <item name="colorOnSurface">@color/text_primary</item>
         <!-- Customize your theme here. -->
     </style>
     <style name="Theme.Messease.AppBarOverlay" parent="Theme.MaterialComponents.DayNight.NoActionBar" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a8b0053..7ca2231 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -12,10 +12,19 @@
     <color name="food">#1972f0</color>
     <color name="medium">#82B5FE</color>
     <color name="grey">#cfd8df</color>
-    <color name="bg">#FFFFFF</color>
     <color name="red">#CC3E44</color>
     <color name="nav_black">#FFFFFF</color>
     <color name="nav_element">#000000</color>
     <color name="gold">#ba8e43</color>
     <color name="light_gold">#f5eba3</color>
+    <color name="primary">#2563EB</color>
+    <color name="primary_variant">#1E40AF</color>
+    <color name="accent">#F59E0B</color>
+    <color name="accent_soft">#FEF3C7</color>
+    <color name="bg">#F9FAFB</color>
+    <color name="surface">#FFFFFF</color>
+    <color name="text_primary">#111827</color>
+    <color name="text_secondary">#6B7280</color>
+    <color name="divider">#E5E7EB</color>
+    <color name="error">#DC2626</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 36c360d..53edde7 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,15 +1,25 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Theme.MyApplication" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Theme.MyApplication" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/food</item>
         <item name="android:statusBarColor">@color/food</item>
-        <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/food</item>
         <item name="colorSecondaryVariant">@color/white</item>
-        <item name="colorOnSecondary">@color/white</item>
         <!-- Status bar color. -->
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryVariant">@color/primary_variant</item>
+        <item name="colorOnPrimary">@color/white</item>
+
+        <item name="colorSecondary">@color/accent</item>
+        <item name="colorOnSecondary">@color/black</item>
+
+        <item name="android:colorBackground">@color/bg</item>
+        <item name="colorSurface">@color/surface</item>
+
+        <item name="colorOnBackground">@color/text_primary</item>
+        <item name="colorOnSurface">@color/text_primary</item>
+
+
 
 
     </style>

From 153eb68e7816746f82fafa7d588a66bb5611ba85 Mon Sep 17 00:00:00 2001
From: siddhigupta075 <siddhigupta075@gmail.com>
Date: Sat, 11 Apr 2026 23:22:58 +0530
Subject: [PATCH 5/6] fix: wrong change

---
 app/src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9a1d43b..8785958 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,7 +46,7 @@
         <activity
             android:name=".ui.splash.fragments.LoginAndSignUpActivity"
             android:exported="false"
-            android:theme="@style/Theme.MyApplication"
+            android:theme="@style/Theme.Material3.Light.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.more.ReviewActivity"

From 2cac09eb3a3e56ea3e476f96ddcec1c56aa4741c Mon Sep 17 00:00:00 2001
From: siddhigupta075 <siddhigupta075@gmail.com>
Date: Sat, 11 Apr 2026 23:46:53 +0530
Subject: [PATCH 6/6] fix: parent theme of night\themes.xml

---
 app/src/main/res/values-night/themes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index fb8bb82..46bffb0 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Theme.MyApplication" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Theme.MyApplication" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
 
         <!-- Secondary brand color. -->