diff --git a/app/src/main/java/com/theayushyadav11/MessEase/MainActivity.kt b/app/src/main/java/com/theayushyadav11/MessEase/MainActivity.kt
index 6409800..aee33c1 100644
--- a/app/src/main/java/com/theayushyadav11/MessEase/MainActivity.kt
+++ b/app/src/main/java/com/theayushyadav11/MessEase/MainActivity.kt
@@ -71,7 +71,7 @@ class MainActivity : AppCompatActivity() {
 
     private val onDownloadComplete: BroadcastReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
-            Toast.makeText(context, "Download completed!", Toast.LENGTH_SHORT).show()
+            Toast.makeText(context, getString(R.string.download_completed), Toast.LENGTH_SHORT).show()
         }
     }
 
@@ -238,9 +238,9 @@ class MainActivity : AppCompatActivity() {
         } else {
             if (!isFinishing && !isDestroyed) {
                 mess.showAlertDialog(
-                    "Alert!",
-                    "You are not a member of Mess Committee!",
-                    "Ok",
+                    getString(R.string.alert),
+                    getString(R.string.not_mess_member),
+                    getString(R.string.ok),
                     ""
                 ) {}
             }
@@ -311,7 +311,7 @@ class MainActivity : AppCompatActivity() {
 
             mAuth.signOut()
             mGoogleSignInClient.signOut().addOnCompleteListener(this) {
-                Toast.makeText(this, "Logged out successfully", Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, getString(R.string.logged_out_successfully), Toast.LENGTH_SHORT).show()
             }
         } catch (e: Exception) {
             mess.log("Sign out error: ${e.message}")
@@ -358,14 +358,14 @@ class MainActivity : AppCompatActivity() {
             val intent = Intent(this@MainActivity, AlarmReceiver::class.java)
 
             val times = listOf(
-                mess.get("bt", "7:30"),
-                mess.get("lt", "12:0"),
-                mess.get("st", "16:30"),
-                mess.get("dt", "19:0")
+                mess.get(getString(R.string.bt),getString(R.string.b_time)),
+                mess.get(getString(R.string.lt),getString(R.string.l_time)),
+                mess.get(getString(R.string.st),getString(R.string.s_time)),
+                mess.get(getString(R.string.dt),getString(R.string.d_time))
             )
 
-            mess.log("Setting alarms: Breakfast ${times[0]}, Lunch ${times[1]}, " +
-                    "Snack ${times[2]}, Dinner ${times[3]}")
+            mess.log(String.format(
+                getString(R.string.setting_alarms_log), times[0], times[1], times[2], times[3]))
 
             for (i in times.indices) {
                 scheduleAlarm(i, times[i], intent)
diff --git a/app/src/main/res/layout/activity_edit_complete.xml b/app/src/main/res/layout/activity_edit_complete.xml
index 5fa601a..f0b635d 100644
--- a/app/src/main/res/layout/activity_edit_complete.xml
+++ b/app/src/main/res/layout/activity_edit_complete.xml
@@ -48,7 +48,7 @@
         android:layout_height="59dp"
         android:layout_marginHorizontal="25dp"
         android:drawableEnd="@drawable/baseline_file_download_24"
-        android:text="Download edited Menu"
+        android:text="@string/download_edited_menu"
         android:textColor="@color/white"
         app:cornerRadius="5dp"
         android:layout_marginVertical="15dp"
@@ -63,7 +63,7 @@
         android:layout_marginHorizontal="25dp"
         android:layout_marginBottom="45dp"
         android:drawableEnd="@drawable/baseline_send_24"
-        android:text="Send Menu for Approoval"
+        android:text="@string/menu_approval"
         android:textColor="@color/white"
         app:cornerRadius="5dp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/activity_menu.xml b/app/src/main/res/layout/activity_menu.xml
index aa069db..c45a3bc 100644
--- a/app/src/main/res/layout/activity_menu.xml
+++ b/app/src/main/res/layout/activity_menu.xml
@@ -16,7 +16,7 @@
         android:layout_width="80dp"
         android:layout_height="80dp"
         android:layout_margin="25dp"
-        android:text="Next"
+        android:text="@string/next"
         android:textColor="#ffffff"
         app:cornerRadius="25dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -78,7 +78,7 @@
                     android:background="#eff3ff"
 
                     android:gravity="center"
-                    android:text="Monday"
+                    android:text="@string/monday"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toEndOf="@id/menu"
@@ -94,7 +94,7 @@
                     android:background="#eff3ff"
 
                     android:gravity="center"
-                    android:text="Tuesday"
+                    android:text="@string/tuesday"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toEndOf="@id/monday"
@@ -110,7 +110,7 @@
                     android:background="#eff3ff"
 
                     android:gravity="center"
-                    android:text="Wednesday"
+                    android:text="@string/wednesday"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toEndOf="@id/tuesday"
@@ -142,7 +142,7 @@
                     android:background="#eff3ff"
                     android:gravity="center"
 
-                    android:text="Friday"
+                    android:text="@string/friday"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toEndOf="@id/thursday"
@@ -157,7 +157,7 @@
                     android:layout_margin="2dp"
                     android:background="#eff3ff"
                     android:gravity="center"
-                    android:text="Saturday"
+                    android:text="@string/saturday"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toEndOf="@id/friday"
@@ -173,7 +173,7 @@
                     android:layout_margin="2dp"
                     android:background="#eff3ff"
                     android:gravity="center"
-                    android:text="Sunday"
+                    android:text="@string/sunday"
                     android:textSize="20sp"
                     android:textStyle="bold"
 
@@ -189,7 +189,7 @@
                     android:layout_margin="2dp"
                     android:background="#eff3ff"
                     android:gravity="center"
-                    android:text="Breakfast"
+                    android:text="@string/meal_breakfast"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
@@ -294,7 +294,7 @@
                     android:layout_margin="2dp"
                     android:background="#eff3ff"
                     android:gravity="center"
-                    android:text="Lunch"
+                    android:text="@string/meal_lunch"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
@@ -505,7 +505,7 @@
                     android:layout_margin="2dp"
                     android:background="#eff3ff"
                     android:gravity="center"
-                    android:text="Dinner"
+                    android:text="@string/meal_dinner"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_payment.xml b/app/src/main/res/layout/activity_payment.xml
index 5a6cd0b..647ba11 100644
--- a/app/src/main/res/layout/activity_payment.xml
+++ b/app/src/main/res/layout/activity_payment.xml
@@ -33,7 +33,7 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:src="@drawable/history_svgrepo_com"
-            android:contentDescription="History"
+            android:contentDescription="@string/history"
             android:background="?android:attr/selectableItemBackground"
             android:layout_gravity="end|center_vertical"
             app:tint="@android:color/white"
@@ -48,7 +48,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="25dp"
         android:layout_marginBottom="0dp"
-        android:hint="Enter Amount in Rupees"
+        android:hint="@string/enter_amount"
         app:startIconDrawable="@drawable/baseline_currency_rupee_24"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
         tools:layout_editor_absoluteX="25dp">
@@ -67,7 +67,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="25dp"
-        android:hint="Enter Purpose"
+        android:hint="@string/enter_purpose"
         app:counterEnabled="true"
         app:counterMaxLength="25"
         app:layout_constraintTop_toBottomOf="@id/textInputLayout2"
@@ -104,7 +104,7 @@
         android:layout_marginHorizontal="25dp"
         android:layout_marginBottom="35dp"
         android:enabled="false"
-        android:text="Pay"
+        android:text="@string/pay"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_review.xml b/app/src/main/res/layout/activity_review.xml
index 75f8986..01ad6b8 100644
--- a/app/src/main/res/layout/activity_review.xml
+++ b/app/src/main/res/layout/activity_review.xml
@@ -69,14 +69,14 @@
                         android:layout_weight="1"
                         android:layout_marginEnd="8dp"
                         android:layout_height="wrap_content"
-                        android:hint="Day">
+                        android:hint="@string/day">
                         <AutoCompleteTextView
                             android:id="@+id/day"
                             android:textColor="@color/black"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="none"
-                            android:text="Monday" />
+                            android:text="@string/monday" />
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.textfield.TextInputLayout
@@ -85,7 +85,7 @@
                         android:layout_width="0dp"
                         android:layout_weight="1"
                         android:layout_height="wrap_content"
-                        android:hint="Meal Type">
+                        android:hint="@string/meal_type">
 
                         <AutoCompleteTextView
                             android:id="@+id/type"
@@ -93,7 +93,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="none"
-                            android:text="Breakfast" />
+                            android:text="@string/meal_breakfast" />
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 2400b41..5b1c155 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -305,7 +305,7 @@
                 android:layout_height="55dp"
                 android:layout_marginHorizontal="25dp"
                 android:layout_marginVertical="55dp"
-                android:text="Done"
+                android:text="@string/done"
                 app:cornerRadius="5dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/dinnerCard" />
diff --git a/app/src/main/res/layout/activity_show_menu.xml b/app/src/main/res/layout/activity_show_menu.xml
index 47dfe14..30040dd 100644
--- a/app/src/main/res/layout/activity_show_menu.xml
+++ b/app/src/main/res/layout/activity_show_menu.xml
@@ -16,7 +16,7 @@
         android:layout_width="80dp"
         android:layout_height="80dp"
         android:layout_margin="25dp"
-        android:text="Next"
+        android:text="@string/next"
         android:textColor="#ffffff"
         app:cornerRadius="25dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -78,7 +78,7 @@
                     android:background="#eff3ff"
 
                     android:gravity="center"
-                    android:text="Monday"
+                    android:text="@string/monday"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toEndOf="@id/menu"
@@ -94,7 +94,7 @@
                     android:background="#eff3ff"
 
                     android:gravity="center"
-                    android:text="Tuesday"
+                    android:text="@string/tuesday"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toEndOf="@id/monday"
@@ -110,7 +110,7 @@
                     android:background="#eff3ff"
 
                     android:gravity="center"
-                    android:text="Wednesday"
+                    android:text="@string/wednesday"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toEndOf="@id/tuesday"
@@ -142,7 +142,7 @@
                     android:background="#eff3ff"
                     android:gravity="center"
 
-                    android:text="Friday"
+                    android:text="@string/friday"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toEndOf="@id/thursday"
@@ -157,7 +157,7 @@
                     android:layout_margin="2dp"
                     android:background="#eff3ff"
                     android:gravity="center"
-                    android:text="Saturday"
+                    android:text="@string/saturday"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toEndOf="@id/friday"
@@ -173,7 +173,7 @@
                     android:layout_margin="2dp"
                     android:background="#eff3ff"
                     android:gravity="center"
-                    android:text="Sunday"
+                    android:text="@string/sunday"
                     android:textSize="20sp"
                     android:textStyle="bold"
 
@@ -189,7 +189,7 @@
                     android:layout_margin="2dp"
                     android:background="#eff3ff"
                     android:gravity="center"
-                    android:text="Breakfast"
+                    android:text="@string/meal_breakfast"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
@@ -294,7 +294,7 @@
                     android:layout_margin="2dp"
                     android:background="#eff3ff"
                     android:gravity="center"
-                    android:text="Lunch"
+                    android:text="@string/meal_lunch"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
@@ -505,7 +505,7 @@
                     android:layout_margin="2dp"
                     android:background="#eff3ff"
                     android:gravity="center"
-                    android:text="Dinner"
+                    android:text="@string/meal_dinner"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dateitem.xml b/app/src/main/res/layout/dateitem.xml
index b1a6219..b223aec 100644
--- a/app/src/main/res/layout/dateitem.xml
+++ b/app/src/main/res/layout/dateitem.xml
@@ -20,7 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="20dp"
             android:gravity="center"
-            android:text="Day"
+            android:text="@string/day"
             android:textColor="@color/food"
             android:textSize="10sp"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/edit_dialog.xml b/app/src/main/res/layout/edit_dialog.xml
index 11b8b3a..0267c9a 100644
--- a/app/src/main/res/layout/edit_dialog.xml
+++ b/app/src/main/res/layout/edit_dialog.xml
@@ -13,7 +13,7 @@
         android:layout_height="50dp"
         android:layout_margin="25dp"
         android:backgroundTint="#2196F3"
-        android:text="Done"
+        android:text="@string/done"
 
         app:cornerRadius="10dp"
 
diff --git a/app/src/main/res/layout/fragment_details.xml b/app/src/main/res/layout/fragment_details.xml
index c94d31c..9581090 100644
--- a/app/src/main/res/layout/fragment_details.xml
+++ b/app/src/main/res/layout/fragment_details.xml
@@ -151,7 +151,7 @@
             android:layout_height="50dp"
             android:layout_margin="25dp"
             android:backgroundTint="@color/food"
-            android:text="Done"
+            android:text="@string/done"
             android:textColor="@color/white"
             app:cornerRadius="5dp"
             app:layout_constraintTop_toBottomOf="@id/tilBatch" />
diff --git a/app/src/main/res/layout/fragment_edit_complete.xml b/app/src/main/res/layout/fragment_edit_complete.xml
index 28c1ce9..b018981 100644
--- a/app/src/main/res/layout/fragment_edit_complete.xml
+++ b/app/src/main/res/layout/fragment_edit_complete.xml
@@ -59,7 +59,7 @@
         android:layout_marginVertical="25dp"
         android:backgroundTint="@color/white"
         android:drawableEnd="@drawable/baseline_send_24"
-        android:text="Send Menu for Approoval"
+        android:text="@string/menu_approval"
         android:textColor="@color/food"
         app:cornerRadius="15dp"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c426486..08caefb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,6 +11,45 @@
     <string name="menu_slideshow">Slideshow</string>
     <string name="menu_know_our_team">Know our team\n</string>
     <string name="demolunch">Marry had a little lamb.</string>
+
+
+    <string name="meal_breakfast">Breakfast</string>
+    <string name="meal_lunch">Lunch</string>
+    <string name="meal_dinner">Dinner</string>
+    <string name="download_edited_menu">Download edited Menu</string>
+    <string name="menu_approval">Send Menu for Approval</string>
+    <string name="history">History</string>
+    <string name="enter_amount">Enter Amount in Rupees</string>
+    <string name="enter_purpose">Enter Purpose</string>
+    <string name="pay">Pay</string>
+    <string name="next">Next</string>
+    <string name="day">Day</string>
+    <string name="monday">Monday</string>
+    <string name="tuesday">Tuesday</string>
+    <string name="wednesday">Wednesday</string>
+    <string name="thursday">Thursday</string>
+    <string name="friday">Friday</string>
+    <string name="saturday">Saturday</string>
+    <string name="sunday">Sunday</string>
+    <string name="meal_type">Meal Type</string>
+    <string name="done">Done</string>
+
+    <!-- hardcoded strings from kotlin files -->
+    <string name="download_completed">Download completed!</string>
+    <string name="alert">Alert!</string>
+    <string name="not_mess_member">You are not a member of Mess Committee!</string>
+    <string name="ok">Ok</string>
+    <string name="logged_out_successfully">Logged out successfully</string>
+    <string name="bt" translatable="false">bt</string>
+    <string name="lt" translatable="false">lt</string>
+    <string name="st" translatable="false">st</string>
+    <string name="dt" translatable="false">dt</string>
+    <string name="b_time">7:30</string>
+    <string name="l_time">12:0</string>
+    <string name="s_time">16:30</string>
+    <string name="d_time">19:0</string>
+    <string name="setting_alarms_log">Setting alarms: Breakfast %s, Lunch %s, Snack %s, Dinner %s</string>
+
     <!-- TODO: Remove or change this placeholder text -->
     <string name="empty_field">This field cannot be empty!</string>
     <string name="select_year">Please Select a year</string>
@@ -19,11 +58,11 @@
     <string name="title_mess_menu">MessMenu.pdf</string>
     <string name="description_downloading_file">Downloading file</string>
     <string name="download_started">Download started</string>
-    <string name="mess_poll_id">pollId</string>
-    <string name="user_is_Logged_In">isLoggedIn</string>
+    <string name="mess_poll_id" translatable="false">pollId</string>
+    <string name="user_is_Logged_In" translatable="false">isLoggedIn</string>
     <string name="ayush_yadav">ayushyadav</string>
     <string name="suffix_iiitl.ac.in"><![CDATA[iiitl.ac.in]]></string>
-    <string name="user">user</string>
+    <string name="user" translatable="false">user</string>
     <string name="update">update</string>
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="razorpay_key">rzp_live_pEv2OERPEj1yaT</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7e7c76c..8f7747c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.6.1"
+agp = "8.13.2"
 androidMail = "1.6.7"
 anychartAndroid = "1.1.5"
 bom = "2.0.0-rc-1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f6d3f3a..9546baf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Aug 15 23:52:46 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists