Skip to content

Commit 91beb87

Browse files
committed
fix lint
1 parent 69a5d2b commit 91beb87

3 files changed

Lines changed: 30 additions & 24 deletions

File tree

app/src/main/java/dev/dimension/flare/ui/screen/serviceselect/WebCookieLoginScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import dev.dimension.flare.ui.presenter.login.WebCookieSeed
2121
import kotlinx.coroutines.delay
2222
import kotlin.time.Duration.Companion.seconds
2323

24-
private val userAgent =
24+
private val USER_AGENT_HEADERS =
2525
mapOf(
2626
"User-Agent" to "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Mobile Safari/537.3",
2727
"Pragma" to "no-cache",
@@ -92,7 +92,7 @@ internal fun WebCookieLoginScreen(
9292
)
9393
}
9494
cookieManager.flush()
95-
webView.loadUrl(url, userAgent)
95+
webView.loadUrl(url, USER_AGENT_HEADERS)
9696
}
9797
},
9898
)

appleApp/ios/UI/Screen/ServiceSelectionScreen.swift

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,14 @@ struct ServiceSelectionScreen: View {
168168
.transition(ServiceSelectionAnimation.inline)
169169
}
170170

171-
let handler = state.createLoginHandler(
172-
platformType: node.platformType,
173-
host: node.host,
174-
methodType: selectedMethod,
175-
redirectUri: nil,
176-
)
177-
LoginFlowView(handler: handler)
171+
LoginFlowView {
172+
state.createLoginHandler(
173+
platformType: node.platformType,
174+
host: node.host,
175+
methodType: selectedMethod,
176+
redirectUri: nil,
177+
)
178+
}
178179
.id("\(key)-\(selectedMethod)")
179180
.transition(ServiceSelectionAnimation.panel)
180181

@@ -371,8 +372,9 @@ struct ReloginScreen: View {
371372
.pickerStyle(.segmented)
372373
}
373374

374-
let handler = state.createLoginHandler(methodType: selectedMethod)
375-
LoginFlowView(handler: handler)
375+
LoginFlowView {
376+
state.createLoginHandler(methodType: selectedMethod)
377+
}
376378
.id("\(target.accountKey)-\(selectedMethod)")
377379

378380
LoginAgreementView(urlString: state.agreementUrl())
@@ -389,8 +391,8 @@ private struct LoginFlowView: View {
389391
@State private var webCookieUrl: String?
390392
@State private var webCookieInitialCookies: [WebCookieSeed] = []
391393

392-
init(handler: LoginMethodHandler) {
393-
self._presenter = .init(wrappedValue: .init(presenter: LoginFlowPresenter(handler: handler)))
394+
init(handler: @escaping () -> LoginMethodHandler) {
395+
self._presenter = .init(wrappedValue: .init(presenter: LoginFlowPresenter(handler: handler())))
394396
}
395397

396398
var body: some View {

appleApp/macos/UI/Screen/ServiceSelectionScreen.swift

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -167,14 +167,17 @@ struct ServiceSelectionScreen: View {
167167
.foregroundStyle(.secondary)
168168
}
169169

170-
let handler = state.createLoginHandler(
171-
platformType: node.platformType,
172-
host: node.host,
173-
methodType: selectedMethod.wrappedValue,
174-
redirectUri: nil,
170+
LoginFlowView(
171+
handler: {
172+
state.createLoginHandler(
173+
platformType: node.platformType,
174+
host: node.host,
175+
methodType: selectedMethod.wrappedValue,
176+
redirectUri: nil,
177+
)
178+
},
179+
authenticateURL: authenticate(url:)
175180
)
176-
177-
LoginFlowView(handler: handler, authenticateURL: authenticate(url:))
178181
.id("\(key)-\(selectedMethod.wrappedValue)")
179182

180183
LoginAgreementView(
@@ -390,9 +393,10 @@ struct ReloginScreen: View {
390393
.labelsHidden()
391394
}
392395

393-
let handler = state.createLoginHandler(methodType: selectedMethod.wrappedValue)
394396
LoginFlowView(
395-
handler: handler,
397+
handler: {
398+
state.createLoginHandler(methodType: selectedMethod.wrappedValue)
399+
},
396400
authenticateURL: authenticate(url:)
397401
)
398402
.id("\(target.accountKey)-\(selectedMethod.wrappedValue)")
@@ -424,11 +428,11 @@ private struct LoginFlowView: View {
424428
@State private var webCookieInitialCookies: [WebCookieSeed] = []
425429

426430
init(
427-
handler: LoginMethodHandler,
431+
handler: @escaping () -> LoginMethodHandler,
428432
authenticateURL: @escaping (String) async -> String?
429433
) {
430434
self.authenticateURL = authenticateURL
431-
self._presenter = .init(wrappedValue: .init(presenter: LoginFlowPresenter(handler: handler)))
435+
self._presenter = .init(wrappedValue: .init(presenter: LoginFlowPresenter(handler: handler())))
432436
}
433437

434438
var body: some View {

0 commit comments

Comments
 (0)