mr.mojtaba/rasadyar_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : ui changes

Browse Source
This commit is contained in:
mr.mojtaba
2025-10-05 10:49:47 +03:30
parent 05e645cbcb
commit a4c7fa87a3
2 changed files with 75 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/local.properties
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=release flutter.buildMode=debug
flutter.versionName=1.3.14 flutter.versionName=1.3.15
flutter.versionCode=11 flutter.versionCode=12

105
packages/chicken/lib/presentation/pages/common/profile/view.dart
View File

@@ -74,34 +74,75 @@ class ProfilePage extends GetView<ProfileLogic> {
rolesWidget(), rolesWidget(),
SizedBox(height: 320.h, child: userProfileInformation()), SizedBox(height: 320.h, child: userProfileInformation()),
Center( SizedBox(
child: Wrap( height: 130.h,
alignment: WrapAlignment.center, child: Container(
spacing: 20, margin: const EdgeInsets.symmetric(horizontal: 8),
runSpacing: 10, decoration: BoxDecoration(
children: [ color: Colors.white,
cardActionWidget( borderRadius: BorderRadius.circular(8),
title: 'تغییر رمز عبور', border: Border.all(width: 0.5, color: AppColor.darkGreyLight),
selected: true, ),
cardColor:AppColor.blueLightActive, child: Stack(
cardIconColor: AppColor.blueNormal, clipBehavior: Clip.none,
onPressed: () { children: [
Get.bottomSheet(changePasswordBottomSheet(), isScrollControlled: true); Positioned.fill(
}, child: Row(
icon: Assets.vec.lockSvg.path, children: [
), Padding(
cardActionWidget( padding: EdgeInsets.fromLTRB(24, 28, 24, 13),
title: 'خروج', child: Wrap(
selected: true, spacing: 50,
cardColor: Color(0xFFF6BDBD), runSpacing: 20,
cardIconColor: Color(0xFFEB5757), children: [
textColor: AppColor.redDarkerText, cardActionWidget(
onPressed: () { title: 'تغییر رمز عبور',
Get.bottomSheet(exitBottomSheet(), isScrollControlled: true); selected: true,
}, cardColor: AppColor.blueLightActive,
icon: Assets.vec.logoutSvg.path, 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<ProfileLogic> {
child: Container( child: Container(
padding: EdgeInsets.all(4), padding: EdgeInsets.all(4),
decoration: BoxDecoration( decoration: BoxDecoration(
color:cardIconColor, color: cardIconColor,
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
child: SvgGenImage.vec(icon).svg( child: SvgGenImage.vec(icon).svg(
@@ -313,9 +354,7 @@ class ProfilePage extends GetView<ProfileLogic> {
SizedBox(height: 2), SizedBox(height: 2),
Text( Text(
title, title,
style: AppFonts.yekan10.copyWith( style: AppFonts.yekan10.copyWith(color: AppColor.textColor),
color: textColor ?? (selected ? AppColor.blueNormal : AppColor.blueLightActive),
),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
], ],
@@ -660,7 +699,7 @@ class ProfilePage extends GetView<ProfileLogic> {
List<String>? item = data.value.data?.roles; List<String>? item = data.value.data?.roles;
return SingleChildScrollView( return SingleChildScrollView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
padding: EdgeInsets.symmetric(horizontal: 18.w), padding: EdgeInsets.symmetric(horizontal: 8.w),
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,