refactor(setting,timeletter): screenshotTest 용 Content 경계를 분리한다 (#1360)

.github/ci-expected-failures.json

@@ -18,20 +18,5 @@
     }
   ],
   "androidTests": [],
-  "screenshotModules": [
-    {
-      "module": ":feature:setting:presentation",
-      "issues": [
-        1360
-      ],
-      "reason": "설정 화면 screenshotTest용 Content 경계 분리 대기 — compileDebugScreenshotTestKotlin 실패"
-    },
-    {
-      "module": ":feature:timeletter:presentation",
-      "issues": [
-        1361
-      ],
-      "reason": "목록 화면 screenshotTest용 Content 경계 분리 대기 — compileDebugScreenshotTestKotlin 실패"
-    }
-  ]
+  "screenshotModules": []
 }

feature/setting/presentation/src/main/kotlin/com/afternote/feature/setting/presentation/screen/AppLockSetupContent.kt

@@ -0,0 +1,108 @@
+package com.afternote.feature.setting.presentation.screen
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.afternote.core.ui.topbar.DetailTopBar
+import com.afternote.feature.setting.presentation.component.InsertPasswordContent
+import com.afternote.feature.setting.presentation.component.PinSetupStep
+
+/**
+ * 앱 잠금 비밀번호 설정 화면의 상태 없는 본문.
+ *
+ * ViewModel·부수효과는 [AppLockSetupScreen] 이 들고, 이 함수는 넘겨받은 상태만 그린다.
+ */
+@Composable
+internal fun AppLockSetupContent(
+    step: PinSetupStep,
+    passwordLength: Int,
+    onDigitClick: (String) -> Unit,
+    onDeleteClick: () -> Unit,
+    onConfirmClick: () -> Unit,
+    onBack: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val titleText =
+        when (step) {
+            PinSetupStep.ENTER_NEW -> "비밀번호를 입력해 주세요."
+            PinSetupStep.CONFIRM_NEW -> "비밀번호를 다시 한 번 입력해 주세요."
+            PinSetupStep.ENTER_CURRENT -> "변경할 비밀번호를 입력해 주세요."
+        }
+
+    Scaffold(
+        topBar = {
+            DetailTopBar(
+                title = "앱 잠금 비밀번호 설정",
+                onBackClick = onBack,
+            )
+        },
+        modifier = modifier,
+        containerColor = Color.Transparent,
+    ) { innerPadding ->
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .padding(innerPadding),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            Spacer(modifier = Modifier.height(40.dp))
+
+            InsertPasswordContent(
+                titleText = titleText,
+                passwordLength = passwordLength,
+                onDigitClick = onDigitClick,
+                onDeleteClick = onDeleteClick,
+                onConfirmClick = onConfirmClick,
+            )
+        }
+    }
+}
+
+@Preview(name = "비밀번호 입력", showBackground = true)
+@Composable
+private fun PreviewEnterNew() {
+    AppLockSetupContent(
+        step = PinSetupStep.ENTER_NEW,
+        passwordLength = 0,
+        onDigitClick = {},
+        onDeleteClick = {},
+        onConfirmClick = {},
+        onBack = {},
+    )
+}
+
+@Preview(name = "비밀번호 재입력", showBackground = true)
+@Composable
+private fun PreviewConfirmNew() {
+    AppLockSetupContent(
+        step = PinSetupStep.CONFIRM_NEW,
+        passwordLength = 3,
+        onDigitClick = {},
+        onDeleteClick = {},
+        onConfirmClick = {},
+        onBack = {},
+    )
+}
+
+@Preview(name = "변경할 비밀번호 입력", showBackground = true)
+@Composable
+private fun PreviewEnterCurrent() {
+    AppLockSetupContent(
+        step = PinSetupStep.ENTER_CURRENT,
+        passwordLength = 0,
+        onDigitClick = {},
+        onDeleteClick = {},
+        onConfirmClick = {},
+        onBack = {},
+    )
+}

feature/setting/presentation/src/main/kotlin/com/afternote/feature/setting/presentation/screen/AppLockSetupScreen.kt

@@ -1,24 +1,12 @@
 package com.afternote.feature.setting.presentation.screen
 
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.afternote.core.ui.topbar.DetailTopBar
-import com.afternote.feature.setting.presentation.component.InsertPasswordContent
 import com.afternote.feature.setting.presentation.component.PinSetupStep
 import com.afternote.feature.setting.presentation.viewmodel.AppLockSetupViewModel
 
@@ -50,89 +38,3 @@ fun AppLockSetupScreen(
         modifier = modifier,
     )
 }
-
-@Composable
-private fun AppLockSetupContent(
-    step: PinSetupStep,
-    passwordLength: Int,
-    onDigitClick: (String) -> Unit,
-    onDeleteClick: () -> Unit,
-    onConfirmClick: () -> Unit,
-    onBack: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    val titleText =
-        when (step) {
-            PinSetupStep.ENTER_NEW -> "비밀번호를 입력해 주세요."
-            PinSetupStep.CONFIRM_NEW -> "비밀번호를 다시 한 번 입력해 주세요."
-            PinSetupStep.ENTER_CURRENT -> "변경할 비밀번호를 입력해 주세요."
-        }
-
-    Scaffold(
-        topBar = {
-            DetailTopBar(
-                title = "앱 잠금 비밀번호 설정",
-                onBackClick = onBack,
-            )
-        },
-        modifier = modifier,
-        containerColor = Color.Transparent,
-    ) { innerPadding ->
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .padding(innerPadding),
-            horizontalAlignment = Alignment.CenterHorizontally,
-        ) {
-            Spacer(modifier = Modifier.height(40.dp))
-
-            InsertPasswordContent(
-                titleText = titleText,
-                passwordLength = passwordLength,
-                onDigitClick = onDigitClick,
-                onDeleteClick = onDeleteClick,
-                onConfirmClick = onConfirmClick,
-            )
-        }
-    }
-}
-
-@Preview(name = "비밀번호 입력", showBackground = true)
-@Composable
-private fun PreviewEnterNew() {
-    AppLockSetupContent(
-        step = PinSetupStep.ENTER_NEW,
-        passwordLength = 0,
-        onDigitClick = {},
-        onDeleteClick = {},
-        onConfirmClick = {},
-        onBack = {},
-    )
-}
-
-@Preview(name = "비밀번호 재입력", showBackground = true)
-@Composable
-private fun PreviewConfirmNew() {
-    AppLockSetupContent(
-        step = PinSetupStep.CONFIRM_NEW,
-        passwordLength = 3,
-        onDigitClick = {},
-        onDeleteClick = {},
-        onConfirmClick = {},
-        onBack = {},
-    )
-}
-
-@Preview(name = "변경할 비밀번호 입력", showBackground = true)
-@Composable
-private fun PreviewEnterCurrent() {
-    AppLockSetupContent(
-        step = PinSetupStep.ENTER_CURRENT,
-        passwordLength = 0,
-        onDigitClick = {},
-        onDeleteClick = {},
-        onConfirmClick = {},
-        onBack = {},
-    )
-}

feature/setting/presentation/src/main/kotlin/com/afternote/feature/setting/presentation/screen/ConnectedAccountsContent.kt

@@ -0,0 +1,74 @@
+package com.afternote.feature.setting.presentation.screen
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.afternote.core.ui.theme.AfternoteDesign
+import com.afternote.core.ui.topbar.DetailTopBar
+import com.afternote.feature.setting.presentation.R
+import com.afternote.feature.setting.presentation.component.SocialAccountRow
+import com.afternote.feature.setting.presentation.viewmodel.ConnectedAccountsUiState
+
+/**
+ * 연결된 계정 화면의 상태 없는 본문.
+ *
+ * ViewModel·소셜 인증 연동은 [ConnectedAccountsScreen] 이 들고, 이 함수는 넘겨받은 상태만 그린다.
+ */
+@Composable
+internal fun ConnectedAccountsContent(
+    uiState: ConnectedAccountsUiState,
+    snackbarHostState: SnackbarHostState,
+    onBack: () -> Unit,
+    onToggle: (provider: String, enabled: Boolean) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Scaffold(
+        modifier = modifier,
+        containerColor = Color.Transparent,
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        topBar = {
+            DetailTopBar(
+                title = "연결된 계정",
+                onBackClick = onBack,
+            )
+        },
+    ) { paddingValues ->
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .padding(paddingValues)
+                    .padding(horizontal = 20.dp, vertical = 16.dp),
+        ) {
+            Text(
+                text = stringResource(R.string.sns_login_section_title),
+                style = AfternoteDesign.typography.bodyLargeR,
+            )
+            Spacer(modifier = Modifier.height(4.dp))
+            Text(
+                text = stringResource(R.string.sns_login_section_desc),
+                style = AfternoteDesign.typography.bodySmallR,
+            )
+            Spacer(modifier = Modifier.height(24.dp))
+
+            uiState.accounts.forEach { account ->
+                SocialAccountRow(
+                    account = account,
+                    onToggle = { enabled -> onToggle(account.provider, enabled) },
+                )
+                Spacer(modifier = Modifier.height(8.dp))
+            }
+        }
+    }
+}