fix merge issues

merge-update-with-lab-changes
Mohammad Aljammal 5 years ago
parent 30c0963063
commit 4adc2916b4

@ -334,7 +334,6 @@ const Map<String, Map<String, String>> localizedValues = {
"ContactUs": {"en": "Contact Us", 'ar': 'الوصول إلينا'},
"ViewAllWaysReachUs": {"en": "View All Ways Reach Us", 'ar': 'جميع طرق الاتصال بنا'},
"medicalProfile": {"en": "Medical Profile", 'ar': 'الملف الطبي'},
"requestType": {"en": "Request Type", "ar": "نوع الاستفسار"},
"consultation": {"en": "Consultation", "ar": "استشارة"},
"logs": {"en": "Logs", "ar": "السجلات"}

@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
@ -49,12 +50,16 @@ class _HomePageState extends State<HomePage> {
child: Row(
children: <Widget>[
Expanded(
child: Container(
height: 110,
margin: EdgeInsets.all(5),
decoration: BoxDecoration(
color: Colors.transparent
.withOpacity(0.3),
child: InkWell(
onTap: ()=>Navigator.push(context, FadePage(page: LiveCareHome())),
child: Container(
height: 110,
margin: EdgeInsets.all(5),
decoration: BoxDecoration(
color: Colors.transparent
.withOpacity(0.3),
),
child: Center(child: Texts('Live care ',color: Colors.white,),),
),
),
),

Loading…
Cancel
Save