Skip to content

Commit c971950

Browse files
andrewtavisandrewtavis
committed
v3.1 update, accent option reactive to i18n, large de text, l10n changes
1 parent 8e7a326 commit c971950

File tree

4 files changed

+430
-408
lines changed

4 files changed

+430
-408
lines changed

‎Scribe.xcodeproj/project.pbxproj

+24-24
Original file line numberDiff line numberDiff line change
@@ -2984,7 +2984,7 @@
29842984
"$(inherited)",
29852985
"@executable_path/Frameworks",
29862986
);
2987-
MARKETING_VERSION = 3.0.0;
2987+
MARKETING_VERSION = 3.1.0;
29882988
PRODUCT_BUNDLE_IDENTIFIER = org.scribe;
29892989
PRODUCT_NAME = "$(TARGET_NAME)";
29902990
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3013,7 +3013,7 @@
30133013
"$(inherited)",
30143014
"@executable_path/Frameworks",
30153015
);
3016-
MARKETING_VERSION = 3.0.0;
3016+
MARKETING_VERSION = 3.1.0;
30173017
PRODUCT_BUNDLE_IDENTIFIER = org.scribe;
30183018
PRODUCT_NAME = "$(TARGET_NAME)";
30193019
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3042,7 +3042,7 @@
30423042
"@executable_path/Frameworks",
30433043
"@executable_path/../../Frameworks",
30443044
);
3045-
MARKETING_VERSION = 3.0.0;
3045+
MARKETING_VERSION = 3.1.0;
30463046
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.german;
30473047
PRODUCT_NAME = "$(TARGET_NAME)";
30483048
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3072,7 +3072,7 @@
30723072
"@executable_path/Frameworks",
30733073
"@executable_path/../../Frameworks",
30743074
);
3075-
MARKETING_VERSION = 3.0.0;
3075+
MARKETING_VERSION = 3.1.0;
30763076
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.german;
30773077
PRODUCT_NAME = "$(TARGET_NAME)";
30783078
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3102,7 +3102,7 @@
31023102
"@executable_path/Frameworks",
31033103
"@executable_path/../../Frameworks",
31043104
);
3105-
MARKETING_VERSION = 3.0.0;
3105+
MARKETING_VERSION = 3.1.0;
31063106
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.french;
31073107
PRODUCT_NAME = "$(TARGET_NAME)";
31083108
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3132,7 +3132,7 @@
31323132
"@executable_path/Frameworks",
31333133
"@executable_path/../../Frameworks",
31343134
);
3135-
MARKETING_VERSION = 3.0.0;
3135+
MARKETING_VERSION = 3.1.0;
31363136
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.french;
31373137
PRODUCT_NAME = "$(TARGET_NAME)";
31383138
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3162,7 +3162,7 @@
31623162
"@executable_path/Frameworks",
31633163
"@executable_path/../../Frameworks",
31643164
);
3165-
MARKETING_VERSION = 3.0.0;
3165+
MARKETING_VERSION = 3.1.0;
31663166
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.portuguese;
31673167
PRODUCT_NAME = "$(TARGET_NAME)";
31683168
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3192,7 +3192,7 @@
31923192
"@executable_path/Frameworks",
31933193
"@executable_path/../../Frameworks",
31943194
);
3195-
MARKETING_VERSION = 3.0.0;
3195+
MARKETING_VERSION = 3.1.0;
31963196
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.portuguese;
31973197
PRODUCT_NAME = "$(TARGET_NAME)";
31983198
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3222,7 +3222,7 @@
32223222
"@executable_path/Frameworks",
32233223
"@executable_path/../../Frameworks",
32243224
);
3225-
MARKETING_VERSION = 3.0.0;
3225+
MARKETING_VERSION = 3.1.0;
32263226
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.spanish;
32273227
PRODUCT_NAME = "$(TARGET_NAME)";
32283228
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3252,7 +3252,7 @@
32523252
"@executable_path/Frameworks",
32533253
"@executable_path/../../Frameworks",
32543254
);
3255-
MARKETING_VERSION = 3.0.0;
3255+
MARKETING_VERSION = 3.1.0;
32563256
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.spanish;
32573257
PRODUCT_NAME = "$(TARGET_NAME)";
32583258
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3282,7 +3282,7 @@
32823282
"@executable_path/Frameworks",
32833283
"@executable_path/../../Frameworks",
32843284
);
3285-
MARKETING_VERSION = 3.0.0;
3285+
MARKETING_VERSION = 3.1.0;
32863286
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.russian;
32873287
PRODUCT_NAME = "$(TARGET_NAME)";
32883288
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3312,7 +3312,7 @@
33123312
"@executable_path/Frameworks",
33133313
"@executable_path/../../Frameworks",
33143314
);
3315-
MARKETING_VERSION = 3.0.0;
3315+
MARKETING_VERSION = 3.1.0;
33163316
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.russian;
33173317
PRODUCT_NAME = "$(TARGET_NAME)";
33183318
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3342,7 +3342,7 @@
33423342
"@executable_path/Frameworks",
33433343
"@executable_path/../../Frameworks",
33443344
);
3345-
MARKETING_VERSION = 3.0.0;
3345+
MARKETING_VERSION = 3.1.0;
33463346
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.swedish;
33473347
PRODUCT_NAME = "$(TARGET_NAME)";
33483348
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3372,7 +3372,7 @@
33723372
"@executable_path/Frameworks",
33733373
"@executable_path/../../Frameworks",
33743374
);
3375-
MARKETING_VERSION = 3.0.0;
3375+
MARKETING_VERSION = 3.1.0;
33763376
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.swedish;
33773377
PRODUCT_NAME = "$(TARGET_NAME)";
33783378
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3401,7 +3401,7 @@
34013401
"@executable_path/Frameworks",
34023402
"@executable_path/../../Frameworks",
34033403
);
3404-
MARKETING_VERSION = 3.0.0;
3404+
MARKETING_VERSION = 3.1.0;
34053405
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.norwegian;
34063406
PRODUCT_NAME = "$(TARGET_NAME)";
34073407
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3430,7 +3430,7 @@
34303430
"@executable_path/Frameworks",
34313431
"@executable_path/../../Frameworks",
34323432
);
3433-
MARKETING_VERSION = 3.0.0;
3433+
MARKETING_VERSION = 3.1.0;
34343434
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.norwegian;
34353435
PRODUCT_NAME = "$(TARGET_NAME)";
34363436
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3459,7 +3459,7 @@
34593459
"@executable_path/Frameworks",
34603460
"@executable_path/../../Frameworks",
34613461
);
3462-
MARKETING_VERSION = 3.0.0;
3462+
MARKETING_VERSION = 3.1.0;
34633463
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.english;
34643464
PRODUCT_NAME = "$(TARGET_NAME)";
34653465
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3484,7 +3484,7 @@
34843484
"@executable_path/Frameworks",
34853485
"@executable_path/../../Frameworks",
34863486
);
3487-
MARKETING_VERSION = 3.0.0;
3487+
MARKETING_VERSION = 3.1.0;
34883488
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.english;
34893489
PRODUCT_NAME = "$(TARGET_NAME)";
34903490
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3509,7 +3509,7 @@
35093509
"@executable_path/Frameworks",
35103510
"@executable_path/../../Frameworks",
35113511
);
3512-
MARKETING_VERSION = 3.0.0;
3512+
MARKETING_VERSION = 3.1.0;
35133513
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.danish;
35143514
PRODUCT_NAME = "$(TARGET_NAME)";
35153515
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3538,7 +3538,7 @@
35383538
"@executable_path/Frameworks",
35393539
"@executable_path/../../Frameworks",
35403540
);
3541-
MARKETING_VERSION = 3.0.0;
3541+
MARKETING_VERSION = 3.1.0;
35423542
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.danish;
35433543
PRODUCT_NAME = "$(TARGET_NAME)";
35443544
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3567,7 +3567,7 @@
35673567
"@executable_path/Frameworks",
35683568
"@executable_path/../../Frameworks",
35693569
);
3570-
MARKETING_VERSION = 3.0.0;
3570+
MARKETING_VERSION = 3.1.0;
35713571
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.hebrew;
35723572
PRODUCT_NAME = "$(TARGET_NAME)";
35733573
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3596,7 +3596,7 @@
35963596
"@executable_path/Frameworks",
35973597
"@executable_path/../../Frameworks",
35983598
);
3599-
MARKETING_VERSION = 3.0.0;
3599+
MARKETING_VERSION = 3.1.0;
36003600
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.hebrew;
36013601
PRODUCT_NAME = "$(TARGET_NAME)";
36023602
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3626,7 +3626,7 @@
36263626
"@executable_path/Frameworks",
36273627
"@executable_path/../../Frameworks",
36283628
);
3629-
MARKETING_VERSION = 3.0.0;
3629+
MARKETING_VERSION = 3.1.0;
36303630
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.italian;
36313631
PRODUCT_NAME = "$(TARGET_NAME)";
36323632
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3656,7 +3656,7 @@
36563656
"@executable_path/Frameworks",
36573657
"@executable_path/../../Frameworks",
36583658
);
3659-
MARKETING_VERSION = 3.0.0;
3659+
MARKETING_VERSION = 3.1.0;
36603660
PRODUCT_BUNDLE_IDENTIFIER = org.scribe.italian;
36613661
PRODUCT_NAME = "$(TARGET_NAME)";
36623662
PROVISIONING_PROFILE_SPECIFIER = "";

