Skip to content

Commit

Permalink
#303 unhide but disable BR declension btn during certain cases
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewtavis committed May 26, 2023
1 parent 82b556e commit 06bc3ae
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ Scribe-iOS tries to follow [semantic versioning](https://semver.org/), a MAJOR.M

Emojis for the following are chosen based on [gitmoji](https://gitmoji.dev/).

# [Upcoming] Scribe-iOS 2.4.0

### ✨ New Features

- German indefinite pronouns are now selectable from the case-declension display.

# Scribe-iOS 2.3.0

### ✨ New Features
Expand All @@ -23,7 +29,7 @@ Emojis for the following are chosen based on [gitmoji](https://gitmoji.dev/).
### 🗃️ Data Added

- French: 2 nouns
- German: 44 nouns, 1 verb, 20 prepositions, 9 pronouns
- German: 44 nouns, 1 verb, 20 prepositions
- Italian: 2 nouns
- Spanish: 350 nouns, 102 verbs
- Swedish: 635 nouns, 27 verbs
Expand Down
11 changes: 5 additions & 6 deletions Keyboards/KeyboardsBase/KeyboardViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1058,12 +1058,6 @@ class KeyboardViewController: UIInputViewController {
activateBtn(btn: btn)
btn.isEnabled = true
}

if controllerLanguage == "German"
&& [.accusativeIndefinite, .dativeIndefinite, .genitiveIndefinite].contains(deCaseDeclensionState) {
deactivateBtn(btn: formKeyBR)
formKeyBR.isEnabled = false
}

if DeviceType.isPad {
var conjugationFontDivisor = 3.5
Expand Down Expand Up @@ -1304,6 +1298,11 @@ class KeyboardViewController: UIInputViewController {
activateBtn(btn: btn)
}

if controllerLanguage == "German"
&& [.accusativeIndefinite, .dativeIndefinite, .genitiveIndefinite].contains(deCaseDeclensionState) {
formKeyBR.isUserInteractionEnabled = false
}

for btn in get3x2FormDisplayButtons() + get3x1FormDisplayButtons() + get1x2FormDisplayButtons() {
deactivateBtn(btn: btn)
}
Expand Down

0 comments on commit 06bc3ae

Please sign in to comment.