Skip to content

Commit dcd0d90

Browse files
d-dategithub-actions[bot]
d-date
authored and
github-actions[bot]
committed
[ci skip] Run swift-format
1 parent 618920c commit dcd0d90

File tree

4 files changed

+395
-392
lines changed

4 files changed

+395
-392
lines changed

‎MyLibrary/Sources/AppFeature/AppView.swift

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
import ComposableArchitecture
22
import Foundation
33
import GuidanceFeature
4-
#if canImport(LiveTranslationSDK_iOS)
5-
import LiveTranslationFeature
6-
#endif
74
import ScheduleFeature
85
import SponsorFeature
96
import SwiftUI
107
import TipKit
118
import trySwiftFeature
129

10+
#if canImport(LiveTranslationSDK_iOS)
11+
import LiveTranslationFeature
12+
#endif
13+
1314
@Reducer
1415
public struct AppReducer {
1516
@ObservableState
@@ -63,10 +64,10 @@ public struct AppView: View {
6364
Label(String(localized: "Schedule", bundle: .module), systemImage: "calendar")
6465
}
6566
#if canImport(LiveTranslationSDK_iOS)
66-
LiveTranslationView()
67-
.tabItem {
68-
Label(String(localized: "Translation", bundle: .module), systemImage: "text.bubble")
69-
}
67+
LiveTranslationView()
68+
.tabItem {
69+
Label(String(localized: "Translation", bundle: .module), systemImage: "text.bubble")
70+
}
7071
#endif
7172
GuidanceView(store: store.scope(state: \.guidance, action: \.guidance))
7273
.tabItem {

‎MyLibrary/Sources/LiveTranslationFeature/LiveTranslationView.swift

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,85 @@
11
#if canImport(LiveTranslationSDK_iOS)
2-
import LiveTranslationSDK_iOS
3-
import SwiftUI
2+
import LiveTranslationSDK_iOS
3+
import SwiftUI
44

5-
public struct LiveTranslationView: View {
6-
let viewModel: ViewModel
7-
@State var isSelectedLanguageSheet: Bool = false
5+
public struct LiveTranslationView: View {
6+
let viewModel: ViewModel
7+
@State var isSelectedLanguageSheet: Bool = false
88

9-
public init(
10-
roomNumber: String = ProcessInfo.processInfo.environment["LIVE_TRANSLATION_KEY"]
11-
?? (Bundle.main.infoDictionary?["Live translation room number"] as? String) ?? ""
12-
) {
13-
print(roomNumber)
14-
self.viewModel = ViewModel(roomNumber: roomNumber)
15-
}
9+
public init(
10+
roomNumber: String = ProcessInfo.processInfo.environment["LIVE_TRANSLATION_KEY"]
11+
?? (Bundle.main.infoDictionary?["Live translation room number"] as? String) ?? ""
12+
) {
13+
print(roomNumber)
14+
self.viewModel = ViewModel(roomNumber: roomNumber)
15+
}
1616

17-
public var body: some View {
18-
NavigationStack {
19-
VStack {
20-
ScrollView {
21-
if self.viewModel.roomNumber.isEmpty {
22-
ContentUnavailableView("Room is unavailable", systemImage: "text.page.slash.fill")
23-
Spacer()
24-
} else if viewModel.chatList.isEmpty {
25-
ContentUnavailableView("Not started yet", systemImage: "text.page.slash.fill")
26-
Spacer()
27-
} else {
28-
LazyVStack {
29-
ForEach(viewModel.chatList) { item in
30-
Text(item.trItem?.content ?? item.item.text)
31-
.frame(maxWidth: .infinity, alignment: .leading)
32-
.multilineTextAlignment(.leading)
33-
.padding()
17+
public var body: some View {
18+
NavigationStack {
19+
VStack {
20+
ScrollView {
21+
if self.viewModel.roomNumber.isEmpty {
22+
ContentUnavailableView("Room is unavailable", systemImage: "text.page.slash.fill")
23+
Spacer()
24+
} else if viewModel.chatList.isEmpty {
25+
ContentUnavailableView("Not started yet", systemImage: "text.page.slash.fill")
26+
Spacer()
27+
} else {
28+
LazyVStack {
29+
ForEach(viewModel.chatList) { item in
30+
Text(item.trItem?.content ?? item.item.text)
31+
.frame(maxWidth: .infinity, alignment: .leading)
32+
.multilineTextAlignment(.leading)
33+
.padding()
34+
}
3435
}
3536
}
36-
}
37-
HStack {
38-
Spacer()
39-
Text("Powered by", bundle: .module)
40-
.font(.caption)
41-
.foregroundStyle(Color(.secondaryLabel))
42-
Image(.flitto)
43-
.resizable()
44-
.aspectRatio(contentMode: .fit)
45-
.frame(maxHeight: 30)
46-
Spacer()
37+
HStack {
38+
Spacer()
39+
Text("Powered by", bundle: .module)
40+
.font(.caption)
41+
.foregroundStyle(Color(.secondaryLabel))
42+
Image(.flitto)
43+
.resizable()
44+
.aspectRatio(contentMode: .fit)
45+
.frame(maxHeight: 30)
46+
Spacer()
47+
}
4748
}
4849
}
49-
}
50-
.task {
51-
viewModel.send(.onAppearedPage)
52-
viewModel.send(.connectChatStream)
53-
}
54-
.navigationTitle(Text("Live translation", bundle: .module))
55-
.toolbar {
56-
ToolbarItem(placement: .navigationBarTrailing) {
57-
Button {
58-
isSelectedLanguageSheet.toggle()
59-
} label: {
60-
let selectedLanguage =
61-
viewModel.langSet?.langCodingKey(viewModel.selectedLangCode) ?? ""
62-
Text(selectedLanguage)
63-
Image(systemName: "globe")
64-
}
65-
.sheet(isPresented: $isSelectedLanguageSheet) {
66-
SelectLanguageSheet(
67-
languageList: viewModel.langList,
68-
langSet: viewModel.langSet,
69-
selectedLanguageAction: { langCode in
70-
viewModel.send(.changeLangCode(langCode))
71-
isSelectedLanguageSheet = false
72-
}
73-
)
74-
.presentationDetents([.medium, .large])
50+
.task {
51+
viewModel.send(.onAppearedPage)
52+
viewModel.send(.connectChatStream)
53+
}
54+
.navigationTitle(Text("Live translation", bundle: .module))
55+
.toolbar {
56+
ToolbarItem(placement: .navigationBarTrailing) {
57+
Button {
58+
isSelectedLanguageSheet.toggle()
59+
} label: {
60+
let selectedLanguage =
61+
viewModel.langSet?.langCodingKey(viewModel.selectedLangCode) ?? ""
62+
Text(selectedLanguage)
63+
Image(systemName: "globe")
64+
}
65+
.sheet(isPresented: $isSelectedLanguageSheet) {
66+
SelectLanguageSheet(
67+
languageList: viewModel.langList,
68+
langSet: viewModel.langSet,
69+
selectedLanguageAction: { langCode in
70+
viewModel.send(.changeLangCode(langCode))
71+
isSelectedLanguageSheet = false
72+
}
73+
)
74+
.presentationDetents([.medium, .large])
75+
}
7576
}
7677
}
7778
}
7879
}
7980
}
80-
}
8181

82-
#Preview {
83-
LiveTranslationView(roomNumber: "490294")
84-
}
82+
#Preview {
83+
LiveTranslationView(roomNumber: "490294")
84+
}
8585
#endif

‎MyLibrary/Sources/LiveTranslationFeature/SelectLanguageSheet.swift

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
11
#if canImport(LiveTranslationSDK_iOS)
2-
import LiveTranslationSDK_iOS
3-
import SwiftUI
2+
import LiveTranslationSDK_iOS
3+
import SwiftUI
44

5-
struct SelectLanguageSheet: View {
6-
let languageList: [LanguageEntity.Response.LanguageItem]
7-
let langSet: LanguageEntity.Response.LangSet?
8-
let selectedLanguageAction: (String) -> Void
5+
struct SelectLanguageSheet: View {
6+
let languageList: [LanguageEntity.Response.LanguageItem]
7+
let langSet: LanguageEntity.Response.LangSet?
8+
let selectedLanguageAction: (String) -> Void
99

10-
@State var languageListWithTitle: [LanguageWithTitle] = []
10+
@State var languageListWithTitle: [LanguageWithTitle] = []
1111

12-
var body: some View {
13-
ScrollView {
14-
LazyVStack {
15-
ForEach(languageListWithTitle) { lang in
16-
Button(action: { selectedLanguageAction(lang.langCode) }) {
17-
Text(lang.langTitle)
18-
.frame(maxWidth: .infinity, alignment: .leading)
19-
.padding()
20-
.contentShape(.rect)
12+
var body: some View {
13+
ScrollView {
14+
LazyVStack {
15+
ForEach(languageListWithTitle) { lang in
16+
Button(action: { selectedLanguageAction(lang.langCode) }) {
17+
Text(lang.langTitle)
18+
.frame(maxWidth: .infinity, alignment: .leading)
19+
.padding()
20+
.contentShape(.rect)
21+
}
2122
}
2223
}
2324
}
24-
}
25-
.task {
26-
self.languageListWithTitle = await makeLanguageWithTitleList()
25+
.task {
26+
self.languageListWithTitle = await makeLanguageWithTitleList()
27+
}
2728
}
2829
}
29-
}
3030

31-
extension SelectLanguageSheet {
32-
fileprivate func makeLanguageWithTitleList() async -> [LanguageWithTitle] {
33-
await withCheckedContinuation { continuation in
34-
let newList: [LanguageWithTitle] = languageList.reduce([]) { current, next in
35-
guard let title = langSet?.langCodingKey(next.langCode) else { return current }
36-
return current + [.init(langCode: next.langCode, langTitle: title)]
37-
}
31+
extension SelectLanguageSheet {
32+
fileprivate func makeLanguageWithTitleList() async -> [LanguageWithTitle] {
33+
await withCheckedContinuation { continuation in
34+
let newList: [LanguageWithTitle] = languageList.reduce([]) { current, next in
35+
guard let title = langSet?.langCodingKey(next.langCode) else { return current }
36+
return current + [.init(langCode: next.langCode, langTitle: title)]
37+
}
3838

39-
continuation.resume(returning: newList)
39+
continuation.resume(returning: newList)
40+
}
4041
}
4142
}
42-
}
4343

44-
extension SelectLanguageSheet {
45-
struct LanguageWithTitle: Equatable, Identifiable {
46-
var id: String { langCode }
47-
let langCode: String
48-
let langTitle: String
44+
extension SelectLanguageSheet {
45+
struct LanguageWithTitle: Equatable, Identifiable {
46+
var id: String { langCode }
47+
let langCode: String
48+
let langTitle: String
4949

50-
init(langCode: String, langTitle: String) {
51-
self.langCode = langCode
52-
self.langTitle = langTitle
50+
init(langCode: String, langTitle: String) {
51+
self.langCode = langCode
52+
self.langTitle = langTitle
53+
}
5354
}
5455
}
55-
}
5656
#endif

0 commit comments

Comments
 (0)