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

Settings

This commit is contained in:
Hillel Coren 2019-10-06 16:41:44 +03:00
parent e05f47730a
commit b27fe3ee3a
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/main.dart
View File

@ -312,7 +312,7 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
QuoteEditScreen.route: (context) => QuoteEditScreen(), QuoteEditScreen.route: (context) => QuoteEditScreen(),
QuoteEmailScreen.route: (context) => QuoteEmailScreen(), QuoteEmailScreen.route: (context) => QuoteEmailScreen(),
// STARTER: routes - do not remove comment // STARTER: routes - do not remove comment
GroupScreen.route: (context) => GroupScreen(), GroupSettingsScreen.route: (context) => GroupSettingsScreen(),
GroupViewScreen.route: (context) => GroupViewScreen(), GroupViewScreen.route: (context) => GroupViewScreen(),
GroupEditScreen.route: (context) => GroupEditScreen(), GroupEditScreen.route: (context) => GroupEditScreen(),
SettingsScreen.route: (context) => SettingsScreen(), SettingsScreen.route: (context) => SettingsScreen(),
@ -326,6 +326,7 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
NotificationsSettingsScreen(), NotificationsSettingsScreen(),
ImportExportScreen.route: (context) => ImportExportScreen(), ImportExportScreen.route: (context) => ImportExportScreen(),
DeviceSettingsScreen.route: (context) => DeviceSettingsScreen(), DeviceSettingsScreen.route: (context) => DeviceSettingsScreen(),
GroupSettingsScreen.route: (context) => GroupSettingsScreen(),
InvoiceSettingsScreen.route: (context) => InvoiceSettingsScreen(), InvoiceSettingsScreen.route: (context) => InvoiceSettingsScreen(),
InvoiceDesignScreen.route: (context) => InvoiceDesignScreen(), InvoiceDesignScreen.route: (context) => InvoiceDesignScreen(),
ClientPortalScreen.route: (context) => ClientPortalScreen(), ClientPortalScreen.route: (context) => ClientPortalScreen(),

4
lib/redux/group/group_middleware.dart
View File

@ -96,11 +96,11 @@ Middleware<AppState> _viewGroupList() {
store.dispatch(LoadGroups()); store.dispatch(LoadGroups());
} }
store.dispatch(UpdateCurrentRoute(GroupScreen.route)); store.dispatch(UpdateCurrentRoute(GroupSettingsScreen.route));
if (isMobile(action.context)) { if (isMobile(action.context)) {
Navigator.of(action.context).pushNamedAndRemoveUntil( Navigator.of(action.context).pushNamedAndRemoveUntil(
GroupScreen.route, (Route<dynamic> route) => false); GroupSettingsScreen.route, (Route<dynamic> route) => false);
} }
}; };
} }

1
lib/redux/group/group_selectors.dart
View File

@ -1,4 +1,3 @@
import 'package:invoiceninja_flutter/data/models/expense_model.dart';
import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart';
import 'package:memoize/memoize.dart'; import 'package:memoize/memoize.dart';
import 'package:built_collection/built_collection.dart'; import 'package:built_collection/built_collection.dart';

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

@ -1,6 +1,7 @@
import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/ui/app/help_text.dart'; import 'package:invoiceninja_flutter/ui/app/help_text.dart';
import 'package:invoiceninja_flutter/ui/app/screen_imports.dart'; import 'package:invoiceninja_flutter/ui/app/screen_imports.dart';
import 'package:invoiceninja_flutter/ui/group/group_screen.dart';
import 'package:invoiceninja_flutter/ui/settings/buy_now_buttons_vm.dart'; import 'package:invoiceninja_flutter/ui/settings/buy_now_buttons_vm.dart';
import 'package:invoiceninja_flutter/ui/settings/client_portal_vm.dart'; import 'package:invoiceninja_flutter/ui/settings/client_portal_vm.dart';
import 'package:invoiceninja_flutter/ui/settings/company_details_vm.dart'; import 'package:invoiceninja_flutter/ui/settings/company_details_vm.dart';
@ -169,7 +170,7 @@ class SettingsScreens extends StatelessWidget {
NotificationsSettingsScreen(), NotificationsSettingsScreen(),
ImportExportScreen(), ImportExportScreen(),
DeviceSettingsScreen(), DeviceSettingsScreen(),
//GroupSettingsScreen(), GroupSettingsScreen(),
InvoiceSettingsScreen(), InvoiceSettingsScreen(),
InvoiceDesignScreen(), InvoiceDesignScreen(),
ClientPortalScreen(), ClientPortalScreen(),

4
lib/ui/group/edit/group_edit_vm.dart
View File

@ -62,9 +62,9 @@ class GroupEditVM {
store.dispatch(UpdateGroup(group)); store.dispatch(UpdateGroup(group));
}, },
onBackPressed: () { onBackPressed: () {
if (state.uiState.currentRoute.contains(GroupScreen.route)) { if (state.uiState.currentRoute.contains(GroupSettingsScreen.route)) {
store.dispatch(UpdateCurrentRoute( store.dispatch(UpdateCurrentRoute(
group.isNew ? GroupScreen.route : GroupViewScreen.route)); group.isNew ? GroupSettingsScreen.route : GroupViewScreen.route));
} }
}, },
onCancelPressed: (BuildContext context) { onCancelPressed: (BuildContext context) {

5
lib/ui/group/group_screen.dart
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/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart';
import 'package:invoiceninja_flutter/ui/app/app_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/app_scaffold.dart';
import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart';
@ -11,8 +12,8 @@ import 'package:invoiceninja_flutter/ui/group/group_list_vm.dart';
import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart';
import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart';
class GroupScreen extends StatelessWidget { class GroupSettingsScreen extends StatelessWidget {
static const String route = '/group'; static const String route = '/$kSettings/$kSettingsGroupSettings';
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

4
lib/ui/group/view/group_view_vm.dart
View File

@ -79,8 +79,8 @@ class GroupViewVM {
}, },
onRefreshed: (context) => _handleRefresh(context), onRefreshed: (context) => _handleRefresh(context),
onBackPressed: () { onBackPressed: () {
if (state.uiState.currentRoute.contains(GroupScreen.route)) { if (state.uiState.currentRoute.contains(GroupSettingsScreen.route)) {
store.dispatch(UpdateCurrentRoute(GroupScreen.route)); store.dispatch(UpdateCurrentRoute(GroupSettingsScreen.route));
} }
}, },
onEntityAction: (BuildContext context, EntityAction action) => onEntityAction: (BuildContext context, EntityAction action) =>