Iteration 5 App

android/app/src/main/AndroidManifest.xml

@@ -2,6 +2,8 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>

lib/core/di/di.dart

@@ -0,0 +1,101 @@
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:get_it/get_it.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
+import 'package:flutter_stripe/flutter_stripe.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:go_router/go_router.dart';
+
+// services
+import 'package:clean_stream_laundry_app/logic/services/auth_service.dart';
+import 'package:clean_stream_laundry_app/logic/services/edge_function_service.dart';
+import 'package:clean_stream_laundry_app/logic/services/location_service.dart';
+import 'package:clean_stream_laundry_app/logic/services/machine_communication_service.dart';
+import 'package:clean_stream_laundry_app/logic/services/machine_service.dart';
+import 'package:clean_stream_laundry_app/logic/services/payment_service.dart';
+import 'package:clean_stream_laundry_app/logic/services/profile_service.dart';
+import 'package:clean_stream_laundry_app/logic/services/transaction_service.dart';
+
+// implementations
+import 'package:clean_stream_laundry_app/services/supabase/supabase_auth_service.dart';
+import 'package:clean_stream_laundry_app/services/supabase/supabase_edge_function_service.dart';
+import 'package:clean_stream_laundry_app/services/supabase/supabase_location_service.dart';
+import 'package:clean_stream_laundry_app/services/supabase/supabase_machine_service.dart';
+import 'package:clean_stream_laundry_app/services/supabase/supabase_profile_service.dart';
+import 'package:clean_stream_laundry_app/services/supabase/supabase_transaction_service.dart';
+import 'package:clean_stream_laundry_app/services/stripe/stripe_service.dart';
+import 'package:clean_stream_laundry_app/services/nayax/machine_communicator.dart';
+
+// misc
+import 'package:clean_stream_laundry_app/core/router/app_router.dart';
+import 'package:clean_stream_laundry_app/services/notification_service.dart';
+import 'package:clean_stream_laundry_app/logic/payment/process_payment.dart';
+
+final getIt = GetIt.instance;
+
+Future<void> setupDependencies() async {
+  await dotenv.load(fileName: '.env');
+
+  await Supabase.initialize(
+    url: dotenv.env['SUPABASE_URL']!,
+    anonKey: dotenv.env['ANON_KEY']!,
+  );
+
+  final supabase = Supabase.instance.client;
+
+  Stripe.publishableKey = dotenv.env['STRIPE_PUBLISHABLE_KEY']!;
+
+  getIt.registerLazySingleton<TransactionService>(
+        () => SupabaseTransactionService(client: supabase),
+  );
+
+  getIt.registerLazySingleton<ProfileService>(
+        () => SupabaseProfileService(client: supabase),
+  );
+
+  getIt.registerLazySingleton<MachineService>(
+        () => SupabaseMachineService(client: supabase),
+  );
+
+  getIt.registerLazySingleton<LocationService>(
+        () => SupabaseLocationHandler(client: supabase),
+  );
+
+  getIt.registerLazySingleton<EdgeFunctionService>(
+        () => SupabaseEdgeFunctionService(client: supabase),
+  );
+
+  getIt.registerLazySingleton<AuthService>(
+        () => SupabaseAuthService(client: supabase),
+  );
+
+  getIt.registerLazySingleton<PaymentService>(() => StripeService());
+
+  getIt.registerLazySingleton<Stripe>(() => Stripe.instance);
+
+  getIt.registerLazySingleton<MachineCommunicationService>(
+        () => MachineCommunicator(
+      edgeFunctionService: getIt<EdgeFunctionService>(),
+    ),
+  );
+
+  getIt.registerLazySingleton<RouterService>(() => RouterService());
+
+  getIt.registerLazySingleton<NotificationService>(
+        () => NotificationService(),
+  );
+
+  getIt.registerSingleton<FlutterLocalNotificationsPlugin>(
+    FlutterLocalNotificationsPlugin(),
+  );
+
+  getIt.registerLazySingleton<PaymentProcessor>(
+        () => PaymentProcessor(),
+  );
+
+  getIt.registerLazySingleton<GoRouter>(() {
+    final authService = getIt<AuthService>();
+    final routerService = getIt<RouterService>();
+
+    return routerService.createRouter(authService);
+  });
+}

lib/middleware/app_router.dart → lib/core/router/app_router.dart

@@ -1,24 +1,25 @@
 import 'package:app_links/app_links.dart';
-import 'package:clean_stream_laundry_app/pages/change_email_verification.dart';
-import 'package:clean_stream_laundry_app/pages/edit_profile_page.dart';
-import 'package:clean_stream_laundry_app/pages/verify_code_page.dart';
-import 'package:go_router/go_router.dart';
+import 'package:clean_stream_laundry_app/features/change_email_verification/change_email_verification.dart';
+import 'package:clean_stream_laundry_app/features/edit_profile/edit_profile.dart';
+import 'package:clean_stream_laundry_app/features/verify_code/verify_code.dart';
+import 'package:clean_stream_laundry_app/features/email_verification/email_verification.dart';
+import 'package:clean_stream_laundry_app/features/home/home.dart';
+import 'package:clean_stream_laundry_app/features/loading/loading.dart';
+import 'package:clean_stream_laundry_app/features/loyalty/loyalty.dart';
+import 'package:clean_stream_laundry_app/features/scanner/scanner.dart';
+import 'package:clean_stream_laundry_app/features/sign_up/sign_up.dart';
+import 'package:clean_stream_laundry_app/features/login/login.dart';
+import 'package:clean_stream_laundry_app/features/not_found/not_found.dart';
+import 'package:clean_stream_laundry_app/features/settings/settings.dart';
+import 'package:clean_stream_laundry_app/features/start_machine/start_machine.dart';
+import 'package:clean_stream_laundry_app/features/machine_payment/machine_payment.dart';
+import 'package:clean_stream_laundry_app/features/monthly_report/monthly_report.dart';
+import 'package:clean_stream_laundry_app/features/refund_request/refund_request.dart';
+import 'package:clean_stream_laundry_app/features/maintenance_request/maintenance_request.dart';
+import 'package:clean_stream_laundry_app/features/password_reset/password_reset.dart';
+import 'package:clean_stream_laundry_app/features/reset_protected/reset_protected.dart';
 import 'package:clean_stream_laundry_app/logic/services/auth_service.dart';
