From cfc866bef2497bc1675bf5dea834cea59d9cc969 Mon Sep 17 00:00:00 2001 From: Ushie Date: Sat, 29 Apr 2023 15:37:30 +0300 Subject: [PATCH] feat: change `continue anyways` to `cancel` --- assets/i18n/en_US.json | 1 - lib/ui/views/app_selector/app_selector_view.dart | 1 - .../app_selector/app_selector_viewmodel.dart | 16 +++++++--------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/assets/i18n/en_US.json b/assets/i18n/en_US.json index 5a05c8a3..2f5393e7 100644 --- a/assets/i18n/en_US.json +++ b/assets/i18n/en_US.json @@ -74,7 +74,6 @@ "viewTitle": "Select an application", "searchBarHint": "Search applications", "selectFromStorageButton": "Select from storage", - "continueAnywayButton": "Continue anyway", "storageButton": "Storage", "errorMessage": "Unable to use selected application", "downloadToast": "Download function is not available yet", diff --git a/lib/ui/views/app_selector/app_selector_view.dart b/lib/ui/views/app_selector/app_selector_view.dart index 228d364b..2509eb9a 100644 --- a/lib/ui/views/app_selector/app_selector_view.dart +++ b/lib/ui/views/app_selector/app_selector_view.dart @@ -116,7 +116,6 @@ class _AppSelectorViewState extends State { ) : model.showSelectFromStorageDialog( context, - app, ); }, ), diff --git a/lib/ui/views/app_selector/app_selector_viewmodel.dart b/lib/ui/views/app_selector/app_selector_viewmodel.dart index c526aa2b..d40756e7 100644 --- a/lib/ui/views/app_selector/app_selector_viewmodel.dart +++ b/lib/ui/views/app_selector/app_selector_viewmodel.dart @@ -78,8 +78,7 @@ class AppSelectorViewModel extends BaseViewModel { locator().loadLastSelectedPatches(); } - Future showSelectFromStorageDialog( - BuildContext context, ApplicationWithIcon app) async { + Future showSelectFromStorageDialog(BuildContext context) async { return showDialog( context: context, builder: (context) => SimpleDialog( @@ -133,19 +132,18 @@ class AppSelectorViewModel extends BaseViewModel { ], ), ), + const SizedBox(height: 10), CustomMaterialButton( isFilled: false, - onPressed: () => selectApp(app).then( - (_) { - Navigator.pop(context); - Navigator.pop(context); - }, - ), + onPressed: () { + Navigator.pop(context); + Navigator.pop(context); + }, label: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ const SizedBox(width: 10), - I18nText('appSelectorView.continueAnywayButton'), + I18nText('cancelButton'), ], ), ),