diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 79ad968..43abe68 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index de50231..67833e3 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 8ecbbab..2956cf8 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 8781f08..e244a8a 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 9c7000e..7977b39 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 55fbb9f..99c9e1f 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index 57bfcfa..3bd91aa 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index a6a7c92..428855e 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index bfa9102..6252af0 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index 4d2568e..6092c7a 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index b15421c..7c33994 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 2823a2a..c69029e 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index a6a7c92..428855e 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index 40bf89d..8a71493 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index 314a70f..0b2f701 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index 314a70f..0b2f701 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index 2cedea6..1c5fe79 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index 52c22e1..ba06f2d 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index 7ebd029..c9e4c46 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index af720dd..bd8c6da 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/lib/presentation/cards_page/cards_page.dart b/lib/presentation/cards_page/cards_page.dart index daae8a5..aacb2c5 100644 --- a/lib/presentation/cards_page/cards_page.dart +++ b/lib/presentation/cards_page/cards_page.dart @@ -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( diff --git a/lib/presentation/cards_page/widgets/listiconsbackground1_item_widget.dart b/lib/presentation/cards_page/widgets/listiconsbackground1_item_widget.dart index 7a18d97..3b4bcf6 100644 --- a/lib/presentation/cards_page/widgets/listiconsbackground1_item_widget.dart +++ b/lib/presentation/cards_page/widgets/listiconsbackground1_item_widget.dart @@ -54,8 +54,11 @@ class Listiconsbackground1ItemWidget extends StatelessWidget { style: AppStyle.txtHeadline, ), ), - Padding( - padding: getPadding( + Container( + width: getHorizontalSize( + 226, + ), + margin: getMargin( top: 7, ), child: Obx( @@ -101,6 +104,9 @@ class Listiconsbackground1ItemWidget extends StatelessWidget { 1, ), color: ColorConstant.gray8005b, + indent: getHorizontalSize( + 64, + ), ), ), ), diff --git a/lib/presentation/dashboard_page/dashboard_page.dart b/lib/presentation/dashboard_page/dashboard_page.dart index fefaaa9..6a5e227 100644 --- a/lib/presentation/dashboard_page/dashboard_page.dart +++ b/lib/presentation/dashboard_page/dashboard_page.dart @@ -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, diff --git a/lib/presentation/dashboard_page/widgets/content_item_widget.dart b/lib/presentation/dashboard_page/widgets/content_item_widget.dart index 49302ac..56dad0a 100644 --- a/lib/presentation/dashboard_page/widgets/content_item_widget.dart +++ b/lib/presentation/dashboard_page/widgets/content_item_widget.dart @@ -99,6 +99,9 @@ class ContentItemWidget extends StatelessWidget { 1, ), color: ColorConstant.gray8005b, + indent: getHorizontalSize( + 64, + ), ), ), ), diff --git a/lib/presentation/onboarding_one_screen/onboarding_one_screen.dart b/lib/presentation/onboarding_one_screen/onboarding_one_screen.dart index efcec3a..965e3b8 100644 --- a/lib/presentation/onboarding_one_screen/onboarding_one_screen.dart +++ b/lib/presentation/onboarding_one_screen/onboarding_one_screen.dart @@ -92,8 +92,9 @@ class OnboardingOneScreen extends GetWidget { 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, diff --git a/lib/presentation/onboarding_three_screen/onboarding_three_screen.dart b/lib/presentation/onboarding_three_screen/onboarding_three_screen.dart index 9758785..217e628 100644 --- a/lib/presentation/onboarding_three_screen/onboarding_three_screen.dart +++ b/lib/presentation/onboarding_three_screen/onboarding_three_screen.dart @@ -91,8 +91,9 @@ class OnboardingThreeScreen extends GetWidget { 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, diff --git a/lib/presentation/onboarding_two_screen/onboarding_two_screen.dart b/lib/presentation/onboarding_two_screen/onboarding_two_screen.dart index 9102010..7f3862f 100644 --- a/lib/presentation/onboarding_two_screen/onboarding_two_screen.dart +++ b/lib/presentation/onboarding_two_screen/onboarding_two_screen.dart @@ -93,8 +93,9 @@ class OnboardingTwoScreen extends GetWidget { 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, diff --git a/lib/presentation/payments_page/widgets/list_item_widget.dart b/lib/presentation/payments_page/widgets/list_item_widget.dart index d82bfa4..e4dbc6e 100644 --- a/lib/presentation/payments_page/widgets/list_item_widget.dart +++ b/lib/presentation/payments_page/widgets/list_item_widget.dart @@ -96,6 +96,9 @@ class ListItemWidget extends StatelessWidget { 1, ), color: ColorConstant.gray8005b, + indent: getHorizontalSize( + 64, + ), ), ), ), diff --git a/lib/presentation/payments_page/widgets/listgroupfortythree_item_widget.dart b/lib/presentation/payments_page/widgets/listgroupfortythree_item_widget.dart index 7a9a1d1..7da6e27 100644 --- a/lib/presentation/payments_page/widgets/listgroupfortythree_item_widget.dart +++ b/lib/presentation/payments_page/widgets/listgroupfortythree_item_widget.dart @@ -109,6 +109,9 @@ class ListgroupfortythreeItemWidget extends StatelessWidget { 1, ), color: ColorConstant.gray8005b, + indent: getHorizontalSize( + 64, + ), ), ), ), diff --git a/lib/presentation/payments_page/widgets/listiconsbackground_item_widget.dart b/lib/presentation/payments_page/widgets/listiconsbackground_item_widget.dart index 3c90194..df032b5 100644 --- a/lib/presentation/payments_page/widgets/listiconsbackground_item_widget.dart +++ b/lib/presentation/payments_page/widgets/listiconsbackground_item_widget.dart @@ -97,6 +97,9 @@ class ListiconsbackgroundItemWidget extends StatelessWidget { 1, ), color: ColorConstant.gray8005b, + indent: getHorizontalSize( + 64, + ), ), ), ), diff --git a/lib/presentation/settings_screen/settings_screen.dart b/lib/presentation/settings_screen/settings_screen.dart index f49a835..0234d8e 100644 --- a/lib/presentation/settings_screen/settings_screen.dart +++ b/lib/presentation/settings_screen/settings_screen.dart @@ -255,6 +255,9 @@ class SettingsScreen extends GetWidget { 1, ), color: ColorConstant.gray8005b, + indent: getHorizontalSize( + 64, + ), ), ), ), @@ -420,8 +423,11 @@ class SettingsScreen extends GetWidget { textAlign: TextAlign.left, style: AppStyle.txtHeadlineBlack900, ), - Padding( - padding: getPadding( + Container( + width: getHorizontalSize( + 226, + ), + margin: getMargin( top: 6, ), child: Text( diff --git a/lib/presentation/settings_screen/widgets/content1_item_widget.dart b/lib/presentation/settings_screen/widgets/content1_item_widget.dart index c7c1eef..7959bf3 100644 --- a/lib/presentation/settings_screen/widgets/content1_item_widget.dart +++ b/lib/presentation/settings_screen/widgets/content1_item_widget.dart @@ -54,8 +54,11 @@ class Content1ItemWidget extends StatelessWidget { style: AppStyle.txtHeadline, ), ), - Padding( - padding: getPadding( + Container( + width: getHorizontalSize( + 218, + ), + margin: getMargin( top: 7, ), child: Obx( @@ -101,6 +104,9 @@ class Content1ItemWidget extends StatelessWidget { 1, ), color: ColorConstant.gray8005b, + indent: getHorizontalSize( + 64, + ), ), ), ), diff --git a/lib/presentation/settings_screen/widgets/list1_item_widget.dart b/lib/presentation/settings_screen/widgets/list1_item_widget.dart index 0f1785c..7dd76a0 100644 --- a/lib/presentation/settings_screen/widgets/list1_item_widget.dart +++ b/lib/presentation/settings_screen/widgets/list1_item_widget.dart @@ -90,6 +90,9 @@ class List1ItemWidget extends StatelessWidget { 1, ), color: ColorConstant.gray8005b, + indent: getHorizontalSize( + 64, + ), ), ), ), diff --git a/lib/presentation/settings_screen/widgets/listiconsbackground2_item_widget.dart b/lib/presentation/settings_screen/widgets/listiconsbackground2_item_widget.dart index ca00316..63d6139 100644 --- a/lib/presentation/settings_screen/widgets/listiconsbackground2_item_widget.dart +++ b/lib/presentation/settings_screen/widgets/listiconsbackground2_item_widget.dart @@ -98,6 +98,9 @@ class Listiconsbackground2ItemWidget extends StatelessWidget { 1, ), color: ColorConstant.gray8005b, + indent: getHorizontalSize( + 64, + ), ), ), ), diff --git a/lib/presentation/transactions_screen/widgets/sectionlisttitle_two_item_widget.dart b/lib/presentation/transactions_screen/widgets/sectionlisttitle_two_item_widget.dart index 2c09ebb..96c5320 100644 --- a/lib/presentation/transactions_screen/widgets/sectionlisttitle_two_item_widget.dart +++ b/lib/presentation/transactions_screen/widgets/sectionlisttitle_two_item_widget.dart @@ -97,6 +97,9 @@ class SectionlisttitleTwoItemWidget extends StatelessWidget { 1, ), color: ColorConstant.gray8005b, + indent: getHorizontalSize( + 64, + ), ), ), ), diff --git a/lib/theme/app_decoration.dart b/lib/theme/app_decoration.dart index 6237401..407ea14 100644 --- a/lib/theme/app_decoration.dart +++ b/lib/theme/app_decoration.dart @@ -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; diff --git a/lib/widgets/app_bar/appbar_image.dart b/lib/widgets/app_bar/appbar_image.dart index d0607d6..bed0a65 100644 --- a/lib/widgets/app_bar/appbar_image.dart +++ b/lib/widgets/app_bar/appbar_image.dart @@ -27,7 +27,7 @@ class AppbarImage extends StatelessWidget { Widget build(BuildContext context) { return InkWell( onTap: () { - onTap!(); + onTap?.call(); }, child: Padding( padding: margin ?? EdgeInsets.zero, diff --git a/lib/widgets/app_bar/appbar_stack.dart b/lib/widgets/app_bar/appbar_stack.dart index 20db4d0..f1271f7 100644 --- a/lib/widgets/app_bar/appbar_stack.dart +++ b/lib/widgets/app_bar/appbar_stack.dart @@ -13,7 +13,7 @@ class AppbarStack extends StatelessWidget { Widget build(BuildContext context) { return GestureDetector( onTap: () { - onTap!(); + onTap?.call(); }, child: Padding( padding: margin ?? EdgeInsets.zero,