From 6269445536dbac1bddd3863d6b17991f1e0afbba Mon Sep 17 00:00:00 2001 From: "mr.mojtaba" Date: Mon, 3 Nov 2025 09:04:28 +0330 Subject: [PATCH] fix: some ui bug --- android/local.properties | 6 +++--- assets/vec/cube_card_goverment.svg.vec | Bin 1519 -> 708 bytes .../presentation/pages/steward/home/view.dart | 14 ++++++++------ .../presentation/pages/steward/root/view.dart | 6 ++++++ pubspec.yaml | 2 +- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/android/local.properties b/android/local.properties index 4fc8e59..7e73034 100644 --- a/android/local.properties +++ b/android/local.properties @@ -1,5 +1,5 @@ sdk.dir=C:/Users/Housh11/AppData/Local/Android/Sdk flutter.sdk=C:\\src\\flutter -flutter.buildMode=debug -flutter.versionName=1.3.29 -flutter.versionCode=26 \ No newline at end of file +flutter.buildMode=release +flutter.versionName=1.3.30 +flutter.versionCode=27 \ No newline at end of file diff --git a/assets/vec/cube_card_goverment.svg.vec b/assets/vec/cube_card_goverment.svg.vec index 7fc92d0a362bb448eff7b7dbb895d9196d4d157a..202cb6b4f28091ce17388b2b6563c0202dd3c5a0 100644 GIT binary patch delta 37 pcmaFQeS}pyNw4ORdE delta 250 zcmX@Y`kvb>NwbHQ@0l@~KXpF>UfQ#%s*d42&D4S2D57F*1O>1OR~P BILH71 diff --git a/packages/chicken/lib/presentation/pages/steward/home/view.dart b/packages/chicken/lib/presentation/pages/steward/home/view.dart index 0e0527c..4d69733 100644 --- a/packages/chicken/lib/presentation/pages/steward/home/view.dart +++ b/packages/chicken/lib/presentation/pages/steward/home/view.dart @@ -26,7 +26,6 @@ class HomePage extends GetView { mainInformation(), SizedBox(height: 8.h), WidelyUsedWidget(), - ], ), ), @@ -34,12 +33,14 @@ class HomePage extends GetView { } Widget buildColumn(Widget widget, String title) { - return Container( - height: 70.h, - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - spacing: 8, children: [widget, Text(title)])); + height: 70.h, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + spacing: 8, + children: [widget, Text(title)], + ), + ); } InkWell mainInformation() { @@ -440,6 +441,7 @@ class HomePage extends GetView { isLoading: data.value == null, description: data.value?.totalGovernmentalRemainWeight?.separatedByCommaFa ?? '0', iconPath: Assets.vec.cubeCardGovermentSvg.path, + iconColor: AppColor.textColor, bgDescriptionColor: const Color(0xFFF5ECEE), bgLabelColor: const Color(0xFFDEC1C7), diff --git a/packages/chicken/lib/presentation/pages/steward/root/view.dart b/packages/chicken/lib/presentation/pages/steward/root/view.dart index ee8f531..5fa415b 100644 --- a/packages/chicken/lib/presentation/pages/steward/root/view.dart +++ b/packages/chicken/lib/presentation/pages/steward/root/view.dart @@ -70,6 +70,9 @@ class StewardRootPage extends GetView { icon: Assets.vec.buySvg.path, isSelected: controller.currentPage.value == 0, onTap: () { + Get.nestedKey( + stewardFirstKey, + )?.currentState?.popUntil((route) => route.isFirst); Get.nestedKey( stewardSecondKey, )?.currentState?.popUntil((route) => route.isFirst); @@ -85,6 +88,9 @@ class StewardRootPage extends GetView { Get.nestedKey( stewardFirstKey, )?.currentState?.popUntil((route) => route.isFirst); + Get.nestedKey( + stewardSecondKey, + )?.currentState?.popUntil((route) => route.isFirst); controller.changePage(1); }, ), diff --git a/pubspec.yaml b/pubspec.yaml index b4428d8..89f3b9e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: rasadyar_app description: "A new Flutter project." publish_to: 'none' -version: 1.3.29+26 +version: 1.3.30+27 environment: sdk: ^3.9.2