-
Notifications
You must be signed in to change notification settings - Fork 0
포커싱 검색 결과 화면에 더보기 기능을 추가한다 #82
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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
16 changes: 16 additions & 0 deletions
16
core/common/src/main/java/com/metasearch/android/core/common/extensions/ModifierExt.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 |
|---|---|---|
| @@ -1,7 +1,23 @@ | ||
| package com.metasearch.android.core.common.extensions | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.graphics.Color.Companion.LightGray | ||
| import androidx.compose.ui.graphics.Shape | ||
| import androidx.compose.ui.platform.LocalInspectionMode | ||
|
|
||
| fun Modifier.clickableIfNotNull(onClick: (() -> Unit)?): Modifier = | ||
| if (onClick != null) this.clickable(onClick = onClick) else this | ||
|
|
||
| @Composable | ||
| fun Modifier.previewPlaceholder( | ||
| color: Color = LightGray, | ||
| shape: Shape? = null, | ||
| ): Modifier = if (LocalInspectionMode.current) { | ||
| if (shape != null) background(color, shape) else background(color) | ||
| } else { | ||
| this | ||
| } |
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
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
49 changes: 49 additions & 0 deletions
49
...arch/src/main/java/com/metasearch/android/feature/search/focusing/component/MoreButton.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,49 @@ | ||
| package com.metasearch.android.feature.search.focusing.component | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.clip | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.unit.dp | ||
| import com.metasearch.android.core.designsystem.annotation.ComponentPreview | ||
| import com.metasearch.android.core.designsystem.theme.LightPink | ||
| import com.metasearch.android.core.designsystem.theme.MetaSearchTheme | ||
| import com.metasearch.android.core.designsystem.theme.Neutral800 | ||
| import com.metasearch.android.feature.search.R | ||
|
|
||
| @Composable | ||
| fun MoreButton( | ||
| onClick: () -> Unit, | ||
| ) { | ||
| Box( | ||
| modifier = Modifier | ||
| .size(100.dp) | ||
| .clip(RoundedCornerShape(MetaSearchTheme.radius.sm)) | ||
| .background(Neutral800) | ||
| .clickable { onClick() }, | ||
| contentAlignment = Alignment.Center, | ||
| ) { | ||
| Text( | ||
| text = stringResource(R.string.focusing_search_more_button), | ||
| style = MetaSearchTheme.typography.labelMedium, | ||
| color = LightPink, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @ComponentPreview | ||
| @Composable | ||
| private fun MoreButtonPreview() { | ||
| MetaSearchTheme { | ||
| MoreButton( | ||
| onClick = {}, | ||
| ) | ||
| } | ||
| } |
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.
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.
Empty string fallback may cause invalid navigation.
When
getFileNamereturnsnull, the code navigates toGraphDetailScreenwith an emptyentityName, which would result in an invalid URL (e.g.,.../entityTripleGraph/dbName/). Consider showing an error or preventing navigation when the filename cannot be resolved.🐛 Proposed fix
is PhotoDetailUiEvent.OnGraphButtonClick -> { scope.launch { val fileName = galleryRepository.getFileName(screen.imageUriString.toUri()) - - navigator.goTo(GraphDetailScreen(entityName = fileName)) + if (fileName != null) { + navigator.goTo(GraphDetailScreen(entityName = fileName)) + } else { + toastMessage = "Unable to retrieve file information" + } } }🤖 Prompt for AI Agents