mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-09-27 14:10:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

More compact account list rows (#1442)

Browse source
This commit is contained in:
Thomas Durand 2023-06-26 15:54:56 +02:00 committed by GitHub
parent 386b34e065
commit 69ab13297f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 498 additions and 236 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
IceCubesApp/Resources/Localization/Plurals/be.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%2$@ follower</string>
<key>other</key>
<string>%2$@ followers</string>
</dict>
</dict>
<key>timeline-new-posts %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>

16
IceCubesApp/Resources/Localization/Plurals/ca.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%2$@ follower</string>
<key>other</key>
<string>%2$@ followers</string>
</dict>
</dict>
<key>timeline-new-posts %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>

26
IceCubesApp/Resources/Localization/Plurals/de.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.detail.featured-tags-n-posts %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@accountDetailFeaturedTagsPosts@</string>
<key>accountDetailFeaturedTagsPosts</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%lld Beitrag</string>
<key>other</key>
<string>%lld Beiträge</string>
</dict>
</dict>
<key>account.detail.n-fields %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
@ -18,20 +34,20 @@
<string>%lld Felder</string>
</dict>
</dict>
<key>account.detail.featured-tags-n-posts %lld</key>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@accountDetailFeaturedTagsPosts@</string>
<key>accountDetailFeaturedTagsPosts</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%lld Beitrag</string>
<string>%2$@ follower</string>
<key>other</key>
<string>%lld Beiträge</string>
<string>%2$@ followers</string>
</dict>
</dict>
<key>timeline-new-posts %lld</key>

16
IceCubesApp/Resources/Localization/Plurals/en-GB.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%2$@ follower</string>
<key>other</key>
<string>%2$@ followers</string>
</dict>
</dict>
<key>timeline-new-posts %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>

16
IceCubesApp/Resources/Localization/Plurals/en.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%2$@ follower</string>
<key>other</key>
<string>%2$@ followers</string>
</dict>
</dict>
<key>timeline-new-posts %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>

16
IceCubesApp/Resources/Localization/Plurals/eu.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%2$@ follower</string>
<key>other</key>
<string>%2$@ followers</string>
</dict>
</dict>
<key>account.detail.n-fields %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>

16
IceCubesApp/Resources/Localization/Plurals/fr.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%2$@ abonné·e</string>
<key>other</key>
<string>%2$@ abonné·e·s</string>
</dict>
</dict>
<key>timeline-new-posts %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>

16
IceCubesApp/Resources/Localization/Plurals/it.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%2$@ follower</string>
<key>other</key>
<string>%2$@ followers</string>
</dict>
</dict>
<key>timeline-new-posts %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>

16
IceCubesApp/Resources/Localization/Plurals/ja.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%2$@ follower</string>
<key>other</key>
<string>%2$@ followers</string>
</dict>
</dict>
<key>timeline-new-posts %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>

16
IceCubesApp/Resources/Localization/Plurals/nb.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%2$@ follower</string>
<key>other</key>
<string>%2$@ followers</string>
</dict>
</dict>
<key>timeline-new-posts %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>

21
IceCubesApp/Resources/Localization/Plurals/nl.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%2$@ follower</string>
<key>other</key>
<string>%2$@ followers</string>
</dict>
</dict>
<key>timeline-new-posts %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
@ -18,7 +34,6 @@
<string>%lld nieuwe posts</string>
</dict>
</dict>
<key>notifications-others-count %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
@ -51,7 +66,6 @@
<string>hebben jou vermeld</string>
</dict>
</dict>
<key>notifications.label.follow %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
@ -68,7 +82,6 @@
<string>volgen jou</string>
</dict>
</dict>
<key>notifications.label.reblog %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
@ -85,7 +98,6 @@
<string>boostten</string>
</dict>
</dict>
<key>notifications.label.favorite %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
@ -102,6 +114,5 @@
<string>markeerden jouw bericht als favoriet</string>
</dict>
</dict>
</dict>
</plist>

17
IceCubesApp/Resources/Localization/Plurals/pl.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%2$@ follower</string>
<key>other</key>
<string>%2$@ followers</string>
</dict>
</dict>
<key>timeline-new-posts %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
@ -249,6 +265,5 @@
<string>od %lld uczestników</string>
</dict>
</dict>
</dict>
</plist>

16
IceCubesApp/Resources/Localization/Plurals/pt-BR.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%2$@ follower</string>
<key>other</key>
<string>%2$@ followers</string>
</dict>
</dict>
<key>timeline-new-posts %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>

16
IceCubesApp/Resources/Localization/Plurals/tr.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%2$@ follower</string>
<key>other</key>
<string>%2$@ followers</string>
</dict>
</dict>
<key>timeline-new-posts %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>

16
IceCubesApp/Resources/Localization/Plurals/uk.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%2$@ follower</string>
<key>other</key>
<string>%2$@ followers</string>
</dict>
</dict>
<key>timeline-new-posts %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>

16
IceCubesApp/Resources/Localization/Plurals/zh-Hans.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%2$@ follower</string>
<key>other</key>
<string>%2$@ followers</string>
</dict>
</dict>
<key>timeline-new-posts %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>

16
IceCubesApp/Resources/Localization/Plurals/zh-Hant.lproj/Localizable.stringsdict
View file

@ -2,6 +2,22 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>account.label.followers %lld %@</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>
<key>followers</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>%2$@ follower</string>
<key>other</key>
<string>%2$@ followers</string>
</dict>
</dict>
<key>timeline-new-posts %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>

4
IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings
View file

@ -287,7 +287,7 @@
"account.follow-request.reject" = "Rejeter";
"account.follow-requests.pending-requests" = "Demandes en attente";
"account.follow-requests.instructions" = "Les utilisateurs ne verront pas vos messages tant que vous ne les acceptez pas.";
"account.followers" = "Abonnés";
"account.followers" = "Abonné·e·s";
"account.following" = "Abonnements";
"account.list.create" = "Créer une nouvelle liste";
"account.list.create.confirm" = "Créer la liste";
@ -486,7 +486,7 @@
"status.summary.n-favorites %lld" = "%lld favoris";
"status.summary.edit-history" = "Edit History";
"status.visibility.direct" = "Privé";
"status.visibility.follower" = "Abonnés";
"status.visibility.follower" = "Abonné·e";
"status.visibility.public" = "Tout le monde";
"status.visibility.unlisted" = "Non répertorié";

36
Packages/Account/Sources/Account/AccountsList/AccountsListRow.swift
View file

@ -50,28 +50,18 @@ public struct AccountsListRow: View {
Text("@\(viewModel.account.acct)")
.font(.scaledFootnote)
.foregroundColor(.gray)
EmojiTextApp(viewModel.account.note, emojis: viewModel.account.emojis)
// First parameter is the number for the plural
// Second parameter is the formatted string to show
Text("account.label.followers \(viewModel.account.followersCount) \(viewModel.account.followersCount, format: .number.notation(.compactName))")
.font(.scaledFootnote)
.emojiSize(Font.scaledFootnoteFont.emojiSize)
.emojiBaselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset)
.lineLimit(3)
.environment(\.openURL, OpenURLAction { url in
routerPath.handle(url: url)
})
let fields = viewModel.account.fields.filter { $0.verifiedAt != nil }
if !fields.isEmpty {
Capsule()
.frame(height: 1)
.foregroundStyle(.regularMaterial)
.padding(.vertical, 5)
.padding(.horizontal)
ForEach(fields) { field in
HStack {
if let field = viewModel.account.fields.filter({ $0.verifiedAt != nil }).first {
HStack(spacing: 2) {
Image(systemName: "checkmark.seal")
.font(.scaledFootnote)
.foregroundColor(.green)
EmojiTextApp(field.value, emojis: viewModel.account.emojis)
.font(.scaledFootnote)
.emojiSize(Font.scaledFootnoteFont.emojiSize)
@ -80,10 +70,16 @@ public struct AccountsListRow: View {
routerPath.handle(url: url)
})
}
.padding(.top, 5)
}
}
EmojiTextApp(viewModel.account.note, emojis: viewModel.account.emojis, lineLimit: 2)
.font(.scaledCaption)
.emojiSize(Font.scaledFootnoteFont.emojiSize)
.emojiBaselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset)
.environment(\.openURL, OpenURLAction { url in
routerPath.handle(url: url)
})
if isFollowRequest {
FollowRequestButtons(account: viewModel.account,
requestUpdated: requestUpdated)