From cb39cc4edfe32713257bde709d3ab81c6e3d054e Mon Sep 17 00:00:00 2001 From: Acclorite <140836141+Acclorite@users.noreply.github.com> Date: Sat, 24 Aug 2024 19:20:05 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20New=20Credits=20and=20About=20op?= =?UTF-8?q?tions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added new credits and options in About screen. --- app/src/main/ICONS NOTICE.txt | 2 +- .../book_story/domain/util/Constants.kt | 29 +++++++++++++++--- .../presentation/screens/about/AboutScreen.kt | 4 +-- app/src/main/res/drawable/patreon.png | Bin 0 -> 1879 bytes app/src/main/res/values-uk/strings.xml | 6 +++- app/src/main/res/values/strings.xml | 12 +++++--- 6 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 app/src/main/res/drawable/patreon.png 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 0000000000000000000000000000000000000000..cd159d5f629f719909da9e838e3b210cb57b2b10 GIT binary patch literal 1879 zcmV-d2dMaoP) zd5jcA6o<{z;_5`{EU4dPIEKsMH(gyqsYz6)SHUfVFa5az(ly@Di{XXsz{2gA|~v z_VSB?lePCJ1(`Qy0uxn;stH1Xoq>~pYk(2JZV57cF)}<&2A&31SMvpa3m`+yjlkK! z?tXr;;m90um(CMyUYhEc0OF5d3f!c=dK!_n#^b=l>PdwrK!4yKU^K8(N{#Oz6ZH&W zyjyQ6Q{xYw3cL=SV~xL^Ivsw+OB&+l1Jw#3KQtD2URSM_9T}#!85)ED($mN3c-Pw+ zz9bS-c?LMT+?%`#An(5pxG!a1PPGhD7xl1GpZ6-jSeJdBMQS7+55#VazENggQ zI8Nu$b}9)VvHR-_w)!l!b9tdxR89c#bZ+TnJI_)ZvI%vb8v#bD=VS4obDfS|N`Sp} z!4=1yt2iJI&2Y*HFj5x~mSB)=+A}1q)0qI`E?r`yn}H(^PT$T17_R@c1dAk`4Jj5t zZjCW^><fF-1koo&7j6m*bqLxnfX(p_mlog^^@6qwuvdyM-UJo_?>p^qs*+g3 zL3;lrodenhu!k+eLnhwog};`u84#f%HHjwZdE$05T3WyoJWs0cPq6?t11@-^!pdWv z6@bdvMOfg}12+R3I{TqoPs&@$vqH1XmzR2%6(BgIxYJd@{BpmL38OGw3Te>lF|#UN zdd82kTb3P|3tRxqabp%MfPXY=3A6KouibuYRtub3YNJ8xXH4~4-ZHDzWi8bq#rs~= zMb=N%e1jFBI@ampYLZ4bJ=KXTB&)TREtQc-=8wSJI@B!jWBwEYHe2JDq)F>af2J|~ z`PG)EEJaoeSX=&Qt5#QE3Vfl%%XeBIG?4XD)=P=Sgt9>^rq9zJzDx}sig%bT+?`1g zo3%RnyShoTJgT8MtFBa9Sfi8Zt2(?yKKy1iMXoL3fw^^>i7;7*n5x}Izi|X;NoaOl ztJZU#pq`9zfk#JxtqBxhy%rgqWU{B1)!TDR!s>v258ME}XFyxZlF{AzzYT7qS0oa7 zVH}K)3b0Y{f+Qdl>}6WdKNe(k`0;gl9TBpEz1B-C-UOTtnZ}qKUjmA^1D_hu7Ed_7 zzpsyGihwD=%W-VDBf!cS?+esxaqJcY+Ts~UfX0{x<+kZFTUHs+ma1?B_&uf*@kjd1 zme}G5Ag<^SF}sK@x)&Sk4JAi_R^5b%6Cb$Ey)l`>2xxs!PYex!E&6MQmX3b49d7Oz3bUHV*7vN;L`Xwrulo6aIPNw0CCco%Ge;p1vvGtm;0NKh<5 zy{?K)MN&lGG`M}9DHdR@-UX&IH6fAPc8UeaYX+E!8PgJOm}Wpbe5JEYh=qo(ir>(! z#zfJX0Ba1~&XZWx3kI~qcS_{~O)qt8bA~25rM;3$rG(r$5pH%b(6K+! zR1%<7_gt5SYy|PZ?v7D-ylUK}q|5QkJBteq1xQ{?yL@Pjl>)@=nShzV10kKNe+_sv zEj29M3Lsv{BfwJu8%E}w@gd%Ak(2e%fF@1<%WDp%m(RLEjDKaEb9}17>#-zB0l5{p zP1D-_piR$gjn#wDsiK;5Va=KfI7WMIE%U-JTF&c=wDo+4x?HX%Pfx1ujsh+Mj?qWq zR-#2yA!TQ4N(3&hQPe7cLl1of?g)JlbU%G6cNZOEoHGbZ3ql;J8*VxP{0Hbyf4+S| R(@6jT002ovPDHLkV1i1?QtJQ! literal 0 HcmV?d00001 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