fix conflict

Author: hoanghaoz

src/lib/features/note/view/focus_widget.dart

@@ -234,7 +234,27 @@ class QuickNoteCard extends StatelessWidget {
                     children: [
                       ClipRRect(
                         borderRadius: BorderRadius.circular(8),
-                        child: Image.file(File(vm.selectedImagePath!), height: 80, width: 80, fit: BoxFit.cover),
+                        child: Image.file(
+                          File(vm.selectedImagePath!),
+                          height: 80,
+                          width: 80,
+                          fit: BoxFit.cover,
+                          errorBuilder: (context, error, stackTrace) {
+                            return Container(
+                              height: 80,
+                              width: 80,
+                              decoration: BoxDecoration(
+                                color: Colors.grey.shade300,
+                                borderRadius: BorderRadius.circular(8),
+                              ),
+                              child: Icon(
+                                Icons.broken_image_outlined,
+                                color: Colors.grey.shade600,
+                                size: 40,
+                              ),
+                            );
+                          },
+                        ),
                       ),
                       Positioned(
                         top: -10,
@@ -321,7 +341,7 @@ class QuickNoteCard extends StatelessWidget {
                               Text(note.content, style: const TextStyle(fontSize: 14, color: Color(0xFF2C3E50), height: 1.4)),
 
                             // DISPLAY ATTACHED IMAGE IN NOTE
-                            if (note.imagePath != null) ...[
+                            if (note.imagePath != null && note.imagePath!.isNotEmpty) ...[
                               const SizedBox(height: 8),
                               ClipRRect(
                                 borderRadius: BorderRadius.circular(10),
@@ -330,6 +350,34 @@ class QuickNoteCard extends StatelessWidget {
                                   width: double.infinity,
                                   height: 150,
                                   fit: BoxFit.cover,
+                                  errorBuilder: (context, error, stackTrace) {
+                                    return Container(
+                                      width: double.infinity,
+                                      height: 150,
+                                      decoration: BoxDecoration(
+                                        color: Colors.grey.shade300,
+                                        borderRadius: BorderRadius.circular(10),
+                                      ),
+                                      child: Column(
+                                        mainAxisAlignment: MainAxisAlignment.center,
+                                        children: [
+                                          Icon(
+                                            Icons.broken_image_outlined,
+                                            color: Colors.grey.shade600,
+                                            size: 50,
+                                          ),
+                                          const SizedBox(height: 8),
+                                          Text(
+                                            'Image not available',
+                                            style: TextStyle(
+                                              color: Colors.grey.shade600,
+                                              fontSize: 12,
+                                            ),
+                                          ),
+                                        ],
+                                      ),
+                                    );
+                                  },
                                 ),
                               ),
                             ],

src/lib/features/note/viewmodel/focus_viewmodel.dart

@@ -39,7 +39,16 @@ class FocusViewModel extends ChangeNotifier {
     final prefs = await SharedPreferences.getInstance();
     List<String>? noteStrings = prefs.getStringList('saved_notes');
     if (noteStrings != null) {
-      notes = noteStrings.map((s) => NoteModel.fromJson(s)).toList();
+      List<NoteModel> loadedNotes = [];
+      for (String noteString in noteStrings) {
+        try {
+          loadedNotes.add(NoteModel.fromJson(noteString));
+        } catch (e) {
+          debugPrint("Error parsing note JSON: $e");
+          // Skip the malformed entry and continue
+        }
+      }
+      notes = loadedNotes;
       notifyListeners();
     }
   }
@@ -66,7 +75,7 @@ class FocusViewModel extends ChangeNotifier {
   }
 
   // Add note (optionally with an image) instantly to the UI and save to disk
-  void addNote() {
+  Future<void> addNote() async {
     final text = noteController.text.trim();
     if (text.isEmpty && selectedImagePath == null) return; // Skip if both text and image are empty
 
@@ -78,21 +87,21 @@ class FocusViewModel extends ChangeNotifier {
     ));
 
     _sortNotes();
-    saveNotesToDisk(); // Persist data
+    await saveNotesToDisk(); // Persist data
     noteController.clear();
     selectedImagePath = null; // Clear temporary image after saving
     notifyListeners();
   }
 
   // Remove note instantly and update storage
-  void removeNote(String id) {
+  Future<void> removeNote(String id) async {
     notes.removeWhere((note) => note.id == id);
-    saveNotesToDisk(); // Persist data
+    await saveNotesToDisk(); // Persist data
     notifyListeners();
   }
 
   // Pin/unpin note and update storage
-  void togglePin(String id) {
+  Future<void> togglePin(String id) async {
     final index = notes.indexWhere((n) => n.id == id);
     if (index != -1) {
       notes[index] = NoteModel(
@@ -102,7 +111,7 @@ class FocusViewModel extends ChangeNotifier {
           imagePath: notes[index].imagePath // Keep image when pinning
       );
       _sortNotes();
-      saveNotesToDisk(); // Persist data
+      await saveNotesToDisk(); // Persist data
       notifyListeners();
     }
   }
@@ -142,7 +151,7 @@ class FocusViewModel extends ChangeNotifier {
   }
 
   // Calculate progress for the circular indicator
-  double get progress => totalTime <= 0 ? 0.0 : (timeRemaining / totalTime).clamp(0.0, 1.0);
+  double get progress => timeRemaining / totalTime;
 
   // --- TIMER OPERATIONS ---
 
@@ -212,11 +221,6 @@ class FocusViewModel extends ChangeNotifier {
 
   // Update preferences from the settings dialog
   void updateSettings({required int newPomodoroMinutes, required int newBreakMinutes, required bool vibrate, required int ringtone}) {
-    if (newPomodoroMinutes <= 0 || newBreakMinutes <= 0) {
-      debugPrint('Lỗi: Thời gian cài đặt phải lớn hơn 0 phút. Đã tự động set về 1.');
-      newPomodoroMinutes = newPomodoroMinutes <= 0 ? 1 : newPomodoroMinutes;
-      newBreakMinutes = newBreakMinutes <= 0 ? 1 : newBreakMinutes;
-    }
     stopAlarm(); // Stop alarm if opening settings
     pomodoroTime = newPomodoroMinutes * 60;
     shortBreakTime = newBreakMinutes * 60;

src/pubspec.yaml

@@ -41,6 +41,7 @@ dependencies:
   provider: ^6.1.5+1
   flutter_ringtone_player: ^4.0.0+4
   image_picker: ^1.2.1
+  shared_preferences: ^2.2.2
 
 dev_dependencies:
   flutter_test:
@@ -90,4 +91,4 @@ flutter:
   #         weight: 700
   #
   # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/to/font-from-package
+  # see https://flutter.dev/to/font-from-package