From 3c2b23db08712609c26568c95c699f228476beec Mon Sep 17 00:00:00 2001 From: Acclorite <140836141+Acclorite@users.noreply.github.com> Date: Mon, 23 Sep 2024 08:29:49 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20Contributors=20in=20About?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added "Contributors" option in About, which navigates to github's contributors page --- .../presentation/core/constants/Constants.kt | 21 +++++++------------ .../presentation/screens/about/AboutScreen.kt | 19 +++++++++++++++++ app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/Constants.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/Constants.kt index 56c73f53..565c9960 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/Constants.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/Constants.kt @@ -73,10 +73,12 @@ object Constants { val SECONDARY_SCROLLBAR @Composable get() = provideSecondaryScrollbar() // Links - val DOWNLOAD_LATEST_RELEASE_PAGE = provideDownloadLatestReleasePage() - val RELEASES_PAGE = provideReleasesPage() - val ISSUES_PAGE = provideIssuesPage() - val TRANSLATION_PAGE = provideTranslationPage() + const val DOWNLOAD_LATEST_RELEASE_PAGE = + "https://www.github.com/Acclorite/book-story/releases/latest/download/book-story.apk" + const val RELEASES_PAGE = "https://www.github.com/Acclorite/book-story/releases/latest" + const val ISSUES_PAGE = "https://www.github.com/Acclorite/book-story/issues" + const val CONTRIBUTORS_PAGE = "https://github.com/Acclorite/book-story/graphs/contributors" + const val TRANSLATION_PAGE = "https://hosted.weblate.org/projects/book-story" } private fun provideSupportedExtensions() = listOf( @@ -615,13 +617,4 @@ private fun provideSecondaryScrollbar() = ScrollbarSettings( thumbShape = RectangleShape, hideDisplacement = 0.dp, scrollbarPadding = 0.dp -) - -private fun provideDownloadLatestReleasePage() = - "https://www.github.com/Acclorite/book-story/releases/latest/download/book-story.apk" - -private fun provideReleasesPage() = "https://www.github.com/Acclorite/book-story/releases/latest" - -private fun provideIssuesPage() = "https://www.github.com/Acclorite/book-story/issues" - -private fun provideTranslationPage() = "https://hosted.weblate.org/projects/book-story" \ No newline at end of file +) \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/AboutScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/AboutScreen.kt index 80f4c9af..d3e92904 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/AboutScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/AboutScreen.kt @@ -170,6 +170,25 @@ private fun AboutScreen() { } } + + item { + AboutItem( + title = stringResource(id = R.string.contributors_option), + description = null + ) { + onEvent( + AboutEvent.OnNavigateToBrowserPage( + Constants.CONTRIBUTORS_PAGE, + context, + noAppsFound = { + context.getString(R.string.error_no_browser) + .showToast(context = context, longToast = false) + } + ) + ) + } + } + item { AboutItem( title = stringResource(id = R.string.whats_new_option), diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 0259cb75..b112e5fc 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -395,6 +395,7 @@ Ліцензії з відкритим кодом Заслуги Допомогти перекласти + Контриб\'ютори Слава Україні! diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1762bd7e..8ff6a501 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -396,6 +396,7 @@ Open source licenses Credits Help translate + Contributors Slava Ukraini!