refactor(theme&ui): improve theme switching and navigation styling
This commit is contained in:
@@ -1,24 +1,19 @@
|
||||
import 'package:firebase_core/firebase_core.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:sfm_app/product/services/theme_services.dart';
|
||||
import 'product/services/language_services.dart';
|
||||
import 'feature/main/main_bloc.dart';
|
||||
import 'product/base/bloc/base_bloc.dart';
|
||||
import 'product/constant/navigation/navigation_router.dart';
|
||||
import 'product/theme/provider/app_provider.dart';
|
||||
import 'product/theme/theme_notifier.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
||||
void main() async {
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
await Firebase.initializeApp();
|
||||
runApp(
|
||||
MultiProvider(
|
||||
providers: [...ApplicationProvider.instance.dependItems],
|
||||
child: BlocProvider(
|
||||
child: const MyApp(),
|
||||
blocBuilder: () => MainBloc(),
|
||||
),
|
||||
BlocProvider(
|
||||
child: const MyApp(),
|
||||
blocBuilder: () => MainBloc(),
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -32,17 +27,30 @@ class MyApp extends StatefulWidget {
|
||||
_MyAppState? state = context.findAncestorStateOfType<_MyAppState>();
|
||||
state?.setLocale(newLocale);
|
||||
}
|
||||
|
||||
static void setTheme(BuildContext context, ThemeData newTheme) {
|
||||
_MyAppState? state = context.findAncestorStateOfType<_MyAppState>();
|
||||
state?.setTheme(newTheme);
|
||||
}
|
||||
}
|
||||
|
||||
class _MyAppState extends State<MyApp> {
|
||||
Locale? _locale;
|
||||
ThemeData? _themeData;
|
||||
late MainBloc mainBloc;
|
||||
LanguageServices languageServices = LanguageServices();
|
||||
ThemeServices themeServices = ThemeServices();
|
||||
|
||||
setLocale(Locale locale) {
|
||||
_locale = locale;
|
||||
mainBloc.sinkLanguage.add(_locale);
|
||||
}
|
||||
|
||||
setTheme(ThemeData theme) {
|
||||
_themeData = theme;
|
||||
mainBloc.sinkTheme.add(_themeData);
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
@@ -52,6 +60,7 @@ class _MyAppState extends State<MyApp> {
|
||||
@override
|
||||
void didChangeDependencies() {
|
||||
languageServices.getLocale().then((locale) => {setLocale(locale)});
|
||||
themeServices.getTheme().then((theme) => {setTheme(theme)});
|
||||
super.didChangeDependencies();
|
||||
}
|
||||
|
||||
@@ -62,12 +71,18 @@ class _MyAppState extends State<MyApp> {
|
||||
stream: mainBloc.streamLanguage,
|
||||
initialData: _locale,
|
||||
builder: (context, languageSnapshot) {
|
||||
return MaterialApp.router(
|
||||
theme: context.watch<ThemeNotifier>().currentTheme,
|
||||
routerConfig: router,
|
||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||
supportedLocales: AppLocalizations.supportedLocales,
|
||||
locale: languageSnapshot.data,
|
||||
return StreamBuilder<ThemeData?>(
|
||||
stream: mainBloc.streamTheme,
|
||||
initialData: _themeData,
|
||||
builder: (context, themeSnapshot) {
|
||||
return MaterialApp.router(
|
||||
theme: themeSnapshot.data,
|
||||
routerConfig: router,
|
||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||
supportedLocales: AppLocalizations.supportedLocales,
|
||||
locale: languageSnapshot.data,
|
||||
);
|
||||
}
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user