[Feature] Update lifecycle.

lheid · Jan 29, 2020 · a0a8e00 · a0a8e00
1 parent 99071d2
commit a0a8e00
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -61,8 +61,11 @@ dependencies {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0-rc03'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0-rc03'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
+    implementation "androidx.lifecycle:lifecycle-livedata:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-process:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-runtime:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel:2.2.0"
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03'
     implementation 'com.caverock:androidsvg-aar:1.4'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'

diff --git a/app/src/main/java/me/zhanghai/android/files/filelist/FileListFragment.java b/app/src/main/java/me/zhanghai/android/files/filelist/FileListFragment.java
@@ -51,7 +51,7 @@
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -292,7 +292,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
             return true;
         });
 
-        mViewModel = ViewModelProviders.of(this).get(FileListViewModel.class);
+        mViewModel = new ViewModelProvider(this).get(FileListViewModel.class);
         if (!mViewModel.hasTrail()) {
             Path path = mExtraPath;
             PickOptions pickOptions = null;

diff --git a/app/src/main/java/me/zhanghai/android/files/viewer/text/TextEditorFragment.java b/app/src/main/java/me/zhanghai/android/files/viewer/text/TextEditorFragment.java
@@ -29,7 +29,7 @@
 import androidx.core.widget.NestedScrollView;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import java8.nio.file.Path;
@@ -124,7 +124,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         AppCompatActivity activity = (AppCompatActivity) requireActivity();
         activity.setSupportActionBar(mToolbar);
 
-        mViewModel = ViewModelProviders.of(this).get(TextEditorViewModel.class);
+        mViewModel = new ViewModelProvider(this).get(TextEditorViewModel.class);
         // TODO: Move reload-prevent here so that we can also handle save-as, etc. Or maybe just get
         //  rid of the mPathLiveData in TextEditorViewModel.
         mViewModel.setPath(mExtraPath);