Companion objects formatting

Author: Eduard Ablekimov

firebase-fetcher/src/main/java/com/ackee/versionupdatehandler/FirebaseVersionFetcher.kt

@@ -15,6 +15,18 @@ class FirebaseVersionFetcher constructor(
     private val currentAttributeName: String = CURRENT_VERSION
 ) : VersionFetcher {
 
+    companion object {
+        const val MINIMAL_VERSION = "minimal_version_android"
+        const val CURRENT_VERSION = "current_version_android"
+
+        val DEFAULTS: Map<String, Any> by lazy {
+            mapOf(
+                MINIMAL_VERSION to -1,
+                CURRENT_VERSION to -1
+            )
+        }
+    }
+
     override suspend fun fetch(): VersionsConfiguration {
         val remoteConfig = FirebaseRemoteConfig.getInstance().apply {
             setDefaultsAsync(DEFAULTS)
@@ -27,16 +39,4 @@ class FirebaseVersionFetcher constructor(
         val currentVersion = remoteConfig.getLong(currentAttributeName)
         return BasicVersionsConfiguration(minimalVersion, currentVersion)
     }
-
-    companion object {
-        const val MINIMAL_VERSION = "minimal_version_android"
-        const val CURRENT_VERSION = "current_version_android"
-
-        val DEFAULTS: Map<String, Any> by lazy {
-            mapOf(
-                MINIMAL_VERSION to -1,
-                CURRENT_VERSION to -1
-            )
-        }
-    }
 }

rest-fetcher/src/main/java/com/ackee/versionupdatehandler/RestVersionFetcher.kt

@@ -28,6 +28,11 @@ class RestVersionFetcher constructor(
     private val minimalAttributeName: String = MINIMAL_VERSION
 ) : VersionFetcher {
 
+    companion object {
+        const val MINIMAL_VERSION = "minimal_version_android"
+        const val CURRENT_VERSION = "current_version_android"
+    }
+
     internal interface ApiDescription {
         @GET("app_version")
         suspend fun versions(): JsonObject?
@@ -60,11 +65,5 @@ class RestVersionFetcher constructor(
             BasicVersionsConfiguration(minimalVersion, currentVersion)
         }
     }
-
-    companion object {
-        val TAG = RestVersionFetcher::class.java.name
-        const val MINIMAL_VERSION = "minimal_version_android"
-        const val CURRENT_VERSION = "current_version_android"
-    }
 }
 

rest-fetcher/src/test/java/com/ackee/versionupdatehandler/RestVersionFetcherTest.kt

@@ -18,6 +18,11 @@ import org.junit.Test
  */
 class RestVersionFetcherTest {
 
+    companion object {
+        const val MINIMAL_VERSION = "minimal_version_android"
+        const val CURRENT_VERSION = "current_version_android"
+    }
+
     private lateinit var server: MockWebServer
 
     @Before
@@ -86,9 +91,4 @@ class RestVersionFetcherTest {
         Truth.assertThat(result.minimalVersion())
             .isEqualTo(10)
     }
-
-    companion object {
-        const val MINIMAL_VERSION = "minimal_version_android"
-        const val CURRENT_VERSION = "current_version_android"
-    }
 }

status-resolver/src/main/java/com/ackee/versioupdatehandler/UpdateDialog.kt

@@ -17,6 +17,19 @@ import com.ackee.versioupdatehandler.model.DialogSettings
  */
 class UpdateDialog : DialogFragment() {
 
+    companion object {
+        private const val FORCE_UPDATE_KEY = "force_update"
+        private const val DIALOG_SETTINGS_KEY = "dialog_settings"
+        fun newInstance(forceUpdate: Boolean, dialogSettings: DialogSettings?): UpdateDialog {
+            val args = Bundle()
+            args.putBoolean(FORCE_UPDATE_KEY, forceUpdate)
+            args.putParcelable(DIALOG_SETTINGS_KEY, dialogSettings)
+            val updateDialog = UpdateDialog()
+            updateDialog.arguments = args
+            return updateDialog
+        }
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val builder = AlertDialog.Builder(activity!!)
         val settings: DialogSettings =
@@ -84,17 +97,4 @@ class UpdateDialog : DialogFragment() {
             startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=$appPackageName")))
         }
     }
-
-    companion object {
-        private const val FORCE_UPDATE_KEY = "force_update"
-        private const val DIALOG_SETTINGS_KEY = "dialog_settings"
-        fun newInstance(forceUpdate: Boolean, dialogSettings: DialogSettings?): UpdateDialog {
-            val args = Bundle()
-            args.putBoolean(FORCE_UPDATE_KEY, forceUpdate)
-            args.putParcelable(DIALOG_SETTINGS_KEY, dialogSettings)
-            val updateDialog = UpdateDialog()
-            updateDialog.arguments = args
-            return updateDialog
-        }
-    }
 }

status-resolver/src/main/java/com/ackee/versioupdatehandler/VersionFetcher.kt

@@ -7,9 +7,5 @@ import com.ackee.versioupdatehandler.model.VersionsConfiguration
  */
 interface VersionFetcher {
 
-    companion object {
-        val TAG = VersionFetcher::class.java.name
-    }
-
     suspend fun fetch(): VersionsConfiguration
 }

status-resolver/src/main/java/com/ackee/versioupdatehandler/VersionStatusResolver.kt

@@ -63,8 +63,4 @@ class VersionStatusResolver(private val fetcher: VersionFetcher) {
     ) {
         UpdateDialog.newInstance(forceUpdate, dialogSettings).show(fragmentManager, UpdateDialog::class.java.name)
     }
-
-    companion object {
-        val TAG = VersionStatusResolver::class.java.name
-    }
 }

status-resolver/src/main/java/com/ackee/versioupdatehandler/model/BasicVersionsConfiguration.kt

@@ -8,10 +8,6 @@ open class BasicVersionsConfiguration(
     private val currentVersion: Long
 ) : VersionsConfiguration {
 
-    companion object {
-        val TAG = BasicVersionsConfiguration::class.java.name
-    }
-
     override fun minimalVersion(): Long {
         return minimalVersion
     }

status-resolver/src/main/java/com/ackee/versioupdatehandler/model/DialogSettings.kt

@@ -8,19 +8,6 @@ import android.os.Parcelable
  */
 class DialogSettings : Parcelable {
 
-    companion object {
-        val TAG = DialogSettings::class.java.name
-        val CREATOR: Parcelable.Creator<DialogSettings> = object : Parcelable.Creator<DialogSettings> {
-            override fun createFromParcel(parcelableValue: Parcel): DialogSettings? {
-                return DialogSettings(parcelableValue)
-            }
-
-            override fun newArray(size: Int): Array<DialogSettings?> {
-                return arrayOfNulls(size)
-            }
-        }
-    }
-
     var packageName: String?
     var title: String?
     var titleRes: Int

status-resolver/src/test/java/com/ackee/versioupdatehandler/VersionStatusResolverTest.kt

@@ -15,6 +15,10 @@ import kotlinx.coroutines.runBlocking
  */
 class VersionStatusResolverTest {
 
+    companion object {
+        val BASIC_VERSIONS_CONFIGURATION = BasicVersionsConfiguration(10, 15)
+    }
+
     @Test
     fun should_be_up_to_date_greater_than_last() {
         checkSuccess(15, VersionStatus.UP_TO_DATE)
@@ -45,8 +49,4 @@ class VersionStatusResolverTest {
         Truth.assertThat(versionStatus)
             .isEqualTo(expectedResult)
     }
-
-    companion object {
-        val BASIC_VERSIONS_CONFIGURATION = BasicVersionsConfiguration(10, 15)
-    }
 }