Skip to content

Commit

Permalink
Bugfix/UI improvements (#5)
Browse files Browse the repository at this point in the history
* Fix CreditCardForm add button padding

* Change splash color of TextButton in dialog action

* Remove license part from README.md

* Move lint dependency to dev
  • Loading branch information
mateusztylman committed Apr 11, 2022
1 parent 70e95d2 commit 030031f
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@ fvm_rebuild_models: ## Rebuilds all auto generated Dart files
fvm flutter pub run build_runner build --delete-conflicting-outputs

help:
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'


@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,4 @@ To generate all the necessary files
## Links
- [Merixstudio Mobile](https://www.merixstudio.com/services/mobile-app-development/)
- [Dribbles](https://dribbble.com/Merixstudio/projects/5011721-Vizier)
- [Invision](https://projects.invisionapp.com/share/4A10C0E0W629#/screens)

## License
MIT License
- [Invision](https://projects.invisionapp.com/share/4A10C0E0W629#/screens)
5 changes: 5 additions & 0 deletions lib/ui/modals/alert_dialog/adaptive_alert_dialog_action.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ class AdaptiveAlertDialogAction extends StatelessWidget {
Widget _buildMaterialDialogAction() {
return TextButton(
onPressed: onPressed,
style: ButtonStyle(
overlayColor: MaterialStateProperty.all(
AppColors.gray500,
),
),
child: Text(
title,
style: textStyle ?? _defaultActionTextStyle(),
Expand Down
1 change: 1 addition & 0 deletions lib/ui/pages/credit_card/form/credit_card_form_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ class _CreditCardFormPageState extends State<CreditCardFormPage> {
context.read<CardAddCubit>().add(context.read<CardFormCubit>().state.account);
}
},
padding: EdgeInsets.all(AppDimensions.padding.defaultValue),
child: Text(
AppLoc.of(context).creditCardFormAdd,
style: AppTextStyles.button.primary(),
Expand Down
2 changes: 1 addition & 1 deletion pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ packages:
source: hosted
version: "6.1.5"
lint:
dependency: "direct main"
dependency: "direct dev"
description:
name: lint
url: "https://pub.dartlang.org"
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ dependencies:
auto_route: ^3.2.4
#Tools
cupertino_icons: ^1.0.2
lint: ^1.8.2
#UI
flutter_svg: ^1.0.3

Expand All @@ -40,6 +39,7 @@ dev_dependencies:
freezed: ^1.1.1
injectable_generator: ^1.5.3
json_serializable: ^6.1.5
lint: ^1.8.2

flutter:
uses-material-design: true
Expand Down

0 comments on commit 030031f

Please sign in to comment.