some design fixes

login_design_fixes
Elham Rababah 5 years ago
parent 97f7426aee
commit 8e656dbc0d

@ -568,7 +568,7 @@ const Map<String, Map<String, String>> localizedValues = {
'ar': "ليس هناك شكوى رئيس" 'ar': "ليس هناك شكوى رئيس"
}, },
"more-verify": { "more-verify": {
"en": "More Verification Options", "en": "More Verification \n Options",
"ar": "المزيد من خيارات التحقق" "ar": "المزيد من خيارات التحقق"
}, },
"welcome-back": {"en": "Welcome back!", "ar": "مرحبا بعودتك!"}, "welcome-back": {"en": "Welcome back!", "ar": "مرحبا بعودتك!"},

@ -130,57 +130,90 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
), ),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Column( Container(
children: [ width: SizeConfig.realScreenWidth * .5,
padding: EdgeInsets.all(0),
Text( child: Column(
TranslationBase.of(context) mainAxisAlignment: MainAxisAlignment.start,
.lastLoginAt, children: [
overflow: Text(
TextOverflow.ellipsis, TranslationBase.of(context)
style: TextStyle( .lastLoginAt,
fontFamily: 'Poppins', overflow: TextOverflow.ellipsis,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *4.5, style: TextStyle(
color: Color(0xFF2E303A), fontFamily: 'Poppins',
fontWeight: FontWeight.w700,), fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
), 4.5,
Row( color: Color(0xFF2E303A),
children: [ fontWeight: FontWeight.w700,
AppText( ),
TranslationBase ),
.of(context) Container(
.verifyWith, width: MediaQuery.of(context)
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *4.5, .size
color: Color(0xFF575757), .width *
fontWeight: FontWeight.w600, 0.55,
), child: RichText(
AppText( text: TextSpan(
authenticationViewModel.getType( text: TranslationBase.of(context)
authenticationViewModel.user .verifyWith,
.logInTypeID, style: TextStyle(
context), color: Color(0xFF2B353E),
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *4.5, fontWeight: FontWeight.w600,
color: Color(0xFF2B353E), fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
fontWeight: FontWeight.w700, 4.5,
fontFamily: 'Poppins',
),
children: <TextSpan>[
TextSpan(
text: authenticationViewModel
.getType(
authenticationViewModel
.user
.logInTypeID,
context),
style: TextStyle(
color:
Color(0xFF2B353E),
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth() *
4.5,
fontFamily: 'Poppins',
fontWeight:
FontWeight.w700,
),
)
]),
),
),
],
crossAxisAlignment:
CrossAxisAlignment.start,
),
), ),
], Column(
) mainAxisAlignment: MainAxisAlignment.start,
],
crossAxisAlignment: CrossAxisAlignment.start,), children: [
Column(children: [ AppText(
AppText( authenticationViewModel
authenticationViewModel.user.editedOn != .user.editedOn !=
null null
? AppDateUtils.getDayMonthYearDateFormatted( ? AppDateUtils
AppDateUtils.convertStringToDate( .getDayMonthYearDateFormatted(
authenticationViewModel.user AppDateUtils
.editedOn)) .convertStringToDate(
: authenticationViewModel.user.createdOn != authenticationViewModel
null .user
? AppDateUtils.getDayMonthYearDateFormatted( .editedOn))
: authenticationViewModel
.user.createdOn !=
null
? AppDateUtils.getDayMonthYearDateFormatted(
AppDateUtils.convertStringToDate(authenticationViewModel.user AppDateUtils.convertStringToDate(authenticationViewModel.user
.createdOn)) .createdOn))
: '--', : '--',

@ -1,3 +1,4 @@
import 'package:charts_flutter/flutter.dart' as charts;
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart';
import 'package:doctor_app_flutter/models/dashboard/dashboard_model.dart'; import 'package:doctor_app_flutter/models/dashboard/dashboard_model.dart';
@ -10,7 +11,6 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_swiper/flutter_swiper.dart'; import 'package:flutter_swiper/flutter_swiper.dart';
import 'package:charts_flutter/flutter.dart' as charts;
class DashboardSwipeWidget extends StatefulWidget { class DashboardSwipeWidget extends StatefulWidget {
final List<DashboardModel> dashboardItemList; final List<DashboardModel> dashboardItemList;
@ -48,36 +48,36 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
// itemHeight: 300, // itemHeight: 300,
pagination: new SwiperCustomPagination( pagination: new SwiperCustomPagination(
builder: (BuildContext context, SwiperPluginConfig config) { builder: (BuildContext context, SwiperPluginConfig config) {
return new Stack( return new Stack(
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
children: [ children: [
Positioned( Positioned(
bottom: 0, bottom: 0,
child: Center( child: Center(
child: InkWell( child: InkWell(
onTap: () {}, onTap: () {},
child: Container( child: Container(
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
config.activeIndex == 0 config.activeIndex == 0
? SwiperRoundedPagination(true) ? SwiperRoundedPagination(true)
: SwiperRoundedPagination(false), : SwiperRoundedPagination(false),
config.activeIndex == 1 config.activeIndex == 1
? SwiperRoundedPagination(true) ? SwiperRoundedPagination(true)
: SwiperRoundedPagination(false), : SwiperRoundedPagination(false),
config.activeIndex == 2 config.activeIndex == 2
? SwiperRoundedPagination(true) ? SwiperRoundedPagination(true)
: SwiperRoundedPagination(false), : SwiperRoundedPagination(false),
], ],
),
),
), ),
), ),
), )
), ],
) );
], }),
);
}),
viewportFraction: 0.9, viewportFraction: 0.9,
// scale: 0.9, // scale: 0.9,
// control: new SwiperControl(), // control: new SwiperControl(),
@ -88,16 +88,20 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
Widget getSwipeWidget(List<DashboardModel> dashboardItemList, int index) { Widget getSwipeWidget(List<DashboardModel> dashboardItemList, int index) {
if (index == 1) if (index == 1)
return RoundedContainer( return RoundedContainer(
raduis: 16, raduis: 16,
showBorder: true, showBorder: true,
borderColor: Colors.white, borderColor: Colors.white,
shadowWidth: 0.2, shadowWidth: 0.2,
shadowSpreadRadius: 3, shadowSpreadRadius: 3,
shadowDy: 1, shadowDy: 1,
margin: EdgeInsets.only(top: 15, bottom: 15, left: 10, right: 10), margin: EdgeInsets.only(top: 15, bottom: 15, left: 10, right: 10),
child: Padding( child: Padding(
padding: const EdgeInsets.all(5.0), padding: const EdgeInsets.all(5.0),
child: GetOutPatientStack(dashboardItemList[1]))); child: GetOutPatientStack(
dashboardItemList[1],
),
),
);
if (index == 0) if (index == 0)
return RoundedContainer( return RoundedContainer(
raduis: 16, raduis: 16,
@ -120,7 +124,7 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
shadowDy: 1, shadowDy: 1,
margin: EdgeInsets.only(top: 15, bottom: 15, left: 10, right: 10), margin: EdgeInsets.only(top: 15, bottom: 15, left: 10, right: 10),
child: child:
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
Expanded( Expanded(
flex: 1, flex: 1,
child: Row( child: Row(
@ -137,9 +141,9 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
padding: EdgeInsets.all(8), padding: EdgeInsets.all(8),
child: Column( child: Column(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.center, MainAxisAlignment.center,
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(context)
@ -228,8 +232,7 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
return Container(); return Container();
} }
static List<charts.Series<GaugeSegment, String>> _createReferralData( static List<charts.Series<GaugeSegment, String>> _createReferralData(List<DashboardModel> dashboardItemList) {
List<DashboardModel> dashboardItemList) {
final data = [ final data = [
new GaugeSegment( new GaugeSegment(
dashboardItemList[2].summaryoptions[0].kPIParameter, dashboardItemList[2].summaryoptions[0].kPIParameter,

@ -17,6 +17,7 @@ class MethodTypeCard extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
double cardHeight = SizeConfig.heightMultiplier * (SizeConfig.isHeightShort? 22 : 15);
return InkWell( return InkWell(
onTap: onTap, onTap: onTap,
child: Container( child: Container(
@ -30,7 +31,7 @@ class MethodTypeCard extends StatelessWidget {
color: HexColor('#707070'), color: HexColor('#707070'),
width: 0.1), width: 0.1),
), ),
height: SizeConfig.heightMultiplier * (SizeConfig.isHeightShort? 22 : 15), height: cardHeight,
child: Center( child: Center(
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@ -38,10 +39,13 @@ class MethodTypeCard extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Image.asset( Image.asset(
assetPath, assetPath,
width: SizeConfig.widthMultiplier* 12, width: SizeConfig.widthMultiplier* 12,
height: cardHeight * 0.35,
// height: ,
), ),
], ],
), ),
@ -50,8 +54,8 @@ class MethodTypeCard extends StatelessWidget {
), ),
AppText( AppText(
label, label,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* 2.5, fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* 3,
color: Color(0xFF2E303A), color: Color(0xFF2B353E),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
) )
], ],

@ -42,7 +42,7 @@ class _VerificationMethodsListState extends State<VerificationMethodsList> {
{widget.authenticateUser(AuthMethodTypes.WhatsApp, true)}, {widget.authenticateUser(AuthMethodTypes.WhatsApp, true)},
label: TranslationBase label: TranslationBase
.of(context) .of(context)
.verifyWith+ TranslationBase.of(context).verifyWhatsApp, .verifyWith+"\n"+ TranslationBase.of(context).verifyWhatsApp,
); );
break; break;
case AuthMethodTypes.SMS: case AuthMethodTypes.SMS:
@ -51,7 +51,7 @@ class _VerificationMethodsListState extends State<VerificationMethodsList> {
onTap: () => {widget.authenticateUser(AuthMethodTypes.SMS, true)}, onTap: () => {widget.authenticateUser(AuthMethodTypes.SMS, true)},
label:TranslationBase label:TranslationBase
.of(context) .of(context)
.verifyWith+ TranslationBase.of(context).verifySMS, .verifyWith+ "\n"+ TranslationBase.of(context).verifySMS,
); );
break; break;
case AuthMethodTypes.Fingerprint: case AuthMethodTypes.Fingerprint:
@ -66,7 +66,7 @@ class _VerificationMethodsListState extends State<VerificationMethodsList> {
}, },
label: TranslationBase label: TranslationBase
.of(context) .of(context)
.verifyWith+TranslationBase.of(context).verifyFingerprint, .verifyWith+"\n"+TranslationBase.of(context).verifyFingerprint,
); );
break; break;
case AuthMethodTypes.FaceID: case AuthMethodTypes.FaceID:
@ -80,7 +80,7 @@ class _VerificationMethodsListState extends State<VerificationMethodsList> {
}, },
label: TranslationBase label: TranslationBase
.of(context) .of(context)
.verifyWith+TranslationBase.of(context).verifyFaceID, .verifyWith+"\n"+TranslationBase.of(context).verifyFaceID,
); );
break; break;
@ -89,7 +89,7 @@ class _VerificationMethodsListState extends State<VerificationMethodsList> {
assetPath: 'assets/images/login/more_icon.png', assetPath: 'assets/images/login/more_icon.png',
onTap: widget.onShowMore, onTap: widget.onShowMore,
label: TranslationBase.of(context).moreVerification, label: TranslationBase.of(context).moreVerification,
height: 40, // height: 40,
); );
} }
} }

Loading…
Cancel
Save