Merge branch 'development' into test/application

CollActionteam · Jun 29, 2022 · d371019 · d371019
2 parents 3b75b91 + 1420b0f
commit d371019
Show file tree

Hide file tree

Showing 17 changed files with 362 additions and 183 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ on:
   workflow_dispatch:
 
 env:
-  flutter_version: "2.10.x"
+  flutter_version: "3.0.x"
   flutter_channel: "stable"
   java_version: "12.x"
 

diff --git a/docs/README.md b/docs/README.md
@@ -73,6 +73,14 @@ To generate the OpenSource licenses dart file via [flutter_oss_licenses](https:/
 
 >Note: Run `flutter format .` once  [oss_licenses.dart](../lib/presentation/licenses/oss_licenses.dart) is created.
 
+## Running tests and generating Test Report
+
+- Step 1: Just for the 1st time, to make sure that all files are included, run ```./.github/scripts/coverage_gen.sh``` to generate a report for the whole project.
+- Step 2: Run ```flutter test --coverage```. This will generate the report locally.
+- Step 3: Run ```genhtml coverage/lcov.info -o coverage```.
+- Step 4: Run ``` firefox coverage/index.html``` (or run ```coverage/index.html``` to any of your web browser).
+#### You should see the coverage of your tests line-wise in Codecov.
+
 ## Getting Started with Flutter
 
 A few resources to get you started if this is your first Flutter project:

diff --git a/lib/domain/user/user.dart b/lib/domain/user/user.dart
@@ -10,7 +10,7 @@ class User with _$User {
   @visibleForTesting
   // ignore: avoid_positional_boolean_parameters
   static Future<String?> getAnonymousIdToken([bool forceRefresh = false]) =>
-      Future.value(null);
+      Future.value();
 
   static const User anonymous = User(
     id: 'anonymous',

diff --git a/lib/presentation/home/home_screen.dart b/lib/presentation/home/home_screen.dart
@@ -19,7 +19,7 @@ class _HomePageState extends State<HomePage> {
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance?.addPostFrameCallback((_) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
       checkAndMaybeShowOnboarding();
     });
   }

diff --git a/lib/presentation/shared_widgets/photo_selector.dart b/lib/presentation/shared_widgets/photo_selector.dart
@@ -121,29 +121,31 @@ class _PhotoSelectorState extends State<PhotoSelector> {
 
   final _compression = 100;
   Future<void> _cropImage(XFile image) async {
-    final File? croppedFile = await ImageCropper.cropImage(
+    final CroppedFile? croppedFile = await ImageCropper().cropImage(
       sourcePath: image.path,
       aspectRatio: const CropAspectRatio(ratioX: 1, ratioY: 1),
       aspectRatioPresets: [CropAspectRatioPreset.square],
       compressFormat: ImageCompressFormat.png,
       maxWidth: 1023,
       maxHeight: 1023,
       compressQuality: _compression,
-      androidUiSettings: const AndroidUiSettings(
-        toolbarTitle: 'Profile Photo',
-        toolbarColor: kAccentColor,
-        toolbarWidgetColor: Colors.white,
-        lockAspectRatio: true,
-      ),
-      iosUiSettings: const IOSUiSettings(
-        minimumAspectRatio: 1.0,
-        aspectRatioLockEnabled: true,
-        title: 'Profile Photo',
-      ),
+      uiSettings: [
+        AndroidUiSettings(
+          toolbarTitle: 'Profile Photo',
+          toolbarColor: kAccentColor,
+          toolbarWidgetColor: Colors.white,
+          lockAspectRatio: true,
+        ),
+        IOSUiSettings(
+          minimumAspectRatio: 1.0,
+          aspectRatioLockEnabled: true,
+          title: 'Profile Photo',
+        ),
+      ],
     );
 
     if (widget.onSelected != null && croppedFile != null) {
-      widget.onSelected!(croppedFile);
+      widget.onSelected!(File(croppedFile.path));
     }
   }