Commit eaeaa7c6 by Ramesh Babu Puvvadi

few changes

parent c62a2345
......@@ -90,5 +90,4 @@ flutter {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.android.support:multidex:1.0.3'
}
......@@ -15,4 +15,7 @@
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
</style>
<style name="AppTheme" parent="@android:style/Theme.DeviceDefault">
<item name="android:windowSwipeToDismiss">true</item>
</style>
</resources>
......@@ -167,7 +167,7 @@ SPEC CHECKSUMS:
FirebaseInstallations: cae95cab0f965ce05b805189de1d4c70b11c76fb
FirebaseMessaging: 0c0ae1eb722ef0c07f7801e5ded8dccd1357d6d4
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_inappwebview: acd4fc0f012cefd09015000c241137d82f01ba62
flutter_inappwebview: 3d32228f1304635e7c028b0d4252937730bbc6cf
flutter_sms: 91ce41530f55c85d6524d82307a5d555844c086a
GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
......
......@@ -211,7 +211,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
......@@ -341,7 +341,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;
......@@ -358,16 +358,17 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = AX549G5V4E;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = 26J2TYD7PU;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = storemonitor;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.sopt.storemonitorapp;
PRODUCT_BUNDLE_IDENTIFIER = com.sopt.storemonito;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
......@@ -423,7 +424,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;
......@@ -472,7 +473,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;
......@@ -491,16 +492,17 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = AX549G5V4E;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = 26J2TYD7PU;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = storemonitor;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.sopt.storemonitorapp;
PRODUCT_BUNDLE_IDENTIFIER = com.sopt.storemonito;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
......@@ -518,16 +520,17 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = AX549G5V4E;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = 26J2TYD7PU;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = storemonitor;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.sopt.storemonitorapp;
PRODUCT_BUNDLE_IDENTIFIER = com.sopt.storemonito;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
......
......@@ -2,65 +2,59 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>Store Monitor</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Store Monitor</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(FLUTTER_BUILD_NAME)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>NSCameraUsageDescription</key>
<string>Camera access is required to capture</string>
<key>NSMicrophoneUsageDescription</key>
<string>Microphone access is required to dial a call</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>This app requires access to the photo library</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<!-- Firebase configurations -->
<key>FirebaseAppDelegateProxyEnabled</key>
<false/>
<!-- Replace with your own reversed client ID -->
<key>REVERSED_CLIENT_ID</key>
<string>d6689d068c6b4290aba903</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>Store Monitor</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Store Monitor</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(FLUTTER_BUILD_NAME)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>FirebaseAppDelegateProxyEnabled</key>
<false/>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSCameraUsageDescription</key>
<string>Camera access is required to capture</string>
<key>NSMicrophoneUsageDescription</key>
<string>Microphone access is required to dial a call</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>This app requires access to the photo library</string>
<key>REVERSED_CLIENT_ID</key>
<string>d6689d068c6b4290aba903</string>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
</dict>
</plist>
......@@ -10,13 +10,14 @@ import 'Constants.dart';
class CheckRegistration extends StatefulWidget {
String message;
CheckRegistration({super.key, required this.message});
@override
State<CheckRegistration> createState() => _CheckRegistration();
}
class _CheckRegistration extends State<CheckRegistration> {
final TextEditingController _empId = TextEditingController();
late final ImagePicker _picker = ImagePicker();
late final ImagePicker _picker = ImagePicker();
XFile? image;
File? newVideoFile;
var store = '';
......@@ -134,7 +135,8 @@ class _CheckRegistration extends State<CheckRegistration> {
});
if (Platform.isAndroid) {
image = await _picker.pickVideo(
source: ImageSource.camera, preferredCameraDevice: CameraDevice.rear);
source: ImageSource.camera,
preferredCameraDevice: CameraDevice.rear);
} else {
image = await _picker.pickVideo(
source: ImageSource.camera,
......@@ -151,14 +153,10 @@ class _CheckRegistration extends State<CheckRegistration> {
Map<String, dynamic> responseMap = jsonDecode(response);
//String res = response;
//bool isEqual = jsonEncode(jsonDecode(response)) == jsonEncode(jsonDecode('{message: VideoUploaded, status: Success}'));
String message = "$responseMap";
// Extract the status value from the message
// Extract the status value from the message
String status = message.split('status:').last.split('}').first.trim();
print(status);
if (status == 'Success') {
Navigator.pop(context);
file.delete();
......@@ -173,7 +171,6 @@ class _CheckRegistration extends State<CheckRegistration> {
file.delete();
//Navigator.of(context).pop();
}
if (kDebugMode) {
print(responseMap);
}
......@@ -183,7 +180,8 @@ class _CheckRegistration extends State<CheckRegistration> {
void getValidReg(String text) async {
var data = await RemoteData().getValidEmp(text);
if (data.statusCode != 200) {
Constants('Review', data.statusCode.toString()).showAlertDialog(context, false);
Constants('Review', data.statusCode.toString())
.showAlertDialog(context, false);
return;
}
Map<String, dynamic> responseMap = jsonDecode(data.body);
......
......@@ -129,9 +129,9 @@ class Constants {
);
static Future<void> showAlertDialog1(BuildContext context) async {
AlertDialog alert = AlertDialog(
AlertDialog alert = const AlertDialog(
content: Row(
children: const [
children: [
CircularProgressIndicator(),
],
),
......
......@@ -141,209 +141,410 @@ class _FootFall extends State<FootFall> {
),
],
),
body: FutureBuilder<Foot?>(
future: _futureFoot,
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
return const Center(
child: CircularProgressIndicator(
color: Color.fromARGB(255, 173, 57, 230)));
} else if (snapshot.hasData) {
final foot = snapshot.data!;
return SingleChildScrollView(
child: Container(
margin: const EdgeInsets.fromLTRB(15, 0, 15, 0),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
const SizedBox(
width: 10,
height: 10,
),
Container(
padding: const EdgeInsets.symmetric(horizontal: 10.0),
decoration: BoxDecoration(
border: Border.all(color: Colors.grey),
borderRadius: BorderRadius.circular(5.0),
),
child: DropdownButtonHideUnderline(
child: DropdownButton<String>(
menuMaxHeight:
Constants.getDropdownItemHeight(context),
value: selectedDropdownItem,
onChanged: (newValue) {
setState(() {
selectedDropdownItem = newValue;
_futureFoot = getData(
selectedDropdownItem!,
'none',
);
});
},
items: storesList?.map((item) {
return DropdownMenuItem<String>(
value: item,
child: Text(item),
);
}).toList(),
icon: const Icon(Icons.arrow_drop_down),
isExpanded: true,
),
body: GestureDetector(
onForcePressUpdate: (details) {
print('force press update');
},
onHorizontalDragStart: (details) {
print('force press start');
},
onHorizontalDragDown: (details) {
print('force press down');
//if (details.globalPosition.direction > 0) {
// print('force press down1$details');
//}
//if (details.globalPosition.direction < 0) {
// print('force press down$details');
//}
//Navigator.of(context).pop();
},
child: FutureBuilder<Foot?>(
future: _futureFoot,
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
return const Center(
child: CircularProgressIndicator(
color: Color.fromARGB(255, 173, 57, 230)));
} else if (snapshot.hasData) {
final foot = snapshot.data!;
return SingleChildScrollView(
child: Container(
margin: const EdgeInsets.fromLTRB(15, 0, 15, 0),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
const SizedBox(
width: 10,
height: 10,
),
),
const SizedBox(
height: 10,
width: 1,
),
TextFormField(
controller: _dateTime,
onTap: () => '',
decoration: InputDecoration(
contentPadding: const EdgeInsets.symmetric(
vertical: 15, horizontal: 10),
isDense: true,
hintText: 'Select date',
border: OutlineInputBorder(
Container(
padding: const EdgeInsets.symmetric(horizontal: 10.0),
decoration: BoxDecoration(
border: Border.all(color: Colors.grey),
borderRadius: BorderRadius.circular(5.0),
),
suffixIcon: IconButton(
icon: Image.asset(
'assets/images/date_icon.png',
width: 24,
height: 24,
child: DropdownButtonHideUnderline(
child: DropdownButton<String>(
menuMaxHeight:
Constants.getDropdownItemHeight(context),
value: selectedDropdownItem,
onChanged: (newValue) {
setState(() {
selectedDropdownItem = newValue;
_futureFoot = getData(
selectedDropdownItem!,
'none',
);
});
},
items: storesList?.map((item) {
return DropdownMenuItem<String>(
value: item,
child: Text(item),
);
}).toList(),
icon: const Icon(Icons.arrow_drop_down),
isExpanded: true,
),
onPressed: () => _selectDate(context),
),
),
),
const SizedBox(
height: 10,
width: 1,
),
const Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text('Store Footfall',
textAlign: TextAlign.left,
style: Constants.headerfontStyle),
],
),
const SizedBox(
width: 0,
height: 3,
),
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Container(
height: 2,
width: 40,
color: const Color.fromARGB(255, 170, 57, 230),
const SizedBox(
height: 10,
width: 1,
),
TextFormField(
controller: _dateTime,
onTap: () => '',
decoration: InputDecoration(
contentPadding: const EdgeInsets.symmetric(
vertical: 15, horizontal: 10),
isDense: true,
hintText: 'Select date',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(5.0),
),
suffixIcon: IconButton(
icon: Image.asset(
'assets/images/date_icon.png',
width: 24,
height: 24,
),
onPressed: () => _selectDate(context),
),
),
],
),
const SizedBox(
height: 10,
width: 1,
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
child: Container(
width: double.infinity,
decoration: BoxDecoration(
gradient: const LinearGradient(
begin: Alignment.bottomLeft,
end: Alignment.bottomCenter,
colors: [
Color(0xFFfd680e),
Color(0xFFf1245f),
//Color(0xFFC2185B),
],
),
const SizedBox(
height: 10,
width: 1,
),
const Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text('Store Footfall',
textAlign: TextAlign.left,
style: Constants.headerfontStyle),
],
),
const SizedBox(
width: 0,
height: 3,
),
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Container(
height: 2,
width: 40,
color: const Color.fromARGB(255, 170, 57, 230),
),
],
),
const SizedBox(
height: 10,
width: 1,
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
child: Container(
width: double.infinity,
decoration: BoxDecoration(
gradient: const LinearGradient(
begin: Alignment.bottomLeft,
end: Alignment.bottomCenter,
colors: [
Color(0xFFfd680e),
Color(0xFFf1245f),
//Color(0xFFC2185B),
],
),
borderRadius: BorderRadius.circular(4),
),
borderRadius: BorderRadius.circular(4),
),
child: Column(
children: [
Row(
children: [
Column(
children: [
Container(
padding: const EdgeInsets.all(1),
child: Image.asset(
'assets/images/people.png',
width: 50,
height: 50,
child: Column(
children: [
Row(
children: [
Column(
children: [
Container(
padding: const EdgeInsets.all(1),
child: Image.asset(
'assets/images/people.png',
width: 50,
height: 50,
),
),
),
Container(
padding: const EdgeInsets.fromLTRB(
10, 10, 0, 20),
child: const Center(
child: Text(
'FOOTFALL',
style: Constants.buttonsfontStyle,
Container(
padding: const EdgeInsets.fromLTRB(
10, 10, 0, 20),
child: const Center(
child: Text(
'FOOTFALL',
style:
Constants.buttonsfontStyle,
),
),
),
],
),
const SizedBox(
width: 3,
height: 3,
),
Column(
children: [
Container(
padding: const EdgeInsets.fromLTRB(
10, 0, 0, 20),
child: Image.asset(
'assets/images/footfall_icon.png',
width: 50,
height: 50,
),
),
Container(
padding: const EdgeInsets.fromLTRB(
10, 0, 0, 0),
child: Center(
child: Text(
'${foot.fadults! + foot.fkids! + foot.fteens! + foot.madults! + foot.mkids! + foot.mteens!}',
style: Constants
.footfallheaderfontStyle,
//textAlign: TextAlign.right,
),
),
),
Container(
//padding: const EdgeInsets.all(3),
padding: const EdgeInsets.fromLTRB(
10, 0, 0, 2),
child: const Center(
child: Text(
'Members',
style:
Constants.footfallfontStyle,
),
),
),
],
),
],
),
],
),
),
),
const SizedBox(
width: 5,
height: 1,
),
Expanded(
child: Container(
width: MediaQuery.of(context).size.width / 2.3,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(5.0),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 2,
blurRadius: 5,
offset: const Offset(0, 2),
),
],
),
child: Column(
children: [
const SizedBox(
width: 1,
height: 7,
),
const Row(
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [
SizedBox(
width: 30,
height: 1,
),
Expanded(
child: Text(
'Adults',
textAlign: TextAlign.center,
style: Constants.listitems,
),
],
),
const SizedBox(
width: 3,
height: 3,
),
Column(
children: [
Container(
padding: const EdgeInsets.fromLTRB(
10, 0, 0, 20),
child: Image.asset(
'assets/images/footfall_icon.png',
width: 50,
height: 50,
),
Expanded(
child: Text(
'Kids',
textAlign: TextAlign.center,
style: Constants.listitems,
),
),
],
),
const SizedBox(
height: 8,
width: 2,
),
const Divider(
height: 2,
thickness: 1,
color: Colors.grey,
indent: 5,
endIndent: 5,
),
const SizedBox(
height: 5,
width: 2,
),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [
Image.asset(
'assets/images/men.png',
width: 25,
height: 25,
),
const SizedBox(
width: 8,
height: 1,
),
Expanded(
child: Text(
foot.madults.toString(),
textAlign: TextAlign.center,
style: const TextStyle(
fontWeight: FontWeight.bold,
color: Color.fromARGB(
255, 63, 123, 173)),
),
),
Expanded(
child: Text(
foot.mkids.toString(),
textAlign: TextAlign.center,
style: const TextStyle(
color: Color.fromARGB(
255, 63, 123, 173),
fontWeight: FontWeight.bold,
),
),
Container(
padding: const EdgeInsets.fromLTRB(
10, 0, 0, 0),
child: Center(
child: Text(
'${foot.fadults! + foot.fkids! + foot.fteens! + foot.madults! + foot.mkids! + foot.mteens!}',
style: Constants
.footfallheaderfontStyle,
//textAlign: TextAlign.right,
),
),
// Expanded(
// child: Text(
// foot.mteens.toString(),
// textAlign: TextAlign.center,
// style: const TextStyle(
// color:
// Color.fromARGB(255, 63, 123, 173),
// fontWeight: FontWeight.bold,
// ),
// ),
// ),
],
),
const SizedBox(
height: 10,
width: 2,
),
const Divider(
height: 5,
thickness: 1,
color: Colors.grey,
indent: 5,
endIndent: 5,
),
const SizedBox(
height: 8,
width: 2,
),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [
Image.asset(
'assets/images/woman.png',
width: 25,
height: 25,
),
const SizedBox(
width: 5,
height: 1,
),
Expanded(
child: Text(
foot.fadults.toString(),
textAlign: TextAlign.center,
style: const TextStyle(
color: Color.fromARGB(
255, 235, 25, 42),
fontWeight: FontWeight.bold,
),
),
Container(
//padding: const EdgeInsets.all(3),
padding: const EdgeInsets.fromLTRB(
10, 0, 0, 2),
child: const Center(
child: Text(
'Members',
style:
Constants.footfallfontStyle,
),
),
Expanded(
child: Text(
foot.fkids.toString(),
textAlign: TextAlign.center,
style: const TextStyle(
color: Color.fromARGB(
255, 235, 25, 42),
fontWeight: FontWeight.bold,
),
),
],
),
],
),
],
),
// Expanded(
// child: Text(
// foot.fteens.toString(),
// textAlign: TextAlign.center,
// style: const TextStyle(
// color: Color.fromARGB(255, 235, 25, 42),
// fontWeight: FontWeight.bold,
// ),
// ),
// ),
],
),
const SizedBox(
width: 1,
height: 10,
),
],
),
),
),
),
const SizedBox(
width: 5,
height: 1,
),
Expanded(
child: Container(
width: MediaQuery.of(context).size.width / 2.3,
],
),
const SizedBox(height: 16),
SizedBox(
width: MediaQuery.of(context).size.width,
height: 350,
child: Container(
margin: const EdgeInsets.fromLTRB(0, 10, 0, 10),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(5.0),
......@@ -357,348 +558,167 @@ class _FootFall extends State<FootFall> {
],
),
child: Column(
//crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisAlignment: MainAxisAlignment.start,
children: [
const SizedBox(
width: 1,
height: 7,
),
const Row(
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [
SizedBox(
width: 30,
height: 1,
),
Expanded(
child: Text(
'Adults',
textAlign: TextAlign.center,
style: Constants.listitems,
),
),
Expanded(
child: Text(
'Kids',
textAlign: TextAlign.center,
style: Constants.listitems,
),
),
],
),
const SizedBox(
height: 8,
width: 2,
width: 0,
height: 10,
),
const Divider(
height: 2,
thickness: 1,
color: Colors.grey,
indent: 5,
endIndent: 5,
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: const [
Text('Hourly Customer Trend',
textAlign: TextAlign.left,
style: Constants.headerfontStyle),
]
.map((e) => Padding(
padding:
const EdgeInsets.only(left: 10),
child: e))
.toList(),
),
const SizedBox(
height: 5,
width: 2,
width: 0,
height: 3,
),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Image.asset(
'assets/images/men.png',
width: 25,
height: 25,
Container(
height: 2,
width: 40,
color: const Color.fromARGB(
255, 170, 57, 230),
),
const SizedBox(
width: 8,
height: 1,
),
Expanded(
child: Text(
foot.madults.toString(),
textAlign: TextAlign.center,
style: const TextStyle(
fontWeight: FontWeight.bold,
color: Color.fromARGB(
255, 63, 123, 173)),
),
),
Expanded(
child: Text(
foot.mkids.toString(),
textAlign: TextAlign.center,
style: const TextStyle(
color:
Color.fromARGB(255, 63, 123, 173),
fontWeight: FontWeight.bold,
),
]
.map((e) => Padding(
padding:
const EdgeInsets.only(left: 10),
child: e))
.toList(),
),
const SizedBox(
height: 8,
),
Center(
child: SizedBox(
width: MediaQuery.of(context).size.width,
height: 280,
child: InAppWebView(
initialData: InAppWebViewInitialData(
data: foot.hourlygraph ?? ""),
initialOptions: InAppWebViewGroupOptions(
crossPlatform: InAppWebViewOptions(
// enable other options if needed
//supportZoom: false,
),
),
),
// Expanded(
// child: Text(
// foot.mteens.toString(),
// textAlign: TextAlign.center,
// style: const TextStyle(
// color:
// Color.fromARGB(255, 63, 123, 173),
// fontWeight: FontWeight.bold,
// ),
// ),
// ),
],
),
),
],
)),
),
SizedBox(
width: MediaQuery.of(context).size.width,
height: 350,
child: Container(
//margin: const EdgeInsets.all(5.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(5.0),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 2,
blurRadius: 5,
offset: const Offset(0, 2),
),
],
),
child: Column(
children: [
const SizedBox(
width: 0,
height: 10,
width: 2,
),
const Divider(
height: 5,
thickness: 1,
color: Colors.grey,
indent: 5,
endIndent: 5,
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
const Text('Gender Breakup',
textAlign: TextAlign.left,
style: Constants.headerfontStyle)
]
.map((e) => Padding(
padding:
const EdgeInsets.only(left: 10),
child: e))
.toList(),
),
const SizedBox(
height: 8,
width: 2,
width: 0,
height: 3,
),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Image.asset(
'assets/images/woman.png',
width: 25,
height: 25,
),
const SizedBox(
width: 5,
height: 1,
),
Expanded(
child: Text(
foot.fadults.toString(),
textAlign: TextAlign.center,
style: const TextStyle(
color:
Color.fromARGB(255, 235, 25, 42),
fontWeight: FontWeight.bold,
),
),
),
Expanded(
child: Text(
foot.fkids.toString(),
textAlign: TextAlign.center,
style: const TextStyle(
color:
Color.fromARGB(255, 235, 25, 42),
fontWeight: FontWeight.bold,
),
),
Container(
height: 2,
width: 40,
color: const Color.fromARGB(
255, 170, 57, 230),
),
// Expanded(
// child: Text(
// foot.fteens.toString(),
// textAlign: TextAlign.center,
// style: const TextStyle(
// color: Color.fromARGB(255, 235, 25, 42),
// fontWeight: FontWeight.bold,
// ),
// ),
// ),
],
]
.map((e) => Padding(
padding:
const EdgeInsets.only(left: 10),
child: e))
.toList(),
),
const SizedBox(
width: 1,
height: 10,
),
],
),
),
),
],
),
const SizedBox(height: 16),
SizedBox(
width: MediaQuery.of(context).size.width,
height: 350,
child: Container(
margin: const EdgeInsets.fromLTRB(0, 10, 0, 10),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(5.0),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 2,
blurRadius: 5,
offset: const Offset(0, 2),
),
],
),
child: Column(
//crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisAlignment: MainAxisAlignment.start,
children: [
const SizedBox(
width: 0,
height: 10,
),
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: const [
Text('Hourly Customer Trend',
textAlign: TextAlign.left,
style: Constants.headerfontStyle),
]
.map((e) => Padding(
padding:
const EdgeInsets.only(left: 10),
child: e))
.toList(),
),
const SizedBox(
width: 0,
height: 3,
),
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Container(
height: 2,
width: 40,
color:
const Color.fromARGB(255, 170, 57, 230),
),
]
.map((e) => Padding(
padding:
const EdgeInsets.only(left: 10),
child: e))
.toList(),
),
const SizedBox(
height: 8,
),
Center(
child: SizedBox(
width: MediaQuery.of(context).size.width,
height: 280,
child: InAppWebView(
initialData: InAppWebViewInitialData(
data: foot.hourlygraph ?? ""),
initialOptions: InAppWebViewGroupOptions(
crossPlatform: InAppWebViewOptions(
// enable other options if needed
//supportZoom: false,
),
),
),
height: 8,
),
),
],
)),
),
SizedBox(
width: MediaQuery.of(context).size.width,
height: 350,
child: Container(
//margin: const EdgeInsets.all(5.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(5.0),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 2,
blurRadius: 5,
offset: const Offset(0, 2),
),
],
),
child: Column(
children: [
const SizedBox(
width: 0,
height: 10,
),
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
const Text('Gender Breakup',
textAlign: TextAlign.left,
style: Constants.headerfontStyle)
]
.map((e) => Padding(
padding:
const EdgeInsets.only(left: 10),
child: e))
.toList(),
),
const SizedBox(
width: 0,
height: 3,
),
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Container(
height: 2,
width: 40,
color:
const Color.fromARGB(255, 170, 57, 230),
),
]
.map((e) => Padding(
padding:
const EdgeInsets.only(left: 10),
child: e))
.toList(),
),
const SizedBox(
height: 8,
),
Center(
child: SizedBox(
width: MediaQuery.of(context).size.width,
height: 280,
child: InAppWebView(
initialData: InAppWebViewInitialData(
data: foot.genderhourlygraph ?? ""),
initialOptions: InAppWebViewGroupOptions(
crossPlatform: InAppWebViewOptions(
// enable options that are common to both platforms
Center(
child: SizedBox(
width: MediaQuery.of(context).size.width,
height: 280,
child: InAppWebView(
initialData: InAppWebViewInitialData(
data: foot.genderhourlygraph ?? ""),
initialOptions: InAppWebViewGroupOptions(
crossPlatform: InAppWebViewOptions(
// enable options that are common to both platforms
//supportZoom: false,
),
android: AndroidInAppWebViewOptions(
// enable Android-specific options if needed
supportMultipleWindows: true,
),
ios: IOSInAppWebViewOptions(
// enable iOS-specific options if needed
allowsInlineMediaPlayback: true,
//supportZoom: false,
),
android: AndroidInAppWebViewOptions(
// enable Android-specific options if needed
supportMultipleWindows: true,
),
ios: IOSInAppWebViewOptions(
// enable iOS-specific options if needed
allowsInlineMediaPlayback: true,
//supportZoom: false,
),
),
),
),
),
),
Container()
],
)),
),
],
Container()
],
)),
),
],
),
),
),
);
} else if (snapshot.hasError) {
return Center(child: Text("Error: ${snapshot.error}"));
} else {
return const Center(child: Text("No data"));
}
},
);
} else if (snapshot.hasError) {
return Center(child: Text("Error: ${snapshot.error}"));
} else {
return const Center(child: Text("No data"));
}
},
),
),
);
}
......
......@@ -133,13 +133,25 @@ class _Home extends State<Home> {
),
body: SingleChildScrollView(
child: GestureDetector(
onHorizontalDragUpdate: (dragDetail) {
print('Testing');
if (dragDetail.delta.direction > 0) {
Navigator.pop(context);
print('Hitted =====>');
}
onForcePressUpdate: (details) {
print('force press update');
},
onHorizontalDragStart: (details) {
print('force press start');
},
onHorizontalDragDown: (details) {
print('force press down');
//Navigator.pop(context);
},
// onHorizontalDragUpdate: (dragDetail) {
// print('Testing');
// if (dragDetail.delta.direction > 0) {
// Navigator.pop(context);
// print('Hitted =====>');
// }
// },
child: Container(
margin: const EdgeInsets.all(12.0),
child: Column(
......
......@@ -442,7 +442,7 @@ class _CustomDialogState extends State<CustomDialog> {
print(userId);
print(_textFieldController1.text);
print(_textFieldController2.text);
//Navigator.pop(context);
//tor.Navigapop(context);
String res = await RemoteData().getChangePassword(
_textFieldController1.text,
......
......@@ -2,8 +2,6 @@ import 'dart:io';
import 'package:firebase_core/firebase_core.dart';
import 'package:flutter/material.dart';
import 'package:storemonitor/FirebaseApi.dart';
//import 'package:media_kit/media_kit.dart';
//import 'Screens/MyHomePage.dart';
import 'Screens/SplashScreen.dart';
Future<void> main() async {
......@@ -12,8 +10,9 @@ Future<void> main() async {
await Firebase.initializeApp();
await FirebaseApi().initNotifications();
}
runApp(const MaterialApp(
debugShowCheckedModeBanner: false,
home: SplashScreen(),
));
runApp(const MaterialApp(
debugShowCheckedModeBanner: false,
home: SplashScreen(),
)
);
}
......@@ -282,10 +282,10 @@ packages:
dependency: "direct main"
description:
name: flutter_inappwebview
sha256: f73505c792cf083d5566e1a94002311be497d984b5607f25be36d685cf6361cf
sha256: d198297060d116b94048301ee6749cd2e7d03c1f2689783f52d210a6b7aba350
url: "https://pub.dev"
source: hosted
version: "5.7.2+3"
version: "5.8.0"
flutter_launcher_icons:
dependency: "direct main"
description:
......
name: storemonitor
description: A new Flutter project.
publish_to: 'none'
version: 1.0.4+4
version: 1.0.5+5
environment:
sdk: '>=2.18.4 <3.0.0'
......@@ -23,7 +23,8 @@ dependencies:
#aws_s3_upload: ^1.5.0
# //flutter_webview_plugin: ^0.4.0
webview_flutter: ^4.2.4
flutter_inappwebview: ^5.7.2+3
flutter_inappwebview: ^5.8.0
#flutter_html: ^0.11.1
http_parser: ^4.0.0
#amazon_cognito_identity_dart_2: ^1.0.3
......
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