From 1cf4797d4f40289488acfb08a65ea09e9d88a134 Mon Sep 17 00:00:00 2001 From: Mohammad Aljmma Date: Mon, 26 Oct 2020 12:43:38 +0300 Subject: [PATCH] add font --- .../WorkSans-Bold.eot | Bin .../WorkSans-Bold.otf | Bin .../WorkSans-Bold.ttf | Bin .../WorkSans-Bold.woff | Bin .../WorkSans-Light_0.eot | Bin .../WorkSans-Light_0.otf | Bin .../WorkSans-Light_0.ttf | Bin .../WorkSans-Light_0.woff | Bin .../WorkSans-Regular.otf | Bin .../WorkSans-Regular.ttf | Bin .../WorkSans-Regular.woff | Bin lib/main.dart | 4 +-- lib/widgets/data_display/text.dart | 16 +++++++--- pubspec.yaml | 30 ++++++++++++++++-- 14 files changed, 40 insertions(+), 10 deletions(-) rename assets/fonts/en/{WorkSans-Bold_0 => WorkSans-Bold}/WorkSans-Bold.eot (100%) rename assets/fonts/en/{WorkSans-Bold_0 => WorkSans-Bold}/WorkSans-Bold.otf (100%) rename assets/fonts/en/{WorkSans-Bold_0 => WorkSans-Bold}/WorkSans-Bold.ttf (100%) rename assets/fonts/en/{WorkSans-Bold_0 => WorkSans-Bold}/WorkSans-Bold.woff (100%) rename assets/fonts/en/{WorkSans-Light_0 => WorkSans-Light}/WorkSans-Light_0.eot (100%) rename assets/fonts/en/{WorkSans-Light_0 => WorkSans-Light}/WorkSans-Light_0.otf (100%) rename assets/fonts/en/{WorkSans-Light_0 => WorkSans-Light}/WorkSans-Light_0.ttf (100%) rename assets/fonts/en/{WorkSans-Light_0 => WorkSans-Light}/WorkSans-Light_0.woff (100%) rename assets/fonts/en/{WorkSans-Light_0 => WorkSans-Light}/WorkSans-Regular.otf (100%) rename assets/fonts/en/{WorkSans-Light_0 => WorkSans-Light}/WorkSans-Regular.ttf (100%) rename assets/fonts/en/{WorkSans-Light_0 => WorkSans-Light}/WorkSans-Regular.woff (100%) diff --git a/assets/fonts/en/WorkSans-Bold_0/WorkSans-Bold.eot b/assets/fonts/en/WorkSans-Bold/WorkSans-Bold.eot similarity index 100% rename from assets/fonts/en/WorkSans-Bold_0/WorkSans-Bold.eot rename to assets/fonts/en/WorkSans-Bold/WorkSans-Bold.eot diff --git a/assets/fonts/en/WorkSans-Bold_0/WorkSans-Bold.otf b/assets/fonts/en/WorkSans-Bold/WorkSans-Bold.otf similarity index 100% rename from assets/fonts/en/WorkSans-Bold_0/WorkSans-Bold.otf rename to assets/fonts/en/WorkSans-Bold/WorkSans-Bold.otf diff --git a/assets/fonts/en/WorkSans-Bold_0/WorkSans-Bold.ttf b/assets/fonts/en/WorkSans-Bold/WorkSans-Bold.ttf similarity index 100% rename from assets/fonts/en/WorkSans-Bold_0/WorkSans-Bold.ttf rename to assets/fonts/en/WorkSans-Bold/WorkSans-Bold.ttf diff --git a/assets/fonts/en/WorkSans-Bold_0/WorkSans-Bold.woff b/assets/fonts/en/WorkSans-Bold/WorkSans-Bold.woff similarity index 100% rename from assets/fonts/en/WorkSans-Bold_0/WorkSans-Bold.woff rename to assets/fonts/en/WorkSans-Bold/WorkSans-Bold.woff diff --git a/assets/fonts/en/WorkSans-Light_0/WorkSans-Light_0.eot b/assets/fonts/en/WorkSans-Light/WorkSans-Light_0.eot similarity index 100% rename from assets/fonts/en/WorkSans-Light_0/WorkSans-Light_0.eot rename to assets/fonts/en/WorkSans-Light/WorkSans-Light_0.eot diff --git a/assets/fonts/en/WorkSans-Light_0/WorkSans-Light_0.otf b/assets/fonts/en/WorkSans-Light/WorkSans-Light_0.otf similarity index 100% rename from assets/fonts/en/WorkSans-Light_0/WorkSans-Light_0.otf rename to assets/fonts/en/WorkSans-Light/WorkSans-Light_0.otf diff --git a/assets/fonts/en/WorkSans-Light_0/WorkSans-Light_0.ttf b/assets/fonts/en/WorkSans-Light/WorkSans-Light_0.ttf similarity index 100% rename from assets/fonts/en/WorkSans-Light_0/WorkSans-Light_0.ttf rename to assets/fonts/en/WorkSans-Light/WorkSans-Light_0.ttf diff --git a/assets/fonts/en/WorkSans-Light_0/WorkSans-Light_0.woff b/assets/fonts/en/WorkSans-Light/WorkSans-Light_0.woff similarity index 100% rename from assets/fonts/en/WorkSans-Light_0/WorkSans-Light_0.woff rename to assets/fonts/en/WorkSans-Light/WorkSans-Light_0.woff diff --git a/assets/fonts/en/WorkSans-Light_0/WorkSans-Regular.otf b/assets/fonts/en/WorkSans-Light/WorkSans-Regular.otf similarity index 100% rename from assets/fonts/en/WorkSans-Light_0/WorkSans-Regular.otf rename to assets/fonts/en/WorkSans-Light/WorkSans-Regular.otf diff --git a/assets/fonts/en/WorkSans-Light_0/WorkSans-Regular.ttf b/assets/fonts/en/WorkSans-Light/WorkSans-Regular.ttf similarity index 100% rename from assets/fonts/en/WorkSans-Light_0/WorkSans-Regular.ttf rename to assets/fonts/en/WorkSans-Light/WorkSans-Regular.ttf diff --git a/assets/fonts/en/WorkSans-Light_0/WorkSans-Regular.woff b/assets/fonts/en/WorkSans-Light/WorkSans-Regular.woff similarity index 100% rename from assets/fonts/en/WorkSans-Light_0/WorkSans-Regular.woff rename to assets/fonts/en/WorkSans-Light/WorkSans-Regular.woff diff --git a/lib/main.dart b/lib/main.dart index d8e3307d..9cb5cb78 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -54,6 +54,7 @@ class MyApp extends StatelessWidget { const Locale('en', ''), // English ], theme: ThemeData( + fontFamily: projectProvider.isArabic ? 'Cairo' : 'WorkSans', primarySwatch: Colors.blue, visualDensity: VisualDensity.adaptivePlatformDensity, brightness: Brightness.light, @@ -66,8 +67,7 @@ class MyApp extends StatelessWidget { hintColor: Colors.grey[400], disabledColor: Colors.grey[300], errorColor: Color.fromRGBO(235, 80, 60, 1.0), - scaffoldBackgroundColor: - HexColor('#E9E9E9'), // Colors.grey[100], + scaffoldBackgroundColor: HexColor('#E9E9E9'), // Colors.grey[100], textSelectionColor: Color.fromRGBO(80, 100, 253, 0.5), textSelectionHandleColor: Colors.grey, canvasColor: Colors.white, diff --git a/lib/widgets/data_display/text.dart b/lib/widgets/data_display/text.dart index 4b9fc551..215db9ff 100644 --- a/lib/widgets/data_display/text.dart +++ b/lib/widgets/data_display/text.dart @@ -257,11 +257,17 @@ class _TextsState extends State { hidden = !hidden; }); }, - child: Text(hidden ? "Read More" : "Read less", - style: _getFontStyle().copyWith( - color: Theme.of(context).primaryColor, - fontWeight: FontWeight.w800, - fontFamily: "WorkSans")), + child: Text( + hidden ? "Read More" : "Read less", + style: _getFontStyle().copyWith( + color: Theme.of(context).primaryColor, + fontWeight: FontWeight.w800, + fontFamily: + Localizations.localeOf(context).languageCode == 'ar' + ? 'Cairo' + : 'WorkSans', + ), + ), ), ), ], diff --git a/pubspec.yaml b/pubspec.yaml index 6556e68d..2cf4bf4a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -181,9 +181,33 @@ flutter: fonts: - family: WorkSans fonts: - - asset: assets/fonts/Work_Sans/WorkSans-Regular.ttf - - asset: assets/fonts/Work_Sans/WorkSans-Bold.ttf - - asset: assets/fonts/Work_Sans/WorkSans-Bold.ttf + - asset: assets/fonts/en/WorkSans-Light/WorkSans-Light_0.eot + - asset: assets/fonts/en/WorkSans-Light/WorkSans-Light_0.otf + - asset: assets/fonts/en/WorkSans-Light/WorkSans-Light_0.ttf + - asset: assets/fonts/en/WorkSans-Light/WorkSans-Light_0.woff + weight: 300 + - asset: assets/fonts/en/WorkSans-Light/WorkSans-Regular.otf + - asset: assets/fonts/en/WorkSans-Light/WorkSans-Regular.ttf + - asset: assets/fonts/en/WorkSans-Light/WorkSans-Regular.woff + weight: 400 + - asset: assets/fonts/en/WorkSans-Bold/WorkSans-Bold.eot + - asset: assets/fonts/en/WorkSans-Bold/WorkSans-Bold.otf + - asset: assets/fonts/en/WorkSans-Bold/WorkSans-Bold.ttf + - asset: assets/fonts/en/WorkSans-Bold/WorkSans-Bold.woff + weight: 700 + + - family: Cairo + fonts: + - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.eot + - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.otf + - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.ttf + - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.woff + weight: 300 + + - asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.eot + - asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.otf + - asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.ttf + - asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.woff weight: 700 - family: DQIcons