From a520bb5e377835505a7e26e5e655113419019615 Mon Sep 17 00:00:00 2001
From: Pietro Maggi <pmaggi@google.com>
Date: Tue, 16 Jul 2019 11:13:51 +0100
Subject: [PATCH] Update to WorkManager v.2.1

- Handle getInstance() deprecation
- Handle changes in WM dependencies
- Fix Blur Activity layout to align ProgressBar with images in documentation

Change-Id: Iab292f58b0c5dccafc9a0debe885e422a2fe00c9
---
 app/build.gradle                              |  9 ++-
 .../com/example/background/BlurViewModel.java | 13 +++--
 app/src/main/res/layout/activity_blur.xml     | 57 ++++++++++---------
 build.gradle                                  | 11 ++--
 4 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1d4c9ce..2bd9e97 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,10 +43,9 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "androidx.appcompat:appcompat:1.1.0-alpha04"
-    implementation "androidx.legacy:legacy-support-v4:1.0.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.0-alpha4"
+    implementation "androidx.appcompat:appcompat:1.1.0-rc01"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.0-beta2"
+    implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
     implementation "androidx.work:work-runtime:$versions.work"
-    implementation "com.github.bumptech.glide:glide:$versions.glide"
+    implementation "com.github.bumptech.glide:glide:4.9.0"
 }
diff --git a/app/src/main/java/com/example/background/BlurViewModel.java b/app/src/main/java/com/example/background/BlurViewModel.java
index 522cbe8..12b6fe4 100644
--- a/app/src/main/java/com/example/background/BlurViewModel.java
+++ b/app/src/main/java/com/example/background/BlurViewModel.java
@@ -16,8 +16,11 @@
 
 package com.example.background;
 
+import androidx.annotation.NonNull;
+import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
-import androidx.lifecycle.ViewModel;
+
+import android.app.Application;
 import android.net.Uri;
 import android.text.TextUtils;
 
@@ -39,16 +42,16 @@
 import static com.example.background.Constants.KEY_IMAGE_URI;
 import static com.example.background.Constants.TAG_OUTPUT;
 
-public class BlurViewModel extends ViewModel {
+public class BlurViewModel extends AndroidViewModel {
 
     private WorkManager mWorkManager;
     private Uri mImageUri;
     private Uri mOutputUri;
     private LiveData<List<WorkInfo>> mSavedWorkInfo;
 
-    public BlurViewModel() {
-
-        mWorkManager = WorkManager.getInstance();
+    public BlurViewModel(@NonNull Application application) {
+        super(application);
+        mWorkManager = WorkManager.getInstance(application);
 
         // This transformation makes sure that whenever the current work Id changes the WorkInfo
         // the UI is listening to changes
diff --git a/app/src/main/res/layout/activity_blur.xml b/app/src/main/res/layout/activity_blur.xml
index 14d3588..bfe82d9 100644
--- a/app/src/main/res/layout/activity_blur.xml
+++ b/app/src/main/res/layout/activity_blur.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright (C) 2018 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,26 +44,20 @@
 
 
         <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/radio_blur_group"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:checkedButton="@+id/radio_blur_lv_1"
-            android:orientation="vertical">
-
-            <RadioButton
-                android:id="@+id/radio_blur_lv_1"
+            android:orientation="vertical"
+            android:id="@+id/radio_blur_group"
+            android:checkedButton="@+id/radio_blur_lv_1">
+            <RadioButton android:id="@+id/radio_blur_lv_1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/blur_lv_1" />
-
-            <RadioButton
-                android:id="@+id/radio_blur_lv_2"
+            <RadioButton android:id="@+id/radio_blur_lv_2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/blur_lv_2" />
-
-            <RadioButton
-                android:id="@+id/radio_blur_lv_3"
+            <RadioButton android:id="@+id/radio_blur_lv_3"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/blur_lv_3" />
@@ -79,31 +74,39 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:layout_marginBottom="16dp"
+            android:layout_marginTop="8dp"
             android:gravity="center"
             android:orientation="horizontal">
 
-            <Button
-                android:id="@+id/cancel_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/cancel_work"
-                android:visibility="gone" />
-
-            <ProgressBar
-                android:id="@+id/progress_bar"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:indeterminate="true"
-                android:visibility="gone" />
+                android:orientation="horizontal">
+                <Button
+                    android:id="@+id/cancel_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/cancel_work"
+                    android:visibility="gone"
+                    />
+
+                <ProgressBar
+                    android:id="@+id/progress_bar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:indeterminate="true"
+                    android:visibility="gone"
+                    android:layout_gravity="center_horizontal"
+                    />
+            </LinearLayout>
 
             <Button
                 android:id="@+id/go_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/go" />
+                android:text="@string/go"
+                />
 
             <Button
                 android:id="@+id/see_file_button"
diff --git a/build.gradle b/build.gradle
index 863df12..41f1b73 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.4.2'
     }
 }
 
@@ -23,10 +23,7 @@ task clean(type: Delete) {
 }
 
 ext.versions = [:]
-versions.compileSdk = 28
+versions.compileSdk = 29
 versions.minSdk = 16
-versions.targetSdk = 27
-versions.support = "28.0.0"
-versions.constraint_layout = "1.1.3"
-versions.glide = "4.8.0"
-versions.work = "2.0.1"
+versions.targetSdk = 29
+versions.work = "2.1.0"