Update Kotlin and Gradle (#438)

stevenzeck · web-flow · commit 7242bd86126d · 2021-07-02T11:14:56.000+02:00
diff --git a/test-app/build.gradle b/test-app/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.31'
+    ext.kotlin_version = '1.5.20'
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.2.2'
 
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
diff --git a/test-app/gradle/wrapper/gradle-wrapper.properties b/test-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 29 14:00:53 CET 2020
+#Fri Jun 25 13:42:26 CEST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/test-app/r2-testapp/build.gradle b/test-app/r2-testapp/build.gradle
@@ -118,7 +118,7 @@ dependencies {
     implementation "androidx.browser:browser:1.3.0"
     implementation "androidx.cardview:cardview:1.0.0"
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
-    implementation "androidx.fragment:fragment-ktx:1.3.4"
+    implementation "androidx.fragment:fragment-ktx:1.3.5"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.1"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"
@@ -142,7 +142,7 @@ dependencies {
     //noinspection GradleDependency
     implementation "com.squareup.picasso:picasso:2.5.2"
     implementation "joda-time:joda-time:2.10.10"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-native-mt"
     // AM NOTE: needs to stay this version for now (June 24,2020)
     //noinspection GradleDependency
     implementation 'org.jsoup:jsoup:1.13.1'
diff --git a/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/audiobook/AudioNavigatorFragment.kt b/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/audiobook/AudioNavigatorFragment.kt
@@ -4,6 +4,8 @@
  * available in the top-level LICENSE file of the project.
  */
 
+@file:Suppress("DEPRECATION")
+
 package org.readium.r2.testapp.audiobook
 
 import android.app.ProgressDialog
@@ -67,6 +69,7 @@ class AudioNavigatorFragment(
             }
         }
 
+        // TODO Replace or add a ProgressBar in the navigator to use here, then remove the deprecation annotation for this file
         activity.mediaPlayer.progress = ProgressDialog.show(requireContext(), null, getString(R.string.progress_wait_while_preparing_audiobook), true)
         initialLocator?.let { go(it) }
     }
diff --git a/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/bookshelf/BookshelfViewModel.kt b/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/bookshelf/BookshelfViewModel.kt
@@ -24,8 +24,6 @@ import org.readium.r2.shared.extensions.mediaType
 import org.readium.r2.shared.extensions.tryOrNull
 import org.readium.r2.shared.publication.Publication
 import org.readium.r2.shared.publication.asset.FileAsset
-import org.readium.r2.shared.publication.asset.PublicationAsset
-import org.readium.r2.shared.publication.opds.images
 import org.readium.r2.shared.publication.services.cover
 import org.readium.r2.shared.publication.services.isRestricted
 import org.readium.r2.shared.publication.services.protectionError
@@ -220,13 +218,13 @@ class BookshelfViewModel(application: Application) : AndroidViewModel(applicatio
                         channel.send(Event.OpenBookError(error.getUserMessage(r2Application)))
                     }
                 } else {
-                    val url = prepareToServe(it, asset)
+                    val url = prepareToServe(it)
                     callback.invoke(asset, asset.mediaType(), it, remoteAsset, url)
                 }
             }
     }
 
