From f8f42d72a9924e73efe3c768960b43016e90105a Mon Sep 17 00:00:00 2001 From: yekta Date: Tue, 5 Mar 2024 20:57:22 +0300 Subject: [PATCH] Font weight --- ios/Flutter/Flutter.podspec | 18 ----------- lib/ui/accounts/accounts_sheet.dart | 1 + lib/ui/home_page.dart | 1 + lib/ui/receive/share_card.dart | 47 +++++++++++++++-------------- pubspec.yaml | 1 + 5 files changed, 28 insertions(+), 40 deletions(-) delete mode 100644 ios/Flutter/Flutter.podspec diff --git a/ios/Flutter/Flutter.podspec b/ios/Flutter/Flutter.podspec deleted file mode 100644 index 8ce4394..0000000 --- a/ios/Flutter/Flutter.podspec +++ /dev/null @@ -1,18 +0,0 @@ -# -# NOTE: This podspec is NOT to be published. It is only used as a local source! -# This is a generated file; do not edit or check into version control. -# - -Pod::Spec.new do |s| - s.name = 'Flutter' - s.version = '1.0.0' - s.summary = 'A UI toolkit for beautiful and fast apps.' - s.homepage = 'https://flutter.dev' - s.license = { :type => 'BSD' } - s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } - s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s } - s.ios.deployment_target = '11.0' - # Framework linking is handled by Flutter tooling, not CocoaPods. - # Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs. - s.vendored_frameworks = 'path/to/nothing' -end diff --git a/lib/ui/accounts/accounts_sheet.dart b/lib/ui/accounts/accounts_sheet.dart index bfba981..0e55fbd 100644 --- a/lib/ui/accounts/accounts_sheet.dart +++ b/lib/ui/accounts/accounts_sheet.dart @@ -599,6 +599,7 @@ class _AppAccountsWidgetState extends State { text: account.balance != null ? "" : "", style: TextStyle( fontFamily: 'AppIcons', + fontWeight: FontWeight.w400, color: StateContainer.of(context).curTheme.text, fontSize: 13.0, ), diff --git a/lib/ui/home_page.dart b/lib/ui/home_page.dart index 8024569..3ae8a73 100644 --- a/lib/ui/home_page.dart +++ b/lib/ui/home_page.dart @@ -1697,6 +1697,7 @@ class _AppHomePageState extends State text: "\u{e80a}", style: TextStyle( fontFamily: 'AppIcons', + fontWeight: FontWeight.w400, color: StateContainer.of(context).curTheme.primary, fontSize: 23.0, diff --git a/lib/ui/receive/share_card.dart b/lib/ui/receive/share_card.dart index b1d433c..5b20072 100644 --- a/lib/ui/receive/share_card.dart +++ b/lib/ui/receive/share_card.dart @@ -1,7 +1,6 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:kalium_wallet_flutter/app_icons.dart'; import 'package:kalium_wallet_flutter/appstate_container.dart'; import 'package:kalium_wallet_flutter/ui/widgets/auto_resize_text.dart'; import 'package:qr_flutter/qr_flutter.dart'; @@ -83,29 +82,33 @@ class _AppShareCardState extends State { // Logo Container( width: 97, - child: Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - // Currency Icon - Container( - margin: EdgeInsets.only(right: 5.5, bottom: 1.5), - child: Icon( - AppIcons.bananologo, - size: 24, - color: StateContainer.of(context).curTheme.primary, + child: RichText( + maxLines: 1, + text: TextSpan( + children: [ + // Currency Icon + TextSpan( + text: "\u{e801} ", + style: TextStyle( + color: + StateContainer.of(context).curTheme.primary, + fontFamily: "AppIcons", + fontWeight: FontWeight.w400, + fontSize: 14.8, + ), ), - ), - Text( - "BANANO", - style: TextStyle( - fontFamily: 'NeueHansKendrick', - color: StateContainer.of(context).curTheme.primary, - fontWeight: FontWeight.w500, - fontSize: 14.8, + TextSpan( + text: "BANANO", + style: TextStyle( + fontFamily: 'NeueHansKendrick', + color: + StateContainer.of(context).curTheme.primary, + fontWeight: FontWeight.w500, + fontSize: 14.8, + ), ), - ), - ], + ], + ), ), ), // Address diff --git a/pubspec.yaml b/pubspec.yaml index ca3e6b8..ba9252b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -178,6 +178,7 @@ flutter: - family: AppIcons fonts: - asset: fonts/AppIcons.ttf + weight: 400 - family: NeueHansKendrick fonts: - asset: fonts/NeueHansKendrick-Medium.ttf