From 88d37f3767798b167fc25cbd4a8a4cdde31fb57b Mon Sep 17 00:00:00 2001
From: Julian KOUNE <jkoune@linagora.com>
Date: Tue, 17 Oct 2023 16:14:02 +0200
Subject: [PATCH] fixup! TW-824: install google fonts to fetch font from http

---
 lib/config/themes.dart                        | 26 ++++++-----
 .../twake_fab/twake_fab_style.dart            | 43 -------------------
 2 files changed, 12 insertions(+), 57 deletions(-)
 delete mode 100644 lib/widgets/twake_components/twake_fab/twake_fab_style.dart

diff --git a/lib/config/themes.dart b/lib/config/themes.dart
index a290864147..575df8112e 100644
--- a/lib/config/themes.dart
+++ b/lib/config/themes.dart
@@ -20,19 +20,19 @@ abstract class TwakeThemes {
       !(GoRouterState.of(context).path?.startsWith('/settings') == true);
 
   static var fallbackTextTheme = TextTheme(
-    bodyLarge: GoogleFonts.inter().copyWith(
+    bodyLarge: GoogleFonts.inter(
       fontWeight: FontWeight.w500,
       letterSpacing: -0.15,
     ),
-    bodyMedium: GoogleFonts.inter().copyWith(
+    bodyMedium: GoogleFonts.inter(
       fontWeight: FontWeight.w500,
       letterSpacing: 0.25,
     ),
-    bodySmall: GoogleFonts.inter().copyWith(
+    bodySmall: GoogleFonts.inter(
       fontWeight: FontWeight.w500,
       letterSpacing: 0.4,
     ),
-    labelLarge: GoogleFonts.inter().copyWith(
+    labelLarge: GoogleFonts.inter(
       fontWeight: FontWeight.w500,
       letterSpacing: 0.1,
     ),
@@ -40,32 +40,30 @@ abstract class TwakeThemes {
       fontWeight: FontWeight.w500,
       letterSpacing: 0.5,
     ),
-    displayLarge: GoogleFonts.inter().copyWith(
+    displayLarge: GoogleFonts.inter(
       fontWeight: FontWeight.w700,
     ),
-    displayMedium: GoogleFonts.inter().copyWith(
+    displayMedium: GoogleFonts.inter(
       fontWeight: FontWeight.w600,
       letterSpacing: 0.4,
     ),
-    displaySmall: GoogleFonts.inter().copyWith(
+    displaySmall: GoogleFonts.inter(
       fontWeight: FontWeight.w600,
       letterSpacing: 0.4,
     ),
-    headlineMedium: GoogleFonts.inter().copyWith(
-      fontWeight: FontWeight.w600,
-    ),
-    headlineSmall: GoogleFonts.inter().copyWith(
+    headlineMedium: GoogleFonts.inter(fontWeight: FontWeight.w600),
+    headlineSmall: GoogleFonts.inter(
       fontWeight: FontWeight.w600,
       letterSpacing: 0.4,
     ),
-    titleLarge: GoogleFonts.inter().copyWith(
+    titleLarge: GoogleFonts.inter(
       fontWeight: FontWeight.w600,
     ),
-    titleMedium: GoogleFonts.inter().copyWith(
+    titleMedium: GoogleFonts.inter(
       fontWeight: FontWeight.w500,
       letterSpacing: 0.15,
     ),
-    titleSmall: GoogleFonts.inter().copyWith(
+    titleSmall: GoogleFonts.inter(
       fontWeight: FontWeight.w500,
       letterSpacing: 0.1,
     ),
diff --git a/lib/widgets/twake_components/twake_fab/twake_fab_style.dart b/lib/widgets/twake_components/twake_fab/twake_fab_style.dart
deleted file mode 100644
index fa28c47809..0000000000
--- a/lib/widgets/twake_components/twake_fab/twake_fab_style.dart
+++ /dev/null
@@ -1,43 +0,0 @@
-import 'package:flutter/material.dart';
-
-class TwakeFabStyle {
-  static const double defaultSize = 28;
-  static const Color defaultPrimaryColor = Color(0xFF99A2AD);
-
-  static const double notificationBubbleWidth = 25;
-  static const double notificationBubbleHeight = 20;
-  static const Color notificationBubbleBackgroundColor = Color(0xffff3347);
-  static const BorderRadiusGeometry notificationBubbleBorderRadius =
-      BorderRadius.all(Radius.circular(12));
-  static const Color notificationBubbleBorderColorLightTheme = Colors.white;
-  static const Color notificationBubbleBorderColorDarkTheme =
-      Color.fromARGB(239, 36, 36, 36);
-  static BoxBorder notificationBubbleBorder(BuildContext context) {
-    return Border.all(
-      color: Theme.of(context).brightness == Brightness.light
-          ? notificationBubbleBorderColorLightTheme
-          : notificationBubbleBorderColorDarkTheme,
-      width: 1,
-    );
-  }
-
-  static const TextStyle notificationBubbleTextStyle = TextStyle(
-    fontFamily: 'Inter',
-    color: Colors.white,
-    fontSize: 10,
-    fontWeight: FontWeight.w500,
-    letterSpacing: 0.3,
-  );
-
-  static TextStyle buttonTextStyle(BuildContext context, bool isSelected) {
-    return TextStyle(
-      fontFamily: 'Inter',
-      color: isSelected
-          ? Theme.of(context).colorScheme.primary
-          : TwakeFabStyle.defaultPrimaryColor,
-      fontSize: 10,
-      fontWeight: FontWeight.w500,
-      letterSpacing: 0.3,
-    );
-  }
-}