Merge pull request xorum-io#12 from xorum-io/2-android-x

xorum-io#2; Migrate to AndroidX.

Author: yev-kanivets

app/build.gradle

@@ -69,35 +69,36 @@ android {
     }
     productFlavors {
     }
-}
 
-apply plugin: 'com.getkeepsafe.dexcount'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-
-    proprietaryCompile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
+    proprietaryImplementation('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
         transitive = true
     }
 
-    compile 'com.android.support:support-v4:27.1.1'
-    compile 'com.android.support:appcompat-v7:27.1.1'
-    compile 'com.android.support:design:27.1.1'
-    compile 'com.jakewharton:butterknife:8.5.1' // View annotation bindings
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1' // ButterKnife compiler
-    compile 'com.google.dagger:dagger:2.11' // Dependency injection tool
-    compile 'com.github.PhilJay:MPAndroidChart:v2.2.4' // Charts
-    compile 'com.jakewharton.timber:timber:4.1.2' // Advanced logging tool
-    compile 'com.android.support.constraint:constraint-layout:1.1.3'
-    compile 'com.dropbox.core:dropbox-core-sdk:3.0.5' // Dropbox Core API
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.jakewharton:butterknife:10.2.3' // View annotation bindings
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3' // ButterKnife compiler
+    implementation 'com.google.dagger:dagger:2.11' // Dependency injection tool
+    implementation 'com.github.PhilJay:MPAndroidChart:v2.2.4' // Charts
+    implementation 'com.jakewharton.timber:timber:4.1.2' // Advanced logging tool
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.dropbox.core:dropbox-core-sdk:3.0.5' // Dropbox Core API
 
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:2.8.9'
-    androidTestCompile 'com.crittercism.dexmaker:dexmaker:1.4'
-    androidTestCompile 'com.crittercism.dexmaker:dexmaker-dx:1.4'
-    androidTestCompile 'com.crittercism.dexmaker:dexmaker-mockito:1.4'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:2.8.9'
+    androidTestImplementation 'com.crittercism.dexmaker:dexmaker:1.4'
+    androidTestImplementation 'com.crittercism.dexmaker:dexmaker-dx:1.4'
+    androidTestImplementation 'com.crittercism.dexmaker:dexmaker-mockito:1.4'
     annotationProcessor 'com.google.dagger:dagger-compiler:2.11'
-    provided 'org.glassfish:javax.annotation:10.0-b28'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:cardview-v7:27.1.1'
+    compileOnly 'org.glassfish:javax.annotation:10.0-b28'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.cardview:cardview:1.0.0'
 }

app/src/free/java/com/blogspot/e_kanivets/moneytracker/util/CrashlyticsProxy.java

@@ -1,7 +1,7 @@
 package com.blogspot.e_kanivets.moneytracker.util;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 
 /**

app/src/main/AndroidManifest.xml

@@ -109,7 +109,7 @@
             android:value="955ae4864ae2a833aeda5b62631512524288adf8" />
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="com.blogspot.e_kanivets.moneytracker"
             android:exported="false"
             android:grantUriPermissions="true">
@@ -122,4 +122,4 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
 
-</manifest>
+</manifest>

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java

@@ -1,7 +1,7 @@
 package com.blogspot.e_kanivets.moneytracker.activity.account;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ListView;

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AddAccountActivity.java

@@ -1,6 +1,6 @@
 package com.blogspot.e_kanivets.moneytracker.activity.account;
 
-import android.support.v7.widget.AppCompatSpinner;
+import androidx.appcompat.widget.AppCompatSpinner;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/TransferActivity.java

@@ -1,6 +1,6 @@
 package com.blogspot.e_kanivets.moneytracker.activity.account;
 
-import android.support.v7.widget.AppCompatSpinner;
+import androidx.appcompat.widget.AppCompatSpinner;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/EditAccountActivity.kt

@@ -4,7 +4,7 @@ import android.app.Activity
 import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
-import android.support.v4.view.ViewPager.OnPageChangeListener
+import androidx.viewpager.widget.ViewPager.OnPageChangeListener
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/EditAccountFragment.kt

@@ -2,7 +2,7 @@ package com.blogspot.e_kanivets.moneytracker.activity.account.edit.fragment
 
 import android.app.Activity
 import android.os.Bundle
-import android.support.design.widget.FloatingActionButton
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import android.view.View
 import com.blogspot.e_kanivets.moneytracker.R
 import com.blogspot.e_kanivets.moneytracker.R.layout

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/base/BaseActivity.java

@@ -2,12 +2,12 @@
 
 import android.app.ProgressDialog;
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.widget.Toast;
 
 import com.blogspot.e_kanivets.moneytracker.MtApp;
@@ -16,7 +16,7 @@
 import butterknife.ButterKnife;
 
 /**
- * Base implementation of {@link android.support.v7.app.AppCompatActivity} to describe some common
+ * Base implementation of {@link androidx.appcompat.app.AppCompatActivity} to describe some common
  * methods.
  * Created on 1/26/16.
  *

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/base/BaseBackActivity.java

@@ -1,8 +1,8 @@
 package com.blogspot.e_kanivets.moneytracker.activity.base;
 
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import com.blogspot.e_kanivets.moneytracker.R;