mirror of
https://github.com/metabolist/metatext.git
synced 2024-11-25 09:41:00 +00:00
Add support for default keyboard in composition view
This commit is contained in:
Raphael Stäbler
parent
b42dd286e6
commit
32d4276f40
21 changed files with 94 additions and 1 deletions
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "Cal que toquis dues vegades per fer-ho favorit";
|
||||
"preferences.show-reblog-and-favorite-counts" = "Mostra el recompte d’impulsos i favorits";
|
||||
"preferences.status-word" = "Paraula d’estat";
|
||||
"preferences.keyboard-type" = "Teclat";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "Per defecte";
|
||||
"filters.active" = "Actiu";
|
||||
"filters.expired" = "Caducat";
|
||||
"filter.add-new" = "Afegeix un filtre nou";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "Vyžadovat dvojité klepnutí pro oblíbené";
|
||||
"preferences.show-reblog-and-favorite-counts" = "Zobrazit boostů a počet oblíbených";
|
||||
"preferences.status-word" = "Toot/Příspěvek";
|
||||
"preferences.keyboard-type" = "Klávesnice";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "Výchozí";
|
||||
"filters.active" = "Aktivní";
|
||||
"filters.expired" = "Platnost vypršela";
|
||||
"filter.add-new" = "Přidat nový filtr";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "Doppelklick zum Favorisieren";
|
||||
"preferences.show-reblog-and-favorite-counts" = "Boosts und Favoriten anzeigen";
|
||||
"preferences.status-word" = "Statuswort";
|
||||
"preferences.keyboard-type" = "Tastatur";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "Standard";
|
||||
"filters.active" = "Aktiv";
|
||||
"filters.expired" = "Abgelaufen";
|
||||
"filter.add-new" = "Neuer Filter";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "Να απαιτείται διπλό πάτημα για προσθήκη στα αγαπημένα";
|
||||
"preferences.show-reblog-and-favorite-counts" = "Εμφάνιση μετρήσεων των boosts και αγαπημένων";
|
||||
"preferences.status-word" = "Λέξη κατάστασης";
|
||||
"preferences.keyboard-type" = "Πληκτρολόγιο";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "Προκαθορισμένο";
|
||||
"filters.active" = "Ενεργό";
|
||||
"filters.expired" = "Έληξε";
|
||||
"filter.add-new" = "Προσθήκη Νέου Φίλτρου";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "Require double tap to favorite";
|
||||
"preferences.show-reblog-and-favorite-counts" = "Show boost and favorite counts";
|
||||
"preferences.status-word" = "Status word";
|
||||
"preferences.keyboard-type" = "Keyboard";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "Default";
|
||||
"filters.active" = "Active";
|
||||
"filters.expired" = "Expired";
|
||||
"filter.add-new" = "Add New Filter";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "Requerir doble toque para añadir a favoritos";
|
||||
"preferences.show-reblog-and-favorite-counts" = "Mostrar boost y cuentas favoritas";
|
||||
"preferences.status-word" = "Palabra de estado";
|
||||
"preferences.keyboard-type" = "Teclado";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "Defecto";
|
||||
"filters.active" = "Activo";
|
||||
"filters.expired" = "Ha caducado";
|
||||
"filter.add-new" = "Añadir un filtro nuevo";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "Gogoko egiteko birritan sakatu behar da";
|
||||
"preferences.show-reblog-and-favorite-counts" = "Erakutsi bultzada eta gogoko kopurua";
|
||||
"preferences.status-word" = "Nahiago duzun hitza";
|
||||
"preferences.keyboard-type" = "Teklatua";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "Lehenetsia";
|
||||
"filters.active" = "Aktibo";
|
||||
"filters.expired" = "Iraungita";
|
||||
"filter.add-new" = "Gehitu iragazki berria";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "Nécessite un double appui pour ajouter aux favoris";
|
||||
"preferences.show-reblog-and-favorite-counts" = "Afficher le nombre de partages/favoris";
|
||||
"preferences.status-word" = "Mot de statut";
|
||||
"preferences.keyboard-type" = "Clavier";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "Défaut";
|
||||
"filters.active" = "Actifs";
|
||||
"filters.expired" = "Expirés";
|
||||
"filter.add-new" = "Ajouter un nouveau filtre";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "Thoir gnogag dhùbailte airson annsachd a chruthachadh";
|
||||
"preferences.show-reblog-and-favorite-counts" = "Seall cunntas nam brosnachaidhean ’s nan annsachdan";
|
||||
"preferences.status-word" = "Facal puist";
|
||||
"preferences.keyboard-type" = "Meur-chlàr";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "Bunaiteach";
|
||||
"filters.active" = "Gnìomhach";
|
||||
"filters.expired" = "Thàinig e gu crìoch";
|
||||
"filter.add-new" = "Cuir criathrag ùr ris";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "דרוש לחיצה כפולה כדי להדהד";
|
||||
"preferences.show-reblog-and-favorite-counts" = "הצג מספר הדהודים וחיבובים";
|
||||
"preferences.status-word" = "מילת סטטוס";
|
||||
"preferences.keyboard-type" = "מקלדת";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "בְּרִירַת מֶחדָל";
|
||||
"filters.active" = "פעיל";
|
||||
"filters.expired" = "פג תוקף";
|
||||
"filter.add-new" = "הוספת מסנן חדש";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "ダブルタップでお気に入り";
|
||||
"preferences.show-reblog-and-favorite-counts" = "ブースト・お気に入り数を表示";
|
||||
"preferences.status-word" = "ステータスを表す言葉";
|
||||
"preferences.keyboard-type" = "キーボード";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "デフォルト";
|
||||
"filters.active" = "有効";
|
||||
"filters.expired" = "期限切れ";
|
||||
"filter.add-new" = "新しいフィルターを追加";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "두 번 탭 해서 즐겨찾기";
|
||||
"preferences.show-reblog-and-favorite-counts" = "부스트 및 즐겨찾기 수 표시";
|
||||
"preferences.status-word" = "상태를 나타내는 말";
|
||||
"preferences.keyboard-type" = "건반";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "기본";
|
||||
"filters.active" = "활성화";
|
||||
"filters.expired" = "만료됨";
|
||||
"filter.add-new" = "새 필터 추가";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "Wymagaj podwójnego stuknięcia do polubienia";
|
||||
"preferences.show-reblog-and-favorite-counts" = "Pokazuj licznik podbić i polubień";
|
||||
"preferences.status-word" = "Używaj jako nazwy statusu";
|
||||
"preferences.keyboard-type" = "Klawiatura";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "Domyślna";
|
||||
"filters.active" = "Aktywny";
|
||||
"filters.expired" = "Wygasły";
|
||||
"filter.add-new" = "Dodaj nowy filtr";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "Solicitar toque duplo para favoritar";
|
||||
"preferences.show-reblog-and-favorite-counts" = "Mostrar contagem de boosts e favoritos";
|
||||
"preferences.status-word" = "Estado da palavra";
|
||||
"preferences.keyboard-type" = "Teclado";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "Predefinição";
|
||||
"filters.active" = "Ativo";
|
||||
"filters.expired" = "Expirados";
|
||||
"filter.add-new" = "Adicionar Novo Filtro";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "Требуется двойное нажатие для добавления в избранное";
|
||||
"preferences.show-reblog-and-favorite-counts" = "Показать счётчик продвижений и добавлений в избранное";
|
||||
"preferences.status-word" = "Название статусов";
|
||||
"preferences.keyboard-type" = "Клавиатура";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "дефолт";
|
||||
"filters.active" = "Активный";
|
||||
"filters.expired" = "Истёк";
|
||||
"filter.add-new" = "Добавить новый фильтр";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "Kräv dubbeltryck för att favoritmarkera";
|
||||
"preferences.show-reblog-and-favorite-counts" = "Visa antal boosts och favoritmarkeringar";
|
||||
"preferences.status-word" = "Statusord";
|
||||
"preferences.keyboard-type" = "Tangentbord";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "Standard";
|
||||
"filters.active" = "Aktiv";
|
||||
"filters.expired" = "Upphört";
|
||||
"filter.add-new" = "Lägg till nytt filter";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "需要双击才能点赞";
|
||||
"preferences.show-reblog-and-favorite-counts" = "显示转发与点赞的计数";
|
||||
"preferences.status-word" = "表述状态用的词";
|
||||
"preferences.keyboard-type" = "键盘";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "默认";
|
||||
"filters.active" = "已启用";
|
||||
"filters.expired" = "已过期";
|
||||
"filter.add-new" = "添加新筛选器";
|
||||
|
|
|
|||
|
|
@ -253,6 +253,9 @@
|
|||
"preferences.require-double-tap-to-favorite" = "需要點按兩次才能收藏";
|
||||
"preferences.show-reblog-and-favorite-counts" = "顯示轉嘟與收藏的次數";
|
||||
"preferences.status-word" = "狀態字";
|
||||
"preferences.keyboard-type" = "鍵盤";
|
||||
"preferences.keyboard-type.twitter" = "Twitter";
|
||||
"preferences.keyboard-type.default-text" = "默認";
|
||||
"filters.active" = "已啟用";
|
||||
"filters.expired" = "已過期";
|
||||
"filter.add-new" = "新增篩選器";
|
||||
|
|
|
|||
|
|
@ -40,6 +40,13 @@ public extension AppPreferences {
|
|||
public var id: String { rawValue }
|
||||
}
|
||||
|
||||
enum KeyboardType: String, CaseIterable, Identifiable {
|
||||
case twitter
|
||||
case defaultText
|
||||
|
||||
public var id: String { rawValue }
|
||||
}
|
||||
|
||||
enum Autoplay: String, CaseIterable, Identifiable {
|
||||
case always
|
||||
case wifi
|
||||
|
|
@ -91,6 +98,18 @@ public extension AppPreferences {
|
|||
set { self[.animateAvatars] = newValue.rawValue }
|
||||
}
|
||||
|
||||
var keyboardType: KeyboardType {
|
||||
get {
|
||||
if let rawValue = self[.keyboardType] as String?,
|
||||
let value = KeyboardType(rawValue: rawValue) {
|
||||
return value
|
||||
}
|
||||
|
||||
return .twitter
|
||||
}
|
||||
set { self[.keyboardType] = newValue.rawValue }
|
||||
}
|
||||
|
||||
var animateHeaders: Bool {
|
||||
get { self[.animateHeaders] ?? !systemReduceMotion() }
|
||||
set { self[.animateHeaders] = newValue }
|
||||
|
|
@ -210,6 +229,7 @@ private extension AppPreferences {
|
|||
case requireDoubleTapToReblog
|
||||
case requireDoubleTapToFavorite
|
||||
case animateAvatars
|
||||
case keyboardType
|
||||
case animateHeaders
|
||||
case animateCustomEmojis
|
||||
case autoplayGIFs
|
||||
|
|
|
|||
|
|
@ -101,6 +101,12 @@ struct PreferencesView: View {
|
|||
Text(option.localizedStringKey).tag(option)
|
||||
}
|
||||
}
|
||||
Picker("preferences.keyboard-type",
|
||||
selection: $identityContext.appPreferences.keyboardType) {
|
||||
ForEach(AppPreferences.KeyboardType.allCases) { option in
|
||||
Text(option.localizedStringKey).tag(option)
|
||||
}
|
||||
}
|
||||
Toggle("preferences.show-reblog-and-favorite-counts",
|
||||
isOn: $identityContext.appPreferences.showReblogAndFavoriteCounts)
|
||||
Toggle("preferences.require-double-tap-to-reblog",
|
||||
|
|
@ -195,6 +201,17 @@ extension AppPreferences.AnimateAvatars {
|
|||
}
|
||||
}
|
||||
|
||||
extension AppPreferences.KeyboardType {
|
||||
var localizedStringKey: LocalizedStringKey {
|
||||
switch self {
|
||||
case .twitter:
|
||||
return "preferences.keyboard-type.twitter"
|
||||
case .defaultText:
|
||||
return "preferences.keyboard-type.default-text"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension AppPreferences.Autoplay {
|
||||
var localizedStringKey: LocalizedStringKey {
|
||||
switch self {
|
||||
|
|
|
|||
|
|
@ -107,7 +107,9 @@ private extension CompositionView {
|
|||
autocompleteQueryPublisher: viewModel.$autocompleteQuery.eraseToAnyPublisher())
|
||||
|
||||
stackView.addArrangedSubview(textView)
|
||||
textView.keyboardType = .twitter
|
||||
textView.keyboardType = parentViewModel.identityContext.appPreferences.keyboardType == .twitter
|
||||
? .twitter
|
||||
: .default
|
||||
textView.isScrollEnabled = false
|
||||
textView.adjustsFontForContentSizeCategory = true
|
||||
textView.font = textViewFont
|
||||
|
|
|
|||
Loading…
Reference in a new issue