diff --git a/lib/main_app.dart b/lib/main_app.dart index b2448804a..7b41162a8 100644 --- a/lib/main_app.dart +++ b/lib/main_app.dart @@ -263,7 +263,6 @@ class InvoiceNinjaAppState extends State { WebhookScreen.route: (context) => WebhookScreenBuilder(), WebhookViewScreen.route: (context) => WebhookViewScreen(), WebhookEditScreen.route: (context) => WebhookEditScreen(), - TokenScreen.route: (context) => TokenScreenBuilder(), TokenViewScreen.route: (context) => TokenViewScreen(), TokenEditScreen.route: (context) => TokenEditScreen(), diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart index 7d08e2dd6..69aa31723 100644 --- a/lib/ui/app/main_screen.dart +++ b/lib/ui/app/main_screen.dart @@ -32,6 +32,9 @@ import 'package:invoiceninja_flutter/ui/settings/tax_settings_vm.dart'; import 'package:invoiceninja_flutter/ui/token/edit/token_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/token/token_screen_vm.dart'; import 'package:invoiceninja_flutter/ui/token/view/token_view_vm.dart'; +import 'package:invoiceninja_flutter/ui/webhook/edit/webhook_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/webhook/view/webhook_view_vm.dart'; +import 'package:invoiceninja_flutter/ui/webhook/webhook_screen_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; import 'package:invoiceninja_flutter/ui/app/app_border.dart'; @@ -448,6 +451,15 @@ class SettingsScreens extends StatelessWidget { case kSettingsTokenEdit: screen = TokenEditScreen(); break; + case kSettingsWebhooks: + screen = WebhookScreenBuilder(); + break; + case kSettingsWebhookView: + screen = WebhookViewScreen(); + break; + case kSettingsWebhookEdit: + screen = WebhookEditScreen(); + break; } return Row(children: [ diff --git a/lib/ui/webhook/edit/webhook_edit_vm.dart b/lib/ui/webhook/edit/webhook_edit_vm.dart index d5a24da94..8b7b8105d 100644 --- a/lib/ui/webhook/edit/webhook_edit_vm.dart +++ b/lib/ui/webhook/edit/webhook_edit_vm.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; @@ -16,7 +17,8 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class WebhookEditScreen extends StatelessWidget { const WebhookEditScreen({Key key}) : super(key: key); - static const String route = '/webhook/edit'; + + static const String route = '/$kSettings/$kSettingsWebhookEdit'; @override Widget build(BuildContext context) { diff --git a/lib/ui/webhook/view/webhook_view_vm.dart b/lib/ui/webhook/view/webhook_view_vm.dart index 2743d3d7d..8610baa49 100644 --- a/lib/ui/webhook/view/webhook_view_vm.dart +++ b/lib/ui/webhook/view/webhook_view_vm.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -17,7 +18,8 @@ class WebhookViewScreen extends StatelessWidget { Key key, this.isFilter = false, }) : super(key: key); - static const String route = '/webhook/view'; + + static const String route = '/$kSettings/$kSettingsWebhookView'; final bool isFilter; @override diff --git a/lib/ui/webhook/webhook_screen.dart b/lib/ui/webhook/webhook_screen.dart index 248c72c40..fcad29abe 100644 --- a/lib/ui/webhook/webhook_screen.dart +++ b/lib/ui/webhook/webhook_screen.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -23,7 +24,8 @@ class WebhookScreen extends StatelessWidget { @required this.viewModel, }) : super(key: key); - static const String route = '/webhook'; + + static const String route = '/$kSettings/$kSettingsWebhooks'; final WebhookScreenVM viewModel;