Skip to content

Merge request from DhiWise #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions lib/presentation/cards_page/cards_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -171,16 +171,16 @@ class CardsPage extends StatelessWidget {
child: SizedBox(width: getHorizontalSize(16), child: Divider(height: getVerticalSize(2), thickness: getVerticalSize(2), color: ColorConstant.whiteA700)))
])),
SizedBox(
width:
getHorizontalSize(
2),
child: Divider(
height:
getVerticalSize(
43),
height:
getVerticalSize(
43),
child: VerticalDivider(
width:
getHorizontalSize(
2),
thickness:
getVerticalSize(
43),
2),
color: ColorConstant
.whiteA700)),
Container(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,11 @@ class Listiconsbackground1ItemWidget extends StatelessWidget {
style: AppStyle.txtHeadline,
),
),
Padding(
padding: getPadding(
Container(
width: getHorizontalSize(
226,
),
margin: getMargin(
top: 7,
),
child: Obx(
Expand Down Expand Up @@ -101,6 +104,9 @@ class Listiconsbackground1ItemWidget extends StatelessWidget {
1,
),
color: ColorConstant.gray8005b,
indent: getHorizontalSize(
64,
),
),
),
),
Expand Down
4 changes: 3 additions & 1 deletion lib/presentation/dashboard_page/dashboard_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,9 @@ class DashboardPage extends StatelessWidget {
height: getVerticalSize(1),
thickness: getVerticalSize(1),
color:
ColorConstant.gray8005b)))
ColorConstant.gray8005b,
indent:
getHorizontalSize(80))))
])),
Align(
alignment: Alignment.centerLeft,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ class ContentItemWidget extends StatelessWidget {
1,
),
color: ColorConstant.gray8005b,
indent: getHorizontalSize(
64,
),
),
),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,9 @@ class OnboardingOneScreen extends GetWidget<OnboardingOneController> {
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.left,
style: AppStyle.txtSFProBold22)),
Padding(
padding: getPadding(top: 14),
Container(
width: getHorizontalSize(340),
margin: getMargin(top: 14),
child: Text("msg_we_are_always_looking".tr,
maxLines: null,
textAlign: TextAlign.center,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,9 @@ class OnboardingThreeScreen extends GetWidget<OnboardingThreeController> {
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.left,
style: AppStyle.txtSFProBold22)),
Padding(
padding: getPadding(top: 14),
Container(
width: getHorizontalSize(327),
margin: getMargin(top: 14),
child: Text("msg_make_transfers_to".tr,
maxLines: null,
textAlign: TextAlign.center,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,9 @@ class OnboardingTwoScreen extends GetWidget<OnboardingTwoController> {
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.left,
style: AppStyle.txtSFProBold22)),
Padding(
padding: getPadding(top: 16),
Container(
width: getHorizontalSize(358),
margin: getMargin(top: 16),
child: Text("msg_view_and_manage".tr,
maxLines: null,
textAlign: TextAlign.center,
Expand Down
3 changes: 3 additions & 0 deletions lib/presentation/payments_page/widgets/list_item_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ class ListItemWidget extends StatelessWidget {
1,
),
color: ColorConstant.gray8005b,
indent: getHorizontalSize(
64,
),
),
),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ class ListgroupfortythreeItemWidget extends StatelessWidget {
1,
),
color: ColorConstant.gray8005b,
indent: getHorizontalSize(
64,
),
),
),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ class ListiconsbackgroundItemWidget extends StatelessWidget {
1,
),
color: ColorConstant.gray8005b,
indent: getHorizontalSize(
64,
),
),
),
),
Expand Down
10 changes: 8 additions & 2 deletions lib/presentation/settings_screen/settings_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@ class SettingsScreen extends GetWidget<SettingsController> {
1,
),
color: ColorConstant.gray8005b,
indent: getHorizontalSize(
64,
),
),
),
),
Expand Down Expand Up @@ -420,8 +423,11 @@ class SettingsScreen extends GetWidget<SettingsController> {
textAlign: TextAlign.left,
style: AppStyle.txtHeadlineBlack900,
),
Padding(
padding: getPadding(
Container(
width: getHorizontalSize(
226,
),
margin: getMargin(
top: 6,
),
child: Text(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,11 @@ class Content1ItemWidget extends StatelessWidget {
style: AppStyle.txtHeadline,
),
),
Padding(
padding: getPadding(
Container(
width: getHorizontalSize(
218,
),
margin: getMargin(
top: 7,
),
child: Obx(
Expand Down Expand Up @@ -101,6 +104,9 @@ class Content1ItemWidget extends StatelessWidget {
1,
),
color: ColorConstant.gray8005b,
indent: getHorizontalSize(
64,
),
),
),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ class List1ItemWidget extends StatelessWidget {
1,
),
color: ColorConstant.gray8005b,
indent: getHorizontalSize(
64,
),
),
),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ class Listiconsbackground2ItemWidget extends StatelessWidget {
1,
),
color: ColorConstant.gray8005b,
indent: getHorizontalSize(
64,
),
),
),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ class SectionlisttitleTwoItemWidget extends StatelessWidget {
1,
),
color: ColorConstant.gray8005b,
indent: getHorizontalSize(
64,
),
),
),
),
Expand Down
18 changes: 18 additions & 0 deletions lib/theme/app_decoration.dart
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,21 @@ class BorderRadiusStyle {
),
);
}

// Comment/Uncomment the below code based on your Flutter SDK version.

// For Flutter SDK Version 3.7.2 or greater.

double get strokeAlignInside => BorderSide.strokeAlignInside;

double get strokeAlignCenter => BorderSide.strokeAlignCenter;

double get strokeAlignOutside => BorderSide.strokeAlignOutside;

// For Flutter SDK Version 3.7.1 or less.

// StrokeAlign get strokeAlignInside => StrokeAlign.inside;
//
// StrokeAlign get strokeAlignCenter => StrokeAlign.center;
//
// StrokeAlign get strokeAlignOutside => StrokeAlign.outside;
2 changes: 1 addition & 1 deletion lib/widgets/app_bar/appbar_image.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class AppbarImage extends StatelessWidget {
Widget build(BuildContext context) {
return InkWell(
onTap: () {
onTap!();
onTap?.call();
},
child: Padding(
padding: margin ?? EdgeInsets.zero,
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/app_bar/appbar_stack.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class AppbarStack extends StatelessWidget {
Widget build(BuildContext context) {
return GestureDetector(
onTap: () {
onTap!();
onTap?.call();
},
child: Padding(
padding: margin ?? EdgeInsets.zero,
Expand Down