Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Show titlebar on login

This commit is contained in:
Hillel Coren 2022-01-12 12:53:38 +02:00
parent 66f1ab88cb
commit decd2d85a3
3 changed files with 74 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
lib/ui/app/app_title_bar.dart Normal file
View File

@ -0,0 +1,63 @@
import 'package:bitsdojo_window/bitsdojo_window.dart';
import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
class AppTitleBar extends StatelessWidget {
const AppTitleBar({Key key}) : super(key: key);
@override
Widget build(BuildContext context) {
final store = StoreProvider.of<AppState>(context);
final state = store.state;
final prefState = state.prefState;
final buttonColors = WindowButtonColors(
iconNormal: state.headerTextColor,
iconMouseOver: state.headerTextColor,
iconMouseDown: state.headerTextColor,
mouseOver: Color(prefState.enableDarkMode ? 0xFF222222 : 0xFFDDDDDD),
mouseDown: Color(prefState.enableDarkMode ? 0xFF333333 : 0xFFCCCCCC),
);
final closeButtonColors = WindowButtonColors(
iconNormal: state.headerTextColor,
iconMouseOver: Colors.white,
mouseOver: Color(0xFFD32F2F),
mouseDown: Color(0xFFB71C1C),
);
return Material(
color: !prefState.enableDarkMode && state.hasAccentColor
? state.accentColor
: null,
child: WindowTitleBarBox(
child: Row(
children: [
Expanded(
child: MoveWindow(
child: isMacOS()
? SizedBox()
: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(width: 6),
Image.asset('assets/images/icon.png', width: 16),
SizedBox(width: 6),
Text(
'Invoice Ninja',
style: TextStyle(color: state.headerTextColor),
),
],
),
)),
MinimizeWindowButton(colors: buttonColors),
MaximizeWindowButton(colors: buttonColors),
CloseWindowButton(colors: closeButtonColors),
],
),
),
);
}
}

50
lib/ui/app/main_screen.dart
View File

@ -1,10 +1,9 @@
// Flutter imports:
import 'package:bitsdojo_window/bitsdojo_window.dart';
import 'package:flutter/material.dart';
// Package imports:
import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
import 'package:invoiceninja_flutter/ui/app/app_title_bar.dart';
import 'package:redux/redux.dart';
// Project imports:
@ -221,21 +220,6 @@ class MainScreen extends StatelessWidget {
print('## Error: main screen route $mainRoute not defined');
}
final buttonColors = WindowButtonColors(
iconNormal: state.headerTextColor,
iconMouseOver: state.headerTextColor,
iconMouseDown: state.headerTextColor,
mouseOver: Color(prefState.enableDarkMode ? 0xFF222222 : 0xFFDDDDDD),
mouseDown: Color(prefState.enableDarkMode ? 0xFF333333 : 0xFFCCCCCC),
);
final closeButtonColors = WindowButtonColors(
iconNormal: state.headerTextColor,
iconMouseOver: Colors.white,
mouseOver: Color(0xFFD32F2F),
mouseDown: Color(0xFFB71C1C),
);
return WillPopScope(
onWillPop: () async {
final state = store.state;
@ -311,37 +295,7 @@ class MainScreen extends StatelessWidget {
policy: ReadingOrderTraversalPolicy(),
child: Column(
children: [
Material(
color: !prefState.enableDarkMode && state.hasAccentColor
? state.accentColor
: null,
child: WindowTitleBarBox(
child: Row(
children: [
Expanded(
child: MoveWindow(
child: isMacOS() ? SizedBox() : Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(width: 6),
Image.asset('assets/images/icon.png',
width: 16),
SizedBox(width: 6),
Text(
'Invoice Ninja',
style:
TextStyle(color: state.headerTextColor),
),
],
),
)),
MinimizeWindowButton(colors: buttonColors),
MaximizeWindowButton(colors: buttonColors),
CloseWindowButton(colors: closeButtonColors),
],
),
),
),
AppTitleBar(),
Expanded(
child: ChangeLayoutBanner(
appLayout: prefState.appLayout,

14
lib/ui/auth/login_view.dart
View File

@ -5,6 +5,7 @@ import 'dart:async';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:invoiceninja_flutter/ui/app/app_title_bar.dart';
// Package imports:
import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
@ -296,11 +297,14 @@ class _LoginState extends State<LoginView> {
return ScrollableListView(
children: <Widget>[
Container(
width: double.infinity,
height: 24,
color: state.accentColor,
),
if (isDesktopOS())
AppTitleBar()
else
Container(
width: double.infinity,
height: 24,
color: state.accentColor,
),
Padding(
padding: EdgeInsets.symmetric(vertical: 25),
child: Center(