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

Notifications

This commit is contained in:
Hillel Coren 2020-03-08 13:40:31 +02:00
parent c8aa9a018b
commit 09cd34b1a3
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/data/models/account_model.dart
View File

@ -28,7 +28,6 @@ abstract class AccountEntity
@BuiltValueField(wireName: 'latest_version') @BuiltValueField(wireName: 'latest_version')
String get latestVersion; String get latestVersion;
@nullable
@BuiltValueField(wireName: 'current_version') @BuiltValueField(wireName: 'current_version')
String get currentVersion; String get currentVersion;

1
lib/ui/app/forms/notification_settings.dart
View File

@ -1,6 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart';
import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart';

3
lib/ui/app/menu_drawer.dart
View File

@ -456,6 +456,7 @@ class SidebarFooter extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final state = StoreProvider.of<AppState>(context).state; final state = StoreProvider.of<AppState>(context).state;
final localization = AppLocalization.of(context); final localization = AppLocalization.of(context);
final account = state.userCompany.account;
return Container( return Container(
color: Theme.of(context).bottomAppBarColor, color: Theme.of(context).bottomAppBarColor,
@ -465,7 +466,7 @@ class SidebarFooter extends StatelessWidget {
if (state.prefState.isMenuCollapsed) ...[ if (state.prefState.isMenuCollapsed) ...[
Expanded(child: SizedBox()) Expanded(child: SizedBox())
] else ...[ ] else ...[
if (true || isSelfHosted(context)) if (account.currentVersion != account.latestVersion)
IconButton( IconButton(
icon: Icon( icon: Icon(
Icons.warning, Icons.warning,

9
lib/ui/system/update_dialog.dart
View File

@ -28,6 +28,8 @@ class _UpdateDialogState extends State<UpdateDialog> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final localization = AppLocalization.of(context); final localization = AppLocalization.of(context);
final state = StoreProvider.of<AppState>(context).state;
final account = state.userCompany.account;
return AlertDialog( return AlertDialog(
title: Text(localization.updateAvailable), title: Text(localization.updateAvailable),
@ -44,8 +46,11 @@ class _UpdateDialogState extends State<UpdateDialog> {
children: <Widget>[ children: <Widget>[
Text(localization.aNewVersionIsAvailable), Text(localization.aNewVersionIsAvailable),
SizedBox(height: 20), SizedBox(height: 20),
Text('• ${localization.currentVersion}: v$kAppVersion'), Text(
//Text('• ${localization.latestVersion}: v???'), '• ${localization.currentVersion}: v${account.currentVersion}'),
SizedBox(height: 6),
Text(
'• ${localization.latestVersion}: v${account.latestVersion}'),
], ],
), ),
actions: <Widget>[ actions: <Widget>[