Merge pull request #8 from Qase/FEAT/androidx

Feat/androidx

.travis.yml

@@ -1,8 +1,8 @@
 language: android
 android:
   components:
-  - build-tools-27.0.3
-  - android-27
+    - build-tools-28.0.3
+    - android-28
   licenses:
   - android-sdk-preview-license-.+
   - android-sdk-license-.+

build.gradle

@@ -1,15 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.51'
+    ext.kotlin_version = '1.3.50'
     ext.architecture_components_version = '1.1.1'
     repositories {
         google()
         jcenter()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

demo/build.gradle

@@ -4,14 +4,14 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.qase.android.appskeletondemo"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -21,36 +21,31 @@ android {
     }
 }
 
-kapt {
-    generateStubs = true
-}
-
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+
     implementation project(':skeleton')
 
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.core:core-ktx:1.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha06'
+    implementation 'com.google.android.material:material:1.1.0-alpha07'
+    implementation 'androidx.fragment:fragment:1.1.0-beta01'
+    implementation 'androidx.preference:preference:1.1.0-beta01'
 
 
-    implementation "com.android.support:support-core-utils:27.1.1"
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    // PreferenceFragmentCompat (because we use android.support.v4.app.Fragment)
-    implementation 'com.android.support:preference-v7:27.1.1'
-    implementation 'com.android.support:multidex:1.0.3'
-    implementation 'com.android.support:design:27.1.1'
 
     // Architecture Components
-    implementation "android.arch.lifecycle:runtime:$architecture_components_version"
-    implementation "android.arch.lifecycle:extensions:$architecture_components_version"
-    kapt "android.arch.lifecycle:compiler:$architecture_components_version"
+    implementation "androidx.lifecycle:lifecycle-runtime:2.2.0-alpha01"
+    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0-alpha01"
+    kapt "androidx.lifecycle:lifecycle-compiler:2.2.0-alpha01"
 
     // RxJava
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.14'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.8'
 
     //Dagger
     implementation 'com.google.dagger:dagger:2.11'

demo/src/main/java/com/qase/android/appskeletondemo/MainActivity.kt

@@ -2,20 +2,20 @@ package com.qase.android.appskeletondemo
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.design.widget.NavigationView
-import android.support.v4.view.GravityCompat
-import android.support.v4.widget.DrawerLayout
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import androidx.core.view.GravityCompat
+import androidx.drawerlayout.widget.DrawerLayout
+import com.google.android.material.navigation.NavigationView
 import com.qase.android.appskeleton.activity.BaseActivityViewHelper
 import com.qase.android.appskeleton.activity.BaseMainActivity
 import com.qase.android.appskeleton.activity.DefaultDrawerActivityViewHelper
 import com.qase.android.appskeletondemo.main.preference.SettingsFragment
 import com.qase.android.appskeletondemo.main.test.TestFragment
 import com.qase.android.appskeletondemo.main.test.TestFragment2
 import com.qase.android.appskeletondemo.main.test.TestFragment3
