From 2912ebecf58052db2e2a1b4b4275688a59eaeb8e Mon Sep 17 00:00:00 2001
From: Debojit Mitra <debojit16mitra@gmail.com>
Date: Sun, 15 Dec 2024 00:54:03 +0530
Subject: [PATCH] v1.0.2

---
 .idea/deploymentTargetSelector.xml            |   4 +-
 app/build.gradle.kts                          |   2 +-
 .../com/bunny/ml/smartchef/MainActivity.java  | 106 +++++-----
 .../smartchef/activities/AIChatActivity.java  |  34 +++-
 .../smartchef/activities/ProfileActivity.java |  85 +++++++-
 .../ml/smartchef/adapters/ChatAdapter.java    |  77 +++++++-
 .../ml/smartchef/firebase/ChatRepository.java |   2 +-
 .../ml/smartchef/firebase/ProfileManager.java |  22 +++
 .../bunny/ml/smartchef/utils/AppUpdater.java  |  23 +++
 .../utils/CookingMotivationManager.java       | 183 ++++++++++++++++++
 .../ml/smartchef/websocket/ChatWebSocket.java |   6 +-
 .../main/res/layout/dialog_custom_alert.xml   |   1 +
 app/src/main/res/layout/item_chat_typing.xml  |  30 ++-
 app/src/main/res/values/strings.xml           |   1 +
 14 files changed, 490 insertions(+), 86 deletions(-)
 create mode 100644 app/src/main/java/com/bunny/ml/smartchef/utils/CookingMotivationManager.java

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 2063808..9f405fc 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-12-12T18:12:09.341723300Z">
+        <DropdownSelection timestamp="2024-12-14T16:55:24.927609400Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\Deboj\.android\avd\Pixel_9_Pro_API_35.avd" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=RZCW82DMBWM" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ea5855f..6e3a188 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -20,7 +20,7 @@ android {
         minSdk = 30
         targetSdk = 35
         versionCode = 1
-        versionName = "1.0.1"
+        versionName = "1.0.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/java/com/bunny/ml/smartchef/MainActivity.java b/app/src/main/java/com/bunny/ml/smartchef/MainActivity.java
index c884c85..9d102cc 100644
--- a/app/src/main/java/com/bunny/ml/smartchef/MainActivity.java
+++ b/app/src/main/java/com/bunny/ml/smartchef/MainActivity.java
@@ -3,12 +3,12 @@
 import static com.bunny.ml.smartchef.activities.SettingsActivity.UPDATE_CHECK_INTERVAL;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -21,6 +21,7 @@
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.work.ExistingPeriodicWorkPolicy;
 
 import com.airbnb.lottie.LottieAnimationView;
 import com.bunny.ml.smartchef.activities.AIChatActivity;
@@ -33,12 +34,12 @@
 import com.bunny.ml.smartchef.firebase.ProfileManager;
 import com.bunny.ml.smartchef.models.Chat;
 import com.bunny.ml.smartchef.utils.AppUpdater;
+import com.bunny.ml.smartchef.utils.CookingMotivationManager;
 import com.bunny.ml.smartchef.utils.CustomAlertDialog;
 import com.bunny.ml.smartchef.utils.PermissionManager;
 import com.bunny.ml.smartchef.utils.SwipeCallback;
 import com.bunny.ml.smartchef.utils.UpdateWorker;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
-import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.firestore.FirebaseFirestoreException;
 
 import java.util.Objects;
