diff --git a/Localization/en.lproj/Localizable.strings b/Localization/en.lproj/Localizable.strings index ccd4639..8f1bc0c 100644 --- a/Localization/en.lproj/Localizable.strings +++ b/Localization/en.lproj/Localizable.strings @@ -169,7 +169,7 @@ "settings.title.thirdParty" = "Third party"; "settings.title.reportBug" = "Report a bug"; "settings.title.githubIssues" = "Issues on Github"; -"settings.title.follow" = "Follow me on Mastodon"; +"settings.title.follow" = "Follow me"; "settings.title.support" = "Support"; "settings.title.thankYouTitle" = "Thank you 馃挄"; "settings.title.thankYouMessage" = "Thanks for your purchase. Purchases both big and small help us keep our dream of providing the best quality products to our customers. We hope you鈥檙e loving Vernissage."; @@ -186,6 +186,12 @@ "settings.title.alwaysShowAltDescription" = "Show alternative text if present on status details screen"; "settings.title.general" = "General"; "settings.title.applicationIcon" = "Application icon"; +"settings.title.followVernissage" = "Follow Vernissage"; +"settings.title.mastodonAccount" = "Mastodon account"; +"settings.title.pixelfedAccount" = "Pixelfed account"; +"settings.title.openPage" = "Open"; +"settings.title.privacyPolicy" = "Privacy policy"; +"settings.title.terms" = "Terms & Conditions"; // Mark: Signin view. "signin.navigationBar.title" = "Sign in to Pixelfed"; diff --git a/Localization/pl.lproj/Localizable.strings b/Localization/pl.lproj/Localizable.strings index 4abfa58..df9bd3f 100644 --- a/Localization/pl.lproj/Localizable.strings +++ b/Localization/pl.lproj/Localizable.strings @@ -169,7 +169,7 @@ "settings.title.thirdParty" = "Zewn臋trzne biblioteki"; "settings.title.reportBug" = "Zg艂o艣 b艂膮d"; "settings.title.githubIssues" = "B艂臋dy na Github"; -"settings.title.follow" = "Obserwuj mnie na Mastodon"; +"settings.title.follow" = "Obserwuj mnie"; "settings.title.support" = "Wsparcie"; "settings.title.thankYouTitle" = "Dzi臋kuj臋 馃挄"; "settings.title.thankYouMessage" = "Dzi臋kujemy za tw贸j zakup. Zakupy zar贸wno te du偶e, jak i te ma艂e pomagaj膮 nam w realizacji marzenia o dostarczaniu naszym klientom produkt贸w najwy偶szej jako艣ci. Mamy nadziej臋, 偶e Vernissage spe艂nia Twoje oczekiwania."; @@ -186,6 +186,12 @@ "settings.title.alwaysShowAltDescription" = "Poka偶 alternatywny tekst, je艣li jest obecny na szczeg贸艂ach statusu"; "settings.title.general" = "Og贸lne"; "settings.title.applicationIcon" = "Ikona aplikacji"; +"settings.title.followVernissage" = "Obserwuj Vernissage"; +"settings.title.mastodonAccount" = "Konto Mastodon"; +"settings.title.pixelfedAccount" = "Konto Pixelfed"; +"settings.title.openPage" = "Otw贸rz"; +"settings.title.privacyPolicy" = "Polityka prywatno艣ci"; +"settings.title.terms" = "Zasady i warunki"; // Mark: Signin view. "signin.navigationBar.title" = "Zaloguj si臋 do Pixelfed"; diff --git a/Vernissage/Views/MainView.swift b/Vernissage/Views/MainView.swift index 1faf584..a53a32a 100644 --- a/Vernissage/Views/MainView.swift +++ b/Vernissage/Views/MainView.swift @@ -237,8 +237,7 @@ struct MainView: View { self.routerPath.presentedSheet = .newStatusEditor } label: { Image(systemName: "square.and.pencil") - .symbolRenderingMode(.palette) - .foregroundStyle(Color.accentColor, Color.mainTextColor) + .foregroundColor(Color.mainTextColor) .fontWeight(.semibold) } } diff --git a/Vernissage/Views/SettingsView/Subviews/GeneralSectionView.swift b/Vernissage/Views/SettingsView/Subviews/GeneralSectionView.swift index 9ecaac6..e0e26bc 100644 --- a/Vernissage/Views/SettingsView/Subviews/GeneralSectionView.swift +++ b/Vernissage/Views/SettingsView/Subviews/GeneralSectionView.swift @@ -25,6 +25,7 @@ struct GeneralSectionView: View { HStack { Image("\(icon)-Preview") Text(icon.replacing("-", with: " ")) + .font(.subheadline) } .tag(icon) } diff --git a/Vernissage/Views/SettingsView/Subviews/OtherSectionView.swift b/Vernissage/Views/SettingsView/Subviews/OtherSectionView.swift index 49e0897..ac75d60 100644 --- a/Vernissage/Views/SettingsView/Subviews/OtherSectionView.swift +++ b/Vernissage/Views/SettingsView/Subviews/OtherSectionView.swift @@ -12,6 +12,20 @@ struct OtherSectionView: View { NavigationLink(value: RouteurDestinations.thirdParty) { Text("settings.title.thirdParty", comment: "Third party") } + + HStack { + Text("settings.title.privacyPolicy", comment: "Privacy policy") + Spacer() + Link(NSLocalizedString("settings.title.openPage", comment: "Open"), destination: URL(string: "https://mczachurski.dev/vernissage/privacy-policy.html")!) + .font(.footnote) + } + + HStack { + Text("settings.title.terms", comment: "Terms & Conditions") + Spacer() + Link(NSLocalizedString("settings.title.openPage", comment: "Open"), destination: URL(string: "https://mczachurski.dev/vernissage/terms.html")!) + .font(.footnote) + } HStack { Text("settings.title.reportBug", comment: "Report a bug") @@ -19,13 +33,45 @@ struct OtherSectionView: View { Link(NSLocalizedString("settings.title.githubIssues", comment: "Issues on GitHub"), destination: URL(string: "https://github.com/VernissageApp/Home/issues")!) .font(.footnote) } + + HStack { + VStack(alignment: .leading) { + Text("settings.title.followVernissage", comment: "Follow Vernissage") + Text("Mastodon account") + .font(.footnote) + .foregroundColor(.lightGrayColor) + } + + Spacer() + Link("@vernissage", destination: URL(string: "https://mastodon.social/@vernissage")!) + .font(.footnote) + } HStack { - Text("settings.title.follow", comment: "Follow me on Mastodon") + VStack(alignment: .leading) { + Text("settings.title.follow", comment: "Follow me") + Text("settings.title.mastodonAccount", comment: "Mastodon account") + .font(.footnote) + .foregroundColor(.lightGrayColor) + } + Spacer() Link("@mczachurski", destination: URL(string: "https://mastodon.social/@mczachurski")!) .font(.footnote) } + + HStack { + VStack(alignment: .leading) { + Text("settings.title.follow", comment: "Follow me") + Text("settings.title.pixelfedAccount", comment: "Pixelfed account") + .font(.footnote) + .foregroundColor(.lightGrayColor) + } + + Spacer() + Link("@mczachurski", destination: URL(string: "https://pixelfed.social/@mczachurski")!) + .font(.footnote) + } } } }