diff --git a/app/build.gradle b/app/build.gradle index dac1338..4c930d2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,14 +17,14 @@ buildscript { } android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "com.dev.shreyansh.pixelwidget" minSdkVersion 21 targetSdkVersion 26 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -40,17 +40,17 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support.constraint:constraint-layout:1.1.0' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.1' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' + androidTestImplementation 'androidx.test:runner:1.1.0-alpha4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4' implementation 'com.google.android.gms:play-services-location:15.0.0' implementation 'com.google.android.gms:play-services-location:15.0.0' implementation 'com.google.android.gms:play-services-awareness:15.0.0' implementation 'org.apache.commons:commons-lang3:3.7' - implementation 'com.android.support:recyclerview-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'com.google.android.material:material:1.0.0' implementation 'com.google.android.gms:play-services-auth:15.0.0' implementation 'pub.devrel:easypermissions:0.3.0' implementation('com.google.api-client:google-api-client-android:1.23.0') { diff --git a/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/ForecastDisplay.java b/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/ForecastDisplay.java index 5132cdc..065c468 100644 --- a/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/ForecastDisplay.java +++ b/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/ForecastDisplay.java @@ -1,18 +1,15 @@ package com.dev.shreyansh.pixelwidget.UI; -import android.media.Image; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.text.Html; import android.util.Log; import android.view.MenuItem; import android.widget.ImageView; import android.widget.TextView; -import android.widget.Toast; import com.dev.shreyansh.pixelwidget.R; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.text.WordUtils; public class ForecastDisplay extends AppCompatActivity { diff --git a/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/GoogleAccountsActivity.java b/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/GoogleAccountsActivity.java index a156ba0..56409c6 100644 --- a/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/GoogleAccountsActivity.java +++ b/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/GoogleAccountsActivity.java @@ -4,8 +4,8 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; import android.view.MenuItem; diff --git a/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/MainActivity.java b/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/MainActivity.java index 60ffa56..c1c0f20 100644 --- a/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/MainActivity.java +++ b/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/MainActivity.java @@ -36,16 +36,16 @@ import android.os.Handler; import android.os.Looper; import android.provider.Settings; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.support.design.widget.AppBarLayout; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.appcompat.widget.DefaultItemAnimator; +import androidx.appcompat.widget.LinearLayoutManager; +import androidx.appcompat.widget.RecyclerView; import android.text.Html; import android.util.Log; import android.view.Menu; @@ -58,7 +58,6 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import android.widget.Toast; import com.crashlytics.android.Crashlytics; import com.dev.shreyansh.pixelwidget.R; @@ -72,21 +71,12 @@ import com.dev.shreyansh.pixelwidget.WeatherAndForecast.Weather; import com.google.android.gms.auth.api.signin.GoogleSignIn; import com.google.android.gms.auth.api.signin.GoogleSignInAccount; -import com.google.android.gms.awareness.Awareness; -import com.google.android.gms.awareness.snapshot.LocationResponse; -import com.google.android.gms.awareness.snapshot.LocationResult; import com.google.android.gms.common.ConnectionResult; -import com.google.android.gms.common.GooglePlayServicesUtil; import com.google.android.gms.common.api.GoogleApiClient; -import com.google.android.gms.common.api.ResultCallback; import com.google.android.gms.common.api.Scope; import com.google.android.gms.location.LocationListener; import com.google.android.gms.location.LocationRequest; import com.google.android.gms.location.LocationServices; -import com.google.android.gms.tasks.OnCompleteListener; -import com.google.android.gms.tasks.OnFailureListener; -import com.google.android.gms.tasks.OnSuccessListener; -import com.google.android.gms.tasks.Task; import com.google.api.services.calendar.CalendarScopes; import io.fabric.sdk.android.Fabric; diff --git a/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/PixelLikeWidget.java b/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/PixelLikeWidget.java index ca14575..4058f89 100644 --- a/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/PixelLikeWidget.java +++ b/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/PixelLikeWidget.java @@ -31,9 +31,9 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.util.Log; import android.widget.RemoteViews; diff --git a/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/SettingsActivity.java b/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/SettingsActivity.java index caa3943..62806fa 100644 --- a/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/SettingsActivity.java +++ b/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/SettingsActivity.java @@ -29,8 +29,8 @@ import android.net.Uri; import android.os.Bundle; import android.provider.Settings; -import android.support.v4.app.ActivityCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.CompoundButton; import android.widget.Switch; diff --git a/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/SplashActivity.java b/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/SplashActivity.java index db887d3..743c98f 100644 --- a/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/SplashActivity.java +++ b/app/src/main/java/com/dev/shreyansh/pixelwidget/UI/SplashActivity.java @@ -1,7 +1,7 @@ package com.dev.shreyansh.pixelwidget.UI; import android.content.Intent; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; public class SplashActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/dev/shreyansh/pixelwidget/Util/DividerItemDecoration.java b/app/src/main/java/com/dev/shreyansh/pixelwidget/Util/DividerItemDecoration.java index 72368c9..ed2e13b 100644 --- a/app/src/main/java/com/dev/shreyansh/pixelwidget/Util/DividerItemDecoration.java +++ b/app/src/main/java/com/dev/shreyansh/pixelwidget/Util/DividerItemDecoration.java @@ -5,8 +5,8 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.appcompat.widget.LinearLayoutManager; +import androidx.appcompat.widget.RecyclerView; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/main/java/com/dev/shreyansh/pixelwidget/Util/UpdateWidgetJobService.java b/app/src/main/java/com/dev/shreyansh/pixelwidget/Util/UpdateWidgetJobService.java index 5eb22dd..8af2e03 100644 --- a/app/src/main/java/com/dev/shreyansh/pixelwidget/Util/UpdateWidgetJobService.java +++ b/app/src/main/java/com/dev/shreyansh/pixelwidget/Util/UpdateWidgetJobService.java @@ -11,9 +11,9 @@ import android.location.LocationManager; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.util.Log; import android.widget.RemoteViews; @@ -21,12 +21,8 @@ import com.dev.shreyansh.pixelwidget.R; import com.dev.shreyansh.pixelwidget.WeatherAndForecast.FetchAsync; import com.dev.shreyansh.pixelwidget.WeatherAndForecast.Weather; -import com.google.android.gms.awareness.Awareness; -import com.google.android.gms.awareness.snapshot.LocationResult; import com.google.android.gms.common.ConnectionResult; -import com.google.android.gms.common.GooglePlayServicesUtil; import com.google.android.gms.common.api.GoogleApiClient; -import com.google.android.gms.common.api.ResultCallback; import com.google.android.gms.location.LocationListener; import com.google.android.gms.location.LocationRequest; import com.google.android.gms.location.LocationServices; diff --git a/app/src/main/java/com/dev/shreyansh/pixelwidget/WeatherAndForecast/ForecastAdapter.java b/app/src/main/java/com/dev/shreyansh/pixelwidget/WeatherAndForecast/ForecastAdapter.java index 684a504..ba28198 100644 --- a/app/src/main/java/com/dev/shreyansh/pixelwidget/WeatherAndForecast/ForecastAdapter.java +++ b/app/src/main/java/com/dev/shreyansh/pixelwidget/WeatherAndForecast/ForecastAdapter.java @@ -20,7 +20,7 @@ import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.v7.widget.RecyclerView; +import androidx.appcompat.widget.RecyclerView; import android.text.Html; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/res/layout/activity_google_accounts.xml b/app/src/main/res/layout/activity_google_accounts.xml index 658fdf9..11920d1 100644 --- a/app/src/main/res/layout/activity_google_accounts.xml +++ b/app/src/main/res/layout/activity_google_accounts.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 136be04..c484ad8 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -252,17 +252,17 @@ - - - + diff --git a/build.gradle b/build.gradle index 0e5b536..054f96d 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.2.0' classpath 'com.google.gms:google-services:3.2.1' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index aac7c9b..9e6fce1 100644 --- a/gradle.properties +++ b/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. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c49a583..7165635 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 29 01:25:13 IST 2018 +#Tue Oct 02 17:25:10 EDT 2018 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-4.6-all.zip