From 24950a469133773139f6beaae0b1c140e1419572 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Fri, 30 Aug 2024 11:35:39 +0900 Subject: [PATCH 01/11] =?UTF-8?q?[fix]=20=EB=8B=89=EB=84=A4=EC=9E=84=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - isError 확인 --- .../java/pokitmons/pokit/nickname/InputNicknameScreen.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/feature/login/src/main/java/pokitmons/pokit/nickname/InputNicknameScreen.kt b/feature/login/src/main/java/pokitmons/pokit/nickname/InputNicknameScreen.kt index ce096374..f3173f75 100644 --- a/feature/login/src/main/java/pokitmons/pokit/nickname/InputNicknameScreen.kt +++ b/feature/login/src/main/java/pokitmons/pokit/nickname/InputNicknameScreen.kt @@ -67,11 +67,11 @@ fun InputNicknameScreen( maxLength = NICKNAME_MAX_LENGTH, sub = when { inputNicknameState.isDuplicate -> stringResource(id = Login.string.nickname_already_in_use) - inputNicknameState.isRegex -> stringResource(id = Login.string.input_restriction_message) - inputNicknameState.nickname.length < NICKNAME_MAX_LENGTH -> stringResource(id = Login.string.input_max_length) + !inputNicknameState.isRegex -> stringResource(id = Login.string.input_restriction_message) + inputNicknameState.nickname.length >= NICKNAME_MAX_LENGTH -> stringResource(id = Login.string.input_max_length) else -> "" }, - isError = inputNicknameState.nickname.length > NICKNAME_MAX_LENGTH || inputNicknameState.isDuplicate || inputNicknameState.isRegex, + isError = inputNicknameState.isRegex || inputNicknameState.isDuplicate || inputNicknameState.nickname.length >= NICKNAME_MAX_LENGTH, hintText = stringResource(id = Login.string.input_nickname_hint), onChangeText = { text -> Log.d("!! : ", text) @@ -79,9 +79,7 @@ fun InputNicknameScreen( viewModel.apply { inputText(text) if (checkNicknameRegex(text)) { - Log.d("!! : ", "else call") checkDuplicateNickname(text) - } else { } } } From 795ede5464c37ae2157f1428c5325787e6abab85 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Fri, 30 Aug 2024 11:35:53 +0900 Subject: [PATCH 02/11] =?UTF-8?q?[fix]=20=EA=B3=B5=EC=9C=A0=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 토스트 추가 --- .../java/pokitmons/pokit/home/pokit/PokitScreen.kt | 7 ++++++- .../pokitmons/pokit/home/pokit/UnclassifiedScreen.kt | 7 ++++++- .../java/pokitmons/pokit/home/remind/RemindScreen.kt | 7 ++++++- .../com/strayalpaca/pokitdetail/PokitDetailScreen.kt | 10 ++++++++-- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/feature/home/src/main/java/pokitmons/pokit/home/pokit/PokitScreen.kt b/feature/home/src/main/java/pokitmons/pokit/home/pokit/PokitScreen.kt index e808aad0..da716fc9 100644 --- a/feature/home/src/main/java/pokitmons/pokit/home/pokit/PokitScreen.kt +++ b/feature/home/src/main/java/pokitmons/pokit/home/pokit/PokitScreen.kt @@ -1,5 +1,7 @@ package pokitmons.pokit.home.pokit +import android.content.Context +import android.widget.Toast import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -15,6 +17,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import coil.compose.rememberAsyncImagePainter @@ -47,6 +50,8 @@ fun PokitScreen( val pokitOptionBottomSheetType by viewModel.pokitOptionBottomSheetType.collectAsState() val currentDetailSelectedCategory by viewModel.currentDetailSelectedCategory.collectAsState() + val context: Context = LocalContext.current + PokitBottomSheet( onHideBottomSheet = viewModel::hidePokitDetailRemoveBottomSheet, show = pokitOptionBottomSheetType != null @@ -54,7 +59,7 @@ fun PokitScreen( when (pokitOptionBottomSheetType) { BottomSheetType.MODIFY -> { ModifyBottomSheetContent( - onClickShare = {}, + onClickShare = { Toast.makeText(context, "준비중입니다.", Toast.LENGTH_SHORT).show() }, onClickModify = remember { { viewModel.hidePokitDetailRemoveBottomSheet() diff --git a/feature/home/src/main/java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt b/feature/home/src/main/java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt index 1dcea235..446d7812 100644 --- a/feature/home/src/main/java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt +++ b/feature/home/src/main/java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt @@ -1,5 +1,7 @@ package pokitmons.pokit.home.pokit +import android.content.Context +import android.widget.Toast import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.lazy.LazyColumn @@ -9,6 +11,7 @@ import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -33,6 +36,8 @@ fun UnclassifiedScreen( val currentSelectedLink by viewModel.currentSelectedLink.collectAsState() val currentDetailShowLink by viewModel.currentDetailShowLink.collectAsState() + val context: Context = LocalContext.current + currentDetailShowLink?.let { link -> LinkDetailBottomSheet( title = link.title, @@ -56,7 +61,7 @@ fun UnclassifiedScreen( when (pokitOptionBottomSheetType) { BottomSheetType.MODIFY -> { ModifyBottomSheetContent( - onClickShare = {}, + onClickShare = { Toast.makeText(context, "준비중입니다.", Toast.LENGTH_SHORT).show() }, onClickModify = remember { { viewModel.hideLinkOptionBottomSheet() diff --git a/feature/home/src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt b/feature/home/src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt index 81390306..00c631fd 100644 --- a/feature/home/src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt +++ b/feature/home/src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt @@ -1,5 +1,7 @@ package pokitmons.pokit.home.remind +import android.content.Context +import android.widget.Toast import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -17,6 +19,7 @@ import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -54,6 +57,8 @@ fun RemindScreen( val pokitOptionBottomSheetType by viewModel.pokitOptionBottomSheetType.collectAsState() val currentSelectedLink by viewModel.currentSelectedLink.collectAsState() + val context: Context = LocalContext.current + val showTotalEmpty by remember { derivedStateOf { todayContentsState == NetworkState.IDLE && @@ -70,7 +75,7 @@ fun RemindScreen( when (pokitOptionBottomSheetType) { BottomSheetType.MODIFY -> { ModifyBottomSheetContent( - onClickShare = {}, + onClickShare = { Toast.makeText(context, "준비중입니다.", Toast.LENGTH_SHORT).show() }, onClickModify = remember { { viewModel.hideLinkOptionBottomSheet() diff --git a/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt b/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt index c909d635..e9cbcd78 100644 --- a/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt +++ b/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt @@ -1,5 +1,7 @@ package com.strayalpaca.pokitdetail +import android.content.Context +import android.widget.Toast import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize @@ -17,6 +19,7 @@ import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import coil.compose.rememberAsyncImagePainter @@ -278,10 +281,12 @@ fun PokitDetailScreen( onHideBottomSheet = hideLinkModifyBottomSheet, show = state.linkBottomSheetType != null ) { + val context: Context = LocalContext.current + when (state.linkBottomSheetType) { BottomSheetType.MODIFY -> { ModifyBottomSheetContent( - onClickShare = {}, + onClickShare = { Toast.makeText(context, "준비중입니다.", Toast.LENGTH_SHORT).show() }, onClickModify = remember { { state.currentLink?.let { link -> @@ -316,8 +321,9 @@ fun PokitDetailScreen( ) { when (state.pokitBottomSheetType) { BottomSheetType.MODIFY -> { + val context: Context = LocalContext.current ModifyBottomSheetContent( - onClickShare = {}, + onClickShare = { Toast.makeText(context, "준비중입니다.", Toast.LENGTH_SHORT).show() }, onClickModify = remember { { hidePokitModifyBottomSheet() From 657838ad3dc9fb235d434c61051b94652c0aa43c Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Fri, 30 Aug 2024 18:28:56 +0900 Subject: [PATCH 03/11] =?UTF-8?q?[fix]=20=EA=B3=B5=EC=9C=A0,=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20=EC=82=AD=EC=A0=9C=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EB=85=B8=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/strayalpaca/addpokit/AddPokitScreen.kt | 2 +- .../pokit/home/pokit/UnclassifiedScreen.kt | 15 ++++++++++++++- .../pokitdetail/PokitDetailScreen.kt | 18 ++++++++++++++++-- .../pokitmons/pokit/search/SearchScreen.kt | 12 ++++++++++++ 4 files changed, 43 insertions(+), 4 deletions(-) diff --git a/feature/addpokit/src/main/java/com/strayalpaca/addpokit/AddPokitScreen.kt b/feature/addpokit/src/main/java/com/strayalpaca/addpokit/AddPokitScreen.kt index aa5029f7..a75f1036 100644 --- a/feature/addpokit/src/main/java/com/strayalpaca/addpokit/AddPokitScreen.kt +++ b/feature/addpokit/src/main/java/com/strayalpaca/addpokit/AddPokitScreen.kt @@ -197,7 +197,7 @@ fun AddPokitScreen( isError = state.pokitInputErrorMessage != null, sub = state.pokitInputErrorMessage ?: "", enable = (state.step != AddPokitScreenStep.POKIT_SAVE_LOADING), - maxLength = 10 + maxLength = 10, ) Spacer(modifier = Modifier.height(28.dp)) diff --git a/feature/home/src/main/java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt b/feature/home/src/main/java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt index 446d7812..cde969ea 100644 --- a/feature/home/src/main/java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt +++ b/feature/home/src/main/java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt @@ -1,6 +1,7 @@ package pokitmons.pokit.home.pokit import android.content.Context +import android.content.Intent import android.widget.Toast import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues @@ -50,7 +51,19 @@ fun UnclassifiedScreen( dateString = link.dateString, onHideBottomSheet = viewModel::hideDetailLinkBottomSheet, show = true, - onClickBookmark = {} + onClickShareLink = { + val intent = Intent(Intent.ACTION_SEND_MULTIPLE).apply { + type = "text/plain" + putExtra(Intent.EXTRA_TEXT, link.url) + } + context.startActivity(Intent.createChooser(intent, "Pokit")) + }, + onClickModifyLink = { + + }, + onClickRemoveLink = { + + }, ) } diff --git a/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt b/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt index e9cbcd78..1577a213 100644 --- a/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt +++ b/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt @@ -1,6 +1,7 @@ package com.strayalpaca.pokitdetail import android.content.Context +import android.content.Intent import android.widget.Toast import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -216,6 +217,7 @@ fun PokitDetailScreen( } if (state.currentLink != null) { + val context: Context = LocalContext.current LinkDetailBottomSheet( title = state.currentLink.title, memo = state.currentLink.memo, @@ -226,7 +228,20 @@ fun PokitDetailScreen( linkType = stringResource(state.currentLink.linkType.textResourceId), dateString = state.currentLink.dateString, onHideBottomSheet = hideLinkDetailBottomSheet, - show = state.linkDetailBottomSheetVisible + show = state.linkDetailBottomSheetVisible, + onClickShareLink = { + val intent = Intent(Intent.ACTION_SEND_MULTIPLE).apply { + type = "text/plain" + putExtra(Intent.EXTRA_TEXT, state.currentLink.url) + } + context.startActivity(Intent.createChooser(intent, "Pokit")) + }, + onClickModifyLink = { + + }, + onClickRemoveLink = { + + }, ) } @@ -282,7 +297,6 @@ fun PokitDetailScreen( show = state.linkBottomSheetType != null ) { val context: Context = LocalContext.current - when (state.linkBottomSheetType) { BottomSheetType.MODIFY -> { ModifyBottomSheetContent( diff --git a/feature/search/src/main/java/pokitmons/pokit/search/SearchScreen.kt b/feature/search/src/main/java/pokitmons/pokit/search/SearchScreen.kt index 3aa7cea7..f589d022 100644 --- a/feature/search/src/main/java/pokitmons/pokit/search/SearchScreen.kt +++ b/feature/search/src/main/java/pokitmons/pokit/search/SearchScreen.kt @@ -1,5 +1,7 @@ package pokitmons.pokit.search +import android.content.Context +import android.content.Intent import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize @@ -10,6 +12,7 @@ import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import coil.compose.rememberAsyncImagePainter @@ -48,6 +51,8 @@ fun SearchScreenContainer( val pokitList by viewModel.pokitList.collectAsState() val pokitPagingState by viewModel.pokitPagingState.collectAsState() + val context: Context = LocalContext.current + state.currentLink?.let { link -> LinkDetailBottomSheet( title = link.title, @@ -60,6 +65,13 @@ fun SearchScreenContainer( dateString = link.dateString, onHideBottomSheet = viewModel::hideLinkDetailBottomSheet, show = state.showLinkDetailBottomSheet, + onClickShareLink = { + val intent = Intent(Intent.ACTION_SEND_MULTIPLE).apply { + type = "text/plain" + putExtra(Intent.EXTRA_TEXT, state.currentLink?.url) + } + context.startActivity(Intent.createChooser(intent, "Pokit")) + }, onClickModifyLink = { viewModel.hideLinkDetailBottomSheet() onNavigateToLinkModify(link.id) From 589e5069ef5dbbd89d205f8993f77068e65bc322 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Fri, 30 Aug 2024 19:25:45 +0900 Subject: [PATCH 04/11] =?UTF-8?q?[fix]=20=EB=A9=94=EB=AA=A8=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/strayalpaca/addlink/AddLinkScreen.kt | 30 ++++++++++++++----- .../strayalpaca/addlink/AddLinkViewModel.kt | 4 ++- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt index 0c4bd205..a80d0d50 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt @@ -216,7 +216,7 @@ fun AddLinkScreen( inputText = url, hintText = stringResource(id = R.string.placeholder_link), onChangeText = inputUrl, - enable = enable + enable = enable, ) Spacer(modifier = Modifier.height(24.dp)) @@ -272,17 +272,31 @@ fun AddLinkScreen( text = memo, hintText = stringResource(id = R.string.placeholder_memo), onChangeText = inputMemo, - enable = enable + enable = enable, + isError = memo.length >= 100, ) Spacer(modifier = Modifier.height(4.dp)) - Text( - modifier = Modifier.fillMaxWidth(), - text = "${memo.length}/100", - style = PokitTheme.typography.detail1.copy(color = PokitTheme.colors.textTertiary), - textAlign = TextAlign.End - ) + Row(verticalAlignment = Alignment.CenterVertically) { + if (memo.length >= 100) { + Text( + color = PokitTheme.colors.error, + text = "최대 100자까지 입력 가능합니다.", + style = PokitTheme.typography.detail1, + ) + } + + Spacer(modifier = Modifier.weight(1f)) + + Text( + color = if (memo.length >= 100) PokitTheme.colors.error else PokitTheme.colors.textTertiary, + modifier = Modifier.weight(1f), + text = "${memo.length}/100", + style = PokitTheme.typography.detail1, + textAlign = TextAlign.End + ) + } Spacer(modifier = Modifier.height(24.dp)) diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt index 3ef65cd4..84b04a4e 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt @@ -177,7 +177,9 @@ class AddLinkViewModel @Inject constructor( } fun inputMemo(memo: String) { - _memo.update { memo } + if (memo.length <= 100) { + _memo.update { memo } + } } fun showSelectPokitBottomSheet() = intent { From b83d0221b775c31b822d26a927bced3f22f0a643 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Fri, 30 Aug 2024 19:26:37 +0900 Subject: [PATCH 05/11] =?UTF-8?q?[chore]=20=EC=BD=94=EB=94=A9=20=EC=BB=A8?= =?UTF-8?q?=EB=B2=A4=EC=85=98=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt | 6 +++--- .../main/java/com/strayalpaca/addpokit/AddPokitScreen.kt | 2 +- .../java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt | 4 +--- .../java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt | 4 +--- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt index a80d0d50..51b5cdd1 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt @@ -216,7 +216,7 @@ fun AddLinkScreen( inputText = url, hintText = stringResource(id = R.string.placeholder_link), onChangeText = inputUrl, - enable = enable, + enable = enable ) Spacer(modifier = Modifier.height(24.dp)) @@ -273,7 +273,7 @@ fun AddLinkScreen( hintText = stringResource(id = R.string.placeholder_memo), onChangeText = inputMemo, enable = enable, - isError = memo.length >= 100, + isError = memo.length >= 100 ) Spacer(modifier = Modifier.height(4.dp)) @@ -283,7 +283,7 @@ fun AddLinkScreen( Text( color = PokitTheme.colors.error, text = "최대 100자까지 입력 가능합니다.", - style = PokitTheme.typography.detail1, + style = PokitTheme.typography.detail1 ) } diff --git a/feature/addpokit/src/main/java/com/strayalpaca/addpokit/AddPokitScreen.kt b/feature/addpokit/src/main/java/com/strayalpaca/addpokit/AddPokitScreen.kt index a75f1036..aa5029f7 100644 --- a/feature/addpokit/src/main/java/com/strayalpaca/addpokit/AddPokitScreen.kt +++ b/feature/addpokit/src/main/java/com/strayalpaca/addpokit/AddPokitScreen.kt @@ -197,7 +197,7 @@ fun AddPokitScreen( isError = state.pokitInputErrorMessage != null, sub = state.pokitInputErrorMessage ?: "", enable = (state.step != AddPokitScreenStep.POKIT_SAVE_LOADING), - maxLength = 10, + maxLength = 10 ) Spacer(modifier = Modifier.height(28.dp)) diff --git a/feature/home/src/main/java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt b/feature/home/src/main/java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt index cde969ea..66ea45f9 100644 --- a/feature/home/src/main/java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt +++ b/feature/home/src/main/java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt @@ -59,11 +59,9 @@ fun UnclassifiedScreen( context.startActivity(Intent.createChooser(intent, "Pokit")) }, onClickModifyLink = { - }, onClickRemoveLink = { - - }, + } ) } diff --git a/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt b/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt index 1577a213..41cb91f3 100644 --- a/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt +++ b/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt @@ -237,11 +237,9 @@ fun PokitDetailScreen( context.startActivity(Intent.createChooser(intent, "Pokit")) }, onClickModifyLink = { - }, onClickRemoveLink = { - - }, + } ) } From 5e141a5aa9070c7821c6ea0d3af947ce6ff2ae79 Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Sat, 31 Aug 2024 12:02:39 +0900 Subject: [PATCH 06/11] =?UTF-8?q?[FIX]=20#67-=EB=A7=81=ED=81=AC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=ED=8F=AC=ED=82=B7=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20bot?= =?UTF-8?q?tomSheet=EC=97=90=EC=84=9C=20=ED=8F=AC=ED=82=B7=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=EC=9D=B4=20=EB=A7=8E=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=EC=9D=84=20=EA=BD=89=20=EC=B1=84=EC=9A=B0?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/bottomsheet/PokitBottomSheet.kt | 3 +- .../template/bottomsheet/Preview.kt | 43 +++++++++---------- .../com/strayalpaca/addlink/AddLinkScreen.kt | 3 +- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/bottomsheet/PokitBottomSheet.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/bottomsheet/PokitBottomSheet.kt index 427b2860..9a0ffe57 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/bottomsheet/PokitBottomSheet.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/bottomsheet/PokitBottomSheet.kt @@ -34,9 +34,10 @@ import pokitmons.pokit.core.ui.theme.PokitTheme fun PokitBottomSheet( onHideBottomSheet: () -> Unit, show: Boolean = false, + skipPartiallyExpanded: Boolean = true, content: @Composable (ColumnScope.() -> Unit), ) { - val bottomSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true) + val bottomSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = skipPartiallyExpanded) var visibility by remember { mutableStateOf(show) } val scope = rememberCoroutineScope() diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/bottomsheet/Preview.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/bottomsheet/Preview.kt index 624e4e2c..3b916b8b 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/bottomsheet/Preview.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/bottomsheet/Preview.kt @@ -27,36 +27,35 @@ private fun PokitSwitchRadioPreview() { Surface(modifier = Modifier.fillMaxSize()) { Surface( modifier = Modifier.fillMaxSize(), - color = MaterialTheme.colorScheme.background + color = PokitTheme.colors.backgroundBase ) { Button(onClick = { showBottomSheet = true }) { Text(text = "Click!") } } - if (showBottomSheet) { - PokitBottomSheet( - onHideBottomSheet = { showBottomSheet = false } - ) { - PokitBottomSheetItem( - text = "즐겨찾기", - resourceId = R.drawable.icon_24_star_1, - data = "즐겨찾기", - onClick = { } - ) + PokitBottomSheet( + onHideBottomSheet = { showBottomSheet = false }, + show = showBottomSheet + ) { + PokitBottomSheetItem( + text = "즐겨찾기", + resourceId = R.drawable.icon_24_star_1, + data = "즐겨찾기", + onClick = { } + ) - HorizontalDivider( - thickness = 1.dp, - color = PokitTheme.colors.borderTertiary - ) + HorizontalDivider( + thickness = 1.dp, + color = PokitTheme.colors.borderTertiary + ) - PokitBottomSheetItem( - text = "공유하기", - resourceId = R.drawable.icon_24_share, - data = "공유하기", - onClick = { showBottomSheet = false } - ) - } + PokitBottomSheetItem( + text = "공유하기", + resourceId = R.drawable.icon_24_share, + data = "공유하기", + onClick = { showBottomSheet = false } + ) } } } diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt index 0c4bd205..16249455 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt @@ -89,7 +89,8 @@ fun AddLinkScreenContainer( PokitBottomSheet( onHideBottomSheet = viewModel::hideSelectPokitBottomSheet, - show = state.step == ScreenStep.POKIT_SELECT + show = state.step == ScreenStep.POKIT_SELECT, + skipPartiallyExpanded = false ) { val lazyColumnListState = rememberLazyListState() val startPaging = remember { From 58bfb1b75bf687602c717e0480229989bd1487cb Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Sat, 31 Aug 2024 12:25:06 +0900 Subject: [PATCH 07/11] =?UTF-8?q?[FIX]=20#67-bottomSheet=EC=9D=98=20?= =?UTF-8?q?=EA=B5=AC=EB=B6=84=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EA=B7=B8?= =?UTF-8?q?=EB=A6=BC=EC=9E=90=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/bottomsheet/PokitBottomSheet.kt | 59 ++++++++++++------- .../template/bottomsheet/Preview.kt | 1 - 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/bottomsheet/PokitBottomSheet.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/bottomsheet/PokitBottomSheet.kt index 9a0ffe57..dbd9e606 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/bottomsheet/PokitBottomSheet.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/bottomsheet/PokitBottomSheet.kt @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.navigationBarsIgnoringVisibility import androidx.compose.foundation.layout.width @@ -14,6 +15,7 @@ import androidx.compose.foundation.layout.windowInsetsBottomHeight import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.Surface import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -22,6 +24,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color @@ -64,31 +67,45 @@ fun PokitBottomSheet( }, sheetState = bottomSheetState, scrimColor = Color.Transparent, - shape = RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp), - containerColor = PokitTheme.colors.backgroundBase, - dragHandle = { - Column { - Spacer(modifier = Modifier.height(8.dp)) + containerColor = Color.Transparent, + dragHandle = null + ) { + Spacer(modifier = Modifier.height(8.dp).background(Color.Transparent)) - Box( - Modifier - .clip(RoundedCornerShape(4.dp)) - .width(36.dp) - .height(4.dp) - .background(color = PokitTheme.colors.iconTertiary) - ) + Surface( + shape = RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp), + color = PokitTheme.colors.backgroundBase, + shadowElevation = 20.dp + ) { + Column( + modifier = Modifier.fillMaxWidth() + ) { + Column( + modifier = Modifier.fillMaxWidth(), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Spacer(modifier = Modifier.height(8.dp)) + + Box( + Modifier + .clip(RoundedCornerShape(4.dp)) + .width(36.dp) + .height(4.dp) + .background(color = PokitTheme.colors.iconTertiary) + ) + + Spacer(modifier = Modifier.height(12.dp)) + } - Spacer(modifier = Modifier.height(12.dp)) + content() + + Spacer( + Modifier.windowInsetsBottomHeight( + WindowInsets.navigationBarsIgnoringVisibility + ) + ) } } - ) { - content() - - Spacer( - Modifier.windowInsetsBottomHeight( - WindowInsets.navigationBarsIgnoringVisibility - ) - ) } } } diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/bottomsheet/Preview.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/bottomsheet/Preview.kt index 3b916b8b..b66f5e21 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/bottomsheet/Preview.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/bottomsheet/Preview.kt @@ -3,7 +3,6 @@ package pokitmons.pokit.core.ui.components.template.bottomsheet import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.Button import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable From 3939b67a8a61cf56d54fa3c6415ba52bbe4658da Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Sat, 31 Aug 2024 12:30:19 +0900 Subject: [PATCH 08/11] =?UTF-8?q?[FIX]=20#67-=ED=99=88=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=EC=97=90=EC=84=9C=20bottomSheet=EC=9D=98=20=EB=B0=B0?= =?UTF-8?q?=EA=B2=BD=20=EC=83=89=EC=83=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/home/src/main/java/pokitmons/pokit/home/HomeScreen.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/feature/home/src/main/java/pokitmons/pokit/home/HomeScreen.kt b/feature/home/src/main/java/pokitmons/pokit/home/HomeScreen.kt index 4757dcb8..86c878a0 100644 --- a/feature/home/src/main/java/pokitmons/pokit/home/HomeScreen.kt +++ b/feature/home/src/main/java/pokitmons/pokit/home/HomeScreen.kt @@ -82,7 +82,8 @@ fun HomeScreen( onDismissRequest = { showBottomSheet = false }, - sheetState = sheetState + sheetState = sheetState, + containerColor = PokitTheme.colors.backgroundBase ) { Row( modifier = Modifier From 4d4dee8394f3cac604edc9e21e34792edfd8d669 Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Sat, 31 Aug 2024 13:04:35 +0900 Subject: [PATCH 09/11] =?UTF-8?q?[FIX]=20#67-=EB=9D=BC=EB=AF=B8=EC=9D=B8?= =?UTF-8?q?=EB=93=9C=20=ED=99=94=EB=A9=B4=20=EB=B0=B0=EA=B2=BD=20=EC=83=89?= =?UTF-8?q?=EC=83=81=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/feature/home/src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt b/feature/home/src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt index 04973cb2..3b28fd7e 100644 --- a/feature/home/src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt +++ b/feature/home/src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt @@ -2,6 +2,7 @@ package pokitmons.pokit.home.remind import android.content.Context import android.widget.Toast +import androidx.compose.foundation.background import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -35,6 +36,7 @@ import pokitmons.pokit.core.ui.components.template.modifybottomsheet.ModifyBotto 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.removeItemBottomSheet.TwoButtonBottomSheetContent +import pokitmons.pokit.core.ui.theme.PokitTheme import pokitmons.pokit.core.ui.R.string as coreString @Composable @@ -130,6 +132,7 @@ fun RemindScreen( } else { Column( modifier = modifier + .background(PokitTheme.colors.backgroundBase) .padding(20.dp) .fillMaxHeight() .verticalScroll(rememberScrollState()) From dfabb1d994dd2e9b7599d7e59424e4cec648f201 Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Sat, 31 Aug 2024 13:04:35 +0900 Subject: [PATCH 10/11] =?UTF-8?q?[FIX]=20#67-=EB=A6=AC=EB=A7=88=EC=9D=B8?= =?UTF-8?q?=EB=93=9C=20=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20"=EC=98=A4?= =?UTF-8?q?=EB=8A=98=20=EC=9D=B4=20=EB=A7=81=ED=81=AC=EB=8A=94=20=EC=96=B4?= =?UTF-8?q?=EB=95=8C=EC=9A=94=3F"=EC=97=90=20=ED=91=9C=EC=8B=9C=EB=90=98?= =?UTF-8?q?=EB=8A=94=20link=20UI=EC=9D=98=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=20=ED=91=9C=EC=8B=9C=20=EB=B6=80=EB=B6=84=20=EC=9E=84?= =?UTF-8?q?=EC=8B=9C=20=EC=88=A8=EA=B9=80=EC=B2=98=EB=A6=AC=20=EC=88=98?= =?UTF-8?q?=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pokit/home/remind/RemindScreen.kt | 5 +++- .../pokit/home/remind/TodayLinkCard.kt | 28 ++++++++++--------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/feature/home/src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt b/feature/home/src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt index 04973cb2..bcc902c0 100644 --- a/feature/home/src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt +++ b/feature/home/src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt @@ -2,6 +2,7 @@ package pokitmons.pokit.home.remind import android.content.Context import android.widget.Toast +import androidx.compose.foundation.background import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -35,6 +36,7 @@ import pokitmons.pokit.core.ui.components.template.modifybottomsheet.ModifyBotto 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.removeItemBottomSheet.TwoButtonBottomSheetContent +import pokitmons.pokit.core.ui.theme.PokitTheme import pokitmons.pokit.core.ui.R.string as coreString @Composable @@ -130,6 +132,7 @@ fun RemindScreen( } else { Column( modifier = modifier + .background(PokitTheme.colors.backgroundBase) .padding(20.dp) .fillMaxHeight() .verticalScroll(rememberScrollState()) @@ -160,7 +163,7 @@ fun RemindScreen( title = todayContent.title, sub = todayContent.createdAt, painter = rememberAsyncImagePainter(todayContent.thumbNail), - badgeText = todayContent.data, + badgeText = null, domain = todayContent.domain, onClick = { viewModel.showDetailLinkBottomSheet(remindResult = todayContent) diff --git a/feature/home/src/main/java/pokitmons/pokit/home/remind/TodayLinkCard.kt b/feature/home/src/main/java/pokitmons/pokit/home/remind/TodayLinkCard.kt index 888f971b..6cd3309a 100644 --- a/feature/home/src/main/java/pokitmons/pokit/home/remind/TodayLinkCard.kt +++ b/feature/home/src/main/java/pokitmons/pokit/home/remind/TodayLinkCard.kt @@ -36,7 +36,7 @@ fun ToadyLinkCard( title: String, sub: String, painter: Painter, - badgeText: String, + badgeText: String?, domain: String, onClick: () -> Unit, onClickKebab: () -> Unit, @@ -70,19 +70,21 @@ fun ToadyLinkCard( .align(Alignment.BottomStart) .padding(12.dp) ) { - Text( - style = PokitTheme.typography.label4, - text = badgeText, - color = PokitTheme.colors.textTertiary, - modifier = Modifier - .height(16.dp) - .width(34.dp) - .clip(RoundedCornerShape(4.dp)) - .background(PokitTheme.colors.backgroundPrimary) - .padding(horizontal = 4.dp, vertical = 2.dp) - ) + badgeText?.let { + Text( + style = PokitTheme.typography.label4, + text = badgeText, + color = PokitTheme.colors.textTertiary, + modifier = Modifier + .height(16.dp) + .width(34.dp) + .clip(RoundedCornerShape(4.dp)) + .background(PokitTheme.colors.backgroundPrimary) + .padding(horizontal = 4.dp, vertical = 2.dp) + ) - Spacer(modifier = Modifier.height(4.dp)) + Spacer(modifier = Modifier.height(4.dp)) + } Row( modifier = Modifier.fillMaxWidth(), From 94dcc740af3b11be0977fb8750fe68884ab7e403 Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Sat, 31 Aug 2024 13:56:50 +0900 Subject: [PATCH 11/11] =?UTF-8?q?[FIX]=20#67-=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20=EA=B3=B5=EC=9C=A0=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EB=88=84=EB=9D=BD=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/pokitmons/pokit/search/SearchScreen.kt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/feature/search/src/main/java/pokitmons/pokit/search/SearchScreen.kt b/feature/search/src/main/java/pokitmons/pokit/search/SearchScreen.kt index cebf33dc..e084ec67 100644 --- a/feature/search/src/main/java/pokitmons/pokit/search/SearchScreen.kt +++ b/feature/search/src/main/java/pokitmons/pokit/search/SearchScreen.kt @@ -115,6 +115,15 @@ fun SearchScreenContainer( viewModel.showLinkRemoveBottomSheet(link) } } + }, + onClickShare = remember { + { + val intent = Intent(Intent.ACTION_SEND_MULTIPLE).apply { + type = "text/plain" + putExtra(Intent.EXTRA_TEXT, state.currentLink?.url) + } + context.startActivity(Intent.createChooser(intent, "Pokit")) + } } ) } @@ -223,7 +232,9 @@ fun SearchScreen( } (linkPagingState == SimplePagingState.FAILURE_INIT) -> { ErrorPokki( - modifier = Modifier.fillMaxWidth().weight(1f), + modifier = Modifier + .fillMaxWidth() + .weight(1f), title = stringResource(id = coreString.title_error), sub = stringResource(id = coreString.sub_error), onClickRetry = onClickSearch @@ -231,7 +242,9 @@ fun SearchScreen( } (linkList.isEmpty()) -> { EmptyPokki( - modifier = Modifier.fillMaxWidth().weight(1f), + modifier = Modifier + .fillMaxWidth() + .weight(1f), title = stringResource(id = coreString.title_empty_search), sub = stringResource(id = coreString.sub_empty_search) )