Add ktlint-gradle and reformat code (#300)

Author: qnga

.editorconfig

@@ -0,0 +1,7 @@
+[*.{kt,kts}]
+
+ktlint_disabled_rules=no-wildcard-imports,max-line-length
+
+# Imports must be ordered in lexicographic order without any empty lines in-between.
+# https://github.com/pinterest/ktlint/issues/1236
+ij_kotlin_imports_layout=*

build.gradle.kts

@@ -11,6 +11,7 @@ plugins {
     id("com.android.library") apply false
     id("org.jetbrains.kotlin.android") apply false
     id("org.jetbrains.dokka") apply true
+    id("org.jlleitschuh.gradle.ktlint") apply true
 }
 
 allprojects {
@@ -26,6 +27,14 @@ subprojects {
         archiveClassifier.set("sources")
         from("src/main/java", "src/main/resources")
     }
+
+    apply(plugin = "org.jlleitschuh.gradle.ktlint")
+
+    ktlint {
+        android.set(true)
+        disabledRules.add("no-wildcard-imports")
+        disabledRules.add("max-line-length")
+    }
 }
 
 tasks.register("clean", Delete::class).configure {

gradle/libs.versions.toml

@@ -1,7 +1,5 @@
 [versions]
 
-android-gradle-plugin = "7.3.1"
-
 androidx-activity = "1.6.1"
 androidx-appcompat = "1.5.1"
 androidx-browser = "1.4.0"
@@ -146,8 +144,3 @@ navigation = ["androidx-navigation-fragment", "androidx-navigation-ui"]
 room = ["androidx-room-runtime", "androidx-room-ktx"]
 test-frameworks = ["junit", "androidx-ext-junit", "androidx-expresso-core", "robolectric", "kotlin-junit", "assertj", "kotlinx-coroutines-test"]
 
-[plugins]
-agpapp = { id = "com.android.application", version.ref = "android-gradle-plugin" }
-agplib = { id = "com.android.library", version.ref = "android-gradle-plugin" }
-kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

readium/adapters/pdfium/pdfium-document/src/main/java/org/readium/adapters/pdfium/document/PdfiumDocument.kt

@@ -9,7 +9,10 @@ package org.readium.adapters.pdfium.document
 import android.content.Context
 import android.graphics.Bitmap
 import android.os.ParcelFileDescriptor
+import com.shockwave.pdfium.PdfDocument as _PdfiumDocument
 import com.shockwave.pdfium.PdfiumCore
+import java.io.File
+import kotlin.reflect.KClass
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.readium.r2.shared.PdfSupport
@@ -20,9 +23,6 @@ import org.readium.r2.shared.util.pdf.PdfDocument
 import org.readium.r2.shared.util.pdf.PdfDocumentFactory
 import org.readium.r2.shared.util.use
 import timber.log.Timber
-import java.io.File
-import kotlin.reflect.KClass
-import com.shockwave.pdfium.PdfDocument as _PdfiumDocument
 
 @OptIn(PdfSupport::class)
 class PdfiumDocument(
@@ -84,7 +84,7 @@ class PdfiumDocumentFactory(context: Context) : PdfDocumentFactory<PdfiumDocumen
 
     override val documentType: KClass<PdfiumDocument> = PdfiumDocument::class
 
-    private val core by lazy { PdfiumCore(context.applicationContext ) }
+    private val core by lazy { PdfiumCore(context.applicationContext) }
 
     override suspend fun open(file: File, password: String?): PdfiumDocument =
         core.fromFile(file, password)

readium/adapters/pdfium/pdfium-navigator/src/main/java/org/readium/adapters/pdfium/navigator/PdfiumDefaults.kt

@@ -6,8 +6,8 @@
 
 package org.readium.adapters.pdfium.navigator
 
-import org.readium.r2.shared.ExperimentalReadiumApi
 import org.readium.r2.navigator.preferences.ReadingProgression
+import org.readium.r2.shared.ExperimentalReadiumApi
 
 /**
  * Default values for the PDF navigator with the PDFium adapter.

readium/adapters/pdfium/pdfium-navigator/src/main/java/org/readium/adapters/pdfium/navigator/PdfiumDocumentFragment.kt

@@ -13,6 +13,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
 import com.github.barteksc.pdfviewer.PDFView
+import kotlin.math.roundToInt
 import kotlinx.coroutines.launch
 import org.readium.adapters.pdfium.document.PdfiumDocumentFactory
 import org.readium.r2.navigator.pdf.PdfDocumentFragment
@@ -24,7 +25,6 @@ import org.readium.r2.shared.fetcher.Resource
 import org.readium.r2.shared.publication.Link
 import org.readium.r2.shared.publication.Publication
 import timber.log.Timber
-import kotlin.math.roundToInt
 
 @ExperimentalReadiumApi
 class PdfiumDocumentFragment internal constructor(
@@ -55,7 +55,11 @@ class PdfiumDocumentFragment internal constructor(
     private var isReloading: Boolean = false
     private var hasToReload: Int? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View =
         PDFView(inflater.context, null)
             .also { pdfView = it }
 

readium/adapters/pdfium/pdfium-navigator/src/main/java/org/readium/adapters/pdfium/navigator/PdfiumPreferencesEditor.kt

@@ -86,7 +86,7 @@ class PdfiumPreferencesEditor internal constructor(
 
     val scrollAxis: EnumPreference<Axis> =
         EnumPreferenceDelegate(
-            getValue = { preferences.scrollAxis},
+            getValue = { preferences.scrollAxis },
             getEffectiveValue = { state.settings.scrollAxis },
             getIsEffective = { true },
             updateValue = { value -> updateValues { it.copy(scrollAxis = value) } },

readium/adapters/pdfium/pdfium-navigator/src/main/java/org/readium/adapters/pdfium/navigator/PdfiumSettingsResolver.kt

@@ -6,12 +6,12 @@
 
 package org.readium.adapters.pdfium.navigator
 
-import org.readium.r2.shared.publication.ReadingProgression as PublicationReadingProgression
 import org.readium.r2.navigator.preferences.Axis
 import org.readium.r2.navigator.preferences.Fit
 import org.readium.r2.navigator.preferences.ReadingProgression
 import org.readium.r2.shared.ExperimentalReadiumApi
 import org.readium.r2.shared.publication.Metadata
+import org.readium.r2.shared.publication.ReadingProgression as PublicationReadingProgression
 
 @ExperimentalReadiumApi
 internal class PdfiumSettingsResolver(

readium/adapters/pspdfkit/pspdfkit-document/src/main/java/org/readium/adapters/pspdfkit/document/PsPdfKitDocument.kt

@@ -13,17 +13,17 @@ import com.pspdfkit.annotations.actions.GoToAction
 import com.pspdfkit.document.DocumentSource
 import com.pspdfkit.document.OutlineElement
 import com.pspdfkit.document.PageBinding
+import com.pspdfkit.document.PdfDocument as _PsPdfKitDocument
 import com.pspdfkit.document.PdfDocumentLoader
+import java.io.File
+import kotlin.reflect.KClass
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.readium.r2.shared.fetcher.Resource
 import org.readium.r2.shared.publication.ReadingProgression
 import org.readium.r2.shared.util.pdf.PdfDocument
 import org.readium.r2.shared.util.pdf.PdfDocumentFactory
 import timber.log.Timber
-import java.io.File
-import kotlin.reflect.KClass
-import com.pspdfkit.document.PdfDocument as _PsPdfKitDocument
 
 class PsPdfKitDocumentFactory(context: Context) : PdfDocumentFactory<PsPdfKitDocument> {
     private val context = context.applicationContext

readium/adapters/pspdfkit/pspdfkit-document/src/main/java/org/readium/adapters/pspdfkit/document/ResourceDataProvider.kt

@@ -7,13 +7,13 @@
 package org.readium.adapters.pspdfkit.document
 
 import com.pspdfkit.document.providers.DataProvider
+import java.util.*
 import kotlinx.coroutines.runBlocking
 import org.readium.r2.shared.fetcher.Resource
 import org.readium.r2.shared.fetcher.synchronized
 import org.readium.r2.shared.util.getOrElse
 import org.readium.r2.shared.util.isLazyInitialized
 import timber.log.Timber
-import java.util.*
 
 class ResourceDataProvider(
     resource: Resource,
@@ -57,4 +57,4 @@ class ResourceDataProvider(
             runBlocking { resource.close() }
         }
     }
-}
+}