From f2aa70aa5fc58fe5e6941e20fc5cb058f8ec5388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E7=A9=BA?= <70465933+YuKongA@users.noreply.github.com> Date: Tue, 18 Jun 2024 22:06:05 +0800 Subject: [PATCH] app: Show original image when click on the little image --- .../top/yukonga/hq_icon/MainActivity.kt | 5 +- .../hq_icon/ui/components/ResultsView.kt | 51 ++++++++++++++++--- app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 6 files changed, 52 insertions(+), 8 deletions(-) diff --git a/app/src/main/kotlin/top/yukonga/hq_icon/MainActivity.kt b/app/src/main/kotlin/top/yukonga/hq_icon/MainActivity.kt index 4c9ad70..4c4a683 100644 --- a/app/src/main/kotlin/top/yukonga/hq_icon/MainActivity.kt +++ b/app/src/main/kotlin/top/yukonga/hq_icon/MainActivity.kt @@ -2,6 +2,7 @@ package top.yukonga.hq_icon import android.os.Build import android.os.Bundle +import android.widget.Toast import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge @@ -82,7 +83,7 @@ class MainActivity : ComponentActivity() { fun App() { val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(rememberTopAppBarState()) val fabOffsetHeight by animateDpAsState( - targetValue = if (scrollBehavior.state.contentOffset < 0) 80.dp + WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding() else 0.dp, + targetValue = if (scrollBehavior.state.contentOffset < -35) 80.dp + WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding() else 0.dp, animationSpec = tween(durationMillis = 300), label = "" ) @@ -157,10 +158,12 @@ private fun FloatActionButton( ) { val coroutineScope = rememberCoroutineScope() val hapticFeedback = LocalHapticFeedback.current + val searching = stringResource(R.string.searching) ExtendedFloatingActionButton( modifier = Modifier.offset(y = fabOffsetHeight), onClick = { + Toast.makeText(AppContext.context, searching, Toast.LENGTH_SHORT).show() hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress) coroutineScope.launch { if (term.value != "") { diff --git a/app/src/main/kotlin/top/yukonga/hq_icon/ui/components/ResultsView.kt b/app/src/main/kotlin/top/yukonga/hq_icon/ui/components/ResultsView.kt index e464ef4..dea7bb5 100644 --- a/app/src/main/kotlin/top/yukonga/hq_icon/ui/components/ResultsView.kt +++ b/app/src/main/kotlin/top/yukonga/hq_icon/ui/components/ResultsView.kt @@ -9,14 +9,17 @@ import androidx.compose.animation.shrinkVertically import androidx.compose.foundation.Image import androidx.compose.foundation.clickable import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.BasicAlertDialog import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -36,6 +39,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.DialogProperties import kotlinx.coroutines.delay import kotlinx.coroutines.launch import top.yukonga.hq_icon.R @@ -52,9 +56,11 @@ fun ResultsView(results: List, corner: String, resolution: Stri } } +@OptIn(ExperimentalMaterial3Api::class) @Composable fun ResultItemView(result: Response.Result, corner: String, resolution: String) { val isVisible = remember { mutableStateOf(false) } + val isDialogOpen = remember { mutableStateOf(false) } val coroutineScope = rememberCoroutineScope() val context = LocalContext.current val hapticFeedback = LocalHapticFeedback.current @@ -65,7 +71,8 @@ fun ResultItemView(result: Response.Result, corner: String, resolution: String) exit = fadeOut() + shrinkVertically() ) { Card( - modifier = Modifier.padding(bottom = 20.dp), + modifier = Modifier + .padding(bottom = 20.dp), shape = RoundedCornerShape(10.dp), colors = CardDefaults.cardColors( contentColor = MaterialTheme.colorScheme.onPrimaryContainer, @@ -73,12 +80,19 @@ fun ResultItemView(result: Response.Result, corner: String, resolution: String) ) ) { Row( - modifier = Modifier.padding(16.dp), + modifier = Modifier + .padding(16.dp), verticalAlignment = Alignment.CenterVertically ) { Image( - modifier = Modifier.size(58.dp), - bitmap = networkImage(url = result.artworkUrl512, corner = corner), + modifier = Modifier + .size(58.dp) + .clickable { isDialogOpen.value = true }, + bitmap = networkImage( + url = result.artworkUrl512, + corner = corner, + resolution = resolution.toInt() + ), contentDescription = null ) Column( @@ -122,6 +136,28 @@ fun ResultItemView(result: Response.Result, corner: String, resolution: String) } } } + + if (isDialogOpen.value) { + BasicAlertDialog( + onDismissRequest = { isDialogOpen.value = false }, + properties = DialogProperties(usePlatformDefaultWidth = false), + content = { + Box( + contentAlignment = Alignment.Center + ) { + Image( + bitmap = networkImage( + url = result.artworkUrl512, + corner = corner, + resolution = resolution.toInt() + ), + contentDescription = null + ) + } + } + ) + } + LaunchedEffect(result) { isVisible.value = false delay(300) @@ -142,13 +178,14 @@ fun MessageText(text: String, style: TextStyle) { } @Composable -fun networkImage(url: String, corner: String): ImageBitmap { - val bitmapState: MutableState = remember { mutableStateOf(Bitmap.createBitmap(512, 512, Bitmap.Config.ARGB_8888)) } +fun networkImage(url: String, corner: String, resolution: Int): ImageBitmap { + val bitmapState: MutableState = remember { mutableStateOf(Bitmap.createBitmap(resolution, resolution, Bitmap.Config.ARGB_8888)) } + val realUrl = url.replace("512x512bb.jpg", "${resolution}x${resolution}bb.png") val coroutineScope = rememberCoroutineScope() LaunchedEffect(url, corner) { coroutineScope.launch { - bitmapState.value = LoadIcon().loadIcon(url) + bitmapState.value = LoadIcon().loadIcon(realUrl) bitmapState.value = LoadIcon().roundCorners(bitmapState.value, corner) } } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ce62d5d..bd027b8 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -11,4 +11,5 @@ 下载 下载成功 下载失败 + 开始搜索… \ No newline at end of file diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index caa828d..f87ce45 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -11,4 +11,5 @@ 下載 下載成功 下載失敗 + 開始搜索… \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index b7e94f4..f906f56 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -11,4 +11,5 @@ 下載 下載成功 下載失敗 + 開始搜索… \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 183722c..c9c46be 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,4 +12,5 @@ Download Download successful Download failed + Searching… \ No newline at end of file