add logincount and update cms accordingly

firecms/deploy.txt

@@ -0,0 +1,3 @@
+yarn run build
+firebase deploy --only hosting
+

firecms/src/App.tsx

@@ -43,6 +43,7 @@ type FredericUser = {
   // email: string,
   has_purchased: boolean,
   last_login: Date,
+  login_count: number,
   last_os: string,
   last_os_version: string,
   is_developer: boolean,
@@ -314,6 +315,11 @@ const usersCollection = buildCollection<FredericUser>({
       model: "date_time",
       readOnly: true
     }),
+    login_count: buildProperty({
+      name: "Login Count",
+      dataType: "number",
+      readOnly: true
+    }),
     should_reload_data: buildProperty({
       name: "Should reload data",
       dataType: "boolean"

lib/backend/analytics/frederic_analytics_service.dart

@@ -159,7 +159,7 @@ abstract class FredericAnalyticsService {
 //   // Future<void> logEnterHomeScreen() {
 //   //   return analytics.setCurrentScreen(screenName: 'Home');
 //   // }
-//   //
+//   //e
 //   // Future<void> logChangeColorTheme(FredericColorTheme theme) {
 //   //   return analytics.logEvent(
 //   //       name: 'change_color_theme', parameters: {'theme': theme.name});
@@ -189,7 +189,7 @@ class UmamiAnalyticsService extends FredericAnalyticsService {
         }));
 
     if (kDebugMode) {
-      // enabled = false;
+      enabled = false;
     }
   }
 

lib/backend/database/firebase/firebase_auth_interface.dart

@@ -124,6 +124,7 @@ class FirebaseAuthInterface implements FredericAuthInterface {
         'last_login': Timestamp.now(),
         'last_os': Platform.operatingSystem,
         'last_os_version': Platform.operatingSystemVersion,
+        'login_count': FieldValue.increment(1),
       });
 
       if (_box == null) _box = await Hive.openBox(_name);
@@ -233,6 +234,10 @@ class FirebaseAuthInterface implements FredericAuthInterface {
       //TODO: find a way to move this to another class
       //TODO: this breaks the abstraction of the auth interface maybe?
       'has_purchased': trialEnabled ? false : true,
+      'last_login': Timestamp.now(),
+      'last_os': Platform.operatingSystem,
+      'last_os_version': Platform.operatingSystemVersion,
+      'login_count': 1,
     });
 
     final userDocument =

lib/misc/bottom_sheet.dart

@@ -1,17 +1,23 @@
+import 'package:cupertino_modal_sheet/cupertino_modal_sheet.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:sheet/route.dart';
-import 'package:sheet/sheet.dart';
 
 Future<void> showFredericBottomSheet(
     {required BuildContext context,
     bool enableDrag = false,
-    bool isDismissible = false,
+    bool isDismissible = true,
     required Widget Function(BuildContext) builder}) {
   HapticFeedback.lightImpact();
-  return Navigator.of(context)
-      .push(CupertinoSheetRoute<void>(builder: builder));
+
+  return showCupertinoModalSheet(
+    context: context,
+    builder: builder,
+    barrierDismissible: isDismissible,
+  );
+
+  // return Navigator.of(context)
+  //     .push(CupertinoSheetRoute<void>(builder: builder));
   // Navigator.of(context)
   //     .push(SheetRoute<void>(builder: builder, draggable: enableDrag));
 }

pubspec.yaml

@@ -66,6 +66,8 @@ dependencies:
   introduction_screen: ^3.1.12
   cached_network_image: ^3.3.0
 
+
+  cupertino_modal_sheet: ^1.1.0
   sheet:
     git:
       url: https://github.com/jamesblasco/modal_bottom_sheet.git