diff --git a/app/src/main/ICONS NOTICE.txt b/app/src/main/ICONS NOTICE.txt index ec301107..a4efa1dd 100644 --- a/app/src/main/ICONS NOTICE.txt +++ b/app/src/main/ICONS NOTICE.txt @@ -1,4 +1,4 @@ -Almost all Icons are licensed under Apache License 2.0 and were taken from Material Design Icons. +Almost all Icons, except Brand Icons (e.g. Reddit, Patreon, X) are licensed under Apache License 2.0 and were taken from Material Design Icons. https://www.apache.org/licenses/LICENSE-2.0.html https://fonts.google.com/icons \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/domain/util/Constants.kt b/app/src/main/java/ua/acclorite/book_story/domain/util/Constants.kt index 1f9dfd99..915584a9 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/util/Constants.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/util/Constants.kt @@ -119,6 +119,7 @@ private fun provideCredits() = listOf( source = "GitHub", credits = listOf( UIText.StringResource(R.string.credits_design), + UIText.StringResource(R.string.credits_ideas), UIText.StringValue("Readme") ), website = "https://www.github.com/mihonapp/mihon" @@ -127,7 +128,8 @@ private fun provideCredits() = listOf( name = "Kitsune", source = "GitHub", credits = listOf( - UIText.StringResource(R.string.credits_updates) + UIText.StringResource(R.string.credits_updates), + UIText.StringResource(R.string.credits_ideas) ), website = "https://www.github.com/Drumber/Kitsune" ), @@ -139,6 +141,23 @@ private fun provideCredits() = listOf( ), website = "https://fonts.google.com/icons" ), + Credit( + name = "Material Design Fonts", + source = "Google Fonts", + credits = listOf( + UIText.StringResource(R.string.credits_fonts) + ), + website = "https://fonts.google.com" + ), + Credit( + name = "Weblate", + source = "Hosted Weblate", + credits = listOf( + UIText.StringResource(R.string.credits_translation), + UIText.StringResource(R.string.credits_contribution) + ), + website = "https://hosted.weblate.org/projects/book-story" + ), ) private fun provideHelpTips() = listOf( @@ -393,11 +412,11 @@ private fun provideAboutBadges() = listOf( url = null ), Badge( - id = "github_project", - drawable = R.drawable.github, + id = "patreon", + drawable = R.drawable.patreon, imageVector = null, - contentDescription = R.string.github_project_content_desc, - url = "https://www.github.com/Acclorite/book-story" + contentDescription = R.string.patreon_content_desc, + url = "https://www.patreon.com/Acclorite" ), Badge( id = "github_profile", 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 44b1877b..6f70fabf 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 @@ -243,12 +243,12 @@ private fun AboutScreen( item { AboutItem( - title = stringResource(id = R.string.support_option), + title = stringResource(id = R.string.help_translate_option), description = null ) { onEvent( AboutEvent.OnNavigateToBrowserPage( - context.getString(R.string.support_page), + context.getString(R.string.translation_page), context, noAppsFound = { Toast.makeText( diff --git a/app/src/main/res/drawable/patreon.png b/app/src/main/res/drawable/patreon.png new file mode 100644 index 00000000..cd159d5f Binary files /dev/null and b/app/src/main/res/drawable/patreon.png differ diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 3c2e2ff7..fbe09d73 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -351,15 +351,19 @@ Натисніть, щоб перевірити на оновлення Повідомити про помилку Що нового - Підтримати мою роботу Ліцензії з відкритим кодом Заслуги + Допомогти перекласти Слава Україні! Дизайн Іконки Керування новими оновленнями + Шрифти + Переклад + Внесок + Ідеї Будь ласка, зверніть увагу, що на diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2f006da0..3cfc2582 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,8 +20,8 @@ https://www.github.com/Acclorite/book-story/issues - - https://www.buymeacoffee.com/acclorite + + https://hosted.weblate.org/projects/book-story @@ -370,15 +370,19 @@ Click to check for updates Report a bug What\'s new - Support my work Open source licenses Credits + Help translate Slava Ukraini! Design Icons New updates managing + Fonts + Translation + Contribution + Ideas Please note, that @@ -609,8 +613,8 @@ Shuffle colors X Reddit + Patreon Tryzub - GitHub Project GitHub Profile Drag Filter