Skip to content

Commit 0b39e4d

Browse files
fixed page popped out of context bug
1 parent 7eaf8fd commit 0b39e4d

File tree

18 files changed

+1688
-1518
lines changed

18 files changed

+1688
-1518
lines changed

ios/Podfile.lock

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
PODS:
22
- connectivity_plus (0.0.1):
33
- Flutter
4-
- ReachabilitySwift
54
- DKImagePickerController/Core (4.3.4):
65
- DKImagePickerController/ImageDataManager
76
- DKImagePickerController/Resource
@@ -43,9 +42,9 @@ PODS:
4342
- Flutter (1.0.0)
4443
- flutter_local_notifications (0.0.1):
4544
- Flutter
46-
- flutter_native_splash (0.0.1):
45+
- flutter_native_splash (2.4.3):
4746
- Flutter
48-
- flutter_native_timezone (0.0.1):
47+
- flutter_timezone (0.0.1):
4948
- Flutter
5049
- home_widget (0.0.1):
5150
- Flutter
@@ -54,15 +53,17 @@ PODS:
5453
- path_provider_foundation (0.0.1):
5554
- Flutter
5655
- FlutterMacOS
57-
- permission_handler_apple (9.0.4):
56+
- permission_handler_apple (9.3.0):
5857
- Flutter
59-
- ReachabilitySwift (5.0.0)
6058
- SDWebImage (5.19.0):
6159
- SDWebImage/Core (= 5.19.0)
6260
- SDWebImage/Core (5.19.0)
6361
- shared_preferences_foundation (0.0.1):
6462
- Flutter
6563
- FlutterMacOS
64+
- sqflite_darwin (0.0.4):
65+
- Flutter
66+
- FlutterMacOS
6667
- SwiftyGif (5.4.4)
6768
- url_launcher_ios (0.0.1):
6869
- Flutter
@@ -75,19 +76,19 @@ DEPENDENCIES:
7576
- Flutter (from `Flutter`)
7677
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
7778
- flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
78-
- flutter_native_timezone (from `.symlinks/plugins/flutter_native_timezone/ios`)
79+
- flutter_timezone (from `.symlinks/plugins/flutter_timezone/ios`)
7980
- home_widget (from `.symlinks/plugins/home_widget/ios`)
8081
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
8182
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
8283
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
8384
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
85+
- sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
8486
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
8587

8688
SPEC REPOS:
8789
trunk:
8890
- DKImagePickerController
8991
- DKPhotoGallery
90-
- ReachabilitySwift
9192
- SDWebImage
9293
- SwiftyGif
9394

@@ -106,8 +107,8 @@ EXTERNAL SOURCES:
106107
:path: ".symlinks/plugins/flutter_local_notifications/ios"
107108
flutter_native_splash:
108109
:path: ".symlinks/plugins/flutter_native_splash/ios"
109-
flutter_native_timezone:
110-
:path: ".symlinks/plugins/flutter_native_timezone/ios"
110+
flutter_timezone:
111+
:path: ".symlinks/plugins/flutter_timezone/ios"
111112
home_widget:
112113
:path: ".symlinks/plugins/home_widget/ios"
113114
package_info_plus:
@@ -118,30 +119,32 @@ EXTERNAL SOURCES:
118119
:path: ".symlinks/plugins/permission_handler_apple/ios"
119120
shared_preferences_foundation:
120121
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
122+
sqflite_darwin:
123+
:path: ".symlinks/plugins/sqflite_darwin/darwin"
121124
url_launcher_ios:
122125
:path: ".symlinks/plugins/url_launcher_ios/ios"
123126

