Covid New Design 2

merge-update-with-lab-changes
Mirza.Shafique 4 years ago
parent 5b330b2a25
commit b80e2ea16e

@ -2,6 +2,7 @@ import 'dart:io';
import 'package:diplomaticquarterapp/theme/colors.dart'; import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
@ -36,12 +37,7 @@ class _PaymentMethodState extends State<PaymentMethod> {
child: Text(TranslationBase.of(context).selectPaymentOption, style: TextStyle(fontSize: 18.0, fontWeight: FontWeight.bold)), child: Text(TranslationBase.of(context).selectPaymentOption, style: TextStyle(fontSize: 18.0, fontWeight: FontWeight.bold)),
), ),
Container( Container(
margin: EdgeInsets.only(top: 25.0), width: double.infinity,
child: Flex(
direction: Axis.horizontal,
children: <Widget>[
Expanded(
child: Container(
child: InkWell( child: InkWell(
onTap: () { onTap: () {
updateSelectedPaymentMethod("MADA"); updateSelectedPaymentMethod("MADA");
@ -54,18 +50,30 @@ class _PaymentMethodState extends State<PaymentMethod> {
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
side: selectedPaymentMethod == "MADA" ? BorderSide(color: Colors.green, width: 5.0) : BorderSide(color: Colors.transparent, width: 0.0), side: selectedPaymentMethod == "MADA" ? BorderSide(color: Colors.green, width: 5.0) : BorderSide(color: Colors.transparent, width: 0.0),
), ),
child: Container( child: Row(
height: 120.0, children: [
Container(
height: 60.0,
width:60,
padding: EdgeInsets.all(7.0), padding: EdgeInsets.all(7.0),
width: MediaQuery.of(context).size.width * 0.45,
child: Image.asset("assets/images/new-design/mada.png"), child: Image.asset("assets/images/new-design/mada.png"),
), ),
mWidth(12),
Text(
"MADA",
style: TextStyle(
color: Colors.black,
fontSize: 14,
fontWeight: FontWeight.bold,
),
)
],
), ),
), ),
), ),
), ),
Expanded( Container(
child: Container( width: double.infinity,
child: InkWell( child: InkWell(
onTap: () { onTap: () {
updateSelectedPaymentMethod("VISA"); updateSelectedPaymentMethod("VISA");
@ -78,26 +86,29 @@ class _PaymentMethodState extends State<PaymentMethod> {
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
side: selectedPaymentMethod == "VISA" ? BorderSide(color: Colors.green, width: 5.0) : BorderSide(color: Colors.transparent, width: 0.0), side: selectedPaymentMethod == "VISA" ? BorderSide(color: Colors.green, width: 5.0) : BorderSide(color: Colors.transparent, width: 0.0),
), ),
child: Container( child: Row(
height: 120.0, children: [
Container(
height: 60.0,
padding: EdgeInsets.all(7.0), padding: EdgeInsets.all(7.0),
width: MediaQuery.of(context).size.width * 0.45, width: 60,
child: Image.asset("assets/images/new-design/visa.png"), child: Image.asset("assets/images/new-design/visa.png"),
), ),
mWidth(12),Text(
"VISA",
style: TextStyle(
color: Colors.black,
fontSize: 14,
fontWeight: FontWeight.bold,
), ),
)
],
), ),
), ),
), ),
],
),
), ),
Container( Container(
margin: EdgeInsets.only(top: 25.0), width: double.infinity,
child: Flex(
direction: Axis.horizontal,
children: <Widget>[
Expanded(
child: Container(
child: InkWell( child: InkWell(
onTap: () { onTap: () {
updateSelectedPaymentMethod("MASTERCARD"); updateSelectedPaymentMethod("MASTERCARD");
@ -110,18 +121,30 @@ class _PaymentMethodState extends State<PaymentMethod> {
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
side: selectedPaymentMethod == "MASTERCARD" ? BorderSide(color: Colors.green, width: 5.0) : BorderSide(color: Colors.transparent, width: 0.0), side: selectedPaymentMethod == "MASTERCARD" ? BorderSide(color: Colors.green, width: 5.0) : BorderSide(color: Colors.transparent, width: 0.0),
), ),
child: Container( child: Row(
height: 120.0, children: [
Container(
height: 60.0,
padding: EdgeInsets.all(7.0), padding: EdgeInsets.all(7.0),
width: MediaQuery.of(context).size.width * 0.45, width: 60,
child: Image.asset("assets/images/new-design/mastercard.png"), child: Image.asset("assets/images/new-design/mastercard.png"),
), ),
mWidth(12),
Text(
"MATER CARD",
style: TextStyle(
color: Colors.black,
fontSize: 14,
fontWeight: FontWeight.bold,
),
)
],
), ),
), ),
), ),
), ),
Expanded( Container(
child: Container( width: double.infinity,
child: InkWell( child: InkWell(
onTap: () { onTap: () {
updateSelectedPaymentMethod("Installment"); updateSelectedPaymentMethod("Installment");
@ -134,18 +157,27 @@ class _PaymentMethodState extends State<PaymentMethod> {
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
side: selectedPaymentMethod == "Installment" ? BorderSide(color: Colors.green, width: 5.0) : BorderSide(color: Colors.transparent, width: 0.0), side: selectedPaymentMethod == "Installment" ? BorderSide(color: Colors.green, width: 5.0) : BorderSide(color: Colors.transparent, width: 0.0),
), ),
child: Container( child: Row(
height: 120.0, children: [
Container(
height: 60.0,
padding: EdgeInsets.all(7.0), padding: EdgeInsets.all(7.0),
width: MediaQuery.of(context).size.width * 0.45, width: 60,
child: Image.asset("assets/images/new-design/installment.png"), child: Image.asset("assets/images/new-design/installment.png"),
), ),
mWidth(12),
Text(
"INSTALLMENT",
style: TextStyle(
color: Colors.black,
fontSize: 14,
fontWeight: FontWeight.bold,
), ),
)
],
), ),
), ),
), ),
],
),
), ),
Platform.isIOS Platform.isIOS
? Container( ? Container(

Loading…
Cancel
Save