Skip to content
Merged
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
22 changes: 14 additions & 8 deletions mobile/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:mobile/providers/basic_providers.dart';
import 'package:mobile/providers/group_controller_provider.dart';
import 'package:mobile/themes/theme_provider.dart';
import 'package:provider/provider.dart';
import 'core/constants.dart';
import 'controllers/auth.dart';
Expand All @@ -14,9 +15,16 @@ void main() async {
await Env.init();
await AuthService().initTokens();

final themeProvider = ThemeProvider();

while (!themeProvider.isInitialized) {
await Future.delayed(const Duration(milliseconds: 10));
}

runApp(
MultiProvider(
providers: [
ChangeNotifierProvider.value(value: themeProvider),
ChangeNotifierProvider(create: (_) => BasicProviders()),
ChangeNotifierProvider(create: (_) => AuthState()),
ChangeNotifierProvider(create: (_) => ChatController()),
Expand All @@ -35,11 +43,7 @@ class MyApp extends StatelessWidget {
return MaterialApp(
title: 'Elephant',
debugShowCheckedModeBanner: false,
theme: ThemeData(
useMaterial3: true,
colorSchemeSeed: const Color(0xFF0052CC),
scaffoldBackgroundColor: const Color(0xFFFAFBFC),
),
theme: context.watch<ThemeProvider>().themeData,
home: const SessionGateway(),
);
}
Expand Down Expand Up @@ -81,10 +85,12 @@ class _SessionGatewayState extends State<SessionGateway> {
@override
Widget build(BuildContext context) {
if (!_hasCheckedAutoLogin) {
return const Scaffold(
backgroundColor: Colors.white,
return Scaffold(
backgroundColor: Theme.of(context).scaffoldBackgroundColor,
body: Center(
child: CircularProgressIndicator(color: Color(0xFF0052CC)),
child: CircularProgressIndicator(
color: Theme.of(context).colorScheme.primary,
),
),
);
}
Expand Down
Loading
Loading