diff --git a/lib/landing_page.dart b/lib/landing_page.dart index cd9507fd..fcdb1eff 100644 --- a/lib/landing_page.dart +++ b/lib/landing_page.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/screens/doctor/doctor_replay/doctor_reply_screen.dart'; import 'package:doctor_app_flutter/screens/doctor/my_schedule_screen.dart'; import 'package:doctor_app_flutter/screens/home/home_screen.dart'; @@ -11,6 +12,7 @@ import 'package:doctor_app_flutter/widgets/shared/user-guid/app_showcase_widget. import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import 'package:provider/provider.dart'; class LandingPage extends StatefulWidget { @override @@ -36,6 +38,7 @@ class _LandingPageState extends State { @override Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); return AppScaffold( appBar: currentTab != 0 ? AppBar( @@ -53,12 +56,16 @@ class _LandingPageState extends State { : SizedBox(), leading: Builder( builder: (BuildContext context) { - return IconButton( - icon: SvgPicture.asset('assets/images/svgs/menu.svg', - height: 50, width: 50), - iconSize: 15, - color: Color(0xff2B353E), - onPressed: () => Scaffold.of(context).openDrawer(), + return Container( + width: 40, + margin: EdgeInsets.only(left: projectViewModel.isArabic? 0:20, right: projectViewModel.isArabic? 20:0), + child: IconButton( + icon: SvgPicture.asset('assets/images/svgs/menu.svg', + height: 25, width: 10), + iconSize: 15, + color: Color(0xff2B353E), + onPressed: () => Scaffold.of(context).openDrawer(), + ), ); }, ), diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index 5cf849e8..a0b03656 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -85,6 +85,7 @@ class _HomeScreenState extends State { color: Colors.grey[100], padding: EdgeInsets.only(top: 10), child: Stack(children: [ + //TODO Elham* make it componet Container( width: 40, margin: EdgeInsets.only(left: projectsProvider.isArabic? 0:32, right: projectsProvider.isArabic? 23:0), diff --git a/lib/util/helpers.dart b/lib/util/helpers.dart index 6a3ca933..cdf45732 100644 --- a/lib/util/helpers.dart +++ b/lib/util/helpers.dart @@ -236,9 +236,6 @@ class Helpers { return parsedString; } - - - static InputDecoration textFieldSelectorDecoration( String hintText, String selectedText, bool isDropDown, {Icon suffixIcon, Color dropDownColor}) { @@ -334,30 +331,46 @@ class Helpers { } static getBoxTabsBoxDecoration( - { - bool isFirst = false, + {bool isFirst = false, bool isMiddle = false, bool isLast = false, bool isActive = false, - double radius = 6.0 - }) { - return BoxDecoration( + double radius = 6.0}) { + return BoxDecoration( color: isActive ? AppGlobal.appRedColor : Color(0xFFEAEAEA), shape: BoxShape.rectangle, borderRadius: BorderRadius.only( - topRight: Radius.circular(isActive?isFirst || isMiddle?radius:0:0), - bottomRight: Radius.circular(isActive?isFirst || isMiddle?radius:0:0), - topLeft: Radius.circular(isActive?isLast|| isMiddle?radius:0:0), - bottomLeft: Radius.circular(isActive?isLast || isMiddle?radius:0:0) - ), + topRight: Radius.circular(isActive + ? isFirst || isMiddle + ? radius + : 0 + : 0), + topLeft: Radius.circular(isActive + ? isLast || isMiddle + ? radius + : 0 + : 0), + bottomRight: Radius.circular(isActive + ? isFirst || isMiddle + ? radius + : 0 + : 0), + bottomLeft: Radius.circular(isActive + ? isLast || isMiddle + ? radius + : 0 + : 0)), ); } - static getBgTabColor(){ + static getBgTabColor() { return Color(0xFFEAEAEA); } - static getTabText({String title, bool isActive = false,}){ + static getTabText({ + String title, + bool isActive = false, + }) { return AppText( title, fontSize: SizeConfig.textMultiplier * 1.8, @@ -365,16 +378,14 @@ class Helpers { letterSpacing: -0.48, fontWeight: FontWeight.w600, ); - } - - static getTabHeight(BuildContext context){ + static getTabHeight(BuildContext context) { final screenSize = MediaQuery.of(context).size; return screenSize.height * 0.07; } - static getTabCounter({bool isActive: false,int counter}){ + static getTabCounter({bool isActive: false, int counter}) { return Container( margin: EdgeInsets.all(4), width: 15, @@ -396,8 +407,6 @@ class Helpers { ); } - - static String convertToTitleCase(String text) { if (text == null) { return null; @@ -424,7 +433,4 @@ class Helpers { // Join/Merge all words back to one String return capitalizedWords.join(' '); } - } - -