From 1476c151e268b07cc3e055c5e8b3145dde34e502 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Thu, 18 Jun 2020 09:18:11 +0300 Subject: [PATCH] Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam # Conflicts: # lib/config/localized_values.dart # lib/screens/dashboard_screen.dart # lib/util/translations_delegate_base.dart --- lib/landing_page.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/landing_page.dart b/lib/landing_page.dart index c934f6da..90cce786 100644 --- a/lib/landing_page.dart +++ b/lib/landing_page.dart @@ -9,6 +9,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; + class LandingPage extends StatefulWidget { @override _LandingPageState createState() => _LandingPageState(); @@ -38,7 +39,8 @@ class _LandingPageState extends State { elevation: 0, backgroundColor: Hexcolor('#515B5D'), textTheme: TextTheme( - headline6: TextStyle(color: Colors.white, fontWeight: FontWeight.bold)), + headline6: + TextStyle(color: Colors.white, fontWeight: FontWeight.bold)), title: Text(getText(currentTab).toUpperCase()), leading: Builder( builder: (BuildContext context) { @@ -50,7 +52,6 @@ class _LandingPageState extends State { }, ), centerTitle: true, - ), drawer: SafeArea(child: AppDrawer()), extendBody: true, @@ -65,7 +66,6 @@ class _LandingPageState extends State { ], ), bottomNavigationBar: BottomNavBar(changeIndex: _changeCurrentTab), - ); }