diff --git a/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderImagesAlignment.kt b/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderImagesAlignment.kt new file mode 100644 index 00000000..5901306b --- /dev/null +++ b/app/src/main/java/ua/acclorite/book_story/domain/reader/ReaderImagesAlignment.kt @@ -0,0 +1,13 @@ +package ua.acclorite.book_story.domain.reader + +import androidx.compose.ui.Alignment + +enum class ReaderImagesAlignment(val alignment: Alignment) { + START(Alignment.CenterStart), + CENTER(Alignment.Center), + END(Alignment.CenterEnd) +} + +fun String.toImagesAlignment(): ReaderImagesAlignment { + return ReaderImagesAlignment.valueOf(this) +} \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/DataStoreConstants.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/DataStoreConstants.kt index bd850950..d9c07cde 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/DataStoreConstants.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/DataStoreConstants.kt @@ -50,6 +50,7 @@ object DataStoreConstants { val CHAPTER_TITLE_ALIGNMENT = stringPreferencesKey("chapter_title_alignment") val IMAGES = booleanPreferencesKey("images") val IMAGES_CORNERS_ROUNDNESS = intPreferencesKey("images_corners_roundness") + val IMAGES_ALIGNMENT = stringPreferencesKey("images_alignment") // Browse settings val BROWSE_FILES_STRUCTURE = stringPreferencesKey("browse_files_structure") diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderContent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderContent.kt index 63210f7e..8bdba2c1 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderContent.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderContent.kt @@ -15,6 +15,7 @@ import ua.acclorite.book_story.domain.library.book.Book import ua.acclorite.book_story.domain.reader.Checkpoint import ua.acclorite.book_story.domain.reader.FontWithName import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture +import ua.acclorite.book_story.domain.reader.ReaderImagesAlignment import ua.acclorite.book_story.domain.reader.ReaderText import ua.acclorite.book_story.domain.reader.ReaderText.Chapter import ua.acclorite.book_story.domain.reader.ReaderTextAlignment @@ -57,6 +58,7 @@ fun ReaderContent( fontColor: Color, images: Boolean, imagesCornersRoundness: Dp, + imagesAlignment: ReaderImagesAlignment, fontFamily: FontWithName, lineHeight: TextUnit, fontStyle: FontStyle, @@ -124,6 +126,7 @@ fun ReaderContent( fontColor = fontColor, images = images, imagesCornersRoundness = imagesCornersRoundness, + imagesAlignment = imagesAlignment, fontFamily = fontFamily, lineHeight = lineHeight, fontStyle = fontStyle, diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayout.kt index b662f6d2..22c8ea3c 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayout.kt @@ -23,6 +23,7 @@ import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.reader.FontWithName import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture +import ua.acclorite.book_story.domain.reader.ReaderImagesAlignment import ua.acclorite.book_story.domain.reader.ReaderText import ua.acclorite.book_story.domain.reader.ReaderTextAlignment import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar @@ -50,6 +51,7 @@ fun ReaderLayout( fontColor: Color, images: Boolean, imagesCornersRoundness: Dp, + imagesAlignment: ReaderImagesAlignment, fontFamily: FontWithName, lineHeight: TextUnit, fontStyle: FontStyle, @@ -167,6 +169,7 @@ fun ReaderLayout( showMenu = showMenu, entry = entry, imagesCornersRoundness = imagesCornersRoundness, + imagesAlignment = imagesAlignment, fontFamily = fontFamily, fontColor = fontColor, lineHeight = lineHeight, diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutText.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutText.kt index 02c5cc12..6e46f2bb 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutText.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutText.kt @@ -10,6 +10,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.TextUnit import ua.acclorite.book_story.domain.reader.FontWithName +import ua.acclorite.book_story.domain.reader.ReaderImagesAlignment import ua.acclorite.book_story.domain.reader.ReaderText import ua.acclorite.book_story.domain.reader.ReaderTextAlignment import ua.acclorite.book_story.ui.reader.ReaderEvent @@ -20,6 +21,7 @@ fun LazyItemScope.ReaderLayoutText( showMenu: Boolean, entry: ReaderText, imagesCornersRoundness: Dp, + imagesAlignment: ReaderImagesAlignment, fontFamily: FontWithName, fontColor: Color, lineHeight: TextUnit, @@ -44,7 +46,8 @@ fun LazyItemScope.ReaderLayoutText( ReaderLayoutTextImage( entry = entry, sidePadding = sidePadding, - imagesCornersRoundness = imagesCornersRoundness + imagesCornersRoundness = imagesCornersRoundness, + imagesAlignment = imagesAlignment ) } diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextImage.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextImage.kt index 1729b519..561e5ada 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextImage.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextImage.kt @@ -1,6 +1,7 @@ package ua.acclorite.book_story.presentation.reader import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyItemScope @@ -8,27 +9,31 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.unit.Dp +import ua.acclorite.book_story.domain.reader.ReaderImagesAlignment import ua.acclorite.book_story.domain.reader.ReaderText @Composable fun LazyItemScope.ReaderLayoutTextImage( entry: ReaderText.Image, sidePadding: Dp, - imagesCornersRoundness: Dp + imagesCornersRoundness: Dp, + imagesAlignment: ReaderImagesAlignment ) { - Image( + Box( modifier = Modifier .animateItem( fadeInSpec = null, fadeOutSpec = null ) .padding(horizontal = sidePadding) - .clip(RoundedCornerShape(imagesCornersRoundness)) .fillMaxWidth(), - bitmap = entry.imageBitmap, - contentDescription = null, - contentScale = ContentScale.FillWidth - ) + contentAlignment = imagesAlignment.alignment + ) { + Image( + modifier = Modifier.clip(RoundedCornerShape(imagesCornersRoundness)), + bitmap = entry.imageBitmap, + contentDescription = null + ) + } } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScaffold.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScaffold.kt index 81a9f366..db72a8bb 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScaffold.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScaffold.kt @@ -23,6 +23,7 @@ import ua.acclorite.book_story.domain.library.book.Book import ua.acclorite.book_story.domain.reader.Checkpoint import ua.acclorite.book_story.domain.reader.FontWithName import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture +import ua.acclorite.book_story.domain.reader.ReaderImagesAlignment import ua.acclorite.book_story.domain.reader.ReaderText import ua.acclorite.book_story.domain.reader.ReaderText.Chapter import ua.acclorite.book_story.domain.reader.ReaderTextAlignment @@ -61,6 +62,7 @@ fun ReaderScaffold( fontColor: Color, images: Boolean, imagesCornersRoundness: Dp, + imagesAlignment: ReaderImagesAlignment, fontFamily: FontWithName, lineHeight: TextUnit, fontStyle: FontStyle, @@ -155,6 +157,7 @@ fun ReaderScaffold( fontColor = fontColor, images = images, imagesCornersRoundness = imagesCornersRoundness, + imagesAlignment = imagesAlignment, fontFamily = fontFamily, lineHeight = lineHeight, fontStyle = fontStyle, diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt index 8b886e34..37049372 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt @@ -23,10 +23,10 @@ fun ChapterTitleAlignmentOption() { ButtonItem( id = it.toString(), title = when (it) { - ReaderTextAlignment.START -> stringResource(id = R.string.text_alignment_start) - ReaderTextAlignment.JUSTIFY -> stringResource(id = R.string.text_alignment_justify) - ReaderTextAlignment.CENTER -> stringResource(id = R.string.text_alignment_center) - ReaderTextAlignment.END -> stringResource(id = R.string.text_alignment_end) + ReaderTextAlignment.START -> stringResource(id = R.string.alignment_start) + ReaderTextAlignment.JUSTIFY -> stringResource(id = R.string.alignment_justify) + ReaderTextAlignment.CENTER -> stringResource(id = R.string.alignment_center) + ReaderTextAlignment.END -> stringResource(id = R.string.alignment_end) }, textStyle = MaterialTheme.typography.labelLarge, selected = it == state.value.chapterTitleAlignment diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/ImagesSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/ImagesSubcategory.kt index 486204cd..9a743dab 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/ImagesSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/ImagesSubcategory.kt @@ -9,6 +9,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory +import ua.acclorite.book_story.presentation.settings.reader.images.components.ImagesAlignmentOption import ua.acclorite.book_story.presentation.settings.reader.images.components.ImagesCornersRoundnessOption import ua.acclorite.book_story.presentation.settings.reader.images.components.ImagesOption @@ -31,5 +32,9 @@ fun LazyListScope.ImagesSubcategory( item { ImagesCornersRoundnessOption() } + + item { + ImagesAlignmentOption() + } } } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesAlignmentOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesAlignmentOption.kt new file mode 100644 index 00000000..63138660 --- /dev/null +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesAlignmentOption.kt @@ -0,0 +1,45 @@ +package ua.acclorite.book_story.presentation.settings.reader.images.components + +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.res.stringResource +import androidx.hilt.navigation.compose.hiltViewModel +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import ua.acclorite.book_story.R +import ua.acclorite.book_story.domain.reader.ReaderImagesAlignment +import ua.acclorite.book_story.domain.ui.ButtonItem +import ua.acclorite.book_story.presentation.core.components.settings.SegmentedButtonWithTitle +import ua.acclorite.book_story.ui.main.MainEvent +import ua.acclorite.book_story.ui.main.MainModel +import ua.acclorite.book_story.ui.theme.ExpandingTransition + +@Composable +fun ImagesAlignmentOption() { + val mainModel = hiltViewModel() + val state = mainModel.state.collectAsStateWithLifecycle() + + ExpandingTransition(visible = state.value.images) { + SegmentedButtonWithTitle( + title = stringResource(id = R.string.images_alignment_option), + buttons = ReaderImagesAlignment.entries.map { + ButtonItem( + id = it.toString(), + title = when (it) { + ReaderImagesAlignment.START -> stringResource(id = R.string.alignment_start) + ReaderImagesAlignment.CENTER -> stringResource(id = R.string.alignment_center) + ReaderImagesAlignment.END -> stringResource(id = R.string.alignment_end) + }, + textStyle = MaterialTheme.typography.labelLarge, + selected = it == state.value.imagesAlignment + ) + }, + onClick = { + mainModel.onEvent( + MainEvent.OnChangeImagesAlignment( + it.id + ) + ) + } + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/TextAlignmentOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/TextAlignmentOption.kt index 09d92764..c3a1ddc1 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/TextAlignmentOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/TextAlignmentOption.kt @@ -23,10 +23,10 @@ fun TextAlignmentOption() { ButtonItem( id = it.toString(), title = when (it) { - ReaderTextAlignment.START -> stringResource(id = R.string.text_alignment_start) - ReaderTextAlignment.JUSTIFY -> stringResource(id = R.string.text_alignment_justify) - ReaderTextAlignment.CENTER -> stringResource(id = R.string.text_alignment_center) - ReaderTextAlignment.END -> stringResource(id = R.string.text_alignment_end) + ReaderTextAlignment.START -> stringResource(id = R.string.alignment_start) + ReaderTextAlignment.JUSTIFY -> stringResource(id = R.string.alignment_justify) + ReaderTextAlignment.CENTER -> stringResource(id = R.string.alignment_center) + ReaderTextAlignment.END -> stringResource(id = R.string.alignment_end) }, textStyle = MaterialTheme.typography.labelLarge, selected = it == state.value.textAlignment diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/MainEvent.kt b/app/src/main/java/ua/acclorite/book_story/ui/main/MainEvent.kt index 3e01b957..6902afad 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/main/MainEvent.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/main/MainEvent.kt @@ -52,4 +52,5 @@ sealed class MainEvent { data class OnChangeChapterTitleAlignment(val value: String) : MainEvent() data class OnChangeImages(val value: Boolean) : MainEvent() data class OnChangeImagesCornersRoundness(val value: Int) : MainEvent() + data class OnChangeImagesAlignment(val value: String) : MainEvent() } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt b/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt index 7bc056aa..83f8df1c 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt @@ -20,6 +20,7 @@ import ua.acclorite.book_story.domain.browse.toBrowseFilesStructure import ua.acclorite.book_story.domain.browse.toBrowseLayout import ua.acclorite.book_story.domain.browse.toBrowseSortOrder import ua.acclorite.book_story.domain.reader.toHorizontalGesture +import ua.acclorite.book_story.domain.reader.toImagesAlignment import ua.acclorite.book_story.domain.reader.toReaderScreenOrientation import ua.acclorite.book_story.domain.reader.toTextAlignment import ua.acclorite.book_story.domain.use_case.data_store.ChangeLanguage @@ -438,6 +439,14 @@ class MainModel @Inject constructor( it.copy(imagesCornersRoundness = this) } ) + + is MainEvent.OnChangeImagesAlignment -> handleDatastoreUpdate( + key = DataStoreConstants.IMAGES_ALIGNMENT, + value = event.value, + updateState = { + it.copy(imagesAlignment = this.toImagesAlignment()) + } + ) } } diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt b/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt index d2180d99..c407309d 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt @@ -14,9 +14,11 @@ import ua.acclorite.book_story.domain.browse.toBrowseFilesStructure import ua.acclorite.book_story.domain.browse.toBrowseLayout import ua.acclorite.book_story.domain.browse.toBrowseSortOrder import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture +import ua.acclorite.book_story.domain.reader.ReaderImagesAlignment import ua.acclorite.book_story.domain.reader.ReaderScreenOrientation import ua.acclorite.book_story.domain.reader.ReaderTextAlignment import ua.acclorite.book_story.domain.reader.toHorizontalGesture +import ua.acclorite.book_story.domain.reader.toImagesAlignment import ua.acclorite.book_story.domain.reader.toReaderScreenOrientation import ua.acclorite.book_story.domain.reader.toTextAlignment import ua.acclorite.book_story.presentation.core.constants.Constants @@ -95,6 +97,7 @@ data class MainState( val chapterTitleAlignment: ReaderTextAlignment = provideDefaultValue { ReaderTextAlignment.JUSTIFY }, val images: Boolean = provideDefaultValue { true }, val imagesCornersRoundness: Int = provideDefaultValue { 8 }, + val imagesAlignment: ReaderImagesAlignment = provideDefaultValue { ReaderImagesAlignment.START }, // Browse Settings val browseFilesStructure: BrowseFilesStructure = provideDefaultValue { @@ -320,6 +323,10 @@ data class MainState( imagesCornersRoundness = provideValue( IMAGES_CORNERS_ROUNDNESS ) { imagesCornersRoundness }, + + imagesAlignment = provideValue( + IMAGES_ALIGNMENT, convert = { toImagesAlignment() } + ) { imagesAlignment }, ) } } diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScreen.kt index e04fdbe4..7be8e679 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScreen.kt @@ -342,6 +342,7 @@ data class ReaderScreen(val bookId: Int) : Screen, Parcelable { fontColor = fontColor.value, images = mainState.value.images, imagesCornersRoundness = imagesCornersRoundness, + imagesAlignment = mainState.value.imagesAlignment, fontFamily = fontFamily, lineHeight = lineHeight, fontStyle = fontStyle, diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index f066670b..b18cce39 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -172,8 +172,8 @@ رخص مفتوحة المصدر الأيقونات إدارة التحديثات الجديدة - ابدأ - المركز + ابدأ + المركز نقل حذف التفاصيل @@ -182,7 +182,7 @@ انقر للتحقق من وجود تحديثات الإبلاغ عن خطأ ما الجديد - النهاية + النهاية بلوتو أفكار الخطوط diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 06750f31..fa1a20ea 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -124,8 +124,8 @@ Formát souboru Typ souboru Velikost souboru - Začátek - Konec + Začátek + Konec Na výšku Na šířku Pouze na výšku @@ -203,8 +203,8 @@ Vysoký Všechny soubory na řádku - Zarovnat - Do prostřed + Zarovnat + Do prostřed Jupiter Ganymede Obálka byla úspěšně změněna. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 70734ea6..ce54e909 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -289,10 +289,10 @@ Dateigröße Textausrichtung Dateistruktur - Start - Rechtfertigen - Mitte - Ende + Start + Rechtfertigen + Mitte + Ende Beitrag Drücken Sie zweimal die Zurück-Taste, um die App zu beenden Zum Beenden zweimal Zurück drücken diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8bc007e8..ed7161f3 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -289,10 +289,10 @@ Filtrar Alineación del texto Estructura de los ficheros - Iniciar - Justificar - Centrar - Fin + Iniciar + Justificar + Centrar + Fin Ayuda a traducir Fuentes Traducción diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 854d1ee4..63655bee 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -118,10 +118,10 @@ Type de fichier Dernière modification Taille de fichier - Début - Justifier - Centrer - Fin + Début + Justifier + Centrer + Fin Mercure Neptune Terre diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 4ceba145..b56284f9 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -165,10 +165,10 @@ फाइल का प्रकार फाइल का प्रकार आखिरी बार संशोधित - प्रारंभ - सममित करें - मध्य - अंत + प्रारंभ + सममित करें + मध्य + अंत आड़ी दिशा खड़ी दिशा खड़ा दिशा लॉक diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 151176c3..730809c4 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -198,10 +198,10 @@ Generale Generale, filtro, ordinamento Allineamento del testo - Centrale - Fine + Centrale + Fine Lingua dell\'app - Avvia + Avvia Cerca… Selezionato «%1$s» Traduttore diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 0231cd52..7bdc1f17 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -124,10 +124,10 @@ Typ pliku Ostatnio modyfikowany Rozmiar pliku - Start - Uzasadnij - Koniec - Środek + Start + Uzasadnij + Koniec + Środek Ziemia Naciśnij ponownie, aby wyjść Przesuń w lewo lub w prawo, aby zmienić ustawienie koloru diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index f64485f7..1a5cfdc7 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -81,8 +81,8 @@ Grade Hoje Automático - Começar - Fim + Começar + Fim Mercúrio Netuno Terra @@ -117,10 +117,10 @@ Permissões Copiado Requerido - Justificar + Justificar Escolha a categoria da qual você quer mover todos os livros selecionados(%1$s). Todos os livros selecionados serão movidos para essa categoria. Isto irá apagar todos os livros selecionados(%1$s) da base de dados. Isso não irá apagar os livros do seu dispositivo. - Centro + Centro Detalhes Configurações Reverter diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index e92565a1..6ce7fbef 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -82,7 +82,7 @@ சேமிப்பாளர் தரநிலை சராசரி - முடிவு + முடிவு இலவசம் உருவப்படம் நிலப்பரப்பு @@ -163,7 +163,7 @@ வலைவாய் தானி ஒரு வரிசையில் - நடுவண் + நடுவண் நான் ஒரு புத்தகத்தை எவ்வாறு திருத்துவது? நூலகம் நான் ஒரு புத்தகத்தைப் படிப்பது எப்படி? @@ -263,8 +263,8 @@ கோப்பு வகை கடைசியாக மாற்றப்பட்டது கோப்பு அளவு - தொடங்கு - நியாயப்படுத்துங்கள் + தொடங்கு + நியாயப்படுத்துங்கள் பூட்டப்பட்ட உருவப்படம் அறிவன் நெப்டியூன் diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ef1d9799..31a14a39 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -160,10 +160,10 @@ Dosya türü Son değiştirilme Dosya boyutu - Başlangıç - İki yana yaslı - Ortalı - Son + Başlangıç + İki yana yaslı + Ortalı + Son Merkür Neptün Dünya diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index fd817b14..9ccd1479 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -200,6 +200,7 @@ Зображення Показувати зображення разом із написами до них Округлість кутків + Розташування Структура файлів @@ -253,10 +254,10 @@ Розмір файла - Старт - Рівномірно - Центр - Кінець + Старт + Рівномірно + Центр + Кінець Вільно diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index da4a98ea..7b743a3c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -167,8 +167,8 @@ 列表 每行 文件格式 - 开头 - 末尾 + 开头 + 末尾 自由 横屏 竖屏锁定 @@ -184,7 +184,7 @@ 字母顺序 竖屏 土星 - 居中 + 居中 水星 阋神星 目录 @@ -256,7 +256,7 @@ 前往 书库 如何阅读一本书? - 证明合法 + 证明合法 前往 前往 您可以在 \"书库\"、\"历史记录 \"和 \"浏览 \"界面点击右上角的三个点,然后从下拉菜单中选择 \"设置\"。 然后你就会看到此应用程序的所有可用设置。 请随意尝试! diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3fd822d0..581b7ec3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -255,6 +255,7 @@ Images Display images along with their captions Corners roundness + Alignment Files structure @@ -309,11 +310,11 @@ Last modified File size - - Start - Justify - Center - End + + Start + Justify + Center + End Free