Skip to content

Created TranslationLanguagePickerView.swift. It now uses a modern Swi… #641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vishuzz wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Created TranslationLanguagePickerView.swift. It now uses a modern Swi… #641

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
379abd4
Created TranslationLanguagePickerView.swift. It now uses a modern Swi…
Vishuzz Apr 1, 2026
32017ce
Created LanguageSettingsView.swift which handles layout toggles and t…
Vishuzz Apr 3, 2026
a5f9cfc
This completes the bottom-up migration of the Settings tab to SwiftUI…
Vishuzz Apr 3, 2026
fcecf5f
Merge branch 'main' into resolve-pbxproj-conflict
Vishuzz Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions Scribe.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,11 @@
38BD214F22D592CA00C6795D /* DEKeyboardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38BD214E22D592CA00C6795D /* DEKeyboardViewController.swift */; };
38BD215322D592CA00C6795D /* German.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 38BD214C22D592CA00C6795D /* German.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
38DD94F122D6A40000FF8845 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38DD94F022D6A40000FF8845 /* Extensions.swift */; };
5A68DA412CDE7B7A00897FAD /* RadioTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A68DA3D2CDE7B7900897FAD /* RadioTableViewCell.swift */; };
5A68DA422CDE7B7A00897FAD /* RadioTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A68DA3E2CDE7B7900897FAD /* RadioTableViewCell.xib */; };
5A68DA432CDE7B7A00897FAD /* SelectionViewTemplateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A68DA3F2CDE7B7900897FAD /* SelectionViewTemplateViewController.swift */; };
5A8FFB6B2C5A9D9C00F4B571 /* English.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D1AFDF3D29CA66D00033BF27 /* English.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
693150472C881DCE005F99E8 /* BaseTableViewControllerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 693150462C881DCE005F99E8 /* BaseTableViewControllerTest.swift */; };
69B81EBC2BFB8C77008CAB85 /* TipCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69B81EBB2BFB8C77008CAB85 /* TipCardView.swift */; };
84AF4D882C3575EA009AE0D2 /* UIDeviceExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AF4D872C3575EA009AE0D2 /* UIDeviceExtensions.swift */; };
8B82A46F2F7D6E0400F1B04D /* TranslationLanguagePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B82A46E2F7D6E0300F1B04D /* TranslationLanguagePickerView.swift */; };
CE1378C428F5D7AC00E1CBC2 /* ScribeColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1378C228F5D7AC00E1CBC2 /* ScribeColor.swift */; };
CE1378C528F5D7AC00E1CBC2 /* ScribeColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1378C228F5D7AC00E1CBC2 /* ScribeColor.swift */; };
CE1378C628F5D7AC00E1CBC2 /* ScribeColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1378C228F5D7AC00E1CBC2 /* ScribeColor.swift */; };
Expand Down Expand Up @@ -769,7 +767,6 @@
F786BB292F1E8F70003F7505 /* IDLanguageData.sqlite in Resources */ = {isa = PBXBuildFile; fileRef = D16150FB2E9DBDC500131732 /* IDLanguageData.sqlite */; };
F786BB2A2F1E8F70003F7505 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D1895BD12C1D816F009FBEB0 /* Settings.bundle */; };
F786BB2B2F1E8F70003F7505 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 38BD213F22D5908100C6795D /* LaunchScreen.storyboard */; };
F786BB2C2F1E8F70003F7505 /* RadioTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A68DA3E2CDE7B7900897FAD /* RadioTableViewCell.xib */; };
F786BB2D2F1E8F70003F7505 /* InfoChildTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 147797AF2A2CD3370044A53E /* InfoChildTableViewCell.xib */; };
F786BB2E2F1E8F70003F7505 /* AboutTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = ED2486F22B0B4E8C0038AE6A /* AboutTableViewCell.xib */; };
F786BB2F2F1E8F70003F7505 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = E93179A32F03AE77002ED334 /* Localizable.xcstrings */; };
Expand Down Expand Up @@ -1042,12 +1039,10 @@
38BD214E22D592CA00C6795D /* DEKeyboardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DEKeyboardViewController.swift; sourceTree = "<group>"; };
38BD215022D592CA00C6795D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
38DD94F022D6A40000FF8845 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
5A68DA3D2CDE7B7900897FAD /* RadioTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadioTableViewCell.swift; sourceTree = "<group>"; };
5A68DA3E2CDE7B7900897FAD /* RadioTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RadioTableViewCell.xib; sourceTree = "<group>"; };
5A68DA3F2CDE7B7900897FAD /* SelectionViewTemplateViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectionViewTemplateViewController.swift; sourceTree = "<group>"; };
693150462C881DCE005F99E8 /* BaseTableViewControllerTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseTableViewControllerTest.swift; sourceTree = "<group>"; };
69B81EBB2BFB8C77008CAB85 /* TipCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TipCardView.swift; sourceTree = "<group>"; };
84AF4D872C3575EA009AE0D2 /* UIDeviceExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIDeviceExtensions.swift; sourceTree = "<group>"; };
8B82A46E2F7D6E0300F1B04D /* TranslationLanguagePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslationLanguagePickerView.swift; sourceTree = "<group>"; };
CE1378C228F5D7AC00E1CBC2 /* ScribeColor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScribeColor.swift; sourceTree = "<group>"; };
CE1378C328F5D7AC00E1CBC2 /* UIColor+ScribeColors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+ScribeColors.swift"; sourceTree = "<group>"; };
D109A20B275B6888005E2271 /* French.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = French.appex; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -1683,8 +1678,6 @@
5A68DA402CDE7B7900897FAD /* RadioTableViewCell */ = {
isa = PBXGroup;
children = (
5A68DA3D2CDE7B7900897FAD /* RadioTableViewCell.swift */,
5A68DA3E2CDE7B7900897FAD /* RadioTableViewCell.xib */,
);
path = RadioTableViewCell;
sourceTree = "<group>";
Expand Down Expand Up @@ -2020,7 +2013,7 @@
children = (
5A68DA442CDE7D2900897FAD /* Cells */,
EDB460202B03B3E400BEA967 /* BaseTableViewController.swift */,
5A68DA3F2CDE7B7900897FAD /* SelectionViewTemplateViewController.swift */,
8B82A46E2F7D6E0300F1B04D /* TranslationLanguagePickerView.swift */,
140158A12A4EDB2200D14E52 /* TableViewTemplateViewController.swift */,
);
path = Views;
Expand Down Expand Up @@ -2653,7 +2646,6 @@
D16150FD2E9DBDED00131732 /* IDLanguageData.sqlite in Resources */,
D1895BD22C1D816F009FBEB0 /* Settings.bundle in Resources */,
38BD214122D5908100C6795D /* LaunchScreen.storyboard in Resources */,
5A68DA422CDE7B7A00897FAD /* RadioTableViewCell.xib in Resources */,
147797B12A2CD3370044A53E /* InfoChildTableViewCell.xib in Resources */,
ED2486F42B0B4E8C0038AE6A /* AboutTableViewCell.xib in Resources */,
E93179A42F03AE78002ED334 /* Localizable.xcstrings in Resources */,
Expand Down Expand Up @@ -2807,7 +2799,6 @@
F786BB292F1E8F70003F7505 /* IDLanguageData.sqlite in Resources */,
F786BB2A2F1E8F70003F7505 /* Settings.bundle in Resources */,
F786BB2B2F1E8F70003F7505 /* LaunchScreen.storyboard in Resources */,
F786BB2C2F1E8F70003F7505 /* RadioTableViewCell.xib in Resources */,
F786BB2D2F1E8F70003F7505 /* InfoChildTableViewCell.xib in Resources */,
F786BB2E2F1E8F70003F7505 /* AboutTableViewCell.xib in Resources */,
F786BB2F2F1E8F70003F7505 /* Localizable.xcstrings in Resources */,
Expand Down Expand Up @@ -2871,6 +2862,7 @@
D171946527AF31770038660B /* Conjugate.swift in Sources */,
147797B52A2CFB490044A53E /* SettingsViewController.swift in Sources */,
1406B7872A2DFCDD001DF45B /* AboutTableData.swift in Sources */,
8B82A46F2F7D6E0400F1B04D /* TranslationLanguagePickerView.swift in Sources */,
E9202DF02F0FAA0C001590FC /* DownloadStateManager.swift in Sources */,
E996498A2E98AC6000200F53 /* IDInterfaceVariables.swift in Sources */,
3045396D293B9DDC003AE55B /* ToolTipViewDatasource.swift in Sources */,
Expand Down Expand Up @@ -2901,7 +2893,6 @@
38BD213422D5907F00C6795D /* AppDelegate.swift in Sources */,
30489C1E2936DAB700B59393 /* ToolTipView.swift in Sources */,
3045396F293B9DF2003AE55B /* ToolTipViewTheme.swift in Sources */,
5A68DA412CDE7B7A00897FAD /* RadioTableViewCell.swift in Sources */,
E9F7273E2F45A6DE0060B92D /* LanguageDataService.swift in Sources */,
D1F0367327AAE1B400CD7921 /* CommandVariables.swift in Sources */,
E9CE5EA82F063E230068A930 /* DownloadDataScreen.swift in Sources */,
Expand All @@ -2925,7 +2916,6 @@
D111E9A227AFE4F300746F92 /* CommandBar.swift in Sources */,
30453967293B9D31003AE55B /* ViewThemeable.swift in Sources */,
D1362A39274C106A00C00E48 /* ColorVariables.swift in Sources */,
5A68DA432CDE7B7A00897FAD /* SelectionViewTemplateViewController.swift in Sources */,
ED2486F32B0B4E8C0038AE6A /* AboutTableViewCell.swift in Sources */,
D1A2DCB127AD37BD0057A10D /* InstallScreen.swift in Sources */,
D171944927AEF7290038660B /* KeyboardKeys.swift in Sources */,
Expand Down
20 changes: 0 additions & 20 deletions Scribe/Base.lproj/AppScreen.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,32 +558,12 @@
</tableView>
<navigationItem key="navigationItem" id="vhy-kK-VNo"/>
<connections>
<segue destination="oOM-lN-cEA" kind="show" identifier="Select option within keyboard settings" id="5Pu-48-MeW"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="AWg-K9-pJG" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="25" y="-100"/>
</scene>
<!--Selection View Template View Controller-->
<scene sceneID="Y04-va-yC3">
<objects>
<tableViewController storyboardIdentifier="SelectionViewTemplateViewController" id="oOM-lN-cEA" userLabel="Selection View Template View Controller" customClass="SelectionViewTemplateViewController" customModule="Scribe" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="insetGrouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" estimatedSectionHeaderHeight="-1" sectionFooterHeight="18" estimatedSectionFooterHeight="-1" id="SS2-uh-4eH">
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" name="scribeAppBackground"/>
<connections>
<outlet property="dataSource" destination="oOM-lN-cEA" id="o1H-zm-BFJ"/>
<outlet property="delegate" destination="oOM-lN-cEA" id="IoE-QL-Kun"/>
</connections>
</tableView>
<navigationItem key="navigationItem" id="ApL-7K-SMa"/>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="T2o-Rh-3Dh" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="956" y="-100"/>
</scene>
<!--i18n.app.installation.title-->
<scene sceneID="2my-SI-kbz">
<objects>
Expand Down
18 changes: 7 additions & 11 deletions Scribe/InstallationTab/InstallationVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,14 +469,6 @@ extension InstallationVC {
}

private func navigateToTranslationSourceSelection(languageCode: String, languageName: String) {
guard
let selectionVC = storyboard?.instantiateViewController(
identifier: "SelectionViewTemplateViewController"
) as? SelectionViewTemplateViewController
else {
return
}

if let hostingController = navigationController?.viewControllers.last
as? UIHostingController<DownloadDataScreen> {
hostingController.navigationItem.backButtonTitle = NSLocalizedString(
Expand All @@ -495,7 +487,7 @@ extension InstallationVC {
translateData[0].section.remove(at: langCodeIndex)
}

let parentSection = Section(
let parentSection = Scribe.Section(
sectionTitle: languageName,
imageString: nil,
hasToggle: false,
Expand All @@ -505,9 +497,13 @@ extension InstallationVC {
externalLink: false
)

selectionVC.configureTable(
for: translateData, parentSection: parentSection, langCode: languageCode
let pickerView = TranslationLanguagePickerView(
tableData: translateData,
parentSection: parentSection,
langCode: languageCode
)

let selectionVC = UIHostingController(rootView: pickerView)
selectionVC.edgesForExtendedLayout = .all

// Copy navigation bar appearance from Settings tab.
Expand Down
70 changes: 0 additions & 70 deletions Scribe/Views/Cells/RadioTableViewCell/RadioTableViewCell.swift
View file
Open in desktop

This file was deleted.

Loading
Loading