fix issue#1

merge-update-with-lab-changes
Mohammad Aljmma 5 years ago
parent e1f6ef5e5b
commit 27594f15b8

@ -27,6 +27,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart';
import '../../locator.dart';
import 'home_page.dart';
@ -330,10 +331,8 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
@override
Widget build(BuildContext context) {
//final searchValue = Provider.of<SearchProvider>(context);
//print(searchValue);
// projectProvider = Provider.of(context);
// checkValue(projectProvider);
ProjectViewModel projectViewModel = Provider.of(context);
return Scaffold(
appBar: AppBar(
elevation: 0,
@ -341,10 +340,11 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
headline6:
TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
),
title: Texts(
title: Text(
getText(currentTab).toUpperCase(),
bold: true,
color: Colors.white,
style: TextStyle(fontWeight: FontWeight.bold,color: Colors.white,fontFamily: projectViewModel.isArabic ? 'Cairo' : 'WorkSans'),
// bold: true,
// color: Colors.white,
),
leading: Builder(
builder: (BuildContext context) {

@ -1,4 +1,6 @@
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class Texts extends StatefulWidget {
final String text;
@ -164,6 +166,7 @@ class _TextsState extends State<Texts> {
@override
Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
TextStyle _getFontStyle() {
switch (widget.style) {
case "headline2":
@ -262,10 +265,7 @@ class _TextsState extends State<Texts> {
style: _getFontStyle().copyWith(
color: Theme.of(context).primaryColor,
fontWeight: FontWeight.w800,
fontFamily:
Localizations.localeOf(context).languageCode == 'ar'
? 'Cairo'
: 'WorkSans',
fontFamily: projectViewModel.isArabic ? 'Cairo' : 'WorkSans',
),
),
),

Loading…
Cancel
Save