This commit is contained in:
Hillel Coren 2019-10-29 23:51:26 +02:00
parent a017b90728
commit d5578b6910
5 changed files with 10 additions and 4 deletions

View File

@ -1,7 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
// This version must be updated in tandem with the pubspec version. // This version must be updated in tandem with the pubspec version.
const String kAppVersion = '2.0.1'; const String kAppVersion = '2.0.0';
const String kSiteUrl = 'https://invoiceninja.com'; const String kSiteUrl = 'https://invoiceninja.com';
const String kAppUrl = 'https://staging.invoicing.co'; const String kAppUrl = 'https://staging.invoicing.co';
const String kAppPlansURL = const String kAppPlansURL =

View File

@ -2,6 +2,7 @@ import 'dart:async';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
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/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart';
import 'package:invoiceninja_flutter/ui/user/user_screen.dart'; import 'package:invoiceninja_flutter/ui/user/user_screen.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart';
@ -16,7 +17,7 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
class UserEditScreen extends StatelessWidget { class UserEditScreen extends StatelessWidget {
const UserEditScreen({Key key}) : super(key: key); const UserEditScreen({Key key}) : super(key: key);
static const String route = '/user/edit'; static const String route = '/$kSettings/$kSettingsUserManagementEdit';
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

View File

@ -1,5 +1,6 @@
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/ui/app/app_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/app_scaffold.dart';
import 'package:invoiceninja_flutter/data/models/user_model.dart'; import 'package:invoiceninja_flutter/data/models/user_model.dart';
import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart';
@ -19,7 +20,7 @@ class UserScreen extends StatelessWidget {
@required this.viewModel, @required this.viewModel,
}) : super(key: key); }) : super(key: key);
static const String route = '/user'; static const String route = '/$kSettings';
final UserScreenVM viewModel; final UserScreenVM viewModel;

View File

@ -1,4 +1,5 @@
import 'dart:async'; import 'dart:async';
import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/ui/app/snackbar_row.dart'; import 'package:invoiceninja_flutter/ui/app/snackbar_row.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -16,7 +17,7 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
class UserViewScreen extends StatelessWidget { class UserViewScreen extends StatelessWidget {
const UserViewScreen({Key key}) : super(key: key); const UserViewScreen({Key key}) : super(key: key);
static const String route = '/user/view'; static const String route = '/$kSettings/$kSettingsUserManagementView';
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

View File

@ -14,6 +14,7 @@ abstract class LocaleCodeAware {
mixin LocalizationsProvider on LocaleCodeAware { mixin LocalizationsProvider on LocaleCodeAware {
static final Map<String, Map<String, String>> _localizedValues = { static final Map<String, Map<String, String>> _localizedValues = {
'en': { 'en': {
'user_management': 'User Management',
'users': 'Users', 'users': 'Users',
'new_user': 'New User', 'new_user': 'New User',
'edit_user': 'Edit User', 'edit_user': 'Edit User',
@ -15392,6 +15393,8 @@ mixin LocalizationsProvider on LocaleCodeAware {
String get users => _localizedValues[localeCode]['users']; String get users => _localizedValues[localeCode]['users'];
String get userManagement => _localizedValues[localeCode]['user_management'];
String lookup(String key) { String lookup(String key) {
final lookupKey = toSnakeCase(key); final lookupKey = toSnakeCase(key);
return _localizedValues[localeCode][lookupKey] ?? return _localizedValues[localeCode][lookupKey] ??