diff --git a/app/src/main/java/me/ash/reader/ui/component/reader/HtmlToComposable.kt b/app/src/main/java/me/ash/reader/ui/component/reader/HtmlToComposable.kt index 17d10ce..da8c1f1 100644 --- a/app/src/main/java/me/ash/reader/ui/component/reader/HtmlToComposable.kt +++ b/app/src/main/java/me/ash/reader/ui/component/reader/HtmlToComposable.kt @@ -39,6 +39,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.RectangleShape import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontStyle @@ -601,7 +602,7 @@ private fun TextComposer.appendTextChildren( .fillMaxWidth(), data = video.imageUrl, size = maxImageSize(), - contentDescription = "点击播放视频", + contentDescription = stringResource(R.string.touch_to_play_video), precision = Precision.INEXACT, contentScale = ContentScale.FillWidth, ) @@ -614,7 +615,7 @@ private fun TextComposer.appendTextChildren( modifier = Modifier .fillMaxWidth() .padding(horizontal = PADDING_HORIZONTAL.dp), - text = "点击播放视频", + text = stringResource(R.string.touch_to_play_video), style = captionStyle(), ) diff --git a/app/src/main/java/me/ash/reader/ui/ext/ScrollbarsExt.kt b/app/src/main/java/me/ash/reader/ui/ext/ScrollbarsExt.kt index 1f24737..ce85a11 100644 --- a/app/src/main/java/me/ash/reader/ui/ext/ScrollbarsExt.kt +++ b/app/src/main/java/me/ash/reader/ui/ext/ScrollbarsExt.kt @@ -27,7 +27,6 @@ package me.ash.reader.ui.ext */ import android.view.ViewConfiguration -import androidx.compose.animation.animateContentSize import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.tween import androidx.compose.foundation.ScrollState @@ -89,7 +88,7 @@ fun Modifier.drawHorizontalScrollbar( fun Modifier.drawVerticalScrollbar( state: LazyListState, reverseScrolling: Boolean = false -): Modifier = drawScrollbar(state, Orientation.Vertical, reverseScrolling).animateContentSize() +): Modifier = drawScrollbar(state, Orientation.Vertical, reverseScrolling) private fun Modifier.drawScrollbar( state: ScrollState, diff --git a/app/src/main/java/me/ash/reader/ui/page/home/read/ReadPage.kt b/app/src/main/java/me/ash/reader/ui/page/home/read/ReadPage.kt index c2a5e7b..05ac6e2 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/read/ReadPage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/read/ReadPage.kt @@ -163,7 +163,7 @@ private fun TopBar( FeedbackIconButton( modifier = Modifier.size(20.dp), imageVector = Icons.Outlined.Share, - contentDescription = stringResource(R.string.search), + contentDescription = stringResource(R.string.share), tint = MaterialTheme.colorScheme.onSurface, ) { context.startActivity(Intent.createChooser(Intent(Intent.ACTION_SEND).apply { @@ -172,7 +172,7 @@ private fun TopBar( title?.takeIf { it.isNotBlank() }?.let { it + "\n" } + link ) type = "text/plain" - }, "Share")) + }, context.getString(R.string.share))) } } ) diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index aa1ce44..9356ce5 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -168,4 +168,6 @@ Das farbliche Hervorheben der oberen Leiste ist nur beim Scrollen verfügbar. Das farbliche Hervorheben der Artikelliste ist nur für das helle Design verfügbar. Das farbliche Hervorheben der Gruppenliste ist nur für das helle Design verfügbar. + Aktie + Berühren, um Video abzuspielen \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 47336fb..42c0b0a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -165,4 +165,6 @@ 标题栏的色调海拔仅在滚动时可用。 文章列表的色调海拔仅在亮色主题时可用。 分组列表的色调海拔仅在亮色主题时可用。 + 分享 + 轻触播放视频 \ 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 b68273a..0c8a45c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -175,4 +175,6 @@ Tone elevation of the top bar is only available when scrolling. Tone elevation of the article list is only available for light theme. Tone elevation of the group list is only available for light theme. + Share + Touch to play video \ No newline at end of file