-import com.qase.android.appskeletondemo.main.testviewmodel.TestDaggerFragment
+import com.qase.android.appskeletondemo.main.testdagger.TestDaggerFragment
 import com.qase.android.appskeletondemo.main.testviewmodel.TestvmFragment
 
 class MainActivity : BaseMainActivity(), NavigationView.OnNavigationItemSelectedListener {

demo/src/main/java/com/qase/android/appskeletondemo/main/testdagger/AppComponent.kt

@@ -1,7 +1,6 @@
 package com.qase.android.appskeletondemo.main.testdagger
 
 import com.qase.android.appskeleton.BaseAppComponent
-import com.qase.android.appskeletondemo.main.testviewmodel.TestDaggerViewModel
 import dagger.Component
 import javax.inject.Singleton
 

demo/src/main/java/com/qase/android/appskeletondemo/main/testdagger/TestDaggerFragment.kt

@@ -1,10 +1,10 @@
-package com.qase.android.appskeletondemo.main.testviewmodel
+package com.qase.android.appskeletondemo.main.testdagger
 
-import android.arch.lifecycle.Observer
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.lifecycle.Observer
 import com.qase.android.appskeleton.fragment.BaseBundle
 import com.qase.android.appskeleton.fragment.BaseViewModelFragment
 import com.qase.android.appskeletondemo.R
@@ -20,7 +20,7 @@ class TestDaggerFragment : BaseViewModelFragment<BaseBundle, TestDaggerViewModel
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        viewModel.testLiveData.observe(this, Observer {
+        viewModel.testLiveData.observe(viewLifecycleOwner, Observer {
             textData.text = it?.toString()
         })
     }

demo/src/main/java/com/qase/android/appskeletondemo/main/testdagger/TestDaggerViewModel.kt

@@ -1,10 +1,8 @@
-package com.qase.android.appskeletondemo.main.testviewmodel
+package com.qase.android.appskeletondemo.main.testdagger
 
-import android.arch.lifecycle.MutableLiveData
+import androidx.lifecycle.MutableLiveData
 import com.qase.android.appskeleton.fragment.BaseBundle
 import com.qase.android.appskeleton.fragment.InjectedBaseViewModel
-import com.qase.android.appskeletondemo.main.testdagger.AppComponent
-import com.qase.android.appskeletondemo.main.testdagger.TestManager
 import javax.inject.Inject
 
 class TestDaggerViewModel : InjectedBaseViewModel<BaseBundle, AppComponent>() {

demo/src/main/java/com/qase/android/appskeletondemo/main/testdagger/TestManager.kt

@@ -1,6 +1,6 @@
 package com.qase.android.appskeletondemo.main.testdagger
 
-import android.arch.lifecycle.MutableLiveData
+import androidx.lifecycle.MutableLiveData
 import io.reactivex.Observable
 import io.reactivex.schedulers.Schedulers
 import java.lang.Thread.sleep

demo/src/main/java/com/qase/android/appskeletondemo/main/testviewmodel/TestvmFragment.kt

@@ -1,10 +1,10 @@
 package com.qase.android.appskeletondemo.main.testviewmodel
 
-import android.arch.lifecycle.Observer
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.lifecycle.Observer
 import com.qase.android.appskeleton.fragment.BaseBundle
 import com.qase.android.appskeleton.fragment.BaseViewModelFragment
 import com.qase.android.appskeletondemo.R
@@ -21,7 +21,7 @@ class TestvmFragment : BaseViewModelFragment<BaseBundle, TestvmViewModel>(Testvm
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         getDataButton.setOnClickListener{ viewModel.onGetDataClicked() }
-        viewModel.testLiveData.observe(this, Observer {
+        viewModel.testLiveData.observe(viewLifecycleOwner, Observer {
             textData.text = it?.toString()
         })
     }

demo/src/main/java/com/qase/android/appskeletondemo/main/testviewmodel/TestvmViewModel.kt

@@ -1,6 +1,6 @@
 package com.qase.android.appskeletondemo.main.testviewmodel
 
-import android.arch.lifecycle.MutableLiveData
+import androidx.lifecycle.MutableLiveData
 import com.qase.android.appskeleton.fragment.BaseBundle
 import com.qase.android.appskeleton.fragment.BaseViewModel
 import io.reactivex.Observable

demo/src/main/res/layout/activity_custom_view.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -87,4 +87,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/fragment_container" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

demo/src/main/res/xml/main_preferences.xml

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <android.support.v7.preference.CheckBoxPreference
+    <androidx.preference.CheckBoxPreference
         android:defaultValue="true"
         android:key="test_bool"
         android:summary="Testing bool pref summary"
         android:title="Testing bool preference" />
 
-    <android.support.v7.preference.EditTextPreference
+    <androidx.preference.EditTextPreference
         android:defaultValue=""
         android:key="test_string"
         android:summary="Testing string pref summary"
         android:title="Testing string preference" />
 
-    <android.support.v7.preference.ListPreference
+    <androidx.preference.ListPreference
         android:defaultValue="Entry 2"
         android:dialogTitle="Choose preference 2"
         android:entries="@array/pref_test2_entries"
         android:entryValues="@array/pref_test2_entries"
         android:key="pref_test2"
         android:title="Preference 2" />
 
-</android.support.v7.preference.PreferenceScreen>
+</androidx.preference.PreferenceScreen>

gradle.properties

@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri May 04 10:42:02 CEST 2018
+#Wed Nov 13 14:18:46 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

skeleton/build.gradle

@@ -4,15 +4,15 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
-        versionName "0.2.0"
+        versionName "0.3.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -28,34 +28,37 @@ android {
     }
 }
 
-kapt {
-    generateStubs = true
-}
-
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+//    implementation 'com.android.support:appcompat-v7:27.1.1'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    androidTestImplementation 'com.android.support:multidex:1.0.3'
+//    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+//    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+//    androidTestImplementation 'com.android.support:multidex:1.0.3'
 
-    implementation 'com.android.support:multidex:1.0.3'
-    implementation 'com.android.support:preference-v7:27.1.1'
+//    implementation 'com.android.support:multidex:1.0.3'
+//    implementation 'com.android.support:preference-v7:27.1.1'
 
-    implementation 'com.android.support:design:27.1.1'
+//    implementation 'com.android.support:design:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-rc01'
+    implementation 'com.google.android.material:material:1.2.0-alpha01'
+    implementation 'androidx.fragment:fragment:1.2.0-rc01'
+    implementation 'androidx.preference:preference:1.1.0'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // Architecture Components
-    implementation "android.arch.lifecycle:runtime:$architecture_components_version"
-    implementation "android.arch.lifecycle:extensions:$architecture_components_version"
-    kapt "android.arch.lifecycle:compiler:$architecture_components_version"
+    implementation "androidx.lifecycle:lifecycle-runtime:2.2.0-rc02"
+    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0-rc02"
+    kapt "androidx.lifecycle:lifecycle-compiler:2.2.0-rc02"
 
     //RxJava
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.14'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.10'
 }
 
 repositories {

skeleton/src/main/java/com/qase/android/appskeleton/activity/BaseMainActivity.kt

@@ -1,9 +1,9 @@
 package com.qase.android.appskeleton.activity
 
 import android.os.Bundle
-import android.support.design.widget.NavigationView
-import android.support.v7.app.AppCompatActivity
 import android.util.Log
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.navigation.NavigationView
 import com.qase.android.appskeleton.BaseApp
 
 /**

skeleton/src/main/java/com/qase/android/appskeleton/activity/DefaultDrawerActivityViewHelper.kt

@@ -1,12 +1,12 @@
 package com.qase.android.appskeleton.activity
 
-import android.support.annotation.DrawableRes
-import android.support.annotation.LayoutRes
-import android.support.annotation.MenuRes
-import android.support.annotation.StringRes
-import android.support.design.widget.NavigationView
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.annotation.LayoutRes
+import androidx.annotation.MenuRes
+import androidx.annotation.StringRes
+import com.google.android.material.navigation.NavigationView
 import com.qase.android.appskeleton.R
 import kotlinx.android.synthetic.main.activity_main.*
 
@@ -34,8 +34,8 @@ open class DefaultDrawerActivityViewHelper(listener: NavigationView.OnNavigation
     constructor(listener: NavigationView.OnNavigationItemSelectedListener,
                 @MenuRes menuRes: Int? = null,
                 @DrawableRes headerIconRes: Int? = null,
-                @StringRes headerTextPrimary: String? = null,
-                @StringRes headerTextSecondary: String? = null) : this(listener) {
+                headerTextPrimary: String? = null,
+                headerTextSecondary: String? = null) : this(listener) {
         this.menuRes = menuRes
         this.headerIconRes = headerIconRes
         this.headerTextPrimary = headerTextPrimary