Skip to content

Use Swift UI for the Conjugate App #604

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
angrezichatterbox wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Use Swift UI for the Conjugate App #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14d55c3
feat:use swift ui for conjugate app
angrezichatterbox Mar 18, 2026
ae63a24
chore: removed unncessary files in build phase
angrezichatterbox Mar 18, 2026
3f5797c
fix:linting issues
angrezichatterbox Mar 18, 2026
b7db18f
Update ConjugateTab.swift with license header
angrezichatterbox Mar 18, 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
19 changes: 19 additions & 0 deletions Conjugate/AppNavigation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// SPDX-License-Identifier: GPL-3.0-or-later

import SwiftUI

struct AppNavigation<Content: View>: View {
let content: () -> Content

var body: some View {
if #available(iOS 16, *) {
NavigationStack {
content()
}
} else {
NavigationView {
content()
}
}
}
}
636 changes: 0 additions & 636 deletions Conjugate/Base.lproj/ConjugateAppScreen.storyboard
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions Conjugate/ConjugateApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// SPDX-License-Identifier: GPL-3.0-or-later

import SwiftUI

@main
struct ConjugateApp: App {
var body: some Scene {
WindowGroup {
ContentView()
}
}
}
13 changes: 13 additions & 0 deletions Conjugate/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
}
19 changes: 19 additions & 0 deletions Conjugate/Navigation/AppNavigation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// SPDX-License-Identifier: GPL-3.0-or-later

import SwiftUI

struct AppNavigation<Content: View>: View {
@ViewBuilder let content: () -> Content

var body: some View {
if #available(iOS 16, *) {
NavigationStack {
content()
}
} else {
NavigationView {
content()
}
}
}
}
24 changes: 24 additions & 0 deletions Conjugate/Views/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
}
}
}
}
13 changes: 13 additions & 0 deletions Conjugate/Views/Tabs/About/AboutTab.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
}
}
}
13 changes: 13 additions & 0 deletions Conjugate/Views/Tabs/Conjugate/ConjugateTab.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
}
}
}
13 changes: 13 additions & 0 deletions Conjugate/Views/Tabs/ConjugateTab.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
}
}
}
13 changes: 13 additions & 0 deletions Conjugate/Views/Tabs/Settings/SettingsTab.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
}
}
}
2 changes: 0 additions & 2 deletions ConjugateApp-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
<string>1</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>ConjugateAppScreen</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
Expand Down
319 changes: 157 additions & 162 deletions Scribe.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Scribe/i18n
Open in desktop
Submodule i18n updated 18 files
+8 −10 .github/workflows/pr_ci_i18n.yaml
+1 −1 .pre-commit-config.yaml
+48 −57 README.md
+15 −969 i18n/Localizable.xcstrings
+6 −6 i18n/locales/bn.json
+0 −408 i18n/locales/el.json
+7 −10 i18n/locales/en-US.json
+6 −6 i18n/locales/hi.json
+6 −6 i18n/locales/ml.json
+6 −6 i18n/locales/ne.json
+6 −6 i18n/locales/ta.json
+6 −6 i18n/locales/te.json
+0 −156 i18n/values/el/string.xml
+1 −4 i18n/values/en-US/string.xml
+0 −18 pyproject.toml
+11 −0 requirements-dev.in
+80 −0 requirements-dev.txt
+0 −257 uv.lock
Loading