-import 'package:clean_stream_laundry_app/pages/email_verification_page.dart';
-import 'package:clean_stream_laundry_app/pages/home_page.dart';
-import 'package:clean_stream_laundry_app/pages/loading_page.dart';
-import 'package:clean_stream_laundry_app/pages/loyalty_card_page.dart';
-import 'package:clean_stream_laundry_app/pages/scanner_widget.dart';
-import 'package:clean_stream_laundry_app/pages/sign_up_screen.dart';
-import 'package:clean_stream_laundry_app/pages/login_page.dart';
-import 'package:clean_stream_laundry_app/pages/not_found_page.dart';
-import 'package:clean_stream_laundry_app/pages/settings.dart';
-import 'package:clean_stream_laundry_app/pages/start_machine_page.dart';
-import 'package:clean_stream_laundry_app/pages/payment_page.dart';
-import 'package:clean_stream_laundry_app/pages/monthly_transaction_history.dart';
-import 'package:clean_stream_laundry_app/pages/refund_page.dart';
-import 'package:clean_stream_laundry_app/pages/password_reset.dart';
-import 'package:clean_stream_laundry_app/pages/reset_protected_page.dart';
+import 'package:go_router/go_router.dart';
 
 class RouterService {
   GoRouter createRouter(AuthService authenticator) => GoRouter(
@@ -28,7 +29,7 @@ class RouterService {
         path: '/login',
         pageBuilder: (context, state) => CustomTransitionPage(
           key: state.pageKey,
-          child: LoginScreen(appLinks: AppLinks()),
+          child: Login(appLinks: AppLinks()),
           transitionDuration: Duration.zero,
           reverseTransitionDuration: Duration.zero,
           transitionsBuilder: (_, _, _, child) => child,
@@ -38,7 +39,7 @@ class RouterService {
         path: '/signup',
         pageBuilder: (context, state) => CustomTransitionPage(
           key: state.pageKey,
-          child: SignUpScreen(),
+          child: SignUpPage(),
           transitionDuration: Duration.zero,
           reverseTransitionDuration: Duration.zero,
           transitionsBuilder: (_, _, _, child) => child,
@@ -48,7 +49,7 @@ class RouterService {
         path: '/scanner',
         pageBuilder: (context, state) => CustomTransitionPage(
           key: state.pageKey,
-          child: ScannerWidget(),
+          child: ScannerPage(),
           transitionDuration: Duration.zero,
           reverseTransitionDuration: Duration.zero,
           transitionsBuilder: (_, _, _, child) => child,
@@ -81,7 +82,7 @@ class RouterService {
           final machineId = state.uri.queryParameters['machineId'] ?? '';
           return CustomTransitionPage(
             key: state.pageKey,
-            child: PaymentPage(machineId: machineId),
+            child: MachinePayment(machineId: machineId),
             transitionDuration: Duration.zero,
             reverseTransitionDuration: Duration.zero,
             transitionsBuilder: (_, _, _, child) => child,
@@ -90,13 +91,16 @@ class RouterService {
       ),
       GoRoute(
         path: '/email-verification',
-        pageBuilder: (context, state) => CustomTransitionPage(
-          key: state.pageKey,
-          child: EmailVerificationPage(appLinks: AppLinks()),
-          transitionDuration: Duration.zero,
-          reverseTransitionDuration: Duration.zero,
-          transitionsBuilder: (_, _, _, child) => child,
-        ),
+        pageBuilder: (context, state) {
+          final email = state.extra is String ? state.extra as String : null;
+          return CustomTransitionPage(
+            key: state.pageKey,
+            child: EmailVerificationPage(email: email),
+            transitionDuration: Duration.zero,
+            reverseTransitionDuration: Duration.zero,
+            transitionsBuilder: (_, _, _, child) => child,
+          );
+        },
       ),
       GoRoute(
         path: '/homePage',
@@ -134,7 +138,7 @@ class RouterService {
           final transactions = state.extra as List<Map<String, dynamic>>? ?? [];
           return CustomTransitionPage(
             key: state.pageKey,
-            child: MonthlyTransactionHistory(transactions: transactions),
+            child: MonthlyReport(transactions: transactions),
             transitionDuration: Duration.zero,
             reverseTransitionDuration: Duration.zero,
             transitionsBuilder: (_, _, _, child) => child,
@@ -151,6 +155,16 @@ class RouterService {
           transitionsBuilder: (_, _, _, child) => child,
         ),
       ),
+      GoRoute(
+        path: '/maintenancePage',
+        pageBuilder: (context, state) => CustomTransitionPage(
+          key: state.pageKey,
+          child: MaintenancePage(),
+          transitionDuration: Duration.zero,
+          reverseTransitionDuration: Duration.zero,
+          transitionsBuilder: (_, _, _, child) => child,
+        ),
+      ),
       GoRoute(
         path: '/editProfile',
         pageBuilder: (context, state) => CustomTransitionPage(
@@ -195,14 +209,14 @@ class RouterService {
             transitionsBuilder: (_, _, _, child) => child,
           );
         },
-      )
+      ),
     ],
     errorBuilder: (context, state) {
       final uri = state.uri;
       if (uri.scheme == 'clean-stream' && uri.host == 'reset-protected') {
         return ResetProtectedPage();
       }
-      return const NotFoundScreen();
+      return const NotFound();
     },
     redirect: (context, state) {
       final uri = state.uri;

lib/logic/theme/theme_manager.dart → lib/core/theme/theme_manager.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:clean_stream_laundry_app/logic/theme/theme.dart';
-import 'package:clean_stream_laundry_app/middleware/storage_service.dart';
+import 'package:clean_stream_laundry_app/core/theme/theme.dart';
+import 'package:clean_stream_laundry_app/core/storage/storage_service.dart';
 
 class ThemeManager with ChangeNotifier {
   ThemeData _themeData = lightMode;

lib/features/change_email_verification/change_email_verification.dart

@@ -1,4 +1,4 @@
-import 'package:clean_stream_laundry_app/Logic/Theme/theme.dart';
+import 'package:clean_stream_laundry_app/core/theme/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:app_links/app_links.dart';
 import 'controller.dart';

lib/features/change_email_verification/widgets/verification_error.dart

@@ -1,4 +1,4 @@
-import 'package:clean_stream_laundry_app/Logic/Theme/theme.dart';
+import 'package:clean_stream_laundry_app/core/theme/theme.dart';
 import 'package:flutter/material.dart';
 
 class VerificationError extends StatelessWidget {

lib/features/edit_profile/controller.dart

@@ -0,0 +1,113 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:get_it/get_it.dart';
+import 'package:clean_stream_laundry_app/logic/services/auth_service.dart';
+import 'package:clean_stream_laundry_app/logic/services/profile_service.dart';
+import 'package:clean_stream_laundry_app/logic/services/edge_function_service.dart';
+
+class EditProfileController extends ChangeNotifier {
+  final authService = GetIt.instance<AuthService>();
+  final profileService = GetIt.instance<ProfileService>();
+  final edgeFunctionService = GetIt.instance<EdgeFunctionService>();
+
+  final nameController = TextEditingController();
+  final emailController = TextEditingController();
+
+  StreamSubscription? authSub;
+
+  String currentName = '';
+  String currentEmail = '';
+
+  bool isLoading = true;
+  bool isSaving = false;
+
+  bool get hasChanges =>
+      nameController.text.trim() != currentName ||
+          emailController.text.trim() != currentEmail;
+
+  Future<void> init() async {
+    await loadUserData();
+
+    authSub = authService.onAuthChange.listen((_) {
+      loadUserData();
+    });
+  }
+
+  Future<void> disposeController() async {
+    nameController.dispose();
+    emailController.dispose();
+    await authSub?.cancel();
+  }
+
+  Future<void> loadUserData() async {
+    try {
+      final userId = await authService.getCurrentUserId;
+
+      if (userId == null) {
+        throw Exception("User not found");
+      }
+
+      final username = await profileService.getUserNameById(userId);
+      final email = await authService.getCurrentUserEmail();
+
+      currentName = username ?? '';
+      currentEmail = email ?? '';
+
+      nameController.text = currentName;
+      emailController.text = currentEmail;
+    } catch (e) {
+      rethrow;
+    } finally {
+      isLoading = false;
+      notifyListeners();
+    }
+  }
+
+  Future<bool> saveChanges() async {
+    if (isSaving) return false;
+
+    if (!hasChanges) {
+      throw Exception("No changes made");
+    }
+
+    final newName = nameController.text.trim();
+    final newEmail = emailController.text.trim();
+
+    final nameChanged = newName != currentName;
+    final emailChanged = newEmail != currentEmail;
+
+    isSaving = true;
+    notifyListeners();
+
+    try {
+      await authService.updateUserAttributes(
+        email: emailChanged ? newEmail : null,
+        data: nameChanged ? {'full_name': newName} : null,
+      );
+
+      currentName = newName;
+      currentEmail = newEmail;
+
+      return emailChanged;
+    } finally {
+      isSaving = false;
+      notifyListeners();
+    }
+  }
+
+  Future<bool> deleteAccount() async {
+    final userId = await authService.getCurrentUserId;
+
+    final response = await edgeFunctionService.runEdgeFunction(
+      name: "delete-account",
+      body: {"user_id": userId},
+    );
+
+    if (response?.status == 200) {
+      await authService.logout();
+      return true;
+    }
+
+    return false;
+  }
+}