native device orientation work

This commit is contained in:
Christien Rioux 2025-03-17 22:51:34 -04:00
parent debb475bdc
commit 0d888363ff
3 changed files with 141 additions and 118 deletions

View file

@ -8,6 +8,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_translate/flutter_translate.dart'; import 'package:flutter_translate/flutter_translate.dart';
import 'package:form_builder_validators/form_builder_validators.dart'; import 'package:form_builder_validators/form_builder_validators.dart';
import 'package:native_device_orientation/native_device_orientation.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:veilid_support/veilid_support.dart'; import 'package:veilid_support/veilid_support.dart';
@ -100,19 +101,9 @@ class VeilidChatApp extends StatelessWidget {
onInvoke: (intent) => _attachDetach(context)), onInvoke: (intent) => _attachDetach(context)),
}, child: Focus(autofocus: true, child: builder(context))))); }, child: Focus(autofocus: true, child: builder(context)))));
@override Widget appBuilder(
Widget build(BuildContext context) => FutureProvider<VeilidChatGlobalInit?>( BuildContext context, LocalizationDelegate localizationDelegate) =>
initialData: null, ThemeProvider(
create: (context) async => VeilidChatGlobalInit.initialize(),
builder: (context, __) {
final globalInit = context.watch<VeilidChatGlobalInit?>();
if (globalInit == null) {
// Splash screen until we're done with init
return const Splash();
}
// Once init is done, we proceed with the app
final localizationDelegate = LocalizedApp.of(context).delegate;
return ThemeProvider(
initTheme: initialThemeData, initTheme: initialThemeData,
builder: (context, theme) => LocalizationProvider( builder: (context, theme) => LocalizationProvider(
state: LocalizationProvider.of(context).state, state: LocalizationProvider.of(context).state,
@ -129,8 +120,7 @@ class VeilidChatApp extends StatelessWidget {
create: (context) => create: (context) =>
ConnectionStateCubit(ProcessorRepository.instance)), ConnectionStateCubit(ProcessorRepository.instance)),
BlocProvider<RouterCubit>( BlocProvider<RouterCubit>(
create: (context) => create: (context) => RouterCubit(AccountRepository.instance),
RouterCubit(AccountRepository.instance),
), ),
BlocProvider<LocalAccountsCubit>( BlocProvider<LocalAccountsCubit>(
create: (context) => create: (context) =>
@ -191,14 +181,34 @@ class VeilidChatApp extends StatelessWidget {
FormBuilderLocalizations.delegate, FormBuilderLocalizations.delegate,
localizationDelegate localizationDelegate
], ],
supportedLocales: supportedLocales: localizationDelegate.supportedLocales,
localizationDelegate.supportedLocales,
locale: localizationDelegate.currentLocale, locale: localizationDelegate.currentLocale,
) )
]); ]);
})), })),
)), )),
); );
@override
Widget build(BuildContext context) => FutureProvider<VeilidChatGlobalInit?>(
initialData: null,
create: (context) async => VeilidChatGlobalInit.initialize(),
builder: (context, __) {
final globalInit = context.watch<VeilidChatGlobalInit?>();
if (globalInit == null) {
// Splash screen until we're done with init
return const Splash();
}
// Once init is done, we proceed with the app
final localizationDelegate = LocalizedApp.of(context).delegate;
if (isiOS || isAndroid) {
return NativeDeviceOrientationReader(
//useSensor: false,
builder: (context) => appBuilder(context, localizationDelegate));
} else {
return appBuilder(context, localizationDelegate);
}
}); });
@override @override

View file

@ -318,7 +318,7 @@ class _DrawerMenuState extends State<DrawerMenu> {
scale.subtleBorder, scale.subtleBorder,
]); ]);
return DecoratedBox( Widget menu = DecoratedBox(
decoration: ShapeDecoration( decoration: ShapeDecoration(
shadows: themedShadow(scaleConfig, scale), shadows: themedShadow(scaleConfig, scale),
gradient: scaleConfig.useVisualIndicators ? null : gradient, gradient: scaleConfig.useVisualIndicators ? null : gradient,
@ -393,6 +393,12 @@ class _DrawerMenuState extends State<DrawerMenu> {
), ),
]) ])
]).paddingAll(16), ]).paddingAll(16),
).paddingLTRB(0, 2, 2, 2); );
if (scaleConfig.preferBorders || scaleConfig.useVisualIndicators) {
menu = menu.paddingLTRB(0, 2, 2, 2);
}
return menu;
} }
} }

View file

@ -13,6 +13,7 @@ import 'package:veilid_support/veilid_support.dart';
import '../../account_manager/account_manager.dart'; import '../../account_manager/account_manager.dart';
import '../../settings/settings.dart'; import '../../settings/settings.dart';
import '../../theme/theme.dart'; import '../../theme/theme.dart';
import '../../tools/native_safe_area.dart';
import 'drawer_menu/drawer_menu.dart'; import 'drawer_menu/drawer_menu.dart';
import 'home_account_invalid.dart'; import 'home_account_invalid.dart';
import 'home_account_locked.dart'; import 'home_account_locked.dart';
@ -208,8 +209,7 @@ class HomeScreenState extends State<HomeScreen>
.indexWhere((x) => x.superIdentity.recordKey == activeLocalAccount); .indexWhere((x) => x.superIdentity.recordKey == activeLocalAccount);
final canClose = activeIndex != -1; final canClose = activeIndex != -1;
return SafeArea( Widget homeWidget = DefaultTextStyle(
child: DefaultTextStyle(
style: theme.textTheme.bodySmall!, style: theme.textTheme.bodySmall!,
child: ZoomDrawer( child: ZoomDrawer(
controller: _zoomDrawerController, controller: _zoomDrawerController,
@ -237,7 +237,14 @@ class HomeScreenState extends State<HomeScreen>
disableDragGesture: !canClose, disableDragGesture: !canClose,
mainScreenScale: .25, mainScreenScale: .25,
slideWidth: min(360, MediaQuery.of(context).size.width * 0.9), slideWidth: min(360, MediaQuery.of(context).size.width * 0.9),
))); ));
if (isiOS || isAndroid) {
homeWidget = NativeSafeArea(
bottom: false, left: false, right: false, child: homeWidget);
}
return homeWidget;
} }
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////