diff --git a/data/src/main/kotlin/com/signal/data/model/coin/FetchCoinsResponse.kt b/data/src/main/kotlin/com/signal/data/model/coin/FetchCoinsResponse.kt index 43d7479a..c0b58a5f 100644 --- a/data/src/main/kotlin/com/signal/data/model/coin/FetchCoinsResponse.kt +++ b/data/src/main/kotlin/com/signal/data/model/coin/FetchCoinsResponse.kt @@ -4,9 +4,9 @@ import com.google.gson.annotations.SerializedName import com.signal.domain.entity.CoinsEntity data class FetchCoinsResponse( - @SerializedName("coin_list") val coins: List + @SerializedName("coin_list") val coins: List ) { - data class Coins( + data class Coin( @SerializedName("coin") val coin: Long, @SerializedName("activity") val activity: String, @SerializedName("create_date") val createDate: String, @@ -15,7 +15,7 @@ data class FetchCoinsResponse( fun FetchCoinsResponse.toEntity() = CoinsEntity(coinsEntity = this.coins.map { it.toEntity() }) -private fun FetchCoinsResponse.Coins.toEntity() = CoinsEntity.CoinEntity( +private fun FetchCoinsResponse.Coin.toEntity() = CoinsEntity.CoinEntity( coin = coin, activity = activity, createDate = createDate, diff --git a/data/src/main/kotlin/com/signal/data/model/mypage/FetchUserInformationResponse.kt b/data/src/main/kotlin/com/signal/data/model/mypage/FetchUserInformationResponse.kt index c9ca4f4a..fef23a9f 100644 --- a/data/src/main/kotlin/com/signal/data/model/mypage/FetchUserInformationResponse.kt +++ b/data/src/main/kotlin/com/signal/data/model/mypage/FetchUserInformationResponse.kt @@ -17,5 +17,4 @@ fun FetchUserInformationResponse.toEntity() = UserInformationEntity( birth = this.birth, imageUrl = this.profile, coinCount = this.coinCount, - ) \ No newline at end of file diff --git a/data/src/main/kotlin/com/signal/data/model/mypage/UserInformationModel.kt b/data/src/main/kotlin/com/signal/data/model/mypage/UserInformationModel.kt index 0d312aa8..0caf4c43 100644 --- a/data/src/main/kotlin/com/signal/data/model/mypage/UserInformationModel.kt +++ b/data/src/main/kotlin/com/signal/data/model/mypage/UserInformationModel.kt @@ -29,5 +29,5 @@ fun UserInformationEntity.toModel() = UserInformationModel( phone = this.phone, birth = this.birth, profile = this.imageUrl, - coinCount = this.coinCount + coinCount = this.coinCount, ) \ No newline at end of file diff --git a/data/src/main/kotlin/com/signal/data/repository/CoinRepositoryImpl.kt b/data/src/main/kotlin/com/signal/data/repository/CoinRepositoryImpl.kt index 908553dc..1faf7087 100644 --- a/data/src/main/kotlin/com/signal/data/repository/CoinRepositoryImpl.kt +++ b/data/src/main/kotlin/com/signal/data/repository/CoinRepositoryImpl.kt @@ -3,8 +3,6 @@ package com.signal.data.repository import com.signal.data.datasource.coin.CoinDataSource import com.signal.data.model.coin.CreateCoinRequest import com.signal.data.model.coin.toEntity -import com.signal.domain.entity.CoinsEntity -import com.signal.domain.entity.CreateCoinEntity import com.signal.domain.enums.Coin import com.signal.domain.repository.CoinRepository @@ -12,13 +10,15 @@ class CoinRepositoryImpl( private val coinDataSource: CoinDataSource, ) : CoinRepository { - override suspend fun createCoin(coin: Long, type: Coin): CreateCoinEntity = - coinDataSource.createCoin( - CreateCoinRequest( - coin = coin, - type = type, - ) - ).toEntity() + override suspend fun createCoin( + coin: Long, + type: Coin, + ) = coinDataSource.createCoin( + CreateCoinRequest( + coin = coin, + type = type, + ) + ).toEntity() - override suspend fun fetchCoin(): CoinsEntity = coinDataSource.fetchCoins().toEntity() + override suspend fun fetchCoin() = coinDataSource.fetchCoins().toEntity() } \ No newline at end of file diff --git a/presentation/src/main/java/com/signal/signal_android/feature/achievement/MoreAchievements.kt b/presentation/src/main/java/com/signal/signal_android/feature/achievement/MoreAchievements.kt index 004733ca..633693bf 100644 --- a/presentation/src/main/java/com/signal/signal_android/feature/achievement/MoreAchievements.kt +++ b/presentation/src/main/java/com/signal/signal_android/feature/achievement/MoreAchievements.kt @@ -132,9 +132,7 @@ private fun Achievement( Spacer(modifier = Modifier.width(10.dp)) Image( painter = painterResource(id = R.drawable.ic_coin), - contentDescription = stringResource( - id = R.string.achievement_image - ), + contentDescription = stringResource(id = R.string.achievement_image), ) } } diff --git a/presentation/src/main/java/com/signal/signal_android/feature/coin/CoinDialog.kt b/presentation/src/main/java/com/signal/signal_android/feature/coin/CoinDialog.kt index e55ab69d..fd2fb07f 100644 --- a/presentation/src/main/java/com/signal/signal_android/feature/coin/CoinDialog.kt +++ b/presentation/src/main/java/com/signal/signal_android/feature/coin/CoinDialog.kt @@ -46,18 +46,18 @@ internal fun CoinDialog( Image( modifier = Modifier.size(70.dp), painter = painterResource(id = R.drawable.ic_coin), - contentDescription = stringResource( - id = R.string.coin_image - ), + contentDescription = stringResource(id = R.string.coin_image), ) Spacer(modifier = Modifier.height(30.dp)) SubTitle( - text = when (coin) { - COMMENT -> stringResource(id = R.string.get_1_coin) - FEED -> stringResource(id = R.string.get_2_coin) - DIARY -> stringResource(id = R.string.get_3_coin) - RESERVATION -> stringResource(id = R.string.get_4_coin) - } + text = stringResource( + id = when (coin) { + COMMENT -> R.string.get_1_coin + FEED -> R.string.get_2_coin + DIARY -> R.string.get_3_coin + RESERVATION -> R.string.get_4_coin + } + ), ) Spacer(modifier = Modifier.height(6.dp)) Body(text = "현재 보유 코인 : $coinCount") diff --git a/presentation/src/main/java/com/signal/signal_android/feature/coin/CoinHistory.kt b/presentation/src/main/java/com/signal/signal_android/feature/coin/CoinHistory.kt index 7ba26fc2..ccd1b543 100644 --- a/presentation/src/main/java/com/signal/signal_android/feature/coin/CoinHistory.kt +++ b/presentation/src/main/java/com/signal/signal_android/feature/coin/CoinHistory.kt @@ -49,11 +49,7 @@ internal fun CoinHistory( title = stringResource(id = R.string.coin_history), onLeadingClicked = { moveToBack() }, ) - Row(modifier = Modifier.fillMaxSize()) { - Coins( - coins = state.coins, - ) - } + Coins(coins = state.coins) } Spacer(modifier = Modifier.height(12.dp)) } diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/mypage/MyPage.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/mypage/MyPage.kt index 1c859f3a..eb9f7f85 100644 --- a/presentation/src/main/java/com/signal/signal_android/feature/main/mypage/MyPage.kt +++ b/presentation/src/main/java/com/signal/signal_android/feature/main/mypage/MyPage.kt @@ -265,9 +265,7 @@ private fun Achievement( Image( modifier = Modifier.size(60.dp), painter = painterResource(id = R.drawable.ic_coin_1k), - contentDescription = stringResource( - id = R.string.achievement_image - ), + contentDescription = stringResource(id = R.string.achievement_image), ) } } @@ -372,10 +370,10 @@ private fun CardUserTool( .fillMaxWidth() .height(60.dp) .shadow( - elevation = 2.dp, shape = RoundedCornerShape(8.dp) + elevation = 2.dp, + shape = RoundedCornerShape(8.dp), ) .clip(RoundedCornerShape(8.dp)) - .background(color = SignalColor.White) .signalClickable( rippleEnabled = true,