react-native-readium 1.0.0-alpha.3 → 1.0.0-alpha.6

package/README.md

@@ -16,6 +16,11 @@ A react-native wrapper for https://readium.org/
 
 ## Installation
 
+#### Prerequisites
+
+1. **iOS**: Requires an iOS target >= `13.0` (see the iOS section for more details).
+2. **Android**: Requires `compileSdkVersion` >= `31` (see the Android section for more details).
+
 #### Install Module
 
 **NPM**
@@ -32,17 +37,14 @@ yarn add react-native-readium
 
 #### iOS
 
-###### Requirements
-
-This project requires an iOS target >= `13.0`.
-
-###### Pod Install
-
 Due to the current state of the `Readium` swift libraries you need to manually
 update your `Podfile` ([see more on that here](https://github.com/readium/swift-toolkit/issues/38)).
 
 ```rb
 # ./ios/Podfile
+...
+platform :ios, '13.0'
+
 ...
 
 target 'ExampleApp' do
@@ -61,6 +63,21 @@ Finally, install the pods:
 
 `pod install`
 
+#### Android
+
+If you're not using `compileSdkVersion` >= 31 you'll need to update that:
+
+```groovy
+// android/build.gradle
+...
+buildscript {
+    ...
+    ext {
+        ...
+        compileSdkVersion = 31
+...
+```
+
 ## Usage
 
 ```tsx

package/android/build.gradle

@@ -136,16 +136,20 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 
 dependencies {
   // noinspection GradleDynamicVersion
-  api 'com.facebook.react:react-native:+'
+  api "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
   // readium deps
   implementation "com.github.readium.kotlin-toolkit:readium-shared:$readium_version"
   implementation "com.github.readium.kotlin-toolkit:readium-streamer:$readium_version"
-  implementation "com.github.readium.kotlin-toolkit:readium-navigator:$readium_version"
+  implementation ("com.github.readium.kotlin-toolkit:readium-navigator:$readium_version") {
+    // this package doesn't provide audio playback, so remove exoplayer
+    // transitive deps to avoid potential collisions with other projects.
+    exclude group: "com.google.android.exoplayer"
+  }
 
   // other deps
-  implementation 'androidx.core:core-ktx:1.6.0'
+  implementation "androidx.core:core-ktx:1.6.0"
   implementation "androidx.activity:activity-ktx:1.3.1"
   implementation "androidx.appcompat:appcompat:1.3.1"
   implementation "androidx.browser:browser:1.3.0"
@@ -178,15 +182,15 @@ dependencies {
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
   // AM NOTE: needs to stay this version for now (June 24,2020)
   //noinspection GradleDependency
-  implementation 'org.jsoup:jsoup:1.13.1'
+  implementation "org.jsoup:jsoup:1.13.1"
 
   // Room database
-  final room_version = '2.4.0-beta01'
+  final room_version = "2.4.0-beta01"
   implementation "androidx.room:room-runtime:$room_version"
   implementation "androidx.room:room-ktx:$room_version"
   annotationProcessor "androidx.room:room-compiler:$room_version"
 
-  implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+  implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
   //noinspection LifecycleAnnotationProcessorWithJava8
   annotationProcessor "androidx.lifecycle:lifecycle-compiler:2.3.1"
 

package/android/src/main/java/com/reactnativereadium/ReadiumViewManager.kt

@@ -35,7 +35,8 @@ class ReadiumViewManager(
 
   @ReactProp(name = "file")
   fun setFile(view: ReadiumView, file: ReadableMap) {
-    val path = file.getString("url")
+    val path = (file.getString("url") ?: "")
+      .replace("^(file:/+)?(/.*)$".toRegex(), "$2")
     val locatorMap = file.getMap("initialLocation")
     var initialLocation: Locator? = null
 
@@ -44,7 +45,7 @@ class ReadiumViewManager(
     }
 
     runBlocking {
-      svc.openPublication(path!!, initialLocation) { fragment ->
+      svc.openPublication(path, initialLocation) { fragment ->
         view.addFragment(fragment)
       }
     }

package/ios/Readium.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

package/ios/Readium.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

package/ios/Readium.xcodeproj/xcuserdata/jspizziri.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>Readium.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/ios/ReadiumView.swift

@@ -9,6 +9,10 @@ import R2Navigator
 class ReadiumView : UIView, Loggable {
   var readerService: ReaderService = ReaderService()
   var readerViewController: ReaderViewController?
+  var viewController: UIViewController? {
+    let viewController = sequence(first: self, next: { $0.next }).first(where: { $0 is UIViewController })
+    return viewController as? UIViewController
+  }
   private var subscriptions = Set<AnyCancellable>()
 
   @objc var file: NSDictionary? = nil {
@@ -138,11 +142,12 @@ class ReadiumView : UIView, Loggable {
       self.updateUserSettings(settings)
     }
 
-    let rootViewController = UIApplication.shared.delegate?.window??.rootViewController
-    rootViewController?.addChild(readerViewController!)
     readerViewController!.view.frame = self.superview!.frame
+    self.viewController!.addChild(readerViewController!)
     let rootView = self.readerViewController!.view!
     self.addSubview(rootView)
+    self.viewController!.addChild(readerViewController!)
+    self.readerViewController!.didMove(toParent: self.viewController!)
 
     // bind the reader's view to be constrained to its parent
     rootView.translatesAutoresizingMaskIntoConstraints = false
@@ -150,7 +155,5 @@ class ReadiumView : UIView, Loggable {
     rootView.bottomAnchor.constraint(equalTo: self.bottomAnchor).isActive = true
     rootView.leftAnchor.constraint(equalTo: self.leftAnchor).isActive = true
     rootView.rightAnchor.constraint(equalTo: self.rightAnchor).isActive = true
-
-    self.readerViewController!.didMove(toParent: rootViewController)
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-readium",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.6",
   "description": "A react-native wrapper for https://readium.org/",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",