From 28e5a8fa90a3ab47cebaaeb02dfd7531ed067ea5 Mon Sep 17 00:00:00 2001 From: Marcus Kida Date: Mon, 6 Feb 2023 11:58:23 +0100 Subject: [PATCH] chore(Widget): Make font dynamic sizeable --- .../FollowersCount/FollowersCountWidgetView.swift | 10 +++++----- .../LatestFollowers/LatestFollowersWidgetView.swift | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/WidgetExtension/Variants/FollowersCount/FollowersCountWidgetView.swift b/WidgetExtension/Variants/FollowersCount/FollowersCountWidgetView.swift index 41648805d..ad35a48c4 100644 --- a/WidgetExtension/Variants/FollowersCount/FollowersCountWidgetView.swift +++ b/WidgetExtension/Variants/FollowersCount/FollowersCountWidgetView.swift @@ -52,7 +52,7 @@ struct FollowersCountWidgetView: View { .truncationMode(.tail) Text(account.displayNameWithFallback) - .font(.system(size: 13)) + .font(.system(size: UIFontMetrics.default.scaledValue(for: 13))) .lineLimit(1) .truncationMode(.tail) @@ -108,7 +108,7 @@ struct FollowersCountWidgetView: View { Spacer() if let increaseCount = followersHistory.increaseCountString(for: account) { Text("\(increaseCount) followers today") - .font(.system(size: 12)) + .font(.system(size: UIFontMetrics.default.scaledValue(for: 12))) .foregroundColor(.secondary) .lineLimit(1) .truncationMode(.tail) @@ -135,12 +135,12 @@ struct FollowersCountWidgetView: View { HStack(alignment: .center) { Image("BrandIcon") Text("FOLLOWERS") - .font(.system(size: 15, weight: .semibold)) + .font(.system(size: UIFontMetrics.default.scaledValue(for: 15), weight: .semibold)) } .padding(.top, 6) Text(account.followersCount.asAbbreviatedCountString()) - .font(.system(size: 43)) + .font(.system(size: UIFontMetrics.default.scaledValue(for: 43))) .lineLimit(1) .truncationMode(.tail) } @@ -157,7 +157,7 @@ struct FollowersCountWidgetView: View { Image("BrandIcon") Text(account.followersCount.asAbbreviatedCountString()) - .font(.system(size: 15)) + .font(.system(size: UIFontMetrics.default.scaledValue(for: 15))) .lineLimit(1) .truncationMode(.tail) } diff --git a/WidgetExtension/Variants/LatestFollowers/LatestFollowersWidgetView.swift b/WidgetExtension/Variants/LatestFollowers/LatestFollowersWidgetView.swift index 929f2a483..839422bdb 100644 --- a/WidgetExtension/Variants/LatestFollowers/LatestFollowersWidgetView.swift +++ b/WidgetExtension/Variants/LatestFollowers/LatestFollowersWidgetView.swift @@ -109,7 +109,7 @@ struct LatestFollowersWidgetView: View { .truncationMode(.tail) } - Text(account.noteWithoutHtmlTags!) + Text(account.noteWithoutHtmlTags ?? "") .font(.caption) .lineLimit(1) .truncationMode(.tail)