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

.gitignore

@@ -23,6 +23,10 @@ yarn.lock
 build/
 dist/
 
+# Google Services
+**/GoogleService-Info.plist
+**/google-services.json
+
 # Android specific
 **/android/**/build/
 **/android/.gradle
@@ -32,9 +36,6 @@ dist/
 **/android/**/gradle-wrapper.jar
 **/android/**/local.properties
 **/android/**/GeneratedPluginRegistrant.java
-**/android/app/google-services.json
-**/android/app/src/dev/google-services.json
-**/android/app/src/prod/google-services.json
 
 # iOS specific
 **/ios/**/Pods/
@@ -47,9 +48,10 @@ dist/
 **/ios/Runner.xcworkspace
 **/ios/**/GeneratedPluginRegistrant.*
 **/ios/**/xcuserdata
-**/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/.env.template

@@ -1,3 +1,3 @@
-OPENAI_API_KEY=
-API_BASE_URL=
-GOOGLE_MAPS_API_KEY=
+OPENAI_API_KEY="YOUR_OPENAI_API_KEY"
+API_BASE_URL="YOUR_BACKEND_DOMAIN i.e. test-omi.ngrok-free.app"
+GOOGLE_MAPS_API_KEY="YOUR_GOOGLE_MAPS_API_KEY"

app/Makefile

@@ -0,0 +1,21 @@
+.PHONY: test build clean
+
+test:
+	@echo "🧪 Running tests..."
+	@dart run build_runner build --delete-conflicting-outputs || { echo "❌ Build runner failed"; exit 1; }
+	@[ -x "$(CURDIR)/test.sh" ] || { echo "❌ test.sh not found or not executable"; exit 1; }
+	@if ! "$(CURDIR)/test.sh"; then \
+		echo "❌ Tests failed"; \
+		echo "Please check the test output above for details"; \
+		exit 1; \
+	fi
+build:
+	@echo "🏗️ Building..."
+	@dart run build_runner build --delete-conflicting-outputs || { echo "❌ Build failed"; exit 1; }
+	@echo "✅ Build completed successfully"
+clean:
+	@echo "🧹 Cleaning..."
+	@command -v flutter >/dev/null 2>&1 || { echo "❌ Flutter not found"; exit 1; }
+	@flutter clean
+	@rm -rf coverage build 2>/dev/null || true
+	@echo "✅ Clean completed successfully"

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/Flutter/Debug.xcconfig

@@ -1,2 +1,2 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
-#include "Generated.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
+#include? "Generated.xcconfig"

app/ios/Flutter/Release.xcconfig

@@ -1,2 +1,2 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
-#include "Generated.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
+#include? "Generated.xcconfig"

app/ios/Podfile

@@ -1,9 +1,37 @@
 # Uncomment this line to define a global platform for your project
 platform :ios, '15.0'
 
+# Move these to the top level, before any target definitions
+use_frameworks! :linkage => :static
+use_modular_headers!
+
 # 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)
+  require 'shellwords'
+  require 'uri'
+
+  # Validate inputs
+  raise "Invalid URL" unless url =~ URI::regexp
+  raise "Invalid name" unless name =~ /^[a-zA-Z0-9_-]+$/
+
+  escaped_url = Shellwords.escape(url)
+  escaped_name = Shellwords.escape(name)
+  system("echo downloading #{url}")
+  download_success = system("curl -L #{escaped_url} -o #{escaped_name}.xcframework.zip")
+  raise "Download failed" unless download_success
+
+  unzip_success = system("unzip -o #{escaped_name}.xcframework.zip")
+  raise "Extraction failed" unless unzip_success
+
+  framework_path = "#{escaped_name}.xcframework"
+  raise "Framework not found after extraction" unless Dir.exist?(framework_path)
+
+  File.delete("#{escaped_name}.xcframework.zip")
+end
+
 project 'Runner', {
   'Debug-prod' => :debug,
   'Profile-prod' => :release,
@@ -14,70 +42,79 @@ project 'Runner', {
 }
 
 def flutter_root
-  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
-  unless File.exist?(generated_xcode_build_settings_path)
-    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
-  end
-
-  File.foreach(generated_xcode_build_settings_path) do |line|
-    matches = line.match(/FLUTTER_ROOT\=(.*)/)
-    return matches[1].strip if matches
-  end
-  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
+	generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+	unless File.exist?(generated_xcode_build_settings_path)
+		raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
+	end
+
+	File.foreach(generated_xcode_build_settings_path) do |line|
+		matches = line.match(/FLUTTER_ROOT\=(.*)/)
+		return matches[1].strip if matches
+	end
+	raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
 end
 
 require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
 
 flutter_ios_podfile_setup
 
-target 'Runner' do
-  use_frameworks! :linkage => :static
-  use_modular_headers!
+# Add Firebase pods with explicit modular headers setting
+pod 'Firebase/Core', :modular_headers => true
+pod 'Firebase/Analytics', :modular_headers => true
+pod 'GoogleUtilities', :modular_headers => true
+pod 'FirebaseCoreInternal', :modular_headers => true
+
+# 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")
 
-  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+target 'Runner' do
+	flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end
 
 post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    flutter_additional_ios_build_settings(target)
-    target.build_configurations.each do |config|
-      config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
-      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
-        '$(inherited)',
-
-        # dart: PermissionGroup.notification
-        'PERMISSION_NOTIFICATIONS=1',
-
-        # 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.
-        ##
-        ## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse]
-        'PERMISSION_LOCATION=1',
-        'PERMISSION_LOCATION_WHENINUSE=1',
-        'PERMISSION_LOCATION_ALWAYS=1',
-
-        ## dart: PermissionGroup.calendarFullAccess
-        'PERMISSION_EVENTS_FULL_ACCESS=1',
-
-        ## dart: PermissionGroup.calendar
-        'PERMISSION_EVENTS=1',
-      ]
-
-    end
-  end
-#   ################  Awesome Notifications pod modification 1 ###################
-#   awesome_pod_file = File.expand_path(File.join('plugins', 'awesome_notifications', 'ios', 'Scripts', 'AwesomePodFile'), '.symlinks')
-#   require awesome_pod_file
-#   update_awesome_pod_build_settings(installer)
-#   ################  Awesome Notifications pod modification 1 ###################
+	installer.pods_project.targets.each do |target|
+		flutter_additional_ios_build_settings(target)
+
+		# Force Swift modules for all pods
+		target.build_configurations.each do |config|
+			config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES'
+			config.build_settings['DEFINES_MODULE'] = 'YES'
+			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)',
+
+				# dart: PermissionGroup.notification
+				'PERMISSION_NOTIFICATIONS=1',
+
+				# 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.
+				##
+				## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse]
+				'PERMISSION_LOCATION=1',
+				'PERMISSION_LOCATION_WHENINUSE=1',
+				'PERMISSION_LOCATION_ALWAYS=1',
+
+				## dart: PermissionGroup.calendarFullAccess
+				'PERMISSION_EVENTS_FULL_ACCESS=1',
+
+				## dart: PermissionGroup.calendar
+				'PERMISSION_EVENTS=1',
+			]
+		end
+	end
 end
-#
-# ################  Awesome Notifications pod modification 2 ###################
-# awesome_pod_file = File.expand_path(File.join('plugins', 'awesome_notifications', 'ios', 'Scripts', 'AwesomePodFile'), '.symlinks')
-# require awesome_pod_file
-# update_awesome_main_target_settings('Runner', File.dirname(File.realpath(__FILE__)), flutter_root)
-# ################  Awesome Notifications pod modification 2 ###################

app/ios/Runner/AppDelegate.swift

@@ -1,6 +1,7 @@
 import UIKit
 import Flutter
 import UserNotifications
+import Firebase
 
 @main
 @objc class AppDelegate: FlutterAppDelegate {
@@ -13,6 +14,7 @@ import UserNotifications
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
+	FirebaseApp.configure()
     GeneratedPluginRegistrant.register(with: self)
     //Creates a method channel to handle notifications on kill
     let controller = window?.rootViewController as? FlutterViewController