diff --git a/app/src/main/java/ua/acclorite/book_story/domain/model/Credit.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/Credit.kt index ea783d69..b6fa387f 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/model/Credit.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/model/Credit.kt @@ -6,7 +6,7 @@ import ua.acclorite.book_story.domain.util.UIText @Immutable data class Credit( val name: String, - val source: String, + val source: String?, val credits: List, - val website: String + val website: String? ) 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 c78fb11a..088df6a7 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 @@ -91,6 +91,15 @@ object Constants { ), website = "https://github.com/Drumber/Kitsune" ), + Credit( + name = "Crocus", + source = null, + credits = listOf( + UIText.StringResource(R.string.credits_motivation), + UIText.StringValue("UwU") + ), + website = null + ), Credit( name = "Freepik", source = "Flaticon", diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/credits/CreditsScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/credits/CreditsScreen.kt index a45ac87e..e093ebaf 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/credits/CreditsScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/credits/CreditsScreen.kt @@ -80,19 +80,21 @@ private fun CreditsScreen( ) { customItems(Constants.CREDITS, key = { it.name }) { CreditItem(credit = it) { - onAboutNavigateEvent( - AboutEvent.OnNavigateToBrowserPage( - page = it.website, - context = context, - noAppsFound = { - Toast.makeText( - context, - context.getString(R.string.error_no_browser), - Toast.LENGTH_SHORT - ).show() - } + it.website?.let { website -> + onAboutNavigateEvent( + AboutEvent.OnNavigateToBrowserPage( + page = website, + context = context, + noAppsFound = { + Toast.makeText( + context, + context.getString(R.string.error_no_browser), + Toast.LENGTH_SHORT + ).show() + } + ) ) - ) + } } } } diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/credits/components/CreditItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/credits/components/CreditItem.kt index 98257077..b1020517 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/credits/components/CreditItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/credits/components/CreditItem.kt @@ -40,7 +40,7 @@ fun CreditItem( Column( modifier = Modifier .fillMaxWidth() - .clickable { onClick.invoke() } + .clickable(enabled = credit.website != null) { onClick.invoke() } .padding(vertical = verticalPadding, horizontal = horizontalPadding) ) { Text( @@ -51,11 +51,13 @@ fun CreditItem( overflow = TextOverflow.Ellipsis ) - Text( - text = credit.source, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant - ) + credit.source?.let { + Text( + text = it, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } if (credit.credits.isNotEmpty()) { Spacer(modifier = Modifier.height(6.dp)) diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index f5914822..6ac4e264 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -99,7 +99,7 @@ Немає опису. - Щось пішло не так. + Який жах! Щось пішло не так. Щось пішло не так. Будь ласка, перевірте чи файл цієї книги не пошкоджений. @@ -351,6 +351,7 @@ Дизайн Іконки Керування новими оновленнями + Мотивація Будь ласка, зверніть увагу, що на diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 732eca48..cccb5345 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -371,6 +371,7 @@ Design Icons New updates managing + Motivation Please note, that