Skip to content

Commit

Permalink
style check success
Browse files Browse the repository at this point in the history
  • Loading branch information
easyhooon committed Nov 15, 2023
1 parent 8167a11 commit 5682373
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import javax.inject.Inject
import retrofit2.HttpException
import timber.log.Timber

@Suppress("TooGenericExceptionCaught")
internal class ChatRemoteDataSourceImpl @Inject constructor(
private val service: ChatService,
) : ChatRemoteDataSource {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.text.selection.TextSelectionColors
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.Send
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
Expand Down Expand Up @@ -89,7 +88,6 @@ internal fun ChatRoute(
)
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
internal fun ChatScreen(
modifier: Modifier = Modifier,
Expand All @@ -108,6 +106,7 @@ internal fun ChatScreen(
// LaunchedEffect(key1 = uiState.chatMessageList.size) {
// listState.scrollToItem(uiState.chatMessageList.size - 1)
// }

Surface(
modifier = modifier.fillMaxSize(),
) {
Expand Down Expand Up @@ -200,7 +199,7 @@ internal fun ChatScreen(
cursorColor = Gray900,
focusedTextColor = Gray900,
selectionColors = TextSelectionColors(handleColor = Gray500, backgroundColor = Gray500),
)
),
)
IconButton(
onClick = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.last.psychat.android.core.ui.components.ProfileImage
import com.last.psychat.android.feature.main.R
import com.last.pyschat.android.core.designsystem.theme.Gray900
import com.last.pyschat.android.core.designsystem.theme.H5

Expand All @@ -26,7 +28,7 @@ fun MainTopBar(
contentAlignment = Alignment.CenterStart,
) {
Text(
text = "채팅 목록",
text = stringResource(R.string.chat_list),
style = H5,
color = Gray900,
)
Expand Down
1 change: 1 addition & 0 deletions feature/main/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
<string name="start_chat">대화 시작</string>
<string name="network_error_title">네트워크 문제로 이전 대화 목록을\n불러오지 못했어요</string>
<string name="network_error_description">다시 시도 해주시기 바랍니다.</string>
<string name="chat_list">채팅 목록</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class ResultViewModel @Inject constructor(
init {
_uiState.update {
it.copy(
emotion = emotion
emotion = emotion,
)
}
}
Expand All @@ -69,7 +69,7 @@ class ResultViewModel @Inject constructor(
val result = getRecommendedContentListUseCase(
EmotionRequestEntity(
emotion = emotion.replace("+", " "),
)
),
)
when {
result.isSuccess && result.getOrNull() != null -> {
Expand Down

0 comments on commit 5682373

Please sign in to comment.