Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ class ExampleInstrumentedTest {
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.example.slowclock", appContext.packageName)
assertEquals("com.ilhyok.slowclock", appContext.packageName)
}
}
88 changes: 88 additions & 0 deletions app/src/androidTest/java/com/example/slowclock/UiRecoveryTest.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
package com.example.slowclock

import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.test.assertHasNoClickAction
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertIsEnabled
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performScrollTo
import androidx.compose.ui.unit.Density
import com.example.slowclock.data.model.Schedule
import com.example.slowclock.ui.common.components.ErrorCard
import com.example.slowclock.ui.common.components.ScheduleRow
import com.example.slowclock.ui.main.components.ScheduleDetailDialog
import com.example.slowclock.ui.theme.SlowClockTheme
import com.example.slowclock.util.AppError
import com.google.firebase.Timestamp
import org.junit.Assert.assertEquals
import org.junit.Rule
import org.junit.Test
import java.util.Date

class UiRecoveryTest {
@get:Rule
val compose = createComposeRule()

@Test
fun nonRetryableErrorCanBeDismissed() {
var dismisses = 0
compose.setContent {
SlowClockTheme(darkTheme = false) {
ErrorCard(error = AppError.PermissionError, canRetry = false, onDismiss = { dismisses++ })
}
}
compose.onNodeWithText("다시 시도").assertDoesNotExist()
compose.onNodeWithText("닫기").assertIsEnabled().performClick()
compose.runOnIdle { assertEquals(1, dismisses) }
}

@Test
fun nonClickableRowIsNotDisabledAndItsCompletionActionWorks() {
var toggles = 0
compose.setContent {
SlowClockTheme(darkTheme = false) {
ScheduleRow(title = "혈압약 먹기", time = Date(0), completed = false, onToggleComplete = { toggles++ })
}
}
compose.onNodeWithText("혈압약 먹기").assertIsEnabled().assertHasNoClickAction()
compose.onNodeWithContentDescription("완료로 표시").assertIsEnabled().performClick()
compose.runOnIdle { assertEquals(1, toggles) }
}

@Test
fun longDetailAtLargeFontCanScrollToActions() {
var deletes = 0
var dismisses = 0
compose.setContent {
val density = LocalDensity.current
CompositionLocalProvider(LocalDensity provides Density(density.density, fontScale = 2f)) {
SlowClockTheme(darkTheme = false) {
ScheduleDetailDialog(
schedule =
Schedule(
id = "detail",
title = "혈압약 먹기",
description = List(30) { "식사 후 물과 함께 복용해주세요." }.joinToString("\n"),
startTime = Timestamp(Date(0)),
),
onDismiss = { dismisses++ },
onDelete = { deletes++ },
)
}
}
}
compose
.onNodeWithText("삭제")
.performScrollTo()
.assertIsDisplayed()
.performClick()
compose.runOnIdle {
assertEquals(1, deletes)
assertEquals(1, dismisses)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.example.slowclock

import androidx.compose.foundation.layout.Column
import androidx.compose.runtime.Composable
import androidx.compose.ui.tooling.preview.Preview
import com.android.tools.screenshot.PreviewTest
import com.example.slowclock.ui.addschedule.components.RecommendationPlaceholder
import com.example.slowclock.ui.theme.SlowClockTheme

@PreviewTest
@Preview(name = "추천 카드 큰 글자 320", widthDp = 320, heightDp = 480, fontScale = 2f)
@Preview(name = "추천 카드 큰 글자 360", widthDp = 360, heightDp = 480, fontScale = 2f)
@Composable
internal fun RecommendationLargeTextScreenshot() {
SlowClockTheme(darkTheme = false) {
Column {
RecommendationPlaceholder(onNavigateToRecommendation = {})
}
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ fun Throwable.toAppError(): AppError =
message?.contains("not found", ignoreCase = true) == true -> AppError.NotFoundError
message?.contains("authentication", ignoreCase = true) == true -> AppError.AuthError
message?.contains("storage", ignoreCase = true) == true -> AppError.StorageFullError
else -> AppError.GeneralError(message)
else -> AppError.GeneralError()
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.example.slowclock.util

import org.junit.Assert.assertEquals
import org.junit.Test

class ErrorTypeTest {
@Test
fun `분류하지 못한 예외는 내부 메시지 대신 기본 안내를 낸다`() {
assertEquals(AppError.GeneralError().message, IllegalStateException("INTERNAL transport closed").toAppError().message)
assertEquals(AppError.GeneralError().message, RuntimeException().toAppError().message)
}

@Test
fun `알려진 오류와 앱이 작성한 안내는 유지한다`() {
assertEquals(AppError.NetworkError, RuntimeException("NETWORK unavailable").toAppError())
assertEquals(AppError.TimeoutError, RuntimeException("timeout").toAppError())
assertEquals("일정 제목을 입력해주세요", AppError.GeneralError("일정 제목을 입력해주세요").message)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ fun BottomNavigationBar(
indicatorColor = MaterialTheme.colorScheme.primaryContainer,
),
icon = { Icon(item.icon, contentDescription = null) },
// 글꼴을 키우면 두 줄로 흘러 옆 항목과 겹친다. 한 줄로 고정한다.
// 큰 글자에서도 「시간표」의 끝 글자가 잘리지 않도록 줄바꿈을 허용한다.
label = {
Text(
text = item.label,
style = MaterialTheme.typography.labelLarge,
maxLines = 1,
maxLines = 2,
)
},
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.example.slowclock.ui.common.components

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
Expand All @@ -10,6 +11,7 @@ import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.widthIn
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material.icons.outlined.Block
Expand All @@ -32,6 +34,7 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import com.example.slowclock.util.AppError
Expand Down Expand Up @@ -107,33 +110,39 @@ fun ErrorCard(
textAlign = TextAlign.Center,
)

if (canRetry && onRetry != null) {
if (onDismiss != null || (canRetry && onRetry != null)) {
Spacer(modifier = Modifier.height(20.dp))

Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
val actionMinWidth = 144.dp * LocalDensity.current.fontScale
FlowRow(
horizontalArrangement = Arrangement.spacedBy(12.dp),
verticalArrangement = Arrangement.spacedBy(12.dp),
) {
if (onDismiss != null) {
OutlinedButton(
onClick = onDismiss,
shape = MaterialTheme.shapes.small,
modifier = Modifier.weight(1f).heightIn(min = 56.dp),
modifier = Modifier.widthIn(min = actionMinWidth).weight(1f).heightIn(min = 56.dp),
) {
Text(text = "닫기", style = MaterialTheme.typography.labelLarge)
}
}

Button(
onClick = onRetry,
shape = MaterialTheme.shapes.small,
modifier = Modifier.weight(1f).heightIn(min = 56.dp),
colors =
ButtonDefaults.buttonColors(
containerColor = MaterialTheme.colorScheme.error,
contentColor = MaterialTheme.colorScheme.onError,
),
) {
Icon(Icons.Default.Refresh, contentDescription = null)
Spacer(modifier = Modifier.width(8.dp))
Text(text = "다시 시도", style = MaterialTheme.typography.labelLarge)
if (canRetry && onRetry != null) {
Button(
onClick = onRetry,
shape = MaterialTheme.shapes.small,
modifier = Modifier.widthIn(min = actionMinWidth).weight(1f).heightIn(min = 56.dp),
colors =
ButtonDefaults.buttonColors(
containerColor = MaterialTheme.colorScheme.error,
contentColor = MaterialTheme.colorScheme.onError,
),
) {
Icon(Icons.Default.Refresh, contentDescription = null)
Spacer(modifier = Modifier.width(8.dp))
Text(text = "다시 시도", style = MaterialTheme.typography.labelLarge)
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.CheckCircle
Expand Down Expand Up @@ -65,18 +66,10 @@ fun ScheduleRow(
MaterialTheme.colorScheme.onSurface
}

Surface(
onClick = onClick ?: {},
enabled = onClick != null,
ScheduleRowSurface(
onClick = onClick,
completed = completed,
modifier = modifier.fillMaxWidth(),
shape = MaterialTheme.shapes.medium,
color =
if (completed) {
MaterialTheme.colorScheme.surfaceContainerLow
} else {
MaterialTheme.colorScheme.surface
},
border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant),
) {
Row(
modifier =
Expand All @@ -86,14 +79,15 @@ fun ScheduleRow(
.padding(start = 16.dp, end = 8.dp, top = 10.dp, bottom = 10.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Column(modifier = Modifier.width(64.dp)) {
Column(modifier = Modifier.widthIn(min = 64.dp)) {
Text(
text = meridiem,
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
Text(
text = clock,
maxLines = 1,
style = MaterialTheme.typography.titleMedium,
color = titleColor,
)
Expand Down Expand Up @@ -154,3 +148,26 @@ fun ScheduleRow(
}
}
}

@Composable
private fun ScheduleRowSurface(
onClick: (() -> Unit)?,
completed: Boolean,
modifier: Modifier = Modifier,
content: @Composable () -> Unit,
) {
val color = if (completed) MaterialTheme.colorScheme.surfaceContainerLow else MaterialTheme.colorScheme.surface
val border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant)
if (onClick == null) {
Surface(modifier = modifier, shape = MaterialTheme.shapes.medium, color = color, border = border, content = content)
} else {
Surface(
onClick = onClick,
modifier = modifier,
shape = MaterialTheme.shapes.medium,
color = color,
border = border,
content = content,
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ fun RecommendationPlaceholder(
modifier =
Modifier
.fillMaxWidth()
.height(140.dp)
.heightIn(min = 140.dp)
.padding(24.dp),
contentAlignment = Alignment.Center,
) {
Column(horizontalAlignment = Alignment.CenterHorizontally) {
Text(
text = "🔮 일정 추천해드릴까요?",
text = "일정 추천해드릴까요?",
style = MaterialTheme.typography.titleLarge,
color = MaterialTheme.colorScheme.onTertiaryContainer,
)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.example.slowclock.ui.common

import android.content.ActivityNotFoundException
import android.util.Log

/** 시스템 설정이나 브라우저가 없거나 정책으로 막힌 기기에서도 현재 화면을 유지한다. */
internal fun launchExternalActivity(
open: () -> Unit,
fallback: (() -> Unit)? = null,
): Boolean {
try {
open()
return true
} catch (e: ActivityNotFoundException) {
Log.w("ExternalActivity", "외부 화면을 열지 못했다", e)
} catch (e: SecurityException) {
Log.w("ExternalActivity", "외부 화면이 허용되지 않았다", e)
}
return fallback?.let { launchExternalActivity(it) } ?: false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.example.slowclock.ui.common

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp

@Composable
internal fun ScheduleLoadingIndicator(
modifier: Modifier = Modifier,
message: String = "일정을 불러오고 있습니다",
) {
Row(
modifier = modifier.padding(vertical = 16.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
CircularProgressIndicator(modifier = Modifier.size(24.dp))
Text(text = message, style = MaterialTheme.typography.bodyLarge)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.compose.LifecycleEventEffect
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.example.slowclock.ui.common.ScheduleLoadingIndicator
import com.example.slowclock.ui.common.components.DayProgress
import com.example.slowclock.ui.common.components.EmptyState
import com.example.slowclock.ui.common.components.ErrorCard
Expand Down Expand Up @@ -77,7 +78,11 @@ internal fun DoneContent(
)
}

if (state.isLoading) {
ScheduleLoadingIndicator()
}
if (completed.isEmpty() && remaining.isEmpty()) {
if (state.isLoading || state.error != null) return@Column
EmptyState(
icon = Icons.Outlined.TaskAlt,
title = "오늘 일정이 없습니다",
Expand Down
Loading
Loading