diff --git a/app/build.gradle b/app/build.gradle index 7daaf2d..b5fe71c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,14 +3,14 @@ apply plugin: 'io.fabric' android { - compileSdkVersion 28 - buildToolsVersion '28.0.3' + compileSdkVersion 29 + buildToolsVersion '29.0.2' defaultConfig { applicationId 'com.mauriciotogneri.fileexplorer' - minSdkVersion 14 - targetSdkVersion 27 + minSdkVersion 16 + targetSdkVersion 28 versionCode 17 versionName '1.4.0' } @@ -64,20 +64,15 @@ android } } -ext -{ - support = '28.0.0' -} - dependencies { - implementation "com.android.support:support-v4:$support" - implementation "com.android.support:appcompat-v7:$support" - implementation "com.android.support:design:$support" + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.android.material:material:1.2.0-alpha03' // firebase - implementation 'com.google.firebase:firebase-core:16.0.7' + implementation 'com.google.firebase:firebase-core:17.2.1' // crashlytics - implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9' + implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1' } \ No newline at end of file diff --git a/app/src/main/java/com/mauriciotogneri/fileexplorer/adapters/FolderAdapter.java b/app/src/main/java/com/mauriciotogneri/fileexplorer/adapters/FolderAdapter.java index 945569a..5e1d57f 100644 --- a/app/src/main/java/com/mauriciotogneri/fileexplorer/adapters/FolderAdapter.java +++ b/app/src/main/java/com/mauriciotogneri/fileexplorer/adapters/FolderAdapter.java @@ -1,7 +1,6 @@ package com.mauriciotogneri.fileexplorer.adapters; import android.content.Context; -import android.support.v4.content.ContextCompat; import android.util.TypedValue; import android.view.View; import android.widget.ImageView; @@ -16,6 +15,8 @@ import java.util.ArrayList; import java.util.List; +import androidx.core.content.ContextCompat; + public class FolderAdapter extends BaseListAdapter { private int itemsSelected = 0; diff --git a/app/src/main/java/com/mauriciotogneri/fileexplorer/app/MainActivity.java b/app/src/main/java/com/mauriciotogneri/fileexplorer/app/MainActivity.java index 945ffbc..f609081 100644 --- a/app/src/main/java/com/mauriciotogneri/fileexplorer/app/MainActivity.java +++ b/app/src/main/java/com/mauriciotogneri/fileexplorer/app/MainActivity.java @@ -7,12 +7,6 @@ import android.os.Bundle; import android.os.Environment; import android.os.StatFs; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import com.mauriciotogneri.fileexplorer.R; import com.mauriciotogneri.fileexplorer.fragments.FolderFragment; @@ -27,6 +21,13 @@ import java.util.List; import java.util.Stack; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; + public class MainActivity extends AppCompatActivity { private ToolBar toolBar; diff --git a/app/src/main/java/com/mauriciotogneri/fileexplorer/base/BaseListAdapter.java b/app/src/main/java/com/mauriciotogneri/fileexplorer/base/BaseListAdapter.java index cebcdbe..47be351 100644 --- a/app/src/main/java/com/mauriciotogneri/fileexplorer/base/BaseListAdapter.java +++ b/app/src/main/java/com/mauriciotogneri/fileexplorer/base/BaseListAdapter.java @@ -1,7 +1,6 @@ package com.mauriciotogneri.fileexplorer.base; import android.content.Context; -import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -10,6 +9,8 @@ import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; + public abstract class BaseListAdapter extends ArrayAdapter { private final int resourceId; diff --git a/app/src/main/java/com/mauriciotogneri/fileexplorer/fragments/FolderFragment.java b/app/src/main/java/com/mauriciotogneri/fileexplorer/fragments/FolderFragment.java index f040c34..3c3af12 100644 --- a/app/src/main/java/com/mauriciotogneri/fileexplorer/fragments/FolderFragment.java +++ b/app/src/main/java/com/mauriciotogneri/fileexplorer/fragments/FolderFragment.java @@ -9,9 +9,6 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.StringRes; -import android.support.v4.app.Fragment; -import android.support.v4.widget.SwipeRefreshLayout; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; @@ -34,6 +31,10 @@ import java.util.Collections; import java.util.List; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + public class FolderFragment extends Fragment { private static final String PARAMETER_FOLDER_PATH = "folder.path"; diff --git a/app/src/main/java/com/mauriciotogneri/fileexplorer/fragments/StorageFragment.java b/app/src/main/java/com/mauriciotogneri/fileexplorer/fragments/StorageFragment.java index a748125..effa29d 100644 --- a/app/src/main/java/com/mauriciotogneri/fileexplorer/fragments/StorageFragment.java +++ b/app/src/main/java/com/mauriciotogneri/fileexplorer/fragments/StorageFragment.java @@ -2,7 +2,6 @@ import android.content.Context; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -14,6 +13,8 @@ import java.util.Arrays; +import androidx.fragment.app.Fragment; + public class StorageFragment extends Fragment { private static final String PARAMETER_STORAGES_PATH = "storages.path"; diff --git a/app/src/main/java/com/mauriciotogneri/fileexplorer/models/FileInfo.java b/app/src/main/java/com/mauriciotogneri/fileexplorer/models/FileInfo.java index 61a456b..b15c152 100644 --- a/app/src/main/java/com/mauriciotogneri/fileexplorer/models/FileInfo.java +++ b/app/src/main/java/com/mauriciotogneri/fileexplorer/models/FileInfo.java @@ -5,7 +5,6 @@ import android.graphics.BitmapFactory; import android.net.Uri; import android.os.Build; -import android.support.v4.content.FileProvider; import com.mauriciotogneri.fileexplorer.BuildConfig; import com.mauriciotogneri.fileexplorer.utils.CrashUtils; @@ -22,6 +21,8 @@ import java.util.ArrayList; import java.util.List; +import androidx.core.content.FileProvider; + public class FileInfo { private final File file; diff --git a/app/src/main/java/com/mauriciotogneri/fileexplorer/provider/LegacyCompatFileProvider.java b/app/src/main/java/com/mauriciotogneri/fileexplorer/provider/LegacyCompatFileProvider.java index 3120f69..360c1af 100644 --- a/app/src/main/java/com/mauriciotogneri/fileexplorer/provider/LegacyCompatFileProvider.java +++ b/app/src/main/java/com/mauriciotogneri/fileexplorer/provider/LegacyCompatFileProvider.java @@ -2,8 +2,9 @@ import android.database.Cursor; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.v4.content.FileProvider; + +import androidx.annotation.NonNull; +import androidx.core.content.FileProvider; public class LegacyCompatFileProvider extends FileProvider { diff --git a/app/src/main/java/com/mauriciotogneri/fileexplorer/utils/Dialogs.java b/app/src/main/java/com/mauriciotogneri/fileexplorer/utils/Dialogs.java index c7cf1fc..87c984c 100644 --- a/app/src/main/java/com/mauriciotogneri/fileexplorer/utils/Dialogs.java +++ b/app/src/main/java/com/mauriciotogneri/fileexplorer/utils/Dialogs.java @@ -3,7 +3,6 @@ import android.annotation.SuppressLint; import android.app.ProgressDialog; import android.content.Context; -import android.support.v7.app.AlertDialog; import android.text.Editable; import android.text.TextWatcher; import android.view.LayoutInflater; @@ -19,6 +18,8 @@ import java.util.List; +import androidx.appcompat.app.AlertDialog; + public class Dialogs { private Dialogs() diff --git a/build.gradle b/build.gradle index 2a64469..76df492 100644 --- a/build.gradle +++ b/build.gradle @@ -14,9 +14,9 @@ buildscript dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' - classpath 'com.google.gms:google-services:4.2.0' - classpath 'io.fabric.tools:gradle:1.27.1' + classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.google.gms:google-services:4.3.3' + classpath 'io.fabric.tools:gradle:1.28.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c3e03ff..d491a09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Feb 19 13:50:19 CET 2019 +#Thu Dec 26 15:11:39 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip