From 8e050267e128aa77fb19a27c77ce02a5bd8be667 Mon Sep 17 00:00:00 2001 From: Mohamed Nouffer Date: Wed, 17 Jan 2024 16:08:41 +0530 Subject: [PATCH] update for always checkin points --- ios/Runner.xcodeproj/project.pbxproj | 9 ++ .../destination/destination_controller.dart | 4 + lib/widgets/map_widget.dart | 142 +++++++++--------- pubspec.yaml | 2 +- 4 files changed, 85 insertions(+), 72 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 4d1c669..1ee1e7c 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -358,6 +358,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = ECMVJVB7LV; ENABLE_BITCODE = NO; @@ -369,6 +371,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -489,6 +492,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = ECMVJVB7LV; ENABLE_BITCODE = NO; @@ -500,6 +505,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -513,6 +519,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = ECMVJVB7LV; ENABLE_BITCODE = NO; @@ -524,6 +532,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; diff --git a/lib/pages/destination/destination_controller.dart b/lib/pages/destination/destination_controller.dart index 0f6540c..fde9454 100644 --- a/lib/pages/destination/destination_controller.dart +++ b/lib/pages/destination/destination_controller.dart @@ -796,6 +796,10 @@ class DestinationController extends GetxController { } int getForcedChckinDistance(Destination dest) { + if (dest.checkin_radious == -1) { + return 10000000000000000; + } + int _retValue = 100; if (dest.cp == -1) { return 500; diff --git a/lib/widgets/map_widget.dart b/lib/widgets/map_widget.dart index f5a4721..5aa3490 100644 --- a/lib/widgets/map_widget.dart +++ b/lib/widgets/map_widget.dart @@ -29,40 +29,40 @@ class MapWidget extends StatelessWidget { GeoJSONMultiPoint p = i.geometry as GeoJSONMultiPoint; //print("lat is ${p.geoSerie!.geoPoints[0].latitude} and lon is ${p.geoSerie!.geoPoints[0].longitude}"); //RegExp regex = RegExp(r'([.]*0)(?!.*\d)'); - return Stack( - fit: StackFit.expand, - //mainAxisAlignment: MainAxisAlignment.center, - children: [ - InkWell( - onTap: () { - GeoJSONFeature? fs = indexController.getFeatureForLatLong( - p.coordinates[0][1], p.coordinates[0][0]); - //print("------- fs $fs------"); - if (fs != null) { - indexController.currentFeature.clear(); - indexController.currentFeature.add(fs); - //print("----- fs is ${fs.properties!['photos']}"); + return InkWell( + onTap: () { + GeoJSONFeature? fs = indexController.getFeatureForLatLong( + p.coordinates[0][1], p.coordinates[0][0]); + //print("------- fs $fs------"); + if (fs != null) { + indexController.currentFeature.clear(); + indexController.currentFeature.add(fs); + //print("----- fs is ${fs.properties!['photos']}"); - Destination des = destinationController.festuretoDestination(fs); + Destination des = destinationController.festuretoDestination(fs); - DatabaseHelper db = DatabaseHelper.instance; - db.getDestinationByLatLon(des.lat!, des.lon!).then((value) { - showModalBottomSheet( - constraints: BoxConstraints.loose( - Size(Get.width, Get.height * 0.85)), - context: context, - isScrollControlled: true, - isDismissible: true, - builder: ((context) => BottomSheetNew( - destination: des, isAlreadyCheckedIn: value.isNotEmpty)) - //builder:((context) => BottomSheetWidget()) - ).whenComplete(() { - destinationController.skipGps = false; - }); - }); - } - }, - child: Container( + DatabaseHelper db = DatabaseHelper.instance; + db.getDestinationByLatLon(des.lat!, des.lon!).then((value) { + showModalBottomSheet( + constraints: + BoxConstraints.loose(Size(Get.width, Get.height * 0.85)), + context: context, + isScrollControlled: true, + isDismissible: true, + builder: ((context) => BottomSheetNew( + destination: des, isAlreadyCheckedIn: value.isNotEmpty)) + //builder:((context) => BottomSheetWidget()) + ).whenComplete(() { + destinationController.skipGps = false; + }); + }); + } + }, + child: Stack( + fit: StackFit.expand, + //mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( height: 32, width: 32, decoration: BoxDecoration( @@ -99,47 +99,47 @@ class MapWidget extends StatelessWidget { ), ], )), - ), - Transform.translate( - offset: Offset(40, 0), - child: Align( - alignment: Alignment.center, - child: Container( - color: Colors.purple.withOpacity(0.2), - // child: Text(TextUtils.getDisplayTextFeture(i), - // style: const TextStyle( - // fontSize: 16, - // fontWeight: FontWeight.bold, - // color: Colors.red, - // ))), - child: Stack( - children: [ - // Text with white outline - Text( - TextUtils.getDisplayTextFeture(i), - style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.w700, - foreground: Paint() - ..style = PaintingStyle.stroke - ..strokeWidth = 1 - ..color = Colors.white, + Transform.translate( + offset: Offset(45, 0), + child: Align( + alignment: Alignment.center, + child: Container( + color: Colors.purple.withOpacity(0.2), + // child: Text(TextUtils.getDisplayTextFeture(i), + // style: const TextStyle( + // fontSize: 16, + // fontWeight: FontWeight.bold, + // color: Colors.red, + // ))), + child: Stack( + children: [ + // Text with white outline + Text( + TextUtils.getDisplayTextFeture(i), + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + foreground: Paint() + ..style = PaintingStyle.stroke + ..strokeWidth = 1 + ..color = Colors.white, + ), ), - ), - // Text with black fill - Text( - TextUtils.getDisplayTextFeture(i), - style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.w700, - color: Colors.black, + // Text with black fill + Text( + TextUtils.getDisplayTextFeture(i), + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Colors.black, + ), ), - ), - ], - )), - ), - ) - ], + ], + )), + ), + ) + ], + ), ); } diff --git a/pubspec.yaml b/pubspec.yaml index 6866f7a..c7aa9d5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.0.28+28 +version: 1.0.29+29 environment: sdk: ">=3.1.0 <4.0.0"