Merge pull request #3 from AckeeCZ/feature/java-to-kt

Rewritten to Kotlin. Replaced Rx with Coroutines. Added tests for Rest

Author: davidbilik

.gitignore

@@ -1,9 +1,43 @@
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+out/
+.out/
+out/
+build/
+.idea/*
+!.idea/localizerSettings.xml
+!.idea/mvpAddSettings.xml
+.gradle/
+captures/
+
+
+#iml files
 *.iml
-.gradle
-/local.properties
-/.idea
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# linux files
+.directory
+*.*~
+
+# mac files
 .DS_Store
-/build
-/captures
-.externalNativeBuild
-/projectFilesBackup*
+
+Thumbs.db
+thumbs.db
+
+outputs/mapping.txt
+
+artwork

.idea/encodings.xml

@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion Config.compileSdk
 
     defaultConfig {
         applicationId "com.ackee.versionupdatehandler"
-        minSdkVersion 15
-        targetSdkVersion 29
+        minSdkVersion Config.minSdk
+        targetSdkVersion Config.targetSdk
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -29,24 +29,18 @@ android {
     }
 }
 
-ext {
-    ankoVersion = "0.10.8"
-}
-
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':status-resolver')
+
+    implementation Dependencies.androidXAppCompat
+    implementation Dependencies.kotlinStdLib
+    implementation Dependencies.ankoSdk15
+    implementation Dependencies.ankoSdk21Coroutines
+    implementation Dependencies.ankoAppcompat
+
+    testImplementation Dependencies.jUnit
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    testImplementation 'junit:junit:4.12'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
-    // Anko
-    implementation "org.jetbrains.anko:anko-sdk15:$ankoVersion" // So here it's 15 too
-
-    // Anko libs matching support libs
-    implementation "org.jetbrains.anko:anko-appcompat-v7:${ankoVersion}"
-
-    implementation project(':status-resolver')
 }

.idea/gradle.xml

@@ -1,29 +1,33 @@
 package com.ackee.versionupdatehandler.setup
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.ackee.versionupdatehandler.R
+import com.ackee.versioupdatehandler.VersionFetcher
 import com.ackee.versioupdatehandler.VersionStatusResolver
 import com.ackee.versioupdatehandler.model.BasicVersionsConfiguration
 import com.ackee.versioupdatehandler.model.DialogSettings
 import com.ackee.versioupdatehandler.model.VersionStatus
-import io.reactivex.Single
+import com.ackee.versioupdatehandler.model.VersionsConfiguration
 import org.jetbrains.anko.*
+import org.jetbrains.anko.sdk21.coroutines.onClick
 import java.util.Random
 
 /**
  * Activity with samples
  */
 class MainActivity : AppCompatActivity() {
 
+    @SuppressLint("SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         scrollView {
             verticalLayout {
                 padding = dip(16)
                 button {
                     text = "Not mandatory update"
-                    setOnClickListener {
+                    onClick {
                         checkWithVersion(13)
                     }
                 }.lparams(width = matchParent) {
@@ -32,7 +36,7 @@ class MainActivity : AppCompatActivity() {
 
                 button {
                     text = "Mandatory update"
-                    setOnClickListener {
+                    onClick {
                         checkWithVersion(8)
                     }
                 }.lparams(width = matchParent) {
@@ -41,33 +45,26 @@ class MainActivity : AppCompatActivity() {
 
                 button {
                     text = "Customized dialog"
-                    setOnClickListener {
-                        VersionStatusResolver({
-                            Single.just(BasicVersionsConfiguration(10, 15))
-                        }).checkVersionStatusAndOpenDefault(8, supportFragmentManager, DialogSettings.Builder()
-                                .title("My custom title")
-                                .messageRes(R.string.update_dialog_message)
-                                .positiveButton("Yaay")
-                                .negativeButton("Never")
-                                .build()
-                        )
+                    onClick {
+                        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)
                 }
 
                 button {
                     text = "Custom UI"
-                    setOnClickListener {
-                        VersionStatusResolver({
-                            Single.just(BasicVersionsConfiguration(10, 15))
-                        }).checkVersionStatus(if (Random().nextInt() % 2 == 0) 8 else 12)
-                                .subscribe({
-                                    when (it) {
-                                        VersionStatus.UPDATE_AVAILABLE -> toast("Update is available")
-                                        VersionStatus.UPDATE_REQUIRED -> toast("Mandatory update is available")
-                                    }
-                                }, Throwable::printStackTrace)
+                    onClick {
+                        when (getDefaultStatusResolver().checkVersionStatus(if (Random().nextInt() % 2 == 0) 8 else 12)) {
+                            VersionStatus.UPDATE_AVAILABLE -> toast("Update is available")
+                            VersionStatus.UPDATE_REQUIRED -> toast("Mandatory update is available")
+                            VersionStatus.UP_TO_DATE -> toast("Up to date")
+                        }
                     }
                 }.lparams(width = matchParent) {
                     bottomMargin = dip(16)
@@ -76,10 +73,16 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun checkWithVersion(version: Int) {
+    private suspend fun checkWithVersion(version: Int) {
         // replace fetcher with some real one
-        VersionStatusResolver({
-            Single.just(BasicVersionsConfiguration(10, 15))
-        }).checkVersionStatusAndOpenDefault(version, supportFragmentManager)
+        getDefaultStatusResolver().checkVersionStatusAndOpenDialog(version, supportFragmentManager)
+    }
+
+    private fun getDefaultStatusResolver(minimalVersion: Long = 10, currentVersion: Long = 15): VersionStatusResolver {
+        return VersionStatusResolver(object : VersionFetcher {
+            override suspend fun fetch(): VersionsConfiguration {
+                return BasicVersionsConfiguration(minimalVersion, currentVersion)
+            }
+        })
     }
 }

.idea/misc.xml

@@ -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.3.50'
+    ext.kotlin_version = Config.kotlinVersion
 
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
@@ -19,6 +19,7 @@ allprojects {
     repositories {
         jcenter()
         google()
+        mavenCentral()
     }
 }