-    private fun prepareToServe(publication: Publication, asset: PublicationAsset): URL? {
+    private fun prepareToServe(publication: Publication): URL? {
         val userProperties =
             r2Application.filesDir.path + "/" + Injectable.Style.rawValue + "/UserProperties.json"
         return server.addPublication(publication, userPropertiesFile = File(userProperties))
@@ -241,18 +239,7 @@ class BookshelfViewModel(application: Application) : AndroidViewModel(applicatio
             }
             val coverImageFile = File("${r2Directory}covers/${imageName}.png")
 
-            var bitmap: Bitmap? = null
-            if (publication.cover() == null) {
-                publication.coverLink?.let { link ->
-                    bitmap = getBitmapFromURL(link.href)
-                } ?: run {
-                    if (publication.images.isNotEmpty()) {
-                        bitmap = getBitmapFromURL(publication.images.first().href)
-                    }
-                }
-            } else {
-                bitmap = publication.cover()
-            }
+            val bitmap: Bitmap? = publication.cover()
 
             val resized = bitmap?.let { Bitmap.createScaledBitmap(it, 120, 200, true) }
             val fos = FileOutputStream(coverImageFile)
diff --git a/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/catalogs/CatalogDetailFragment.kt b/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/catalogs/CatalogDetailFragment.kt
@@ -50,17 +50,8 @@ class CatalogDetailFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         (activity as MainActivity).supportActionBar?.title = publication?.metadata?.title
 
-        publication?.coverLink?.let { link ->
-            Picasso.with(requireContext()).load(link.href).into(binding.catalogListCoverImage)
-        } ?: run {
-            if (publication?.images?.isNotEmpty() == true) {
-                Picasso.with(requireContext()).load(publication!!.images.first().href)
-                    .into(binding.catalogListCoverImage)
-            }
-        }
-//        viewLifecycleOwner.lifecycleScope.launchWhenCreated {
-//            binding.coverImageView.setImageBitmap(mPublication?.cover())
-//        }
+        Picasso.with(requireContext()).load(publication?.images?.first()?.href)
+            .into(binding.catalogDetailCoverImage)
 
         binding.catalogDetailDownloadButton.setOnClickListener {
             publication?.let { it1 ->
diff --git a/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/catalogs/CatalogViewModel.kt b/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/catalogs/CatalogViewModel.kt
@@ -123,18 +123,8 @@ class CatalogViewModel(application: Application) : AndroidViewModel(application)
             }
             val coverImageFile = File("${r2Directory}covers/${imageName}.png")
 
-            var bitmap: Bitmap? = null
-            if (publication.cover() == null) {
-                publication.coverLink?.let { link ->
-                    bitmap = getBitmapFromURL(link.href)
-                } ?: run {
-                    if (publication.images.isNotEmpty()) {
-                        bitmap = getBitmapFromURL(publication.images.first().href)
-                    }
-                }
-            } else {
-                bitmap = publication.cover()
-            }
+            val bitmap: Bitmap? =
+                publication.cover() ?: getBitmapFromURL(publication.images.first().href)
 
             val resized = bitmap?.let { Bitmap.createScaledBitmap(it, 120, 200, true) }
             val fos = FileOutputStream(coverImageFile)
diff --git a/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/epub/EpubActivity.kt b/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/epub/EpubActivity.kt
@@ -12,11 +12,9 @@ package org.readium.r2.testapp.epub
 
 import android.content.Context
 import android.graphics.Color
-import android.graphics.Point
 import android.graphics.Rect
 import android.os.Bundle
 import android.os.Handler
-import android.util.DisplayMetrics
 import android.view.*
 import android.view.accessibility.AccessibilityManager
 import android.view.inputmethod.InputMethodManager
@@ -182,13 +180,11 @@ class EpubActivity : R2EpubActivity() {
                     val rect =
                         try {
                             with(JSONObject(it)) {
-                                val display = windowManager.defaultDisplay
-                                val metrics = DisplayMetrics()
-                                display.getMetrics(metrics)
+                                val density = this@EpubActivity.resources.displayMetrics.density
                                 val left = getDouble("left")
                                 val width = getDouble("width")
-                                val top = getDouble("top") * metrics.density
-                                val height = getDouble("height") * metrics.density
+                                val top = getDouble("top") * density
+                                val height = getDouble("height") * density
                                 Rect(
                                     left.toInt(),
                                     top.toInt(),
@@ -230,30 +226,31 @@ class EpubActivity : R2EpubActivity() {
 //            // when the corresponding highlight in DB is.
 //        }
 
-            val display = windowManager.defaultDisplay
-            val rect = size ?: Rect()
-
-            val mDisplaySize = Point()
-            display.getSize(mDisplaySize)
-
             val popupView = layoutInflater.inflate(
-                    if (rect.top > rect.height()) R.layout.view_action_mode_reverse else R.layout.view_action_mode,
-                    null,
-                    false
+                if (size.top > size.height()) R.layout.view_action_mode_reverse else R.layout.view_action_mode,
+                null,
+                false
+            )
+            popupView.measure(
+                View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
+                View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)
             )
-            popupView.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED))
 
-            popupWindow = PopupWindow(popupView, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT)
+            popupWindow = PopupWindow(
+                popupView,
+                LinearLayout.LayoutParams.WRAP_CONTENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
+            )
             popupWindow?.isFocusable = true
 
-            val x = rect.left
-            val y = if (rect.top > rect.height()) rect.top - rect.height() - 80 else rect.bottom
+            val x = size.left
+            val y = if (size.top > size.height()) size.top - size.height() - 80 else size.bottom
 
             popupWindow?.showAtLocation(popupView, Gravity.NO_GRAVITY, x, y)
 
             popupView.run {
                 findViewById<View>(R.id.notch).run {
-                    setX((rect.left * 2).toFloat())
+                    setX((size.left * 2).toFloat())
                 }
                 findViewById<View>(R.id.red).setOnClickListener {
                     changeHighlightColor(highlight, Color.rgb(247, 124, 124))
@@ -425,7 +422,7 @@ class EpubActivity : R2EpubActivity() {
             userSettings = UserSettings(preferences, this, publication.userSettingsUIPreset)
             userSettings.saveChanges()
 
-            Handler().postDelayed({
+            Handler(mainLooper).postDelayed({
                 userSettings.resourcePager = resourcePager
                 userSettings.updateViewCSS(SCROLL_REF)
             }, 500)
diff --git a/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/epub/UserSettings.kt b/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/epub/UserSettings.kt
@@ -178,7 +178,8 @@ class UserSettings(var preferences: SharedPreferences, val context: Context, pri
         view.setProperty(userSetting.name, userSetting.toString())
     }
 
-
+    // There isn't an easy way to migrate from TabHost/TabWidget to TabLayout
+    @Suppress("DEPRECATION")
     fun userSettingsPopUp(): PopupWindow {
 
         val layoutInflater = LayoutInflater.from(context)
diff --git a/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/opds/OPDSDownloader.kt b/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/opds/OPDSDownloader.kt
@@ -42,8 +42,7 @@ class OPDSDownloader(context: Context) {
     }
 
     suspend fun publicationUrl(
-        url: String,
-        parameters: List<Pair<String, Any?>>? = null
+        url: String
     ): Try<Pair<String, String>, Exception> {
         val fileName = UUID.randomUUID().toString()
         if (DEBUG) Timber.i("download url %s", url)
diff --git a/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/search/SearchResultAdapter.kt b/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/search/SearchResultAdapter.kt
@@ -6,6 +6,7 @@
 
 package org.readium.r2.testapp.search
 
+import android.os.Build
 import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
@@ -20,7 +21,8 @@ import org.readium.r2.testapp.utils.singleClick
 /**
  * This class is an adapter for Search results' list view
  */
-class SearchResultAdapter(private var listener: Listener) : PagingDataAdapter<Locator, SearchResultAdapter.ViewHolder>(ItemCallback()) {
+class SearchResultAdapter(private var listener: Listener) :
+    PagingDataAdapter<Locator, SearchResultAdapter.ViewHolder>(ItemCallback()) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         return ViewHolder(
@@ -32,15 +34,23 @@ class SearchResultAdapter(private var listener: Listener) : PagingDataAdapter<Lo
 
     override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
         val locator = getItem(position) ?: return
-        val title = locator.title?.let { "<h6>$it</h6>"}
-        viewHolder.textView.text = Html.fromHtml("$title\n${locator.text.before}<span style=\"background:yellow;\"><b>${locator.text.highlight}</b></span>${locator.text.after}")
+        val title = locator.title?.let { "<h6>$it</h6>" }
+        val html =
+            "$title\n${locator.text.before}<span style=\"background:yellow;\"><b>${locator.text.highlight}</b></span>${locator.text.after}"
+        viewHolder.textView.text = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            Html.fromHtml(html, Html.FROM_HTML_MODE_COMPACT)
+        } else {
+            @Suppress("DEPRECATION")
+            Html.fromHtml(html)
+        }
 
-        viewHolder.itemView.singleClick { v->
+        viewHolder.itemView.singleClick { v ->
             listener.onItemClicked(v, locator)
         }
     }
 
-    inner class ViewHolder(val binding: ItemRecycleSearchBinding) : RecyclerView.ViewHolder(binding.root) {
+    inner class ViewHolder(val binding: ItemRecycleSearchBinding) :
+        RecyclerView.ViewHolder(binding.root) {
         val textView = binding.text
     }
 
diff --git a/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/utils/ContentResolverUtil.kt b/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/utils/ContentResolverUtil.kt
@@ -13,14 +13,15 @@ package org.readium.r2.testapp.utils
 import android.content.ContentUris
 import android.content.Context
 import android.net.Uri
-import android.os.Environment
 import android.provider.DocumentsContract
 import android.provider.MediaStore
 import android.text.TextUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.readium.r2.testapp.utils.extensions.toFile
-import java.io.*
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.InputStream
 import java.net.URL
 
 object ContentResolverUtil {
@@ -62,7 +63,7 @@ object ContentResolverUtil {
                 val split = docId.split(":".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
                 val type = split[0]
                 if ("primary".equals(type, ignoreCase = true)) {
-                    return Environment.getExternalStorageDirectory().toString() + "/" + split[1]
+                    return context.getExternalFilesDir(null).toString() + "/" + split[1]
                 }
                 // TODO handle non-primary volumes
 
diff --git a/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/utils/SystemUiManagement.kt b/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/utils/SystemUiManagement.kt
@@ -10,12 +10,17 @@ import android.app.Activity
 import android.view.View
 import android.view.WindowInsets
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.WindowInsetsCompat
 
+// Using ViewCompat and WindowInsetsCompat does not work properly in all versions of Android
+@Suppress("DEPRECATION")
 /** Returns `true` if fullscreen or immersive mode is not set. */
 private fun Activity.isSystemUiVisible(): Boolean {
     return this.window.decorView.systemUiVisibility and View.SYSTEM_UI_FLAG_FULLSCREEN == 0
 }
 
+// Using ViewCompat and WindowInsetsCompat does not work properly in all versions of Android
+@Suppress("DEPRECATION")
 /** Enable fullscreen or immersive mode. */
 fun Activity.hideSystemUi() {
     this.window.decorView.systemUiVisibility = (
@@ -28,6 +33,8 @@ fun Activity.hideSystemUi() {
             )
 }
 
+// Using ViewCompat and WindowInsetsCompat does not work properly in all versions of Android
+@Suppress("DEPRECATION")
 /** Disable fullscreen or immersive mode. */
 fun Activity.showSystemUi() {
     this.window.decorView.systemUiVisibility = (
@@ -48,13 +55,16 @@ fun Activity.toggleSystemUi() {
 
 /** Set padding around view so that content doesn't overlap system UI */
 fun View.padSystemUi(insets: WindowInsets, activity: Activity) =
-    setPadding(
-        insets.systemWindowInsetLeft,
-        insets.systemWindowInsetTop + (activity as AppCompatActivity).supportActionBar!!.height,
-        insets.systemWindowInsetRight,
-        insets.systemWindowInsetBottom
-    )
+    WindowInsetsCompat.toWindowInsetsCompat(insets, this)
+        .getInsets(WindowInsetsCompat.Type.statusBars()).apply {
+            setPadding(
+                left,
+                top + (activity as AppCompatActivity).supportActionBar!!.height,
+                right,
+                bottom
+            )
+        }
 
 /** Clear padding around view */
 fun View.clearPadding() =
-    setPadding(0, 0, 0,0)
+    setPadding(0, 0, 0, 0)
diff --git a/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/utils/extensions/Context.kt b/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/utils/extensions/Context.kt
@@ -10,7 +10,6 @@
 
 package org.readium.r2.testapp.utils.extensions
 
-import android.app.ProgressDialog
 import android.content.Context
 import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
@@ -25,10 +24,3 @@ import androidx.core.content.ContextCompat
 fun Context.color(@ColorRes id: Int): Int {
     return ContextCompat.getColor(this, id)
 }
-
-fun Context.blockingProgressDialog(message: String) =
-        ProgressDialog(this).apply {
-            setMessage(message)
-            isIndeterminate = true
-            show()
-        }
diff --git a/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/utils/extensions/Uri.kt b/test-app/r2-testapp/src/main/java/org/readium/r2/testapp/utils/extensions/Uri.kt
diff --git a/test-app/r2-testapp/src/main/res/layout/fragment_audiobook.xml b/test-app/r2-testapp/src/main/res/layout/fragment_audiobook.xml
diff --git a/test-app/r2-testapp/src/main/res/layout/fragment_catalog_detail.xml b/test-app/r2-testapp/src/main/res/layout/fragment_catalog_detail.xml
diff --git a/test-app/r2-testapp/src/main/res/layout/popup_window_user_settings.xml b/test-app/r2-testapp/src/main/res/layout/popup_window_user_settings.xml
diff --git a/test-app/r2-testapp/src/main/res/values/arrays.xml b/test-app/r2-testapp/src/main/res/values/arrays.xml
diff --git a/test-app/r2-testapp/src/main/res/values/strings.xml b/test-app/r2-testapp/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`	`* available in the top-level LICENSE file of the project.`
`5`	`5`	`*/`
`6`	`6`
	`7`	`+@file:Suppress("DEPRECATION")`
	`8`	`+`
`7`	`9`	`package org.readium.r2.testapp.audiobook`
`8`	`10`
`9`	`11`	`import android.app.ProgressDialog`
`@@ -67,6 +69,7 @@ class AudioNavigatorFragment(`
`67`	`69`	`}`
`68`	`70`	`}`
`69`	`71`
	`72`	`+ // TODO Replace or add a ProgressBar in the navigator to use here, then remove the deprecation annotation for this file`
`70`	`73`	`activity.mediaPlayer.progress = ProgressDialog.show(requireContext(), null, getString(R.string.progress_wait_while_preparing_audiobook), true)`
`71`	`74`	`initialLocator?.let { go(it) }`
`72`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,8 @@ class UserSettings(var preferences: SharedPreferences, val context: Context, pri`
`178`	`178`	`view.setProperty(userSetting.name, userSetting.toString())`
`179`	`179`	`}`
`180`	`180`
`181`		`-`
	`181`	`+ // There isn't an easy way to migrate from TabHost/TabWidget to TabLayout`
	`182`	`+ @Suppress("DEPRECATION")`
`182`	`183`	`fun userSettingsPopUp(): PopupWindow {`
`183`	`184`
`184`	`185`	`val layoutInflater = LayoutInflater.from(context)`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,7 @@ class OPDSDownloader(context: Context) {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`suspend fun publicationUrl(`
`45`		`- url: String,`
`46`		`- parameters: List<Pair<String, Any?>>? = null`
	`45`	`+ url: String`
`47`	`46`	`): Try<Pair<String, String>, Exception> {`
`48`	`47`	`val fileName = UUID.randomUUID().toString()`
`49`	`48`	`if (DEBUG) Timber.i("download url %s", url)`