From 0ca14d764152158ab399ed17329ea5f0624b1315 Mon Sep 17 00:00:00 2001 From: Anand Deshmukh Date: Wed, 9 Oct 2019 23:10:07 +0530 Subject: [PATCH] Migrated to AndroidX --- app/build.gradle | 16 +++---- .../appathon/ExampleInstrumentedTest.java | 4 +- .../mayankaggarwal/appathon/AddContact.java | 15 +++--- .../mayankaggarwal/appathon/AddProduct.java | 25 ++-------- .../mayankaggarwal/appathon/MainActivity.java | 47 +++++-------------- .../appathon/RVConatctList.java | 5 +- .../mayankaggarwal/appathon/RVOrderList.java | 2 +- .../mayankaggarwal/appathon/SeeOrder.java | 6 +-- .../appathon/SuccessActivity.java | 7 +-- .../appathon/SuccessProduct.java | 4 +- .../main/res/layout/activity_add_contact.xml | 2 +- app/src/main/res/layout/activity_main.xml | 4 +- .../main/res/layout/activity_see_order.xml | 4 +- app/src/main/res/layout/app_bar_main.xml | 10 ++-- app/src/main/res/layout/content_main.xml | 28 +++++------ app/src/main/res/layout/order_item_layout.xml | 8 ++-- build.gradle | 10 +++- gradle.properties | 2 + gradle/wrapper/gradle-wrapper.properties | 4 +- 19 files changed, 84 insertions(+), 119 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 970d86f..e809b02 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 + compileSdkVersion 28 buildToolsVersion "25.0.2" defaultConfig { applicationId "com.example.mayankaggarwal.appathon" minSdkVersion 19 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -22,14 +22,14 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.1.1' - compile 'com.android.support:design:25.1.1' + compile 'androidx.appcompat:appcompat:1.0.0' + compile 'com.google.android.material:material:1.0.0' - compile 'com.android.support:cardview-v7:25.1.1' - compile 'com.android.support:support-v4:25.1.1' + compile 'androidx.cardview:cardview:1.0.0' + compile 'androidx.legacy:legacy-support-v4:1.0.0' compile 'com.google.code.gson:gson:2.7' compile 'com.squareup.retrofit2:retrofit:2.1.0' compile 'com.squareup.retrofit2:converter-gson:2.1.0' diff --git a/app/src/androidTest/java/com/example/mayankaggarwal/appathon/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/mayankaggarwal/appathon/ExampleInstrumentedTest.java index 54d270f..a478d10 100644 --- a/app/src/androidTest/java/com/example/mayankaggarwal/appathon/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/example/mayankaggarwal/appathon/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.example.mayankaggarwal.appathon; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/java/com/example/mayankaggarwal/appathon/AddContact.java b/app/src/main/java/com/example/mayankaggarwal/appathon/AddContact.java index 3e50a78..7427886 100644 --- a/app/src/main/java/com/example/mayankaggarwal/appathon/AddContact.java +++ b/app/src/main/java/com/example/mayankaggarwal/appathon/AddContact.java @@ -9,16 +9,15 @@ import android.graphics.drawable.Drawable; import android.os.Build; import android.provider.ContactsContract; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.util.Log; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import android.view.View; -import android.view.Window; import android.view.WindowManager; import android.widget.Button; import android.widget.Toast; diff --git a/app/src/main/java/com/example/mayankaggarwal/appathon/AddProduct.java b/app/src/main/java/com/example/mayankaggarwal/appathon/AddProduct.java index 19fb2d3..683612e 100644 --- a/app/src/main/java/com/example/mayankaggarwal/appathon/AddProduct.java +++ b/app/src/main/java/com/example/mayankaggarwal/appathon/AddProduct.java @@ -11,16 +11,14 @@ import android.graphics.Color; import android.graphics.Matrix; import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; import android.os.Environment; -import android.provider.ContactsContract; import android.provider.MediaStore; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.text.TextUtils; import android.util.Log; @@ -32,30 +30,15 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.Spinner; -import android.widget.Toast; - -import com.cloudinary.Cloudinary; -import com.cloudinary.utils.ObjectUtils; - -import org.json.JSONException; -import org.json.JSONObject; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.concurrent.Future; - -import retrofit2.Response; - -import static android.R.attr.path; public class AddProduct extends AppCompatActivity implements AdapterView.OnItemSelectedListener { diff --git a/app/src/main/java/com/example/mayankaggarwal/appathon/MainActivity.java b/app/src/main/java/com/example/mayankaggarwal/appathon/MainActivity.java index 966a8a5..eef2edd 100644 --- a/app/src/main/java/com/example/mayankaggarwal/appathon/MainActivity.java +++ b/app/src/main/java/com/example/mayankaggarwal/appathon/MainActivity.java @@ -1,53 +1,32 @@ package com.example.mayankaggarwal.appathon; -import android.Manifest; import android.animation.Animator; -import android.annotation.TargetApi; -import android.content.DialogInterface; import android.content.Intent; -import android.content.pm.PackageManager; -import android.database.Cursor; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.media.Image; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.provider.ContactsContract; -import android.support.annotation.RequiresApi; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v4.media.MediaMetadataCompat; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.CardView; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.util.Log; -import android.view.Gravity; -import android.view.LayoutInflater; + +import androidx.annotation.RequiresApi; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AlertDialog; +import androidx.cardview.widget.CardView; + import android.view.View; -import android.support.design.widget.NavigationView; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import com.google.android.material.navigation.NavigationView; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.ViewAnimationUtils; import android.view.WindowManager; -import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.ListView; import android.widget.TextView; -import android.widget.Toast; - -import java.util.ArrayList; -import java.util.List; public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener { diff --git a/app/src/main/java/com/example/mayankaggarwal/appathon/RVConatctList.java b/app/src/main/java/com/example/mayankaggarwal/appathon/RVConatctList.java index 60908de..a5f11d2 100644 --- a/app/src/main/java/com/example/mayankaggarwal/appathon/RVConatctList.java +++ b/app/src/main/java/com/example/mayankaggarwal/appathon/RVConatctList.java @@ -1,13 +1,10 @@ package com.example.mayankaggarwal.appathon; -import android.app.Activity; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/example/mayankaggarwal/appathon/RVOrderList.java b/app/src/main/java/com/example/mayankaggarwal/appathon/RVOrderList.java index a0dca9b..00fc1c7 100644 --- a/app/src/main/java/com/example/mayankaggarwal/appathon/RVOrderList.java +++ b/app/src/main/java/com/example/mayankaggarwal/appathon/RVOrderList.java @@ -1,7 +1,7 @@ package com.example.mayankaggarwal.appathon; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/example/mayankaggarwal/appathon/SeeOrder.java b/app/src/main/java/com/example/mayankaggarwal/appathon/SeeOrder.java index 6ca1b61..2ea7772 100644 --- a/app/src/main/java/com/example/mayankaggarwal/appathon/SeeOrder.java +++ b/app/src/main/java/com/example/mayankaggarwal/appathon/SeeOrder.java @@ -3,10 +3,10 @@ import android.app.ProgressDialog; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.WindowManager; public class SeeOrder extends AppCompatActivity { diff --git a/app/src/main/java/com/example/mayankaggarwal/appathon/SuccessActivity.java b/app/src/main/java/com/example/mayankaggarwal/appathon/SuccessActivity.java index 9acf698..033b1d1 100644 --- a/app/src/main/java/com/example/mayankaggarwal/appathon/SuccessActivity.java +++ b/app/src/main/java/com/example/mayankaggarwal/appathon/SuccessActivity.java @@ -1,15 +1,12 @@ package com.example.mayankaggarwal.appathon; import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; -import android.util.Log; import android.view.WindowManager; import android.widget.TextView; -import org.w3c.dom.Text; - public class SuccessActivity extends AppCompatActivity { TextView textView; diff --git a/app/src/main/java/com/example/mayankaggarwal/appathon/SuccessProduct.java b/app/src/main/java/com/example/mayankaggarwal/appathon/SuccessProduct.java index 1dae2ff..7d89391 100644 --- a/app/src/main/java/com/example/mayankaggarwal/appathon/SuccessProduct.java +++ b/app/src/main/java/com/example/mayankaggarwal/appathon/SuccessProduct.java @@ -1,8 +1,8 @@ package com.example.mayankaggarwal.appathon; import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.WindowManager; diff --git a/app/src/main/res/layout/activity_add_contact.xml b/app/src/main/res/layout/activity_add_contact.xml index b99928b..d02de23 100644 --- a/app/src/main/res/layout/activity_add_contact.xml +++ b/app/src/main/res/layout/activity_add_contact.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" tools:context="com.example.mayankaggarwal.appathon.AddContact"> - - - + diff --git a/app/src/main/res/layout/activity_see_order.xml b/app/src/main/res/layout/activity_see_order.xml index f00c5dc..135c38f 100644 --- a/app/src/main/res/layout/activity_see_order.xml +++ b/app/src/main/res/layout/activity_see_order.xml @@ -10,11 +10,11 @@ android:paddingTop="@dimen/activity_vertical_margin" tools:context="com.example.mayankaggarwal.appathon.SeeOrder"> - - + diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index 38e046f..4341722 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -1,5 +1,5 @@ - - - - + - + diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index 9be4dc6..5fb4afe 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -10,7 +10,7 @@ tools:context="com.example.mayankaggarwal.appathon.MainActivity" tools:showIn="@layout/app_bar_main"> - - - + - - + @@ -116,7 +116,7 @@ android:layout_weight="0.5" android:orientation="vertical"> - - + - - + - - + - - + @@ -319,6 +319,6 @@ - + diff --git a/app/src/main/res/layout/order_item_layout.xml b/app/src/main/res/layout/order_item_layout.xml index 892bc1a..0826168 100644 --- a/app/src/main/res/layout/order_item_layout.xml +++ b/app/src/main/res/layout/order_item_layout.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - + - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 1e79967..2ff4cb9 100644 --- a/build.gradle +++ b/build.gradle @@ -4,9 +4,13 @@ buildscript { repositories { jcenter() mavenCentral() + maven { + url 'https://maven.google.com/' + name 'Google' + } } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:3.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -17,6 +21,10 @@ allprojects { repositories { jcenter() mavenCentral() + maven { + url 'https://maven.google.com/' + name 'Google' + } } } 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 04e285f..1f720d2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Wed Oct 09 23:06:40 IST 2019 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-4.6-all.zip