Migrate to AndroidX

volkansahin45 · Oct 5, 2018 · 2602901 · 2602901
1 parent 388d29f
commit 2602901
Show file tree

Hide file tree

Showing 35 changed files with 146 additions and 147 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,14 +4,14 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.vsahin.moneycim"
         minSdkVersion 19
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
@@ -35,60 +35,49 @@ android {
     }
 }
 
-project.ext {
-    daggerVersion = "2.11"
-    butterKnifeVersion = "8.8.1"
-    roomVersion = "1.0.0"
-    architectureComponents = "1.1.1"
-    androidDbDebugVersion = "1.0.1"
-    googleVisionApiVersion = "12.0.1"
-    androidSupportLibrary = "27.1.0"
-    androidKtx = "0.2"
-}
-
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-beta01', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     androidTestImplementation 'junit:junit:4.12'
 
     //design support library
-    implementation "com.android.support:appcompat-v7:$androidSupportLibrary"
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation "com.android.support:design:$androidSupportLibrary"
-    implementation "com.android.support:cardview-v7:$androidSupportLibrary"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
 
     // Dagger
-    kapt "com.google.dagger:dagger-compiler:$daggerVersion"
-    implementation "com.google.dagger:dagger:$daggerVersion"
+    kapt "com.google.dagger:dagger-compiler:$rootProject.daggerVersion"
+    implementation "com.google.dagger:dagger:$rootProject.daggerVersion"
 
     // ButterKnife
-    implementation "com.jakewharton:butterknife:$butterKnifeVersion"
-    kapt "com.jakewharton:butterknife-compiler:$butterKnifeVersion"
+    implementation "com.jakewharton:butterknife:$rootProject.butterKnifeVersion"
+    kapt "com.jakewharton:butterknife-compiler:$rootProject.butterKnifeVersion"
 
     //android livedata, lifecycle etc
-    implementation "android.arch.lifecycle:runtime:$architectureComponents"
-    implementation "android.arch.lifecycle:extensions:$architectureComponents"
-    annotationProcessor "android.arch.lifecycle:compiler:$architectureComponents"
+    implementation 'androidx.lifecycle:lifecycle-runtime:2.0.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
+    annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.0.0'
 
     //room
-    implementation "android.arch.persistence.room:runtime:$roomVersion"
-    kapt "android.arch.persistence.room:compiler:$roomVersion"
+    implementation 'androidx.room:room-runtime:2.0.0'
+    kapt 'androidx.room:room-compiler:2.0.0'
 
     //Database and Shared Preferences Debug
-    debugImplementation "com.amitshekhar.android:debug-db:$androidDbDebugVersion"
+    debugImplementation "com.amitshekhar.android:debug-db:$rootProject.androidDbDebugVersion"
 
     //Google Vision API
     implementation "com.google.android.gms:play-services-vision:$googleVisionApiVersion"
 
     //Kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     //Android KTX
     implementation "androidx.core:core-ktx:$androidKtx"
 
-    implementation "com.android.support:customtabs:$androidSupportLibrary"
+    implementation 'androidx.browser:browser:1.0.0'
 }
 
 
diff --git a/app/src/androidTest/java/com/vsahin/moneycim/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/vsahin/moneycim/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.vsahin.moneycim;
 
 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/vsahin/moneycim/Di/AppModule.java b/app/src/main/java/com/vsahin/moneycim/Di/AppModule.java
@@ -1,11 +1,10 @@
 package com.vsahin.moneycim.Di;
 
 import android.app.Application;
-import android.arch.persistence.db.SupportSQLiteDatabase;
-import android.arch.persistence.room.Room;
-import android.arch.persistence.room.RoomDatabase;
-import android.support.annotation.NonNull;
-import android.util.Log;
+import androidx.sqlite.db.SupportSQLiteDatabase;
+import androidx.room.Room;
+import androidx.room.RoomDatabase;
+import androidx.annotation.NonNull;
 
 import com.vsahin.moneycim.Model.Database.AppDatabase;
 

diff --git a/app/src/main/java/com/vsahin/moneycim/Model/Dao/SpendingDao.java b/app/src/main/java/com/vsahin/moneycim/Model/Dao/SpendingDao.java
@@ -1,10 +1,10 @@
 package com.vsahin.moneycim.Model.Dao;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Insert;
