Merge pull request #91 from readium/refactor/navigator

Refactoring
readium · Sep 7, 2019 · 7d9ac2d · 7d9ac2d
2 parents 90476b5 + 150d967
commit 7d9ac2d
Show file tree

Hide file tree

Showing 36 changed files with 848 additions and 160 deletions.
diff --git a/r2-navigator/src/main/AndroidManifest.xml b/r2-navigator/src/main/AndroidManifest.xml
@@ -21,10 +21,16 @@
         tools:replace="android:allowBackup">
 
         <activity
-            android:name=".R2EpubActivity"
+            android:name=".epub.R2EpubActivity"
             android:theme="@style/AppTheme" />
         <activity
-            android:name=".R2CbzActivity"
+            android:name=".cbz.R2CbzActivity"
+            android:theme="@style/AppTheme" />
+        <activity
+            android:name=".audiobook.R2AudiobookActivity"
+            android:theme="@style/AppTheme" />
+        <activity
+            android:name=".divina.R2DiViNaActivity"
             android:theme="@style/AppTheme" />
 
     </application>

diff --git a/.../java/org/readium/r2/navigator/Globals.kt → ...va/org/readium/r2/navigator/GlobalVars.kt b/.../java/org/readium/r2/navigator/Globals.kt → ...va/org/readium/r2/navigator/GlobalVars.kt
@@ -9,11 +9,6 @@
 
 package org.readium.r2.navigator
 
-import android.content.Context
-import androidx.annotation.ColorInt
-import androidx.annotation.ColorRes
-import androidx.core.content.ContextCompat
-
 /**
  * Created by aferditamuriqi on 10/3/17.
  */
@@ -22,17 +17,5 @@ import androidx.core.content.ContextCompat
 /**
  * Global Parameters
  */
-//val PORT_NUMBER = 3333
 const val BASE_URL = "http://127.0.0.1"
-//val SERVER_URL = "$BASE_URL:$PORT_NUMBER"
-//val MANIFEST = "/manifest"
-
-
-/**
- * Extensions
- */
 
-@ColorInt
-fun Context.color(@ColorRes id: Int): Int {
-    return ContextCompat.getColor(this, id)
-}
diff --git a/r2-navigator/src/main/java/org/readium/r2/navigator/R2ActivityListener.kt b/r2-navigator/src/main/java/org/readium/r2/navigator/R2ActivityListener.kt
@@ -20,6 +20,8 @@ interface R2ActivityListener {
     val publication: Publication
     val preferences: SharedPreferences
     val publicationIdentifier: String
+    val publicationFileName: String
+    val publicationPath: String
     val resourcePager: R2ViewPager?
         get() = null
     val allowToggleActionBar: Boolean

diff --git a/...dium/r2/navigator/pager/R2BasicWebView.kt → ...rg/readium/r2/navigator/R2BasicWebView.kt b/...dium/r2/navigator/pager/R2BasicWebView.kt → ...rg/readium/r2/navigator/R2BasicWebView.kt
@@ -7,7 +7,7 @@
  * LICENSE file present in the project repository where this source code is maintained.
  */
 
-package org.readium.r2.navigator.pager
+package org.readium.r2.navigator
 
 import android.content.Context
 import android.os.Build
@@ -27,9 +27,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.jsoup.Jsoup
 import org.jsoup.safety.Whitelist
-import org.readium.r2.navigator.BuildConfig
-import org.readium.r2.navigator.R
-import org.readium.r2.navigator.R2ActivityListener
 import org.readium.r2.shared.Locations
 import org.readium.r2.shared.SCROLL_REF
 import org.readium.r2.shared.getAbsolute

diff --git a/...g/readium/r2/navigator/pager/R2WebView.kt → ...ava/org/readium/r2/navigator/R2WebView.kt b/...g/readium/r2/navigator/pager/R2WebView.kt → ...ava/org/readium/r2/navigator/R2WebView.kt
@@ -7,7 +7,7 @@
  * LICENSE file present in the project repository where this source code is maintained.
  */
 
-package org.readium.r2.navigator.pager
+package org.readium.r2.navigator
 
 import android.content.Context
 import android.graphics.Rect