new: add support for flag emoji in proxy names

This commit is contained in:
Hiddify
2024-03-08 00:20:48 +01:00
parent d16d013305
commit 141faa4d6c
6 changed files with 18 additions and 1 deletions

BIN
assets/fonts/Emoji.ttf Normal file

Binary file not shown.

View File

@@ -0,0 +1 @@
https://github.com/googlefonts/noto-emoji/

View File

@@ -391,7 +391,8 @@ class ProfileSubscriptionInfo extends HookConsumerWidget {
consumed: subInfo.consumption.sizeGB(), consumed: subInfo.consumption.sizeGB(),
total: subInfo.total.sizeGB(), total: subInfo.total.sizeGB(),
), ),
style: theme.textTheme.bodySmall, style: theme.textTheme.bodySmall
?.copyWith(fontFamily: getEmojiFont4Desktop()),
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
), ),

View File

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

View File

@@ -1,5 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hiddify/gen/fonts.gen.dart';
import 'package:intl/intl.dart' as intl; import 'package:intl/intl.dart' as intl;
import 'dart:io';
extension TextAlignX on BuildContext { extension TextAlignX on BuildContext {
bool get isRtl => Directionality.of(this) == TextDirection.rtl; bool get isRtl => Directionality.of(this) == TextDirection.rtl;
@@ -27,3 +29,10 @@ extension TextEditingControllerX on TextEditingController {
return text.textDirection; return text.textDirection;
} }
} }
String getEmojiFont4Desktop() {
if (Platform.isLinux || Platform.isWindows) {
return FontFamily.emoji;
}
return "";
}

View File

@@ -113,6 +113,9 @@ flutter:
- family: Shabnam - family: Shabnam
fonts: fonts:
- asset: assets/fonts/Shabnam.ttf - asset: assets/fonts/Shabnam.ttf
- family: Emoji
fonts:
- asset: assets/fonts/Emoji.ttf
flutter_gen: flutter_gen:
output: lib/gen/ output: lib/gen/