diff --git a/CHANGELOG.md b/CHANGELOG.md index cd9ac1c..e30c163 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.4.0(2019-02-13) + +- Migrate to AndroidX + ## 1.3.5(2018-03-07) - Updated dependencies (Support library, build tools, Gradle). diff --git a/README.md b/README.md index 46031ce..d7dee4a 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ Download -------- ```groovy -compile 'eu.inloop:androidviewmodel:1.3.5' +compile 'eu.inloop:androidviewmodel:1.4.0' ``` ## Android Studio Template @@ -140,4 +140,4 @@ curl -o androidviewmodel.zip -Lk https://github.com/inloop/AndroidViewModel/arch In the Android Studio right click inside the Projet window and select `File > New > AndroidViewModel Inloop > AVM Fragment` -![Android Studio New Template](/template/create-new-template-preview.png) \ No newline at end of file +![Android Studio New Template](/template/create-new-template-preview.png) diff --git a/build.gradle b/build.gradle index 4916934..51a9613 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.3.1' } } diff --git a/gradle.properties b/gradle.properties index 35b39c4..f9ed904 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,6 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -VERSION_NAME=1.3.5 \ No newline at end of file +android.enableJetifier=true +android.useAndroidX=true +VERSION_NAME=1.4.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1e1ed4f..ab096e7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Nov 02 07:53:43 CET 2017 +#Wed Feb 13 17:35:05 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 0d8d9a6..87a4ceb 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -2,16 +2,15 @@ apply plugin: 'com.android.library' apply plugin: 'maven' android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 28 defaultConfig { minSdkVersion 15 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName VERSION_NAME consumerProguardFiles 'proguard-rules.pro' - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -26,13 +25,12 @@ android { } dependencies { - implementation 'com.android.support:support-fragment:27.1.0' - implementation 'com.android.support:appcompat-v7:27.1.0' - implementation 'com.android.support:support-v4:27.1.0' + implementation 'androidx.fragment:fragment:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.2' androidTestImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.1' - androidTestImplementation 'com.android.support.test:rules:1.0.1' + androidTestImplementation 'androidx.test:runner:1.1.2-alpha01' + androidTestImplementation 'androidx.test:rules:1.1.2-alpha01' } task androidJavadocs(type: Javadoc) { diff --git a/library/src/androidTest/java/eu/inloop/viewmodel/ViewModelActivityTest.java b/library/src/androidTest/java/eu/inloop/viewmodel/ViewModelActivityTest.java index 60dc5fb..15eb73f 100644 --- a/library/src/androidTest/java/eu/inloop/viewmodel/ViewModelActivityTest.java +++ b/library/src/androidTest/java/eu/inloop/viewmodel/ViewModelActivityTest.java @@ -2,11 +2,11 @@ import android.content.pm.ActivityInfo; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.MediumTest; -import android.support.test.filters.SmallTest; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; import org.junit.Rule; import org.junit.Test; diff --git a/library/src/androidTest/java/eu/inloop/viewmodel/fixture/activity/VMTestActivity.java b/library/src/androidTest/java/eu/inloop/viewmodel/fixture/activity/VMTestActivity.java index 0b47177..5e828f3 100644 --- a/library/src/androidTest/java/eu/inloop/viewmodel/fixture/activity/VMTestActivity.java +++ b/library/src/androidTest/java/eu/inloop/viewmodel/fixture/activity/VMTestActivity.java @@ -3,9 +3,9 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.widget.LinearLayout; import eu.inloop.viewmodel.base.ViewModelBaseActivity; diff --git a/library/src/androidTest/java/eu/inloop/viewmodel/fixture/activity/VMTestActivityViewModel.java b/library/src/androidTest/java/eu/inloop/viewmodel/fixture/activity/VMTestActivityViewModel.java index 1ec855b..129d230 100644 --- a/library/src/androidTest/java/eu/inloop/viewmodel/fixture/activity/VMTestActivityViewModel.java +++ b/library/src/androidTest/java/eu/inloop/viewmodel/fixture/activity/VMTestActivityViewModel.java @@ -1,8 +1,8 @@ package eu.inloop.viewmodel.fixture.activity; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import eu.inloop.viewmodel.AbstractViewModel; diff --git a/library/src/androidTest/java/eu/inloop/viewmodel/fixture/fragment/VMTestFragment.java b/library/src/androidTest/java/eu/inloop/viewmodel/fixture/fragment/VMTestFragment.java index 782467d..ca603af 100644 --- a/library/src/androidTest/java/eu/inloop/viewmodel/fixture/fragment/VMTestFragment.java +++ b/library/src/androidTest/java/eu/inloop/viewmodel/fixture/fragment/VMTestFragment.java @@ -1,8 +1,8 @@ package eu.inloop.viewmodel.fixture.fragment; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/library/src/androidTest/java/eu/inloop/viewmodel/fixture/fragment/VMTestFragmentViewModel.java b/library/src/androidTest/java/eu/inloop/viewmodel/fixture/fragment/VMTestFragmentViewModel.java index 6a1e300..e8710d7 100644 --- a/library/src/androidTest/java/eu/inloop/viewmodel/fixture/fragment/VMTestFragmentViewModel.java +++ b/library/src/androidTest/java/eu/inloop/viewmodel/fixture/fragment/VMTestFragmentViewModel.java @@ -1,8 +1,8 @@ package eu.inloop.viewmodel.fixture.fragment; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import eu.inloop.viewmodel.AbstractViewModel; diff --git a/library/src/main/java/eu/inloop/viewmodel/AbstractViewModel.java b/library/src/main/java/eu/inloop/viewmodel/AbstractViewModel.java index aada88b..560b4c3 100644 --- a/library/src/main/java/eu/inloop/viewmodel/AbstractViewModel.java +++ b/library/src/main/java/eu/inloop/viewmodel/AbstractViewModel.java @@ -3,11 +3,11 @@ import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.CheckResult; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.CallSuper; +import androidx.annotation.CheckResult; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.util.Log; import android.view.View; diff --git a/library/src/main/java/eu/inloop/viewmodel/IView.java b/library/src/main/java/eu/inloop/viewmodel/IView.java index dee387c..7bd2054 100644 --- a/library/src/main/java/eu/inloop/viewmodel/IView.java +++ b/library/src/main/java/eu/inloop/viewmodel/IView.java @@ -1,7 +1,7 @@ package eu.inloop.viewmodel; import android.app.Activity; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import eu.inloop.viewmodel.base.ViewModelBaseActivity; import eu.inloop.viewmodel.base.ViewModelBaseFragment; diff --git a/library/src/main/java/eu/inloop/viewmodel/IViewModelProvider.java b/library/src/main/java/eu/inloop/viewmodel/IViewModelProvider.java index 70e4555..76db555 100644 --- a/library/src/main/java/eu/inloop/viewmodel/IViewModelProvider.java +++ b/library/src/main/java/eu/inloop/viewmodel/IViewModelProvider.java @@ -1,6 +1,6 @@ package eu.inloop.viewmodel; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** * Your {@link android.app.Activity} must implement this interface if diff --git a/library/src/main/java/eu/inloop/viewmodel/ProxyViewHelper.java b/library/src/main/java/eu/inloop/viewmodel/ProxyViewHelper.java index f5a0b19..94d8ec4 100644 --- a/library/src/main/java/eu/inloop/viewmodel/ProxyViewHelper.java +++ b/library/src/main/java/eu/inloop/viewmodel/ProxyViewHelper.java @@ -1,11 +1,10 @@ package eu.inloop.viewmodel; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Proxy; import java.lang.reflect.Type; diff --git a/library/src/main/java/eu/inloop/viewmodel/ViewModelHelper.java b/library/src/main/java/eu/inloop/viewmodel/ViewModelHelper.java index b94b7f5..b00234d 100644 --- a/library/src/main/java/eu/inloop/viewmodel/ViewModelHelper.java +++ b/library/src/main/java/eu/inloop/viewmodel/ViewModelHelper.java @@ -2,12 +2,12 @@ import android.app.Activity; import android.content.Intent; -import android.databinding.DataBindingUtil; -import android.databinding.ViewDataBinding; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ViewDataBinding; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.util.Log; import android.view.LayoutInflater; @@ -34,7 +34,7 @@ public class ViewModelHelper> { /** * Call from {@link android.app.Activity#onCreate(android.os.Bundle)} or - * {@link android.support.v4.app.Fragment#onCreate(android.os.Bundle)} + * {@link androidx.core.app.Fragment#onCreate(android.os.Bundle)} * * @param activity parent activity * @param savedInstanceState savedInstance state from {@link Activity#onCreate(Bundle)} or @@ -86,7 +86,7 @@ public void onCreate(@NonNull Activity activity, } /** - * Call from {@link android.support.v4.app.Fragment#onViewCreated(android.view.View, android.os.Bundle)} + * Call from {@link androidx.core.app.Fragment#onViewCreated(android.view.View, android.os.Bundle)} * or {@link android.app.Activity#onCreate(android.os.Bundle)} * * @param view view @@ -133,8 +133,8 @@ public void performBinding(@NonNull final IView bindingView) { } /** - * Use in case this model is associated with an {@link android.support.v4.app.Fragment} - * Call from {@link android.support.v4.app.Fragment#onDestroyView()}. Use in case model is associated + * Use in case this model is associated with an {@link androidx.core.app.Fragment} + * Call from {@link androidx.core.app.Fragment#onDestroyView()}. Use in case model is associated * with Fragment * * @param fragment fragment @@ -152,8 +152,8 @@ public void onDestroyView(@NonNull Fragment fragment) { } /** - * Use in case this model is associated with an {@link android.support.v4.app.Fragment} - * Call from {@link android.support.v4.app.Fragment#onDestroy()} + * Use in case this model is associated with an {@link androidx.core.app.Fragment} + * Call from {@link androidx.core.app.Fragment#onDestroy()} * * @param fragment fragment */ @@ -194,7 +194,7 @@ public void onDestroy(@NonNull final Activity activity) { } /** - * Call from {@link android.app.Activity#onStop()} or {@link android.support.v4.app.Fragment#onStop()} + * Call from {@link android.app.Activity#onStop()} or {@link androidx.core.app.Fragment#onStop()} */ public void onStop() { if (mViewModel == null) { @@ -205,7 +205,7 @@ public void onStop() { } /** - * Call from {@link android.app.Activity#onStart()} ()} or {@link android.support.v4.app.Fragment#onStart()} ()} + * Call from {@link android.app.Activity#onStart()} ()} or {@link androidx.core.app.Fragment#onStart()} ()} */ public void onStart() { if (mViewModel == null) { @@ -234,7 +234,7 @@ public R getViewModel() { /** * Call from {@link android.app.Activity#onSaveInstanceState(android.os.Bundle)} - * or {@link android.support.v4.app.Fragment#onSaveInstanceState(android.os.Bundle)}. + * or {@link androidx.core.app.Fragment#onSaveInstanceState(android.os.Bundle)}. * This allows the model to save its state. * * @param bundle bundle diff --git a/library/src/main/java/eu/inloop/viewmodel/ViewModelProvider.java b/library/src/main/java/eu/inloop/viewmodel/ViewModelProvider.java index c484f72..ab07ecb 100644 --- a/library/src/main/java/eu/inloop/viewmodel/ViewModelProvider.java +++ b/library/src/main/java/eu/inloop/viewmodel/ViewModelProvider.java @@ -1,9 +1,9 @@ package eu.inloop.viewmodel; import android.app.Activity; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; -import android.support.v4.app.FragmentActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.FragmentActivity; import java.util.Collections; import java.util.HashMap; @@ -11,8 +11,8 @@ /** * Create and keep this class inside your Activity. Store it - * in {@link android.support.v4.app.FragmentActivity#onRetainCustomNonConfigurationInstance() - * and restore in {@link android.support.v4.app.FragmentActivity#onCreate(android.os.Bundle)} before + * in {@link androidx.core.app.FragmentActivity#onRetainCustomNonConfigurationInstance() + * and restore in {@link androidx.core.app.FragmentActivity#onCreate(android.os.Bundle)} before * calling the super implemenentation. */ public class ViewModelProvider { diff --git a/library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseActivity.java b/library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseActivity.java index 2a7dc47..f7b895a 100644 --- a/library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseActivity.java +++ b/library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseActivity.java @@ -1,9 +1,9 @@ package eu.inloop.viewmodel.base; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import eu.inloop.viewmodel.AbstractViewModel; import eu.inloop.viewmodel.IView; diff --git a/library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseEmptyActivity.java b/library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseEmptyActivity.java index 35ebd20..f98db59 100644 --- a/library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseEmptyActivity.java +++ b/library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseEmptyActivity.java @@ -1,9 +1,9 @@ package eu.inloop.viewmodel.base; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.CallSuper; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import eu.inloop.viewmodel.IViewModelProvider; import eu.inloop.viewmodel.ViewModelProvider; diff --git a/library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseFragment.java b/library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseFragment.java index 35851f1..19d57b9 100644 --- a/library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseFragment.java +++ b/library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseFragment.java @@ -1,10 +1,10 @@ package eu.inloop.viewmodel.base; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.View; import eu.inloop.viewmodel.AbstractViewModel; diff --git a/library/src/main/java/eu/inloop/viewmodel/binding/ViewModelBaseBindingFragment.java b/library/src/main/java/eu/inloop/viewmodel/binding/ViewModelBaseBindingFragment.java index abc4485..4fabe9e 100644 --- a/library/src/main/java/eu/inloop/viewmodel/binding/ViewModelBaseBindingFragment.java +++ b/library/src/main/java/eu/inloop/viewmodel/binding/ViewModelBaseBindingFragment.java @@ -1,13 +1,13 @@ package eu.inloop.viewmodel.binding; -import android.databinding.ViewDataBinding; +import androidx.databinding.ViewDataBinding; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import eu.inloop.viewmodel.AbstractViewModel; import eu.inloop.viewmodel.IView; diff --git a/library/src/main/java/eu/inloop/viewmodel/binding/ViewModelBindingConfig.java b/library/src/main/java/eu/inloop/viewmodel/binding/ViewModelBindingConfig.java index d008c47..4cb750c 100644 --- a/library/src/main/java/eu/inloop/viewmodel/binding/ViewModelBindingConfig.java +++ b/library/src/main/java/eu/inloop/viewmodel/binding/ViewModelBindingConfig.java @@ -1,8 +1,8 @@ package eu.inloop.viewmodel.binding; import android.content.Context; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; import eu.inloop.viewmodel.BR; diff --git a/library/src/main/java/eu/inloop/viewmodel/support/ViewModelStatePagerAdapter.java b/library/src/main/java/eu/inloop/viewmodel/support/ViewModelStatePagerAdapter.java index 4254e7a..c632fac 100644 --- a/library/src/main/java/eu/inloop/viewmodel/support/ViewModelStatePagerAdapter.java +++ b/library/src/main/java/eu/inloop/viewmodel/support/ViewModelStatePagerAdapter.java @@ -1,9 +1,9 @@ package eu.inloop.viewmodel.support; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; import android.util.Log; import android.view.ViewGroup; diff --git a/sample/build.gradle b/sample/build.gradle index 62412e8..228c3a8 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,13 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 28 defaultConfig { applicationId 'eu.inloop.viewmodel.sample' minSdkVersion 15 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName '1.0' } @@ -30,12 +29,12 @@ android { } dependencies { - implementation 'com.android.support:support-fragment:27.1.0' - implementation 'com.android.support:appcompat-v7:27.1.0' - implementation 'com.android.support:support-v4:27.1.0' + implementation 'androidx.fragment:fragment:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.2' + debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.1' releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1' - implementation 'com.jakewharton:butterknife:8.8.1' - annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' + implementation 'com.jakewharton:butterknife:10.0.0' + annotationProcessor 'com.jakewharton:butterknife-compiler:10.0.0' implementation project(':library') } diff --git a/sample/src/main/java/eu/inloop/viewmodel/sample/activity/ViewPagerActivity.java b/sample/src/main/java/eu/inloop/viewmodel/sample/activity/ViewPagerActivity.java index 7d7ec34..2e56405 100644 --- a/sample/src/main/java/eu/inloop/viewmodel/sample/activity/ViewPagerActivity.java +++ b/sample/src/main/java/eu/inloop/viewmodel/sample/activity/ViewPagerActivity.java @@ -1,10 +1,11 @@ package eu.inloop.viewmodel.sample.activity; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.view.ViewPager; + +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.viewpager.widget.ViewPager; import butterknife.BindView; import butterknife.ButterKnife; import eu.inloop.viewmodel.base.ViewModelBaseEmptyActivity; diff --git a/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/PagerFragment.java b/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/PagerFragment.java index d90717f..daf7d60 100644 --- a/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/PagerFragment.java +++ b/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/PagerFragment.java @@ -1,8 +1,8 @@ package eu.inloop.viewmodel.sample.fragment; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -11,7 +11,6 @@ import com.squareup.leakcanary.RefWatcher; import eu.inloop.viewmodel.base.ViewModelBaseFragment; -import eu.inloop.viewmodel.binding.ViewModelBindingConfig; import eu.inloop.viewmodel.sample.R; import eu.inloop.viewmodel.sample.SampleApplication; import eu.inloop.viewmodel.sample.viewmodel.PageModel; diff --git a/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/SampleBindingFragment.java b/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/SampleBindingFragment.java index 7fa2e9f..934666f 100644 --- a/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/SampleBindingFragment.java +++ b/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/SampleBindingFragment.java @@ -1,11 +1,11 @@ package eu.inloop.viewmodel.sample.fragment; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; +import androidx.fragment.app.Fragment; import eu.inloop.viewmodel.binding.ViewModelBaseBindingFragment; import eu.inloop.viewmodel.binding.ViewModelBindingConfig; import eu.inloop.viewmodel.sample.R; diff --git a/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/SampleBundleFragment.java b/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/SampleBundleFragment.java index 474a039..031a285 100644 --- a/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/SampleBundleFragment.java +++ b/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/SampleBundleFragment.java @@ -1,7 +1,7 @@ package eu.inloop.viewmodel.sample.fragment; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -9,7 +9,6 @@ import butterknife.ButterKnife; import eu.inloop.viewmodel.IView; import eu.inloop.viewmodel.base.ViewModelBaseFragment; -import eu.inloop.viewmodel.binding.ViewModelBindingConfig; import eu.inloop.viewmodel.sample.R; import eu.inloop.viewmodel.sample.viewmodel.SampleArgumentViewModel; diff --git a/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/UserListFragment.java b/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/UserListFragment.java index 92c8814..d415492 100644 --- a/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/UserListFragment.java +++ b/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/UserListFragment.java @@ -2,8 +2,8 @@ import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -21,7 +21,6 @@ import butterknife.BindView; import butterknife.ButterKnife; import eu.inloop.viewmodel.base.ViewModelBaseFragment; -import eu.inloop.viewmodel.binding.ViewModelBindingConfig; import eu.inloop.viewmodel.sample.R; import eu.inloop.viewmodel.sample.SampleApplication; import eu.inloop.viewmodel.sample.activity.SampleBindingActivity; diff --git a/sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/PageModel.java b/sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/PageModel.java index 69d4a9e..a238f1e 100644 --- a/sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/PageModel.java +++ b/sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/PageModel.java @@ -1,7 +1,7 @@ package eu.inloop.viewmodel.sample.viewmodel; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import eu.inloop.viewmodel.AbstractViewModel; import eu.inloop.viewmodel.sample.viewmodel.view.IPageView; diff --git a/sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/SampleArgumentViewModel.java b/sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/SampleArgumentViewModel.java index a8275a5..c31e0d3 100644 --- a/sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/SampleArgumentViewModel.java +++ b/sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/SampleArgumentViewModel.java @@ -1,7 +1,7 @@ package eu.inloop.viewmodel.sample.viewmodel; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import eu.inloop.viewmodel.AbstractViewModel; diff --git a/sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/SampleBindingViewModel.java b/sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/SampleBindingViewModel.java index 40a74e5..21f832f 100644 --- a/sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/SampleBindingViewModel.java +++ b/sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/SampleBindingViewModel.java @@ -1,8 +1,8 @@ package eu.inloop.viewmodel.sample.viewmodel; -import android.databinding.ObservableField; +import androidx.databinding.ObservableField; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import eu.inloop.viewmodel.AbstractViewModel; import eu.inloop.viewmodel.sample.viewmodel.view.ISampleBindingView; diff --git a/sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/UserListViewModel.java b/sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/UserListViewModel.java index 607cd43..58e5a0c 100644 --- a/sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/UserListViewModel.java +++ b/sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/UserListViewModel.java @@ -3,8 +3,8 @@ import android.annotation.SuppressLint; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/sample/src/main/res/layout/activity_pager.xml b/sample/src/main/res/layout/activity_pager.xml index 0c61343..e6e6d08 100644 --- a/sample/src/main/res/layout/activity_pager.xml +++ b/sample/src/main/res/layout/activity_pager.xml @@ -3,7 +3,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> -