124127
SPEC CHECKSUMS:
125-
connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
128+
connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
126129
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
127130
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
128-
file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de
129-
file_picker_writable: 67959f5c516feb5121693a14eda63fcbe6cbb6dc
130-
file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b
131+
file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
132+
file_picker_writable: 3a458aa8cdb7c1378cb3e8ec0543ead87a77d0be
133+
file_selector_ios: f92e583d43608aebc2e4a18daac30b8902845502
131134
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
132-
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
133-
flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
134-
flutter_native_timezone: 5f05b2de06c9776b4cc70e1839f03de178394d22
135-
home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
136-
package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
137-
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
138-
permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
139-
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
135+
flutter_local_notifications: 395056b3175ba4f08480a7c5de30cd36d69827e4
136+
flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
137+
flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544
138+
home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
139+
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
140+
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
141+
permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
140142
SDWebImage: 981fd7e860af070920f249fd092420006014c3eb
141-
shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
143+
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
144+
sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
142145
SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
143-
url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
146+
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
144147

145148
PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
146149

147-
COCOAPODS: 1.14.3
150+
COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
9705A1C41CF9048500538489 /* Embed Frameworks */,
141141
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
142142
E6257F2992FA3E40BE65E7BD /* [CP] Embed Pods Frameworks */,
143+
8FEC10D1539C672E7E2B68F4 /* [CP] Copy Pods Resources */,
143144
);
144145
buildRules = (
145146
);
@@ -236,6 +237,23 @@
236237
shellPath = /bin/sh;
237238
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
238239
};
240+
8FEC10D1539C672E7E2B68F4 /* [CP] Copy Pods Resources */ = {
241+
isa = PBXShellScriptBuildPhase;
242+
buildActionMask = 2147483647;
243+
files = (
244+
);
245+
inputFileListPaths = (
246+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
247+
);
248+
name = "[CP] Copy Pods Resources";
249+
outputFileListPaths = (
250+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
251+
);
252+
runOnlyForDeploymentPostprocessing = 0;
253+
shellPath = /bin/sh;
254+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
255+
showEnvVarsInLog = 0;
256+
};
239257
9740EEB61CF901F6004384FC /* Run Script */ = {
240258
isa = PBXShellScriptBuildPhase;
241259
alwaysOutOfDate = 1;

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
ignoresPersistentStateOnLaunch = "NO"
4949
debugDocumentVersioning = "YES"
5050
debugServiceExtension = "internal"
51+
enableGPUValidationMode = "1"
5152
allowLocationSimulation = "YES">
5253
<BuildableProductRunnable
5354
runnableDebuggingMode = "0">

ios/Runner/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import UIKit
22
import Flutter
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,

lib/app/modules/detailRoute/controllers/detail_route_controller.dart

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class DetailRouteController extends GetxController {
1515
late String uuid;
1616
late Modify modify;
1717
var onEdit = false.obs;
18+
var isTourActive = false.obs;
1819

1920
@override
2021
void onInit() {
@@ -34,7 +35,7 @@ class DetailRouteController extends GetxController {
3435
void setAttribute(String name, dynamic newValue) {
3536
modify.set(name, newValue);
3637
onEdit.value = true;
37-
if(name == 'start'){
38+
if (name == 'start') {
3839
debugPrint('Start Value Changed to $newValue');
3940
startValue.value = newValue;
4041
}
@@ -44,13 +45,7 @@ class DetailRouteController extends GetxController {
4445
Future<void> saveChanges() async {
4546
var now = DateTime.now().toUtc();
4647
modify.save(modified: () => now);
47-
onEdit.value = false;
48-
Get.back();
49-
Get.snackbar(
50-
'Task Updated',
51-
'',
52-
snackPosition: SnackPosition.BOTTOM,
53-
);
48+
Get.back(result: true);
5449
}
5550

5651
// 'description': controller.modify.draft.description,
@@ -118,6 +113,7 @@ class DetailRouteController extends GetxController {
118113
opacityShadow: 1.00,
119114
hideSkip: true,
120115
onFinish: () {
116+
isTourActive.value = false;
121117
SaveTourStatus.saveDetailsTourStatus(true);
122118
},
123119
);
@@ -130,6 +126,7 @@ class DetailRouteController extends GetxController {
130126
SaveTourStatus.getDetailsTourStatus().then((value) => {
131127
if (value == false)
132128
{
129+
isTourActive.value = true,
133130
tutorialCoachMark.show(context: context),
134131
}
135132
else

0 commit comments

Comments
 (0)