Compare commits
No commits in common. "3f0342b6cb2264e1f9920498bf5dd06e8b52227a" and "662a1ae157165b83635c1cb597a4bbfedad99b59" have entirely different histories.
3f0342b6cb
...
662a1ae157
|
@ -57,7 +57,16 @@ class _AppPageLayoutState extends State<AppPageLayout> {
|
|||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
body: AnnotatedRegion<SystemUiOverlayStyle>(
|
||||
value: constructOverlayStyle(dark: widget.darkStatusBar),
|
||||
value: SystemUiOverlayStyle(
|
||||
statusBarColor: Colors.transparent,
|
||||
systemNavigationBarContrastEnforced: true,
|
||||
statusBarIconBrightness: widget.darkStatusBar
|
||||
? Brightness.dark
|
||||
: Brightness.light,
|
||||
statusBarBrightness: widget.darkStatusBar
|
||||
? Brightness.light
|
||||
: Brightness.dark,
|
||||
),
|
||||
child: Container(
|
||||
color: widget.backgroundColor ?? Colors.grey[100],
|
||||
child: SafeArea(
|
||||
|
|
|
@ -35,14 +35,15 @@ class _MainLayoutState extends State<MainLayout> {
|
|||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return AutoTabsScaffold(
|
||||
animationDuration: const Duration(milliseconds: 150),
|
||||
routes: const [
|
||||
HomePageRouter(children: [
|
||||
HomeRoute(),
|
||||
]),
|
||||
MapRoute(),
|
||||
EventsRoute(),
|
||||
InfoPageRouter(children: [InfoRoute()]),
|
||||
InfoPageRouter(children: [
|
||||
InfoRoute()
|
||||
]),
|
||||
],
|
||||
bottomNavigationBuilder: (_, tabsRouter) {
|
||||
return WillPopScope(
|
||||
|
@ -68,7 +69,7 @@ class _MainLayoutState extends State<MainLayout> {
|
|||
padding: const EdgeInsets.symmetric(vertical: 3, horizontal: 20),
|
||||
child: SalomonBottomBar(
|
||||
itemPadding:
|
||||
const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
|
||||
const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
|
||||
items: <SalomonBottomBarItem>[
|
||||
SalomonBottomBarItem(
|
||||
icon: const Icon(FlutterRemix.home_line),
|
||||
|
|
|
@ -4,7 +4,6 @@ import 'package:flutter/services.dart';
|
|||
import 'package:furman_now/src/routes/index.gr.dart';
|
||||
import 'package:furman_now/src/screens/home/content.dart';
|
||||
import 'package:furman_now/src/screens/home/state.dart';
|
||||
import 'package:furman_now/src/utils/theme.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
class HomeScreenProvider extends StatelessWidget {
|
||||
|
@ -102,7 +101,7 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
body: AnnotatedRegion<SystemUiOverlayStyle>(
|
||||
value: constructOverlayStyle(),
|
||||
value: SystemUiOverlayStyle.light,
|
||||
child: Container(
|
||||
color: const Color(0xffb7acc9),
|
||||
child: SafeArea(
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:google_fonts/google_fonts.dart';
|
||||
|
||||
ThemeData _baseTheme = ThemeData(
|
||||
|
@ -48,14 +47,5 @@ ThemeData myFurmanTheme = _baseTheme.copyWith(
|
|||
textTheme: GoogleFonts.interTextTheme(_baseTheme.textTheme),
|
||||
);
|
||||
|
||||
var furmanTextStyle =
|
||||
(TextStyle baseStyle) => GoogleFonts.inter(textStyle: baseStyle);
|
||||
|
||||
SystemUiOverlayStyle constructOverlayStyle({bool dark = false}) {
|
||||
return SystemUiOverlayStyle(
|
||||
statusBarColor: Colors.transparent,
|
||||
systemNavigationBarContrastEnforced: true,
|
||||
statusBarIconBrightness: dark ? Brightness.dark : Brightness.light,
|
||||
statusBarBrightness: dark ? Brightness.light : Brightness.dark,
|
||||
systemNavigationBarColor: Colors.grey.shade50);
|
||||
}
|
||||
var furmanTextStyle = (TextStyle baseStyle) =>
|
||||
GoogleFonts.inter(textStyle: baseStyle);
|
||||
|
|
Loading…
Reference in New Issue