TW-824: install google fonts to fetch font from http

linagora · Oct 20, 2023 · 32211f6 · 32211f6
1 parent a1e7d9f
commit 32211f6
Show file tree

Hide file tree

Showing 52 changed files with 74 additions and 343 deletions.
diff --git a/fonts/Inter/Inter-Black.ttf → assets/google_fonts/Inter-Black.ttf b/fonts/Inter/Inter-Black.ttf → assets/google_fonts/Inter-Black.ttf
diff --git a/fonts/Inter/Inter-Bold.ttf → assets/google_fonts/Inter-Bold.ttf b/fonts/Inter/Inter-Bold.ttf → assets/google_fonts/Inter-Bold.ttf
diff --git a/fonts/Inter/Inter-ExtraBold.ttf → assets/google_fonts/Inter-ExtraBold.ttf b/fonts/Inter/Inter-ExtraBold.ttf → assets/google_fonts/Inter-ExtraBold.ttf
diff --git a/fonts/Inter/Inter-ExtraLight.ttf → assets/google_fonts/Inter-ExtraLight.ttf b/fonts/Inter/Inter-ExtraLight.ttf → assets/google_fonts/Inter-ExtraLight.ttf
diff --git a/fonts/Inter/Inter-Light.ttf → assets/google_fonts/Inter-Light.ttf b/fonts/Inter/Inter-Light.ttf → assets/google_fonts/Inter-Light.ttf
diff --git a/fonts/Inter/Inter-Medium.ttf → assets/google_fonts/Inter-Medium.ttf b/fonts/Inter/Inter-Medium.ttf → assets/google_fonts/Inter-Medium.ttf
diff --git a/fonts/Inter/Inter-Regular.ttf → assets/google_fonts/Inter-Regular.ttf b/fonts/Inter/Inter-Regular.ttf → assets/google_fonts/Inter-Regular.ttf
diff --git a/fonts/Inter/Inter-SemiBold.ttf → assets/google_fonts/Inter-SemiBold.ttf b/fonts/Inter/Inter-SemiBold.ttf → assets/google_fonts/Inter-SemiBold.ttf
diff --git a/fonts/Inter/Inter-Thin.ttf → assets/google_fonts/Inter-Thin.ttf b/fonts/Inter/Inter-Thin.ttf → assets/google_fonts/Inter-Thin.ttf
diff --git a/fonts/Roboto/LICENSE.txt b/fonts/Roboto/LICENSE.txt
diff --git a/fonts/Roboto/Roboto-Black.ttf b/fonts/Roboto/Roboto-Black.ttf
diff --git a/fonts/Roboto/Roboto-BlackItalic.ttf b/fonts/Roboto/Roboto-BlackItalic.ttf
diff --git a/fonts/Roboto/Roboto-Bold.ttf b/fonts/Roboto/Roboto-Bold.ttf
diff --git a/fonts/Roboto/Roboto-BoldItalic.ttf b/fonts/Roboto/Roboto-BoldItalic.ttf
diff --git a/fonts/Roboto/Roboto-Italic.ttf b/fonts/Roboto/Roboto-Italic.ttf
diff --git a/fonts/Roboto/Roboto-Light.ttf b/fonts/Roboto/Roboto-Light.ttf
diff --git a/fonts/Roboto/Roboto-LightItalic.ttf b/fonts/Roboto/Roboto-LightItalic.ttf
diff --git a/fonts/Roboto/Roboto-Medium.ttf b/fonts/Roboto/Roboto-Medium.ttf
diff --git a/fonts/Roboto/Roboto-MediumItalic.ttf b/fonts/Roboto/Roboto-MediumItalic.ttf
diff --git a/fonts/Roboto/Roboto-Regular.ttf b/fonts/Roboto/Roboto-Regular.ttf
diff --git a/fonts/Roboto/Roboto-Thin.ttf b/fonts/Roboto/Roboto-Thin.ttf
diff --git a/fonts/Roboto/Roboto-ThinItalic.ttf b/fonts/Roboto/Roboto-ThinItalic.ttf
diff --git a/fonts/Roboto/RobotoMono-Regular.ttf b/fonts/Roboto/RobotoMono-Regular.ttf
diff --git a/lib/config/themes.dart b/lib/config/themes.dart
@@ -1,12 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:go_router/go_router.dart';
+import 'package:google_fonts/google_fonts.dart';
 import 'package:linagora_design_flutter/colors/linagora_ref_colors.dart';
 import 'package:linagora_design_flutter/colors/linagora_sys_colors.dart';
 
 import 'app_config.dart';
 
-abstract class FluffyThemes {
+abstract class TwakeThemes {
   static const double columnWidth = 360.0;
   static const double iconSize = 24.0;
 
@@ -18,58 +19,53 @@ abstract class FluffyThemes {
   static bool getDisplayNavigationRail(BuildContext context) =>
       !(GoRouterState.of(context).path?.startsWith('/settings') == true);
 
-  static const fallbackTextStyle = TextStyle(
-    fontFamily: 'Inter',
-    fontFamilyFallback: ['Inter'],
-  );
-
   static var fallbackTextTheme = TextTheme(
-    bodyLarge: fallbackTextStyle.copyWith(
+    bodyLarge: GoogleFonts.inter(
       fontWeight: FontWeight.w500,
       letterSpacing: -0.15,
     ),
-    bodyMedium: fallbackTextStyle.copyWith(
+    bodyMedium: GoogleFonts.inter(
       fontWeight: FontWeight.w500,
       letterSpacing: 0.25,
     ),
-    bodySmall: fallbackTextStyle.copyWith(
+    bodySmall: GoogleFonts.inter(
       fontWeight: FontWeight.w500,
       letterSpacing: 0.4,
     ),
-    labelLarge: fallbackTextStyle.copyWith(
+    labelLarge: GoogleFonts.inter(
       fontWeight: FontWeight.w500,
       letterSpacing: 0.1,
     ),
-    labelSmall: fallbackTextStyle.copyWith(
+    labelSmall: GoogleFonts.inter(
       fontWeight: FontWeight.w500,
       letterSpacing: 0.5,
     ),
-    displayLarge: fallbackTextStyle.copyWith(
+    displayLarge: GoogleFonts.inter(
       fontWeight: FontWeight.w700,
     ),
-    displayMedium: fallbackTextStyle.copyWith(
+    displayMedium: GoogleFonts.inter(
       fontWeight: FontWeight.w600,
       letterSpacing: 0.4,
     ),
-    displaySmall: fallbackTextStyle.copyWith(
+    displaySmall: GoogleFonts.inter(
       fontWeight: FontWeight.w600,
       letterSpacing: 0.4,
     ),
-    headlineMedium: fallbackTextStyle.copyWith(
+    headlineMedium: GoogleFonts.inter(
       fontWeight: FontWeight.w600,
     ),
-    headlineSmall: fallbackTextStyle.copyWith(
+    headlineSmall: GoogleFonts.inter(
       fontWeight: FontWeight.w600,
       letterSpacing: 0.4,
     ),
-    titleLarge: fallbackTextStyle.copyWith(
+    titleLarge: GoogleFonts.inter(
       fontWeight: FontWeight.w600,
     ),
-    titleMedium: fallbackTextStyle.copyWith(
+    titleMedium: GoogleFonts.inter(
       fontWeight: FontWeight.w500,
       letterSpacing: 0.15,
     ),
-    titleSmall: fallbackTextStyle.copyWith(
+    titleSmall: GoogleFonts.inter(
       fontWeight: FontWeight.w500,
       letterSpacing: 0.1,
     ),

diff --git a/lib/pages/bootstrap/bootstrap_dialog.dart b/lib/pages/bootstrap/bootstrap_dialog.dart
@@ -8,6 +8,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
+import 'package:google_fonts/google_fonts.dart';
 import 'package:matrix/encryption.dart';
 import 'package:matrix/encryption/utils/bootstrap.dart';
 import 'package:matrix/matrix.dart';
@@ -117,7 +118,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
         body: Center(
           child: ConstrainedBox(
             constraints:
-                const BoxConstraints(maxWidth: FluffyThemes.columnWidth * 1.5),
+                const BoxConstraints(maxWidth: TwakeThemes.columnWidth * 1.5),
             child: ListView(
               padding: const EdgeInsets.all(16.0),
               children: [
@@ -140,7 +141,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
                   minLines: 2,
                   maxLines: 4,
                   readOnly: true,
-                  style: const TextStyle(fontFamily: 'RobotoMono'),
+                  style: GoogleFonts.robotoMono(),
                   controller: TextEditingController(text: key),
                   decoration: const InputDecoration(
                     contentPadding: EdgeInsets.all(16),
@@ -244,7 +245,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
             body: Center(
               child: ConstrainedBox(
                 constraints: const BoxConstraints(
-                  maxWidth: FluffyThemes.columnWidth * 1.5,
+                  maxWidth: TwakeThemes.columnWidth * 1.5,
                 ),
                 child: ListView(
                   padding: const EdgeInsets.all(16.0),
@@ -270,7 +271,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
                           ? null
                           : [AutofillHints.password],
                       controller: _recoveryKeyTextEditingController,
-                      style: const TextStyle(fontFamily: 'RobotoMono'),
+                      style: GoogleFonts.robotoMono(),
                       decoration: InputDecoration(
                         contentPadding: const EdgeInsets.all(16),
                         hintStyle: TextStyle(

diff --git a/lib/pages/chat/chat_emoji_picker.dart b/lib/pages/chat/chat_emoji_picker.dart
@@ -13,8 +13,8 @@ class ChatEmojiPicker extends StatelessWidget {
       valueListenable: controller.showEmojiPickerNotifier,
       builder: (context, showEmojiPicker, _) {
         return AnimatedContainer(
-          duration: FluffyThemes.animationDuration,
-          curve: FluffyThemes.animationCurve,
+          duration: TwakeThemes.animationDuration,
+          curve: TwakeThemes.animationCurve,
           width: MediaQuery.of(context).size.width,
           height: showEmojiPicker ? MediaQuery.of(context).size.height / 3 : 0,
           child: showEmojiPicker

diff --git a/lib/pages/chat/chat_event_list.dart b/lib/pages/chat/chat_event_list.dart
@@ -24,7 +24,7 @@ class ChatEventList extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final horizontalPadding = FluffyThemes.isColumnMode(context) ? 8.0 : 0.0;
+    final horizontalPadding = TwakeThemes.isColumnMode(context) ? 8.0 : 0.0;
 
     // create a map of eventId --> index to greatly improve performance of
     // ListView's findChildIndexCallback

diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
@@ -131,7 +131,7 @@ class ChatView extends StatelessWidget with MessageContentMixin {
       return const SizedBox.shrink();
     }
 
-    final bottomSheetPadding = FluffyThemes.isColumnMode(context) ? 16.0 : 8.0;
+    final bottomSheetPadding = TwakeThemes.isColumnMode(context) ? 16.0 : 8.0;
 
     return GestureDetector(
       onTapDown: controller.setReadMarker,
@@ -273,7 +273,7 @@ class ChatView extends StatelessWidget with MessageContentMixin {
                               controller.room!.membership == Membership.join)
                             Container(
                               constraints: const BoxConstraints(
-                                maxWidth: FluffyThemes.columnWidth * 2.5,
+                                maxWidth: TwakeThemes.columnWidth * 2.5,
                               ),
                               alignment: Alignment.center,
                               child: controller.room?.isAbandonedDMRoom == true

diff --git a/lib/pages/chat/events/message/message.dart b/lib/pages/chat/events/message/message.dart
@@ -653,7 +653,7 @@ class Message extends StatelessWidget {
           ? LinagoraSysColors.material().secondaryContainer
           : Theme.of(context).primaryColor.withAlpha(0),
       constraints:
-          const BoxConstraints(maxWidth: FluffyThemes.columnWidth * 2.5),
+          const BoxConstraints(maxWidth: TwakeThemes.columnWidth * 2.5),
       child: Row(
         mainAxisSize: MainAxisSize.max,
         children: [

diff --git a/lib/pages/chat/reactions_picker.dart b/lib/pages/chat/reactions_picker.dart
@@ -21,8 +21,8 @@ class ReactionsPicker extends StatelessWidget {
         controller.room!.canSendDefaultMessages &&
         controller.selectedEvents.isNotEmpty;
     return AnimatedContainer(
-      duration: FluffyThemes.animationDuration,
-      curve: FluffyThemes.animationCurve,
+      duration: TwakeThemes.animationDuration,
+      curve: TwakeThemes.animationCurve,
       height: (display) ? 56 : 0,
       child: Material(
         color: Colors.transparent,