Merge branch 'main' into pomodoro-screen-landscape-overflow

IMGIITRoorkee · Jan 9, 2025 · 95cf22e · 95cf22e
2 parents dd316fc + d1f9fc0
commit 95cf22e
Show file tree

Hide file tree

Showing 32 changed files with 1,520 additions and 530 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,20 @@
+### Related Issue  
+Closes #issue number  
+
+### Type of Change
+Put `x` inside the square bracket to specify what type of change your PR is:  
+- [ ] New Feature  
+- [ ] Bug Fix  
+- [ ] Code Refactor  
+- [ ] Documentation Update  
+- [ ] Other (please specify): 
+
+### Description of Change  
+Give a description of the change your PR is bringing.
+
+### Implementation Details  
+Give details about how you are implementing the change.
+
+### Demo  
+Provide screenshots or a video demonstrating the feature in action.  
+(Include attachments or links, if applicable.)
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,4 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<uses-permission android:name="android.permission.INTERNET"/>
+<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
@@ -21,6 +24,7 @@
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
+            android:taskAffinity=""
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
@@ -31,12 +35,22 @@
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
               android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+              android:resource="@style/NormalTheme"/>
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="taskly" />
+                <data android:host="taskly.com" />
+            </intent-filter>
+
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

diff --git a/android/app/src/main/kotlin/com/example/taskly/MainActivity.kt b/android/app/src/main/kotlin/com/example/taskly/MainActivity.kt
@@ -1,5 +1,22 @@
 package com.example.taskly
 
+import android.content.Intent
 import io.flutter.embedding.android.FlutterActivity
+import io.flutter.plugin.common.MethodChannel
 
-class MainActivity: FlutterActivity()
+class MainActivity: FlutterActivity() {
+    private val CHANNEL = "com.example.taskly/deeplink"
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        handleDeepLink(intent)
+    }
+
+    private fun handleDeepLink(intent: Intent) {
+        val data: String? = intent.dataString
+        flutterEngine?.dartExecutor?.binaryMessenger?.let {
+            MethodChannel(it, CHANNEL)
+                .invokeMethod("onDeepLink", data)
+        }
+    }
+}
diff --git a/assets/svg/Google_Calendar.svg b/assets/svg/Google_Calendar.svg
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -51,16 +51,16 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/speech_to_text/darwin"
 
 SPEC CHECKSUMS:
-  audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40
+  audioplayers_darwin: ccf9c770ee768abb07e26d90af093f7bab1c12ab
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
-  fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  speech_to_text: 627d3fd2194770b51abb324ba45c2d39398f24a8
+  flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619
+  fluttertoast: 76fea30fcf04176325f6864c87306927bd7d2038
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  speech_to_text: 9dc43a5df3cbc2813f8c7cc9bd0fbf94268ed7ac
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
   Try: 5ef669ae832617b3cee58cb2c6f99fb767a4ff96
 
 PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -48,6 +48,7 @@
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		2123B31439D2BCC6D361E8DD /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		2A4BDFD88F11D19FFF7D5371 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		285419062D10925E00F56D85 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		393850DC3621A36CF4AD6477 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
@@ -138,7 +139,6 @@
 				2123B31439D2BCC6D361E8DD /* Pods-RunnerTests.release.xcconfig */,
 				EF51637AE1B35676F68DF4C3 /* Pods-RunnerTests.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -188,6 +188,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				285419062D10925E00F56D85 /* Runner.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -505,6 +506,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = AT4J799SCP;
 				ENABLE_BITCODE = NO;
@@ -688,6 +690,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = AT4J799SCP;
 				ENABLE_BITCODE = NO;
@@ -711,6 +714,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = AT4J799SCP;
 				ENABLE_BITCODE = NO;

diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
@@ -10,4 +10,17 @@ import Flutter
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
+
+    override func application(
+        _ app: UIApplication,
+        open url: URL,
+        options: [UIApplication.OpenURLOptionsKey : Any] = [:]
+      ) -> Bool {
+        let data = url.absoluteString
+        let controller = window?.rootViewController as! FlutterViewController
+        let channel = FlutterMethodChannel(name: "com.example.taskly/deeplink", binaryMessenger: controller.binaryMessenger)
+
+        channel.invokeMethod("onDeepLink", arguments: data)
+        return true
+      }
 }
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -28,6 +28,17 @@
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
+    <key>CFBundleURLTypes</key>
+    <array>
+      <dict>
+        <key>CFBundleURLSchemes</key>
+        <array>
+          <string>taskly</string>
+        </array>
+        <key>CFBundleURLName</key>
+        <string>com.example.taskly</string>
+      </dict>
+    </array>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:taskly.com</string>
+	</array>
+</dict>
+</plist>
diff --git a/lib/constants.dart b/lib/constants.dart
@@ -7,11 +7,121 @@ String completedAfterDeadline(int daysDiff) =>
 String completeTaskWithNoDeadline(String task) => "completed $task";
 scoreReducedForTask(String task) => "Score reduced for $task";
 
+//suggestions
+final List<String> suggestions = [
+  'Grocery shopping',
+  'Laundry',
+  'Dishwashing',
+  'Cooking dinner',
+  'Vacuuming',
+  'Mopping the floor',
+  'Dusting furniture',
+  'Watering plants',
+  'Feeding pets',
+  'Taking out the trash',
+  'Paying bills',
+  'Filing taxes',
+  'Organizing closet',
+  'Decluttering workspace',
+  'Ironing clothes',
+  'Changing bed sheets',
+  'Washing car',
+  'Making breakfast',
+  'Packing lunch',
+  'Meal prepping',
+  'Walking the dog',
+  'Attending yoga class',
+  'Gym workout',
+  'Meditation session',
+  'Evening walk',
+  'Reading a book',
+  'Studying for exams',
+  'Writing a journal',
+  'Answering emails',
+  'Scheduling appointments',
+  'Grocery list planning',
+  'Calling a friend',
+  'Video conferencing',
+  'Taking notes',
+  'Watching a webinar',
+  'Online shopping',
+  'Reviewing expenses',
+  'Budget planning',
+  'Repairing home appliances',
+  'Painting walls',
+  'Planting seeds in the garden',
+  'Sewing clothes',
+  'DIY crafts',
+  'Learning a new recipe',
+  'Learning a new language',
+  'Practicing musical instruments',
+  'Listening to a podcast',
+  'Watching tutorials',
+  'Updating resume',
+  'Preparing for an interview',
+  'Writing blog posts',
+  'Editing photos',
+  'Editing videos',
+  'Cleaning refrigerator',
+  'Organizing pantry',
+  'Meal planning',
+  'Setting reminders',
+  'Replacing light bulbs',
+  'Sharpening knives',
+  'Fixing plumbing issues',
+  'Recycling old items',
+  'Donating clothes',
+  'Packing for a trip',
+  'Unpacking luggage',
+  'Making a to-do list',
+  'Cleaning windows',
+  'Organizing files',
+  'Creating backups',
+  'Updating software',
+  'Cleaning email inbox',
+  'Updating contact list',
+  'Syncing devices',
+  'Sorting laundry',
+  'Ironing curtains',
+  'Decorating room',
+  'Hanging picture frames',
+  'Buying birthday gifts',
+  'Writing thank-you notes',
+  'Managing social media',
+  'Printing documents',
+  'Binding books',
+  'Proofreading documents',
+  'Reviewing presentations',
+  'Practicing public speaking',
+  'Researching topics',
+  'Joining webinars',
+  'Booking tickets',
+  'Checking weather forecast',
+  'Updating calendars',
+  'Visiting bank',
+  'Checking credit score',
+  'Renewing insurance policies',
+  'Reviewing investment plans',
+  'Preparing tax documents',
+  'Running errands',
+  'Picking up dry cleaning',
+  'Buying medicines',
+  'Checking prescriptions',
+  'Scheduling doctor appointments',
+  'Filling water bottles',
+  'Replacing batteries',
+  'Setting up alarms',
+  'Sorting bills and receipts',
+  'Placing onl  ine orders',
+  'Trying DIY home decor'
+];
 String stayFocused(int min) => "Stay focused for $min minutes";
 String relax(int min) => "Relax for $min minutes";
 
 //Meditation Completion
-String ExtraMeditation(int selectedMinutes, int extraSeconds) =>
+String extraMeditation(int selectedMinutes, int extraSeconds) =>
     "Great job! You meditated for $selectedMinutes minutes and $extraSeconds extra seconds";
-String MeditationComplete(int minutesMeditated, int secondsMeditated) =>
+String meditationComplete(int minutesMeditated, int secondsMeditated) =>
     "Session ended. You meditated for $minutesMeditated minutes and $secondsMeditated seconds";
+String AskDependencyCompletion = "Complete the dependency first!";
+String meditationEndedTooSoon() => "Oh no! You stopped meditating too quickly!";
diff --git a/lib/enums/repeat_interval.dart b/lib/enums/repeat_interval.dart
@@ -0,0 +1,14 @@
+enum RepeatInterval {
+  daily(1),
+  weekly(7),
+  monthly(30);
+
+  const RepeatInterval(this.days);
+  final int days;
+}
+
+extension ToString on RepeatInterval {
+  String getString() {
+    return "${name.toString()[0].toUpperCase()}${name.toString().substring(1)}";
+  }
+}
diff --git a/lib/enums/taskoptions.dart b/lib/enums/taskoptions.dart
@@ -1,2 +1,9 @@
 // Enum to represent options in the menu
-enum TaskOption { deleteAll,showKudos,launchMeditationScreen,exportToCSV }
+enum TaskOption {
+  deleteSelected,
+  deleteAll,
+  showKudos,
+  launchMeditationScreen,
+  toggleTipVisibility,
+  exportToCSV,
+}