@@ -47,12 +48,10 @@
 
 public class MainActivity extends AppCompatActivity implements ProfileActivity.MainActivityCallback {
 
+    private static final String TAG = "MainActivity";
     private static final int NOTIFICATION_PERMISSION_CODE = 100;
-    private FirebaseAuth auth;
     private ProfileManager profileManager;
     private CircleImageView profile_image;
-    private TextView hello_user_textview;
-    private LinearLayout layout_try_model_btn, layout_chat_btn;
     private LottieAnimationView animationView;
     private TextView history_textview;
     private RecyclerView chatHistoryRecyclerView;
@@ -67,8 +66,6 @@ protected void onCreate(Bundle savedInstanceState) {
         EdgeToEdge.enable(this);
         setContentView(R.layout.activity_main);
 
-        auth = FirebaseAuth.getInstance();
-
         // Initialize views and base functionality
         initializeViews();
         setProfileImage();
@@ -83,7 +80,7 @@ protected void onCreate(Bundle savedInstanceState) {
         // Check if opened from notification
         if (getIntent().getBooleanExtra("show_update", false)) {
             appUpdater.checkForUpdatesFromNotification();
-        }  else {
+        } else {
             // Always check for updates when app opens
             appUpdater.checkForUpdates(false);
         }
@@ -100,10 +97,10 @@ protected void onCreate(Bundle savedInstanceState) {
     private void initializeViews() {
         profile_image = findViewById(R.id.profile_image);
         profileManager = ProfileManager.getInstance(MainActivity.this);
-        hello_user_textview = findViewById(R.id.hello_user_textview);
+        TextView hello_user_textview = findViewById(R.id.hello_user_textview);
         history_textview = findViewById(R.id.history_textview);
-        layout_try_model_btn = findViewById(R.id.layout_try_model_btn);
-        layout_chat_btn = findViewById(R.id.layout_chat_btn);
+        LinearLayout layout_try_model_btn = findViewById(R.id.layout_try_model_btn);
+        LinearLayout layout_chat_btn = findViewById(R.id.layout_chat_btn);
         animationView = findViewById(R.id.animationView);
 
         profile_image.setOnClickListener(view12 -> setUpBottomSheet());
@@ -120,22 +117,16 @@ private void initializeViews() {
 
         setupSwipeDelete();
 
-        layout_try_model_btn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(MainActivity.this, TryModelActivity.class);
-                startActivity(intent);
-                overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
-            }
+        layout_try_model_btn.setOnClickListener(view -> {
+            Intent intent = new Intent(MainActivity.this, TryModelActivity.class);
+            startActivity(intent);
+            overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
         });
 
-        layout_chat_btn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(MainActivity.this, AIChatActivity.class);
-                startActivity(intent);
-                overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
-            }
+        layout_chat_btn.setOnClickListener(view -> {
+            Intent intent = new Intent(MainActivity.this, AIChatActivity.class);
+            startActivity(intent);
+            overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
         });
 
         new Handler(Looper.getMainLooper()).postDelayed(() -> animationView.playAnimation(), 500);
@@ -151,24 +142,23 @@ private void checkNotificationPermission() {
     }
 
     private void showNotificationPermissionDialog() {
-        new Handler(Looper.getMainLooper()).postDelayed(() -> {
-            new CustomAlertDialog(MainActivity.this)
-                    .setDialogTitle("Notification Permission")
-                    .setMessage("SmartChef needs notification permission for two reasons:\n\n1. For sending cooking motivations.\n2. To keep you updated with the latest app versions.\n\nWould you like to enable notifications?")
-                    .setPositiveButton("Enable", () -> {
-                        PermissionManager.setNotificationPermissionAsked(this, true);
-                        requestNotificationPermission();
-                    })
-                    .setNegativeButton("No Thanks", () -> {
-                        PermissionManager.setNotificationPermissionAsked(this, true);
-                        PermissionManager.setNotificationPermissionDenied(this, true);
-                        PermissionManager.setAutoUpdateEnabled(MainActivity.this, false);
-                        // Cancel any scheduled update checks
-                        androidx.work.WorkManager.getInstance(MainActivity.this)
-                                .cancelUniqueWork("update_check");
-                    })
-                    .show();
-        }, 500);
+        new Handler(Looper.getMainLooper()).postDelayed(() -> new CustomAlertDialog(MainActivity.this)
+                .setDialogTitle("Notification Permission")
+                .setMessage("SmartChef needs notification permission for two reasons:\n\n1. For sending cooking motivations.\n2. To keep you updated with the latest app versions.\n\nWould you like to enable notifications?")
+                .setPositiveButton("Enable", () -> {
+                    PermissionManager.setNotificationPermissionAsked(this, true);
+                    requestNotificationPermission();
+                })
+                .setNegativeButton("No Thanks", () -> {
+                    turnOffMotivation();
+                    PermissionManager.setNotificationPermissionAsked(this, true);
+                    PermissionManager.setNotificationPermissionDenied(this, true);
+                    PermissionManager.setAutoUpdateEnabled(MainActivity.this, false);
+                    // Cancel any scheduled update checks
+                    androidx.work.WorkManager.getInstance(MainActivity.this)
+                            .cancelUniqueWork("update_check");
+                })
+                .show(), 500);
     }
 
     private void requestNotificationPermission() {
@@ -187,6 +177,10 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
         if (requestCode == NOTIFICATION_PERMISSION_CODE) {
             if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                 // Permission granted
+                if (profileManager.getCookingMotivation()){
+                    CookingMotivationManager cookingMotivationManager = new CookingMotivationManager(this);
+                    cookingMotivationManager.scheduleDailyMotivation();
+                }
                 PermissionManager.setNotificationPermissionDenied(this, false);
                 PermissionManager.setAutoUpdateEnabled(this, true);
                 if (appUpdater != null) {
@@ -194,12 +188,24 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
                 }
             } else {
                 // Permission denied
+                turnOffMotivation();
                 PermissionManager.setNotificationPermissionDenied(this, true);
                 PermissionManager.setAutoUpdateEnabled(this, false);
             }
         }
     }
 
+    private void turnOffMotivation() {
+        if (profileManager.getCookingMotivation()){
+            profileManager.setCookingMotivation(false, new ProfileManager.BaseCallback() {
+                @Override
+                public void onFailure(String error) {
+                    Log.e(TAG, error);
+                }
+            });
+        }
+    }
+
     private void scheduleUpdateChecks() {
         androidx.work.PeriodicWorkRequest updateWorkRequest =
                 new androidx.work.PeriodicWorkRequest.Builder(
@@ -212,7 +218,7 @@ private void scheduleUpdateChecks() {
         androidx.work.WorkManager.getInstance(this)
                 .enqueueUniquePeriodicWork(
                         "update_check",
-                        androidx.work.ExistingPeriodicWorkPolicy.REPLACE,
+                        ExistingPeriodicWorkPolicy.REPLACE,
                         updateWorkRequest
                 );
     }
@@ -325,7 +331,7 @@ public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction)
                     // Delete chat
                     CustomAlertDialog dialog = new CustomAlertDialog(MainActivity.this);
                     dialog.setIcon(Objects.requireNonNull(ContextCompat.getDrawable(MainActivity.this, R.drawable.ic_round_delete)))
-                            .setIconTint(ContextCompat.getColor(MainActivity.this, R.color.delete))
+                            .setIconTint(ContextCompat.getColor(MainActivity.this, R.color.mode_inverse))
                             .setMessage("Are you sure you want to delete this chat?")
                             .setPositiveButton("Yes", () -> {
                                 chatRepository.deleteChat(currentChat.getDocumentId());
@@ -339,8 +345,6 @@ public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction)
                             .show();
 
                 } else if (direction == ItemTouchHelper.RIGHT) {
-                    boolean newStarredState = !currentChat.isStarred();
-
                     if (currentChat.isStarred()) {
                         // Show confirmation dialog for unstarring
                         CustomAlertDialog dialog = new CustomAlertDialog(MainActivity.this);
@@ -400,6 +404,14 @@ protected boolean shouldUseAlternateIcon(RecyclerView.ViewHolder viewHolder) {
         new ItemTouchHelper(swipeCallback).attachToRecyclerView(chatHistoryRecyclerView);
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == AppUpdater.REQUEST_INSTALL_PACKAGES) {
+            appUpdater.onActivityResult(requestCode, resultCode);
+        }
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/bunny/ml/smartchef/activities/AIChatActivity.java b/app/src/main/java/com/bunny/ml/smartchef/activities/AIChatActivity.java
index 3a7b850..86a153a 100644
--- a/app/src/main/java/com/bunny/ml/smartchef/activities/AIChatActivity.java
+++ b/app/src/main/java/com/bunny/ml/smartchef/activities/AIChatActivity.java
@@ -55,6 +55,7 @@ public class AIChatActivity extends AppCompatActivity implements ChatWebSocket.C
     private FirebaseAuth firebaseAuth;
     private boolean hasOldMessages = false;
     private boolean isServerConnected = false;
+    private boolean isMessagePending = false;
 
     //pagination
     private DocumentSnapshot lastVisibleMessage;
@@ -102,8 +103,6 @@ private void initializeViews() {
 
         backBtn.setOnClickListener(v -> handleBack());
 
-        sendButton.setOnClickListener(v -> sendMessage());
-
         setupSuggestionAdapter();
 
         // Add keyboard visibility listener
@@ -122,14 +121,16 @@ private void initializeViews() {
         });
 
         sendButton.setOnClickListener(v -> {
+            String messageText = messageInput.getText().toString().trim();
+            if (TextUtils.isEmpty(messageText)) return;
             if (isServerConnected) {
-                sendMessage();
+                sendMessage(messageText);
             } else {
                 // Attempt to reconnect
                 if (chatWebSocket != null) {
                     chatWebSocket.connect();
                 }
-
+                isMessagePending = true;
                 // Show toast to inform user
                 Toast.makeText(this, "Connecting to server...", Toast.LENGTH_SHORT).show();
                 return;
@@ -148,10 +149,11 @@ private void setupSuggestionAdapter() {
             messageInput.setText(suggestion);
 
             if (isServerConnected) {
-                sendMessage();
+                sendMessage(suggestion);
                 layoutSuggestions.setVisibility(View.GONE);
             } else {
                 // Show connection toast and attempt to reconnect
+                isMessagePending = true;
                 Toast.makeText(this, getString(R.string.connecting_to_server), Toast.LENGTH_SHORT).show();
                 if (chatWebSocket != null) {
                     chatWebSocket.connect();
@@ -315,9 +317,7 @@ private void loadMessages() {
         }
     }
 
-    private void sendMessage() {
-        String messageText = messageInput.getText().toString().trim();
-        if (TextUtils.isEmpty(messageText)) return;
+    private void sendMessage(String messageText) {
 
         if (layout_greet_user.getVisibility() == View.VISIBLE) {
             layout_greet_user.setVisibility(View.GONE);
@@ -337,7 +337,14 @@ private void sendMessage() {
         );
 
         chatAdapter.addMessage(userMessage);
-        scrollToBottom();
+        new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                chatAdapter.showTyping(true);
+                scrollToBottom();
+            }
+        }, 400);
+
 
         // Save message to Firebase
         chatRepository.saveMessage(userMessage);
@@ -351,12 +358,20 @@ private void sendMessage() {
     // WebSocket callback implementations
     @Override
     public void onConnected() {
+        if (isMessagePending){
+            String messageText = messageInput.getText().toString().trim();
+            if (!TextUtils.isEmpty(messageText)){
+                sendMessage(messageText);
+            }
+            isMessagePending = false;
+        }
         isServerConnected = true;
     }
 
     @Override
     public void onMessageReceived(String content) {
         runOnUiThread(() -> {
+            chatAdapter.showTyping(false);
             if (currentAiMessage == null) {
                 currentAiMessage = new ChatMessage(
                         content,
@@ -401,6 +416,7 @@ public void onError(String error) {
         Log.e(TAG, error);
 
         runOnUiThread(() -> {
+            chatAdapter.showTyping(false);
             // Only show error if user was actively trying to send a message
             if (!messageInput.isEnabled()) {
                 messageInput.setEnabled(true);
diff --git a/app/src/main/java/com/bunny/ml/smartchef/activities/ProfileActivity.java b/app/src/main/java/com/bunny/ml/smartchef/activities/ProfileActivity.java
index 0eadc72..089de8b 100644
--- a/app/src/main/java/com/bunny/ml/smartchef/activities/ProfileActivity.java
+++ b/app/src/main/java/com/bunny/ml/smartchef/activities/ProfileActivity.java
@@ -1,9 +1,13 @@
 package com.bunny.ml.smartchef.activities;
 
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.res.ColorStateList;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -22,15 +26,17 @@
 import androidx.activity.OnBackPressedCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 
-import com.bunny.ml.smartchef.MainActivity;
 import com.bunny.ml.smartchef.R;
 import com.bunny.ml.smartchef.firebase.ProfileManager;
 import com.bunny.ml.smartchef.models.UserData;
+import com.bunny.ml.smartchef.utils.CookingMotivationManager;
 import com.bunny.ml.smartchef.utils.CustomAlertDialog;
 import com.bunny.ml.smartchef.utils.LoadingDialog;
+import com.bunny.ml.smartchef.utils.PermissionManager;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.chip.Chip;
 import com.google.android.material.chip.ChipGroup;
@@ -56,6 +62,7 @@
 
 public class ProfileActivity extends AppCompatActivity {
     private static final String TAG = "ProfileActivity";
+    private static final int NOTIFICATION_PERMISSION_CODE = 100;
     private CircleImageView profileImage;
     private TextInputEditText nameEditText, conditionsEditText;
     private MaterialAutoCompleteTextView dobEditText;
@@ -80,6 +87,7 @@ public class ProfileActivity extends AppCompatActivity {
     private UserData originalUserData;
     private Uri originalImageUri;
     private boolean hasChanges = false;
+    private CookingMotivationManager cookingMotivationManager;
 
     private static MainActivityCallback mainActivityCallback;
 
@@ -98,6 +106,8 @@ protected void onCreate(Bundle savedInstanceState) {
         EdgeToEdge.enable(this);
         setContentView(R.layout.activity_profile);
 
+        cookingMotivationManager = new CookingMotivationManager(this);
+
         initializeViews();
         initializeLoadingDialog();
         setupImagePicker();
@@ -229,7 +239,29 @@ public void afterTextChanged(Editable editable) {
         genderRadioGroup.setOnCheckedChangeListener((group, checkedId) -> checkForChanges());
 
         // Cooking motivation change listener
-        cookingMotivationSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> checkForChanges());
+        cookingMotivationSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            if (isChecked){
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    if (!PermissionManager.hasNotificationPermission(this)) {
+                        showNotificationPermissionDialog();
+                        return;
+                    }
+                }
+                // Initialize manager if needed
+                if (cookingMotivationManager == null) {
+                    cookingMotivationManager = new CookingMotivationManager(this);
+                }
+                // Schedule motivation notifications
+                cookingMotivationManager.scheduleDailyMotivation();
+            } else {
+                if (cookingMotivationManager == null) {
+                    cookingMotivationManager = new CookingMotivationManager(this);
+                }
+                // Cancel motivation notifications
+                cookingMotivationManager.cancelDailyMotivation();
+            }
+            new Handler(Looper.getMainLooper()).postDelayed(this::checkForChanges, 500);
+        });
 
         healthConsciousSwitch.setOnCheckedChangeListener((compoundButton, b) -> checkForChanges());
     }
@@ -630,6 +662,55 @@ private void logoutUser() {
                 .show();
     }
 
+    private void showNotificationPermissionDialog() {
+        new Handler(Looper.getMainLooper()).postDelayed(() -> new CustomAlertDialog(ProfileActivity.this)
+                .setDialogTitle("Notification Permission")
+                .setMessage("SmartChef needs notification permission for two reasons:\n\n1. For sending cooking motivations.\n2. To keep you updated with the latest app versions.\n\nWould you like to enable notifications?")
+                .setPositiveButton("Enable", () -> {
+                    PermissionManager.setNotificationPermissionAsked(this, true);
+                    requestNotificationPermission();
+                })
+                .setNegativeButton("No Thanks", () -> {
+                    cookingMotivationSwitch.setChecked(false);
+                    cookingMotivationManager.cancelDailyMotivation();
+                    PermissionManager.setNotificationPermissionAsked(this, true);
+                    PermissionManager.setNotificationPermissionDenied(this, true);
+                    PermissionManager.setAutoUpdateEnabled(ProfileActivity.this, false);
+                    // Cancel any scheduled update checks
+                    androidx.work.WorkManager.getInstance(ProfileActivity.this)
+                            .cancelUniqueWork("update_check");
+                })
+                .show(), 500);
+    }
+
+    private void requestNotificationPermission() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            requestPermissions(
+                    new String[]{"android.permission.POST_NOTIFICATIONS"},
+                    NOTIFICATION_PERMISSION_CODE
+            );
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
+                                           @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == NOTIFICATION_PERMISSION_CODE) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                // Permission granted
+                cookingMotivationManager.scheduleDailyMotivation();
+                PermissionManager.setNotificationPermissionDenied(this, false);
+            } else {
+                // Permission denied
+                cookingMotivationSwitch.setChecked(false);
+                cookingMotivationManager.cancelDailyMotivation();
+                PermissionManager.setNotificationPermissionDenied(this, true);
+                PermissionManager.setAutoUpdateEnabled(this, false);
+            }
+        }
+    }
+
     private void handleBack() {
         finish();
         overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right);
diff --git a/app/src/main/java/com/bunny/ml/smartchef/adapters/ChatAdapter.java b/app/src/main/java/com/bunny/ml/smartchef/adapters/ChatAdapter.java
index 0951e00..74bb36c 100644
--- a/app/src/main/java/com/bunny/ml/smartchef/adapters/ChatAdapter.java
+++ b/app/src/main/java/com/bunny/ml/smartchef/adapters/ChatAdapter.java
@@ -26,8 +26,11 @@ public class ChatAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private final List<ChatMessage> messages;
     private final SimpleDateFormat timeFormat;
     private static final int VIEW_TYPE_LOADING = 3;
-
+    private static final int VIEW_TYPE_TYPING = 4;
+    private boolean isTyping = false;
+    private int lastAnimatedPosition = -1;
     private boolean isLoadingMore = false;
+    private boolean shouldAnimate = false;
     private OnLoadMoreListener loadMoreListener;
 
     public interface OnLoadMoreListener {
@@ -62,6 +65,9 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
             case VIEW_TYPE_AI:
                 View aiView = inflater.inflate(R.layout.item_chat_ai, parent, false);
                 return new MessageViewHolder(aiView);
+            case VIEW_TYPE_TYPING:
+                View typingView = inflater.inflate(R.layout.item_chat_typing, parent, false);
+                return new TypingViewHolder(typingView);
             default:
                 throw new IllegalArgumentException("Invalid view type");
         }
@@ -83,24 +89,77 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
             if (message.getTimestamp() != null) {
                 messageHolder.timeText.setText(timeFormat.format(message.getTimestamp()));
             }
+
+            setAnimation(holder.itemView, position);
+
+        } else if (holder instanceof TypingViewHolder) {
+            // Restart animations when typing indicator is bound
+            ((TypingViewHolder) holder).startAnimations();
+            setAnimation(holder.itemView, position);
+        }
+    }
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position, @NonNull List<Object> payloads) {
+        if (!payloads.isEmpty()) {
+            // If this is a content update, just update the text without animation
+            if (holder instanceof MessageViewHolder && position < messages.size()) {
+                MessageViewHolder messageHolder = (MessageViewHolder) holder;
+                ChatMessage message = messages.get(position);
+                if (getItemViewType(position) == VIEW_TYPE_AI) {
+                    messageHolder.messageText.setFormattedText(message.getContent());
+                } else {
+                    messageHolder.messageText.setText(message.getContent());
+                }
+            }
+        } else {
+            // Call the simple version if no payloads
+            onBindViewHolder(holder, position);
+        }
+    }
+
+    @Override
+    public void onViewDetachedFromWindow(@NonNull RecyclerView.ViewHolder holder) {
+        super.onViewDetachedFromWindow(holder);
+        holder.itemView.clearAnimation();
+    }
+
+    private void setAnimation(View viewToAnimate, int position) {
+        if (shouldAnimate && position > lastAnimatedPosition && position >= getItemCount() - 2) {
+            Animation slideIn = AnimationUtils.loadAnimation(viewToAnimate.getContext(), R.anim.slide_in_up);
+            viewToAnimate.startAnimation(slideIn);
+            lastAnimatedPosition = position;
         }
-        // No need to do anything for TypingViewHolder as it's just an animation
     }
 
     @Override
     public int getItemCount() {
-        return messages.size();
+        return messages.size() + (isTyping ? 1 : 0);
     }
 
     @Override
     public int getItemViewType(int position) {
+        if (position == messages.size() && isTyping) {
+            return VIEW_TYPE_TYPING;
+        }
         if (messages.get(position) == null) {
             return VIEW_TYPE_LOADING;
         }
         return messages.get(position).isAi() ? VIEW_TYPE_AI : VIEW_TYPE_USER;
     }
 
+    public void showTyping(boolean show) {
+        if (isTyping != show) {
+            isTyping = show;
+            if (show) {
+                notifyItemInserted(messages.size());
+            } else {
+                notifyItemRemoved(messages.size());
+            }
+        }
+    }
+
     public void addMessages(List<ChatMessage> newMessages, boolean isFirstPage) {
+        shouldAnimate = false;
         if (isFirstPage) {
             List<ChatMessage> updatedList = new ArrayList<>(newMessages);
             DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(
@@ -147,6 +206,7 @@ public void setLoading(boolean loading) {
     }
 
     public void addMessage(ChatMessage message) {
+        shouldAnimate = true;
         messages.add(message);
         notifyItemInserted(messages.size() - 1);
     }
@@ -157,7 +217,8 @@ public void updateLastMessage(String content) {
             ChatMessage lastMessage = messages.get(lastIndex);
             if (lastMessage != null) {
                 lastMessage.setContent(content);
-                notifyItemChanged(lastIndex); // Remove the payload to ensure full update
+                shouldAnimate = false;
+                notifyItemChanged(lastIndex, "content_update"); // Remove the payload to ensure full update
             }
         }
     }
@@ -237,6 +298,13 @@ public TypingViewHolder(@NonNull View itemView) {
             dot1 = itemView.findViewById(R.id.dot1);
             dot2 = itemView.findViewById(R.id.dot2);
             dot3 = itemView.findViewById(R.id.dot3);
+        }
+
+        public void startAnimations() {
+            // Clear any existing animations
+            dot1.clearAnimation();
+            dot2.clearAnimation();
+            dot3.clearAnimation();
 
             // Start animations with delays
             startDotAnimation(dot1, 0);
@@ -247,6 +315,7 @@ public TypingViewHolder(@NonNull View itemView) {
         private void startDotAnimation(View dot, int delay) {
             Animation animation = AnimationUtils.loadAnimation(dot.getContext(), R.anim.typing_dot);
             animation.setStartOffset(delay);
+            animation.setRepeatCount(Animation.INFINITE); // Make sure animation repeats
             dot.startAnimation(animation);
         }
     }
diff --git a/app/src/main/java/com/bunny/ml/smartchef/firebase/ChatRepository.java b/app/src/main/java/com/bunny/ml/smartchef/firebase/ChatRepository.java
index 47bfca2..c708e57 100644
--- a/app/src/main/java/com/bunny/ml/smartchef/firebase/ChatRepository.java
+++ b/app/src/main/java/com/bunny/ml/smartchef/firebase/ChatRepository.java
@@ -26,7 +26,7 @@ public class ChatRepository {
     private static final String CHAT_METADATA_COLLECTION = "chat_metadata";
     private static final int MAX_CHATS = 5;
     private static final int MESSAGES_PER_PAGE = 20;
-    private static final int MAX_STARRED_CHATS = 3;
+    private static final int MAX_STARRED_CHATS = 5;
 
     public ChatRepository() {
         this.db = FirebaseFirestore.getInstance();
diff --git a/app/src/main/java/com/bunny/ml/smartchef/firebase/ProfileManager.java b/app/src/main/java/com/bunny/ml/smartchef/firebase/ProfileManager.java
index eb485df..8605787 100644
--- a/app/src/main/java/com/bunny/ml/smartchef/firebase/ProfileManager.java
+++ b/app/src/main/java/com/bunny/ml/smartchef/firebase/ProfileManager.java
@@ -167,6 +167,28 @@ public boolean getHealthConscious() {
         return cachedUserData != null && cachedUserData.isHealthConscious();
     }
 
+    public void setCookingMotivation(boolean enabled, BaseCallback callback) {
+        if (checkAuthentication(callback)) return;
+
+        String uid = getCurrentUserId();
+
+        // Update database
+        db.collection(USERS_COLLECTION)
+                .document(uid)
+                .update("cookingMotivation", enabled)
+                .addOnSuccessListener(aVoid -> {
+                    // Update cache if it exists
+                    if (cachedUserData != null) {
+                        cachedUserData.setCookingMotivation(enabled);
+                    }
+                    // Since BaseCallback doesn't have onSuccess, we don't need to call it
+                })
+                .addOnFailureListener(e -> {
+                    Log.e(TAG, "Error updating cooking motivation: " + e.getMessage());
+                    callback.onFailure(e.getMessage());
+                });
+    }
+
     // Profile Image Methods
     public void loadProfileImage(@NonNull CircleImageView imageView) {
         if (checkAuthentication(null)) {
diff --git a/app/src/main/java/com/bunny/ml/smartchef/utils/AppUpdater.java b/app/src/main/java/com/bunny/ml/smartchef/utils/AppUpdater.java
index 777418c..dae5de8 100644
--- a/app/src/main/java/com/bunny/ml/smartchef/utils/AppUpdater.java
+++ b/app/src/main/java/com/bunny/ml/smartchef/utils/AppUpdater.java
@@ -47,6 +47,8 @@ public class AppUpdater {
     private final OkHttpClient client;
     public MaterialAlertDialogBuilder progressDialogBuilder;
     private androidx.appcompat.app.AlertDialog progressDialog;
+    private String pendingNewVersion;
+    private String pendingDownloadUrl;
 
     public interface UpdateCheckCallback {
         void onUpdateAvailable(boolean available);
@@ -227,6 +229,8 @@ private void showUpdateDialog(String newVersion, String downloadUrl, String rele
 
 
     private void handleUpdateClick(String newVersion, String downloadUrl) {
+        this.pendingNewVersion = newVersion;
+        this.pendingDownloadUrl = downloadUrl;
         if (!context.getPackageManager().canRequestPackageInstalls()) {
             showInstallPermissionDialog(newVersion, downloadUrl);
         } else {
@@ -254,6 +258,10 @@ private void showInstallPermissionDialog(String newVersion, String downloadUrl)
                 .show();
     }
 
+    private void showInstallPermissionDialog(){
+        showInstallPermissionDialog(pendingNewVersion, pendingDownloadUrl);
+    }
+
     private void storeDownloadInfo(String newVersion, String downloadUrl) {
         SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
         prefs.edit()
@@ -262,6 +270,21 @@ private void storeDownloadInfo(String newVersion, String downloadUrl) {
                 .apply();
     }
 
+    public void onActivityResult(int requestCode, int resultCode) {
+        if (requestCode == REQUEST_INSTALL_PACKAGES) {
+            if (context.getPackageManager().canRequestPackageInstalls()) {
+                // Permission granted, show download confirmation
+                if (pendingNewVersion != null && pendingDownloadUrl != null) {
+                    showDownloadConfirmationDialog(pendingNewVersion, pendingDownloadUrl);
+                }
+            } else {
+                // Permission still not granted, show permission dialog again
+                showInstallPermissionDialog();
+            }
+        }
+    }
+
+
     public void checkAndDownloadPendingUpdate() {
         SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
         String pendingNewVersion = prefs.getString("pendingNewVersion", null);
diff --git a/app/src/main/java/com/bunny/ml/smartchef/utils/CookingMotivationManager.java b/app/src/main/java/com/bunny/ml/smartchef/utils/CookingMotivationManager.java
new file mode 100644
index 0000000..93576e4
--- /dev/null
+++ b/app/src/main/java/com/bunny/ml/smartchef/utils/CookingMotivationManager.java
@@ -0,0 +1,183 @@
+package com.bunny.ml.smartchef.utils;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.NotificationCompat;
+import androidx.core.content.ContextCompat;
+import androidx.work.ExistingPeriodicWorkPolicy;
+import androidx.work.PeriodicWorkRequest;
+import androidx.work.WorkManager;
+import androidx.work.Worker;
+import androidx.work.WorkerParameters;
+
+import com.bunny.ml.smartchef.MainActivity;
+import com.bunny.ml.smartchef.R;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+public class CookingMotivationManager {
+    private static final String TAG = "CookingMotivationManager";
+    private static final String CHANNEL_ID = "cooking_motivation_channel";
+    private static final int NOTIFICATION_ID = 200;
+    private static final String MOTIVATION_API_URL = "https://api.npoint.io/e519da2a9cf6d1e43bf2";
+    private static final String WORK_NAME = "daily_motivation";
+
+    private final Context context;
+    private final OkHttpClient client;
+    private final WorkManager workManager;
+
+    public CookingMotivationManager(Context context) {
+        this.context = context.getApplicationContext();
+        this.client = new OkHttpClient();
+        this.workManager = WorkManager.getInstance(context);
+        createNotificationChannel();
+    }
+
+    public void scheduleDailyMotivation() {
+        // First check if work is already scheduled
+        workManager.getWorkInfosForUniqueWork(WORK_NAME)
+                .addListener(() -> {
+                    // Create and schedule new work only if no existing work is found
+                    PeriodicWorkRequest motivationWorkRequest =
+                            new PeriodicWorkRequest.Builder(MotivationWorker.class, 24, TimeUnit.HOURS)
+                                    .build();
+
+                    workManager.enqueueUniquePeriodicWork(
+                            WORK_NAME,
+                            ExistingPeriodicWorkPolicy.KEEP,  // Keep existing work if any
+                            motivationWorkRequest
+                    );
+                }, ContextCompat.getMainExecutor(context));
+    }
+
+    public void cancelDailyMotivation() {
+        workManager.cancelUniqueWork(WORK_NAME);
+    }
+
+    public boolean isMotivationScheduled() {
+        try {
+            boolean[] isScheduled = {false};
+            workManager.getWorkInfosForUniqueWork(WORK_NAME).get()
+                    .forEach(workInfo -> {
+                        if (workInfo != null && !workInfo.getState().isFinished()) {
+                            isScheduled[0] = true;
+                        }
+                    });
+            return isScheduled[0];
+        } catch (Exception e) {
+            Log.e(TAG, "Error checking motivation schedule: " + e.getMessage());
+            return false;
+        }
+    }
+
+    private void createNotificationChannel() {
+        NotificationChannel channel = new NotificationChannel(
+                CHANNEL_ID,
+                "Cooking Motivation",
+                NotificationManager.IMPORTANCE_DEFAULT
+        );
+        channel.setDescription("Daily cooking motivation notifications");
+
+        NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+        notificationManager.createNotificationChannel(channel);
+    }
+
+    public static class MotivationWorker extends Worker {
+        public MotivationWorker(@NonNull Context context, @NonNull WorkerParameters params) {
+            super(context, params);
+        }
+
+        @NonNull
+        @Override
+        public Result doWork() {
+            CookingMotivationManager manager = new CookingMotivationManager(getApplicationContext());
+            manager.fetchAndShowMotivation();
+            return Result.success();
+        }
+    }
+
+    private void fetchAndShowMotivation() {
+        Request request = new Request.Builder()
+                .url(MOTIVATION_API_URL)
+                .build();
+
+        try {
+            Response response = client.newCall(request).execute();
+            if (!response.isSuccessful()) throw new IOException("Unexpected response " + response);
+
+            String responseData = "";
+            if (response.body() != null) {
+                responseData = response.body().string();
+            }
+            List<String> motivations = parseMotivations(responseData);
+
+            if (!motivations.isEmpty()) {
+                String randomMotivation = getRandomMotivation(motivations);
+                showMotivationNotification(randomMotivation);
+            }
+
+        } catch (IOException | JSONException e) {
+            Log.e(TAG, "Error fetching motivation: " + e.getMessage());
+            // Use fallback motivation if API fails
+            showMotivationNotification("Time to create something delicious!");
+        }
+    }
+
+    private List<String> parseMotivations(String jsonData) throws JSONException {
+        List<String> motivations = new ArrayList<>();
+        JSONObject jsonObject = new JSONObject(jsonData);
+        JSONArray motivationsArray = jsonObject.getJSONArray("motivations");
+
+        for (int i = 0; i < motivationsArray.length(); i++) {
+            motivations.add(motivationsArray.getString(i));
+        }
+
+        return motivations;
+    }
+
+    private String getRandomMotivation(List<String> motivations) {
+        Random random = new Random();
+        return motivations.get(random.nextInt(motivations.size()));
+    }
+
+    private void showMotivationNotification(String motivation) {
+        Intent intent = new Intent(context, MainActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
+        PendingIntent pendingIntent = PendingIntent.getActivity(
+                context,
+                0,
+                intent,
+                PendingIntent.FLAG_IMMUTABLE
+        );
+
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_ID)
+                .setSmallIcon(R.drawable.ic_chef_2)
+                .setContentTitle(context.getString(R.string.cooking_motivation_for_today))
+                .setContentText(motivation)
+                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+                .setAutoCancel(true)
+                .setContentIntent(pendingIntent);
+
+        NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.notify(NOTIFICATION_ID, builder.build());
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bunny/ml/smartchef/websocket/ChatWebSocket.java b/app/src/main/java/com/bunny/ml/smartchef/websocket/ChatWebSocket.java
index 1ddf654..be6a4f0 100644
--- a/app/src/main/java/com/bunny/ml/smartchef/websocket/ChatWebSocket.java
+++ b/app/src/main/java/com/bunny/ml/smartchef/websocket/ChatWebSocket.java
@@ -27,7 +27,6 @@ public class ChatWebSocket {
     private final Handler mainHandler;
     private boolean isConnected = false;
     private static final int RECONNECT_DELAY = 5000; // 5 seconds
-    private static final int MAX_RETRIES = 3;
     private int retryCount = 0;
     private ProfileManager profileManager;
     private boolean isReconnecting = false;
@@ -143,7 +142,10 @@ public void onMessage(WebSocket webSocket, String text) {
 
             @Override
             public void onClosing(WebSocket webSocket, int code, String reason) {
+                Log.e("ChatWebSocket", "WebSocketClosed");
                 webSocket.close(1000, null);
+                callback.onDisconnected();
+                attemptReconnect();
             }
 
             @Override
@@ -159,7 +161,7 @@ public void onFailure(WebSocket webSocket, Throwable t, Response response) {
     }
 
     private void attemptReconnect() {
-        if (retryCount < MAX_RETRIES) {
+        if (retryCount < Integer.MAX_VALUE) {
             retryCount++;
             mainHandler.postDelayed(this::connect, RECONNECT_DELAY);
         }
diff --git a/app/src/main/res/layout/dialog_custom_alert.xml b/app/src/main/res/layout/dialog_custom_alert.xml
index c460eb1..3c64a48 100644
--- a/app/src/main/res/layout/dialog_custom_alert.xml
+++ b/app/src/main/res/layout/dialog_custom_alert.xml
@@ -52,6 +52,7 @@
             android:textAllCaps="false"
             android:textColor="@color/mode_inverse"
             android:visibility="gone"
+            android:textStyle="bold"
             app:rippleColor="@color/ripple_effect" />
 
 
diff --git a/app/src/main/res/layout/item_chat_typing.xml b/app/src/main/res/layout/item_chat_typing.xml
index 28335a7..522762b 100644
--- a/app/src/main/res/layout/item_chat_typing.xml
+++ b/app/src/main/res/layout/item_chat_typing.xml
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:padding="8dp">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/chat_bubble_ai"
-        android:padding="12dp">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="horizontal">
+    android:background="@drawable/chat_bubble_ai"
+    android:orientation="horizontal"
+    android:gravity="center"
+    android:layout_marginStart="16dp"
+    android:layout_marginEnd="48dp"
+    android:layout_marginBottom="8dp"
+    android:paddingBottom="5dp"
+    android:padding="12dp">
 
             <View
                 android:id="@+id/dot1"
@@ -39,6 +34,5 @@
                 android:layout_margin="2dp"
                 android:background="@drawable/ic_round_typing_dot"
                 android:backgroundTint="@color/mode_inverse" />
-        </LinearLayout>
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b3df7f1..a397885 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -110,4 +110,5 @@
     <string name="auto_update_check">Auto update check</string>
     <string name="notification_permission_required_for_auto_updates">Notification permission required for auto-updates</string>
     <string name="quick_suggestions">Quick Suggestions</string>
+    <string name="cooking_motivation_for_today">Cooking Motivation for today</string>
 </resources>
\ No newline at end of file