‎Scribe/InstallationTab/InstallationVC.swift

+6-10
Original file line numberDiff line numberDiff line change
@@ -225,16 +225,12 @@ class InstallationVC: UIViewController {
225225
func setCurrentUI() {
226226
// Sets the font size for the text in the app screen and corresponding UIImage icons.
227227
if DeviceType.isPhone {
228-
if Locale.userSystemLanguage == "DE" {
229-
fontSize = UIScreen.main.bounds.height / 61
230-
} else {
231-
if UIScreen.main.bounds.width > 413 || UIScreen.main.bounds.width <= 375 {
232-
print(UIScreen.main.bounds.width)
233-
fontSize = UIScreen.main.bounds.height / 59
234-
} else if UIScreen.main.bounds.width <= 413 && UIScreen.main.bounds.width > 375 {
235-
print(UIScreen.main.bounds.width)
236-
fontSize = UIScreen.main.bounds.height / 50
237-
}
228+
if UIScreen.main.bounds.width > 413 || UIScreen.main.bounds.width <= 375 {
229+
print(UIScreen.main.bounds.width)
230+
fontSize = UIScreen.main.bounds.height / 59
231+
} else if UIScreen.main.bounds.width <= 413 && UIScreen.main.bounds.width > 375 {
232+
print(UIScreen.main.bounds.width)
233+
fontSize = UIScreen.main.bounds.height / 50
238234
}
239235

240236
} else if DeviceType.isPad {

‎Scribe/SettingsTab/SettingsViewController.swift

+9-8
Original file line numberDiff line numberDiff line change
@@ -179,26 +179,27 @@ extension SettingsViewController: UITableViewDelegate {
179179
data.remove(at: 0)
180180
}
181181
} else {
182-
let periodCommaOptionIndex = SettingsTableData.languageSettingsData[0].section.firstIndex(where: { s in
183-
s.sectionTitle.elementsEqual(NSLocalizedString("app.settings.layout.periodAndComma", value: "Period and comma on ABC", comment: ""))
184-
}) ?? -1
185-
186182
// Languages where we can disable accent keys.
187-
let accentKeyLanguages: [String] = ["Swedish", "German", "Spanish"]
183+
let accentKeyLanguages: [String] = [
184+
NSLocalizedString("_global.german", comment: ""),
185+
NSLocalizedString("_global.spanish", comment: ""),
186+
NSLocalizedString("_global.swedish", comment: "")
187+
]
188+
188189
let accentKeyOptionIndex = SettingsTableData.languageSettingsData[0].section.firstIndex(where: { s in
189190
s.sectionTitle.elementsEqual(NSLocalizedString("app.settings.layout.disableAccentCharacters", value: "Disable accent characters", comment: ""))
190191
}) ?? -1
191192

192193
// If there are no accent keys we can remove the `Disable accent characters` option.
193194
if accentKeyLanguages.firstIndex(of: section.sectionTitle) == nil && accentKeyOptionIndex != -1 {
194-
let accentKeySettings = data[0].section.remove(at: accentKeyOptionIndex)
195-
print(accentKeySettings)
195+
data[0].section.remove(at: accentKeyOptionIndex)
196196
} else if accentKeyLanguages.firstIndex(of: section.sectionTitle) != nil && accentKeyOptionIndex == -1 {
197197
data[0].section.insert(Section(
198198
sectionTitle: NSLocalizedString("app.settings.layout.disableAccentCharacters", value: "Disable accent characters", comment: ""),
199199
imageString: "info.circle",
200200
hasToggle: true,
201-
sectionState: .none(.toggleAccentCharacters)
201+
sectionState: .none(.toggleAccentCharacters),
202+
shortDescription: NSLocalizedString("app.settings.layout.disableAccentCharacters.description", value: "Include accented letter keys on the primary keyboard layout.", comment: "")
202203
), at: 1
203204
)
204205
}

0 commit comments

Comments
 (0)