Skip to content

Commit

Permalink
[CHORE] #69-푸키 캐릭터 영문명 수정 (pokki -> pooki)
Browse files Browse the repository at this point in the history
  • Loading branch information
l5x5l committed Sep 6, 2024
1 parent ec095d0 commit d448cf6
Show file tree
Hide file tree
Showing 32 changed files with 52 additions and 53 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package pokitmons.pokit.core.ui.components.template.pokki
package pokitmons.pokit.core.ui.components.template.pooki

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.size
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
Expand All @@ -16,7 +16,7 @@ import pokitmons.pokit.core.ui.R
import pokitmons.pokit.core.ui.theme.PokitTheme

@Composable
fun Pokki(
fun Pooki(
modifier: Modifier = Modifier,
title: String,
sub: String,
Expand All @@ -30,10 +30,9 @@ fun Pokki(
) {
Image(
modifier = Modifier
.height(180.dp)
.width(180.dp),
painter = painterResource(id = R.drawable.pokki),
contentDescription = "pokki"
.size(180.dp),
painter = painterResource(id = R.drawable.pooki),
contentDescription = "pooki"
)

Spacer(modifier = Modifier.height(16.dp))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package pokitmons.pokit.core.ui.components.template.pokki
package pokitmons.pokit.core.ui.components.template.pooki

import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.Surface
Expand All @@ -12,7 +12,7 @@ import pokitmons.pokit.core.ui.theme.PokitTheme
private fun Preview() {
PokitTheme {
Surface(modifier = Modifier.fillMaxSize()) {
Pokki(title = "저장된 포킷이 없어요!", sub = "포킷을 생성해 링크를 저장해보세요")
Pooki(title = "저장된 포킷이 없어요!", sub = "포킷을 생성해 링크를 저장해보세요")
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package pokitmons.pokit.core.ui.components.template.pokkiempty
package pokitmons.pokit.core.ui.components.template.pookiempty

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Box
Expand All @@ -16,7 +16,7 @@ import pokitmons.pokit.core.ui.R
import pokitmons.pokit.core.ui.theme.PokitTheme

@Composable
fun EmptyPokki(
fun EmptyPooki(
modifier: Modifier = Modifier,
title: String,
sub: String,
Expand All @@ -32,7 +32,7 @@ fun EmptyPokki(
modifier = Modifier
.height(180.dp)
.width(180.dp),
painter = painterResource(id = R.drawable.empty_pokki),
painter = painterResource(id = R.drawable.empty_pooki),
contentDescription = "empty"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package pokitmons.pokit.core.ui.components.template.pokkiempty
package pokitmons.pokit.core.ui.components.template.pookiempty

import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.Surface
Expand All @@ -12,7 +12,7 @@ import pokitmons.pokit.core.ui.theme.PokitTheme
private fun Preview() {
PokitTheme {
Surface(modifier = Modifier.fillMaxSize()) {
EmptyPokki(title = "저장된 포킷이 없어요!", sub = "포킷을 생성해 링크를 저장해보세요")
EmptyPooki(title = "저장된 포킷이 없어요!", sub = "포킷을 생성해 링크를 저장해보세요")
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package pokitmons.pokit.core.ui.components.template.pokkierror
package pokitmons.pokit.core.ui.components.template.pookierror

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Box
Expand All @@ -22,9 +22,9 @@ import pokitmons.pokit.core.ui.components.atom.button.attributes.PokitButtonType
import pokitmons.pokit.core.ui.theme.PokitTheme

@Composable
fun ErrorPokki(
fun ErrorPooki(
modifier: Modifier = Modifier,
pokkiSize: Dp = 180.dp,
pookiSize: Dp = 180.dp,
title: String,
sub: String,
onClickRetry: (() -> Unit)? = null,
Expand All @@ -38,9 +38,9 @@ fun ErrorPokki(
) {
Image(
modifier = Modifier
.height(pokkiSize)
.width(pokkiSize),
painter = painterResource(id = R.drawable.cry_pokki),
.height(pookiSize)
.width(pookiSize),
painter = painterResource(id = R.drawable.cry_pooki),
contentDescription = "empty"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package pokitmons.pokit.core.ui.components.template.pokkierror
package pokitmons.pokit.core.ui.components.template.pookierror

import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.Surface
Expand All @@ -12,8 +12,8 @@ import pokitmons.pokit.core.ui.theme.PokitTheme
private fun Preview() {
PokitTheme {
Surface(modifier = Modifier.fillMaxSize()) {
ErrorPokki(title = "오류가 발생했어요", sub = "조금 뒤 다시 접속해주세요", onClickRetry = null)
// ErrorPokki(title = "오류가 발생했어요", sub = "조금 뒤 다시 접속해주세요", onClickRetry = {})
ErrorPooki(title = "오류가 발생했어요", sub = "조금 뒤 다시 접속해주세요", onClickRetry = null)
// ErrorPooki(title = "오류가 발생했어요", sub = "조금 뒤 다시 접속해주세요", onClickRetry = {})
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import pokitmons.pokit.alarm.components.toolbar.Toolbar
import pokitmons.pokit.alarm.model.Alarm
import pokitmons.pokit.alarm.paging.SimplePagingState
import pokitmons.pokit.core.ui.components.atom.loading.LoadingProgress
import pokitmons.pokit.core.ui.components.template.pokki.Pokki
import pokitmons.pokit.core.ui.components.template.pokkierror.ErrorPokki
import pokitmons.pokit.core.ui.components.template.pooki.Pooki
import pokitmons.pokit.core.ui.components.template.pookierror.ErrorPooki
import pokitmons.pokit.core.ui.R.string as coreString

@Composable
Expand Down Expand Up @@ -92,7 +92,7 @@ fun AlarmScreen(
)
}
alarmsState == SimplePagingState.FAILURE_INIT -> {
ErrorPokki(
ErrorPooki(
modifier = Modifier
.fillMaxWidth()
.weight(1f),
Expand All @@ -102,7 +102,7 @@ fun AlarmScreen(
)
}
alarms.isEmpty() -> {
Pokki(
Pooki(
modifier = Modifier
.fillMaxWidth()
.weight(1f),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import pokitmons.pokit.core.ui.components.atom.loading.LoadingProgress
import pokitmons.pokit.core.ui.components.block.pokitcard.PokitCard
import pokitmons.pokit.core.ui.components.template.bottomsheet.PokitBottomSheet
import pokitmons.pokit.core.ui.components.template.modifybottomsheet.ModifyBottomSheetContent
import pokitmons.pokit.core.ui.components.template.pokkiempty.EmptyPokki
import pokitmons.pokit.core.ui.components.template.pokkierror.ErrorPokki
import pokitmons.pokit.core.ui.components.template.pookiempty.EmptyPooki
import pokitmons.pokit.core.ui.components.template.pookierror.ErrorPooki
import pokitmons.pokit.core.ui.components.template.removeItemBottomSheet.TwoButtonBottomSheetContent
import pokitmons.pokit.core.ui.R.string as coreString

Expand Down Expand Up @@ -101,15 +101,15 @@ fun PokitScreen(
LoadingProgress(modifier = Modifier.fillMaxSize())
}
(pokitsState == SimplePagingState.FAILURE_INIT) -> {
ErrorPokki(
ErrorPooki(
modifier = Modifier.fillMaxSize(),
title = stringResource(id = coreString.title_error),
sub = stringResource(id = coreString.sub_error),
onClickRetry = viewModel::loadPokits
)
}
(pokits.value.isEmpty()) -> {
EmptyPokki(
EmptyPooki(
modifier = Modifier.fillMaxSize(),
title = stringResource(id = coreString.title_empty_pokits),
sub = stringResource(id = coreString.sub_empty_pokits)
Expand Down Expand Up @@ -148,15 +148,15 @@ fun PokitScreen(
LoadingProgress(modifier = Modifier.fillMaxSize())
}
(unCategoryLinksState == SimplePagingState.FAILURE_INIT) -> {
ErrorPokki(
ErrorPooki(
modifier = Modifier.fillMaxSize(),
title = stringResource(id = coreString.title_error),
sub = stringResource(id = coreString.sub_error),
onClickRetry = viewModel::loadUnCategoryLinks
)
}
(unCategoryLinks.value.isEmpty()) -> {
EmptyPokki(
EmptyPooki(
modifier = Modifier.fillMaxSize(),
title = stringResource(id = coreString.title_empty_links),
sub = stringResource(id = coreString.sub_empty_links)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import pokitmons.pokit.core.ui.components.block.linkcard.LinkCard
import pokitmons.pokit.core.ui.components.template.bottomsheet.PokitBottomSheet
import pokitmons.pokit.core.ui.components.template.linkdetailbottomsheet.LinkDetailBottomSheet
import pokitmons.pokit.core.ui.components.template.modifybottomsheet.ModifyBottomSheetContent
import pokitmons.pokit.core.ui.components.template.pokkiempty.EmptyPokki
import pokitmons.pokit.core.ui.components.template.pokkierror.ErrorPokki
import pokitmons.pokit.core.ui.components.template.pookiempty.EmptyPooki
import pokitmons.pokit.core.ui.components.template.pookierror.ErrorPooki
import pokitmons.pokit.core.ui.components.template.removeItemBottomSheet.TwoButtonBottomSheetContent
import pokitmons.pokit.core.ui.theme.PokitTheme
import pokitmons.pokit.core.ui.R.string as coreString
Expand Down Expand Up @@ -129,7 +129,7 @@ fun RemindScreen(
}

if (showTotalEmpty) {
ErrorPokki(
ErrorPooki(
modifier = Modifier
.fillMaxWidth()
.fillMaxHeight()
Expand All @@ -153,11 +153,11 @@ fun RemindScreen(
when (todayContentsState) {
NetworkState.IDLE -> {
if (todayContents.value.isEmpty()) {
ErrorPokki(
ErrorPooki(
modifier = Modifier
.fillMaxWidth()
.height(208.dp),
pokkiSize = 140.dp,
pookiSize = 140.dp,
title = stringResource(id = coreString.title_lack_of_links),
sub = stringResource(id = coreString.sub_lack_of_links)
)
Expand Down Expand Up @@ -192,11 +192,11 @@ fun RemindScreen(
)
}
NetworkState.ERROR -> {
ErrorPokki(
ErrorPooki(
modifier = Modifier
.fillMaxWidth()
.height(208.dp),
pokkiSize = 140.dp,
pookiSize = 140.dp,
title = stringResource(id = coreString.title_error),
sub = stringResource(id = coreString.sub_error)
)
Expand Down Expand Up @@ -240,7 +240,7 @@ fun RemindScreen(
when (bookmarkContentState) {
NetworkState.IDLE -> {
if (bookmarkContents.value.isEmpty()) {
EmptyPokki(
EmptyPooki(
modifier = Modifier
.fillMaxWidth()
.height(252.dp),
Expand Down Expand Up @@ -279,11 +279,11 @@ fun RemindScreen(
)
}
NetworkState.ERROR -> {
ErrorPokki(
ErrorPooki(
modifier = Modifier
.fillMaxWidth()
.height(252.dp),
pokkiSize = 140.dp,
pookiSize = 140.dp,
title = stringResource(id = coreString.title_empty_favorite),
sub = stringResource(id = coreString.sub_empty_favorite)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ fun SignUpSuccessScreen(

Image(
modifier = Modifier.height(308.dp),
painter = painterResource(id = coreDrawable.big_pokki),
contentDescription = "big_pokki"
painter = painterResource(id = coreDrawable.big_pooki),
contentDescription = "big_pooki"
)

Spacer(modifier = Modifier.height(16.dp))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ import pokitmons.pokit.core.ui.components.block.pokitlist.attributes.PokitListSt
import pokitmons.pokit.core.ui.components.template.bottomsheet.PokitBottomSheet
import pokitmons.pokit.core.ui.components.template.linkdetailbottomsheet.LinkDetailBottomSheet
import pokitmons.pokit.core.ui.components.template.modifybottomsheet.ModifyBottomSheetContent
import pokitmons.pokit.core.ui.components.template.pokkiempty.EmptyPokki
import pokitmons.pokit.core.ui.components.template.pokkierror.ErrorPokki
import pokitmons.pokit.core.ui.components.template.pookiempty.EmptyPooki
import pokitmons.pokit.core.ui.components.template.pookierror.ErrorPooki
import pokitmons.pokit.core.ui.components.template.removeItemBottomSheet.TwoButtonBottomSheetContent
import pokitmons.pokit.core.ui.theme.PokitTheme
import pokitmons.pokit.core.ui.R.string as coreString
Expand Down Expand Up @@ -177,7 +177,7 @@ fun PokitDetailScreen(
)
}
(linkListState == SimplePagingState.FAILURE_INIT) -> {
ErrorPokki(
ErrorPooki(
modifier = Modifier
.fillMaxWidth()
.weight(1f),
Expand All @@ -186,7 +186,7 @@ fun PokitDetailScreen(
)
}
(linkList.isEmpty()) -> {
EmptyPokki(
EmptyPooki(
modifier = Modifier
.fillMaxWidth()
.weight(1f),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import pokitmons.pokit.core.ui.components.atom.loading.LoadingProgress
import pokitmons.pokit.core.ui.components.template.bottomsheet.PokitBottomSheet
import pokitmons.pokit.core.ui.components.template.linkdetailbottomsheet.LinkDetailBottomSheet
import pokitmons.pokit.core.ui.components.template.modifybottomsheet.ModifyBottomSheetContent
import pokitmons.pokit.core.ui.components.template.pokkiempty.EmptyPokki
import pokitmons.pokit.core.ui.components.template.pokkierror.ErrorPokki
import pokitmons.pokit.core.ui.components.template.pookiempty.EmptyPooki
import pokitmons.pokit.core.ui.components.template.pookierror.ErrorPooki
import pokitmons.pokit.core.ui.components.template.removeItemBottomSheet.TwoButtonBottomSheetContent
import pokitmons.pokit.core.ui.theme.PokitTheme
import pokitmons.pokit.search.components.filter.FilterArea
Expand Down Expand Up @@ -231,7 +231,7 @@ fun SearchScreen(
)
}
(linkPagingState == SimplePagingState.FAILURE_INIT) -> {
ErrorPokki(
ErrorPooki(
modifier = Modifier
.fillMaxWidth()
.weight(1f),
Expand All @@ -241,7 +241,7 @@ fun SearchScreen(
)
}
(linkList.isEmpty()) -> {
EmptyPokki(
EmptyPooki(
modifier = Modifier
.fillMaxWidth()
.weight(1f),
Expand Down

0 comments on commit d448cf6

Please sign in to comment.