fix :
some ui bug
This commit is contained in:
@@ -11,6 +11,7 @@
|
||||
android:exported="true"
|
||||
android:launchMode="singleTop"
|
||||
android:taskAffinity=""
|
||||
android:enableOnBackInvokedCallback="true"
|
||||
android:theme="@style/LaunchTheme"
|
||||
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
|
||||
android:hardwareAccelerated="true"
|
||||
|
||||
@@ -78,7 +78,7 @@ class DisplayInformationPage extends GetView<DisplayInformationLogic> {
|
||||
Expanded(child: ROutlinedElevated(
|
||||
height: 40,
|
||||
text: 'انصراف', onPressed: (){
|
||||
Get.offAllNamed(SupervisionRoutes.supervision);
|
||||
Get.until((route) => route.isFirst);
|
||||
}))
|
||||
],
|
||||
)
|
||||
|
||||
@@ -23,7 +23,7 @@ class SupervisionFilterPage extends GetView<SupervisionFilterLogic> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return PopScope(
|
||||
canPop: controller.sheetController.value.handleBack(),
|
||||
canPop: controller.sheetController.value.handleBack,
|
||||
onPopInvokedWithResult: (didPop, result) {
|
||||
if (!didPop &&
|
||||
controller.sheetController.value.bottomSheets.isNotEmpty) {
|
||||
|
||||
@@ -43,7 +43,6 @@ class ProfilePage extends GetView<ProfileLogic> {
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
|
||||
spacing: 16,
|
||||
children: [
|
||||
SizedBox(
|
||||
@@ -77,12 +76,12 @@ class ProfilePage extends GetView<ProfileLogic> {
|
||||
itemCount: controller.roles.length,
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 30,
|
||||
vertical: 10,
|
||||
),
|
||||
child: Expanded(
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 30,
|
||||
vertical: 10,
|
||||
),
|
||||
child: ObxValue((data) {
|
||||
return switch (data.value) {
|
||||
0 => userProfileInformation(),
|
||||
|
||||
@@ -116,12 +116,13 @@ class DraggableBottomSheetController extends GetxController {
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
bool handleBack() {
|
||||
if (bottomSheets.isNotEmpty) {
|
||||
removeLastBottomSheet();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
bool get handleBack{
|
||||
if (bottomSheets.isNotEmpty) {
|
||||
removeLastBottomSheet();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user