Merge branch 'main' into post-patchset-1

SGI-CAPP-AT2 · web-flow · commit 15528b585889 · 2025-11-18T13:24:05.000+05:30
diff --git a/.fvmrc b/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.29.2"
+  "flutter": "3.38.0"
 }
diff --git a/.gitignore b/.gitignore
@@ -47,4 +47,5 @@ app.*.map.json
 /android/app/release
 
 # FVM Version Cache
-.fvm/
+.fvm/
+.vscode/settings.json
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,67 @@
+{
+	// Use IntelliSense to learn about possible attributes.
+	// Hover to view descriptions of existing attributes.
+	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+	"version": "0.2.0",
+	"configurations": [
+		
+		{
+			"name": "taskwarrior-flutter (prod)",
+			"request": "launch",
+			"type": "dart",
+			"args": [
+				"--flavor",
+				"prod"
+			]
+		},
+		{
+			"name": "taskwarrior-flutter (nightly)",
+			"request": "launch",
+			"type": "dart",
+			"args": [
+				"--flavor",
+				"nightly"
+			]
+		},
+		{
+			"name": "taskwarrior-flutter (prod profile)",
+			"request": "launch",
+			"type": "dart",
+			"flutterMode": "profile",
+			"args": [
+				"--flavor",
+				"prod"
+			]
+		},
+		{
+			"name": "taskwarrior-flutter (nightly profile)",
+			"request": "launch",
+			"type": "dart",
+			"flutterMode": "profile",
+			"args": [
+				"--flavor",
+				"nightly"
+			]
+		},
+		{
+			"name": "taskwarrior-flutter (prod release)",
+			"request": "launch",
+			"type": "dart",
+			"flutterMode": "release",
+			"args": [
+				"--flavor",
+				"prod"
+			]
+		},
+		{
+			"name": "taskwarrior-flutter (nightly release)",
+			"request": "launch",
+			"type": "dart",
+			"flutterMode": "release",
+			"args": [
+				"--flavor",
+				"nightly"
+			]
+		}
+	]
+}
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -36,11 +36,12 @@ if (nightlyKeystorePropertiesFile.exists()) {
 
 android {
 	namespace "com.ccextractor.taskwarriorflutter"
-    compileSdkVersion 35
+    compileSdkVersion 36
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+        coreLibraryDesugaringEnabled true
     }
 
     kotlinOptions {
@@ -101,5 +102,6 @@ flutter {
 }
 
 dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 }
 
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4096M
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.1.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.10" apply false
+    id "com.android.application" version "8.6.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/lib/app/modules/detailRoute/controllers/detail_route_controller.dart b/lib/app/modules/detailRoute/controllers/detail_route_controller.dart
@@ -60,12 +60,17 @@ class DetailRouteController extends GetxController {
     var now = DateTime.now().toUtc();
     modify.save(modified: () => now);
     onEdit.value = false;
-    Get.back();
+
+    // Show snackbar
     Get.snackbar(
       'Task Updated',
       '',
       snackPosition: SnackPosition.BOTTOM,
+      duration: const Duration(seconds: 2),
     );
+
+    // Navigate back immediately after showing snackbar
+    Get.back();
   }
 
   //  'description': controller.modify.draft.description,
diff --git a/lib/app/modules/detailRoute/views/detail_route_view.dart b/lib/app/modules/detailRoute/views/detail_route_view.dart
@@ -28,11 +28,15 @@ class DetailRouteView extends GetView<DetailRouteController> {
     return WillPopScope(
       onWillPop: () async {
         if (!controller.onEdit.value) {
+          debugPrint(
+              'DetailRouteView: No edits made, navigating back without prompt.');
           // Get.offAll(() => const HomeView());
-          Get.back();
+          Navigator.of(context).pop();
           // Get.toNamed(Routes.HOME);
           return false;
         }
+        debugPrint(
+            'DetailRouteView: Unsaved edits detected, prompting user for action.');
 
         bool? save = await showDialog(
           context: context,
@@ -50,10 +54,14 @@ class DetailRouteView extends GetView<DetailRouteController> {
               actions: [
                 TextButton(
                   onPressed: () {
-                    controller.saveChanges();
-                    // Get.offAll(() => const HomeView());
+                    // Get.back(); // Close the dialog first
+                    // // Wait for dialog to fully close before showing snackbar
+                    // Future.delayed(const Duration(milliseconds: 100), () {
+                    //   controller.saveChanges();
+                    // });
 
-                    Get.back();
+                    controller.saveChanges();
+                    Navigator.of(context).pop(true);
                   },
                   child: Text(
                     SentenceManager(
@@ -69,7 +77,7 @@ class DetailRouteView extends GetView<DetailRouteController> {
                   onPressed: () {
                     // Get.offAll(() => const HomeView());
 
-                    Get.back();
+                    Navigator.of(context).pop();
                   },
                   child: Text(
                     SentenceManager(
@@ -83,7 +91,7 @@ class DetailRouteView extends GetView<DetailRouteController> {
                 ),
                 TextButton(
                   onPressed: () {
-                    Get.back();
+                    Navigator.of(context).pop(false);
                   },
                   child: Text(
                     SentenceManager(
@@ -251,7 +259,7 @@ class AttributeWidget extends StatelessWidget {
         Theme.of(context).extension<TaskwarriorColorTheme>()!;
     // Get the controller to check if the task is read-only
     final DetailRouteController controller = Get.find<DetailRouteController>();
-    
+
     // Always allow status to be edited, but respect read-only for other attributes
     final bool isEditable = !controller.isReadOnly.value || name == 'status';
 
@@ -323,9 +331,10 @@ class AttributeWidget extends StatelessWidget {
           isEditable: isEditable,
         );
       default:
-        final Color? textColor = (isEditable && !['entry', 'modified', 'urgency'].contains(name))
-            ? tColors.primaryTextColor
-            : tColors.primaryDisabledTextColor;
+        final Color? textColor =
+            (isEditable && !['entry', 'modified', 'urgency'].contains(name))
+                ? tColors.primaryTextColor
+                : tColors.primaryDisabledTextColor;
 
         return Card(
           color: tColors.secondaryBackgroundColor,
diff --git a/lib/app/modules/home/views/tasks_builder.dart b/lib/app/modules/home/views/tasks_builder.dart
@@ -53,7 +53,8 @@ class TasksBuilder extends StatelessWidget {
 
   void saveChanges(
       BuildContext context, Modify modify, String id, String newValue) async {
-    TaskwarriorColorTheme tColors = Theme.of(context).extension<TaskwarriorColorTheme>()!;
+    TaskwarriorColorTheme tColors =
+        Theme.of(context).extension<TaskwarriorColorTheme>()!;
     var now = DateTime.now().toUtc();
     modify.save(
       modified: () => now,
@@ -70,6 +71,7 @@ class TasksBuilder extends StatelessWidget {
       backgroundColor: tColors.secondaryBackgroundColor,
       duration: const Duration(seconds: 2),
       action: SnackBarAction(
+        textColor: tColors.purpleShade,
         label:
             SentenceManager(currentLanguage: selectedLanguage).sentences.undo,
         onPressed: () {
@@ -110,32 +112,37 @@ class TasksBuilder extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     // print(taskData);
-    TaskwarriorColorTheme tColors = Theme.of(context).extension<TaskwarriorColorTheme>()!;
+    TaskwarriorColorTheme tColors =
+        Theme.of(context).extension<TaskwarriorColorTheme>()!;
     var storageWidget = Get.find<HomeController>();
     return Scaffold(
         floatingActionButtonLocation:
             FloatingActionButtonLocation.miniStartFloat,
-        floatingActionButton: showbtn ? AnimatedOpacity(
-          duration: const Duration(milliseconds: 100), //show/hide animation
-          opacity: showbtn ? 1.0 : 0.0, //set obacity to 1 on visible, or hide
-          child: FloatingActionButton(
-            heroTag: "btn2",
-            onPressed: () {
-              scrollController.animateTo(
-                  //go to top of scroll
-                  0, //scroll offset to go
-                  duration:
-                      const Duration(milliseconds: 500), //duration of scroll
-                  curve: Curves.fastLinearToSlowEaseIn //scroll type
-                  );
-            },
-            backgroundColor: tColors.primaryTextColor,
-            child: Icon(
-              Icons.arrow_upward,
-              color: tColors.secondaryBackgroundColor,
-            ),
-          ),
-        ) : null,
+        floatingActionButton: showbtn
+            ? AnimatedOpacity(
+                duration:
+                    const Duration(milliseconds: 100), //show/hide animation
+                opacity:
+                    showbtn ? 1.0 : 0.0, //set obacity to 1 on visible, or hide
+                child: FloatingActionButton(
+                  heroTag: "btn2",
+                  onPressed: () {
+                    scrollController.animateTo(
+                        //go to top of scroll
+                        0, //scroll offset to go
+                        duration: const Duration(
+                            milliseconds: 500), //duration of scroll
+                        curve: Curves.fastLinearToSlowEaseIn //scroll type
+                        );
+                  },
+                  backgroundColor: tColors.primaryTextColor,
+                  child: Icon(
+                    Icons.arrow_upward,
+                    color: tColors.secondaryBackgroundColor,
+                  ),
+                ),
+              )
+            : null,
         backgroundColor: Colors.transparent,
         body: Obx(
           () => taskData.isEmpty
@@ -152,8 +159,7 @@ class TasksBuilder extends StatelessWidget {
                       style: TextStyle(
                           fontFamily: FontFamily.poppins,
                           fontSize: TaskWarriorFonts.fontSizeLarge,
-                          color: tColors.primaryTextColor
-                      ),
+                          color: tColors.primaryTextColor),
                       // style: GoogleFonts.poppins(
                       //   fontSize: TaskWarriorFonts.fontSizeLarge,
                       //   color: AppSettings.isDarkMode
@@ -193,7 +199,8 @@ class TasksBuilder extends StatelessWidget {
                                     }
                                   },
                                   icon: Icons.done,
-                                  label: SentenceManager(currentLanguage: selectedLanguage)
+                                  label: SentenceManager(
+                                          currentLanguage: selectedLanguage)
                                       .sentences
                                       .complete,
                                   backgroundColor: TaskWarriorColors.green,
@@ -222,7 +229,8 @@ class TasksBuilder extends StatelessWidget {
                                     }
                                   },
                                   icon: Icons.delete,
-                                  label: SentenceManager(currentLanguage: selectedLanguage)
+                                  label: SentenceManager(
+                                          currentLanguage: selectedLanguage)
                                       .sentences
                                       .delete,
                                   backgroundColor: TaskWarriorColors.red,
diff --git a/lib/app/utils/taskfunctions/taskparser.dart b/lib/app/utils/taskfunctions/taskparser.dart
@@ -5,8 +5,6 @@ import 'package:taskwarrior/app/models/models.dart';
 
 import 'package:uuid/uuid.dart';
 
-
-
 class Tag {
   const Tag(this.tag);
 
@@ -67,10 +65,8 @@ Parser descriptionWordPrimitive() => wordPrimitive();
 
 final add = (epsilon() & endOfInput()) |
     (tagPrimitive() | attributePrimitive() | descriptionWordPrimitive())
-        .separatedBy(
-      char(' '),
-      includeSeparators: false,
-    );
+        .starSeparated(char(' '))
+        .map((result) => result.elements);
 
 Task taskParser(String task) {
   var now = DateTime.now().toUtc();
diff --git a/lib/app/v3/db/task_database.dart b/lib/app/v3/db/task_database.dart
@@ -97,9 +97,13 @@ class TaskDatabase {
     List<TaskForC> a = await Future.wait(
       maps.map((mapItem) => getObjectForTask(mapItem)).toList(),
     );
-    debugPrint("Database fetch ${maps.last}");
-    for (int i = 0; i < maps.length; i++) {
-      debugPrint("Database fetch ${maps[i]}");
+    if (maps.isNotEmpty) {
+      debugPrint("Database fetch ${maps.last}");
+      for (int i = 0; i < maps.length; i++) {
+        debugPrint("Database fetch ${maps[i]}");
+      }
+    } else {
+      debugPrint("Database fetch: No tasks found");
     }
     debugPrint('Tasks from db');
     debugPrint(a.toString());
diff --git a/pubspec.lock b/pubspec.lock

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "flutter": "3.29.2"`
	`2`	`+ "flutter": "3.38.0"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,11 +36,12 @@ if (nightlyKeystorePropertiesFile.exists()) {`
`36`	`36`
`37`	`37`	`android {`
`38`	`38`	`namespace "com.ccextractor.taskwarriorflutter"`
`39`		`- compileSdkVersion 35`
	`39`	`+ compileSdkVersion 36`
`40`	`40`
`41`	`41`	`compileOptions {`
`42`	`42`	`sourceCompatibility JavaVersion.VERSION_1_8`
`43`	`43`	`targetCompatibility JavaVersion.VERSION_1_8`
	`44`	`+ coreLibraryDesugaringEnabled true`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`kotlinOptions {`
`@@ -101,5 +102,6 @@ flutter {`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`dependencies {`
	`105`	`+ coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'`
`104`	`106`	`}`
`105`	`107`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ pluginManagement {`
`18`	`18`
`19`	`19`	`plugins {`
`20`	`20`	`id "dev.flutter.flutter-plugin-loader" version "1.0.0"`
`21`		`- id "com.android.application" version "8.1.0" apply false`
`22`		`- id "org.jetbrains.kotlin.android" version "1.9.10" apply false`
	`21`	`+ id "com.android.application" version "8.6.0" apply false`
	`22`	`+ id "org.jetbrains.kotlin.android" version "2.1.0" apply false`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`include ":app"`