syntax cleanup

r2-shared/src/main/java/org/readium/r2/shared/Properties.kt

@@ -41,8 +41,7 @@ class Properties : JSONable, Serializable {
 
     override fun getJSON(): JSONObject {
         val json = JSONObject()
-        if (contains.isNotEmpty())
-            json.put("contains", getStringArray(contains))
+        if (contains.isNotEmpty()) json.put("contains", getStringArray(contains))
         json.putOpt("mediaOverlay", mediaOverlay)
         json.putOpt("encryption", encryption)
         json.putOpt("layout", layout)

r2-shared/src/main/java/org/readium/r2/shared/UserProperties.kt

@@ -11,7 +11,8 @@ import java.io.Serializable
 sealed class UserProperty(var ref: String, var name: String) {
 
     private var value: String = ""
-    get() = this.toString()
+        get() = this.toString()
+
     abstract override fun toString(): String
     fun getJson(): String {
         return """{name:"$name",value:"${this}"}"""
@@ -22,9 +23,7 @@ sealed class UserProperty(var ref: String, var name: String) {
 
 // TODO add here your new Subclasses of UserPreference. It has to be an abstract class inheriting from UserSetting.
 
-class Enumerable(var index: Int, private val values: List<String>, ref: String, name: String) :
-        UserProperty(ref, name) {
-
+class Enumerable(var index: Int, private val values: List<String>, ref: String, name: String) : UserProperty(ref, name) {
     override fun toString() = values[index]
 }
 
@@ -34,11 +33,10 @@ class Incremental(var value: Float,
                   private val step: Float,
                   private val suffix: String,
                   ref: String,
-                  name: String) :
-        UserProperty(ref, name) {
+                  name: String) : UserProperty(ref, name) {
 
     fun increment() {
-        value +=  (if (value + step <= max) step else 0.0f)
+        value += (if (value + step <= max) step else 0.0f)
     }
 
     fun decrement() {
@@ -48,9 +46,7 @@ class Incremental(var value: Float,
     override fun toString() = value.toString() + suffix
 }
 
-class Switchable(onValue: String, offValue: String, var on: Boolean,
-        ref: String, name: String) :
-        UserProperty(ref, name) {
+class Switchable(onValue: String, offValue: String, var on: Boolean, ref: String, name: String) : UserProperty(ref, name) {
 
     private val values = mapOf(true to onValue, false to offValue)
 
@@ -78,7 +74,7 @@ class UserProperties : Serializable {
         properties.add(Enumerable(index, values, ref, name))
     }
 
-    fun <T : UserProperty>getByRef(ref: String) = properties.firstOrNull {
+    fun <T : UserProperty> getByRef(ref: String) = properties.firstOrNull {
         it.ref == ref
     }!! as T
 }

r2-shared/src/main/java/org/readium/r2/shared/opds/Group.kt

@@ -13,7 +13,7 @@ import java.io.Serializable
 
 data class Group(val title: String): Serializable {
      var metadata: OpdsMetadata = OpdsMetadata(title = title)
-    var links = mutableListOf<Link>()
+     var links = mutableListOf<Link>()
      var publications = mutableListOf<Publication>()
      var navigation = mutableListOf<Link>()