ft => 🤘 Merge ios_updates to main

ios/Runner/AppDelegate.swift

@@ -9,10 +9,16 @@ import GoogleMaps
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-
     FirebaseApp.configure()
+
+    // Extra Stuff
     GMSServices.provideAPIKey("AIzaSyCzj49x2EaAt7T3G6fTQQU06m9bwAls2AA")
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
+
+    override func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+            let firebaseAuth = Auth.auth()
+            firebaseAuth.setAPNSToken(deviceToken, type: AuthAPNSTokenType.unknown)
+    }
 }

ios/Runner/Runner.entitlements

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>aps-environment</key>
-	<string>development</string>
+	<string>unknown</string>
 </dict>
 </plist>

lib/models/user/user.model.dart

@@ -28,6 +28,24 @@ class User {
     );
   }
 
+  User copyWith({
+    String? id,
+    String? name,
+    String? picturePath,
+    String? phone,
+    DateTime? joined,
+    int? credits,
+  }) {
+    return User(
+      id: id ?? this.id,
+      name: name ?? this.name,
+      phone: phone ?? this.phone,
+      picturePath: this.picturePath,
+      joined: joined ?? this.joined,
+      credits: credits ?? this.credits,
+    );
+  }
+
   Map<String, dynamic> toMap() => {
         "id": id,
         "name": name,

lib/neuances.dart

@@ -10,15 +10,18 @@ final Uri kRateAppUrl = Uri.parse("https://joinsafe.me");
 final Uri kGitHubUrl = Uri.parse("https://github.com/safedotme/safe");
 final Uri kEmailUrl = Uri.parse("mailto:[email protected]");
 final Uri kStoryUrl = Uri.parse("https://docs.joinsafe.me/story");
-const String kAppVersion = "1.0.1";
+const String kAppVersion = "1.0.0";
 final Uri kMarcoCalzadaMemory = Uri.parse("https://youtu.be/GVdFoKvmMtU");
 final Uri kTermsOfService = Uri.parse(
   "https://docs.joinsafe.me/termsofservice",
 );
 final Uri kPrivacyPolicy = Uri.parse("https://docs.joinsafe.me/privacy");
 final Uri kMediaKit = Uri.parse("https://docs.joinsafe.me/media-kit");
 final Uri kCollaborators = Uri.parse("https://docs.joinsafe.me/collaborators");
+final Uri kDeleteIncident =
+    Uri.parse("https://docs.joinsafe.me/deletion-policy");
 final Uri kHelpCenter = Uri.parse("https://docs.joinsafe.me");
 final Uri kGiveFeedback = Uri.parse(
   "https://docs.joinsafe.me/contributors",
 );
+final Uri kWidgetInfo = Uri.parse("https://docs.joinsafe.me/widget");

lib/screens/auth/local_widgets/legal_checkmark.widget.dart

@@ -0,0 +1,60 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:safe/core.dart';
+import 'package:safe/utils/constants/constants.util.dart';
+import 'package:safe/utils/icon/icon.util.dart';
+import 'package:safe/widgets/mutable_icon/mutable_icon.widget.dart';
+
+class LegalCheckmark extends StatefulWidget {
+  final bool isAllowed;
+
+  LegalCheckmark(this.isAllowed);
+
+  @override
+  State<LegalCheckmark> createState() => _LegalCheckmarkState();
+}
+
+class _LegalCheckmarkState extends State<LegalCheckmark> {
+  late Core core;
+
+  @override
+  void initState() {
+    core = Provider.of<Core>(context, listen: false);
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: 22,
+      width: 22,
+      decoration: BoxDecoration(
+        border: !widget.isAllowed
+            ? Border.all(
+                width: kBorderWidth,
+                color: kColorMap[MutableColor.neutral4]!,
+              )
+            : Border.all(
+                width: kBorderWidth,
+                color: Colors.white.withOpacity(0.3),
+              ),
+        boxShadow:
+            widget.isAllowed ? core.utils.color.applyGradientShadow(20) : null,
+        image: widget.isAllowed
+            ? DecorationImage(
+                image: AssetImage("assets/images/gradient.png"),
+              )
+            : null,
+        borderRadius: BorderRadius.circular(6),
+      ),
+      child: widget.isAllowed
+          ? Center(
+              child: MutableIcon(
+              MutableIcons.checkmark,
+              size: Size(12, 12),
+              color: kIconColorInGradientFill,
+            ))
+          : null,
+    );
+  }
+}

lib/screens/auth/local_widgets/legal_checkpoint.widget.dart

@@ -0,0 +1,71 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:provider/provider.dart';
+import 'package:safe/core.dart';
+import 'package:safe/neuances.dart';
+import 'package:safe/screens/auth/local_widgets/legal_checkmark.widget.dart';
+import 'package:safe/utils/constants/constants.util.dart';
+import 'package:safe/widgets/mutable_button/mutable_button.widget.dart';
+import 'package:safe/widgets/mutable_text/mutable_text.widget.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+class LegalCheckpoint extends StatefulWidget {
+  @override
+  State<LegalCheckpoint> createState() => _LegalCheckpointState();
+}
+
+class _LegalCheckpointState extends State<LegalCheckpoint> {
+  late Core core;
+
+  @override
+  void initState() {
+    core = Provider.of<Core>(context, listen: false);
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      margin: EdgeInsets.only(bottom: 12),
+      padding: EdgeInsets.all(10),
+      decoration: BoxDecoration(
+        color: kColorMap[MutableColor.neutral8]!.withOpacity(0.15),
+        border: Border.all(
+          width: kBorderWidth,
+          color: kColorMap[MutableColor.neutral8]!,
+        ),
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Row(
+        children: [
+          MutableButton(
+            scale: 0.9,
+            onTap: () {
+              core.state.auth.setAcceptedLegal(
+                !core.state.auth.acceptedLegal,
+              );
+            },
+            child: Observer(
+              builder: (_) => LegalCheckmark(core.state.auth.acceptedLegal),
+            ),
+          ),
+          SizedBox(width: 10),
+          Expanded(
+              child: MutableButton(
+            onTap: () {
+              launchUrl(kTermsOfService);
+            },
+            child: MutableText(
+              core.utils.language
+                      .langMap[core.state.preferences.language]!["auth"]
+                  ["phone_verification"]["terms"],
+              size: 12,
+              weight: TypeWeight.medium,
+              color: MutableColor.neutral2,
+            ),
+          )),
+        ],
+      ),
+    );
+  }
+}

