diff --git a/Conjugate/AppNavigation.swift b/Conjugate/AppNavigation.swift new file mode 100644 index 00000000..9658122c --- /dev/null +++ b/Conjugate/AppNavigation.swift @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-3.0-or-later + +import SwiftUI + +struct AppNavigation: View { + let content: () -> Content + + var body: some View { + if #available(iOS 16, *) { + NavigationStack { + content() + } + } else { + NavigationView { + content() + } + } + } +} diff --git a/Conjugate/Base.lproj/ConjugateAppScreen.storyboard b/Conjugate/Base.lproj/ConjugateAppScreen.storyboard deleted file mode 100644 index e2030782..00000000 --- a/Conjugate/Base.lproj/ConjugateAppScreen.storyboard +++ /dev/null @@ -1,636 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Conjugate/ConjugateApp.swift b/Conjugate/ConjugateApp.swift new file mode 100644 index 00000000..cba393de --- /dev/null +++ b/Conjugate/ConjugateApp.swift @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-3.0-or-later + +import SwiftUI + +@main +struct ConjugateApp: App { + var body: some Scene { + WindowGroup { + ContentView() + } + } +} diff --git a/Conjugate/ContentView.swift b/Conjugate/ContentView.swift new file mode 100644 index 00000000..ed5bb33b --- /dev/null +++ b/Conjugate/ContentView.swift @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-3.0-or-later + +import SwiftUI + +struct ContentView: View { + var body: some View { + Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/) + } +} + +#Preview { + ContentView() +} diff --git a/Conjugate/Navigation/AppNavigation.swift b/Conjugate/Navigation/AppNavigation.swift new file mode 100644 index 00000000..6a4e9f43 --- /dev/null +++ b/Conjugate/Navigation/AppNavigation.swift @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-3.0-or-later + +import SwiftUI + +struct AppNavigation: View { + @ViewBuilder let content: () -> Content + + var body: some View { + if #available(iOS 16, *) { + NavigationStack { + content() + } + } else { + NavigationView { + content() + } + } + } +} diff --git a/Conjugate/Views/ContentView.swift b/Conjugate/Views/ContentView.swift new file mode 100644 index 00000000..275f7954 --- /dev/null +++ b/Conjugate/Views/ContentView.swift @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-3.0-or-later + +import SwiftUI + +struct ContentView: View { + var body: some View { + TabView { + ConjugateTab() + .tabItem { + Label("Conjugate", systemImage: "character.book.closed") + } + + SettingsTab() + .tabItem { + Label("Settings", systemImage: "gearshape") + } + + AboutTab() + .tabItem { + Label("About", systemImage: "info.circle") + } + } + } +} diff --git a/Conjugate/Views/Tabs/About/AboutTab.swift b/Conjugate/Views/Tabs/About/AboutTab.swift new file mode 100644 index 00000000..f3e878c1 --- /dev/null +++ b/Conjugate/Views/Tabs/About/AboutTab.swift @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-3.0-or-later + +import SwiftUI + +struct AboutTab: View { + var body: some View { + AppNavigation { + Text("About") + .font(.largeTitle) + .navigationTitle("About") + } + } +} diff --git a/Conjugate/Views/Tabs/Conjugate/ConjugateTab.swift b/Conjugate/Views/Tabs/Conjugate/ConjugateTab.swift new file mode 100644 index 00000000..278e935e --- /dev/null +++ b/Conjugate/Views/Tabs/Conjugate/ConjugateTab.swift @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-3.0-or-later + +import SwiftUI + +struct ConjugateTab: View { + var body: some View { + AppNavigation { + Text("Conjugate") + .font(.largeTitle) + .navigationTitle("Conjugate") + } + } +} diff --git a/Conjugate/Views/Tabs/ConjugateTab.swift b/Conjugate/Views/Tabs/ConjugateTab.swift new file mode 100644 index 00000000..278e935e --- /dev/null +++ b/Conjugate/Views/Tabs/ConjugateTab.swift @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-3.0-or-later + +import SwiftUI + +struct ConjugateTab: View { + var body: some View { + AppNavigation { + Text("Conjugate") + .font(.largeTitle) + .navigationTitle("Conjugate") + } + } +} diff --git a/Conjugate/Views/Tabs/Settings/SettingsTab.swift b/Conjugate/Views/Tabs/Settings/SettingsTab.swift new file mode 100644 index 00000000..57468676 --- /dev/null +++ b/Conjugate/Views/Tabs/Settings/SettingsTab.swift @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-3.0-or-later + +import SwiftUI + +struct SettingsTab: View { + var body: some View { + AppNavigation { + Text("Settings") + .font(.largeTitle) + .navigationTitle("Settings") + } + } +} diff --git a/ConjugateApp-Info.plist b/ConjugateApp-Info.plist index c482fe3a..b7ea86b6 100644 --- a/ConjugateApp-Info.plist +++ b/ConjugateApp-Info.plist @@ -22,8 +22,6 @@ 1 UILaunchStoryboardName LaunchScreen - UIMainStoryboardFile - ConjugateAppScreen UIRequiredDeviceCapabilities armv7 diff --git a/Scribe.xcodeproj/project.pbxproj b/Scribe.xcodeproj/project.pbxproj index 233f3833..c6b75b7b 100644 --- a/Scribe.xcodeproj/project.pbxproj +++ b/Scribe.xcodeproj/project.pbxproj @@ -609,7 +609,6 @@ E91980BB2F2F540A00B5852F /* NavigationStructure.swift in Sources */ = {isa = PBXBuildFile; fileRef = E91980B92F2F540000B5852F /* NavigationStructure.swift */; }; E91980BC2F2F540A00B5852F /* NavigationStructure.swift in Sources */ = {isa = PBXBuildFile; fileRef = E91980B92F2F540000B5852F /* NavigationStructure.swift */; }; E91980BD2F2F540A00B5852F /* NavigationStructure.swift in Sources */ = {isa = PBXBuildFile; fileRef = E91980B92F2F540000B5852F /* NavigationStructure.swift */; }; - E91980BE2F2F540A00B5852F /* NavigationStructure.swift in Sources */ = {isa = PBXBuildFile; fileRef = E91980B92F2F540000B5852F /* NavigationStructure.swift */; }; E91980BF2F2F540A00B5852F /* NavigationStructure.swift in Sources */ = {isa = PBXBuildFile; fileRef = E91980B92F2F540000B5852F /* NavigationStructure.swift */; }; E91980C02F2F540A00B5852F /* NavigationStructure.swift in Sources */ = {isa = PBXBuildFile; fileRef = E91980B92F2F540000B5852F /* NavigationStructure.swift */; }; E91980C12F2F540A00B5852F /* NavigationStructure.swift in Sources */ = {isa = PBXBuildFile; fileRef = E91980B92F2F540000B5852F /* NavigationStructure.swift */; }; @@ -648,7 +647,6 @@ E97E65142F2CDD5B0070810A /* ESInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97E65092F2CDD5B0070810A /* ESInterfaceVariables.swift */; }; E97E65152F2CDD5B0070810A /* ESInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97E65092F2CDD5B0070810A /* ESInterfaceVariables.swift */; }; E97E65162F2CDD5B0070810A /* ESInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97E65092F2CDD5B0070810A /* ESInterfaceVariables.swift */; }; - E97E65172F2CDD730070810A /* ESInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97E65092F2CDD5B0070810A /* ESInterfaceVariables.swift */; }; E97E65192F2CDEC50070810A /* ESCommandVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97E65182F2CDEC50070810A /* ESCommandVariables.swift */; }; E97E651A2F2CDEC50070810A /* ESCommandVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97E65182F2CDEC50070810A /* ESCommandVariables.swift */; }; E97E651B2F2CDEC50070810A /* ESCommandVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97E65182F2CDEC50070810A /* ESCommandVariables.swift */; }; @@ -658,7 +656,6 @@ E97E651F2F2CDEC50070810A /* ESCommandVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97E65182F2CDEC50070810A /* ESCommandVariables.swift */; }; E97E65202F2CDEC50070810A /* ESCommandVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97E65182F2CDEC50070810A /* ESCommandVariables.swift */; }; E97E65212F2CDEC50070810A /* ESCommandVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97E65182F2CDEC50070810A /* ESCommandVariables.swift */; }; - E97E65222F2CDEC50070810A /* ESCommandVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97E65182F2CDEC50070810A /* ESCommandVariables.swift */; }; E97E65232F2CDEC50070810A /* ESCommandVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97E65182F2CDEC50070810A /* ESCommandVariables.swift */; }; E97E65242F2CDEC50070810A /* ESCommandVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97E65182F2CDEC50070810A /* ESCommandVariables.swift */; }; E97E65252F2CDEC50070810A /* ESCommandVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97E65182F2CDEC50070810A /* ESCommandVariables.swift */; }; @@ -728,7 +725,6 @@ E9ED93872F2A3C45008D7451 /* DynamicConjugationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9ED937C2F2A3C32008D7451 /* DynamicConjugationViewController.swift */; }; E9ED93882F2A3C45008D7451 /* DynamicConjugationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9ED937C2F2A3C32008D7451 /* DynamicConjugationViewController.swift */; }; E9ED93892F2A3C45008D7451 /* DynamicConjugationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9ED937C2F2A3C32008D7451 /* DynamicConjugationViewController.swift */; }; - E9ED938A2F2A3C45008D7451 /* DynamicConjugationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9ED937C2F2A3C32008D7451 /* DynamicConjugationViewController.swift */; }; E9FAC39F2E98972D008E00AC /* IDInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9FAC3892E9894F9008E00AC /* IDInterfaceVariables.swift */; }; E9FAC3A12E98972D008E00AC /* IDKeyboardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9FAC38A2E9894F9008E00AC /* IDKeyboardViewController.swift */; }; E9FAC3A72E989A84008E00AC /* SwiftyJSON in Frameworks */ = {isa = PBXBuildFile; productRef = E9FAC3A62E989A84008E00AC /* SwiftyJSON */; }; @@ -749,77 +745,8 @@ EDC364732AE409000001E456 /* InterfaceConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDC364682AE408F20001E456 /* InterfaceConstants.swift */; }; EDC364742AE409000001E456 /* InterfaceConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDC364682AE408F20001E456 /* InterfaceConstants.swift */; }; EDEE62252B2DE65A00A0B9C1 /* UIEdgeInsetsExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDEE62242B2DE65A00A0B9C1 /* UIEdgeInsetsExtensions.swift */; }; - F740686D2F1FB28E00E8560B /* ConjugateAppScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F740686B2F1FB28E00E8560B /* ConjugateAppScreen.storyboard */; }; - F786BAD42F1E8F70003F7505 /* ThirdPartyLicense.swift in Sources */ = {isa = PBXBuildFile; fileRef = 140158982A430DD000D14E52 /* ThirdPartyLicense.swift */; }; - F786BAD52F1E8F70003F7505 /* (null) in Sources */ = {isa = PBXBuildFile; }; - F786BAD62F1E8F70003F7505 /* AppTextStyling.swift in Sources */ = {isa = PBXBuildFile; fileRef = D17193BF27AEA33A0038660B /* AppTextStyling.swift */; }; - F786BAD72F1E8F70003F7505 /* ScribeColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1378C228F5D7AC00E1CBC2 /* ScribeColor.swift */; }; - F786BAD82F1E8F70003F7505 /* Conjugate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D171946427AF31770038660B /* Conjugate.swift */; }; - F786BAD92F1E8F70003F7505 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 147797B42A2CFB490044A53E /* SettingsViewController.swift */; }; - F786BADA2F1E8F70003F7505 /* AboutTableData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1406B7862A2DFCDD001DF45B /* AboutTableData.swift */; }; - F786BADB2F1E8F70003F7505 /* DownloadStateManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9202DEF2F0FAA0C001590FC /* DownloadStateManager.swift */; }; - F786BADC2F1E8F70003F7505 /* IDInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9FAC3892E9894F9008E00AC /* IDInterfaceVariables.swift */; }; - F786BADE2F1E8F70003F7505 /* ToolTipViewDatasource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3045396C293B9DDC003AE55B /* ToolTipViewDatasource.swift */; }; - F786BADF2F1E8F70003F7505 /* Translate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D111E9B127AFE79500746F92 /* Translate.swift */; }; - F786BAE32F1E8F70003F7505 /* ScribeKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = D171945727AF237C0038660B /* ScribeKey.swift */; }; - F786BAE42F1E8F70003F7505 /* AppExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1406B78B2A3209CF001DF45B /* AppExtensions.swift */; }; - F786BAE62F1E8F70003F7505 /* FR-AZERTYInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = D180EC0228FDFABF0018E29B /* FR-AZERTYInterfaceVariables.swift */; }; - F786BAE72F1E8F70003F7505 /* ENInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1CDED7A2A859FBF00098546 /* ENInterfaceVariables.swift */; }; - F786BAE82F1E8F70003F7505 /* InstallationVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38BD213522D5907F00C6795D /* InstallationVC.swift */; }; - F786BAE92F1E8F70003F7505 /* DEInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = D17193CF27AEC9EC0038660B /* DEInterfaceVariables.swift */; }; - F786BAEA2F1E8F70003F7505 /* SettingsTableData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 147797BF2A2D0CDF0044A53E /* SettingsTableData.swift */; }; - F786BAEB2F1E8F70003F7505 /* InformationScreenVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14AC56892A261663006B1DDF /* InformationScreenVC.swift */; }; - F786BAEC2F1E8F70003F7505 /* InfoChildTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 147797AE2A2CD3370044A53E /* InfoChildTableViewCell.swift */; }; - F786BAED2F1E8F70003F7505 /* AppUISymbols.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1A2DCB327AD3EB50057A10D /* AppUISymbols.swift */; }; - F786BAEE2F1E8F70003F7505 /* KeyboardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D190B2592742565500705659 /* KeyboardViewController.swift */; }; - F786BAEF2F1E8F70003F7505 /* InstallationDownload.swift in Sources */ = {isa = PBXBuildFile; fileRef = E96111472F04EC62001E4F95 /* InstallationDownload.swift */; }; - F786BAF02F1E8F70003F7505 /* UIEdgeInsetsExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDEE62242B2DE65A00A0B9C1 /* UIEdgeInsetsExtensions.swift */; }; - F786BAF12F1E8F70003F7505 /* (null) in Sources */ = {isa = PBXBuildFile; }; - F786BAF22F1E8F70003F7505 /* KeyboardStyling.swift in Sources */ = {isa = PBXBuildFile; fileRef = D171943727AEF0560038660B /* KeyboardStyling.swift */; }; - F786BAF32F1E8F70003F7505 /* Annotate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D111E9B927AFE7B200746F92 /* Annotate.swift */; }; - F786BAF42F1E8F70003F7505 /* KeyboardBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19DC85F92C7772FC006E32FD /* KeyboardBuilder.swift */; }; - F786BAF52F1E8F70003F7505 /* KeyboardProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 198369CB2C7980BA00C1B583 /* KeyboardProvider.swift */; }; - F786BAF62F1E8F70003F7505 /* UIColor+ScribeColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1378C328F5D7AC00E1CBC2 /* UIColor+ScribeColors.swift */; }; - F786BAF72F1E8F70003F7505 /* SVInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = D17193EF27AECB350038660B /* SVInterfaceVariables.swift */; }; - F786BAF92F1E8F70003F7505 /* TableViewTemplateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 140158A12A4EDB2200D14E52 /* TableViewTemplateViewController.swift */; }; - F786BAFB2F1E8F70003F7505 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38BD213322D5907F00C6795D /* AppDelegate.swift */; }; - F786BAFC2F1E8F70003F7505 /* ToolTipView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30489C1D2936DAB700B59393 /* ToolTipView.swift */; }; - F786BAFD2F1E8F70003F7505 /* ToolTipViewTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3045396E293B9DF2003AE55B /* ToolTipViewTheme.swift */; }; - F786BAFE2F1E8F70003F7505 /* RadioTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A68DA3D2CDE7B7900897FAD /* RadioTableViewCell.swift */; }; - F786BAFF2F1E8F70003F7505 /* CommandVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = D190B2462741B24F00705659 /* CommandVariables.swift */; }; - F786BB002F1E8F70003F7505 /* DownloadDataScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9CE5EA72F063D870068A930 /* DownloadDataScreen.swift */; }; - F786BB012F1E8F70003F7505 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = D16DD3A429E78A1500FB9022 /* Utilities.swift */; }; - F786BB022F1E8F70003F7505 /* BaseTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDB460202B03B3E400BEA967 /* BaseTableViewController.swift */; }; - F786BB032F1E8F70003F7505 /* DAInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1CDED742A859DDD00098546 /* DAInterfaceVariables.swift */; }; - F786BB052F1E8F70003F7505 /* UIDeviceExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AF4D872C3575EA009AE0D2 /* UIDeviceExtensions.swift */; }; - F786BB062F1E8F70003F7505 /* TipCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69B81EBB2BFB8C77008CAB85 /* TipCardView.swift */; }; - F786BB072F1E8F70003F7505 /* InformationToolTipData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30453963293B9D18003AE55B /* InformationToolTipData.swift */; }; - F786BB082F1E8F70003F7505 /* ToolTipViewUpdatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30453968293B9DB4003AE55B /* ToolTipViewUpdatable.swift */; }; - F786BB092F1E8F70003F7505 /* RUInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = D17193DF27AECAA60038660B /* RUInterfaceVariables.swift */; }; - F786BB0A2F1E8F70003F7505 /* ITInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1B81D5227BBBA360085FE5E /* ITInterfaceVariables.swift */; }; - F786BB0B2F1E8F70003F7505 /* PTInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = D17193D727AECA450038660B /* PTInterfaceVariables.swift */; }; - F786BB0C2F1E8F70003F7505 /* HEInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = D12EB9B92C81C0E700181765 /* HEInterfaceVariables.swift */; }; - F786BB0D2F1E8F70003F7505 /* AppStyling.swift in Sources */ = {isa = PBXBuildFile; fileRef = D17193C327AEAD7D0038660B /* AppStyling.swift */; }; - F786BB0E2F1E8F70003F7505 /* Plural.swift in Sources */ = {isa = PBXBuildFile; fileRef = D111E9A927AFE78600746F92 /* Plural.swift */; }; - F786BB0F2F1E8F70003F7505 /* InterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = D190B2492741B31F00705659 /* InterfaceVariables.swift */; }; - F786BB102F1E8F70003F7505 /* CommandBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = D111E9A127AFE4F300746F92 /* CommandBar.swift */; }; - F786BB122F1E8F70003F7505 /* ViewThemeable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30453966293B9D31003AE55B /* ViewThemeable.swift */; }; - F786BB132F1E8F70003F7505 /* ColorVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = D190B240274056D400705659 /* ColorVariables.swift */; }; - F786BB142F1E8F70003F7505 /* SelectionViewTemplateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A68DA3F2CDE7B7900897FAD /* SelectionViewTemplateViewController.swift */; }; - F786BB152F1E8F70003F7505 /* AboutTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2486F12B0B4E8C0038AE6A /* AboutTableViewCell.swift */; }; - F786BB162F1E8F70003F7505 /* InstallScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1A2DCB027AD37BD0057A10D /* InstallScreen.swift */; }; - F786BB182F1E8F70003F7505 /* KeyboardKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = D171942E27AEDE110038660B /* KeyboardKeys.swift */; }; - F786BB192F1E8F70003F7505 /* ParentTableCellModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 147797B22A2CD5AB0044A53E /* ParentTableCellModel.swift */; }; - F786BB1A2F1E8F70003F7505 /* WrapperCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9FEE6CA2EF1433E003A9266 /* WrapperCell.swift */; }; - F786BB1B2F1E8F70003F7505 /* WikimediaAndScribe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1401589A2A45A07200D14E52 /* WikimediaAndScribe.swift */; }; - F786BB1C2F1E8F70003F7505 /* ToolTipViewDatasourceable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3045396A293B9DC9003AE55B /* ToolTipViewDatasourceable.swift */; }; - F786BB1D2F1E8F70003F7505 /* KeyAltChars.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1B0719F27C6A1AA00FD7DBD /* KeyAltChars.swift */; }; - F786BB1E2F1E8F70003F7505 /* NBInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1CDED802A85A12400098546 /* NBInterfaceVariables.swift */; }; - F786BB1F2F1E8F70003F7505 /* FR-QWERTYInterfaceVariables.swift in Sources */ = {isa = PBXBuildFile; fileRef = D17693DC28FC8CC300DF0FBB /* FR-QWERTYInterfaceVariables.swift */; }; - F786BB202F1E8F70003F7505 /* KeyAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1B0719627C63C9100FD7DBD /* KeyAnimation.swift */; }; - F786BB212F1E8F70003F7505 /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14AC56832A24AED3006B1DDF /* AboutViewController.swift */; }; - F786BB222F1E8F70003F7505 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38DD94F022D6A40000FF8845 /* Extensions.swift */; }; - F786BB232F1E8F70003F7505 /* InterfaceConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDC364682AE408F20001E456 /* InterfaceConstants.swift */; }; + F725CADE2F6A72BC00A8C950 /* ConjugateApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = F725CADD2F6A72BC00A8C950 /* ConjugateApp.swift */; }; + F725CAE72F6A783400A8C950 /* SettingsTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = F725CAE62F6A782D00A8C950 /* SettingsTab.swift */; }; F786BB252F1E8F70003F7505 /* SwiftyJSON in Frameworks */ = {isa = PBXBuildFile; productRef = F786BACB2F1E8F70003F7505 /* SwiftyJSON */; }; F786BB262F1E8F70003F7505 /* SwipeableTabBarController in Frameworks */ = {isa = PBXBuildFile; productRef = F786BACF2F1E8F70003F7505 /* SwipeableTabBarController */; }; F786BB272F1E8F70003F7505 /* GRDB in Frameworks */ = {isa = PBXBuildFile; productRef = F786BACD2F1E8F70003F7505 /* GRDB */; }; @@ -841,6 +768,10 @@ F786BB392F1E8F70003F7505 /* Spanish.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D1608665270B6D3C00134D48 /* Spanish.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; F786BB3A2F1E8F70003F7505 /* French.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D109A20B275B6888005E2271 /* French.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; F786BB3B2F1E8F70003F7505 /* Russian.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D1671A60275A1E8700A7C118 /* Russian.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + F7A17EBA2F6A8C180040B09B /* AppNavigation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A17EB62F6A8BFE0040B09B /* AppNavigation.swift */; }; + F7A17EBB2F6A8C1C0040B09B /* AboutTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A17EAC2F6A8BFE0040B09B /* AboutTab.swift */; }; + F7A17EBC2F6A8C200040B09B /* ConjugateTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A17EAE2F6A8BFE0040B09B /* ConjugateTab.swift */; }; + F7A17EBD2F6A8C230040B09B /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A17EB42F6A8BFE0040B09B /* ContentView.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -1202,9 +1133,23 @@ EDB460202B03B3E400BEA967 /* BaseTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseTableViewController.swift; sourceTree = ""; }; EDC364682AE408F20001E456 /* InterfaceConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InterfaceConstants.swift; sourceTree = ""; }; EDEE62242B2DE65A00A0B9C1 /* UIEdgeInsetsExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIEdgeInsetsExtensions.swift; sourceTree = ""; }; - F740686C2F1FB28E00E8560B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/ConjugateAppScreen.storyboard; sourceTree = ""; }; + F725CADD2F6A72BC00A8C950 /* ConjugateApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConjugateApp.swift; sourceTree = ""; }; + F725CADF2F6A72D300A8C950 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + F725CAE42F6A782500A8C950 /* ConjugateTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConjugateTab.swift; sourceTree = ""; }; + F725CAE62F6A782D00A8C950 /* SettingsTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsTab.swift; sourceTree = ""; }; + F725CAE82F6A783700A8C950 /* AboutTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutTab.swift; sourceTree = ""; }; + F725CAEA2F6A78CA00A8C950 /* AppNavigation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppNavigation.swift; sourceTree = ""; }; F786BB3F2F1E8F70003F7505 /* Conjugate.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Conjugate.app; sourceTree = BUILT_PRODUCTS_DIR; }; F786BB422F1E8F70003F7505 /* ConjugateApp-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "ConjugateApp-Info.plist"; path = "/Users/gauthammohanraj/Developer/Scribe-iOS/ConjugateApp-Info.plist"; sourceTree = ""; }; + F7A17EAB2F6A8BFE0040B09B /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ContentView.swift; path = Conjugate/ContentView.swift; sourceTree = ""; }; + F7A17EAC2F6A8BFE0040B09B /* AboutTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutTab.swift; sourceTree = ""; }; + F7A17EAE2F6A8BFE0040B09B /* ConjugateTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConjugateTab.swift; sourceTree = ""; }; + F7A17EB02F6A8BFE0040B09B /* SettingsTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsTab.swift; sourceTree = ""; }; + F7A17EB22F6A8BFE0040B09B /* ConjugateTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConjugateTab.swift; sourceTree = ""; }; + F7A17EB42F6A8BFE0040B09B /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + F7A17EB62F6A8BFE0040B09B /* AppNavigation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppNavigation.swift; path = Conjugate/AppNavigation.swift; sourceTree = ""; }; + F7A17EB72F6A8BFE0040B09B /* ConjugateApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ConjugateApp.swift; path = Conjugate/ConjugateApp.swift; sourceTree = ""; }; + F7A17EB82F6A8BFF0040B09B /* AppNavigation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppNavigation.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ @@ -1557,14 +1502,29 @@ ); target = D18EA8982760D4A6001E1358 /* Swedish */; }; + F7A17EA92F6A8BC90040B09B /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + membershipExceptions = ( + CTAButton.swift, + DownloadButton.swift, + ); + target = F786BAB22F1E8F70003F7505 /* Conjugate */; + }; + F7A17EAA2F6A8BE30040B09B /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + membershipExceptions = ( + ConfirmDialogView.swift, + ); + target = F786BAB22F1E8F70003F7505 /* Conjugate */; + }; /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ /* Begin PBXFileSystemSynchronizedRootGroup section */ - E943457E2F05638700DFDB20 /* Button */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Button; sourceTree = ""; }; + E943457E2F05638700DFDB20 /* Button */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (F7A17EA92F6A8BC90040B09B /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Button; sourceTree = ""; }; E98E73BE2F20D8AA005EEDA3 /* Data */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (E98E74352F20EA5E005EEDA3 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E98E74362F20EA5E005EEDA3 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E98E74372F20EA5E005EEDA3 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E98E74382F20EA5E005EEDA3 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E98E74392F20EA5E005EEDA3 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E98E743A2F20EA5E005EEDA3 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E98E743B2F20EA5E005EEDA3 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E98E743C2F20EA5E005EEDA3 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E98E743D2F20EA5E005EEDA3 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E98E743E2F20EA5E005EEDA3 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E98E743F2F20EA5E005EEDA3 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E98E74402F20EA5E005EEDA3 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Data; sourceTree = ""; }; E98E73BF2F20D8C3005EEDA3 /* DataContracts */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = DataContracts; sourceTree = ""; }; E9B89DCD2F226757003E396F /* DataManager */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (E9B89DCE2F22676B003E396F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E9B89DCF2F22676B003E396F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E9B89DD02F22676B003E396F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E9B89DD12F22676B003E396F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E9B89DD22F22676B003E396F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E9B89DD32F22676B003E396F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E9B89DD42F22676B003E396F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E9B89DD52F22676B003E396F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E9B89DD62F22676B003E396F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E9B89DD72F22676B003E396F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E9B89DD82F22676B003E396F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E9B89DD92F22676B003E396F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, E9B89DDA2F22676B003E396F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = DataManager; sourceTree = ""; }; - E9DADB332EF3CF9B00702783 /* ConfirmDialog */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = ConfirmDialog; sourceTree = ""; }; + E9DADB332EF3CF9B00702783 /* ConfirmDialog */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (F7A17EAA2F6A8BE30040B09B /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = ConfirmDialog; sourceTree = ""; }; /* End PBXFileSystemSynchronizedRootGroup section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1792,6 +1752,11 @@ 38BD212722D5907E00C6795D = { isa = PBXGroup; children = ( + F7A17EB62F6A8BFE0040B09B /* AppNavigation.swift */, + F7A17EB72F6A8BFE0040B09B /* ConjugateApp.swift */, + F7A17EAB2F6A8BFE0040B09B /* ContentView.swift */, + F7A17EB92F6A8BFF0040B09B /* Navigation */, + F7A17EB52F6A8BFE0040B09B /* Views */, F75BB4282F1FA72200C90392 /* Conjugate */, D1FECBC9270E1A1500C8BC60 /* Keyboards */, 38BD213222D5907F00C6795D /* Scribe */, @@ -2204,14 +2169,121 @@ path = Extensions; sourceTree = ""; }; + F725CAE12F6A77E300A8C950 /* Views */ = { + isa = PBXGroup; + children = ( + F725CAE32F6A781F00A8C950 /* Tabs */, + F725CADF2F6A72D300A8C950 /* ContentView.swift */, + ); + path = Views; + sourceTree = ""; + }; + F725CAE32F6A781F00A8C950 /* Tabs */ = { + isa = PBXGroup; + children = ( + F725CAED2F6A79DC00A8C950 /* About */, + F725CAEE2F6A79E600A8C950 /* Settings */, + F725CAEF2F6A79EF00A8C950 /* Conjugate */, + ); + path = Tabs; + sourceTree = ""; + }; + F725CAED2F6A79DC00A8C950 /* About */ = { + isa = PBXGroup; + children = ( + F725CAE82F6A783700A8C950 /* AboutTab.swift */, + ); + path = About; + sourceTree = ""; + }; + F725CAEE2F6A79E600A8C950 /* Settings */ = { + isa = PBXGroup; + children = ( + F725CAE62F6A782D00A8C950 /* SettingsTab.swift */, + ); + path = Settings; + sourceTree = ""; + }; + F725CAEF2F6A79EF00A8C950 /* Conjugate */ = { + isa = PBXGroup; + children = ( + F725CAE42F6A782500A8C950 /* ConjugateTab.swift */, + ); + path = Conjugate; + sourceTree = ""; + }; + F725CAF02F6A79FF00A8C950 /* Navigation */ = { + isa = PBXGroup; + children = ( + F725CAEA2F6A78CA00A8C950 /* AppNavigation.swift */, + ); + path = Navigation; + sourceTree = ""; + }; F75BB4282F1FA72200C90392 /* Conjugate */ = { isa = PBXGroup; children = ( - F740686B2F1FB28E00E8560B /* ConjugateAppScreen.storyboard */, + F725CAF02F6A79FF00A8C950 /* Navigation */, + F725CAE12F6A77E300A8C950 /* Views */, + F725CADD2F6A72BC00A8C950 /* ConjugateApp.swift */, ); path = Conjugate; sourceTree = ""; }; + F7A17EAD2F6A8BFE0040B09B /* About */ = { + isa = PBXGroup; + children = ( + F7A17EAC2F6A8BFE0040B09B /* AboutTab.swift */, + ); + path = About; + sourceTree = ""; + }; + F7A17EAF2F6A8BFE0040B09B /* Conjugate */ = { + isa = PBXGroup; + children = ( + F7A17EAE2F6A8BFE0040B09B /* ConjugateTab.swift */, + ); + path = Conjugate; + sourceTree = ""; + }; + F7A17EB12F6A8BFE0040B09B /* Settings */ = { + isa = PBXGroup; + children = ( + F7A17EB02F6A8BFE0040B09B /* SettingsTab.swift */, + ); + path = Settings; + sourceTree = ""; + }; + F7A17EB32F6A8BFE0040B09B /* Tabs */ = { + isa = PBXGroup; + children = ( + F7A17EAD2F6A8BFE0040B09B /* About */, + F7A17EAF2F6A8BFE0040B09B /* Conjugate */, + F7A17EB12F6A8BFE0040B09B /* Settings */, + F7A17EB22F6A8BFE0040B09B /* ConjugateTab.swift */, + ); + path = Tabs; + sourceTree = ""; + }; + F7A17EB52F6A8BFE0040B09B /* Views */ = { + isa = PBXGroup; + children = ( + F7A17EB32F6A8BFE0040B09B /* Tabs */, + F7A17EB42F6A8BFE0040B09B /* ContentView.swift */, + ); + name = Views; + path = Conjugate/Views; + sourceTree = ""; + }; + F7A17EB92F6A8BFF0040B09B /* Navigation */ = { + isa = PBXGroup; + children = ( + F7A17EB82F6A8BFF0040B09B /* AppNavigation.swift */, + ); + name = Navigation; + path = Conjugate/Navigation; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -2862,7 +2934,6 @@ F786BB2A2F1E8F70003F7505 /* Settings.bundle in Resources */, F786BB2B2F1E8F70003F7505 /* LaunchScreen.storyboard in Resources */, F786BB2C2F1E8F70003F7505 /* RadioTableViewCell.xib in Resources */, - F740686D2F1FB28E00E8560B /* ConjugateAppScreen.storyboard in Resources */, F786BB2D2F1E8F70003F7505 /* InfoChildTableViewCell.xib in Resources */, F786BB2E2F1E8F70003F7505 /* AboutTableViewCell.xib in Resources */, F786BB2F2F1E8F70003F7505 /* Localizable.xcstrings in Resources */, @@ -3652,80 +3723,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - E97E65172F2CDD730070810A /* ESInterfaceVariables.swift in Sources */, - E9ED938A2F2A3C45008D7451 /* DynamicConjugationViewController.swift in Sources */, - F786BAD42F1E8F70003F7505 /* ThirdPartyLicense.swift in Sources */, - F786BAD52F1E8F70003F7505 /* (null) in Sources */, - F786BAD62F1E8F70003F7505 /* AppTextStyling.swift in Sources */, - E91980BE2F2F540A00B5852F /* NavigationStructure.swift in Sources */, - F786BAD72F1E8F70003F7505 /* ScribeColor.swift in Sources */, - F786BAD82F1E8F70003F7505 /* Conjugate.swift in Sources */, - F786BAD92F1E8F70003F7505 /* SettingsViewController.swift in Sources */, - F786BADA2F1E8F70003F7505 /* AboutTableData.swift in Sources */, - F786BADB2F1E8F70003F7505 /* DownloadStateManager.swift in Sources */, - F786BADC2F1E8F70003F7505 /* IDInterfaceVariables.swift in Sources */, - F786BADE2F1E8F70003F7505 /* ToolTipViewDatasource.swift in Sources */, - F786BADF2F1E8F70003F7505 /* Translate.swift in Sources */, - F786BAE32F1E8F70003F7505 /* ScribeKey.swift in Sources */, - F786BAE42F1E8F70003F7505 /* AppExtensions.swift in Sources */, - F786BAE62F1E8F70003F7505 /* FR-AZERTYInterfaceVariables.swift in Sources */, - F786BAE72F1E8F70003F7505 /* ENInterfaceVariables.swift in Sources */, - F786BAE82F1E8F70003F7505 /* InstallationVC.swift in Sources */, - F786BAE92F1E8F70003F7505 /* DEInterfaceVariables.swift in Sources */, - F786BAEA2F1E8F70003F7505 /* SettingsTableData.swift in Sources */, - F786BAEB2F1E8F70003F7505 /* InformationScreenVC.swift in Sources */, - F786BAEC2F1E8F70003F7505 /* InfoChildTableViewCell.swift in Sources */, - F786BAED2F1E8F70003F7505 /* AppUISymbols.swift in Sources */, - F786BAEE2F1E8F70003F7505 /* KeyboardViewController.swift in Sources */, - F786BAEF2F1E8F70003F7505 /* InstallationDownload.swift in Sources */, - F786BAF02F1E8F70003F7505 /* UIEdgeInsetsExtensions.swift in Sources */, - F786BAF12F1E8F70003F7505 /* (null) in Sources */, - F786BAF22F1E8F70003F7505 /* KeyboardStyling.swift in Sources */, - F786BAF32F1E8F70003F7505 /* Annotate.swift in Sources */, - F786BAF42F1E8F70003F7505 /* KeyboardBuilder.swift in Sources */, - F786BAF52F1E8F70003F7505 /* KeyboardProvider.swift in Sources */, - F786BAF62F1E8F70003F7505 /* UIColor+ScribeColors.swift in Sources */, - F786BAF72F1E8F70003F7505 /* SVInterfaceVariables.swift in Sources */, - F786BAF92F1E8F70003F7505 /* TableViewTemplateViewController.swift in Sources */, - F786BAFB2F1E8F70003F7505 /* AppDelegate.swift in Sources */, - F786BAFC2F1E8F70003F7505 /* ToolTipView.swift in Sources */, - F786BAFD2F1E8F70003F7505 /* ToolTipViewTheme.swift in Sources */, - F786BAFE2F1E8F70003F7505 /* RadioTableViewCell.swift in Sources */, - F786BAFF2F1E8F70003F7505 /* CommandVariables.swift in Sources */, - F786BB002F1E8F70003F7505 /* DownloadDataScreen.swift in Sources */, - F786BB012F1E8F70003F7505 /* Utilities.swift in Sources */, - F786BB022F1E8F70003F7505 /* BaseTableViewController.swift in Sources */, - F786BB032F1E8F70003F7505 /* DAInterfaceVariables.swift in Sources */, - F786BB052F1E8F70003F7505 /* UIDeviceExtensions.swift in Sources */, - E97E65222F2CDEC50070810A /* ESCommandVariables.swift in Sources */, - F786BB062F1E8F70003F7505 /* TipCardView.swift in Sources */, - F786BB072F1E8F70003F7505 /* InformationToolTipData.swift in Sources */, - F786BB082F1E8F70003F7505 /* ToolTipViewUpdatable.swift in Sources */, - F786BB092F1E8F70003F7505 /* RUInterfaceVariables.swift in Sources */, - F786BB0A2F1E8F70003F7505 /* ITInterfaceVariables.swift in Sources */, - F786BB0B2F1E8F70003F7505 /* PTInterfaceVariables.swift in Sources */, - F786BB0C2F1E8F70003F7505 /* HEInterfaceVariables.swift in Sources */, - F786BB0D2F1E8F70003F7505 /* AppStyling.swift in Sources */, - F786BB0E2F1E8F70003F7505 /* Plural.swift in Sources */, - F786BB0F2F1E8F70003F7505 /* InterfaceVariables.swift in Sources */, - F786BB102F1E8F70003F7505 /* CommandBar.swift in Sources */, - F786BB122F1E8F70003F7505 /* ViewThemeable.swift in Sources */, - F786BB132F1E8F70003F7505 /* ColorVariables.swift in Sources */, - F786BB142F1E8F70003F7505 /* SelectionViewTemplateViewController.swift in Sources */, - F786BB152F1E8F70003F7505 /* AboutTableViewCell.swift in Sources */, - F786BB162F1E8F70003F7505 /* InstallScreen.swift in Sources */, - F786BB182F1E8F70003F7505 /* KeyboardKeys.swift in Sources */, - F786BB192F1E8F70003F7505 /* ParentTableCellModel.swift in Sources */, - F786BB1A2F1E8F70003F7505 /* WrapperCell.swift in Sources */, - F786BB1B2F1E8F70003F7505 /* WikimediaAndScribe.swift in Sources */, - F786BB1C2F1E8F70003F7505 /* ToolTipViewDatasourceable.swift in Sources */, - F786BB1D2F1E8F70003F7505 /* KeyAltChars.swift in Sources */, - F786BB1E2F1E8F70003F7505 /* NBInterfaceVariables.swift in Sources */, - F786BB1F2F1E8F70003F7505 /* FR-QWERTYInterfaceVariables.swift in Sources */, - F786BB202F1E8F70003F7505 /* KeyAnimation.swift in Sources */, - F786BB212F1E8F70003F7505 /* AboutViewController.swift in Sources */, - F786BB222F1E8F70003F7505 /* Extensions.swift in Sources */, - F786BB232F1E8F70003F7505 /* InterfaceConstants.swift in Sources */, + F7A17EBD2F6A8C230040B09B /* ContentView.swift in Sources */, + F7A17EBC2F6A8C200040B09B /* ConjugateTab.swift in Sources */, + F7A17EBB2F6A8C1C0040B09B /* AboutTab.swift in Sources */, + F7A17EBA2F6A8C180040B09B /* AppNavigation.swift in Sources */, + F725CADE2F6A72BC00A8C950 /* ConjugateApp.swift in Sources */, + F725CAE72F6A783400A8C950 /* SettingsTab.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3876,14 +3879,6 @@ name = LaunchScreen.storyboard; sourceTree = ""; }; - F740686B2F1FB28E00E8560B /* ConjugateAppScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - F740686C2F1FB28E00E8560B /* Base */, - ); - name = ConjugateAppScreen.storyboard; - sourceTree = ""; - }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ diff --git a/Scribe/i18n b/Scribe/i18n index 8c90cfc4..5dd446bb 160000 --- a/Scribe/i18n +++ b/Scribe/i18n @@ -1 +1 @@ -Subproject commit 8c90cfc46eab602c70ec3cd5b5a002fb6ca6ad9a +Subproject commit 5dd446bb4cb8b199f41a95298164610b4143545a