Merge branch 'font' into 'master'

add font

See merge request Cloud_Solution/diplomatic-quarter!77

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,

lib/widgets/data_display/text.dart

@@ -257,11 +257,17 @@ class _TextsState extends State<Texts> {
                   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',
+                ),
+              ),
             ),
           ),
       ],

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