Merge branch 'development' into 'master'
Development See merge request Cloud_Solution/driver-app!31setting_page
commit
a2fb7e82a0
Binary file not shown.
@ -0,0 +1,72 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:hexcolor/hexcolor.dart';
|
||||||
|
|
||||||
|
class ActionSheetButton extends StatelessWidget {
|
||||||
|
const ActionSheetButton({Key key, this.label, this.onTap, this.icon})
|
||||||
|
: super(key: key);
|
||||||
|
final String label;
|
||||||
|
final Function onTap;
|
||||||
|
final IconData icon;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return InkWell(
|
||||||
|
onTap: onTap,
|
||||||
|
child: Container(
|
||||||
|
height: MediaQuery.of(context).size.height * 0.07,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
border: Border.all(color: Colors.blue),
|
||||||
|
borderRadius: BorderRadius.circular(6),
|
||||||
|
gradient: LinearGradient(colors: [
|
||||||
|
Hexcolor('#DCE6E8'),
|
||||||
|
Hexcolor('#FFFFFF'),
|
||||||
|
], begin: Alignment.topLeft),
|
||||||
|
),
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.start,
|
||||||
|
children: <Widget>[
|
||||||
|
Expanded(
|
||||||
|
flex: 1,
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: <Widget>[
|
||||||
|
Container(
|
||||||
|
width: 60,
|
||||||
|
height: 50,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
borderRadius: BorderRadius.circular(10),
|
||||||
|
color: Theme.of(context).primaryColor,
|
||||||
|
),
|
||||||
|
child: Center(
|
||||||
|
child: Icon(
|
||||||
|
icon,
|
||||||
|
size: 30,
|
||||||
|
color: Colors.white,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
flex: 3,
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: <Widget>[
|
||||||
|
Padding(
|
||||||
|
padding: EdgeInsets.only(top: 5.0),
|
||||||
|
child: Text(
|
||||||
|
label,
|
||||||
|
style: TextStyle(fontSize: 18.0),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,39 @@
|
|||||||
|
import 'package:flutter/cupertino.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:hexcolor/hexcolor.dart';
|
||||||
|
|
||||||
|
class CustomBottomSheet extends StatelessWidget {
|
||||||
|
final List<Widget> children;
|
||||||
|
|
||||||
|
CustomBottomSheet({Key key, @required this.children}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Container(
|
||||||
|
padding: EdgeInsets.symmetric(vertical: 12.0),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: Hexcolor("#FEFEFE"),
|
||||||
|
borderRadius: BorderRadius.only(
|
||||||
|
topLeft: Radius.circular(30.0),
|
||||||
|
topRight: Radius.circular(30.0),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: SafeArea(
|
||||||
|
top: false,
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: <Widget>[
|
||||||
|
Container(
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: Hexcolor("#D5D5D5"),
|
||||||
|
borderRadius: BorderRadius.circular(3.0)),
|
||||||
|
width: 200,
|
||||||
|
height: 7.0,
|
||||||
|
),
|
||||||
|
...children
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,19 +1,26 @@
|
|||||||
import 'package:eva_icons_flutter/eva_icons_flutter.dart';
|
import 'package:driverapp/core/viewModels/project_view_model.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
class ArrowBack extends StatelessWidget {
|
class ArrowBack extends StatelessWidget {
|
||||||
final Function onTap;
|
final Function onTap;
|
||||||
|
final Color arrowColor;
|
||||||
|
|
||||||
ArrowBack({Key key, this.onTap}) : super(key: key);
|
ArrowBack({Key key, this.onTap, this.arrowColor}) : super(key: key);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
ProjectViewModel projectViewModel = Provider.of(context);
|
||||||
return GestureDetector(
|
return GestureDetector(
|
||||||
behavior: HitTestBehavior.opaque,
|
behavior: HitTestBehavior.opaque,
|
||||||
onTap: Feedback.wrapForTap(() {
|
onTap: Feedback.wrapForTap(() {
|
||||||
onTap != null ? onTap() : Navigator.pop(context);
|
onTap != null ? onTap() : Navigator.pop(context);
|
||||||
}, context),
|
}, context),
|
||||||
child: Icon(EvaIcons.arrowBack, color: Theme.of(context).primaryColor),
|
child: Icon(
|
||||||
|
projectViewModel.isArabic ? Icons.arrow_forward : Icons.arrow_back,
|
||||||
|
color: arrowColor ?? Theme.of(context).primaryColor,
|
||||||
|
size: 22,
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue