Merge Dev into Master

.fvm/flutter_sdk

@@ -1 +1 @@
-C:/Users/jordyigondjo/fvm/versions/3.7.12
+/Users/jordyigondjo/fvm/versions/3.7.12

.github/dependabot.yaml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "pub"
+    directory: "/"
+    schedule:
+      interval: "daily"

.gitignore

@@ -1,5 +1,11 @@
+# Firebase related
+lib/firebase_options_dev.dart
+lib/firebase_options.dart
+*.json
+
 # Miscellaneous
 *.class
+*.lock
 *.log
 *.pyc
 *.swp
@@ -8,19 +14,36 @@
 .buildlog/
 .history
 .svn/
-.android/
-.ios/
+
 # IntelliJ related
 *.iml
 *.ipr
 *.iws
-.idea/
+.idea/*
+
+# Visual Studio Code related
+.classpath
+.project
+.settings/
+.vscode/*
 
+# Flutter repo-specific
+/bin/cache/
+/bin/mingit/
+/dev/benchmarks/mega_gallery/
+/dev/bots/.recipe_deps
+/dev/bots/android_tools/
+/dev/docs/doc/
+/dev/docs/flutter.docs.zip
+/dev/docs/lib/
+/dev/docs/pubspec.yaml
+/dev/integration_tests/**/xcuserdata
+/dev/integration_tests/**/Pods
+/packages/flutter/coverage/
+version
 
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
+# packages file containing multi-root paths
+.packages.generated
 
 # Flutter/Dart/Pub related
 **/doc/api/
@@ -31,7 +54,61 @@
 .packages
 .pub-cache/
 .pub/
-/build/
+build/
+flutter_*.png
+linked_*.ds
+unlinked.ds
+unlinked_spec.ds
+.fvm/
+
+# Android related
+**/android/**/gradle-wrapper.jar
+**/android/.gradle
+**/android/captures/
+**/android/gradlew
+**/android/gradlew.bat
+**/android/local.properties
+**/android/**/GeneratedPluginRegistrant.java
+**/android/key.properties
+**/android/.idea/
+*.jks
+
+# iOS/XCode related
+**/ios/**/*.mode1v3
+**/ios/**/*.mode2v3
+**/ios/**/*.moved-aside
+**/ios/**/*.pbxuser
+**/ios/**/*.perspectivev3
+**/ios/**/*sync/
+**/ios/**/.sconsign.dblite
+**/ios/**/.tags*
+**/ios/**/.vagrant/
+**/ios/**/DerivedData/
+**/ios/**/Icon?
+**/ios/**/Pods/
+**/ios/**/.symlinks/
+**/ios/**/profile
+**/ios/**/xcuserdata
+**/ios/.generated/
+**/ios/Flutter/App.framework
+**/ios/Flutter/Flutter.framework
+**/ios/Flutter/Flutter.podspec
+**/ios/Flutter/Generated.xcconfig
+**/ios/Flutter/app.flx
+**/ios/Flutter/app.zip
+**/ios/Flutter/.last_build_id
+**/ios/Flutter/flutter_assets/
+**/ios/Flutter/flutter_export_environment.sh
+**/ios/ServiceDefinitions.json
+**/ios/Runner/GeneratedPluginRegistrant.*
+
+# Coverage
+coverage/
+
+# Submodules
+!pubspec.lock
+packages/**/pubspec.lock
+
 # Web related
 lib/generated_plugin_registrant.dart
 
@@ -40,6 +117,18 @@ app.*.symbols
 
 # Obfuscation related
 app.*.map.json
-google-services.json
-/lib/models/**/*.freezed.dart
-/lib/models/**/*.g.dart
+
+# Exceptions to the above rules.
+!**/ios/**/default.mode1v3
+!**/ios/**/default.mode2v3
+!**/ios/**/default.pbxuser
+!**/ios/**/default.perspectivev3
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+!/dev/ci/**/Gemfile.lock
+!.vscode/extensions.json
+!.vscode/launch.json
+!.idea/codeStyles/
+!.idea/dictionaries/
+!.idea/runConfigurations/
+
+

.metadata

@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: 9b2d32b605630f28625709ebd9d78ab3016b2bf6
+  channel: stable
+
+project_type: app

.vscode/extensions.json

@@ -0,0 +1,9 @@
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=827846
+  // for the documentation about the extensions.json format
+  "recommendations": [
+    "dart-code.dart-code",
+    "dart-code.flutter",
+    "felixangelov.bloc"
+  ]
+}

.vscode/launch.json

@@ -0,0 +1,34 @@
+{
+  // 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": "Launch development",
+      "request": "launch",
+      "type": "dart",
+      "program": "lib/main_development.dart",
+      "args": [
+        "--flavor",
+        "development",
+        "--target",
+        "lib/main_development.dart"
+      ]
+    },
+    {
+      "name": "Launch staging",
+      "request": "launch",
+      "type": "dart",
+      "program": "lib/main_staging.dart",
+      "args": ["--flavor", "staging", "--target", "lib/main_staging.dart"]
+    },
+    {
+      "name": "Launch production",
+      "request": "launch",
+      "type": "dart",
+      "program": "lib/main_production.dart",
+      "args": ["--flavor", "production", "--target", "lib/main_production.dart"]
+    }
+  ]
+}

Makefile

@@ -36,4 +36,7 @@ master:
 	git chechout master
 
 ready:
-	fvm flutter analyze && fvm flutter test
+	fvm flutter analyze && fvm flutter test
+
+shell:
+	./scripts/env.sh

README.md

@@ -4,19 +4,19 @@
 
 
 
- ## NEW FEATURES 
- 
-Time's Up is a mobile application developed using `flutter` to monitor the time kids 
+## NEW FEATURES
+
+Time's Up is a mobile application developed using `flutter` to monitor the time kids
 spend on screen.So far the app is only available on Android. The app can't run on iOS devices.
 The application has for sole purpose to track and record the data from the child's
 device and send it to parents. The application does not violate the `privacy policies`
-settled for user, and doesn't collect data for third parties companies. 
+settled for user, and doesn't collect data for third parties companies.
+
+####  🚀 V2.0.0
 
- ####  🚀 V2.0.0 
-
- ##### Planned Features: 
-- App Icons 📱  
-- App Usage Metrics 📈 
+##### Planned Features:
+- App Icons 📱
+- App Usage Metrics 📈
 - Setting page (Update Profile) 🚹
 - Contact Us page📩
 - Dark Mode 🌘
@@ -25,7 +25,7 @@ settled for user, and doesn't collect data for third parties companies.
 - Marker image (Child's Picture) on Map 🗺
 - Email follow up for weekly report 📨
 - Location Tracking 📍
-- Notification 🔔 
+- Notification 🔔
 
 
 ## Screenshot
@@ -44,7 +44,7 @@ to control pages is [BLoC](https://bloclibrary.dev/#/). It is the perfect tool i
 Specific ENUMS cases.
 
 
-## Packages 
+## Packages
 
 - [firebase auth](https://pub.dev/packages/firebase_auth) for authentication
 - [provider](https://pub.dev/packages/provider) for state management
@@ -55,10 +55,10 @@ Specific ENUMS cases.
 - [shared_preferences](https://pub.dev/packages/shared_preferences) for String and bool caching
 - [share_plus](https://pub.dev/packages/share_plus) for sharing Child's code
 
-## Contribution 
+## Contribution
 
 To contribute to the project you can join the discord server:
-Jordyhers https://discord.gg/WaF54U9x 
+Jordyhers https://discord.gg/WaF54U9x
 
 
 ## License 

analysis_options.yaml

@@ -1,19 +1,17 @@
-include: package:pedantic/analysis_options.1.9.0.yaml
-
+include: package:very_good_analysis/analysis_options.4.0.0.yaml
 linter:
   rules:
-    - require_trailing_commas
-    - prefer_const_declarations
-    - lines_longer_than_80_chars
-    - always_declare_return_types
-    - prefer_final_fields
-    - prefer_single_quotes
-    - file_names
-    - avoid_print
+    public_member_api_docs: false
+    sort_pub_dependencies: false
 
 analyzer:
   exclude:
     - '**.freezed.dart'
     - '**.g.dart'
     - '**.gr.dart'
+    - '**/main_staging.dart'
+    - '**/main_development.dart'
+    - '**/main_production.dart'
     - '**/generated_plugin_registrant.dart'
+    - '**/firebase_options_dev.dart'
+    - '**/firebase_options.dart'

android/.gitignore

@@ -9,4 +9,5 @@ GeneratedPluginRegistrant.java
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
 key.properties
-google-services.json
+**/*.keystore
+**/*.jks