lib/screens/auth/phone_verification.screen.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:provider/provider.dart';
 import 'package:safe/core.dart';
-import 'package:safe/neuances.dart';
+import 'package:safe/screens/auth/local_widgets/legal_checkpoint.widget.dart';
 import 'package:safe/utils/constants/constants.util.dart';
 import 'package:safe/utils/icon/icon.util.dart';
 import 'package:safe/widgets/mutable_banner/mutable_banner.widget.dart';
@@ -11,7 +11,6 @@ import 'package:safe/widgets/mutable_popup/mutable_popup.widget.dart';
 import 'package:safe/widgets/mutable_submit_textfield_button/mutable_submit_textfield_button.widget.dart';
 import 'package:safe/widgets/mutable_text_field/local_widgets/phone_extention_display.widget.dart';
 import 'package:safe/widgets/mutable_text_field/mutable_text_field.widget.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 class PhoneVerificationScreen extends StatefulWidget {
   @override
@@ -88,6 +87,11 @@ class _PhoneVerificationScreenState extends State<PhoneVerificationScreen>
   }
 
   void submit() async {
+    if (!core.state.auth.acceptedLegal) {
+      handleError("not-accepted-legal");
+      return;
+    }
+
     if (core.state.auth.authType == AuthType.login) {
       bool userExists = await checkUserExists(
           "${core.state.auth.countryDialCode} ${core.state.auth.phoneNumber}");
@@ -237,12 +241,7 @@ class _PhoneVerificationScreenState extends State<PhoneVerificationScreen>
             ],
           ),
         ),
-        aboveButtonText: core.utils.language
-                .langMap[core.state.preferences.language]!["auth"]
-            ["phone_verification"]["terms"],
-        aboveButtonOnTap: () {
-          launchUrl(kTermsOfService);
-        },
+        aboveButtonWidget: LegalCheckpoint(),
         resizeToAvoidBottomInsets: true,
         // Display related properties
         title: core.utils.language

lib/screens/home/home.screen.dart

@@ -1,6 +1,5 @@
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart' hide BoxShadow;
-import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:provider/provider.dart';
 import 'package:safe/core.dart';
@@ -15,6 +14,7 @@ import 'package:safe/screens/home/local_widgets/incident_limit_home_banner.widge
 import 'package:safe/screens/home/local_widgets/event_home_banner.widget.dart.dart';
 import 'package:safe/screens/home/local_widgets/tutorial_banner.widget.dart';
 import 'package:safe/screens/incident/incident.screen.dart';
+import 'package:safe/screens/incident/local_widgets/widget_showcase_popup.widget.dart';
 import 'package:safe/screens/incident_log/incident_log.screen.dart';
 import 'package:safe/screens/play/play.screen.dart';
 import 'package:safe/screens/settings/settings.screen.dart';
@@ -153,6 +153,7 @@ class _HomeScreenState extends State<HomeScreen> {
         ContactScreen(),
         ContactEditorScreen(),
         ImportContactPopup(),
+        WidgetShowcasePopup(),
         CustomCupertinoContactPopup(),
         ContactCountryCodeSelector(),
         CaptureScreen(),
@@ -201,8 +202,6 @@ class _HomeScreenState extends State<HomeScreen> {
                 duration: kFadeInDuration,
                 child: MutableSafeButton(
                   onTap: () async {
-                    HapticFeedback.heavyImpact();
-
                     bool shouldCapture = await core.utils.credit.shouldCapture(
                       TriggerIdentifier.primary,
                       core,

lib/screens/home/local_widgets/incident_limit_home_banner.widget.dart

@@ -5,8 +5,10 @@ import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
 import 'package:safe/core.dart';
+import 'package:safe/services/analytics/helper_classes/analytics_log_model.service.dart';
 import 'package:safe/utils/constants/constants.util.dart';
 import 'package:safe/utils/credit/credit.util.dart';
+import 'package:safe/widgets/mutable_banner/mutable_banner.widget.dart';
 import 'package:safe/widgets/mutable_home_message.widget.dart/mutable_home_banner.widget.dart';
 import 'package:safe/widgets/mutable_pill/mutable_pill.widget.dart';
 import 'package:safe/widgets/mutable_text/mutable_text.widget.dart';
@@ -110,7 +112,23 @@ class _IncidentLimitHomeBannerState extends State<IncidentLimitHomeBanner> {
           }
 
           if (core.state.capture.limErrState == LimitErrorState.maxed) {
-            core.state.incidentLog.controller.open();
+            core.services.analytics.log(
+              AnalyticsLog(
+                channel: "request-credits",
+                event: "maxed-credit-request",
+                description: "User has requested incident credits.",
+                tags: {
+                  "userid": core.services.auth.currentUser!.uid,
+                },
+                icon: "💰",
+              ),
+            );
+
+            core.state.preferences.actionController.trigger(
+              core.utils.language.langMap[core.state.preferences.language]![
+                  "credit_request"]["notification"]!,
+              MessageType.success,
+            );
             return;
           }
         },