fix: some ui bug

This commit is contained in:
2025-11-03 09:04:28 +03:30
parent f93d9bb275
commit 6269445536
5 changed files with 18 additions and 10 deletions

View File

@@ -1,5 +1,5 @@
sdk.dir=C:/Users/Housh11/AppData/Local/Android/Sdk sdk.dir=C:/Users/Housh11/AppData/Local/Android/Sdk
flutter.sdk=C:\\src\\flutter flutter.sdk=C:\\src\\flutter
flutter.buildMode=debug flutter.buildMode=release
flutter.versionName=1.3.29 flutter.versionName=1.3.30
flutter.versionCode=26 flutter.versionCode=27

View File

@@ -26,7 +26,6 @@ class HomePage extends GetView<HomeLogic> {
mainInformation(), mainInformation(),
SizedBox(height: 8.h), SizedBox(height: 8.h),
WidelyUsedWidget(), WidelyUsedWidget(),
], ],
), ),
), ),
@@ -34,12 +33,14 @@ class HomePage extends GetView<HomeLogic> {
} }
Widget buildColumn(Widget widget, String title) { Widget buildColumn(Widget widget, String title) {
return Container( return Container(
height: 70.h, height: 70.h,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
spacing: 8, children: [widget, Text(title)])); spacing: 8,
children: [widget, Text(title)],
),
);
} }
InkWell mainInformation() { InkWell mainInformation() {
@@ -440,6 +441,7 @@ class HomePage extends GetView<HomeLogic> {
isLoading: data.value == null, isLoading: data.value == null,
description: data.value?.totalGovernmentalRemainWeight?.separatedByCommaFa ?? '0', description: data.value?.totalGovernmentalRemainWeight?.separatedByCommaFa ?? '0',
iconPath: Assets.vec.cubeCardGovermentSvg.path, iconPath: Assets.vec.cubeCardGovermentSvg.path,
iconColor: AppColor.textColor, iconColor: AppColor.textColor,
bgDescriptionColor: const Color(0xFFF5ECEE), bgDescriptionColor: const Color(0xFFF5ECEE),
bgLabelColor: const Color(0xFFDEC1C7), bgLabelColor: const Color(0xFFDEC1C7),

View File

@@ -70,6 +70,9 @@ class StewardRootPage extends GetView<StewardRootLogic> {
icon: Assets.vec.buySvg.path, icon: Assets.vec.buySvg.path,
isSelected: controller.currentPage.value == 0, isSelected: controller.currentPage.value == 0,
onTap: () { onTap: () {
Get.nestedKey(
stewardFirstKey,
)?.currentState?.popUntil((route) => route.isFirst);
Get.nestedKey( Get.nestedKey(
stewardSecondKey, stewardSecondKey,
)?.currentState?.popUntil((route) => route.isFirst); )?.currentState?.popUntil((route) => route.isFirst);
@@ -85,6 +88,9 @@ class StewardRootPage extends GetView<StewardRootLogic> {
Get.nestedKey( Get.nestedKey(
stewardFirstKey, stewardFirstKey,
)?.currentState?.popUntil((route) => route.isFirst); )?.currentState?.popUntil((route) => route.isFirst);
Get.nestedKey(
stewardSecondKey,
)?.currentState?.popUntil((route) => route.isFirst);
controller.changePage(1); controller.changePage(1);
}, },
), ),

View File

@@ -1,7 +1,7 @@
name: rasadyar_app name: rasadyar_app
description: "A new Flutter project." description: "A new Flutter project."
publish_to: 'none' publish_to: 'none'
version: 1.3.29+26 version: 1.3.30+27
environment: environment:
sdk: ^3.9.2 sdk: ^3.9.2