Merge branch 'main' of gitlab.com:famedly/fluffychat into main

lib/config/themes.dart

@@ -12,7 +12,7 @@ abstract class FluffyThemes {
       MediaQuery.of(context).size.width > columnWidth * 2;
 
   static const fallbackTextStyle =
-      TextStyle(fontFamily: 'NotoSans', fontFamilyFallback: ['NotoEmoji']);
+      TextStyle(fontFamily: 'Roboto', fontFamilyFallback: ['NotoEmoji']);
 
   static var fallback_text_theme = PlatformInfos.isDesktop
       ? TextTheme(

pubspec.yaml

@@ -95,19 +95,16 @@ flutter:
     - assets/js/package/
 
   fonts:
+    - family: Roboto
+      fonts:
+        - asset: fonts/Roboto/Roboto-Regular.ttf
+        - asset: fonts/Roboto/Roboto-Italic.ttf
+          style: italic
+        - asset: fonts/Roboto/Roboto-Bold.ttf
+          weight: 700
     - family: NotoEmoji
       fonts:
         - asset: fonts/NotoEmoji/NotoColorEmoji.ttf
-    - family: NotoSans
-      fonts:
-        - asset: fonts/NotoSans/NotoSans-Regular.ttf
-        - asset: fonts/NotoSans/NotoSans-Italic.ttf
-          style: italic
-        - asset: fonts/NotoSans/NotoSans-Bold.ttf
-          weight: 700
-        - asset: fonts/NotoSans/NotoSans-BoldItalic.ttf
-          weight: 700
-          style: italic
 
 dependency_overrides:
   geolocator_android: