app tour bug and Create new password bug.
This commit is contained in:
parent
1c8515709a
commit
1eca9f0af3
BIN
assets/app_tour/leftDown2.png
Normal file
BIN
assets/app_tour/leftDown2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.1 KiB |
BIN
assets/app_tour/rightDown.png
Normal file
BIN
assets/app_tour/rightDown.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.9 KiB |
@ -179,7 +179,6 @@ class _CreateNewPwState extends ConsumerState<CreateNewPw> {
|
|||||||
SnackBar(
|
SnackBar(
|
||||||
content: Text(
|
content: Text(
|
||||||
AppLocalizations.of(context)!.password_update_successfully),
|
AppLocalizations.of(context)!.password_update_successfully),
|
||||||
backgroundColor: Colors.green,
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -676,7 +675,7 @@ class _CreateNewPwState extends ConsumerState<CreateNewPw> {
|
|||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
crossAxisAlignment: CrossAxisAlignment.center,
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
children: [
|
children: [
|
||||||
SizedBox(height: screenHeight / 8),
|
SizedBox(height: screenHeight * 0.21),
|
||||||
Icon(Icons.check_circle_outlined, color: Color(0xFF8AC681), size: 80),
|
Icon(Icons.check_circle_outlined, color: Color(0xFF8AC681), size: 80),
|
||||||
SizedBox(height: 20),
|
SizedBox(height: 20),
|
||||||
Text(
|
Text(
|
||||||
@ -743,7 +742,7 @@ class _CreateNewPwState extends ConsumerState<CreateNewPw> {
|
|||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: screenHeight / 2.2),
|
SizedBox(height: screenHeight*0.25),
|
||||||
// Spacer(),
|
// Spacer(),
|
||||||
Center(
|
Center(
|
||||||
// child: Container(
|
// child: Container(
|
||||||
|
|||||||
@ -518,7 +518,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void _previousKpiTutorial() {
|
Future<void> _previousKpiTutorial() async {
|
||||||
|
tourCard = (await _getWidget())!;
|
||||||
_initpreviousTargets();
|
_initpreviousTargets();
|
||||||
tutorialCoachMark = TutorialCoachMark(
|
tutorialCoachMark = TutorialCoachMark(
|
||||||
paddingFocus: 0,
|
paddingFocus: 0,
|
||||||
|
|||||||
@ -166,7 +166,7 @@ class _ManageUserRouterState extends ConsumerState<ManageUserRouter> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Method to show a confirmation dialog when status is changed
|
//Method to show a confirmation dialog when status is changed
|
||||||
Future<void> _showConfirmationDialog(User user, String newStatus) async {
|
Future<void> _showConfirmationDialog(User user, String newStatus,String statusUpdate) async {
|
||||||
print('user $user');
|
print('user $user');
|
||||||
double myheight = MediaQuery.of(context).size.height;
|
double myheight = MediaQuery.of(context).size.height;
|
||||||
|
|
||||||
@ -199,7 +199,7 @@ class _ManageUserRouterState extends ConsumerState<ManageUserRouter> {
|
|||||||
),
|
),
|
||||||
children: [
|
children: [
|
||||||
TextSpan(
|
TextSpan(
|
||||||
text: newStatus,
|
text: statusUpdate,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontWeight:
|
fontWeight:
|
||||||
FontWeight.bold, // Makes newStatus bold
|
FontWeight.bold, // Makes newStatus bold
|
||||||
@ -573,7 +573,7 @@ class _ManageUserRouterState extends ConsumerState<ManageUserRouter> {
|
|||||||
print(user);
|
print(user);
|
||||||
if (newStatus != null) {
|
if (newStatus != null) {
|
||||||
_showConfirmationDialog(
|
_showConfirmationDialog(
|
||||||
user, newStatus);
|
user, newStatus, statusOptions[newStatus]!,);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
|||||||
@ -298,8 +298,8 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
|
|||||||
createTargetContent(
|
createTargetContent(
|
||||||
text: AppLocalizations.of(context)!.mainMenu,
|
text: AppLocalizations.of(context)!.mainMenu,
|
||||||
alignment: ContentAlign.bottom,
|
alignment: ContentAlign.bottom,
|
||||||
|
space:55,
|
||||||
gap: 55,
|
gap: 55,
|
||||||
space: locale.languageCode == 'ar' ? 20 : 20,
|
|
||||||
),
|
),
|
||||||
TargetContent(
|
TargetContent(
|
||||||
align: ContentAlign.bottom,
|
align: ContentAlign.bottom,
|
||||||
@ -416,7 +416,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
|
|||||||
TargetContent(
|
TargetContent(
|
||||||
padding: EdgeInsets.only(
|
padding: EdgeInsets.only(
|
||||||
right: locale.languageCode == 'ar' ? 0 : screenWidth * 0.7,
|
right: locale.languageCode == 'ar' ? 0 : screenWidth * 0.7,
|
||||||
top: locale.languageCode == 'ar' ? 20 : 20,
|
top: 25,
|
||||||
left: locale.languageCode == 'ar' ? screenWidth * 0.7 : 0,
|
left: locale.languageCode == 'ar' ? screenWidth * 0.7 : 0,
|
||||||
),
|
),
|
||||||
align: locale.languageCode == 'ar'
|
align: locale.languageCode == 'ar'
|
||||||
@ -424,13 +424,13 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
|
|||||||
: ContentAlign.right,
|
: ContentAlign.right,
|
||||||
child: Container(
|
child: Container(
|
||||||
width: 200,
|
width: 200,
|
||||||
height: screenHeight / 4,
|
height: 100,
|
||||||
child: Stack(
|
child: Stack(
|
||||||
children: [
|
children: [
|
||||||
Image.asset(
|
Image.asset(
|
||||||
locale.languageCode == 'ar'
|
locale.languageCode == 'ar'
|
||||||
? 'assets/app_tour/down_right.png' // Arabic locale image
|
? 'assets/app_tour/rightDown.png' // Arabic locale image
|
||||||
: 'assets/app_tour/leftDown.png', // Default image
|
: 'assets/app_tour/leftDown2.png', // Default image
|
||||||
fit: BoxFit.contain,
|
fit: BoxFit.contain,
|
||||||
),
|
),
|
||||||
// Positioned(
|
// Positioned(
|
||||||
@ -461,7 +461,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
|
|||||||
contents: [
|
contents: [
|
||||||
createTargetContent(
|
createTargetContent(
|
||||||
text: AppLocalizations.of(context)!.toggle,
|
text: AppLocalizations.of(context)!.toggle,
|
||||||
space: 0,
|
space: 50,
|
||||||
alignment: ContentAlign.bottom,
|
alignment: ContentAlign.bottom,
|
||||||
gap: 50,
|
gap: 50,
|
||||||
),
|
),
|
||||||
@ -596,13 +596,13 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
|
|||||||
: ContentAlign.left,
|
: ContentAlign.left,
|
||||||
child: Container(
|
child: Container(
|
||||||
width: 200,
|
width: 200,
|
||||||
height: screenHeight / 4,
|
height: 200,
|
||||||
child: Stack(
|
child: Stack(
|
||||||
children: [
|
children: [
|
||||||
Image.asset(
|
Image.asset(
|
||||||
locale.languageCode == 'ar'
|
locale.languageCode == 'ar'
|
||||||
? 'assets/app_tour/leftDown.png' // Arabic locale image
|
? 'assets/app_tour/leftDown2.png' // Arabic locale image
|
||||||
: 'assets/app_tour/down_right.png', // Default image
|
: 'assets/app_tour/rightDown.png', // Default image
|
||||||
fit: BoxFit.contain,
|
fit: BoxFit.contain,
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user