elham commit
parent
80b9eea5ea
commit
f7e464567a
@ -1,12 +1 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Modify this file to customize your launch splash screen -->
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@android:color/white" />
|
||||
|
||||
<!-- You can insert your own image assets here -->
|
||||
<!-- <item>
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@mipmap/launch_image" />
|
||||
</item> -->
|
||||
</layer-list>
|
||||
import 'package:driverapp/config/config.dart';import 'package:driverapp/core/model/orders/next_order_request_model.dart';import 'package:driverapp/core/model/orders/pending_orders_req_model.dart';import 'package:driverapp/core/model/orders/pending_orders_res_model.dart';import 'package:driverapp/core/model/orders/update_order_status_request_model.dart';import 'package:driverapp/core/model/scan_qr/scan_qr_request_model.dart';import 'pack
|
||||
@ -1,18 +1 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<!-- Theme applied to the Android Window while the process is starting -->
|
||||
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
|
||||
<!-- Show a splash screen on the activity. Automatically removed when
|
||||
Flutter draws its first frame -->
|
||||
<item name="android:windowBackground">@drawable/launch_background</item>
|
||||
</style>
|
||||
<!-- Theme applied to the Android Window as soon as the process has started.
|
||||
This theme determines the color of the Android Window while your
|
||||
Flutter UI initializes, as well as behind your Flutter UI while its
|
||||
running.
|
||||
|
||||
This Theme is only used starting with V2 of Flutter's Android embedding. -->
|
||||
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
|
||||
<item name="android:windowBackground">@android:color/white</item>
|
||||
</style>
|
||||
</resources>
|
||||
import 'package:barcode_scan/platform_wrapper.dart';import 'package:driverapp/config/config.dart';import 'package:driverapp/config/size_config.dart';import 'package:driverapp/core/enum/viewstate.dart';import 'package:driverapp/core/model/scan_qr/scan_qr_request_model.dart';import 'package:driverapp/core/viewModels/authentication_view_model.dart';import 'package:driverapp/core/viewModels/orders_view_model.dart';import 'package:driverapp/pages/delivery/information_page.dart';import 'package:driverapp/pages/orders/deliverd_orders_page.dart';import 'package:driverapp/pages/orders/pending_orders_page.dart';import 'package:driverapp/pages/setting/setting_page.dart';import 'package:driverapp/uitl/app_toast.dart';import 'package:driverapp/uitl/translations_delegate_base.dart';import 'package:driverapp/uitl/utils.dart';import 'package:driverapp/widgets/order/order_info_card.dart';import 'package:driverapp/widgets/others/app_scaffold_w
|
||||
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -0,0 +1,44 @@
|
||||
import 'package:driverapp/widgets/data_display/circle-container.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class DistanceInKilometers extends StatelessWidget {
|
||||
const DistanceInKilometers({
|
||||
@required this.distanceInKilometers,
|
||||
Key key,
|
||||
}) : super(key: key);
|
||||
|
||||
final dynamic distanceInKilometers;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return CircleContainer(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: <Widget>[
|
||||
Text(
|
||||
distanceInKilometers.toString(),
|
||||
style: TextStyle(
|
||||
color: Color(0xff42B6AD),
|
||||
fontWeight: FontWeight.w800,
|
||||
fontStyle: FontStyle.normal),
|
||||
),
|
||||
Text(
|
||||
'K.m',
|
||||
style: TextStyle(
|
||||
color: Color(0xff42B6AD),
|
||||
fontWeight: FontWeight.w800,
|
||||
fontStyle: FontStyle.normal),
|
||||
),
|
||||
Text(
|
||||
'away',
|
||||
style: TextStyle(
|
||||
color: Color(0xff42B6AD),
|
||||
fontWeight: FontWeight.w800,
|
||||
fontStyle: FontStyle.normal),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,100 @@
|
||||
import 'package:driverapp/uitl/utils.dart';
|
||||
import 'package:driverapp/widgets/delivery/distance_in_kilometers.dart';
|
||||
import 'package:driverapp/widgets/others/rounded_container.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hexcolor/hexcolor.dart';
|
||||
|
||||
class OrderInfoCard extends StatelessWidget {
|
||||
const OrderInfoCard({Key key, this.order, this.onTap}) : super(key: key);
|
||||
|
||||
final dynamic order;
|
||||
final Function onTap;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return InkWell(
|
||||
child: Container(
|
||||
child: RoundedContainer(
|
||||
showShadow: true,
|
||||
raduis: 25.0,
|
||||
height: MediaQuery.of(context).orientation == Orientation.portrait
|
||||
? MediaQuery.of(context).size.height * 0.120
|
||||
: MediaQuery.of(context).size.height * 0.209,
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: <Widget>[
|
||||
Expanded(
|
||||
flex: 1,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: <Widget>[
|
||||
Padding(
|
||||
padding: EdgeInsets.only(left: 15.0, top: 14.0),
|
||||
child: Image.asset(
|
||||
'assets/images/location.png',
|
||||
height: MediaQuery.of(context).orientation ==
|
||||
Orientation.portrait
|
||||
? MediaQuery.of(context).size.height * 0.06
|
||||
: MediaQuery.of(context).size.height * 0.11,
|
||||
width: MediaQuery.of(context).orientation ==
|
||||
Orientation.portrait
|
||||
? MediaQuery.of(context).size.width * 0.05
|
||||
: MediaQuery.of(context).size.width * 0.09,
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
flex: 5,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: <Widget>[
|
||||
Padding(
|
||||
padding: EdgeInsets.only(top: 20.0),
|
||||
child: Text(
|
||||
Utils.formatStringToPascalCase(
|
||||
order.firstName + ' ' + order.lastName),
|
||||
style: TextStyle(
|
||||
fontSize: 18.0,
|
||||
color: Hexcolor("#343333"),
|
||||
fontWeight: FontWeight.bold),
|
||||
),
|
||||
),
|
||||
Text(
|
||||
order.mobileNumber,
|
||||
style: TextStyle(
|
||||
color: Color(0xff30B7B9),
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: 15.0,
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: Text(
|
||||
order.orderID.toString(),
|
||||
style: TextStyle(
|
||||
fontSize: 15.0,
|
||||
fontWeight: FontWeight.w400,
|
||||
letterSpacing: 8.0),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: EdgeInsets.all(8.0),
|
||||
child: DistanceInKilometers(
|
||||
distanceInKilometers: order.distanceInKilometers,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
onTap: () {
|
||||
onTap();
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -1,22 +1,19 @@
|
||||
import 'package:eva_icons_flutter/eva_icons_flutter.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class CloseBack extends StatelessWidget{
|
||||
|
||||
class CloseBack extends StatelessWidget {
|
||||
final Function onTap;
|
||||
|
||||
CloseBack({Key key,
|
||||
this.onTap
|
||||
}) : super(key: key);
|
||||
CloseBack({Key key, this.onTap}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTap: Feedback.wrapForTap(() {
|
||||
onTap!=null ? onTap() : Navigator.pop(context);
|
||||
onTap != null ? onTap() : Navigator.pop(context);
|
||||
}, context),
|
||||
child: Icon(EvaIcons.close, color: Color.fromRGBO(78, 62, 253, 1.0)),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue