feat: fix dependencies and support unit tests for app #619 #1131

.gitignore

@@ -50,6 +50,8 @@ dist/
 **/ios/Runner/GoogleService-Info.plist
 **/ios/Config/*
 **/ios/Config/**/*
+**/ios/ogg.xcframework
+****/ios/opus.xcframework
 
 # macOS specific
 **/macos/**/Pods/
@@ -63,6 +65,7 @@ dist/
 **/macos/.generated/
 **/macos/Runner.xcworkspace
 **/macos/**/GeneratedPluginRegistrant.*
+**/macos/Runner/GoogleService-Info.plist
 
 # Linux specific
 **/linux/.dart_tool/
@@ -112,6 +115,7 @@ src/recordings
 
 # test output
 test/recordings
+app/coverage
 
 # Flutter
 env.g.dart

app/Makefile

@@ -0,0 +1,19 @@
+.PHONY: test build clean
+
+test:
+	@echo "🧪 Running tests..."
+	@dart run build_runner build --delete-conflicting-outputs
+	@if ! ./test.sh; then \
+		echo "❌ Tests failed"; \
+		exit 1; \
+	fi
+
+build:
+	@echo "🏗️ Building..."
+	@dart run build_runner build --delete-conflicting-outputs
+
+clean:
+	@echo "🧹 Cleaning..."
+	@flutter clean
+	@rm -rf coverage
+	@rm -rf build

app/integration_test/app_test.dart

@@ -0,0 +1,18 @@
+import 'package:integration_test/integration_test.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:friend_private/main.dart';
+import 'package:flutter/material.dart';
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+  group('Full App Tests', () {
+    testWidgets('App shows onboarding flow', (tester) async {
+      await tester.pumpWidget(const MyApp());
+      await tester.pumpAndSettle();
+
+      // Test full app flow with real dependencies
+      expect(find.byType(DeciderWidget), findsOneWidget);
+    });
+  });
+}

app/ios/Podfile

@@ -4,6 +4,14 @@ platform :ios, '15.0'
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
 
+# Add script to download XCFrameworks
+def download_xcframework(url, name)
+	system("echo downloading #{url}")
+  system("curl -L #{url} -o #{name}.xcframework.zip")
+  system("unzip -o #{name}.xcframework.zip")
+  system("rm #{name}.xcframework.zip")
+end
+
 project 'Runner', {
   'Debug-prod' => :debug,
   'Profile-prod' => :release,
@@ -30,6 +38,10 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
 
 flutter_ios_podfile_setup
 
+# Download XCFrameworks before installing pods
+download_xcframework("https://github.com/sbooth/opus-binary-xcframework/releases/download/0.2.0/opus.xcframework.zip", "opus")
+download_xcframework("https://github.com/sbooth/ogg-binary-xcframework/releases/download/0.1.0/ogg.xcframework.zip", "ogg")
+
 target 'Runner' do
   use_frameworks! :linkage => :static
   use_modular_headers!
@@ -42,6 +54,13 @@ post_install do |installer|
     flutter_additional_ios_build_settings(target)
     target.build_configurations.each do |config|
       config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
+      # Add framework search paths for manually added XCFrameworks
+      config.build_settings['FRAMEWORK_SEARCH_PATHS'] ||= ['$(inherited)']
+      config.build_settings['FRAMEWORK_SEARCH_PATHS'] << '$(PROJECT_DIR)'
+      # Add specific settings for opus and ogg
+      config.build_settings['OTHER_LDFLAGS'] ||= ['$(inherited)']
+      config.build_settings['OTHER_LDFLAGS'] << '-framework opus'
+      config.build_settings['OTHER_LDFLAGS'] << '-framework ogg'
       config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
         '$(inherited)',
 
@@ -50,7 +69,7 @@ post_install do |installer|
 
         # dart: PermissionGroup.bluetooth
         'PERMISSION_BLUETOOTH=1',
-        
+
         ## The 'PERMISSION_LOCATION' macro enables the `locationWhenInUse` and `locationAlways` permission. If
         ## the application only requires `locationWhenInUse`, only specify the `PERMISSION_LOCATION_WHENINUSE`
         ## macro.

app/lib/main.dart

@@ -298,7 +298,24 @@ class _DeciderWidgetState extends State<DeciderWidget> {
         if (SharedPreferencesUtil().onboardingCompleted && authProvider.user != null) {
           return const HomePageWrapper();
         } else {
-          return const OnboardingWrapper();
+          return LayoutBuilder(
+            builder: (context, constraints) {
+              return SingleChildScrollView(
+                child: ConstrainedBox(
+                  constraints: BoxConstraints(
+                    minHeight: constraints.maxHeight,
+                    minWidth: constraints.maxWidth,
+                  ),
+                  child: IntrinsicHeight(
+                    child: DefaultTextStyle(
+                      style: Theme.of(context).textTheme.bodyMedium!,
+                      child: const OnboardingWrapper(),
+                    ),
+                  ),
+                ),
+              );
+            },
+          );
         }
       },
     );
@@ -308,12 +325,16 @@ class _DeciderWidgetState extends State<DeciderWidget> {
 class CustomErrorWidget extends StatelessWidget {
   final String errorMessage;
 
-  const CustomErrorWidget({super.key, required this.errorMessage});
+  const CustomErrorWidget({
+    super.key,
+    required this.errorMessage,
+  });
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      body: Center(
+    return Center(
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
@@ -322,48 +343,19 @@ class CustomErrorWidget extends StatelessWidget {
               color: Colors.red,
               size: 50.0,
             ),
-            const SizedBox(height: 10.0),
+            const SizedBox(height: 16.0),
             const Text(
               'Something went wrong! Please try again later.',
               textAlign: TextAlign.center,
               style: TextStyle(fontSize: 18.0, fontWeight: FontWeight.bold),
             ),
-            const SizedBox(height: 10.0),
-            Container(
-              padding: const EdgeInsets.all(10),
-              margin: const EdgeInsets.all(16),
-              height: 200,
-              decoration: BoxDecoration(
-                color: const Color.fromARGB(255, 63, 63, 63),
-                borderRadius: BorderRadius.circular(10),
-              ),
-              child: Text(
-                errorMessage,
-                textAlign: TextAlign.start,
-                style: const TextStyle(fontSize: 16.0),
-              ),
-            ),
-            const SizedBox(height: 10.0),
-            SizedBox(
-              width: 210,
-              child: ElevatedButton(
-                style: ElevatedButton.styleFrom(backgroundColor: Colors.red),
-                onPressed: () {
-                  Clipboard.setData(ClipboardData(text: errorMessage));
-                  ScaffoldMessenger.of(context).showSnackBar(
-                    const SnackBar(
-                      content: Text('Error message copied to clipboard'),
-                    ),
-                  );
-                },
-                child: const Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: [
-                    Text('Copy error message'),
-                    SizedBox(width: 10),
-                    Icon(Icons.copy_rounded),
-                  ],
+            const SizedBox(height: 16.0),
+            Expanded(
+              child: SingleChildScrollView(
+                key: const Key('error_message_scroll_view'),
+                child: Text(
+                  errorMessage,
+                  style: const TextStyle(fontSize: 16.0),
                 ),
               ),
             ),

app/pubspec.yaml

@@ -11,7 +11,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  
+
   # State Management
   provider: ^6.1.2
   flutter_provider_utilities: ^1.0.6
@@ -20,7 +20,7 @@ dependencies:
   flutter_localizations:
     sdk: flutter
 
-  # UI 
+  # UI
   auto_size_text: 3.0.0
   lottie: ^3.1.2
   expandable_text: ^2.3.0
@@ -126,6 +126,7 @@ dev_dependencies:
   envied_generator: ^0.5.4+1
   build_runner: ^2.4.11
   flutter_flavorizr: ^2.2.3
+  mockito: ^5.4.4
 
 
 flutter_launcher_icons:
@@ -155,23 +156,23 @@ flutter:
   fonts:
     - family: 'SF Pro Display'
       fonts:
-        - asset: assets/fonts/SFPRODISPLAYTHINITALIC.OTF
+        - asset: assets/fonts/SFProDisplayThinItalic.otf
           weight: 100
           style: italic
-        - asset: assets/fonts/SFPRODISPLAYLIGHTITALIC.OTF
+        - asset: assets/fonts/SFProDisplayLightItalic.otf
           weight: 300
           style: italic
-        - asset: assets/fonts/SFPRODISPLAYREGULAR.OTF
-        - asset: assets/fonts/SFPRODISPLAYHEAVYITALIC.OTF
+        - asset: assets/fonts/SFProDisplayRegular.otf
+        - asset: assets/fonts/SFProDisplayHeavyItalic.otf
           style: italic
-        - asset: assets/fonts/SFPRODISPLAYMEDIUM.OTF
+        - asset: assets/fonts/SFProDisplayMedium.otf
           weight: 500
-        - asset: assets/fonts/SFPRODISPLAYSEMIBOLDITALIC.OTF
+        - asset: assets/fonts/SFProDisplaySemiboldItalic.otf
           weight: 600
           style: italic
-        - asset: assets/fonts/SFPRODISPLAYBOLD.OTF
+        - asset: assets/fonts/SFProDisplayBold.otf
           weight: 700
-        - asset: assets/fonts/SFPRODISPLAYBLACKITALIC.OTF
+        - asset: assets/fonts/SFProDisplayBlackItalic.otf
           weight: 900
           style: italic
 

app/test.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+echo "🚀 Starting test suite..."
+
+# Clean and rebuild mocks
+echo "🔨 Generating mocks..."
+dart run build_runner build --delete-conflicting-outputs
+
+# Function to run tests with proper output formatting
+run_test() {
+    echo "🧪 Running tests for: $1"
+    flutter test "$1" --coverage
+}
+
+# Run all test files
+echo "📋 Running all tests..."
+
+# Core tests
+run_test "test/app_test.dart"
+
+# Provider tests
+run_test "test/providers/auth_provider_test.dart"
+run_test "test/providers/capture_provider_test.dart"
+run_test "test/providers/memory_provider_test.dart"
+
+# Service tests
+run_test "test/services/device_connection_test.dart"
+run_test "test/services/notifications_test.dart"
+
+# Schema tests
+run_test "test/backend/schema/message_test.dart"
+
+# Combine coverage data
+if [ -d "coverage" ]; then
+    echo "📊 Generating combined coverage report..."
+    lcov -a coverage/lcov.info -o coverage/lcov_combined.info
+    genhtml coverage/lcov_combined.info -o coverage/html --no-function-coverage
+    echo "Coverage report generated in coverage/html"
+fi
+
+# Check if any test failed
+if [ $? -eq 0 ]; then
+    echo "✅ All tests completed successfully!"
+else
+    echo "❌ Some tests failed!"
+    exit 1
+fi