Skip to content

Commit 291a055

Browse files
committed
Implemented Longman and ReversoContext on iPadOS.
1 parent 6639b48 commit 291a055

File tree

4 files changed

+49
-7
lines changed

4 files changed

+49
-7
lines changed

ReaderTranslator.xcodeproj/project.pbxproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,9 @@
569569
F0C706D1239ACE620061F790 /* BookmarksView_Controls.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0C706CF239ACDBD0061F790 /* BookmarksView_Controls.swift */; };
570570
F0C934A824187D0C0006E31D /* SettingsView_Views.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0C934A724187D0C0006E31D /* SettingsView_Views.swift */; };
571571
F0C934A924187D0C0006E31D /* SettingsView_Views.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0C934A724187D0C0006E31D /* SettingsView_Views.swift */; };
572+
F0CFD3B32539BD4E00635677 /* ReversoRepresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0A9F35A2349228A00970C97 /* ReversoRepresenter.swift */; };
573+
F0CFD3BC2539BDAB00635677 /* Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0C6657B2351A70B0087B6F2 /* Collection.swift */; };
574+
F0CFD3C52539C5C200635677 /* LongmanRepresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0505C522360D37C004F2D50 /* LongmanRepresenter.swift */; };
572575
F0D2E334234BA49000D95994 /* Safari.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0D2E333234BA49000D95994 /* Safari.swift */; };
573576
F0D2E335234BA49000D95994 /* Safari.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0D2E333234BA49000D95994 /* Safari.swift */; };
574577
F0D31C5123491C23003CF86B /* GTranslatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0D31C5023491C23003CF86B /* GTranslatorView.swift */; };
@@ -1163,8 +1166,8 @@
11631166
isa = PBXGroup;
11641167
children = (
11651168
F07CD2E9244CE22700BCBF71 /* Delegates */,
1166-
F07CD2DB244CDE0F00BCBF71 /* ContentView.swift */,
11671169
F07CD2EC244CE2C600BCBF71 /* Stores */,
1170+
F07CD2DB244CDE0F00BCBF71 /* ContentView.swift */,
11681171
F07CD2DD244CDE1100BCBF71 /* Assets.xcassets */,
11691172
F07CD2E2244CDE1100BCBF71 /* LaunchScreen.storyboard */,
11701173
F07CD2E5244CDE1100BCBF71 /* Info.plist */,
@@ -2292,6 +2295,7 @@
22922295
F07CD2F7244CE3DB00BCBF71 /* Store.swift in Sources */,
22932296
F07CD309244CE48500BCBF71 /* CircleButton.swift in Sources */,
22942297
F07CD306244CE47300BCBF71 /* CambidgeRepresenter.swift in Sources */,
2298+
F0CFD3B32539BD4E00635677 /* ReversoRepresenter.swift in Sources */,
22952299
F07CD303244CE46100BCBF71 /* WebViewContainer.swift in Sources */,
22962300
F07CD2F0244CE34600BCBF71 /* WikipediaView.swift in Sources */,
22972301
F07CD31F244CE5F500BCBF71 /* CambridgeStore.swift in Sources */,
@@ -2301,6 +2305,7 @@
23012305
F07CD30C244CE4B000BCBF71 /* WKPageView.swift in Sources */,
23022306
F07CD317244CE52800BCBF71 /* SpeechSynthesizer.swift in Sources */,
23032307
F07CD319244CE53C00BCBF71 /* String.swift in Sources */,
2308+
F0CFD3C52539C5C200635677 /* LongmanRepresenter.swift in Sources */,
23042309
F07CD31D244CE58300BCBF71 /* SentencesView_Row.swift in Sources */,
23052310
F07CD2F3244CE35600BCBF71 /* ReversoView.swift in Sources */,
23062311
F07CD30B244CE4A000BCBF71 /* AVAudioNetPlayer.swift in Sources */,
@@ -2327,6 +2332,7 @@
23272332
F07CD320244CE5FD00BCBF71 /* FileStore.swift in Sources */,
23282333
F07CD2DC244CDE0F00BCBF71 /* ContentView.swift in Sources */,
23292334
F07CD2EE244CE32F00BCBF71 /* Published.swift in Sources */,
2335+
F0CFD3BC2539BDAB00635677 /* Collection.swift in Sources */,
23302336
F07CD313244CE50C00BCBF71 /* ViewRepresentable.swift in Sources */,
23312337
F07CD2FA244CE41900BCBF71 /* DeepLView.swift in Sources */,
23322338
F026D3AC244CE76F0085BA72 /* WebView.swift in Sources */,

ReaderTranslatorIPad/ContentView.swift

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ import SwiftUI
1111
struct ContentView: View {
1212
@ObservedObject private var store = Store.shared
1313

14+
@State var service: AvailableView = .gTranslator {
15+
didSet {
16+
enbaledService(service)
17+
}
18+
}
19+
1420
init() {
1521
ViewsStore.shared.enabledViews = [.gTranslator, .web]
1622
}
@@ -22,14 +28,40 @@ struct ContentView: View {
2228
}
2329

2430
return HStack {
25-
HStack {
26-
GTranslatorView()
27-
.frame(width: 400)
31+
VStack {
32+
Menu("TranslateBy") {
33+
Button("Google Translate", action: {
34+
service = .gTranslator
35+
})
36+
Button("ReversoContext", action: {
37+
service = .reverso
38+
})
39+
Button("Longman", action: {
40+
service = .longman
41+
})
42+
Button("Cancel", action: {})
43+
}
2844

29-
WebView()
45+
switch service {
46+
case .gTranslator: GTranslatorView()
47+
case .reverso: ReversoView()
48+
case .longman: LongmanView()
49+
default: EmptyView()
50+
}
3051
}
52+
.frame(width: 400)
53+
54+
WebView()
3155
}
3256
}
57+
58+
private func enbaledService(_ service: AvailableView) {
59+
ViewsStore.shared.enabledViews.remove(.gTranslator)
60+
ViewsStore.shared.enabledViews.remove(.reverso)
61+
ViewsStore.shared.enabledViews.remove(.longman)
62+
63+
ViewsStore.shared.enabledViews.insert(service)
64+
}
3365
}
3466

3567
struct ContentView_Previews: PreviewProvider {

ReaderTranslatorMobile/Views/LongmanView.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
import SwiftUI
1010

1111
struct LongmanView: View {
12+
@ObservedObject private var store = Store.shared
13+
1214
var body: some View {
13-
Text("Not implemented")
15+
LongmanRepresenter(selectedText: self.$store.translateAction)
1416
}
1517
}
1618

ReaderTranslatorMobile/Views/ReversoView.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
import SwiftUI
1010

1111
struct ReversoView: View {
12+
@ObservedObject private var store = Store.shared
13+
1214
var body: some View {
13-
Text("Not implemented")
15+
ReversoRepresenter(selectedText: self.$store.translateAction)
1416
}
1517
}
1618

0 commit comments

Comments
 (0)