From a4c7fa87a39c120aaf536dc28e2525835c6317d6 Mon Sep 17 00:00:00 2001 From: "mr.mojtaba" Date: Sun, 5 Oct 2025 10:49:47 +0330 Subject: [PATCH] fix : ui changes --- android/local.properties | 6 +- .../pages/common/profile/view.dart | 105 ++++++++++++------ 2 files changed, 75 insertions(+), 36 deletions(-) diff --git a/android/local.properties b/android/local.properties index 81b593d..d1e4376 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=release -flutter.versionName=1.3.14 -flutter.versionCode=11 \ No newline at end of file +flutter.buildMode=debug +flutter.versionName=1.3.15 +flutter.versionCode=12 \ No newline at end of file diff --git a/packages/chicken/lib/presentation/pages/common/profile/view.dart b/packages/chicken/lib/presentation/pages/common/profile/view.dart index 477ac25..44e2a0d 100644 --- a/packages/chicken/lib/presentation/pages/common/profile/view.dart +++ b/packages/chicken/lib/presentation/pages/common/profile/view.dart @@ -74,34 +74,75 @@ class ProfilePage extends GetView { rolesWidget(), SizedBox(height: 320.h, child: userProfileInformation()), - Center( - child: Wrap( - alignment: WrapAlignment.center, - spacing: 20, - runSpacing: 10, - children: [ - cardActionWidget( - title: 'تغییر رمز عبور', - selected: true, - cardColor:AppColor.blueLightActive, - cardIconColor: AppColor.blueNormal, - onPressed: () { - Get.bottomSheet(changePasswordBottomSheet(), isScrollControlled: true); - }, - icon: Assets.vec.lockSvg.path, - ), - cardActionWidget( - title: 'خروج', - selected: true, - cardColor: Color(0xFFF6BDBD), - cardIconColor: Color(0xFFEB5757), - textColor: AppColor.redDarkerText, - onPressed: () { - Get.bottomSheet(exitBottomSheet(), isScrollControlled: true); - }, - icon: Assets.vec.logoutSvg.path, - ), - ], + SizedBox( + height: 130.h, + child: Container( + margin: const EdgeInsets.symmetric(horizontal: 8), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + border: Border.all(width: 0.5, color: AppColor.darkGreyLight), + ), + child: Stack( + clipBehavior: Clip.none, + children: [ + Positioned.fill( + child: Row( + children: [ + Padding( + padding: EdgeInsets.fromLTRB(24, 28, 24, 13), + child: Wrap( + spacing: 50, + runSpacing: 20, + children: [ + cardActionWidget( + title: 'تغییر رمز عبور', + selected: true, + cardColor: AppColor.blueLightActive, + cardIconColor: AppColor.blueNormal, + onPressed: () { + Get.bottomSheet( + changePasswordBottomSheet(), + isScrollControlled: true, + ); + }, + icon: Assets.vec.lockSvg.path, + ), + cardActionWidget( + title: 'خروج', + selected: true, + cardColor: Color(0xFFF6BDBD), + cardIconColor: Color(0xFFEB5757), + textColor: AppColor.redDarkerText, + onPressed: () { + Get.bottomSheet(exitBottomSheet(), isScrollControlled: true); + }, + icon: Assets.vec.logoutSvg.path, + ), + ], + ), + ), + ], + ), + ), + Positioned( + right: 10, + top: -15, + child: Container( + padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + border: Border.all(width: 0.5, color: Color(0xFFA9A9A9)), + ), + child: Text( + 'اطلاعات هویتی', + style: AppFonts.yekan16.copyWith(color: AppColor.iconColor), + ), + ), + ), + ], + ), ), ), @@ -300,7 +341,7 @@ class ProfilePage extends GetView { child: Container( padding: EdgeInsets.all(4), decoration: BoxDecoration( - color:cardIconColor, + color: cardIconColor, borderRadius: BorderRadius.circular(8), ), child: SvgGenImage.vec(icon).svg( @@ -313,9 +354,7 @@ class ProfilePage extends GetView { SizedBox(height: 2), Text( title, - style: AppFonts.yekan10.copyWith( - color: textColor ?? (selected ? AppColor.blueNormal : AppColor.blueLightActive), - ), + style: AppFonts.yekan10.copyWith(color: AppColor.textColor), textAlign: TextAlign.center, ), ], @@ -660,7 +699,7 @@ class ProfilePage extends GetView { List? item = data.value.data?.roles; return SingleChildScrollView( scrollDirection: Axis.horizontal, - padding: EdgeInsets.symmetric(horizontal: 18.w), + padding: EdgeInsets.symmetric(horizontal: 8.w), physics: BouncingScrollPhysics(), child: Row( mainAxisAlignment: MainAxisAlignment.center,