Skip to content

Commit

Permalink
fix: onboarding design fixes (#138)
Browse files Browse the repository at this point in the history
## Description

- Page Swipping animation
- Background color adjustment
- Pointer indicator


## Type of Change

<!--- Put an `x` in all the boxes that apply: -->

- [ ] ✨ New feature (non-breaking change which adds functionality)
- [x] 🛠️ Bug fix (non-breaking change which fixes an issue)
- [ ] ❌ Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] 🧹 Code refactor
- [ ] ✅ Build configuration change
- [ ] 📝 Documentation
- [ ] 🗑️ Chore


## Pre-launch Checklist

- [ ] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [ ] I read and ran all relevant commands as specififed in the Running
Tests section of the [Contributor Guide].
- [ ] The title of the PR follows the [Conventional Commits] guideline
- [ ] My local branch follows the naming standards in the [Deepsource
Branch Naming Convention] or [Biodiversity Branch Naming Convention]
- [ ] I listed at least one issue that this PR fixes in the description
above.
- [ ] I updated `pubspec.yaml` with an appropriate new version according
to the [pub versioning philosophy],
- [ ] I updated/added relevant documentation (doc comments with `///`).
- [ ] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [ ] All existing and new tests are passing.


[Contributor Guide]:
https://github.com/FlutterPlaza/.github/blob/main/CONTRIBUTING.md
[Conventional Commits]:
https://www.conventionalcommits.org/en/v1.0.0-beta.4/
[pub versioning philosophy]: https://dart.dev/tools/pub/versioning
[Biodiversity Branch Naming Convention]: https://bit.ly/3DyYSwM
[Deepsource Branch Naming Convention]: https://bit.ly/3Y08Gs4
  • Loading branch information
jeffrey0606 authored Mar 24, 2023
2 parents 55e35ea + 8b6475f commit bfd5fd9
Show file tree
Hide file tree
Showing 53 changed files with 1,593 additions and 509 deletions.
3 changes: 3 additions & 0 deletions assets/fpb-assets/active_checkbox.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions assets/fpb-assets/apple_pay.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions assets/fpb-assets/bank.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions assets/fpb-assets/bank_account.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions assets/fpb-assets/google_pay.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions assets/fpb-assets/paypal.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions assets/fpb-assets/uncheck_tick.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions assets/fpb-assets/white_tick_check.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions lib/assets/fpb_svg.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ class SvgNames {
static String facebook = '${path}facebook.svg';
static String twitter = '${path}twitter.svg';
static String error = '${path}Cross.svg';
static String paypal = '${path}paypal.svg';
static String googlePay = '${path}google_pay.svg';
static String applePay = '${path}apple_pay.svg';
static String bank = '${path}bank_account.svg';
static String whiteTickCheckbox = '${path}white_tick_check.svg';
static String activeCheckbox = '${path}active_checkbox.svg';
static String inactiveCheckbox = '${path}uncheck_tick.svg';

static String timeCircle = '${path}time_circle.svg';
static String wallet = '${path}wallet.svg';
}
4 changes: 1 addition & 3 deletions lib/contact_us/view/contact_us_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,7 @@ class _ContactUsScreenState extends State<ContactUsScreen> {
label: l10n.contactUsSubmitBtnLabel,
onTap: () {
if (_formKey.currentState!.validate()) {
context.router.push(
ContactUsSuccessRoute()
);
context.router.push(ContactUsSuccessRoute());
} else {}
})
]),
Expand Down
14 changes: 6 additions & 8 deletions lib/contact_us/view/contact_us_success_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import 'package:fpb/l10n/l10n.dart';
import 'package:fpb/sign_in/view/sign_in_page.dart';

class ContactUsSuccessScreen extends StatelessWidget {
const ContactUsSuccessScreen({super.key, });
const ContactUsSuccessScreen({
super.key,
});

@override
Widget build(BuildContext context) {
Expand All @@ -16,8 +18,7 @@ class ContactUsSuccessScreen extends StatelessWidget {
final style = theme.textTheme;
//final colors = theme.colorScheme;

return LayoutBuilder(
builder: (context, box){
return LayoutBuilder(builder: (context, box) {
return Scaffold(
resizeToAvoidBottomInset: false,
body: Stack(children: [
Expand Down Expand Up @@ -45,7 +46,6 @@ class ContactUsSuccessScreen extends StatelessWidget {
bottom: box.maxHeight * .005),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,

children: [
SizedBox(
height: box.maxHeight * .1,
Expand All @@ -54,9 +54,7 @@ class ContactUsSuccessScreen extends StatelessWidget {
SizedBox(
height: box.maxHeight * .0001,
),
ContactUsSuccessTexts(

l10n: l10n, style: style, box: box),
ContactUsSuccessTexts(l10n: l10n, style: style, box: box),
SizedBox(
height: box.maxHeight * .15,
),
Expand All @@ -74,6 +72,6 @@ class ContactUsSuccessScreen extends StatelessWidget {
))
]),
);
});
});
}
}
7 changes: 2 additions & 5 deletions lib/contact_us/view/widgets/contact_us_success_texts.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,8 @@ class ContactUsSuccessTexts extends StatelessWidget {
SizedBox(
height: box.maxHeight * .025,
),
Text(
l10n.contactUsSuccessText,
maxLines: 3,
textAlign: TextAlign.center,
style: style.titleMedium),
Text(l10n.contactUsSuccessText,
maxLines: 3, textAlign: TextAlign.center, style: style.titleMedium),
],
);
}
Expand Down
Loading

0 comments on commit bfd5fd9

Please sign in to comment.