This repository has been archived by the owner on Jul 29, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #41 from readium/develop
1.0.4
- Loading branch information
Showing
18 changed files
with
640 additions
and
135 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| local.properties | ||
| /.idea/workspace.xml | ||
| /.idea/libraries | ||
| /.idea | ||
| .DS_Store | ||
| /build | ||
| /captures | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,6 @@ import org.json.JSONObject | |
|
|
||
| interface JSONable { | ||
|
|
||
| fun getJSON(): JSONObject | ||
| fun toJSON(): JSONObject | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
177 changes: 177 additions & 0 deletions
177
r2-shared/src/main/java/org/readium/r2/shared/Locator.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,177 @@ | ||
| /* | ||
| * Module: r2-shared-kotlin | ||
| * Developers: Aferdita Muriqi, Mostapha Idoubihi, Paul Stoica | ||
| * | ||
| * Copyright (c) 2018. Readium Foundation. All rights reserved. | ||
| * Use of this source code is governed by a BSD-style license which is detailed in the | ||
| * LICENSE file present in the project repository where this source code is maintained. | ||
| */ | ||
|
|
||
| package org.readium.r2.shared | ||
|
|
||
| import org.json.JSONObject | ||
| import java.io.Serializable | ||
|
|
||
| /** | ||
| * Locator model - https://github.com/readium/architecture/tree/master/locators | ||
| * | ||
| * @val href: String - The href of the resource the locator points at. | ||
| * @val created: Long - The datetime of creation of the locator. | ||
| * @val title: String - The title of the chapter or section which is more relevant in the context of this locator. | ||
| * @val location: Location - One or more alternative expressions of the location. | ||
| * @val text: LocatorText? - Textual context of the locator. | ||
| */ | ||
|
|
||
| open class Locator(val href: String, | ||
| val created: Long, | ||
| val title: String, | ||
| val locations: Locations, | ||
| val text: LocatorText?) : Serializable | ||
|
|
||
| class LocatorText(var after: String? = null, | ||
| var before: String? = null, | ||
| var hightlight: String? = null) | ||
| : JSONable, Serializable { | ||
|
|
||
| companion object { | ||
| fun fromJSON(json: JSONObject): LocatorText { | ||
|
|
||
| val location = LocatorText() | ||
| if (json.has("before")) { | ||
| location.before = json.getString("before") | ||
| } | ||
| if (json.has("hightlight")) { | ||
| location.hightlight = json.getString("hightlight") | ||
| } | ||
| if (json.has("after")) { | ||
| location.after = json.getString("after") | ||
| } | ||
|
|
||
| return location | ||
| } | ||
| } | ||
|
|
||
| override fun toJSON(): JSONObject { | ||
| val json = JSONObject() | ||
|
|
||
| before?.let { | ||
| json.putOpt("before", before) | ||
| } | ||
| hightlight?.let { | ||
| json.putOpt("hightlight", hightlight) | ||
| } | ||
| after?.let { | ||
| json.putOpt("after", after) | ||
| } | ||
|
|
||
| return json | ||
| } | ||
|
|
||
| override fun toString(): String { | ||
| var jsonString = """{""" | ||
|
|
||
| if (before != null) { | ||
| before.let { jsonString += """ "before": "$before" ,""" } | ||
| } | ||
| if (hightlight != null) { | ||
| hightlight.let { jsonString += """ "before": "$hightlight" ,""" } | ||
| } | ||
| if (after != null) { | ||
| after.let { jsonString += """ "after": "$after" ,""" } | ||
| } | ||
| jsonString += """}""" | ||
| return jsonString | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Location : Class that contain the different variables needed to localize a particular position | ||
| * | ||
| * @var id: Long? - Identifier of a specific fragment in the publication | ||
| * @var cfi: String? - String formatted to designed a particular place in an Publication | ||
| * @var cssSelector: String? - Css selector | ||
| * @var xpath: String? - An xpath in the resource | ||
| * @var progression: Double - A percentage ( between 0 and 1 ) of the progression in a Publication | ||
| * @var position: Long - Index of a segment in the resource / synthetic page number!!?? | ||
| * | ||
| */ | ||
| class Locations(var cfi: String? = null, // 1 = highlight, annotation etc | ||
| var id: String? = null, // 2 = fragment identifier (toc, page lists, landmarks) | ||
| var cssSelector: String? = null, // 2 = | ||
| var xpath: String? = null, // 2 = | ||
| var progression: Double? = null, // 3 = bookmarks | ||
| var position: Long? = null // 4 = goto page | ||
| ) : JSONable, Serializable { | ||
|
|
||
| companion object { | ||
| fun fromJSON(json: JSONObject): Locations { | ||
|
|
||
| val location = Locations() | ||
| if (json.has("id")) { | ||
| location.id = json.getString("id") | ||
| } | ||
| if (json.has("cfi")) { | ||
| location.cfi = json.getString("cfi") | ||
| } | ||
| if (json.has("cssSelector")) { | ||
| location.cssSelector = json.getString("cssSelector") | ||
| } | ||
| if (json.has("xpath")) { | ||
| location.xpath = json.getString("xpath") | ||
| } | ||
| if (json.has("progression")) { | ||
| location.progression = json.getDouble("progression") | ||
| } | ||
| if (json.has("position")) { | ||
| location.position = json.getLong("position") | ||
| } | ||
|
|
||
| return location | ||
| } | ||
| } | ||
|
|
||
| override fun toJSON(): JSONObject { | ||
| val json = JSONObject() | ||
|
|
||
| id?.let { | ||
| json.putOpt("id", id) | ||
| } | ||
| cfi?.let { | ||
| json.putOpt("cfi", cfi) | ||
| } | ||
| cssSelector?.let { | ||
| json.putOpt("cssSelector", cssSelector) | ||
| } | ||
| xpath?.let { | ||
| json.putOpt("xpath", xpath) | ||
| } | ||
| progression?.let { | ||
| json.putOpt("progression", progression) | ||
| } | ||
| position?.let { | ||
| json.putOpt("position", position) | ||
| } | ||
|
|
||
| return json | ||
| } | ||
|
|
||
| override fun toString(): String { | ||
| var jsonString = """{""" | ||
| if (id != null) { | ||
| id.let { jsonString += """ "id": "$id" ,""" } | ||
| } | ||
| if (cfi != null) { | ||
| cfi.let { jsonString += """ "cfi": "$cfi" ,""" } | ||
| } | ||
| if (cssSelector != null) { | ||
| cssSelector.let { jsonString += """ "cssSelector": "$cssSelector" ,""" } | ||
| } | ||
| if (xpath != null) { | ||
| xpath.let { jsonString += """ "xpath": "$xpath" ,""" } | ||
| } | ||
| progression.let { jsonString += """ "progression": "$progression" ,""" } | ||
| position.let { jsonString += """ "position": "$position" """ } | ||
| jsonString += """}""" | ||
| return jsonString | ||
| } | ||
| } |
Oops, something went wrong.