From ff4f21836308ea9844f82a87da329653e8984f31 Mon Sep 17 00:00:00 2001 From: Sasikanth Miriyampalli Date: Fri, 26 Jul 2024 08:48:01 +0530 Subject: [PATCH] Add content description for buttons in `ReaderScreen` --- .../reader/resources/strings/DeTwineStrings.kt | 1 + .../reader/resources/strings/EnTwineStrings.kt | 1 + .../reader/resources/strings/TrTwineStrings.kt | 1 + .../rss/reader/resources/strings/TwineStrings.kt | 1 + .../reader/resources/strings/ZhTwineStrings.kt | 1 + .../rss/reader/reader/ui/ReaderScreen.kt | 15 ++++++++++----- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/DeTwineStrings.kt b/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/DeTwineStrings.kt index d615e3c2d..a77fb3e5e 100644 --- a/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/DeTwineStrings.kt +++ b/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/DeTwineStrings.kt @@ -164,4 +164,5 @@ val DeTwineStrings = noPinnedSources = "No pinned feeds/groups", databaseMaintainenceTitle = "Please wait...", databaseMaintainenceSubtitle = "Performing database maintainence, don't close the app", + cdLoadFullArticle = "Load full article", ) diff --git a/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/EnTwineStrings.kt b/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/EnTwineStrings.kt index 3c943d7f6..e4ba6b336 100644 --- a/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/EnTwineStrings.kt +++ b/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/EnTwineStrings.kt @@ -171,4 +171,5 @@ val EnTwineStrings = noPinnedSources = "No pinned feeds/groups", databaseMaintainenceTitle = "Please wait...", databaseMaintainenceSubtitle = "Performing database maintainence, don't close the app", + cdLoadFullArticle = "Load full article", ) diff --git a/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/TrTwineStrings.kt b/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/TrTwineStrings.kt index 0102a419f..6fd107ab6 100644 --- a/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/TrTwineStrings.kt +++ b/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/TrTwineStrings.kt @@ -160,4 +160,5 @@ val TrTwineStrings = noPinnedSources = "Sabitlenmiş yayın/grup yok", databaseMaintainenceTitle = "Lütfen bekleyin...", databaseMaintainenceSubtitle = "Veritabanı bakımı gerçekleştiriliyor, uygulamayı kapatmayın", + cdLoadFullArticle = "Load full article", ) diff --git a/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/TwineStrings.kt b/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/TwineStrings.kt index 5affd741d..30922c6ae 100644 --- a/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/TwineStrings.kt +++ b/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/TwineStrings.kt @@ -151,6 +151,7 @@ data class TwineStrings( val noPinnedSources: String, val databaseMaintainenceTitle: String, val databaseMaintainenceSubtitle: String, + val cdLoadFullArticle: String, ) object Locales { diff --git a/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/ZhTwineStrings.kt b/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/ZhTwineStrings.kt index 80f26cab5..ea25bd3ad 100644 --- a/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/ZhTwineStrings.kt +++ b/resources/strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/ZhTwineStrings.kt @@ -151,4 +151,5 @@ val ZhTwineStrings = noPinnedSources = "没有置顶的订阅/分组", databaseMaintainenceTitle = "请稍候...", databaseMaintainenceSubtitle = "正在进行数据库维护，请勿关闭应用", + cdLoadFullArticle = "Load full article", ) diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderScreen.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderScreen.kt index 8ca78bf13..4e5e3b01f 100644 --- a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderScreen.kt +++ b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderScreen.kt @@ -66,6 +66,7 @@ import dev.sasikanth.rss.reader.resources.icons.Bookmarked import dev.sasikanth.rss.reader.resources.icons.Share import dev.sasikanth.rss.reader.resources.icons.TwineIcons import dev.sasikanth.rss.reader.resources.icons.Website +import dev.sasikanth.rss.reader.resources.strings.LocalStrings import dev.sasikanth.rss.reader.share.LocalShareHandler import dev.sasikanth.rss.reader.ui.AppTheme import dev.sasikanth.rss.reader.util.DispatchersProvider @@ -92,7 +93,7 @@ internal fun ReaderScreen( title = {}, navigationIcon = { IconButton(onClick = { presenter.dispatch(ReaderEvent.BackClicked) }) { - Icon(TwineIcons.ArrowBack, contentDescription = null) + Icon(TwineIcons.ArrowBack, contentDescription = LocalStrings.current.buttonGoBack) } }, colors = @@ -130,7 +131,7 @@ internal fun ReaderScreen( TwineIcons.Bookmark } IconButton(onClick = { presenter.dispatch(ReaderEvent.TogglePostBookmark) }) { - Icon(bookmarkIcon, contentDescription = null) + Icon(bookmarkIcon, contentDescription = LocalStrings.current.bookmark) } } @@ -159,7 +160,11 @@ internal fun ReaderScreen( coroutineScope.launch { presenter.dispatch(ReaderEvent.ArticleShortcutClicked) } } ) { - Icon(TwineIcons.ArticleShortcut, contentDescription = null, tint = iconTint) + Icon( + TwineIcons.ArticleShortcut, + contentDescription = LocalStrings.current.cdLoadFullArticle, + tint = iconTint + ) } } InProgress -> { @@ -176,14 +181,14 @@ internal fun ReaderScreen( Icon( modifier = Modifier.requiredSize(24.dp), imageVector = TwineIcons.Website, - contentDescription = null + contentDescription = LocalStrings.current.openWebsite ) } } Box(Modifier.weight(1f), contentAlignment = Alignment.Center) { IconButton(onClick = { coroutineScope.launch { sharedHandler.share(state.link!!) } }) { - Icon(TwineIcons.Share, contentDescription = null) + Icon(TwineIcons.Share, contentDescription = LocalStrings.current.share) } } }