From 021a762b567026d55c09220772e32a8ebc75843a Mon Sep 17 00:00:00 2001 From: Sagar Date: Sat, 22 Jan 2022 17:58:48 +0530 Subject: [PATCH] migrated androidx --- app/build.gradle | 23 +++++++++---------- app/src/main/AndroidManifest.xml | 7 ++++-- .../shushme/GeofenceBroadcastReceiver.java | 10 ++++++++ .../example/android/shushme/Geofencing.java | 3 ++- .../example/android/shushme/MainActivity.java | 14 ++++++----- .../android/shushme/PlaceListAdapter.java | 3 ++- .../provider/PlaceContentProvider.java | 3 ++- app/src/main/res/layout/activity_main.xml | 2 +- build.gradle | 8 ++++--- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 11 files changed, 48 insertions(+), 29 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4a0fc28f..4f5bcd5d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 31 defaultConfig { applicationId "com.example.android.shushme" - minSdkVersion 16 - targetSdkVersion 25 + minSdkVersion 19 + targetSdkVersion 31 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -20,13 +19,13 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.1.0' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.google.android.gms:play-services-places:9.8.0' - compile 'com.google.android.gms:play-services-location:9.8.0' - testCompile 'junit:junit:4.12' + implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'com.google.android.gms:play-services-places:17.0.0' + implementation 'com.google.android.gms:play-services-location:19.0.1' + testImplementation 'junit:junit:4.13.2' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c5fbcc1a..af72c150 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,9 @@ + + + - + @@ -30,5 +34,4 @@ - \ No newline at end of file diff --git a/app/src/main/java/com/example/android/shushme/GeofenceBroadcastReceiver.java b/app/src/main/java/com/example/android/shushme/GeofenceBroadcastReceiver.java index 84a1864f..c72ca920 100644 --- a/app/src/main/java/com/example/android/shushme/GeofenceBroadcastReceiver.java +++ b/app/src/main/java/com/example/android/shushme/GeofenceBroadcastReceiver.java @@ -16,11 +16,21 @@ * limitations under the License. */ +import android.app.NotificationManager; +import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.graphics.BitmapFactory; +import android.media.AudioManager; import android.util.Log; +import androidx.core.app.NotificationCompat; +import androidx.core.app.TaskStackBuilder; + +import com.google.android.gms.location.Geofence; +import com.google.android.gms.location.GeofencingEvent; + public class GeofenceBroadcastReceiver extends BroadcastReceiver { public static final String TAG = GeofenceBroadcastReceiver.class.getSimpleName(); diff --git a/app/src/main/java/com/example/android/shushme/Geofencing.java b/app/src/main/java/com/example/android/shushme/Geofencing.java index bd8a2fa1..b7963bba 100644 --- a/app/src/main/java/com/example/android/shushme/Geofencing.java +++ b/app/src/main/java/com/example/android/shushme/Geofencing.java @@ -19,9 +19,10 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; import android.util.Log; +import androidx.annotation.NonNull; + import com.google.android.gms.common.api.GoogleApiClient; import com.google.android.gms.common.api.Result; import com.google.android.gms.common.api.ResultCallback; diff --git a/app/src/main/java/com/example/android/shushme/MainActivity.java b/app/src/main/java/com/example/android/shushme/MainActivity.java index d60dee02..e5eae443 100644 --- a/app/src/main/java/com/example/android/shushme/MainActivity.java +++ b/app/src/main/java/com/example/android/shushme/MainActivity.java @@ -24,12 +24,6 @@ import android.database.Cursor; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.ActivityCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.View; import android.widget.CheckBox; @@ -37,6 +31,13 @@ import android.widget.Switch; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.example.android.shushme.provider.PlaceContract; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GooglePlayServicesNotAvailableException; @@ -211,6 +212,7 @@ public void onAddPlaceButtonClicked(View view) { * @param data The Intent that carries the result data. */ protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); if (requestCode == PLACE_PICKER_REQUEST && resultCode == RESULT_OK) { Place place = PlacePicker.getPlace(this, data); if (place == null) { diff --git a/app/src/main/java/com/example/android/shushme/PlaceListAdapter.java b/app/src/main/java/com/example/android/shushme/PlaceListAdapter.java index c48916ac..91811c1e 100644 --- a/app/src/main/java/com/example/android/shushme/PlaceListAdapter.java +++ b/app/src/main/java/com/example/android/shushme/PlaceListAdapter.java @@ -17,12 +17,13 @@ */ import android.content.Context; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.google.android.gms.location.places.PlaceBuffer; public class PlaceListAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/com/example/android/shushme/provider/PlaceContentProvider.java b/app/src/main/java/com/example/android/shushme/provider/PlaceContentProvider.java index 21f0b3fb..80b3c153 100644 --- a/app/src/main/java/com/example/android/shushme/provider/PlaceContentProvider.java +++ b/app/src/main/java/com/example/android/shushme/provider/PlaceContentProvider.java @@ -24,10 +24,11 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; -import android.support.annotation.NonNull; import static com.example.android.shushme.provider.PlaceContract.PlaceEntry; +import androidx.annotation.NonNull; + public class PlaceContentProvider extends ContentProvider { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 96981fe6..32ed48a2 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -156,7 +156,7 @@ android:layout_marginTop="4dp" android:background="@color/colorPrimary" /> - diff --git a/build.gradle b/build.gradle index 74b2ab0d..61019c1a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { - jcenter() + google() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:7.0.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -14,7 +15,8 @@ buildscript { allprojects { repositories { - jcenter() + google() + mavenCentral() } } diff --git a/gradle.properties b/gradle.properties index aac7c9b4..29b531a1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. org.gradle.jvmargs=-Xmx1536m - +android.useAndroidX=true # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f3..f3bd5913 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip