diff --git a/assets/i18n/en.json b/assets/i18n/en.json index c89b023c..4d2b6127 100644 --- a/assets/i18n/en.json +++ b/assets/i18n/en.json @@ -31,7 +31,7 @@ }, "patcherView": { "widgetTitle": "Patcher", - "fabButton": "Patch" + "patchButton": "Patch" }, "appSelectorCard": { "widgetTitle": "Select application", @@ -50,7 +50,7 @@ }, "appSelectorView": { "searchBarHint": "Search applications", - "fabButton": "Storage", + "storageButton": "Storage", "errorMessage": "Unable to use selected application." }, "patchesSelectorView": { diff --git a/lib/ui/views/app_selector/app_selector_view.dart b/lib/ui/views/app_selector/app_selector_view.dart index 93f9e06f..a7a1546e 100644 --- a/lib/ui/views/app_selector/app_selector_view.dart +++ b/lib/ui/views/app_selector/app_selector_view.dart @@ -23,12 +23,17 @@ class _AppSelectorViewState extends State { viewModelBuilder: () => AppSelectorViewModel(), builder: (context, model, child) => Scaffold( floatingActionButton: FloatingActionButton.extended( + label: I18nText('appSelectorView.storageButton'), + icon: const Icon(Icons.sd_storage), onPressed: () { model.selectAppFromStorage(context); Navigator.of(context).pop(); }, - label: I18nText('appSelectorView.fabButton'), - icon: const Icon(Icons.sd_storage), + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.all( + Radius.circular(16.0), + ), + ), backgroundColor: Theme.of(context).colorScheme.secondary, foregroundColor: Colors.white, ), diff --git a/lib/ui/views/contributors/contributors_view.dart b/lib/ui/views/contributors/contributors_view.dart index 2ca66fff..63903241 100644 --- a/lib/ui/views/contributors/contributors_view.dart +++ b/lib/ui/views/contributors/contributors_view.dart @@ -12,10 +12,6 @@ class ContributorsView extends StatelessWidget { viewModelBuilder: () => ContributorsViewModel(), onModelReady: (model) => model.getContributors(), builder: (context, model, child) => Scaffold( - floatingActionButton: FloatingActionButton( - onPressed: () => model.getContributors(), - child: const Icon(Icons.refresh), - ), body: SafeArea( child: SingleChildScrollView( child: Column( diff --git a/lib/ui/views/patcher/patcher_view.dart b/lib/ui/views/patcher/patcher_view.dart index deb04bf2..f8e45077 100644 --- a/lib/ui/views/patcher/patcher_view.dart +++ b/lib/ui/views/patcher/patcher_view.dart @@ -18,11 +18,16 @@ class PatcherView extends StatelessWidget { viewModelBuilder: () => locator(), builder: (context, model, child) => Scaffold( floatingActionButton: Visibility( - visible: model.showFabButton(), + visible: model.showPatchButton(), child: FloatingActionButton.extended( - onPressed: () => model.navigateToInstaller(), - label: I18nText('patcherView.fabButton'), + label: I18nText('patcherView.patchButton'), icon: const Icon(Icons.build), + onPressed: () => model.navigateToInstaller(), + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.all( + Radius.circular(16.0), + ), + ), backgroundColor: Theme.of(context).colorScheme.secondary, foregroundColor: Colors.white, ), diff --git a/lib/ui/views/patcher/patcher_viewmodel.dart b/lib/ui/views/patcher/patcher_viewmodel.dart index 18b356b6..9d26bce4 100644 --- a/lib/ui/views/patcher/patcher_viewmodel.dart +++ b/lib/ui/views/patcher/patcher_viewmodel.dart @@ -25,7 +25,7 @@ class PatcherViewModel extends BaseViewModel { _navigationService.navigateTo(Routes.installerView); } - bool showFabButton() { + bool showPatchButton() { return selectedPatches.isNotEmpty; }