Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 66 additions & 49 deletions lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';

import 'screens/splash_screen.dart';
import 'screens/home/home_screen.dart';
import 'screens/chat/chat_screen.dart';

import 'services/navigation_service.dart';
import 'services/supabase_service.dart';
import 'services/ai_service.dart';

import 'theme/theme_controller.dart';
import 'theme/app_themes.dart';

Expand All @@ -18,14 +21,15 @@ void main() async {
} catch (e) {
debugPrint('Error initializing services: $e');
}

final themeController = await ThemeController.create();

runApp(
WidgetsBindingObserverWidget(
child: ChangeNotifierProvider<ThemeController>.value(
value: themeController,
child: const MyApp(),
runApp(
WidgetsBindingObserverWidget(
child: ChangeNotifierProvider<ThemeController>.value(
value: themeController,
child: const MyApp(),
),
),
),
);
Expand All @@ -37,91 +41,104 @@ class MyApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
final themeController = context.watch<ThemeController>();

return MaterialApp(
title: 'Ell-ena',
debugShowCheckedModeBanner: false,
navigatorKey: NavigationService().navigatorKey,
navigatorObservers: <NavigatorObserver>[AppRouteObserver.instance],
navigatorObservers: <NavigatorObserver>[
AppRouteObserver.instance,
],
theme: lightTheme,
darkTheme: darkTheme,
themeMode: themeController.flutterThemeMode,
home: const SplashScreen(),

onGenerateRoute: (settings) {
if (settings.name == '/') {
return MaterialPageRoute(
builder: (context) => const SplashScreen(),
settings: settings,
);
} else if (settings.name == '/home') {
final args = (settings.arguments is Map<String, dynamic>)
? settings.arguments as Map<String, dynamic>
: null;

}

else if (settings.name == '/home') {
final args =
settings.arguments is Map<String, dynamic>
? settings.arguments as Map<String, dynamic>
: null;

return MaterialPageRoute(
builder: (context) => HomeScreen(arguments: args),
settings: settings,
);
} else if (settings.name == '/chat') {
final args = (settings.arguments is Map<String, dynamic>)
? settings.arguments as Map<String, dynamic>
: null;

}

else if (settings.name == '/chat') {
final args =
settings.arguments is Map<String, dynamic>
? settings.arguments as Map<String, dynamic>
: null;

return MaterialPageRoute(
builder: (context) => ChatScreen(arguments: args),
settings: settings,
);
}

return null;
},
);
}
}

class WidgetsBindingObserverWidget extends StatefulWidget {
final Widget child;
final Widget child;

const WidgetsBindingObserverWidget({
super.key,
required this.child,
});
const WidgetsBindingObserverWidget({
super.key,
required this.child,
});

@override
State<WidgetsBindingObserverWidget> createState() =>
_WidgetsBindingObserverWidgetState();
}
@override
State<WidgetsBindingObserverWidget> createState() =>
_WidgetsBindingObserverWidgetState();
}

class _WidgetsBindingObserverWidgetState
extends State<WidgetsBindingObserverWidget>
with WidgetsBindingObserver {
class _WidgetsBindingObserverWidgetState
extends State<WidgetsBindingObserverWidget>
with WidgetsBindingObserver {

@override
void initState() {
super.initState();
WidgetsBinding.instance.addObserver(this);
}
@override
void initState() {
super.initState();
WidgetsBinding.instance.addObserver(this);
}

@override
void didChangeAppLifecycleState(AppLifecycleState state) {
if (state == AppLifecycleState.detached) {
SupabaseService().dispose(); // ✅ ONLY IMPORTANT LINE
}
@override
void didChangeAppLifecycleState(AppLifecycleState state) {
if (state == AppLifecycleState.detached) {
SupabaseService().dispose();
}
}

@override
void dispose() {
WidgetsBinding.instance.removeObserver(this);
super.dispose();
}
@override
void dispose() {
WidgetsBinding.instance.removeObserver(this);
super.dispose();
}

@override
Widget build(BuildContext context) {
return widget.child;
}
@override
Widget build(BuildContext context) {
return widget.child;
}
}

// Simple singleton RouteObserver to allow screens to refresh on focus
class AppRouteObserver extends RouteObserver<ModalRoute<void>> {
AppRouteObserver._();
static final AppRouteObserver instance = AppRouteObserver._();

static final AppRouteObserver instance =
AppRouteObserver._();
}

Loading