-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #124 from kaleidot725/feature/rework_screenshot
feat: rework gallery ui
- Loading branch information
Showing
10 changed files
with
232 additions
and
176 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains 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 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 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 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
101 changes: 101 additions & 0 deletions
101
...jvmMain/kotlin/jp/kaleidot725/adbpad/ui/screen/screenshot/component/ScreenshotExplorer.kt
This file contains 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,101 @@ | ||
| package jp.kaleidot725.adbpad.ui.screen.screenshot.component | ||
|
|
||
| import androidx.compose.foundation.VerticalScrollbar | ||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.fillMaxHeight | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.foundation.lazy.LazyColumn | ||
| import androidx.compose.foundation.lazy.items | ||
| import androidx.compose.foundation.lazy.rememberLazyListState | ||
| import androidx.compose.foundation.rememberScrollbarAdapter | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.input.key.Key | ||
| import androidx.compose.ui.input.key.KeyEventType | ||
| import androidx.compose.ui.input.key.key | ||
| import androidx.compose.ui.input.key.onKeyEvent | ||
| import androidx.compose.ui.input.key.type | ||
| import androidx.compose.ui.unit.dp | ||
| import coil3.compose.AsyncImage | ||
| import jp.kaleidot725.adbpad.domain.model.screenshot.Screenshot | ||
| import jp.kaleidot725.adbpad.ui.common.resource.clickableBackground | ||
|
|
||
| @Composable | ||
| fun ScreenshotExplorer( | ||
| selectedScreenshot: Screenshot, | ||
| screenshots: List<Screenshot>, | ||
| onSelectScreenShot: (Screenshot) -> Unit, | ||
| onNextScreenshot: () -> Unit, | ||
| onPreviousScreenshot: () -> Unit, | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| Box(modifier) { | ||
| if (screenshots.isNotEmpty()) { | ||
| val lazyColumnState = rememberLazyListState() | ||
| LazyColumn( | ||
| state = lazyColumnState, | ||
| modifier = | ||
| Modifier.onKeyEvent { event -> | ||
| when { | ||
| event.key == Key.DirectionUp && event.type == KeyEventType.KeyDown -> { | ||
| onPreviousScreenshot() | ||
| true | ||
| } | ||
| event.key == Key.DirectionDown && event.type == KeyEventType.KeyDown -> { | ||
| onNextScreenshot() | ||
| true | ||
| } | ||
| else -> false | ||
| } | ||
| }, | ||
| ) { | ||
| items( | ||
| items = screenshots, | ||
| key = { screenshot -> screenshot.file?.absolutePath ?: "" }, | ||
| ) { screenshot -> | ||
| Row( | ||
| modifier = | ||
| Modifier | ||
| .fillMaxWidth() | ||
| .clickableBackground( | ||
| isSelected = selectedScreenshot == screenshot, | ||
| shape = RoundedCornerShape(4.dp), | ||
| ) | ||
| .clickable { onSelectScreenShot(screenshot) } | ||
| .padding(horizontal = 12.dp, vertical = 4.dp), | ||
| horizontalArrangement = Arrangement.spacedBy(4.dp), | ||
| ) { | ||
| AsyncImage( | ||
| model = screenshot.file, | ||
| contentDescription = null, | ||
| modifier = Modifier.size(24.dp), | ||
| ) | ||
|
|
||
| Text( | ||
| text = screenshot.file?.name ?: "", | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| VerticalScrollbar( | ||
| modifier = Modifier.align(Alignment.CenterEnd).width(8.dp).fillMaxHeight(), | ||
| adapter = rememberScrollbarAdapter(scrollState = lazyColumnState), | ||
| ) | ||
| } else { | ||
| Text( | ||
| text = "Not Found Screenshot", | ||
| modifier = Modifier.align(Alignment.Center), | ||
| ) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.