Make project build, refactoring

Author: Eduard Ablekimov

app/src/main/java/com/ackee/versionupdatehandler/setup/MainActivity.kt

@@ -46,13 +46,12 @@ class MainActivity : AppCompatActivity() {
                 button {
                     text = "Customized dialog"
                     onClick {
-                        getDefaultStatusResolver().checkVersionStatusAndOpenDialog(8, supportFragmentManager, DialogSettings.Builder()
-                            .title("My custom title")
-                            .messageRes(R.string.update_dialog_message)
-                            .positiveButton("Yaay")
-                            .negativeButton("Never")
-                            .build()
-                        )
+                        getDefaultStatusResolver().checkVersionStatusAndOpenDialog(8, supportFragmentManager, DialogSettings(
+                            title = "My custom title",
+                            messageRes = R.string.update_dialog_message,
+                            positiveButton = "Yaay",
+                            negativeButton = "Never"
+                        ))
                     }
                 }.lparams(width = matchParent) {
                     bottomMargin = dip(16)
@@ -79,10 +78,10 @@ class MainActivity : AppCompatActivity() {
         getDefaultStatusResolver().checkVersionStatusAndOpenDialog(version, supportFragmentManager)
     }
 
-    private fun getDefaultStatusResolver(minimalVersion: Int = 10, currentVersion: Int = 15): VersionStatusResolver {
+    private fun getDefaultStatusResolver(minimalVersion: Long = 10, currentVersion: Long = 15): VersionStatusResolver {
         return VersionStatusResolver(object : VersionFetcher {
             override suspend fun fetch(): VersionsConfiguration {
-                return BasicVersionsConfiguration(10, 15)
+                return BasicVersionsConfiguration(minimalVersion, currentVersion)
             }
         })
     }

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

@@ -8,7 +8,6 @@ import com.google.gson.FieldNamingPolicy
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonObject
 import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.http.GET

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

@@ -48,24 +48,33 @@ class UpdateDialog : DialogFragment() {
         return builder.create()
     }
 
-    private fun setupNegativeButton(settings: DialogSettings, builder: AlertDialog.Builder,
-        isForceUpdate: Boolean) {
-        var negButton: String? = "Cancel"
-        if (settings.negativeButton != null) {
-            negButton = settings.negativeButton
+    private fun setupTitle(settings: DialogSettings, builder: AlertDialog.Builder) {
+        var title: String? = "Update app"
+        if (settings.title != null) {
+            title = settings.title
         }
-        if (settings.negativeButtonRes > 0) {
-            negButton = getString(settings.negativeButtonRes)
+        if (settings.titleRes > 0) {
+            title = getString(settings.titleRes)
         }
-        builder.setNegativeButton(negButton) { _, _ ->
-            if (isForceUpdate) {
-                requireActivity().moveTaskToBack(true)
-            }
+        builder.setTitle(title)
+    }
+
+    private fun setupMessage(settings: DialogSettings, builder: AlertDialog.Builder) {
+        var message: String? = "Your application is outdated. Please update to the newest version"
+        if (settings.message != null) {
+            message = settings.message
+        }
+        if (settings.messageRes > 0) {
+            message = getString(settings.messageRes)
         }
+        builder.setMessage(message)
     }
 
-    private fun setupPositiveButton(settings: DialogSettings, builder: AlertDialog.Builder,
-        isForceUpdate: Boolean) {
+    private fun setupPositiveButton(
+        settings: DialogSettings,
+        builder: AlertDialog.Builder,
+        isForceUpdate: Boolean
+    ) {
         var posButton: String? = "Update"
         if (settings.positiveButton != null) {
             posButton = settings.positiveButton
@@ -83,26 +92,23 @@ class UpdateDialog : DialogFragment() {
         }
     }
 
-    private fun setupMessage(settings: DialogSettings, builder: AlertDialog.Builder) {
-        var message: String? = "Your application is outdated. Please update to the newest version"
-        if (settings.message != null) {
-            message = settings.message
-        }
-        if (settings.messageRes > 0) {
-            message = getString(settings.messageRes)
+    private fun setupNegativeButton(
+        settings: DialogSettings,
+        builder: AlertDialog.Builder,
+        isForceUpdate: Boolean
+    ) {
+        var negButton: String? = "Cancel"
+        if (settings.negativeButton != null) {
+            negButton = settings.negativeButton
         }
-        builder.setMessage(message)
-    }
-
-    private fun setupTitle(settings: DialogSettings, builder: AlertDialog.Builder) {
-        var title: String? = "Update app"
-        if (settings.title != null) {
-            title = settings.title
+        if (settings.negativeButtonRes > 0) {
+            negButton = getString(settings.negativeButtonRes)
         }
-        if (settings.titleRes > 0) {
-            title = getString(settings.titleRes)
+        builder.setNegativeButton(negButton) { _, _ ->
+            if (isForceUpdate) {
+                requireActivity().moveTaskToBack(true)
+            }
         }
-        builder.setTitle(title)
     }
 
     /**

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

@@ -32,7 +32,7 @@ class VersionStatusResolver(private val fetcher: VersionFetcher) {
     suspend fun checkVersionStatusAndOpenDialog(
         version: Int,
         fragmentManager: FragmentManager,
-        settings: DialogSettings = DialogSettings.Builder().build()
+        settings: DialogSettings = DialogSettings()
     ) {
         val versionStatus = checkVersionStatus(version)
         if (versionStatus != VersionStatus.UP_TO_DATE) {

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

@@ -8,13 +8,13 @@ import kotlinx.android.parcel.Parcelize
  */
 @Parcelize
 class DialogSettings(
-    val packageName: String?,
-    val title: String?,
-    val titleRes: Int,
-    val message: String?,
-    val messageRes: Int,
-    val positiveButton: String?,
-    val positiveButtonRes: Int,
-    val negativeButton: String?,
-    val negativeButtonRes: Int
+    val packageName: String? = null,
+    val title: String? = null,
+    val titleRes: Int = -1,
+    val message: String? = null,
+    val messageRes: Int = -1,
+    val positiveButton: String? = null,
+    val positiveButtonRes: Int = -1,
+    val negativeButton: String? = null,
+    val negativeButtonRes: Int = -1
 ) : Parcelable