lib/theme.dart

@@ -38,18 +38,9 @@ abstract class SolianTheme {
         brightness: brightness,
         seedColor: seedColor ?? const Color.fromRGBO(154, 98, 91, 1),
       ),
-      fontFamily: 'Comfortaa',
+      fontFamily: 'Quicksand',
-      fontFamilyFallback: const [
+      fontFamilyFallback: const ['NotoSansSC', 'NotoSansHK'],
-        'NotoSansSC',
+      typography: Typography.material2021(),
-        'NotoSansHK',
-        'NotoSansJP',
-        'NotoSansEmoji'
-      ],
-      typography: Typography.material2021(
-        colorScheme: brightness == Brightness.light
-            ? const ColorScheme.light()
-            : const ColorScheme.dark(),
-      ),
     );
   }
 }

lib/widgets/attachments/attachment_list_fullscreen.dart

@@ -45,14 +45,6 @@ class _AttachmentListFullScreenState extends State<AttachmentListFullScreen> {
     return '${(bytes / math.pow(k, i)).toStringAsFixed(dm)} ${sizes[i]}';
   }
 
-  double _getRatio() {
-    final value = widget.attachment.metadata?['ratio'];
-    if (value == null) return 1;
-    if (value is int) return value.toDouble();
-    if (value is double) return value;
-    return 1;
-  }
-
   @override
   void initState() {
     super.initState();
@@ -172,7 +164,7 @@ class _AttachmentListFullScreenState extends State<AttachmentListFullScreen> {
                             ),
                           if (widget.attachment.metadata?['ratio'] != null)
                             Text(
-                              '${_getRatio().toPrecision(2)}',
+                              '${(widget.attachment.metadata?['ratio'] as double).toPrecision(2)}',
                               style: TextStyle(
                                 fontSize: 12,
                                 color: _unFocusColor,

pubspec.yaml

@@ -81,29 +81,15 @@ flutter:
     - assets/logo.png
 
   fonts:
-    - family: NotoSansEmoji
-      fonts:
-        - asset: assets/fonts/NotoColorEmoji-Regular.ttf
     - family: NotoSansSC
       fonts:
-        - asset: assets/fonts/NotoSansSC-Regular.ttf
+        - asset: assets/fonts/NotoSansSC-VariableFont_wght.ttf
-        - asset: assets/fonts/NotoSansSC-Bold.ttf
-          weight: 700
     - family: NotoSansHK
       fonts:
-        - asset: assets/fonts/NotoSansHK-Regular.ttf
+        - asset: assets/fonts/NotoSansHK-VariableFont_wght.ttf
-        - asset: assets/fonts/NotoSansHK-Bold.ttf
+    - family: Quicksand
-          weight: 700
-    - family: NotoSansJP
       fonts:
-        - asset: assets/fonts/NotoSansJP-Regular.ttf
+        - asset: assets/fonts/Quicksand-VariableFont_wght.ttf
-        - asset: assets/fonts/NotoSansJP-Bold.ttf
-          weight: 700
-    - family: Comfortaa
-      fonts:
-        - asset: assets/fonts/Comfortaa-Regular.ttf
-        - asset: assets/fonts/Comfortaa-Bold.ttf
-          weight: 700
 
 flutter_launcher_icons:
   android:

web/index.html

@@ -15,8 +15,7 @@
     This is a placeholder for base href that will be replaced by the value of
     the `--base-href` argument provided to `flutter build`.
   -->
-  <!-- <base href="$FLUTTER_BASE_HREF"> -->
+  <base href="$FLUTTER_BASE_HREF">
-  <base href="/" />
 
   <meta charset="UTF-8">
   <meta content="IE=Edge" http-equiv="X-UA-Compatible">