Skip to content

Commit a15e509

Browse files
committed
chore :: ktlint check
1 parent 9e28428 commit a15e509

File tree

2 files changed

+13
-30
lines changed

2 files changed

+13
-30
lines changed

feature/src/main/java/team/aliens/dms/android/feature/main/application/ApplicationScreen.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package team.aliens.dms.android.feature.main.application
22

3-
import android.view.ViewGroup
4-
import android.webkit.WebView
5-
import android.webkit.WebViewClient
63
import androidx.compose.animation.AnimatedVisibility
74
import androidx.compose.animation.animateContentSize
85
import androidx.compose.animation.fadeIn
@@ -26,11 +23,9 @@ import androidx.compose.ui.Alignment
2623
import androidx.compose.ui.Modifier
2724
import androidx.compose.ui.platform.LocalLifecycleOwner
2825
import androidx.compose.ui.res.stringResource
29-
import androidx.compose.ui.viewinterop.AndroidView
3026
import androidx.hilt.navigation.compose.hiltViewModel
3127
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3228
import com.ramcosta.composedestinations.annotation.Destination
33-
import org.threeten.bp.LocalDateTime
3429
import team.aliens.dms.android.core.designsystem.ContainedButton
3530
import team.aliens.dms.android.core.designsystem.DmsTheme
3631
import team.aliens.dms.android.core.designsystem.DmsTopAppBar

feature/src/main/java/team/aliens/dms/android/feature/volunteers/VolunteersScreen.kt

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package team.aliens.dms.android.feature.volunteers
22

3-
import android.app.Activity
4-
import android.util.Log
3+
import android.annotation.SuppressLint
54
import android.view.ViewGroup
6-
import android.webkit.WebResourceResponse
75
import android.webkit.WebView
86
import android.webkit.WebViewClient
97
import androidx.compose.foundation.background
@@ -17,37 +15,32 @@ import androidx.compose.material3.Icon
1715
import androidx.compose.material3.IconButton
1816
import androidx.compose.material3.Text
1917
import androidx.compose.runtime.Composable
18+
import androidx.compose.runtime.getValue
2019
import androidx.compose.ui.Modifier
21-
import androidx.compose.ui.graphics.toArgb
22-
import androidx.compose.ui.platform.LocalView
2320
import androidx.compose.ui.res.painterResource
2421
import androidx.compose.ui.res.stringResource
2522
import androidx.compose.ui.viewinterop.AndroidView
26-
import androidx.core.view.WindowCompat
23+
import androidx.hilt.navigation.compose.hiltViewModel
24+
import androidx.lifecycle.compose.collectAsStateWithLifecycle
2725
import com.ramcosta.composedestinations.annotation.Destination
2826
import team.aliens.dms.android.core.designsystem.DmsTheme
2927
import team.aliens.dms.android.core.designsystem.DmsTopAppBar
3028
import team.aliens.dms.android.core.designsystem.Scaffold
31-
import team.aliens.dms.android.core.ui.mvi.SideEffect
3229
import team.aliens.dms.android.feature.R
3330
import team.aliens.dms.android.feature.volunteers.navigation.VolunteersNavigator
3431
import team.aliens.dms.android.network.BuildConfig
3532

33+
@SuppressLint("SetJavaScriptEnabled")
3634
@OptIn(ExperimentalMaterial3Api::class)
3735
@Destination
3836
@Composable
3937
fun VolunteersScreen(
4038
modifier: Modifier = Modifier,
4139
navigator: VolunteersNavigator,
40+
viewModel: VolunteersViewModel = hiltViewModel(),
4241
) {
43-
val accessToken = "eyJKV1QiOiJhY2Nlc3MiLCJhbGciOiJIUzUxMiJ9.eyJqdGkiOiJmZmFlNDhmNS1lNGYwLTExZWUtYjMyMi03ZDRmZmIxYWIzZDciLCJhdXRob3JpdHkiOiJTVFVERU5UIiwiaWF0IjoxNzYwNDE4MDIzLCJleHAiOjE3NjA0MjE2MjN9.NEjMHn-Ddbm4Y29ySh-XFF0n5vFx4KT8D6vpr10cWa20U95dhSGhPOIwq6uIoAHFVyjag5m9ZL3P6pMHz7bIew"
44-
val refreshToken = "eyJKV1QiOiJyZWZyZXNoIiwiYWxnIjoiSFM1MTIifQ.eyJqdGkiOiJmZmFlNDhmNS1lNGYwLTExZWUtYjMyMi03ZDRmZmIxYWIzZDciLCJpYXQiOjE3NjA0MTgwMjMsImV4cCI6MTc2MTYyMzYyM30.N5IorFvyZNA4HA7GCuC0sDUgC4VAT4dz34ZPa3Xhin--1GVy-ApI7WDl4Iu5sp_AIAGvMEXDkKjGJsAylr3ZaA"
45-
val theme = if (isSystemInDarkTheme()) {
46-
"dark"
47-
} else {
48-
"light"
49-
}
50-
42+
val uiState by viewModel.stateFlow.collectAsStateWithLifecycle()
43+
val theme = if (isSystemInDarkTheme()) "dark" else "light"
5144
var isTokenSet = false
5245

5346
Scaffold(
@@ -66,13 +59,13 @@ fun VolunteersScreen(
6659
}
6760
},
6861
)
69-
}
62+
},
7063
) { padValues ->
7164
Column(
7265
modifier = Modifier
7366
.fillMaxSize()
7467
.padding(padValues)
75-
.imePadding()
68+
.imePadding(),
7669
) {
7770
AndroidView(
7871
modifier = Modifier.weight(1f),
@@ -92,8 +85,8 @@ fun VolunteersScreen(
9285
) {
9386
if (!isTokenSet) {
9487
view?.evaluateJavascript(
95-
"window.setAuthToken('$accessToken', '$refreshToken')",
96-
null
88+
"window.setAuthToken('${uiState.accessToken}', '${uiState.refreshToken}')",
89+
null,
9790
)
9891
isTokenSet = true
9992
}
@@ -102,13 +95,9 @@ fun VolunteersScreen(
10295
override fun doUpdateVisitedHistory(
10396
view: WebView?,
10497
url: String?,
105-
isReload: Boolean
98+
isReload: Boolean,
10699
) {
107100
super.doUpdateVisitedHistory(view, url, isReload)
108-
Log.d(
109-
"WEBVIEW_DEBUG",
110-
"doUpdateVisitedHistory - URL: $url, isReload: $isReload"
111-
)
112101

113102
if (url == null || isReload || redirectedUrls.contains(url)) return
114103

@@ -121,7 +110,6 @@ fun VolunteersScreen(
121110
if (url.contains("/volunteer")) {
122111
val separator = if (url.contains("?")) "&" else "?"
123112
val urlWithTheme = "$url${separator}theme=$theme"
124-
Log.d("WEBVIEW_DEBUG", "✅ 테마 추가: $urlWithTheme")
125113

126114
redirectedUrls.add(urlWithTheme)
127115
view?.loadUrl(urlWithTheme)

0 commit comments

Comments
 (0)