Merge remote-tracking branch 'origin/main'

BasedHardware · Aug 25, 2024 · eb41f1d · eb41f1d
2 parents 8aea49b + 23a661d
commit eb41f1d
Show file tree

Hide file tree

Showing 37 changed files with 3,190 additions and 2,410 deletions.
diff --git a/app/analysis_options.yaml b/app/analysis_options.yaml
@@ -24,6 +24,8 @@ linter:
     # avoid_print: false  # Uncomment to disable the `avoid_print` rule
     # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
     unnecessary_string_escapes: false
+    # always_declare_return_types: true
+    # prefer_const_declarations: true
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj
@@ -1843,4 +1843,4 @@
 /* End XCConfigurationList section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}
+}
diff --git a/app/lib/backend/http/api/plugins.dart b/app/lib/backend/http/api/plugins.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:developer';
 
 import 'package:flutter/material.dart';
 import 'package:friend_private/backend/http/shared.dart';
@@ -16,6 +17,7 @@ Future<List<Plugin>> retrievePlugins() async {
   );
   if (response?.statusCode == 200) {
     try {
+      log('plugins: ${response?.body}');
       var plugins = Plugin.fromJsonList(jsonDecode(response!.body));
       SharedPreferencesUtil().pluginsList = plugins;
       return plugins;

diff --git a/app/lib/backend/http/shared.dart b/app/lib/backend/http/shared.dart
@@ -55,7 +55,7 @@ Future<http.Response?> makeApiCall({
       throw Exception('Unsupported HTTP method: $method');
     }
   } catch (e, stackTrace) {
-    debugPrint('HTTP request failed: $e');
+    debugPrint('HTTP request failed: $e, $stackTrace');
     CrashReporting.reportHandledCrash(
       e,
       stackTrace,

diff --git a/app/lib/env/env.dart b/app/lib/env/env.dart
@@ -15,8 +15,9 @@ abstract class Env {
 
   static String? get mixpanelProjectToken => _instance.mixpanelProjectToken;
 
-  static String? get apiBaseUrl => _instance.apiBaseUrl;
+  // static String? get apiBaseUrl => _instance.apiBaseUrl;
 
+  static String? get apiBaseUrl => 'https://based-hardware-development--backened-dev-api.modal.run/';
   // static String? get apiBaseUrl => 'https://camel-lucky-reliably.ngrok-free.app/';
 
   static String? get growthbookApiKey => _instance.growthbookApiKey;

diff --git a/app/lib/main.dart b/app/lib/main.dart
@@ -16,7 +16,14 @@ import 'package:friend_private/firebase_options_prod.dart' as prod;
 import 'package:friend_private/flavors.dart';
 import 'package:friend_private/pages/home/page.dart';
 import 'package:friend_private/pages/onboarding/wrapper.dart';
+import 'package:friend_private/providers/auth_provider.dart';
+import 'package:friend_private/providers/capture_provider.dart';
+import 'package:friend_private/providers/device_provider.dart';
 import 'package:friend_private/providers/home_provider.dart';
+import 'package:friend_private/providers/memory_provider.dart';
+import 'package:friend_private/providers/message_provider.dart';
+import 'package:friend_private/providers/onboarding_provider.dart';
+import 'package:friend_private/providers/plugin_provider.dart';
 import 'package:friend_private/services/notification_service.dart';
 import 'package:friend_private/utils/analytics/growthbook.dart';
 import 'package:friend_private/utils/analytics/mixpanel.dart';
@@ -125,6 +132,30 @@ class _MyAppState extends State<MyApp> {
   Widget build(BuildContext context) {
     return MultiProvider(
         providers: [
+          ChangeNotifierProvider(create: (context) => AuthenticationProvider()),
+          // ChangeNotifierProvider(create: (context) => DeviceProvider()),
+          ChangeNotifierProvider(create: (context) => MemoryProvider()),
+          ListenableProvider(create: (context) => PluginProvider()),
+          ChangeNotifierProxyProvider<PluginProvider, MessageProvider>(
+            create: (context) => MessageProvider(),
+            update: (BuildContext context, value, MessageProvider? previous) =>
+                (previous?..updatePluginProvider(value)) ?? MessageProvider(),
+          ),
+          ChangeNotifierProxyProvider2<MemoryProvider, MessageProvider, CaptureProvider>(
+            create: (context) => CaptureProvider(),
+            update: (BuildContext context, memory, message, CaptureProvider? previous) =>
+                (previous?..updateProviderInstances(memory, message)) ?? CaptureProvider(),
+          ),
+          ChangeNotifierProxyProvider<CaptureProvider, DeviceProvider>(
+            create: (context) => DeviceProvider(),
+            update: (BuildContext context, value, DeviceProvider? previous) =>
+                (previous?..setProvider(value)) ?? DeviceProvider(),
+          ),
+          ChangeNotifierProxyProvider<DeviceProvider, OnboardingProvider>(
+            create: (context) => OnboardingProvider(),
+            update: (BuildContext context, value, OnboardingProvider? previous) =>
+                (previous?..setDeviceProvider(value)) ?? OnboardingProvider(),
+          ),
           ListenableProvider(create: (context) => HomeProvider()),
         ],
         builder: (context, child) {
@@ -196,4 +227,4 @@ class _MyAppState extends State<MyApp> {
 //     ));
 //     audioSession.setActive(true);
 //   });
-// }
+// }