Skip to content

P
PhotoShootFlutter
Commit 1e1d27d5 by Ramesh Babu Puvvadi
Options

add changes

parent 33ba968b
Showing with 115 additions and 117 deletions
ios/Podfile
......@@ -2,7 +2,7 @@
# platform :ios, '11.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
platform :ios, '11.0'
platform :ios, '12.0'
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
......
ios/Podfile.lock
......@@ -78,7 +78,7 @@ SPEC CHECKSUMS:
device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_barcode_scanner: 7a1144744c28dc0c57a8de7218ffe5ec59a9e4bf
fluttertoast: eb263d302cc92e04176c053d2385237e9f43fad0
fluttertoast: 48c57db1b71b0ce9e6bba9f31c940ff4b001293c
image_cropper: 60c2789d1f1a78c873235d4319ca0c34a69f2d98
image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9
......@@ -88,6 +88,6 @@ SPEC CHECKSUMS:
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
PODFILE CHECKSUM: f2b3bd02c4756e2d270495857f0d81bb13b42dbe
PODFILE CHECKSUM: 1119d1c4de683e572c54a0dff7a594860d13ec5e
COCOAPODS: 1.12.1
COCOAPODS: 1.13.0
ios/Runner.xcodeproj/project.pbxproj
......@@ -141,6 +141,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 1430;
ORGANIZATIONNAME = "";
TargetAttributes = {
......@@ -310,6 +311,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
......@@ -320,6 +322,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
......@@ -328,7 +331,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
......@@ -347,7 +350,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = AX549G5V4E;
DEVELOPMENT_TEAM = 26J2TYD7PU;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = PhotoShoot;
......@@ -357,7 +360,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.2;
PRODUCT_BUNDLE_IDENTIFIER = com.example.photoshoot;
PRODUCT_BUNDLE_IDENTIFIER = com.sopt.photoshoot;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
......@@ -389,6 +392,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
......@@ -399,6 +403,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
......@@ -413,7 +418,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
......@@ -444,6 +449,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
......@@ -454,6 +460,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
......@@ -462,7 +469,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = NO;
SDKROOT = iphoneos;
......@@ -485,7 +492,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = AX549G5V4E;
DEVELOPMENT_TEAM = 26J2TYD7PU;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = PhotoShoot;
......@@ -495,7 +502,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.2;
PRODUCT_BUNDLE_IDENTIFIER = com.example.photoshoot;
PRODUCT_BUNDLE_IDENTIFIER = com.sopt.photoshoot;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
......@@ -515,7 +522,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = AX549G5V4E;
DEVELOPMENT_TEAM = 26J2TYD7PU;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = PhotoShoot;
......@@ -525,7 +532,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.2;
PRODUCT_BUNDLE_IDENTIFIER = com.example.photoshoot;
PRODUCT_BUNDLE_IDENTIFIER = com.sopt.photoshoot;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
......
ios/Runner/Info.plist
......@@ -26,12 +26,12 @@
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSPhotoLibraryUsageDescription</key>
<string>This library access to the photo library</string>
<key>NSCameraUsageDescription</key>
<string>Camera access required</string>
<key>NSMicrophoneUsageDescription</key>
<string>Microphone access is required to record audio for video content creation.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>This library access to the photo library</string>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UILaunchStoryboardName</key>
......
lib/Remote/RemoteData.dart
......@@ -61,7 +61,7 @@ class RemoteData {
}
//Logout Request GET Method
Future<String> Logout(String? id) async {
Future<String> getLogout(String? id) async {
var header = {type: appjson};
var res = '';
var response = await http.get(Uri.parse('$logout$id'), headers: header);
......@@ -75,7 +75,7 @@ class RemoteData {
}
//Upload Images POST Method
Future<Upload?> UploadImages(String token, String storeId, String barcode,
Future<Upload?> uploadImages(String token, String storeId, String barcode,
List<NamedFile> imageList, String channels, String model) async {
try {
final request = http.MultipartRequest('POST', Uri.parse(uploadimages));
......@@ -104,7 +104,9 @@ class RemoteData {
return uploadFromJson(responseString);
}
} catch (e) {
print(e);
if (kDebugMode) {
print(e);
}
}
return null;
}
......
lib/Screen/Home.dart
......@@ -49,13 +49,6 @@ class _Home extends State<Home> {
}
}
/*_openGallery() async{
var pickImage = await ImagePicker.pickImage(source: ImageSource.gallery);
this.setState({
imagefile = pickImage;
});
}*/
Future<void> startBarcodeScanStream() async {
String barcodeScanRes;
try {
......@@ -72,9 +65,9 @@ class _Home extends State<Home> {
}
setState(() {
_barcodevalue.text = barcodeScanRes;
// if (barcodeScanRes == '-1') {
//if (barcodeScanRes == '-1') {
// _barcodevalue.text = '';
// } else {
//} else {
// _barcodevalue.text = barcodeScanRes;
// if (RegExp(r'^[0-9]+$').hasMatch(_barcodevalue.text)) {
// _barcodevalue.text = '';
......@@ -82,7 +75,7 @@ class _Home extends State<Home> {
// } else {
// //getUpdate(_barcodevalue.text);
// }
// }
//}
});
} on PlatformException {
barcodeScanRes = 'Failed to get platform version.';
......@@ -119,9 +112,7 @@ class _Home extends State<Home> {
onPressed: () {
startBarcodeScanStream();
},
icon: Image.asset('assets/images/ic_barcode.png')
//icon: Icon(AssetImage("assets/images/ic_barcode.png")),
),
icon: Image.asset('assets/images/ic_barcode.png')),
]),
const SizedBox(height: 20),
Row(mainAxisAlignment: MainAxisAlignment.spaceAround, children: [
......@@ -164,7 +155,6 @@ class _Home extends State<Home> {
style: ElevatedButton.styleFrom(
backgroundColor: Colors.blue,
minimumSize: const Size.fromHeight(50),
// NEW
),
onPressed: () async {
if (imagefile == null) {
......@@ -172,7 +162,6 @@ class _Home extends State<Home> {
.showAlertDialog(context);
} else {
isloading = true;
bool isInternetConnected =
await Constants.checkInternetConnectivity();
if (isInternetConnected) {
......
lib/Screen/MultipleImages.dart
import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:image_cropper/image_cropper.dart';
......@@ -63,19 +64,19 @@ class _MultipleImages extends State<MultipleImages> {
IOSUiSettings(
title: 'Crop Image',
),
WebUiSettings(
context: context,
presentStyle: CropperPresentStyle.dialog,
boundary: const CroppieBoundary(
width: 520,
height: 520,
),
viewPort: const CroppieViewPort(
width: 1080, height: 1920, type: 'square'),
enableExif: true,
enableZoom: true,
showZoomer: true,
),
//WebUiSettings(
// context: context,
// presentStyle: CropperPresentStyle.dialog,
// boundary: const CroppieBoundary(
// width: 520,
// height: 520,
// ),
// viewPort: const CroppieViewPort(
// width: 1080, height: 1920, type: 'square'),
// enableExif: true,
// enableZoom: true,
// showZoomer: true,
// ),
],
);
File file = File(image!.path);
......@@ -85,52 +86,54 @@ class _MultipleImages extends State<MultipleImages> {
switch (index) {
case 0:
imagefile = File(cropped!.path);
//imagefile!.renameSync(newFile.path);
print(' Pallu Image: $imagefile');
if (kDebugMode) {
print(' Pallu Image: $imagefile');
}
break;
case 1:
imagefile1 = File(cropped!.path);
print('Body Image : $imagefile1');
if (kDebugMode) {
print('Body Image : $imagefile1');
}
break;
case 2:
imagefile2 = File(cropped!.path);
print('Body Image : $imagefile2');
if (kDebugMode) {
print('Body Image : $imagefile2');
}
break;
case 3:
imagefile3 = File(cropped!.path);
print('Body Image : $imagefile3');
if (kDebugMode) {
print('Body Image : $imagefile3');
}
break;
case 4:
imagefile4 = File(cropped!.path);
print('Body Image : $imagefile4');
if (kDebugMode) {
print('Body Image : $imagefile4');
}
break;
case 5:
imagefile5 = File(cropped!.path);
print('Body Image : $imagefile5');
if (kDebugMode) {
print('Body Image : $imagefile5');
}
break;
}
});
} else {
image = await _picker.pickImage(source: ImageSource.camera);
//Toast.show('Enter UserId', duration: 2000, gravity: Toast.center);
/* Fluttertoast.showToast(
msg: 'Enter UserId',
toastLength: Toast.LENGTH_SHORT,
gravity: ToastGravity.CENTER,
timeInSecForIosWeb: 1,
textColor: Colors.black,
fontSize: 16.0); */
}
}
}
/* _openGallery() async{
var pickImage = await ImagePicker.pickImage(source: ImageSource.gallery);
this.setState({
imagefile = pickImage;
});
}
*/
/*_openGallery() async{
var pickImage = await ImagePicker.pickImage(source: ImageSource.gallery);
this.setState({
imagefile = pickImage;
});
}*/
Future<void> startBarcodeScanStream() async {
String barcodeScanRes;
......@@ -143,7 +146,9 @@ class _MultipleImages extends State<MultipleImages> {
//scanAreaWidth: 300,
//scanAreaHeight: 200,
);
print(barcodeScanRes);
if (kDebugMode) {
print(barcodeScanRes);
}
setState(() {
if (barcodeScanRes == '-1') {
_barcodevalue.text = '';
......@@ -159,14 +164,19 @@ class _MultipleImages extends State<MultipleImages> {
});
} on PlatformException {
barcodeScanRes = 'Failed to get platform version.';
if (kDebugMode) {
print(barcodeScanRes);
}
}
}
signOut() async {
SharedPreferences prefs = await SharedPreferences.getInstance();
var storeId = prefs.getString("store_Id");
print('StoreId: $storeId');
String data = await RemoteData().Logout(storeId);
if (kDebugMode) {
print('StoreId: $storeId');
}
String data = await RemoteData().getLogout(storeId);
var res = jsonDecode(data);
if (res['success'] == 1) {
Constants.saveLoginCredentials('', '', '', '', false);
......@@ -512,7 +522,7 @@ class _MultipleImages extends State<MultipleImages> {
await SharedPreferences.getInstance();
var storeId = prefs.getString("store_Id");
String? token = prefs.getString('userToken');
String Model = '';
String? Model = '';
// /* String uniqueDeviceId =
// (await PlatformDeviceId.getDeviceId)!;
// if (Platform.isAndroid) {
......@@ -537,7 +547,7 @@ class _MultipleImages extends State<MultipleImages> {
Upload? upload;
if (token != null) {
upload = await RemoteData().UploadImages(
upload = await RemoteData().uploadImages(
token,
storeId!,
_barcodevalue.text,
......@@ -546,9 +556,9 @@ class _MultipleImages extends State<MultipleImages> {
Model,
);
} else {}
print('Third call : $upload.success');
print(upload?.success);
print('Fifth call : $upload.msg');
//print('Third call : $upload.success');
//print(upload?.success);
//print('Fifth call : $upload.msg');
if (upload?.success == 1) {
if (imagefile != null) {
imagefile?.delete();
......@@ -667,28 +677,28 @@ class _MultipleImages extends State<MultipleImages> {
bool isInternetConnected =
await Constants.checkInternetConnectivity();
if (isInternetConnected) {
SharedPreferences _prefs =
SharedPreferences prefs =
await SharedPreferences.getInstance();
var storeId = _prefs.getString("store_Id");
String? token = _prefs.getString('userToken');
String Model = '';
// /* String uniqueDeviceId =
// (await PlatformDeviceId.getDeviceId)!;
var storeId = prefs.getString("store_Id");
String? token = prefs.getString('userToken');
String? model = '';
// /* String uniqueDeviceId = (await PlatformDeviceId.getDeviceId)!;
// if (Platform.isAndroid) {
// final info = await DeviceInfoPlugin().iosInfo;
// Model = info.model!;
// print(info.model);
// //print(info.systemVersion);
// }
// if (Platform.isIOS) {
// final info = await DeviceInfoPlugin().iosInfo;
// print(info.utsname.machine); // "iPhone15,2"
// print(info.utsname.version); // "iPhone 14 Pro"
// }
print('Selected Shoot :$shoot');
if (kDebugMode) {
print('Selected Shoot :$shoot');
}
showDialog(
context: context,
......@@ -699,21 +709,19 @@ class _MultipleImages extends State<MultipleImages> {
Upload? upload;
if (token != null) {
upload = await RemoteData().UploadImages(
upload = await RemoteData().uploadImages(
token,
storeId!,
_barcodevalue.text,
images,
shoot!,
Model,
model,
);
} else {}
print('Third call : $upload.success');
print(upload?.success);
print('Fifth call : $upload.msg');
// print('Third call : $upload.success');
// print(upload?.success);
// print('Fifth call : $upload.msg');
if (upload?.success == 1) {
if (imagefile != null) {
......@@ -765,8 +773,7 @@ class _MultipleImages extends State<MultipleImages> {
width: 160.0, height: 200.0);
_barcodevalue.clear();
images.clear();
/*imagefile = Image.asset('assets/images/camera.png',
width: 180.0, height: 150.0) as File?; */
/*imagefile = Image.asset('assets/images/camera.png', width: 180.0, height: 150.0) as File?; */
Constants('Upload Images', upload!.msg)
.showAlertDialog(context);
});
......@@ -785,7 +792,6 @@ class _MultipleImages extends State<MultipleImages> {
.showAlertDialog(context);
}
}
//_showMyDialog(context);
},
child: const Text('Upload Images'),
......@@ -821,7 +827,6 @@ class _MultipleImages extends State<MultipleImages> {
actions: [
TextButton(
onPressed: () {
// Perform some action
Navigator.of(context).pop();
},
child: const Text('Ok'),
......
lib/Screen/SignUp.dart
import 'package:flutter/material.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:photoshoot/Remote/RemoteData.dart';
import 'package:photoshoot/Screen/Constants.dart';
import 'package:photoshoot/Screen/MultipleImages.dart';
import '../Model/LoginResponse.dart';
import '../Model/Store.dart';
import '../Remote/RemoteData.dart';
import 'Constants.dart';
import 'MultipleImages.dart';
class SignUp extends StatefulWidget {
const SignUp({super.key});
......@@ -69,29 +69,27 @@ class _SignUpState extends State<SignUp> {
if (item) {
if (_focusNode.hasFocus) {
bool isInternetConnected =
await Constants.checkInternetConnectivity();
if (isInternetConnected) {
// Internet connectivity is available
showDialog(
await Constants.checkInternetConnectivity();
if(isInternetConnected) {
showDialog(
context: context,
builder: (context) {
return const Center(child: CircularProgressIndicator());
});
item = false;
storesList = await RemoteData().getStoreList(_email.text);
setState(() {
Navigator.pop(context);
storesList = storesList;
});
}
);
item = false;
storesList = await RemoteData().getStoreList(_email.text);
setState(() {
Navigator.pop(context);
storesList = storesList;
});
} else {
Constants('LoginPage', 'Check your network connection')
.showAlertDialog(context);
Constants('LoginPage', 'Check your network connection')
.showAlertDialog(context);
}
} else {
//_focusNode.unfocus();
//_focusNode.unfocus();
}
//print(storesList?.length);
//print(storesList?[0].storeName);
}
} else {
_focusNode.unfocus();
......@@ -105,11 +103,8 @@ class _SignUpState extends State<SignUp> {
textColor: Colors.white,
fontSize: 16.0);
}
// The cursor is focused on the TextField
// Perform your action here
});
}
final FocusNode _focusNode = FocusNode();
@override
Widget build(BuildContext context) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment