Repository navigation
fix(timeletter): 서버 실패 상태와 재시도 처리 (#714) #1365
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
koongmai
wants to merge
24
commits into
develop
Choose a base branch
from
fix/714
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
0f3bc46
fix(timeletter): 서버 실패 상태와 재시도 처리
koongmai 4c82a50
Merge branch 'develop' into fix/714
OnlyReadOneBook a12b983
Merge branch 'develop' into fix/714
OnlyReadOneBook 78585c4
Merge branch 'develop' into fix/714
OnlyReadOneBook 13f4627
Merge branch 'develop' into fix/714
OnlyReadOneBook d20c1a4
Merge branch 'develop' into fix/714
OnlyReadOneBook 321ddeb
ci: CI Test Plan 재검증 트리거
OnlyReadOneBook d4debbc
Merge branch 'develop' into fix/714
OnlyReadOneBook f9b4b46
Merge branch 'develop' into fix/714
OnlyReadOneBook 951f3fe
Merge branch 'develop' into fix/714
OnlyReadOneBook f9a48d3
fix(timeletter): 리뷰 지적 6건과 컴파일 블로커를 해소한다
koongmai c5ec3e7
Merge remote-tracking branch 'origin/develop' into fix/714
koongmai 963dbf6
fix(timeletter): develop 머지 후 빠졌던 수정사항 2건을 커밋한다
koongmai 1edc58c
fix(timeletter): 발신 목록 조회 실패 시 재시도 UI를 되살린다
koongmai 95941c7
fix(timeletter): 수신인 목록 Loading·Error 상단바 제목을 Success와 맞춘다
koongmai e190647
fix(timeletter): 수신인 선택 상태를 rememberSaveable로 옮겨 백그라운드 복귀 시 소실을 막는다
koongmai 9b6770b
fix(timeletter): deleteSelected 성공 분기의 중복된 isDeleting 대입을 지운다
koongmai a89e102
fix(timeletter): 조회 성공 뒤 재조회 실패가 빈 목록으로 가리는 문제를 고친다
koongmai 83ff32d
fix(timeletter): 수신인 선택 소실과 로그아웃 신호 유실을 고친다 (#714)
koongmai fddd25b
test(timeletter): 수신인 선택 유지를 uiState 순환으로 검증한다 (#714)
koongmai 25a4c9e
Merge remote-tracking branch 'origin/develop' into fix/714
koongmai 2409ef8
fix(timeletter): androidTest를 RecipientListScreen의 상태 없는 시그니처에 맞춘다 (#…
koongmai e6c2151
Merge remote-tracking branch 'origin/develop' into fix/714
koongmai 9977831
fix(timeletter): 수신인 선택을 receiverListStateFlow 로 옮겨 실패를 빈 목록과 가른다 (#714)
koongmai File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
...lin/com/afternote/feature/timeletter/presentation/component/TimeLetterLoadErrorContent.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package com.afternote.feature.timeletter.presentation.component | ||
|
|
||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.material3.TextButton | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.stringResource | ||
| import com.afternote.core.ui.theme.AfternoteDesign | ||
| import com.afternote.feature.timeletter.presentation.R | ||
|
|
||
| @Composable | ||
| fun TimeLetterLoadErrorContent( | ||
| message: String, | ||
| onRetry: () -> Unit, | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| Column( | ||
| modifier = modifier.fillMaxSize(), | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| verticalArrangement = Arrangement.Center, | ||
| ) { | ||
| Text( | ||
| text = message, | ||
| style = AfternoteDesign.typography.bodyLargeR, | ||
| color = AfternoteDesign.colors.gray7, | ||
| ) | ||
| TextButton(onClick = onRetry) { | ||
| Text( | ||
| text = stringResource(R.string.timeletter_retry), | ||
| style = AfternoteDesign.typography.bodyLargeB, | ||
| color = AfternoteDesign.colors.gray9, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[minor] 공용 컴포넌트로 뽑은 것 자체는 좋은데, 같은 모듈의 기존 인라인 에러+재시도 UI 3곳(
TimeLetterDetailScreen·RecipientTimeletterScreen·RecipientTimeLetterDetailScreen— filledButton, bodySmallR/gray6)과 스타일이 다릅니다(여긴TextButton, bodyLargeR/gray7). 이대로면 타임레터 모듈 안에 실패 UI가 두 벌 공존합니다. 이 PR에서 그 3곳을 이 컴포넌트로 정렬하거나, 최소한 스타일을 기존과 맞춰 주세요. (#446 통일 맥락의 후속으로 빼도 됩니다 — 그 경우 한 줄 남겨 주시면 됩니다.)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
스타일 통일은 이 PR 범위 밖으로 미뤘습니다 — PR 본문 'Work Description'에 후속 과제로 명시해뒀습니다. "다시 시도" 하드코딩만
f9a48d3d3에서 리소스(R.string.timeletter_retry)로 뺐습니다.