mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-09-28 22:41:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bigger font for focused status

Browse source
This commit is contained in:
Thomas Ricouard 2023-03-09 20:27:03 +01:00
parent 93d9ded447
commit b9793057e0
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Packages/DesignSystem/Sources/DesignSystem/Font.swift
View file

@ -49,6 +49,14 @@ public extension Font {
customUIFont(size: userScaledFontSize(baseSize: headline)) customUIFont(size: userScaledFontSize(baseSize: headline))
} }
static var scaledBodyFocused: Font {
customFont(size: userScaledFontSize(baseSize: body + 2), relativeTo: .body)
}
static var scaledBodyFocusedFont: UIFont {
customUIFont(size: userScaledFontSize(baseSize: body + 2))
}
static var scaledBody: Font { static var scaledBody: Font {
customFont(size: userScaledFontSize(baseSize: body), relativeTo: .body) customFont(size: userScaledFontSize(baseSize: body), relativeTo: .body)
} }

2
Packages/Status/Sources/Status/Detail/StatusDetailView.swift
View file

@ -140,7 +140,7 @@ public struct StatusDetailView: View {
StatusRowView(viewModel: { .init(status: status, StatusRowView(viewModel: { .init(status: status,
client: client, client: client,
routerPath: routerPath, routerPath: routerPath,
isFocused: !viewModel.isLoadingContext) }) isFocused: true) })
.overlay { .overlay {
GeometryReader { reader in GeometryReader { reader in
VStack {} VStack {}

6
Packages/Status/Sources/Status/Row/Subviews/StatusRowTextView.swift
View file

@ -15,10 +15,10 @@ struct StatusRowTextView: View {
emojis: viewModel.finalStatus.emojis, emojis: viewModel.finalStatus.emojis,
language: viewModel.finalStatus.language, language: viewModel.finalStatus.language,
lineLimit: viewModel.lineLimit) lineLimit: viewModel.lineLimit)
.font(.scaledBody) .font(viewModel.isFocused ? .scaledBodyFocused : .scaledBody)
.foregroundColor(viewModel.textDisabled ? .gray : theme.labelColor) .foregroundColor(viewModel.textDisabled ? .gray : theme.labelColor)
.emojiSize(Font.scaledBodyFont.emojiSize) .emojiSize(viewModel.isFocused ? Font.scaledBodyFocusedFont.emojiSize : Font.scaledBodyFont.emojiSize)
.emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) .emojiBaselineOffset(viewModel.isFocused ? Font.scaledBodyFocusedFont.emojiBaselineOffset : Font.scaledBodyFont.emojiBaselineOffset)
.environment(\.openURL, OpenURLAction { url in .environment(\.openURL, OpenURLAction { url in
viewModel.routerPath.handleStatus(status: viewModel.finalStatus, url: url) viewModel.routerPath.handleStatus(status: viewModel.finalStatus, url: url)
}) })