new: add support for flag emoji in proxy names

hiddify · Mar 7, 2024 · 141faa4 · 141faa4
1 parent d16d013
commit 141faa4
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 1 deletion.
diff --git a/assets/fonts/Emoji.ttf b/assets/fonts/Emoji.ttf
diff --git a/assets/fonts/emoji_source.txt b/assets/fonts/emoji_source.txt
@@ -0,0 +1 @@
+https://github.com/googlefonts/noto-emoji/
diff --git a/lib/features/profile/widget/profile_tile.dart b/lib/features/profile/widget/profile_tile.dart
@@ -391,7 +391,8 @@ class ProfileSubscriptionInfo extends HookConsumerWidget {
                 consumed: subInfo.consumption.sizeGB(),
                 total: subInfo.total.sizeGB(),
               ),
-              style: theme.textTheme.bodySmall,
+              style: theme.textTheme.bodySmall
+                  ?.copyWith(fontFamily: getEmojiFont4Desktop()),
               overflow: TextOverflow.ellipsis,
             ),
           ),

diff --git a/lib/features/proxy/widget/proxy_tile.dart b/lib/features/proxy/widget/proxy_tile.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:hiddify/gen/fonts.gen.dart';
 import 'package:hiddify/features/proxy/model/proxy_entity.dart';
 import 'package:hiddify/utils/custom_loggers.dart';
+import 'package:hiddify/utils/text_utils.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 class ProxyTile extends HookConsumerWidget with PresLogger {
@@ -24,6 +26,7 @@ class ProxyTile extends HookConsumerWidget with PresLogger {
       title: Text(
         proxy.name,
         overflow: TextOverflow.ellipsis,
+        style: TextStyle(fontFamily: getEmojiFont4Desktop()),
       ),
       leading: Padding(
         padding: const EdgeInsets.symmetric(vertical: 8),

diff --git a/lib/utils/text_utils.dart b/lib/utils/text_utils.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:hiddify/gen/fonts.gen.dart';
 import 'package:intl/intl.dart' as intl;
+import 'dart:io';
 
 extension TextAlignX on BuildContext {
   bool get isRtl => Directionality.of(this) == TextDirection.rtl;
@@ -27,3 +29,10 @@ extension TextEditingControllerX on TextEditingController {
     return text.textDirection;
   }
 }
+
+String getEmojiFont4Desktop() {
+  if (Platform.isLinux || Platform.isWindows) {
+    return FontFamily.emoji;
+  }
+  return "";
+}
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -113,6 +113,9 @@ flutter:
     - family: Shabnam
       fonts:
         - asset: assets/fonts/Shabnam.ttf
+    - family: Emoji
+      fonts:
+        - asset: assets/fonts/Emoji.ttf
 
 flutter_gen:
   output: lib/gen/