-import android.arch.persistence.room.OnConflictStrategy;
-import android.arch.persistence.room.Query;
+import androidx.lifecycle.LiveData;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Query;
 
 import com.vsahin.moneycim.Model.Entity.RawSpending;
 import com.vsahin.moneycim.Model.Pojo.Spending;

diff --git a/app/src/main/java/com/vsahin/moneycim/Model/Dao/SpendingGroupDao.java b/app/src/main/java/com/vsahin/moneycim/Model/Dao/SpendingGroupDao.java
@@ -1,9 +1,9 @@
 package com.vsahin.moneycim.Model.Dao;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Insert;
-import android.arch.persistence.room.Query;
+import androidx.lifecycle.LiveData;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.Query;
 
 import com.vsahin.moneycim.Model.Entity.SpendingGroup;
 

diff --git a/app/src/main/java/com/vsahin/moneycim/Model/Database/AppDatabase.java b/app/src/main/java/com/vsahin/moneycim/Model/Database/AppDatabase.java
@@ -1,8 +1,8 @@
 package com.vsahin.moneycim.Model.Database;
 
-import android.arch.persistence.room.Database;
-import android.arch.persistence.room.RoomDatabase;
-import android.arch.persistence.room.TypeConverters;
+import androidx.room.Database;
+import androidx.room.RoomDatabase;
+import androidx.room.TypeConverters;
 
 import com.vsahin.moneycim.Model.Dao.SpendingDao;
 import com.vsahin.moneycim.Model.Dao.SpendingGroupDao;

diff --git a/app/src/main/java/com/vsahin/moneycim/Model/Database/Converters.java b/app/src/main/java/com/vsahin/moneycim/Model/Database/Converters.java
@@ -1,6 +1,6 @@
 package com.vsahin.moneycim.Model.Database;
 
-import android.arch.persistence.room.TypeConverter;
+import androidx.room.TypeConverter;
 
 import java.util.Date;
 

diff --git a/app/src/main/java/com/vsahin/moneycim/Model/Entity/RawSpending.java b/app/src/main/java/com/vsahin/moneycim/Model/Entity/RawSpending.java
@@ -1,10 +1,10 @@
 package com.vsahin.moneycim.Model.Entity;
 
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.ForeignKey;
-import android.arch.persistence.room.PrimaryKey;
-import android.arch.persistence.room.TypeConverters;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.ForeignKey;
+import androidx.room.PrimaryKey;
+import androidx.room.TypeConverters;
 
 import com.vsahin.moneycim.Model.Database.Converters;
 

diff --git a/app/src/main/java/com/vsahin/moneycim/Model/Entity/SpendingGroup.java b/app/src/main/java/com/vsahin/moneycim/Model/Entity/SpendingGroup.java
@@ -1,8 +1,8 @@
 package com.vsahin.moneycim.Model.Entity;
 
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.PrimaryKey;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.PrimaryKey;
 
 /**
  * Created by Volkan Şahin on 18.08.2017.

diff --git a/app/src/main/java/com/vsahin/moneycim/Model/Pojo/Spending.java b/app/src/main/java/com/vsahin/moneycim/Model/Pojo/Spending.java
@@ -1,7 +1,7 @@
 package com.vsahin.moneycim.Model.Pojo;
 
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Embedded;
+import androidx.room.ColumnInfo;
+import androidx.room.Embedded;
 
 import com.vsahin.moneycim.Model.Entity.RawSpending;
 

diff --git a/app/src/main/java/com/vsahin/moneycim/Model/Repository/SpendingRepository.java b/app/src/main/java/com/vsahin/moneycim/Model/Repository/SpendingRepository.java
@@ -1,14 +1,13 @@
 package com.vsahin.moneycim.Model.Repository;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 
 import com.vsahin.moneycim.Model.Database.AppDatabase;
 import com.vsahin.moneycim.Model.Entity.RawSpending;
 import com.vsahin.moneycim.Model.Entity.SpendingGroup;
 import com.vsahin.moneycim.Model.Pojo.Spending;
 
-import java.sql.Timestamp;
 import java.util.List;
 
 import javax.inject.Inject;

diff --git a/...src/main/java/com/vsahin/moneycim/View/AddAndEditSpending/AddAndEditSpendingActivity.java b/...src/main/java/com/vsahin/moneycim/View/AddAndEditSpending/AddAndEditSpendingActivity.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import com.vsahin.moneycim.Model.Entity.RawSpending;

diff --git a/...src/main/java/com/vsahin/moneycim/View/AddAndEditSpending/AddAndEditSpendingFragment.java b/...src/main/java/com/vsahin/moneycim/View/AddAndEditSpending/AddAndEditSpendingFragment.java
@@ -1,15 +1,15 @@
 package com.vsahin.moneycim.View.AddAndEditSpending;
 
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/...rc/main/java/com/vsahin/moneycim/View/AddAndEditSpending/AddAndEditSpendingViewModel.java b/...rc/main/java/com/vsahin/moneycim/View/AddAndEditSpending/AddAndEditSpendingViewModel.java
@@ -1,8 +1,8 @@
 package com.vsahin.moneycim.View.AddAndEditSpending;
 
 import android.app.Application;
-import android.arch.lifecycle.AndroidViewModel;
-import android.arch.lifecycle.LiveData;
+import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
 
 import com.vsahin.moneycim.Model.Entity.RawSpending;
 import com.vsahin.moneycim.Model.Entity.SpendingGroup;

diff --git a/app/src/main/java/com/vsahin/moneycim/View/Base/BaseActivity.java b/app/src/main/java/com/vsahin/moneycim/View/Base/BaseActivity.java
@@ -1,10 +1,10 @@
 package com.vsahin.moneycim.View.Base;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.vsahin.moneycim.R;
 

diff --git a/app/src/main/java/com/vsahin/moneycim/View/Base/BaseFragment.java b/app/src/main/java/com/vsahin/moneycim/View/Base/BaseFragment.java
@@ -1,9 +1,9 @@
 package com.vsahin.moneycim.View.Base;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/com/vsahin/moneycim/View/MainActivity.java b/app/src/main/java/com/vsahin/moneycim/View/MainActivity.java
@@ -4,10 +4,10 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

diff --git a/app/src/main/java/com/vsahin/moneycim/View/OCR_Scan_Receipt/CameraSource.java b/app/src/main/java/com/vsahin/moneycim/View/OCR_Scan_Receipt/CameraSource.java
@@ -25,9 +25,9 @@
 import android.hardware.Camera.CameraInfo;
 import android.os.Build;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresPermission;
-import android.support.annotation.StringDef;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresPermission;
+import androidx.annotation.StringDef;
 import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceHolder;

diff --git a/app/src/main/java/com/vsahin/moneycim/View/OCR_Scan_Receipt/CameraSourcePreview.java b/app/src/main/java/com/vsahin/moneycim/View/OCR_Scan_Receipt/CameraSourcePreview.java
@@ -18,7 +18,7 @@
 import android.Manifest;
 import android.content.Context;
 import android.content.res.Configuration;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.RequiresPermission;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.SurfaceHolder;

diff --git a/app/src/main/java/com/vsahin/moneycim/View/OCR_Scan_Receipt/OcrCaptureActivity.java b/app/src/main/java/com/vsahin/moneycim/View/OCR_Scan_Receipt/OcrCaptureActivity.java
@@ -27,10 +27,10 @@
 import android.content.pm.PackageManager;
 import android.hardware.Camera;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.ActivityCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.core.app.ActivityCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.view.MotionEvent;

diff --git a/app/src/main/java/com/vsahin/moneycim/View/SpendingList/GridRecyclerView.java b/app/src/main/java/com/vsahin/moneycim/View/SpendingList/GridRecyclerView.java
@@ -1,9 +1,9 @@
 package com.vsahin.moneycim.View.SpendingList;
 
 import android.content.Context;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/com/vsahin/moneycim/View/SpendingList/SpendingDiffCallback.java b/app/src/main/java/com/vsahin/moneycim/View/SpendingList/SpendingDiffCallback.java
@@ -1,6 +1,6 @@
 package com.vsahin.moneycim.View.SpendingList;
 
-import android.support.v7.util.DiffUtil;
+import androidx.recyclerview.widget.DiffUtil;
 
 import com.vsahin.moneycim.Model.Pojo.Spending;
 

diff --git a/app/src/main/java/com/vsahin/moneycim/View/SpendingList/SpendingListFragment.java b/app/src/main/java/com/vsahin/moneycim/View/SpendingList/SpendingListFragment.java
@@ -1,17 +1,13 @@
 package com.vsahin.moneycim.View.SpendingList;
 
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.AnimationUtils;
-import android.view.animation.LayoutAnimationController;
 
 import com.vsahin.moneycim.Model.Entity.RawSpending;
 import com.vsahin.moneycim.Model.Pojo.Spending;