Skip to content

Commit 83caeea

Browse files
Add Conjugate tab to Conjugate app with download data menu option (#646)
* feat: add Conjugate tab download data menu option (SwiftUI) * style: comment formatting * feat: reuse CardView from keyboard app for Conjugate tab download option --------- Co-authored-by: Andrew Tavis McAllister <andrew.t.mcallister@gmail.com>
1 parent bd46d92 commit 83caeea

2 files changed

Lines changed: 39 additions & 7 deletions

File tree

Conjugate/Views/Tabs/Conjugate/ConjugateTab.swift

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,38 @@ import SwiftUI
44

55
struct ConjugateTab: View {
66
var body: some View {
7-
AppNavigation {
8-
Text("Conjugate")
9-
.font(.largeTitle)
10-
.navigationTitle("Conjugate")
11-
}
12-
}
13-
}
7+
AppNavigation {
8+
ScrollView {
9+
VStack(spacing: 20) {
10+
Image("ScribeLogo")
11+
.resizable()
12+
.scaledToFit()
13+
.frame(width: 200, height: 100)
14+
.padding(.top, 30)
15+
CardView(
16+
title: NSLocalizedString(
17+
"i18n.app.download.menu_option.conjugate_title",
18+
value: "Verb data",
19+
comment: ""
20+
),
21+
mainText: NSLocalizedString(
22+
"i18n.app.download.menu_option.conjugate_download_data_start",
23+
value: "Download data to start conjugating!",
24+
comment: ""
25+
),
26+
subtitle: NSLocalizedString(
27+
"i18n.app.download.menu_option.conjugate_description",
28+
value: "Add new data to Scribe Conjugate.",
29+
comment: ""
30+
)
31+
) {
32+
// Insert navigation to download screen.
33+
}
34+
}
35+
.padding()
36+
}
37+
.background(Color("scribeAppBackground"))
38+
.navigationBarHidden(true)
39+
}
40+
}
41+
}

Scribe.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@
130130
693150472C881DCE005F99E8 /* BaseTableViewControllerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 693150462C881DCE005F99E8 /* BaseTableViewControllerTest.swift */; };
131131
69B81EBC2BFB8C77008CAB85 /* TipCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69B81EBB2BFB8C77008CAB85 /* TipCardView.swift */; };
132132
84AF4D882C3575EA009AE0D2 /* UIDeviceExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AF4D872C3575EA009AE0D2 /* UIDeviceExtensions.swift */; };
133+
A4C829A12F8400800015D657 /* ConjugateTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = F725CAE42F6A782500A8C950 /* ConjugateTab.swift */; };
134+
A4C829A52F84366C0015D657 /* InstallationDownload.swift in Sources */ = {isa = PBXBuildFile; fileRef = E96111472F04EC62001E4F95 /* InstallationDownload.swift */; };
133135
CE1378C428F5D7AC00E1CBC2 /* ScribeColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1378C228F5D7AC00E1CBC2 /* ScribeColor.swift */; };
134136
CE1378C528F5D7AC00E1CBC2 /* ScribeColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1378C228F5D7AC00E1CBC2 /* ScribeColor.swift */; };
135137
CE1378C628F5D7AC00E1CBC2 /* ScribeColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1378C228F5D7AC00E1CBC2 /* ScribeColor.swift */; };
@@ -3630,13 +3632,15 @@
36303632
files = (
36313633
F7A17EBD2F6A8C230040B09B /* ContentView.swift in Sources */,
36323634
F7A17EBC2F6A8C200040B09B /* ConjugateTab.swift in Sources */,
3635+
A4C829A52F84366C0015D657 /* InstallationDownload.swift in Sources */,
36333636
F7A17EBB2F6A8C1C0040B09B /* AboutTab.swift in Sources */,
36343637
FA001AAB2F9A000000000001 /* AboutTipCardView.swift in Sources */,
36353638
FA001AAB2F9A000000000002 /* AboutSectionView.swift in Sources */,
36363639
FA001AAB2F9A000000000003 /* AboutRowView.swift in Sources */,
36373640
FA001AAB2F9A000000000004 /* AboutInfoView.swift in Sources */,
36383641
FA001AAB2F9A000000000005 /* ShareSheet.swift in Sources */,
36393642
F7A17EBA2F6A8C180040B09B /* AppNavigation.swift in Sources */,
3643+
A4C829A12F8400800015D657 /* ConjugateTab.swift in Sources */,
36403644
F725CADE2F6A72BC00A8C950 /* ConjugateApp.swift in Sources */,
36413645
F725CAE72F6A783400A8C950 /* SettingsTab.swift in Sources */,
36423646
E91980C82F2F540A00B5852F /* NavigationStructure.swift in Sources */,

0 commit comments

Comments
 (0)