Skip to content

Commit f1e1207

Browse files
d-dategithub-actions[bot]
authored andcommitted
[ci skip] Run swift-format
1 parent aa70392 commit f1e1207

File tree

4 files changed

+49
-21
lines changed

4 files changed

+49
-21
lines changed

MyLibrary/Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ let package = Package(
2929
dependencies: [
3030
.package(url: "https://github.com/pointfreeco/swift-composable-architecture", from: "1.18.0"),
3131
.package(url: "https://github.com/maiyama18/LicensesPlugin", from: "0.2.0"),
32-
.package(url: "https://github.com/flitto/rtt_sdk", from: "0.0.7")
32+
.package(url: "https://github.com/flitto/rtt_sdk", from: "0.0.7"),
3333
],
3434
targets: [
3535
.target(
@@ -70,7 +70,7 @@ let package = Package(
7070
name: "LiveTranslationFeature",
7171
dependencies: [
7272
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
73-
.product(name: "rtt-sdk", package: "rtt_sdk")
73+
.product(name: "rtt-sdk", package: "rtt_sdk"),
7474
]
7575
),
7676
.target(

MyLibrary/Sources/LiveTranslationFeature/LiveTranslationView.swift

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
import SwiftUI
21
import LiveTranslationSDK_iOS
2+
import SwiftUI
33

44
public struct LiveTranslationView: View {
55
let viewModel: ViewModel
66
@State var isSelectedLanguageSheet: Bool = false
77

8-
public init(roomNumber: String = ProcessInfo.processInfo.environment["LIVE_TRANSLATION_KEY"] ?? (Bundle.main.infoDictionary?["Live translation room number"] as? String) ?? "") {
8+
public init(
9+
roomNumber: String = ProcessInfo.processInfo.environment["LIVE_TRANSLATION_KEY"]
10+
?? (Bundle.main.infoDictionary?["Live translation room number"] as? String) ?? ""
11+
) {
912
print(roomNumber)
1013
self.viewModel = ViewModel(roomNumber: roomNumber)
1114
}
@@ -53,7 +56,8 @@ public struct LiveTranslationView: View {
5356
Button {
5457
isSelectedLanguageSheet.toggle()
5558
} label: {
56-
let selectedLanguage = viewModel.langSet?.langCodingKey(viewModel.selectedLangCode) ?? ""
59+
let selectedLanguage =
60+
viewModel.langSet?.langCodingKey(viewModel.selectedLangCode) ?? ""
5761
Text(selectedLanguage)
5862
Image(systemName: "globe")
5963
}

MyLibrary/Sources/LiveTranslationFeature/SelectLanguageSheet.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import SwiftUI
21
import LiveTranslationSDK_iOS
2+
import SwiftUI
33

44
struct SelectLanguageSheet: View {
55
let languageList: [LanguageEntity.Response.LanguageItem]

MyLibrary/Sources/LiveTranslationFeature/ViewModel.swift

Lines changed: 39 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ public final class ViewModel {
1313
var langSet: LanguageEntity.Response.LangSet? = .none
1414
var langList: [LanguageEntity.Response.LanguageItem] = []
1515
var roomInfo: ChatRoomEntity.Make.Response? = .none
16-
var selectedLangCode: String = Locale.autoupdatingCurrent.language.languageCode?.identifier ?? "en"
16+
var selectedLangCode: String =
17+
Locale.autoupdatingCurrent.language.languageCode?.identifier ?? "en"
1718

1819
let service: LiveTranslationService = .init()
1920

@@ -99,7 +100,9 @@ extension ViewModel {
99100
}
100101
}
101102

102-
package func loadTranslation(chatList: [TranslationEntity.CompositeChatItem], _ dstLangCode: String) async {
103+
package func loadTranslation(
104+
chatList: [TranslationEntity.CompositeChatItem], _ dstLangCode: String
105+
) async {
103106
await withTaskGroup(of: Void.self) { [weak self] group in
104107
let chunkedArray = chatList.chunked(into: 20)
105108
for array in chunkedArray {
@@ -140,8 +143,12 @@ extension ViewModel {
140143

141144
switch chatItem.contentData.listType {
142145
case .update:
143-
let updateTargetList = chatItem.contentData.chatList.reduce([TranslationEntity.CompositeChatItem]()) { current, next in
144-
guard let firstIndex = newChatList.firstIndex(where: { $0.id == next.id }) else { return current }
146+
let updateTargetList = chatItem.contentData.chatList.reduce(
147+
[TranslationEntity.CompositeChatItem]()
148+
) { current, next in
149+
guard let firstIndex = newChatList.firstIndex(where: { $0.id == next.id }) else {
150+
return current
151+
}
145152
return current + [newChatList[firstIndex]]
146153
}
147154
await loadTranslation(chatList: updateTargetList, selectedLangCode)
@@ -188,7 +195,9 @@ extension ViewModel {
188195
}
189196

190197
extension [TranslationEntity.CompositeChatItem] {
191-
fileprivate func merge(item: RealTimeEntity.Chat.Response, dstLangCode: String) async -> [TranslationEntity.CompositeChatItem] {
198+
fileprivate func merge(item: RealTimeEntity.Chat.Response, dstLangCode: String) async
199+
-> [TranslationEntity.CompositeChatItem]
200+
{
192201
await withCheckedContinuation { continuation in
193202
switch item.contentData.listType {
194203
case .append:
@@ -199,7 +208,8 @@ extension [TranslationEntity.CompositeChatItem] {
199208
}
200209

201210
guard !(newItem.textForTR.isEmpty || newItem.text.isEmpty) else { continue }
202-
mutableSelf.append(.init(item: newItem, trItem: .none, ttsData: .none, dstLangCode: dstLangCode))
211+
mutableSelf.append(
212+
.init(item: newItem, trItem: .none, ttsData: .none, dstLangCode: dstLangCode))
203213
}
204214

205215
return continuation.resume(returning: mutableSelf.suffix(100))
@@ -211,15 +221,20 @@ extension [TranslationEntity.CompositeChatItem] {
211221
mutableSelf.remove(at: lastIdx)
212222
}
213223

214-
mutableSelf.append(.init(item: newItem, trItem: .none, ttsData: .none, dstLangCode: dstLangCode))
224+
mutableSelf.append(
225+
.init(item: newItem, trItem: .none, ttsData: .none, dstLangCode: dstLangCode))
215226
}
216227
return continuation.resume(returning: mutableSelf)
217228

218229
case .renew:
219-
let newArr: [TranslationEntity.CompositeChatItem] = item.contentData.chatList.reduce([]) { current, next in
220-
guard !next.text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else { return current }
230+
let newArr: [TranslationEntity.CompositeChatItem] = item.contentData.chatList.reduce([]) {
231+
current, next in
232+
guard !next.text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
233+
return current
234+
}
221235
let first = self.first(where: { $0.item.id == next.id })
222-
let new: TranslationEntity.CompositeChatItem = .init(item: next, trItem: first?.trItem, ttsData: first?.ttsData, dstLangCode: dstLangCode)
236+
let new: TranslationEntity.CompositeChatItem = .init(
237+
item: next, trItem: first?.trItem, ttsData: first?.ttsData, dstLangCode: dstLangCode)
223238

224239
return current + [new]
225240
}
@@ -245,8 +260,12 @@ extension [TranslationEntity.CompositeChatItem] {
245260
return variableCurrent
246261
}
247262
// If the update target is not included in the current chat list (when modifying an empty chat)
248-
} else if let willAppendIndex = current.firstIndex(where: { $0.item.timestamp > next.timestamp }) {
249-
guard !next.text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else { return current }
263+
} else if let willAppendIndex = current.firstIndex(where: {
264+
$0.item.timestamp > next.timestamp
265+
}) {
266+
guard !next.text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
267+
return current
268+
}
250269
var variableCurrent = current
251270
variableCurrent.insert(
252271
.init(item: next, trItem: .none, ttsData: .none, dstLangCode: dstLangCode),
@@ -265,13 +284,18 @@ extension [TranslationEntity.CompositeChatItem] {
265284
}
266285
}
267286

268-
fileprivate func updateTranslation(item: RealTimeEntity.Translation.Response) async -> [TranslationEntity.CompositeChatItem] {
287+
fileprivate func updateTranslation(item: RealTimeEntity.Translation.Response) async
288+
-> [TranslationEntity.CompositeChatItem]
289+
{
269290
await withCheckedContinuation { continuation in
270-
guard let firstIndex = self.firstIndex(where: { $0.id == item.contentData.chatList.first?.chatID }) else {
291+
guard
292+
let firstIndex = self.firstIndex(where: { $0.id == item.contentData.chatList.first?.chatID }
293+
)
294+
else {
271295
return continuation.resume(returning: self)
272296
}
273297

274-
let range = firstIndex ..< (firstIndex + item.contentData.chatList.count)
298+
let range = firstIndex..<(firstIndex + item.contentData.chatList.count)
275299
var mutatedArray: [TranslationEntity.CompositeChatItem] = []
276300

277301
for index in range {

0 commit comments

Comments
 (0)