Hydrogen/Solian
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Make system bar appear in call screen

Browse Source
This commit is contained in:
LittleSheep 2024-07-07 14:41:23 +08:00
parent 60d7df4496
commit d4cd120431
3 changed files with 60 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/main.dart
View File

@ -19,6 +19,7 @@ import 'package:solian/providers/content/realm.dart';
import 'package:solian/providers/friend.dart';
import 'package:solian/providers/account_status.dart';
import 'package:solian/router.dart';
import 'package:solian/shells/system_shell.dart';
import 'package:solian/theme.dart';
import 'package:solian/translations.dart';
@ -85,8 +86,10 @@ class SolianApp extends StatelessWidget {
fallbackLocale: const Locale('en', 'US'),
onInit: () => _initializeProviders(context),
builder: (context, child) {
return ScaffoldMessenger(
child: child ?? const SizedBox(),
return SystemShell(
child: ScaffoldMessenger(
child: child ?? const SizedBox(),
),
);
},
);

69
lib/shells/root_shell.dart
View File

@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_animate/flutter_animate.dart';
import 'package:go_router/go_router.dart';
import 'package:solian/platform.dart';
import 'package:solian/router.dart';
import 'package:solian/theme.dart';
import 'package:solian/widgets/navigation/app_navigation.dart';
@ -32,49 +31,33 @@ class RootShell extends StatelessWidget {
AppNavigation.destinationPages.contains(routeName);
return Scaffold(
body: Column(
children: [
if (PlatformInfo.isMacOS)
Container(
height: 28,
color: Theme.of(context).colorScheme.surface,
),
if (PlatformInfo.isMacOS)
const Divider(
thickness: 0.3,
height: 0.3,
),
Expanded(
child: SolianTheme.isLargeScreen(context)
? Row(
children: [
if (showNavigation) const AppNavigationRail(),
if (showNavigation)
const VerticalDivider(thickness: 0.3, width: 1),
Expanded(child: child),
],
)
: Stack(
children: [
child,
Positioned(
bottom: 0,
left: 0,
right: 0,
child: const AppNavigationBottomBar()
.animate(target: showBottom ? 0 : 1)
.slideY(
duration: 250.ms,
begin: 0,
end: 1,
curve: Curves.easeInToLinear,
),
body: SolianTheme.isLargeScreen(context)
? Row(
children: [
if (showNavigation) const AppNavigationRail(),
if (showNavigation)
const VerticalDivider(thickness: 0.3, width: 1),
Expanded(child: child),
],
)
: Stack(
children: [
child,
Positioned(
bottom: 0,
left: 0,
right: 0,
child: const AppNavigationBottomBar()
.animate(target: showBottom ? 0 : 1)
.slideY(
duration: 250.ms,
begin: 0,
end: 1,
curve: Curves.easeInToLinear,
),
],
),
),
],
),
),
],
),
);
}
}

29
lib/shells/system_shell.dart Normal file
View File

@ -0,0 +1,29 @@
import 'package:flutter/material.dart';
import 'package:solian/platform.dart';
class SystemShell extends StatelessWidget {
final Widget child;
const SystemShell({super.key, required this.child});
@override
Widget build(BuildContext context) {
if (PlatformInfo.isMacOS) {
return Column(
children: [
Container(
height: 28,
color: Theme.of(context).colorScheme.surface,
),
const Divider(
thickness: 0.3,
height: 0.3,
),
Expanded(child: child),
],
);
}
return child;
}
}