From 64c372b6e5a87a01e49cbe2b23cbde19c18d31ea Mon Sep 17 00:00:00 2001 From: Paul Stoica Date: Wed, 26 Sep 2018 12:50:33 +0200 Subject: [PATCH 1/2] added computation of the style that should be used --- .../java/org/readium/r2/shared/Metadata.kt | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/r2-shared/src/main/java/org/readium/r2/shared/Metadata.kt b/r2-shared/src/main/java/org/readium/r2/shared/Metadata.kt index 0b347f9d..b44c6a0d 100644 --- a/r2-shared/src/main/java/org/readium/r2/shared/Metadata.kt +++ b/r2-shared/src/main/java/org/readium/r2/shared/Metadata.kt @@ -84,6 +84,26 @@ class Metadata : Serializable { return obj } + + fun contentLayoutStyle(langType: LangType, pageDirection: String?) : ContentLayoutStyle { + + when(langType) { + LangType.afh -> return ContentLayoutStyle.rtl + LangType.cjk -> { + if (pageDirection == ContentLayoutStyle.rtl.name) + return ContentLayoutStyle.cjkv + else + return ContentLayoutStyle.cjkh + } + else -> { + if (pageDirection == ContentLayoutStyle.rtl.name) + return ContentLayoutStyle.rtl + else + return ContentLayoutStyle.ltr + } + } + } + } fun parseMetadata(metadataDict: JSONObject): Metadata { From 11d191f2be3db2f63005f851e08f6ba42d3e6d03 Mon Sep 17 00:00:00 2001 From: Paul Stoica Date: Wed, 26 Sep 2018 12:51:18 +0200 Subject: [PATCH 2/2] enum classes for css use --- .../java/org/readium/r2/shared/Metadata.kt | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/r2-shared/src/main/java/org/readium/r2/shared/Metadata.kt b/r2-shared/src/main/java/org/readium/r2/shared/Metadata.kt index b44c6a0d..26ad5341 100644 --- a/r2-shared/src/main/java/org/readium/r2/shared/Metadata.kt +++ b/r2-shared/src/main/java/org/readium/r2/shared/Metadata.kt @@ -37,7 +37,7 @@ class Metadata : Serializable { var inkers: MutableList = mutableListOf() var narrators: MutableList = mutableListOf() var imprints: MutableList = mutableListOf() - var direction: String = "default" + var direction: String = PageProgressionDirection.default.name var subjects: MutableList = mutableListOf() var publishers: MutableList = mutableListOf() var contributors: MutableList = mutableListOf() @@ -263,3 +263,19 @@ fun parseMetadata(metadataDict: JSONObject): Metadata { return m } + +enum class LangType { + cjk, afh, other +} + + +enum class PageProgressionDirection { + default, + ltr, + rtl +} + +enum class ContentLayoutStyle { + ltr, rtl, + cjkv, cjkh +} \ No newline at end of file