mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2025-06-05 21:38:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' of https://github.com/Dimillian/IceCubesApp

Browse source
This commit is contained in:
Thomas Ricouard 2023-02-23 07:23:22 +01:00
commit ead649125e
26 changed files with 188 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
IceCubesApp/App/Tabs/Settings/SettingsTab.swift
View file

@ -41,8 +41,10 @@ struct SettingsTabs: View {
.toolbar { .toolbar {
if UIDevice.current.userInterfaceIdiom == .phone { if UIDevice.current.userInterfaceIdiom == .phone {
ToolbarItem { ToolbarItem {
Button("action.done") { Button {
dismiss() dismiss()
} label: {
Text("action.done").bold()
} }
} }
} }

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

@ -181,7 +181,7 @@
<key>design.tag.n-posts-from-n-participants %lld %lld</key> <key>design.tag.n-posts-from-n-participants %lld %lld</key>
<dict> <dict>
<key>NSStringLocalizedFormatKey</key> <key>NSStringLocalizedFormatKey</key>
<string>%#@tagParticipantsCount@ %#@tagPostsCount@</string> <string>%2$#@tagParticipantsCount@ %1$#@tagPostsCount@</string>
<key>tagParticipantsCount</key> <key>tagParticipantsCount</key>
<dict> <dict>
<key>NSStringFormatSpecTypeKey</key> <key>NSStringFormatSpecTypeKey</key>
@ -208,7 +208,7 @@
<key>timeline.n-recent-from-n-participants %lld %lld</key> <key>timeline.n-recent-from-n-participants %lld %lld</key>
<dict> <dict>
<key>NSStringLocalizedFormatKey</key> <key>NSStringLocalizedFormatKey</key>
<string>%#@tagParticipantsCount@ %#@tagPostsCount@</string> <string>%2$#@tagParticipantsCount@ %1$#@tagPostsCount@</string>
<key>tagParticipantsCount</key> <key>tagParticipantsCount</key>
<dict> <dict>
<key>NSStringFormatSpecTypeKey</key> <key>NSStringFormatSpecTypeKey</key>
@ -232,5 +232,32 @@
<string>%lld bidalketa</string> <string>%lld bidalketa</string>
</dict> </dict>
</dict> </dict>
<key>status.poll.n-votes-voters %lld %lld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%2$#@tagVotersCount@ %1$#@tagVotesCount@</string>
<key>tagVotesCount</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>boto %lld</string>
<key>other</key>
<string>%lld boto</string>
</dict>
<key>tagVotersCount</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>lld</string>
<key>one</key>
<string>Boto-emaile baten</string>
<key>other</key>
<string>%lld boto-emaileren</string>
</dict>
</dict>
</dict> </dict>
</plist> </plist>

23
IceCubesApp/Resources/Localization/eu.lproj/Localizable.strings
View file

@ -37,7 +37,7 @@
"enum.status-actions-display.only-buttons" = "Botoiak bakarrik"; "enum.status-actions-display.only-buttons" = "Botoiak bakarrik";
"enum.status-display-style.compact" = "Trinkoa"; "enum.status-display-style.compact" = "Trinkoa";
"enum.status-display-style.large" = "Handia"; "enum.status-display-style.large" = "Handia";
"enum.status-display-style.medium" = "Medium"; "enum.status-display-style.medium" = "Ertaina";
"enum.swipeactions.icon-with-text" = "Ikonoa eta testua"; "enum.swipeactions.icon-with-text" = "Ikonoa eta testua";
"enum.swipeactions.icon-only" = "Ikonoa soilik"; "enum.swipeactions.icon-only" = "Ikonoa soilik";
@ -72,8 +72,8 @@
"settings.app.support" = "Eman babesa aplikazioari"; "settings.app.support" = "Eman babesa aplikazioari";
"settings.app.about" = "Aplikazio honi buruz"; "settings.app.about" = "Aplikazio honi buruz";
"settings.display.example-toot" = "Adibidea"; "settings.display.example-toot" = "Adibidea";
"settings.display.avatar.position" = "Avatarearen kokapena"; "settings.display.avatar.position" = "Abatarraren kokapena";
"settings.display.avatar.shape" = "Avatarearen itxura"; "settings.display.avatar.shape" = "Abatarraren itxura";
"settings.display.full-username" = "Erakutsi erabiltzaile izen osoa"; "settings.display.full-username" = "Erakutsi erabiltzaile izen osoa";
"settings.display.navigation-title" = "Pantaila ezarpenak"; "settings.display.navigation-title" = "Pantaila ezarpenak";
"settings.display.restore" = "Berrezarri defektuzkoa"; "settings.display.restore" = "Berrezarri defektuzkoa";
@ -133,7 +133,7 @@
"settings.content.navigation-title" = "Edukiaren ezarpenak"; "settings.content.navigation-title" = "Edukiaren ezarpenak";
"settings.content.boosts" = "Bultzadak"; "settings.content.boosts" = "Bultzadak";
"settings.content.hide-repeated-boosts" = "Ezkutatu errepikatutako bultzadak"; "settings.content.hide-repeated-boosts" = "Ezkutatu errepikatutako bultzadak";
"settings.content.instance-settings" = "Zerbitzariko edukiari buruzko ezarpenak"; "settings.content.instance-settings" = "Edukiari buruzko ezarpenak";
"settings.content.use-instance-settings" = "Erabili zerbitzariko ezarpenak"; "settings.content.use-instance-settings" = "Erabili zerbitzariko ezarpenak";
"settings.content.expand-spoilers" = "Erakutsi beti eduki hunkigarria"; "settings.content.expand-spoilers" = "Erakutsi beti eduki hunkigarria";
"settings.content.expand-media" = "Multimedia erakusteko hobespenak"; "settings.content.expand-media" = "Multimedia erakusteko hobespenak";
@ -168,20 +168,20 @@
"settings.general.swipeactions" = "Mugimenduen ekintzak"; "settings.general.swipeactions" = "Mugimenduen ekintzak";
"settings.swipeactions.navigation-title" = "Atzamar-mugimenduen ekintzak"; "settings.swipeactions.navigation-title" = "Atzamar-mugimenduen ekintzak";
"settings.swipeactions.primary" = "Primary Action"; "settings.swipeactions.primary" = "Ekintza nagusia";
"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.secondary" = "Bigarren ekintza";
"settings.swipeactions.status.action.bookmark" = "Laster-marka"; "settings.swipeactions.status.action.bookmark" = "Laster-marka";
"settings.swipeactions.status.action.boost" = "Bultzatu"; "settings.swipeactions.status.action.boost" = "Bultzatu";
"settings.swipeactions.status.action.favorite" = "Gogokoa"; "settings.swipeactions.status.action.favorite" = "Gogokoa";
"settings.swipeactions.status.action.none" = "Ezer ez"; "settings.swipeactions.status.action.none" = "Ezer ez";
"settings.swipeactions.status.action.quote" = "Aipatu bidalketa"; "settings.swipeactions.status.action.quote" = "Aipatu bidalketa";
"settings.swipeactions.status.action.reply" = "Erantzun"; "settings.swipeactions.status.action.reply" = "Erantzun";
"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; "settings.swipeactions.status.explanation" = "Mugimenduen ekintzak bidalketa batean atzamarra ezkerrera edo eskumara mugitzean daude erabilgai. Ekintza nagusia ezarri ezean ezingo da bigarren ekintza zehaztu.";
"settings.swipeactions.status.leading" = "Eskumarantz"; "settings.swipeactions.status.leading" = "Eskumarantz";
"settings.swipeactions.status.trailing" = "Ezkerrerantz"; "settings.swipeactions.status.trailing" = "Ezkerrerantz";
"settings.swipeactions.status" = "Bidalketa"; "settings.swipeactions.status" = "Bidalketa";
"settings.swipeactions.appearance" = "Appearance"; "settings.swipeactions.appearance" = "Itxura";
"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; "settings.swipeactions.use-theme-colors" = "Erabili gaiaren koloreak";
"settings.swipeactions.use-theme-colors-explanation" = "Erabili hautatutako kolorea defektuzko koloreen ordez"; "settings.swipeactions.use-theme-colors-explanation" = "Erabili hautatutako kolorea defektuzko koloreen ordez";
"settings.swipeactions.icon-style" = "Ikonoen itxura"; "settings.swipeactions.icon-style" = "Ikonoen itxura";
@ -285,7 +285,7 @@
"conversations.new.message.placeholder" = "Mezu berria"; "conversations.new.message.placeholder" = "Mezu berria";
// MARK: Package: DesignSystem // MARK: Package: DesignSystem
"design.theme.navigation-title" = "Itxuraren hautatzailea"; "design.theme.navigation-title" = "Gai hautatzailea";
"design.theme.toots-preview" = "Tuten aurreikuspena"; "design.theme.toots-preview" = "Tuten aurreikuspena";
// MARK: Package: Explore // MARK: Package: Explore
@ -361,8 +361,8 @@
// MARK: Package: Status // MARK: Package: Status
"status.action.translate" = "Itzuli"; "status.action.translate" = "Itzuli";
"status.action.translate-from-%@" = "Itzuli %@(e)tik";
"status.action.translated-label-%@" = "%@ erabiliz itzulia"; "status.action.translated-label-%@" = "%@ erabiliz itzulia";
"status.action.translated-label-from-%@-%@" = "Translated from %@ using %@";
"status.action.bookmark" = "Jarri laster-marka"; "status.action.bookmark" = "Jarri laster-marka";
"status.action.boost" = "Bultzatu"; "status.action.boost" = "Bultzatu";
"status.action.boost-to-followers" = "Bultzatu jarraitzaileek ikus dezaten"; "status.action.boost-to-followers" = "Bultzatu jarraitzaileek ikus dezaten";
@ -428,7 +428,6 @@
"status.media.contextmenu.view-browser" = "Ikusi nabigatzailean"; "status.media.contextmenu.view-browser" = "Ikusi nabigatzailean";
"status.media.sensitive.show" = "Erakutsi eduki hunkigarria"; "status.media.sensitive.show" = "Erakutsi eduki hunkigarria";
"status.poll.n-votes %lld" = "%lld boto"; "status.poll.n-votes %lld" = "%lld boto";
"status.poll.n-votes-voters %lld %lld" = "%lld boto, %lld boto-emaile";
"status.poll.closed" = "Amaituta"; "status.poll.closed" = "Amaituta";
"status.poll.closes-in" = "Epemuga: "; "status.poll.closes-in" = "Epemuga: ";
"status.poll.duration" = "Bozketaren iraupena"; "status.poll.duration" = "Bozketaren iraupena";

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

@ -38,8 +38,8 @@
"enum.status-display-style.compact" = "Compact"; "enum.status-display-style.compact" = "Compact";
"enum.status-display-style.large" = "Grand"; "enum.status-display-style.large" = "Grand";
"enum.status-display-style.medium" = "Moyen"; "enum.status-display-style.medium" = "Moyen";
"enum.swipeactions.icon-with-text" = "Icon with text"; "enum.swipeactions.icon-with-text" = "Icône avec texte";
"enum.swipeactions.icon-only" = "Icon only"; "enum.swipeactions.icon-only" = "Icône seulement";
// MARK: Instances // MARK: Instances
"instance.info.domains" = "Domaines"; "instance.info.domains" = "Domaines";
@ -66,8 +66,8 @@
"settings.account.add" = "Ajouter un compte"; "settings.account.add" = "Ajouter un compte";
"settings.app.icon" = "Icône de l'application"; "settings.app.icon" = "Icône de l'application";
"settings.app.icon.navigation-title" = "Icônes"; "settings.app.icon.navigation-title" = "Icônes";
"settings.app.icon.official" = "Official icons"; "settings.app.icon.official" = "Icônes officielles";
"settings.app.icon.designed-by" = "Icons by"; "settings.app.icon.designed-by" = "Icônes par";
"settings.app.source" = "Source (lien GitHub)"; "settings.app.source" = "Source (lien GitHub)";
"settings.app.support" = "Soutenir l'application"; "settings.app.support" = "Soutenir l'application";
"settings.app.about" = "À propos"; "settings.app.about" = "À propos";
@ -89,7 +89,7 @@
"settings.display.theme.systemColor" = "Correspondre au système"; "settings.display.theme.systemColor" = "Correspondre au système";
"settings.general.browser" = "Navigateur"; "settings.general.browser" = "Navigateur";
"settings.general.browser.in-app" = "Navigateur intégré"; "settings.general.browser.in-app" = "Navigateur intégré";
"settings.general.browser.in-app.readerview" = "In-App Browser Reader View"; "settings.general.browser.in-app.readerview" = "Vue lecteur du navigateur intégré";
"settings.general.browser.system" = "Navigateur système"; "settings.general.browser.system" = "Navigateur système";
"settings.general.display" = "Paramètres d'affichage"; "settings.general.display" = "Paramètres d'affichage";
"settings.general.instance" = "Information sur l'instance"; "settings.general.instance" = "Information sur l'instance";
@ -115,8 +115,8 @@
"settings.content.expand-media" = "Affichage des médias"; "settings.content.expand-media" = "Affichage des médias";
"settings.content.default-sensitive" = "Toujours marquer les médias comme sensibles"; "settings.content.default-sensitive" = "Toujours marquer les médias comme sensibles";
"settings.content.default-visibility" = "Visibilité des publications"; "settings.content.default-visibility" = "Visibilité des publications";
"settings.content.media" = "Media"; "settings.content.media" = "Média";
"settings.content.media.show.alt" = "Show ALT texts"; "settings.content.media.show.alt" = "Montrer les textes ALT";
"settings.content.reading" = "Lecture"; "settings.content.reading" = "Lecture";
"settings.content.posting" = "Publication"; "settings.content.posting" = "Publication";
"enum.expand-media.show" = "Afficher tout"; "enum.expand-media.show" = "Afficher tout";
@ -127,8 +127,8 @@
"settings.section.app.footer %@" = "Version de l'application: %@"; "settings.section.app.footer %@" = "Version de l'application: %@";
"settings.section.general" = "Général"; "settings.section.general" = "Général";
"settings.support.alert.error.message" = "Erreur lors du traitement de votre achat intégré, veuillez réessayer."; "settings.support.alert.error.message" = "Erreur lors du traitement de votre achat intégré, veuillez réessayer.";
"settings.support.alert.message" = "Merci beaucoup pour votre conseil! C'est grandement apprécié!"; "settings.support.alert.message" = "Merci beaucoup pour votre conseil ! C'est grandement apprécié !";
"settings.support.alert.title" = "Merci!"; "settings.support.alert.title" = "Merci !";
"settings.support.message-from-dev" = "Bonjour ! Mon nom est Thomas et j'adore créer des applications open-source. Ice Cubes est certainement l'un de mes projets dont je suis le plus fier à ce jour - et soyons honnêtes, c'est aussi celui qui nécessite le plus d'entretien en raison de l'évolution constante de Mastodon et des réseaux sociaux. Si vous vous amusez avec Ice Cubes, envisagez de me faire une petite contribution. Cela me fera plaisir (et aidera à maintenir l'application en bon état pour vous). 🚀"; "settings.support.message-from-dev" = "Bonjour ! Mon nom est Thomas et j'adore créer des applications open-source. Ice Cubes est certainement l'un de mes projets dont je suis le plus fier à ce jour - et soyons honnêtes, c'est aussi celui qui nécessite le plus d'entretien en raison de l'évolution constante de Mastodon et des réseaux sociaux. Si vous vous amusez avec Ice Cubes, envisagez de me faire une petite contribution. Cela me fera plaisir (et aidera à maintenir l'application en bon état pour vous). 🚀";
"settings.support.navigation-title" = "Soutenez Ice Cubes"; "settings.support.navigation-title" = "Soutenez Ice Cubes";
"settings.support.one.subtitle" = "Petit, mais mignon, et c'est bon !"; "settings.support.one.subtitle" = "Petit, mais mignon, et c'est bon !";
@ -179,12 +179,12 @@
"settings.swipeactions.status.action.none" = "Aucun"; "settings.swipeactions.status.action.none" = "Aucun";
"settings.swipeactions.status.action.quote" = "Citer"; "settings.swipeactions.status.action.quote" = "Citer";
"settings.swipeactions.status.action.reply" = "Répondre"; "settings.swipeactions.status.action.reply" = "Répondre";
"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; "settings.swipeactions.status.explanation" = "Les actions de balayage sont disponibles en balayant à gauche ou à droite sur un post. L'action secondaire n'est disponible que si l'action primaire est définie.";
"settings.swipeactions.status.leading" = "Balayer vers la droite"; "settings.swipeactions.status.leading" = "Balayer vers la droite";
"settings.swipeactions.status.trailing" = "Balayer vers la gauche"; "settings.swipeactions.status.trailing" = "Balayer vers la gauche";
"settings.swipeactions.status" = "Publier"; "settings.swipeactions.status" = "Publier";
"settings.swipeactions.appearance" = "Appearance"; "settings.swipeactions.appearance" = "Apparence";
"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; "settings.swipeactions.use-theme-colors" = "Utiliser les couleurs du thème";
"settings.swipeactions.use-theme-colors-explanation" = "Utiliser les couleurs du thème au lieu des couleurs par défaut"; "settings.swipeactions.use-theme-colors-explanation" = "Utiliser les couleurs du thème au lieu des couleurs par défaut";
"settings.swipeactions.icon-style" = "Style de l'icône"; "settings.swipeactions.icon-style" = "Style de l'icône";
@ -226,7 +226,7 @@
"account.action.unblock" = "Débloquer"; "account.action.unblock" = "Débloquer";
"account.action.mute" = "Rendre muet"; "account.action.mute" = "Rendre muet";
"account.action.unmute" = "Annuler le mode muet"; "account.action.unmute" = "Annuler le mode muet";
"account.action.share" = "Share this account"; "account.action.share" = "ärtager ce compte";
"account.boosted-by" = "Boosté par"; "account.boosted-by" = "Boosté par";
"account.detail.about" = "À propos"; "account.detail.about" = "À propos";
"account.detail.familiar-followers" = "Aussi suivi par"; "account.detail.familiar-followers" = "Aussi suivi par";
@ -265,11 +265,11 @@
"account.joined" = "Inscrit"; "account.joined" = "Inscrit";
"account.action.logout" = "Déconnexion"; "account.action.logout" = "Déconnexion";
"account.relation.note.edit" = "Edit Note"; "account.relation.note.edit" = "Modifier la note";
"account.relation.note.edit.placeholder" = "Enter Note text"; "account.relation.note.edit.placeholder" = "Saisissez le texte de la note";
"account.relation.note.edit.error.save.message" = "Error while saving your note, please try again."; "account.relation.note.edit.error.save.message" = "Erreur pendant la sauvegarde de votre note, essayez de nouveau s'il vous plait.";
"account.relation.note.edit.error.save.title" = "Error while saving your note"; "account.relation.note.edit.error.save.title" = "Erreur pendant la sauvegarde de votre note";
"account.relation.note.label" = "Note:"; "account.relation.note.label" = "Note :";
// MARK: Package: Conversations // MARK: Package: Conversations
"conversations.action.delete" = "Supprimer"; "conversations.action.delete" = "Supprimer";
@ -324,7 +324,7 @@
"lists.name.message" = "Entrez le nom de votre liste"; "lists.name.message" = "Entrez le nom de votre liste";
// MARK: Package: Notifications // MARK: Package: Notifications
"notifications.empty.message" = "Notifications? Quelles notifications? Votre boîte de réception de notifications est si vide. Continuez à être génial! 📱😎"; "notifications.empty.message" = "Notifications ? Quelles notifications ? Votre boîte de réception de notifications est si vide. Continuez à être génial ! 📱😎";
"notifications.empty.title" = "Aucune notification"; "notifications.empty.title" = "Aucune notification";
"notifications.error.message" = "Une erreur s'est produite lors du chargement de vos notifications, veuillez réessayer."; "notifications.error.message" = "Une erreur s'est produite lors du chargement de vos notifications, veuillez réessayer.";
"notifications.error.title" = "Une erreur s'est produite"; "notifications.error.title" = "Une erreur s'est produite";
@ -344,13 +344,13 @@
"notifications.tab.all" = "Tout"; "notifications.tab.all" = "Tout";
"notifications.tab.mentions" = "Mentions"; "notifications.tab.mentions" = "Mentions";
"notifications.label.status.push" = "🖊️ Posted: "; "notifications.label.status.push" = "🖊️ Publié: ";
"notifications.label.reblog.push" = "🚀 Boosted: "; "notifications.label.reblog.push" = "🚀 Boosté: ";
"notifications.label.follow.push" = "👋 Followed you: "; "notifications.label.follow.push" = "👋 Vous ont suivi: ";
"notifications.label.follow-request.push" = "🔒 Requested to follow you: "; "notifications.label.follow-request.push" = "🔒 Ont demandé à vous suivre: ";
"notifications.label.favorite.push" = "⭐️ Starred: "; "notifications.label.favorite.push" = "⭐️ Favori: ";
"notifications.label.poll.push" = "📈 Poll ended: "; "notifications.label.poll.push" = "📈 Sondage terminé: ";
"notifications.label.update.push" = "Updated: "; "notifications.label.update.push" = "Mis à jour: ";
// MARK: Package: Timeline // MARK: Package: Timeline
"timeline.federated" = "Fédéré"; "timeline.federated" = "Fédéré";
@ -430,7 +430,7 @@
"status.media.contextmenu.view-browser" = "Afficher dans le navigateur"; "status.media.contextmenu.view-browser" = "Afficher dans le navigateur";
"status.media.sensitive.show" = "Afficher le contenu sensible"; "status.media.sensitive.show" = "Afficher le contenu sensible";
"status.poll.n-votes %lld" = "%lld votes"; "status.poll.n-votes %lld" = "%lld votes";
"status.poll.n-votes-voters %lld %lld" = "%lld votes from %lld voters"; "status.poll.n-votes-voters %lld %lld" = "%lld votes de %lld voteurs";
"status.poll.closed" = "Fermé"; "status.poll.closed" = "Fermé";
"status.poll.closes-in" = "Ferme dans"; "status.poll.closes-in" = "Ferme dans";
"status.poll.duration" = "Durée du sondage"; "status.poll.duration" = "Durée du sondage";

5
IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings
View file

@ -167,7 +167,6 @@
"settings.display.show-ipad-column" = "Toon tweede kolom"; "settings.display.show-ipad-column" = "Toon tweede kolom";
"settings.general.swipeactions" = "Veegacties"; "settings.general.swipeactions" = "Veegacties";
"settings.swipeactions.appearance" = "Appearance";
"settings.swipeactions.navigation-title" = "Veegacties"; "settings.swipeactions.navigation-title" = "Veegacties";
"settings.swipeactions.primary" = "Primaire actie"; "settings.swipeactions.primary" = "Primaire actie";
"settings.swipeactions.secondary" = "Secundaire actie"; "settings.swipeactions.secondary" = "Secundaire actie";
@ -363,12 +362,12 @@
// MARK: Package: Status // MARK: Package: Status
"status.action.translate" = "Vertaal"; "status.action.translate" = "Vertaal";
"status.action.translated-label-%@" = "Vertaald met behulp van %@"; "status.action.translated-label-%@" = "Vertaald met behulp van %@";
"status.action.translated-label-from-%@-%@" = "Translated from %@ using %@"; "status.action.translated-label-from-%@-%@" = "Vertaald uit het %@ met behulp van %@";
"status.action.bookmark" = "Voeg bladwijzer toe"; "status.action.bookmark" = "Voeg bladwijzer toe";
"status.action.boost" = "Boost"; "status.action.boost" = "Boost";
"status.action.boost-to-followers" = "Boost aan volgers"; "status.action.boost-to-followers" = "Boost aan volgers";
"status.action.copy-text" = "Kopieer tekst"; "status.action.copy-text" = "Kopieer tekst";
"status.action.copy-link" = "Copy Link"; "status.action.copy-link" = "Kopieer link";
"status.action.delete" = "Verwijder"; "status.action.delete" = "Verwijder";
"status.action.delete.confirm.title" = "Bevestigen"; "status.action.delete.confirm.title" = "Bevestigen";
"status.action.delete.confirm.message" = "Weet je zeker dat je deze post wilt verwijderen?"; "status.action.delete.confirm.message" = "Weet je zeker dat je deze post wilt verwijderen?";

18
IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings
View file

@ -37,7 +37,7 @@
"enum.status-actions-display.only-buttons" = "Tylko przyciski"; "enum.status-actions-display.only-buttons" = "Tylko przyciski";
"enum.status-display-style.compact" = "Pomniejszone"; "enum.status-display-style.compact" = "Pomniejszone";
"enum.status-display-style.large" = "Duże"; "enum.status-display-style.large" = "Duże";
"enum.status-display-style.medium" = "Medium"; "enum.status-display-style.medium" = "Średnie";
"enum.swipeactions.icon-with-text" = "Ikona z tekstem"; "enum.swipeactions.icon-with-text" = "Ikona z tekstem";
"enum.swipeactions.icon-only" = "Tylko ikona"; "enum.swipeactions.icon-only" = "Tylko ikona";
@ -171,21 +171,21 @@
"settings.general.swipeactions" = "Przeciąganie palcem"; "settings.general.swipeactions" = "Przeciąganie palcem";
"settings.swipeactions.navigation-title" = "Przeciąganie palcem"; "settings.swipeactions.navigation-title" = "Przeciąganie palcem";
"settings.swipeactions.primary" = "Primary Action"; "settings.swipeactions.primary" = "Akcja podstawowa";
"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.secondary" = "Akcja dodatkowa";
"settings.swipeactions.status.action.bookmark" = "Dodaj zakładkę"; "settings.swipeactions.status.action.bookmark" = "Dodaj zakładkę";
"settings.swipeactions.status.action.boost" = "Podbij"; "settings.swipeactions.status.action.boost" = "Podbij";
"settings.swipeactions.status.action.favorite" = "Polub"; "settings.swipeactions.status.action.favorite" = "Polub";
"settings.swipeactions.status.action.none" = "Bez akcji"; "settings.swipeactions.status.action.none" = "Bez akcji";
"settings.swipeactions.status.action.quote" = "Zacytuj"; "settings.swipeactions.status.action.quote" = "Zacytuj";
"settings.swipeactions.status.action.reply" = "Odpowiedz"; "settings.swipeactions.status.action.reply" = "Odpowiedz";
"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; "settings.swipeactions.status.explanation" = "Akcje przeciągania palcem są dostępne po przesunięciu posta w lewo lub w prawo. Akcja dodatkowa jest dostępna tylko wtedy, gdy ustawiona jest akcja podstawowa.";
"settings.swipeactions.status.leading" = "Przeciągnij w prawo"; "settings.swipeactions.status.leading" = "Przeciągnij w prawo";
"settings.swipeactions.status.trailing" = "Przeciągnij w lewo"; "settings.swipeactions.status.trailing" = "Przeciągnij w lewo";
"settings.swipeactions.status" = "Post"; "settings.swipeactions.status" = "Post";
"settings.swipeactions.appearance" = "Appearance"; "settings.swipeactions.appearance" = "Wygląd";
"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; "settings.swipeactions.use-theme-colors" = "Użyj kolorów motywu";
"settings.swipeactions.use-theme-colors-explanation" = "Używaj kolorów motywu zamiast kolorów domyślnych"; "settings.swipeactions.use-theme-colors-explanation" = "Użyj kolorów motywu zamiast kolorów domyślnych";
"settings.swipeactions.icon-style" = "Styl ikony"; "settings.swipeactions.icon-style" = "Styl ikony";
"settings.display.section.font" = "Czcionka"; "settings.display.section.font" = "Czcionka";
@ -364,12 +364,12 @@
// MARK: Package: Status // MARK: Package: Status
"status.action.translate" = "Przetłumacz"; "status.action.translate" = "Przetłumacz";
"status.action.translated-label-%@" = "Przetłumaczono za pomocą %@"; "status.action.translated-label-%@" = "Przetłumaczono za pomocą %@";
"status.action.translated-label-from-%@-%@" = "Translated from %@ using %@"; "status.action.translated-label-from-%@-%@" = "Tekst %@ przetłumaczono za pomocą %@";
"status.action.bookmark" = "Dodaj zakładkę"; "status.action.bookmark" = "Dodaj zakładkę";
"status.action.boost" = "Podbij"; "status.action.boost" = "Podbij";
"status.action.boost-to-followers" = "Podbij do obserwujących"; "status.action.boost-to-followers" = "Podbij do obserwujących";
"status.action.copy-text" = "Kopiuj tekst"; "status.action.copy-text" = "Kopiuj tekst";
"status.action.copy-link" = "Copy Link"; "status.action.copy-link" = "Kopiuj link";
"status.action.delete" = "Usuń"; "status.action.delete" = "Usuń";
"status.action.delete.confirm.title" = "Potwierdź"; "status.action.delete.confirm.title" = "Potwierdź";
"status.action.delete.confirm.message" = "czy na pewno chcesz usunąć ten post?"; "status.action.delete.confirm.message" = "czy na pewno chcesz usunąć ten post?";

118
IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings
View file

@ -149,46 +149,46 @@
"settings.push.duplicate.title" = "Corretor de notificações duplicadas"; "settings.push.duplicate.title" = "Corretor de notificações duplicadas";
"settings.push.duplicate.footer" = "Recebendo notificações duplicadas? Tente este botão mágico para tentar corrigir"; "settings.push.duplicate.footer" = "Recebendo notificações duplicadas? Tente este botão mágico para tentar corrigir";
"settings.push.duplicate.button.fix" = "🪄 Corrigir"; "settings.push.duplicate.button.fix" = "🪄 Corrigir";
"settings.other.autoplay-video" = "Auto Play Videos"; "settings.other.autoplay-video" = "Reprodução automática de vídeos";
"settings.display.font" = "Timeline Font"; "settings.display.font" = "Fonte da linha do tempo";
"settings.display.font.system" = "System"; "settings.display.font.system" = "Sistema";
"settings.display.font.custom" = "Custom"; "settings.display.font.custom" = "Personalizada";
"settings.display.font.scaling-%@" = "Font scaling: %@"; "settings.display.font.scaling-%@" = "Escala de fonte: %@";
"settings.about.built-with" = "Ice Cubes is built with the following Open Source software:"; "settings.about.built-with" = "Ice Cubes é construído com os seguintes softwares de código aberto:";
"settings.about.title" = "Ice Cubes"; "settings.about.title" = "Ice Cubes";
"settings.account.cached-posts-%@" = "Cached posts: %@"; "settings.account.cached-posts-%@" = "Pastagens cacheadas: %@";
"settings.account.action.delete-cache" = "Clear cache"; "settings.account.action.delete-cache" = "Limpar cache";
"settings.general.haptic" = "Haptic Feedback"; "settings.general.haptic" = "Feedback Haptic";
"settings.haptic.navigation-title" = "Haptic Settings"; "settings.haptic.navigation-title" = "Configurações Haptic";
"settings.haptic.timeline" = "Timeline"; "settings.haptic.timeline" = "Linha do tempo";
"settings.haptic.tab-selection" = "Tab Selection"; "settings.haptic.tab-selection" = "Seleção de aba";
"settings.haptic.buttons" = "Button Press"; "settings.haptic.buttons" = "Pressione o botão";
"settings.display.show-tab-label" = "Show tab name"; "settings.display.show-tab-label" = "Mostrar nome da aba";
"settings.display.show-ipad-column" = "Enable secondary column"; "settings.display.show-ipad-column" = "Habilitar coluna secundária";
"settings.general.swipeactions" = "Swipe Actions"; "settings.general.swipeactions" = "Ações de deslizar";
"settings.swipeactions.navigation-title" = "Swipe Actions"; "settings.swipeactions.navigation-title" = "Ações de deslizar";
"settings.swipeactions.primary" = "Primary Action"; "settings.swipeactions.primary" = "Ação primária";
"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.secondary" = "Ação secundária";
"settings.swipeactions.status.action.bookmark" = "Bookmark"; "settings.swipeactions.status.action.bookmark" = "Bookmark";
"settings.swipeactions.status.action.boost" = "Boost"; "settings.swipeactions.status.action.boost" = "Boost";
"settings.swipeactions.status.action.favorite" = "Favorite"; "settings.swipeactions.status.action.favorite" = "Favorito";
"settings.swipeactions.status.action.none" = "None"; "settings.swipeactions.status.action.none" = "Nenhum";
"settings.swipeactions.status.action.quote" = "Quote"; "settings.swipeactions.status.action.quote" = "Citar";
"settings.swipeactions.status.action.reply" = "Reply"; "settings.swipeactions.status.action.reply" = "Responder";
"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; "settings.swipeactions.status.explanation" = "As ações de deslizar estão disponíveis ao deslizar para a esquerda ou para a direita em uma postagem. A ação secundária só estará disponível se a ação primária estiver definida.";
"settings.swipeactions.status.leading" = "Swipe Right"; "settings.swipeactions.status.leading" = "Deslizar para direita";
"settings.swipeactions.status.trailing" = "Swipe Left"; "settings.swipeactions.status.trailing" = "Deslizar para esquerda";
"settings.swipeactions.status" = "Post"; "settings.swipeactions.status" = "Post";
"settings.swipeactions.appearance" = "Appearance"; "settings.swipeactions.appearance" = "Aparência";
"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; "settings.swipeactions.use-theme-colors" = "Usar cores do tema";
"settings.swipeactions.use-theme-colors-explanation" = "Use theme colors instead of default colors"; "settings.swipeactions.use-theme-colors-explanation" = "Use as cores do tema em vez das cores padrão";
"settings.swipeactions.icon-style" = "Icon Style"; "settings.swipeactions.icon-style" = "Estilo do ícone";
"settings.display.section.font" = "Font"; "settings.display.section.font" = "Fonte";
// MARK: Tabs // MARK: Tabs
"tab.explore" = "Explorar"; "tab.explore" = "Explorar";
@ -265,11 +265,11 @@
"account.joined" = "Entrou em"; "account.joined" = "Entrou em";
"account.action.logout" = "Sair da conta"; "account.action.logout" = "Sair da conta";
"account.relation.note.edit" = "Edit Note"; "account.relation.note.edit" = "Editar nota";
"account.relation.note.edit.placeholder" = "Enter Note text"; "account.relation.note.edit.placeholder" = "Digite o texto da nota";
"account.relation.note.edit.error.save.message" = "Error while saving your note, please try again."; "account.relation.note.edit.error.save.message" = "Ocorreu um erro ao salvar sua nota, tente novamente.";
"account.relation.note.edit.error.save.title" = "Error while saving your note"; "account.relation.note.edit.error.save.title" = "Erro ao salvar sua nota";
"account.relation.note.label" = "Note:"; "account.relation.note.label" = "Nota:";
// MARK: Package: Conversations // MARK: Package: Conversations
"conversations.action.delete" = "Excluir"; "conversations.action.delete" = "Excluir";
@ -348,17 +348,17 @@
"notifications.tab.all" = "Todos"; "notifications.tab.all" = "Todos";
"notifications.tab.mentions" = "Menções"; "notifications.tab.mentions" = "Menções";
"notifications.label.status.push" = "🖊️ Posted: "; "notifications.label.status.push" = "🖊️ Postou: ";
"notifications.label.reblog.push" = "🚀 Boosted: "; "notifications.label.reblog.push" = "🚀 Boosted: ";
"notifications.label.follow.push" = "👋 Followed you: "; "notifications.label.follow.push" = "👋 Seguiu você: ";
"notifications.label.follow-request.push" = "🔒 Requested to follow you: "; "notifications.label.follow-request.push" = "🔒 Pediu para te seguir: ";
"notifications.label.favorite.push" = "⭐️ Starred: "; "notifications.label.favorite.push" = "⭐️ Favoritou: ";
"notifications.label.poll.push" = "📈 Poll ended: "; "notifications.label.poll.push" = "📈 Enquete encerrada: ";
"notifications.label.update.push" = "Updated: "; "notifications.label.update.push" = "Atualizado: ";
// MARK: Package: Timeline // MARK: Package: Timeline
"timeline.federated" = "Linha global"; "timeline.federated" = "Linha global";
"timeline.latest" = "Jump to Latest"; "timeline.latest" = "Ir para o mais recente";
"timeline.home" = "Início"; "timeline.home" = "Início";
"timeline.local" = "Linha local"; "timeline.local" = "Linha local";
"timeline.n-recent-from-n-participants %lld %lld" = "%lld postagens recentes de %lld participantes"; "timeline.n-recent-from-n-participants %lld %lld" = "%lld postagens recentes de %lld participantes";
@ -375,8 +375,8 @@
"status.action.copy-text" = "Copiar Texto"; "status.action.copy-text" = "Copiar Texto";
"status.action.copy-link" = "Copy Link"; "status.action.copy-link" = "Copy Link";
"status.action.delete" = "Deletar"; "status.action.delete" = "Deletar";
"status.action.delete.confirm.title" = "Confirm"; "status.action.delete.confirm.title" = "Confirmar";
"status.action.delete.confirm.message" = "are you sure you want to delete this post?"; "status.action.delete.confirm.message" = "tem certeza que deseja excluir esta postagem?";
"status.action.edit" = "Editar"; "status.action.edit" = "Editar";
"status.action.favorite" = "Favoritar"; "status.action.favorite" = "Favoritar";
"status.action.mention" = "Menção"; "status.action.mention" = "Menção";
@ -409,8 +409,8 @@
"status.editor.error.upload" = "Erro ao fazer upload"; "status.editor.error.upload" = "Erro ao fazer upload";
"status.editor.language-select.navigation-title" = "Selecionar Idioma"; "status.editor.language-select.navigation-title" = "Selecionar Idioma";
"status.editor.language-select.recently-used" = "Usado recentemente"; "status.editor.language-select.recently-used" = "Usado recentemente";
"status.editor.language-select.confirmation.detected-%@" = "Post in %@ (Detected language)"; "status.editor.language-select.confirmation.detected-%@" = "Postagem em %@ (Detected language)";
"status.editor.language-select.confirmation.selected-%@" = "Post in %@ (Selected language)"; "status.editor.language-select.confirmation.selected-%@" = "Postagem em %@ (Selected language)";
"status.editor.media.edit-image" = "Editar Imagem"; "status.editor.media.edit-image" = "Editar Imagem";
"status.editor.media.image-description" = "Descrição da imagem"; "status.editor.media.image-description" = "Descrição da imagem";
"status.editor.mode.edit" = "Editando sua postagem"; "status.editor.mode.edit" = "Editando sua postagem";
@ -474,17 +474,17 @@
"filter.action.hide" = "Ocultar completamente"; "filter.action.hide" = "Ocultar completamente";
// MARK: Accessibility // MARK: Accessibility
"accessibility.editor.button.attach-photo" = "Attach photo"; "accessibility.editor.button.attach-photo" = "Anexar foto";
"accessibility.editor.button.poll" = "Poll"; "accessibility.editor.button.poll" = "Enquete";
"accessibility.editor.button.spoiler" = "Spoiler warning"; "accessibility.editor.button.spoiler" = "Aviso de spoiler";
"accessibility.editor.button.drafts" = "Drafts"; "accessibility.editor.button.drafts" = "Rascunhos";
"accessibility.editor.button.custom-emojis" = "Custom emojis"; "accessibility.editor.button.custom-emojis" = "Emojis customizados";
"accessibility.editor.button.language" = "Language"; "accessibility.editor.button.language" = "Idioma";
"accessibility.tabs.timeline.add-account" = "Add account"; "accessibility.tabs.timeline.add-account" = "Adicionar conta";
"accessibility.app-account.selector.accounts" = "Accounts"; "accessibility.app-account.selector.accounts" = "Contas";
// MARK: Report // MARK: Report
"report.comment.placeholder" = "Additional Info"; "report.comment.placeholder" = "Informação Adicional";
"report.title" = "Report Post"; "report.title" = "Reportar Postagem";
"report.action.send" = "Send"; "report.action.send" = "Enviar";
"status.action.report" = "Report Post"; "status.action.report" = "Repostar Postagem";

3
Packages/Account/Sources/Account/AccountDetailHeaderView.swift
View file

@ -134,6 +134,7 @@ struct AccountDetailHeaderView: View {
VStack(alignment: .leading, spacing: 0) { VStack(alignment: .leading, spacing: 0) {
EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis) EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis)
.font(.scaledHeadline) .font(.scaledHeadline)
.emojiSize(Font.scaledHeadlinePointSize)
Text("@\(account.acct)") Text("@\(account.acct)")
.font(.scaledCallout) .font(.scaledCallout)
.foregroundColor(.gray) .foregroundColor(.gray)
@ -160,6 +161,7 @@ struct AccountDetailHeaderView: View {
EmojiTextApp(account.note, emojis: account.emojis) EmojiTextApp(account.note, emojis: account.emojis)
.font(.scaledBody) .font(.scaledBody)
.emojiSize(Font.scaledBodyPointSize)
.padding(.top, 8) .padding(.top, 8)
.environment(\.openURL, OpenURLAction { url in .environment(\.openURL, OpenURLAction { url in
routerPath.handle(url: url) routerPath.handle(url: url)
@ -242,6 +244,7 @@ struct AccountDetailHeaderView: View {
.foregroundColor(Color.green.opacity(0.80)) .foregroundColor(Color.green.opacity(0.80))
} }
EmojiTextApp(field.value, emojis: viewModel.account?.emojis ?? []) EmojiTextApp(field.value, emojis: viewModel.account?.emojis ?? [])
.emojiSize(Font.scaledBodyPointSize)
.foregroundColor(theme.tintColor) .foregroundColor(theme.tintColor)
.environment(\.openURL, OpenURLAction { url in .environment(\.openURL, OpenURLAction { url in
routerPath.handle(url: url) routerPath.handle(url: url)

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

@ -39,12 +39,14 @@ public struct AccountsListRow: View {
VStack(alignment: .leading, spacing: 2) { VStack(alignment: .leading, spacing: 2) {
EmojiTextApp(.init(stringValue: viewModel.account.safeDisplayName), emojis: viewModel.account.emojis) EmojiTextApp(.init(stringValue: viewModel.account.safeDisplayName), emojis: viewModel.account.emojis)
.font(.scaledSubheadline) .font(.scaledSubheadline)
.emojiSize(Font.scaledSubheadlinePointSize)
.fontWeight(.semibold) .fontWeight(.semibold)
Text("@\(viewModel.account.acct)") Text("@\(viewModel.account.acct)")
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundColor(.gray)
EmojiTextApp(viewModel.account.note, emojis: viewModel.account.emojis) EmojiTextApp(viewModel.account.note, emojis: viewModel.account.emojis)
.font(.scaledFootnote) .font(.scaledFootnote)
.emojiSize(Font.scaledFootnotePointSize)
.lineLimit(3) .lineLimit(3)
.environment(\.openURL, OpenURLAction { url in .environment(\.openURL, OpenURLAction { url in
routerPath.handle(url: url) routerPath.handle(url: url)

2
Packages/Account/Sources/Account/Edit/EditAccountView.swift
View file

@ -116,7 +116,7 @@ public struct EditAccountView: View {
if viewModel.isSaving { if viewModel.isSaving {
ProgressView() ProgressView()
} else { } else {
Text("action.save") Text("action.save").bold()
} }
} }
} }

2
Packages/Account/Sources/Account/Edit/EditRelationshipNoteView.swift
View file

@ -60,7 +60,7 @@ public struct EditRelationshipNoteView: View {
if viewModel.isSaving { if viewModel.isSaving {
ProgressView() ProgressView()
} else { } else {
Text("action.save") Text("action.save").bold()
} }
} }
} }

1
Packages/AppAccount/Sources/AppAccount/AppAccountView.swift
View file

@ -61,6 +61,7 @@ public struct AppAccountView: View {
EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis) EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis)
Text("\(account.username)@\(viewModel.appAccount.server)") Text("\(account.username)@\(viewModel.appAccount.server)")
.font(.scaledSubheadline) .font(.scaledSubheadline)
.emojiSize(Font.scaledSubheadlinePointSize)
.foregroundColor(.gray) .foregroundColor(.gray)
} }
} }

1
Packages/Conversations/Sources/Conversations/Detail/ConversationDetailView.swift
View file

@ -76,6 +76,7 @@ public struct ConversationDetailView: View {
{ {
EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis) EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis)
.font(.scaledHeadline) .font(.scaledHeadline)
.emojiSize(Font.scaledHeadlinePointSize)
} else { } else {
Text("Direct message with \(viewModel.conversation.accounts.count) people") Text("Direct message with \(viewModel.conversation.accounts.count) people")
.font(.scaledHeadline) .font(.scaledHeadline)

1
Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift
View file

@ -32,6 +32,7 @@ struct ConversationMessageView: View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
EmojiTextApp(message.content, emojis: message.emojis) EmojiTextApp(message.content, emojis: message.emojis)
.font(.scaledBody) .font(.scaledBody)
.emojiSize(Font.scaledBodyPointSize)
.padding(6) .padding(6)
.environment(\.openURL, OpenURLAction { url in .environment(\.openURL, OpenURLAction { url in
routerPath.handleStatus(status: message, url: url) routerPath.handleStatus(status: message, url: url)

2
Packages/Conversations/Sources/Conversations/List/ConversationsListRow.swift
View file

@ -22,6 +22,7 @@ struct ConversationsListRow: View {
EmojiTextApp(.init(stringValue: conversation.accounts.map { $0.safeDisplayName }.joined(separator: ", ")), EmojiTextApp(.init(stringValue: conversation.accounts.map { $0.safeDisplayName }.joined(separator: ", ")),
emojis: conversation.accounts.flatMap { $0.emojis }) emojis: conversation.accounts.flatMap { $0.emojis })
.font(.scaledSubheadline) .font(.scaledSubheadline)
.emojiSize(Font.scaledSubheadlinePointSize)
.fontWeight(.semibold) .fontWeight(.semibold)
.foregroundColor(theme.labelColor) .foregroundColor(theme.labelColor)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
@ -39,6 +40,7 @@ struct ConversationsListRow: View {
EmojiTextApp(conversation.lastStatus?.content ?? HTMLString(stringValue: ""), emojis: conversation.lastStatus?.emojis ?? []) EmojiTextApp(conversation.lastStatus?.content ?? HTMLString(stringValue: ""), emojis: conversation.lastStatus?.emojis ?? [])
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.font(.scaledBody) .font(.scaledBody)
.emojiSize(Font.scaledBodyPointSize)
} }
Spacer() Spacer()
} }

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

@ -45,10 +45,18 @@ public extension Font {
customFont(size: userScaledFontSize(baseSize: headline), relativeTo: .headline).weight(.semibold) customFont(size: userScaledFontSize(baseSize: headline), relativeTo: .headline).weight(.semibold)
} }
static var scaledHeadlinePointSize: CGFloat {
customUIFont(size: userScaledFontSize(baseSize: headline)).pointSize
}
static var scaledBody: Font { static var scaledBody: Font {
customFont(size: userScaledFontSize(baseSize: body), relativeTo: .body) customFont(size: userScaledFontSize(baseSize: body), relativeTo: .body)
} }
static var scaledBodyPointSize: CGFloat {
customUIFont(size: userScaledFontSize(baseSize: body)).pointSize
}
static var scaledBodyUIFont: UIFont { static var scaledBodyUIFont: UIFont {
customUIFont(size: userScaledFontSize(baseSize: body)) customUIFont(size: userScaledFontSize(baseSize: body))
} }
@ -57,17 +65,33 @@ public extension Font {
customFont(size: userScaledFontSize(baseSize: callout), relativeTo: .callout) customFont(size: userScaledFontSize(baseSize: callout), relativeTo: .callout)
} }
static var scaledCalloutPointSize: CGFloat {
customUIFont(size: userScaledFontSize(baseSize: body)).pointSize
}
static var scaledSubheadline: Font { static var scaledSubheadline: Font {
customFont(size: userScaledFontSize(baseSize: subheadline), relativeTo: .subheadline) customFont(size: userScaledFontSize(baseSize: subheadline), relativeTo: .subheadline)
} }
static var scaledSubheadlinePointSize: CGFloat {
customUIFont(size: userScaledFontSize(baseSize: subheadline)).pointSize
}
static var scaledFootnote: Font { static var scaledFootnote: Font {
customFont(size: userScaledFontSize(baseSize: footnote), relativeTo: .footnote) customFont(size: userScaledFontSize(baseSize: footnote), relativeTo: .footnote)
} }
static var scaledFootnotePointSize: CGFloat {
customUIFont(size: userScaledFontSize(baseSize: footnote)).pointSize
}
static var scaledCaption: Font { static var scaledCaption: Font {
customFont(size: userScaledFontSize(baseSize: caption), relativeTo: .caption) customFont(size: userScaledFontSize(baseSize: caption), relativeTo: .caption)
} }
static var scaledCaptionPointSize: CGFloat {
customUIFont(size: userScaledFontSize(baseSize: caption)).pointSize
}
} }
public extension UIFont { public extension UIFont {

1
Packages/Lists/Sources/Lists/Edit/ListEditView.swift
View file

@ -33,6 +33,7 @@ public struct ListEditView: View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
EmojiTextApp(.init(stringValue: account.safeDisplayName), EmojiTextApp(.init(stringValue: account.safeDisplayName),
emojis: account.emojis) emojis: account.emojis)
.emojiSize(Font.scaledBodyPointSize)
Text("@\(account.acct)") Text("@\(account.acct)")
.foregroundColor(.gray) .foregroundColor(.gray)
.font(.scaledFootnote) .font(.scaledFootnote)

2
Packages/Notifications/Sources/Notifications/NotificationRowView.swift
View file

@ -104,6 +104,7 @@ struct NotificationRowView: View {
.foregroundColor(.gray) .foregroundColor(.gray)
}) })
.font(.scaledSubheadline) .font(.scaledSubheadline)
.emojiSize(Font.scaledSubheadlinePointSize)
.fontWeight(.semibold) .fontWeight(.semibold)
.lineLimit(3) .lineLimit(3)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
@ -160,6 +161,7 @@ struct NotificationRowView: View {
emojis: notification.accounts[0].emojis) emojis: notification.accounts[0].emojis)
.lineLimit(3) .lineLimit(3)
.font(.scaledCallout) .font(.scaledCallout)
.emojiSize(Font.scaledCalloutPointSize)
.foregroundColor(.gray) .foregroundColor(.gray)
.environment(\.openURL, OpenURLAction { url in .environment(\.openURL, OpenURLAction { url in
routerPath.handle(url: url) routerPath.handle(url: url)

1
Packages/Status/Sources/Status/Editor/Components/StatusEditorAutoCompleteView.swift
View file

@ -34,6 +34,7 @@ struct StatusEditorAutoCompleteView: View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
EmojiTextApp(.init(stringValue: account.safeDisplayName), EmojiTextApp(.init(stringValue: account.safeDisplayName),
emojis: account.emojis) emojis: account.emojis)
.emojiSize(Font.scaledFootnotePointSize)
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(theme.labelColor) .foregroundColor(theme.labelColor)
Text("@\(account.acct)") Text("@\(account.acct)")

2
Packages/Status/Sources/Status/Editor/StatusEditorView.swift
View file

@ -118,7 +118,7 @@ public struct StatusEditorView: View {
if viewModel.isPosting { if viewModel.isPosting {
ProgressView() ProgressView()
} else { } else {
Text("status.action.post") Text("status.action.post").bold()
} }
} }
.disabled(!viewModel.canPost) .disabled(!viewModel.canPost)

1
Packages/Status/Sources/Status/Embed/StatusEmbededView.swift
View file

@ -47,6 +47,7 @@ public struct StatusEmbeddedView: View {
VStack(alignment: .leading, spacing: 0) { VStack(alignment: .leading, spacing: 0) {
EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis) EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis)
.font(.scaledFootnote) .font(.scaledFootnote)
.emojiSize(Font.scaledFootnotePointSize)
.fontWeight(.semibold) .fontWeight(.semibold)
Group { Group {
Text("@\(account.acct)") + Text("@\(account.acct)") +

1
Packages/Status/Sources/Status/History/StatusEditHistoryView.swift
View file

@ -26,6 +26,7 @@ public struct StatusEditHistoryView: View {
VStack(alignment: .leading, spacing: 8) { VStack(alignment: .leading, spacing: 8) {
EmojiTextApp(edit.content, emojis: edit.emojis) EmojiTextApp(edit.content, emojis: edit.emojis)
.font(.scaledBody) .font(.scaledBody)
.emojiSize(Font.scaledBodyPointSize)
Group { Group {
Text(edit.createdAt.asDate, style: .date) + Text(edit.createdAt.asDate, style: .date) +
Text("status.summary.at-time") + Text("status.summary.at-time") +

1
Packages/Status/Sources/Status/Row/Subviews/StatusRowHeaderView.swift
View file

@ -38,6 +38,7 @@ struct StatusRowHeaderView: View {
HStack(alignment: .center, spacing: 4) { HStack(alignment: .center, spacing: 4) {
EmojiTextApp(.init(stringValue: status.account.safeDisplayName), emojis: status.account.emojis) EmojiTextApp(.init(stringValue: status.account.safeDisplayName), emojis: status.account.emojis)
.font(.scaledSubheadline) .font(.scaledSubheadline)
.emojiSize(Font.scaledSubheadlinePointSize)
.fontWeight(.semibold) .fontWeight(.semibold)
.lineLimit(1) .lineLimit(1)
.layoutPriority(1) .layoutPriority(1)

1
Packages/Status/Sources/Status/Row/Subviews/StatusRowReblogView.swift
View file

@ -19,6 +19,7 @@ struct StatusRowReblogView: View {
+ Text("status.row.was-boosted") + Text("status.row.was-boosted")
) )
.font(.scaledFootnote) .font(.scaledFootnote)
.emojiSize(Font.scaledFootnotePointSize)
.foregroundColor(.gray) .foregroundColor(.gray)
.fontWeight(.semibold) .fontWeight(.semibold)
.onTapGesture { .onTapGesture {

1
Packages/Status/Sources/Status/Row/Subviews/StatusRowSpoilerView.swift
View file

@ -13,6 +13,7 @@ struct StatusRowSpoilerView: View {
.foregroundColor(.secondary) .foregroundColor(.secondary)
EmojiTextApp(status.spoilerText, emojis: status.emojis, language: status.language) EmojiTextApp(status.spoilerText, emojis: status.emojis, language: status.language)
.font(.system(.subheadline, weight: .bold)) .font(.system(.subheadline, weight: .bold))
.emojiSize(Font.scaledSubheadlinePointSize)
.foregroundColor(.secondary) .foregroundColor(.secondary)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
Spacer() Spacer()

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

@ -12,6 +12,7 @@ struct StatusRowTextView: View {
HStack { HStack {
EmojiTextApp(status.content, emojis: status.emojis, language: status.language) EmojiTextApp(status.content, emojis: status.emojis, language: status.language)
.font(.scaledBody) .font(.scaledBody)
.emojiSize(Font.scaledBodyPointSize)
.environment(\.openURL, OpenURLAction { url in .environment(\.openURL, OpenURLAction { url in
viewModel.routerPath.handleStatus(status: status, url: url) viewModel.routerPath.handleStatus(status: status, url: url)
}) })