diff --git a/.run/main.dart.run.xml b/.run/main.dart.run.xml
new file mode 100644
index 0000000..4767aff
--- /dev/null
+++ b/.run/main.dart.run.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6eeedef..0a2c566 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
- compileSdkVersion flutter.compileSdkVersion
+ compileSdkVersion 33
ndkVersion flutter.ndkVersion
compileOptions {
@@ -47,7 +47,7 @@ android {
applicationId "com.example.healthcare_delivery"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
- minSdkVersion flutter.minSdkVersion
+ minSdkVersion 28
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index db77bb4..eabddc3 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 17987b7..d583383 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 09d4391..1349b6d 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index d5f1c8d..ea9d6a7 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 4d6372e..3c46fec 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/build.gradle b/android/build.gradle
index 83ae220..f33eab0 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,5 +1,5 @@
buildscript {
- ext.kotlin_version = '1.6.10'
+ ext.kotlin_version = '1.7.10'
repositories {
google()
mavenCentral()
diff --git a/images/appicon.png b/images/appicon.png
new file mode 100644
index 0000000..6ee10c4
Binary files /dev/null and b/images/appicon.png differ
diff --git a/images/logo.png b/images/logo.png
index 0084f50..3982b86 100644
Binary files a/images/logo.png and b/images/logo.png differ
diff --git a/images/mobilebg.png b/images/mobilebg.png
new file mode 100644
index 0000000..5d42afb
Binary files /dev/null and b/images/mobilebg.png differ
diff --git a/images/seekopinion.png b/images/seekopinion.png
new file mode 100644
index 0000000..b17541a
Binary files /dev/null and b/images/seekopinion.png differ
diff --git a/images/splash_screen_new.gif b/images/splash_screen_new.gif
new file mode 100644
index 0000000..b0640d2
Binary files /dev/null and b/images/splash_screen_new.gif differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
index dc9ada4..57e69b7 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
index 28c6bf0..2c7af6d 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
index 2ccbfd9..73dd5f4 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
index f091b6b..58dd612 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
index 4cde121..7c9dca9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
index d0ef06e..3fbb974 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
index dcdc230..c3e4830 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
index 2ccbfd9..73dd5f4 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
index c8f9ed8..06f405b 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
index a6d6b86..4e5755e 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
index a6d6b86..4e5755e 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
index 75b2d16..1d66944 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
index c4df70d..a9ddeec 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index 6a84f41..48d35cb 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index d0e1f58..a80e54e 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/lib/common/dashboard.dart b/lib/common/dashboard.dart
index e80e9b0..d5e7839 100644
--- a/lib/common/dashboard.dart
+++ b/lib/common/dashboard.dart
@@ -69,7 +69,7 @@ class _DashboardState extends State {
Widget _dashBoard() {
return Container(
- color: screenBackgroundColor,
+ color: primaryColor,
child: Column(
children: [
Container(
@@ -81,7 +81,7 @@ class _DashboardState extends State {
//color: Colors.red,
child: FittedBox(
child:Image(
- image: const AssetImage('images/appbgsuplier.png'),
+ image: const AssetImage('images/mobilebg.png'),
),
fit: BoxFit.fill,
@@ -115,8 +115,9 @@ class _DashboardState extends State {
child: Column(
children: [
Container(
- padding: EdgeInsets.fromLTRB(30, 10,10,10),
- child: new SvgPicture.asset("assets/images/booking_request.svg")
+ child: Image(image: AssetImage(
+ "images/seekopinion.png"),
+ ),
),
Text('Booking Data',style: dashboardTextStyle(),),
diff --git a/lib/common/login.dart b/lib/common/login.dart
index 78fe3c2..c5f900b 100644
--- a/lib/common/login.dart
+++ b/lib/common/login.dart
@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
-import 'package:path/path.dart' as Path;
import 'package:healthcare_delivery/common/otpscreen.dart';
import 'package:healthcare_delivery/common/settings.dart';
@@ -69,14 +68,14 @@ class _LoginState extends State {
return WillPopScope(
onWillPop: () async => onWillPop(),
child: Scaffold(
-
+ backgroundColor: primaryColor,
body: Stack(
children: [
- Container(
+ /*Container(
decoration: const BoxDecoration(
image: DecorationImage(image:AssetImage("images/backgroundimage.png"), fit: BoxFit.cover,),
),
- ),
+ ),*/
GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -87,8 +86,8 @@ class _LoginState extends State {
padding: const EdgeInsets.all(10),
child: Column(
children: [
- const SizedBox(
- height: 15,
+ SizedBox(
+ height:MediaQuery.of(context).size.height * .05,
),
Container(
//width: double.infinity,
@@ -96,29 +95,29 @@ class _LoginState extends State {
image: const AssetImage('images/logo.png'),
height: MediaQuery.of(context).size.height * .25,
)),
- const SizedBox(
- height: 15,
+ SizedBox(
+ height:MediaQuery.of(context).size.height * .05,
),
Container(
- padding: const EdgeInsets.all(10),
+ padding: const EdgeInsets.all(0),
child: TextFormField(
- cursorColor: greyColor,
+ cursorColor: Colors.white,
controller: mobileNumberController,
keyboardType: TextInputType.number,
+ style: TextStyle(color: Colors.white),
decoration: textFormFieldDecoration(Icons.phone,'Enter MobileNumber'),
),
),
- const SizedBox(
- height: 15,
+ SizedBox(
+ height:MediaQuery.of(context).size.height * .02,
),
Container(
- width: 400,
- height: 50,
- padding: const EdgeInsets.fromLTRB(10, 0, 10, 0),
+ width:double.infinity,
+ height: MediaQuery.of(context).size.height * .05,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
- primary: primaryColor, // background
+ primary: buttonColors, // background
onPrimary: Colors.white, // foreground
),
onPressed: () async{
@@ -140,7 +139,7 @@ class _LoginState extends State {
await Navigator.push(
context,
MaterialPageRoute(
- builder: (context) => OtpScreen(phoneNumber:mobileNumberController.text)),
+ builder: (context) => OtpScreen(myObject:mobileNumberController.text)),
);
AppSettings.longSuccessToast("OTP sent Successfully");
mobileNumberController.text='';
diff --git a/lib/common/otpscreen.dart b/lib/common/otpscreen.dart
index 2b7c28e..68b8f46 100644
--- a/lib/common/otpscreen.dart
+++ b/lib/common/otpscreen.dart
@@ -1,13 +1,10 @@
import 'package:flutter/material.dart';
import 'package:healthcare_delivery/common/dashboard.dart';
+import 'package:healthcare_delivery/common/login.dart';
import 'package:healthcare_delivery/common/settings.dart';
-
class OtpScreen extends StatefulWidget {
-
- var phoneNumber;
- OtpScreen({
- this.phoneNumber
- });
+ var myObject;
+ OtpScreen({this.myObject});
@override
State createState() => _OtpScreenState();
@@ -21,7 +18,12 @@ class _OtpScreenState extends State {
final TextEditingController _fieldFour = TextEditingController();
final TextEditingController _fieldFive = TextEditingController();
final TextEditingController _fieldSix = TextEditingController();
- TextEditingController phoneverificationCodeController = TextEditingController();
+ TextEditingController mobileNumberController = TextEditingController();
+ TextEditingController passwordController = TextEditingController();
+
+ bool isTextfieldVisible=true;
+ bool isOtpVisible=false;
+ bool isObscureText=true;
// This is the entered code
// It will be displayed in a Text widget
@@ -29,16 +31,62 @@ class _OtpScreenState extends State {
@override
Widget build(BuildContext context) {
return Scaffold(
- backgroundColor: screenBackgroundColor,
body: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Text('Phone Number Verification'),
+
+
+ Visibility(
+ visible: false,
+ child: Container(
+ padding: const EdgeInsets.all(10),
+ child: TextFormField(
+ cursorColor: greyColor,
+ controller: mobileNumberController,
+ keyboardType: TextInputType.number,
+ decoration: const InputDecoration(
+ prefixIcon: Icon(
+ Icons.phone,
+ color: greyColor,
+ ),
+ border: OutlineInputBorder(
+ borderSide: BorderSide(color: greyColor)),
+ focusedBorder: OutlineInputBorder(
+ borderSide: BorderSide(color:greyColor),
+ ),
+ enabledBorder: OutlineInputBorder(
+ borderSide: BorderSide(color: greyColor),
+ ),
+ labelText: 'Enter MobileNumber',
+ labelStyle: TextStyle(
+ color: greyColor, //<-- SEE HERE
+ ),
+ ),
+ ),
+ ),),
const SizedBox(
height: 30,
),
+ Visibility(
+ visible: false,
+ child: Container(
+ width: MediaQuery.of(context).size.width * .99,
+ height: 50,
+ child: ElevatedButton(
+ style: ElevatedButton.styleFrom(
+ primary: primaryColor, // background
+ onPrimary: Colors.white, // foreground
+ ),
+ onPressed: ()async {
+
+ },
+ child: const Text('Submit')),
+ ),),
// Implement 4 input fields
- Row(
+ Visibility(
+ visible:true,
+ child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
OtpInput(_fieldOne, true), // auto focus
@@ -48,77 +96,116 @@ class _OtpScreenState extends State {
OtpInput(_fieldFive, false),
OtpInput(_fieldSix, false),
],
- ),
+ ),),
const SizedBox(
height: 30,
),
- ElevatedButton(
- style: ElevatedButton.styleFrom(
- primary: primaryColor, // background
- onPrimary: Colors.white, // foreground
+ Visibility(
+ visible: false,
+ child: Container(
+ padding: const EdgeInsets.fromLTRB(10, 10, 10, 0),
+ child: TextFormField(
+ cursorColor: greyColor,
+ obscureText: isObscureText,
+ controller: passwordController,
+ decoration: InputDecoration(
+ labelText: 'Password',
+ prefixIcon: const Icon(Icons.password, color: greyColor,),
+ labelStyle: const TextStyle(
+ color: greyColor, //<-- SEE HERE
+ ),
+ border: const OutlineInputBorder(
+ borderSide: BorderSide(color: greyColor)),
+ focusedBorder: const OutlineInputBorder(
+ borderSide: BorderSide(color: greyColor),
+ ),
+ enabledBorder: const OutlineInputBorder(
+ borderSide: BorderSide(color: textFieldStartColor),
+ ),
+ suffixIcon: IconButton(
+ icon: Icon(
+ Icons.visibility_off_outlined,
+ color: isObscureText==true?greyColor:primaryColor,
+ ),
+ onPressed: () {
+
+ print("show password");
+ setState(() {
+ isObscureText = !isObscureText;
+ });
+ },
+ ),
+
+ ),
+
),
- onPressed: () async {
- setState(() {
- _otp = _fieldOne.text +
- _fieldTwo.text +
- _fieldThree.text +
- _fieldFour.text+
- _fieldFive.text +
- _fieldSix.text;
- });
-
-
- if (_otp!.length == 6) {
- AppSettings.preLoaderDialog(context);
-
- bool isOnline = await AppSettings.internetConnectivity();
-
- if(isOnline){
- var payload = new Map();
- payload["phoneVerificationCode"] = _otp.toString();
- payload["phone"] = widget.phoneNumber.toString();
- bool signinStatus = await AppSettings.login(payload);
- try{
- if (signinStatus) {
- Navigator.of(context,rootNavigator: true).pop();
- await Navigator.push(
- context,
- MaterialPageRoute(builder: (context) => Dashboard()),
- );
- AppSettings.longSuccessToast("Logged in Successfully");
+ ),),
+ const SizedBox(
+ height: 30,
+ ),
+ Visibility(
+ visible: true,
+ child: Container(
+ width: MediaQuery.of(context).size.width * .99,
+ height: 50,
+ child: ElevatedButton(
+ style: ElevatedButton.styleFrom(
+ primary: primaryColor, // background
+ onPrimary: Colors.white, // foreground
+ ),
+ onPressed: ()async {
+ setState(() {
+ _otp = _fieldOne.text +
+ _fieldTwo.text +
+ _fieldThree.text +
+ _fieldFour.text+
+ _fieldFive.text +
+ _fieldSix.text;
+ });
+
+ if (_otp!.length == 6) {
+ AppSettings.preLoaderDialog(context);
+
+ bool isOnline = await AppSettings.internetConnectivity();
+
+ if(isOnline){
+ var payload = new Map();
+ payload["phoneVerificationCode"] = _otp.toString();
+ payload["phone"] = widget.myObject.toString();
+ bool phoneVerified = await AppSettings.login(payload);
+ if(phoneVerified){
+ Navigator.of(context,rootNavigator: true).pop();
+ AppSettings.longSuccessToast(
+ "Phone verified successfully");
+ Navigator.push(
+ context,
+ MaterialPageRoute(
+ builder: (context) => Dashboard()),
+ );
+ }
+ else{
+ Navigator.of(context,rootNavigator: true).pop();
+ AppSettings.longFailedToast(
+ "please enter valid pin");
+ }
- } else {
+
+ }
+ else{
Navigator.of(context,rootNavigator: true).pop();
- AppSettings.longFailedToast("Please enter valid details");
+ AppSettings.longFailedToast(
+ "Please check your internet");
}
- }
- catch(exception){
- Navigator.of(context,rootNavigator: true).pop();
- print(exception);
- }
- }
- else{
- Navigator.of(context,rootNavigator: true).pop();
- AppSettings.longFailedToast("Please Check internet");
- }
-
- }
- else{
- AppSettings.longFailedToast("Please enter valid details");
- }
+ }
+ else{
- },
- child: const Text('Submit')),
- const SizedBox(
- height: 30,
- ),
- // Display the entered OTP code
- Text(
- _otp ?? 'Please enter OTP',
- style: const TextStyle(fontSize: 30),
- )
+ }
+ },
+ child: const Text('Submit')),
+ )
+ )
],
),
);
@@ -142,7 +229,7 @@ class OtpInput extends StatelessWidget {
keyboardType: TextInputType.number,
controller: controller,
maxLength: 1,
- cursorColor: primaryColor,
+ cursorColor: Theme.of(context).primaryColor,
decoration: const InputDecoration(
filled: true,
fillColor: Colors.white,
diff --git a/lib/common/settings.dart b/lib/common/settings.dart
index c2da329..f85c39a 100644
--- a/lib/common/settings.dart
+++ b/lib/common/settings.dart
@@ -13,18 +13,21 @@ import 'package:healthcare_delivery/common/preloader.dart';
//const Color primaryColor = Color(0XFF0D4E84);
-const Color primaryColor = Color(0XFF4D317D);
+/*const Color primaryColor = Color(0XFF4D317D);*/
const Color greyColor = Color(0XFF8F8E8E);
+const Color primaryColor = Color(0XFF68A85D);
+const Color secondaryColor = Color(0XFFA0C899);
+const Color buttonColors = Color(0XFFFFAC1C);
const Color textFieldStartColor = Colors.grey;
//const Color screenBackgroundColor = Color(0XFFEAF6FF);
const Color screenBackgroundColor = Color(0XFFDCCBFA);
const Color screenBackgroundColord = Colors.black12;
const Color dashboardbackground = Color(0XFFF5F5F5);
-Color AppBarGradient_1 = Color(0XFF4D317D);
+Color AppBarGradient_1 = primaryColor;
TextStyle PreloaderText() {
- return TextStyle(color:Color(0XFF4D317D));
+ return TextStyle(color:primaryColor);
}
TextStyle labelTextStyle() {
@@ -72,21 +75,21 @@ TextStyle serverIssueTextStyle() {
InputDecoration textFormFieldDecoration(IconData icon,var text){
return InputDecoration(
filled: true,
- fillColor: Colors.white,
+ fillColor: primaryColor,
prefixIcon: Icon(
icon,
- color: greyColor,
+ color: Colors.white,
),
- border: OutlineInputBorder(borderSide: BorderSide(color: primaryColor)),
+ border: OutlineInputBorder(borderSide: BorderSide(color: Colors.white)),
focusedBorder: OutlineInputBorder(
- borderSide: BorderSide(color: primaryColor),
+ borderSide: BorderSide(color: Colors.white),
),
enabledBorder: OutlineInputBorder(
- borderSide: BorderSide(color: primaryColor),
+ borderSide: BorderSide(color: Colors.white),
),
labelText: text,
labelStyle:
- TextStyle(color: primaryColor, fontWeight: FontWeight.bold //<-- SEE HERE
+ TextStyle(color: Colors.white, fontWeight: FontWeight.bold //<-- SEE HERE
),
);
}
@@ -123,7 +126,7 @@ class AppSettings {
late StreamSubscription positionStream;
//api urls
- static String host = 'http://35.207.198.4:3000/api/';
+ static String host = 'http://cloudh.in:4000/api/';
static String loginUrl = host + 'sendSms';
static String deliveryboyloginUrl = host + 'deliveryboylogin';
static String deliveryboybookingsUrl = host + 'getdeliveryboybookings';
diff --git a/lib/common/splash_screen.dart b/lib/common/splash_screen.dart
index a00cf1f..b8db9c0 100644
--- a/lib/common/splash_screen.dart
+++ b/lib/common/splash_screen.dart
@@ -68,7 +68,7 @@ class _SplashScreenState extends State {
children: [
Container(
decoration: const BoxDecoration(
- image: DecorationImage(image: AssetImage("images/final_splash_screen.png"), fit: BoxFit.cover,),
+ image: DecorationImage(image: AssetImage("images/splash_screen_new.gif"), fit: BoxFit.cover,),
),
),
diff --git a/pubspec.yaml b/pubspec.yaml
index 92ae713..4bbf42f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -30,8 +30,8 @@ dev_dependencies:
flutter_icons:
- image_path_ios: 'images/appiconn.png'
- image_path_android: 'images/appiconn.png'
+ image_path_ios: 'images/appicon.png'
+ image_path_android: 'images/appicon.png'
android: true
ios: true
remove_alpha_ios: true