androidx migration

.idea/compiler.xml

@@ -4,8 +4,6 @@
     <annotationProcessing>
       <profile default="true" name="Default" enabled="true" />
     </annotationProcessing>
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.8" />
-      <module name="pizzacucina-android.app" target="1.8" />
-    </bytecodeTargetLevel>
   </component>
 </project>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/build.gradle

@@ -17,14 +17,14 @@ repositories {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "ch.pizzacucina.android"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 29
-        versionCode  11 // play store'daki version --> canlı: 0  - dahili test: 17
+        versionCode  12 // play store'daki version --> canlı: 0  - dahili test: 17
-        versionName "1.20"   // play store'daki version --> canlı: 0.00 -  dahili test: 1.17
+        versionName "1.21"   // play store'daki version --> canlı: 0.00 -  dahili test: 1.17
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         multiDexEnabled true
         manifestPlaceholders = [
                 onesignal_app_id: 'f347ab57-b10f-485d-aa8b-812c8d0f9f6c',
@@ -38,6 +38,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
@@ -47,21 +51,21 @@ dependencies {
     def play_services_version_for_maps_and_locations = "16.0.0"
     def retrofit_version = "2.3.0"
     def okhttp_version = "3.9.1"
-    def butterknife_version = "8.8.1"
+    def butterknife_version = "10.2.3"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 
-    implementation "com.android.support:support-compat:$appcompat_version"
+    implementation 'androidx.core:core:1.0.0'
-    implementation "com.android.support:appcompat-v7:$appcompat_version"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation "com.android.support:design:$appcompat_version"
+    implementation 'com.google.android.material:material:1.0.0'
-    implementation "com.android.support:support-v13:$appcompat_version"
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation "com.android.support:recyclerview-v7:$appcompat_version"
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation "com.android.support:cardview-v7:$appcompat_version"
+    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.multidex:multidex:2.0.0'
 
     implementation "com.google.android.gms:play-services-base:$play_services_version_general"
     implementation "com.google.android.gms:play-services-location:$play_services_version_for_maps_and_locations"

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"1.20","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":12,"versionName":"1.21","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/androidTest/java/ch/pizzacucina/android/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
 package ch.pizzacucina.android;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/main/java/ch/pizzacucina/android/App.java

@@ -1,6 +1,6 @@
 package ch.pizzacucina.android;
 
-import android.support.multidex.MultiDexApplication;
+import androidx.multidex.MultiDexApplication;
 
 import com.crashlytics.android.Crashlytics;
 import com.jakewharton.picasso.OkHttp3Downloader;

app/src/main/java/ch/pizzacucina/android/activity/AddAddressActivity.java

@@ -1,7 +1,7 @@
 package ch.pizzacucina.android.activity;
 
 import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.os.Bundle;
 import android.view.View;
 

app/src/main/java/ch/pizzacucina/android/activity/BaseActivity.java

@@ -5,8 +5,8 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import ch.pizzacucina.android.helper.DisplayHelper;
 import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;

app/src/main/java/ch/pizzacucina/android/activity/CampaignProductDetailsActivity.java

@@ -1,9 +1,9 @@
 package ch.pizzacucina.android.activity;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;

app/src/main/java/ch/pizzacucina/android/activity/CampaignProductListActivity.java

@@ -2,8 +2,8 @@ package ch.pizzacucina.android.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import java.util.ArrayList;

app/src/main/java/ch/pizzacucina/android/activity/CreateOrderActivity.java

@@ -2,8 +2,8 @@ package ch.pizzacucina.android.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
-import android.support.v7.widget.CardView;
+import androidx.cardview.widget.CardView;
 import android.view.View;
 import android.webkit.WebView;
 

app/src/main/java/ch/pizzacucina/android/activity/ForgotPasswordActivity.java

@@ -1,7 +1,7 @@
 package ch.pizzacucina.android.activity;
 
 import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.os.Bundle;
 import android.widget.Button;
 

app/src/main/java/ch/pizzacucina/android/activity/MainActivity.java

@@ -2,14 +2,14 @@ package ch.pizzacucina.android.activity;
 
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.design.widget.BottomNavigationView;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
-import android.support.v4.view.GravityCompat;
+import androidx.core.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;

app/src/main/java/ch/pizzacucina/android/activity/MyAddressesActivity.java

@@ -1,10 +1,10 @@
 package ch.pizzacucina.android.activity;
 
 import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.Button;
 

app/src/main/java/ch/pizzacucina/android/activity/ProductDetailsActivity.java

@@ -1,9 +1,9 @@
 package ch.pizzacucina.android.activity;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;

app/src/main/java/ch/pizzacucina/android/activity/SplashActivity.java

@@ -3,8 +3,8 @@ package ch.pizzacucina.android.activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 import android.widget.TextView;
 

app/src/main/java/ch/pizzacucina/android/activity/UpdateProfileActivity.java

@@ -1,6 +1,6 @@
 package ch.pizzacucina.android.activity;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.os.Bundle;
 import android.widget.Button;
 

app/src/main/java/ch/pizzacucina/android/adapter/pager/CampaignBannerPagerAdapter.java

@@ -1,8 +1,8 @@
 package ch.pizzacucina.android.adapter.pager;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import java.util.ArrayList;
 

app/src/main/java/ch/pizzacucina/android/adapter/pager/OrderPagerAdapter.java

@@ -1,8 +1,8 @@
 package ch.pizzacucina.android.adapter.pager;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import ch.pizzacucina.android.fragment.createOrder.CreateOrderResultFragment;
 import ch.pizzacucina.android.fragment.createOrder.CreateOrderSummaryFragment;

app/src/main/java/ch/pizzacucina/android/adapter/recycler/CartRecyclerAdapter.java

@@ -1,6 +1,6 @@
 package ch.pizzacucina.android.adapter.recycler;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/adapter/recycler/MenuProductRecyclerAdapter.java

@@ -1,6 +1,6 @@
 package ch.pizzacucina.android.adapter.recycler;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/adapter/recycler/MyAddressesRecyclerAdapter.java

@@ -1,6 +1,6 @@
 package ch.pizzacucina.android.adapter.recycler;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/adapter/recycler/NavigationMenuRecyclerAdapter.java

@@ -1,6 +1,6 @@
 package ch.pizzacucina.android.adapter.recycler;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/adapter/recycler/OrderHistoryRecyclerAdapter.java

@@ -1,6 +1,6 @@
 package ch.pizzacucina.android.adapter.recycler;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/adapter/recycler/OrderPriceRecyclerAdapter.java

@@ -1,6 +1,6 @@
 package ch.pizzacucina.android.adapter.recycler;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java

@@ -1,7 +1,7 @@
 package ch.pizzacucina.android.adapter.recycler;
 
-import android.support.v7.widget.AppCompatRadioButton;
+import androidx.appcompat.widget.AppCompatRadioButton;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/adapter/recycler/PersonalCouponCodesRecyclerAdapter.java

@@ -1,7 +1,7 @@
 package ch.pizzacucina.android.adapter.recycler;
 
 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;

app/src/main/java/ch/pizzacucina/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java

@@ -1,7 +1,7 @@
 package ch.pizzacucina.android.adapter.recycler;
 
-import android.support.v7.widget.AppCompatCheckBox;
+import androidx.appcompat.widget.AppCompatCheckBox;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java

@@ -1,6 +1,6 @@
 package ch.pizzacucina.android.adapter.recycler;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java

@@ -1,7 +1,7 @@
 package ch.pizzacucina.android.adapter.recycler;
 
-import android.support.v7.widget.AppCompatRadioButton;
+import androidx.appcompat.widget.AppCompatRadioButton;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java

@@ -1,7 +1,7 @@
 package ch.pizzacucina.android.adapter.recycler;
 
-import android.support.v7.widget.AppCompatRadioButton;
+import androidx.appcompat.widget.AppCompatRadioButton;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java

@@ -1,7 +1,7 @@
 package ch.pizzacucina.android.adapter.recycler;
 
-import android.support.v7.widget.AppCompatRadioButton;
+import androidx.appcompat.widget.AppCompatRadioButton;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/fragment/BaseFragment.java

@@ -1,6 +1,6 @@
 package ch.pizzacucina.android.fragment;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import ch.pizzacucina.android.activity.BaseActivity;
 import ch.pizzacucina.android.activity.MainActivity;

app/src/main/java/ch/pizzacucina/android/fragment/CampaignBannerFragment.java

@@ -1,7 +1,7 @@
 package ch.pizzacucina.android.fragment;
 
 import android.os.Bundle;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/fragment/CartFragment.java

@@ -3,9 +3,9 @@ package ch.pizzacucina.android.fragment;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/fragment/MenuFragment.java

@@ -2,8 +2,8 @@ package ch.pizzacucina.android.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/fragment/OrderHistoryFragment.java

@@ -2,8 +2,8 @@ package ch.pizzacucina.android.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/fragment/ProductFragment.java

@@ -2,9 +2,9 @@ package ch.pizzacucina.android.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/fragment/ProfileFragment.java

@@ -2,10 +2,10 @@ package ch.pizzacucina.android.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
-import android.support.v7.widget.SwitchCompat;
+import androidx.appcompat.widget.SwitchCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderNoteFragment.java

@@ -1,7 +1,7 @@
 package ch.pizzacucina.android.fragment.createOrder;
 
 import android.os.Bundle;
-import android.support.v7.widget.AppCompatRadioButton;
+import androidx.appcompat.widget.AppCompatRadioButton;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java

@@ -4,10 +4,10 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/ch/pizzacucina/android/fragment/createOrder/PaymentMethodFragment.java

@@ -1,8 +1,8 @@
 package ch.pizzacucina.android.fragment.createOrder;
 
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/fragment/createOrder/ShippingAddressFragment.java

@@ -2,8 +2,8 @@ package ch.pizzacucina.android.fragment.createOrder;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/fragment/createOrder/ShippingMethodFragment.java

@@ -1,8 +1,8 @@
 package ch.pizzacucina.android.fragment.createOrder;
 
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/ch/pizzacucina/android/helper/DialogHelper.java

@@ -4,8 +4,8 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 

app/src/main/java/ch/pizzacucina/android/helper/DisplayHelper.java

@@ -2,7 +2,7 @@ package ch.pizzacucina.android.helper;
 
 import android.annotation.TargetApi;
 import android.os.Build;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.DisplayMetrics;
 import android.view.Window;
 import android.view.WindowManager;

app/src/main/java/ch/pizzacucina/android/interfaces/CheckBoxChangedListener.java

@@ -1,6 +1,6 @@
 package ch.pizzacucina.android.interfaces;
 
-import android.support.v7.widget.AppCompatCheckBox;
+import androidx.appcompat.widget.AppCompatCheckBox;
 
 /**
  * Created by cimenmus on 25/09/2017.

app/src/main/java/ch/pizzacucina/android/view/AppButton.java

@@ -2,7 +2,7 @@ package ch.pizzacucina.android.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;

app/src/main/java/ch/pizzacucina/android/view/AppDropdownView.java

@@ -2,7 +2,7 @@ package ch.pizzacucina.android.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;

app/src/main/java/ch/pizzacucina/android/view/AppEditText.java

@@ -3,7 +3,7 @@ package ch.pizzacucina.android.view;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Typeface;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.InputType;

app/src/main/java/ch/pizzacucina/android/view/AppToolbar.java

@@ -2,7 +2,7 @@ package ch.pizzacucina.android.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;

app/src/main/java/ch/pizzacucina/android/view/GridSpacesItemDecoration.java

@@ -1,7 +1,7 @@
 package ch.pizzacucina.android.view;
 
 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import ch.pizzacucina.android.helper.DisplayHelper;

app/src/main/java/ch/pizzacucina/android/view/NoSwipeViewPager.java

@@ -1,7 +1,7 @@
 package ch.pizzacucina.android.view;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 

app/src/main/res/layout/activity_add_address.xml

@@ -31,7 +31,7 @@
             android:scaleType="centerCrop"
             android:src="@drawable/background_wood" />
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/white"
@@ -95,7 +95,7 @@
                             app:dropdownHintView="@string/zone"
                             android:visibility="gone"/>
 
-                        <android.support.v4.widget.Space
+                        <androidx.legacy.widget.Space
                             android:layout_width="match_parent"
                             android:layout_height="48dp" />
 
@@ -115,7 +115,7 @@
 
             </RelativeLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
     </RelativeLayout>
 

app/src/main/res/layout/activity_campaign_product_details.xml

@@ -143,7 +143,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <android.support.v4.widget.NestedScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scrollbars="vertical">
@@ -235,7 +235,7 @@
                     android:textSize="16sp"
                     android:textColor="@color/black"/>
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recyclerView1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -260,7 +260,7 @@
                     android:textSize="16sp"
                     android:textColor="@color/black"/>
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recyclerView2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -269,7 +269,7 @@
             </LinearLayout>
 
 
-        </android.support.v4.widget.NestedScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </LinearLayout>
 

app/src/main/res/layout/activity_campaign_product_list.xml

@@ -22,7 +22,7 @@
         app:title="@string/activity_title_login"
         app:titleTextColor="@color/black" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/campaignProductRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/activity_create_order.xml

@@ -30,7 +30,7 @@
             android:scaleType="centerCrop"
             android:src="@drawable/background_wood" />
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:id="@+id/createOrderCardView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -77,7 +77,7 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
         <WebView
             android:id="@+id/paymentWebView"

app/src/main/res/layout/activity_forgot_password.xml

@@ -52,7 +52,7 @@
                 app:hint="@string/email"
                 app:inputType="email" />
 
-            <android.support.v4.widget.Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="24dp" />
 

app/src/main/res/layout/activity_main.xml

@@ -16,7 +16,7 @@
         app:title="@string/bottom_nav_menu_item_menu"
         app:showHamburgerMenuIcon="true"/>
 
-    <android.support.v4.widget.DrawerLayout
+    <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawerLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -30,14 +30,14 @@
             android:layout_weight="1"
             android:background="@color/actvity_default_background_color_1"/>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/navigationMenuRecyclerView"
             android:layout_width="240dp"
             android:layout_height="match_parent"
             android:layout_gravity="start"
             android:background="@color/white"/>
 
-    </android.support.v4.widget.DrawerLayout>
+    </androidx.drawerlayout.widget.DrawerLayout>
 
     <RelativeLayout
         android:id="@+id/cartTotalRelativeLayout"
@@ -190,7 +190,7 @@
 
     </LinearLayout>
 
-    <android.support.v7.widget.AppCompatImageButton
+    <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/shoppingCartButton"
         android:layout_width="64dp"
         android:layout_height="64dp"
@@ -235,112 +235,4 @@
     </RelativeLayout>
     -->
 
-</RelativeLayout>
+</RelativeLayout>
-
-
-    <!--
-
-    full screen navigation drawer
-    <?xml version="1.0" encoding="utf-8"?>
-    <android.support.v4.widget.DrawerLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/drawerLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        tools:context="ch.pizzalink.android.activity.MainActivity">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <ch.pizzalink.android.view.PizzalinkToolbar
-                android:id="@+id/pizzalinkToolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:title="@string/bottom_nav_menu_item_order"
-                app:showHamburgerMenuIcon="true"/>
-
-            <FrameLayout
-                android:id="@+id/fragmentContainer"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:background="@color/white"/>
-
-            <com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx
-                android:id="@+id/bottomNavigationView"
-                android:layout_width="match_parent"
-                android:layout_height="56dp"
-                android:layout_gravity="bottom"
-                app:itemIconTint="@drawable/selector_bottom_navigation_item"
-                app:itemTextColor="@drawable/selector_bottom_navigation_item"
-                android:background="@color/white"
-                app:menu="@menu/menu_bottom_navigation"
-                app:itemBackground="@color/black"/>
-
-        </LinearLayout>
-
-        <include layout="@layout/layout_navigation_drawer"/>
-
-    </android.support.v4.widget.DrawerLayout>
-
-    -->
-
-
-<!--
-
- navigation menu between toolbar and bottom navigation
-
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context="ch.pizzalink.android.activity.MainActivity">
-
-    <ch.pizzalink.android.view.PizzalinkToolbar
-        android:id="@+id/pizzalinkToolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:title="@string/bottom_nav_menu_item_order"
-        app:showHamburgerMenuIcon="true"/>
-
-    <android.support.v4.widget.DrawerLayout
-        android:id="@+id/drawerLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/pizzalinkToolbar"
-        android:layout_above="@+id/bottomNavigationView">
-
-        <FrameLayout
-            android:id="@+id/fragmentContainer"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:background="@color/white"/>
-
-        <include layout="@layout/layout_navigation_drawer"/>
-
-    </android.support.v4.widget.DrawerLayout>
-
-    <com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx
-        android:id="@+id/bottomNavigationView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        app:itemIconTint="@drawable/selector_bottom_navigation_item"
-        app:itemTextColor="@drawable/selector_bottom_navigation_item"
-        android:background="@color/white"
-        app:menu="@menu/menu_bottom_navigation"
-        app:itemBackground="@color/black"/>
-
-</RelativeLayout>
-
--->

app/src/main/res/layout/activity_my_addresses.xml

@@ -28,7 +28,7 @@
             android:scaleType="centerCrop"
             android:src="@drawable/background_wood" />
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/white"
@@ -39,7 +39,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/myAddressesRecyclerView"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -57,7 +57,7 @@
 
             </RelativeLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
     </RelativeLayout>
 

app/src/main/res/layout/activity_order_history_details.xml

@@ -32,7 +32,7 @@
             android:scaleType="centerCrop"
             android:src="@drawable/background_wood" />
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/white"
@@ -140,7 +140,7 @@
                         style="@style/PizzappGrayButtonWithoutMargin"
                         android:text="@string/repeat_order_uppercased"/>
                     
-                    <android.support.v4.widget.Space
+                    <androidx.legacy.widget.Space
                         android:layout_width="match_parent"
                         android:layout_height="96dp" />
 
@@ -148,7 +148,7 @@
 
             </ScrollView>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
     </RelativeLayout>
 

app/src/main/res/layout/activity_product_details.xml

@@ -142,7 +142,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <android.support.v4.widget.NestedScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scrollbars="vertical">
@@ -232,7 +232,7 @@
                     android:textSize="16sp"
                     android:textColor="@color/black"/>
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recyclerView1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -257,7 +257,7 @@
                     android:textSize="16sp"
                     android:textColor="@color/black"/>
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recyclerView2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -266,7 +266,7 @@
             </LinearLayout>
 
 
-        </android.support.v4.widget.NestedScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </LinearLayout>
 

app/src/main/res/layout/activity_register.xml

@@ -131,7 +131,7 @@
                     app:dropdownHintView="@string/zone"
                     android:visibility="gone"/>
 
-                <android.support.v4.widget.Space
+                <androidx.legacy.widget.Space
                     android:layout_width="match_parent"
                     android:layout_height="48dp" />
 

app/src/main/res/layout/activity_splash.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -84,7 +84,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/campaignsViewPager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -101,4 +101,4 @@
         android:layout_height="48dp"
         android:visibility="gone"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_update_password.xml

@@ -30,7 +30,7 @@
             android:scaleType="centerCrop"
             android:src="@drawable/background_wood" />
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/white"
@@ -66,7 +66,7 @@
                     app:edittextTheme="navy"
                     app:hint="@string/hint_confirm_new_password"/>
 
-                <android.support.v4.widget.Space
+                <androidx.legacy.widget.Space
                     android:layout_width="match_parent"
                     android:layout_height="16dp" />
 
@@ -81,7 +81,7 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
     </RelativeLayout>
 

app/src/main/res/layout/activity_update_profile.xml

@@ -30,7 +30,7 @@
             android:scaleType="centerCrop"
             android:src="@drawable/background_wood" />
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/white"
@@ -93,7 +93,7 @@
 
             </RelativeLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
     </RelativeLayout>
 

app/src/main/res/layout/fragment_campaign_banner.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/campaignBannerImageView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -16,5 +16,5 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintDimensionRatio="H,16:9"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
 

app/src/main/res/layout/fragment_cart.xml

@@ -27,7 +27,7 @@
         android:padding="24dp"
         android:visibility="gone" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/cartRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/fragment_create_order_note.xml

@@ -47,7 +47,7 @@
             android:background="@color/white"
             android:padding="12dp">
 
-            <android.support.v7.widget.AppCompatRadioButton
+            <androidx.appcompat.widget.AppCompatRadioButton
                 android:id="@+id/yesRadioButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -67,7 +67,7 @@
             android:background="@color/white"
             android:padding="12dp">
 
-            <android.support.v7.widget.AppCompatRadioButton
+            <androidx.appcompat.widget.AppCompatRadioButton
                 android:id="@+id/noRadioButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

app/src/main/res/layout/fragment_create_order_summary.xml

@@ -9,7 +9,7 @@
     android:background="@color/white"
     tools:ignore="MissingPrefix">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignParentTop="true"
@@ -70,7 +70,7 @@
                 android:paddingEnd="16dp"
                 fontPath="fonts/Quicksand-Bold.ttf" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/orderProductsRecyclerView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -91,7 +91,7 @@
                 android:paddingEnd="16dp"
                 fontPath="fonts/Quicksand-Bold.ttf" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/orderPriceRecyclerView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -106,7 +106,7 @@
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
     <include layout="@layout/layout_orders_bottom"/>
 

app/src/main/res/layout/fragment_menu.xml

@@ -10,7 +10,7 @@
         android:scaleType="centerCrop"
         android:src="@drawable/background_wood"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/menuProductRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/fragment_order_history.xml

@@ -10,7 +10,7 @@
         android:scaleType="centerCrop"
         android:src="@drawable/background_wood" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/orderHistoryRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

app/src/main/res/layout/fragment_payment_method.xml

@@ -111,7 +111,7 @@
             android:paddingRight="20dp"
             android:paddingEnd="20dp"/>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/paymentMethodsRecyclerView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

app/src/main/res/layout/fragment_product.xml

@@ -10,7 +10,7 @@
         android:scaleType="centerCrop"
         android:src="@drawable/background_wood"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/customProductRecyclerView"
         android:layout_width="match_parent"

app/src/main/res/layout/fragment_profile.xml

@@ -14,7 +14,7 @@
         android:scaleType="centerCrop"
         android:src="@drawable/background_wood" />
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white"
@@ -49,7 +49,7 @@
                     android:textSize="12sp"
                     fontPath="fonts/Quicksand-Bold.ttf" />
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/personalCouponCodesRecyclerView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -231,7 +231,7 @@
                         android:layout_toLeftOf="@+id/enableNotificationsSwitch"
                         android:layout_toStartOf="@+id/enableNotificationsSwitch"/>
 
-                    <android.support.v7.widget.SwitchCompat
+                    <androidx.appcompat.widget.SwitchCompat
                         android:id="@+id/enableNotificationsSwitch"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -299,7 +299,7 @@
 
         </ScrollView>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </RelativeLayout>
 

app/src/main/res/layout/fragment_shipping_address.xml

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:background="@color/white">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/shippingAddressesRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/fragment_shipping_method.xml

@@ -27,7 +27,7 @@
             android:layout_marginEnd="16dp"
             android:textColor="@color/black"/>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/shippingMethodsRecyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

app/src/main/res/layout/fragment_store_info.xml

@@ -11,7 +11,7 @@
         android:scaleType="centerCrop"
         android:src="@drawable/background_wood" />
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/white"
@@ -37,6 +37,6 @@
 
             </RelativeLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
 </RelativeLayout>

app/src/main/res/layout/layout_pizzalink_toolbar.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
     android:id="@+id/toolbar"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -86,4 +86,4 @@
 
     </RelativeLayout>
 
-</android.support.v7.widget.Toolbar>
+</androidx.appcompat.widget.Toolbar>

app/src/main/res/layout/row_cart.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -136,7 +136,7 @@
     </RelativeLayout>
 
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
 
 
 <!--

app/src/main/res/layout/row_option_checkbox.xml

@@ -9,7 +9,7 @@
     android:background="@color/white"
     android:padding="12dp">
 
-    <android.support.v7.widget.AppCompatCheckBox
+    <androidx.appcompat.widget.AppCompatCheckBox
         android:id="@+id/productOptionCheckBox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

app/src/main/res/layout/row_option_radio.xml

@@ -9,7 +9,7 @@
     android:background="@color/white"
     android:padding="12dp">
 
-    <android.support.v7.widget.AppCompatRadioButton
+    <androidx.appcompat.widget.AppCompatRadioButton
         android:id="@+id/productOptionRadioButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

app/src/main/res/layout/row_order_history.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -106,7 +106,7 @@
     </LinearLayout>
 
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
 
 
 

app/src/main/res/layout/row_payment_method.xml

@@ -9,7 +9,7 @@
     android:background="@color/white"
     android:padding="12dp">
 
-    <android.support.v7.widget.AppCompatRadioButton
+    <androidx.appcompat.widget.AppCompatRadioButton
         android:id="@+id/paymentMethodRadioButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

app/src/main/res/layout/row_pizza_2.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -111,7 +111,7 @@
                             android:layout_gravity="center_horizontal"
                             android:textColor="@color/black"/>
 
-                        <android.support.v7.widget.AppCompatCheckBox
+                        <androidx.appcompat.widget.AppCompatCheckBox
                             android:id="@+id/pizzaSize1CheckBox"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -150,7 +150,7 @@
                             android:layout_gravity="center_horizontal"
                             android:textColor="@color/black"/>
 
-                        <android.support.v7.widget.AppCompatCheckBox
+                        <androidx.appcompat.widget.AppCompatCheckBox
                             android:id="@+id/pizzaSize2CheckBox"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -189,7 +189,7 @@
                             android:layout_gravity="center_horizontal"
                             android:textColor="@color/black"/>
 
-                        <android.support.v7.widget.AppCompatCheckBox
+                        <androidx.appcompat.widget.AppCompatCheckBox
                             android:id="@+id/pizzaSize3CheckBox"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -301,4 +301,4 @@
 
     </LinearLayout>
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>

app/src/main/res/layout/row_shipment_address.xml

@@ -9,7 +9,7 @@
     android:background="@color/white"
     android:padding="12dp">
 
-    <android.support.v7.widget.AppCompatRadioButton
+    <androidx.appcompat.widget.AppCompatRadioButton
         android:id="@+id/shipmentAddressRadioButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

app/src/main/res/layout/row_shipment_method.xml

@@ -9,7 +9,7 @@
     android:background="@color/white"
     android:padding="12dp">
 
-    <android.support.v7.widget.AppCompatRadioButton
+    <androidx.appcompat.widget.AppCompatRadioButton
         android:id="@+id/shipmentMethodRadioButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

app/src/main/res/layout/row_space.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.Space
+<androidx.legacy.widget.Space
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="96dp" />

app/src/main/res/layout/row_space_4dp.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.Space
+<androidx.legacy.widget.Space
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="4dp" />

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.