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

fix :

Browse Source 
some ui bug
This commit is contained in:
mr.mojtaba
2025-04-22 15:08:01 +03:30
parent 9751c5cee4
commit a45c0807d1
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/app/src/main/AndroidManifest.xml
View File

@@ -11,6 +11,7 @@
android:exported="true" android:exported="true"
android:launchMode="singleTop" android:launchMode="singleTop"
android:taskAffinity="" android:taskAffinity=""
android:enableOnBackInvokedCallback="true"
android:theme="@style/LaunchTheme" android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"

2
features/supervision/lib/presentation/display_information/view.dart
View File

@@ -78,7 +78,7 @@ class DisplayInformationPage extends GetView<DisplayInformationLogic> {
Expanded(child: ROutlinedElevated( Expanded(child: ROutlinedElevated(
height: 40, height: 40,
text: 'انصراف', onPressed: (){ text: 'انصراف', onPressed: (){
Get.offAllNamed(SupervisionRoutes.supervision); Get.until((route) => route.isFirst);
})) }))
], ],
) )

2
features/supervision/lib/presentation/filter/view.dart
View File

@@ -23,7 +23,7 @@ class SupervisionFilterPage extends GetView<SupervisionFilterLogic> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return PopScope( return PopScope(
canPop: controller.sheetController.value.handleBack(), canPop: controller.sheetController.value.handleBack,
onPopInvokedWithResult: (didPop, result) { onPopInvokedWithResult: (didPop, result) {
if (!didPop && if (!didPop &&
controller.sheetController.value.bottomSheets.isNotEmpty) { controller.sheetController.value.bottomSheets.isNotEmpty) {

13
features/supervision/lib/presentation/profile/view.dart
View File

@@ -43,7 +43,6 @@ class ProfilePage extends GetView<ProfileLogic> {
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
spacing: 16, spacing: 16,
children: [ children: [
SizedBox( SizedBox(
@@ -77,12 +76,12 @@ class ProfilePage extends GetView<ProfileLogic> {
itemCount: controller.roles.length, itemCount: controller.roles.length,
), ),
), ),
Padding( Expanded(
padding: const EdgeInsets.symmetric( child: Padding(
horizontal: 30, padding: const EdgeInsets.symmetric(
vertical: 10, horizontal: 30,
), vertical: 10,
child: Expanded( ),
child: ObxValue((data) { child: ObxValue((data) {
return switch (data.value) { return switch (data.value) {
0 => userProfileInformation(), 0 => userProfileInformation(),

15
packages/core/lib/presentation/widget/draggable_bottom_sheet/draggable_bottom_sheet_controller.dart
View File

@@ -116,12 +116,13 @@ class DraggableBottomSheetController extends GetxController {
}); });
} }
} }
bool get handleBack{
bool handleBack() { if (bottomSheets.isNotEmpty) {
if (bottomSheets.isNotEmpty) { removeLastBottomSheet();
removeLastBottomSheet(); return true;
return true;
}
return false;
} }
return false;
}
} }