Merge branch 'inline-3.0'

codekidX · Mar 25, 2019 · 8676762 · 8676762
2 parents bba9240 + 3c32cb6
commit 8676762
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 51 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
     defaultConfig {
         applicationId "com.codekidlabs.storagechooserdemo"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -23,13 +23,13 @@ android {
 
 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-alpha4', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 
-    implementation 'com.android.support:cardview-v7:27.1.1'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'androidx.cardview:cardview:1.0.0-beta01'
+    implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
+    implementation 'com.google.android.material:material:1.0.0-beta01'
     testImplementation 'junit:junit:4.12'
 
     implementation project (':storagechooser')

diff --git a/app/src/main/java/com/codekidlabs/storagechooserdemo/MainActivity.java b/app/src/main/java/com/codekidlabs/storagechooserdemo/MainActivity.java
@@ -4,11 +4,12 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
@@ -21,6 +22,7 @@
 import com.codekidlabs.storagechooser.Content;
 import com.codekidlabs.storagechooser.StorageChooser;
 import com.codekidlabs.storagechooser.utils.DiskUtil;
+import com.google.android.material.snackbar.Snackbar;
 
 import java.util.ArrayList;
 

diff --git a/app/src/main/java/com/codekidlabs/storagechooserdemo/ReportBottomSheet.java b/app/src/main/java/com/codekidlabs/storagechooserdemo/ReportBottomSheet.java
@@ -1,16 +1,17 @@
 package com.codekidlabs.storagechooserdemo;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomSheetDialogFragment;
-import android.support.v4.content.ContextCompat;
+
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
 import com.codekidlabs.storagechooserdemo.utils.TypefaceUtil;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 
 /**
  * report any issue using logboard api

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/coord"
     android:layout_width="match_parent"
@@ -10,7 +10,7 @@
         android:layout_height="160dp"
         android:background="@color/colorPrimary" />
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="-4dp"
@@ -118,10 +118,10 @@
             </LinearLayout>
 
         </ScrollView>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -130,4 +130,4 @@
         android:tint="@android:color/white"
         app:srcCompat="@drawable/open_in_new" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/build.gradle b/build.gradle
@@ -11,8 +11,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git 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
@@ -1,6 +1,6 @@
-#Sun Jul 08 10:09:20 IST 2018
+#Mon Mar 25 14:17:17 IST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/storagechooser/build.gradle b/storagechooser/build.gradle
@@ -4,16 +4,16 @@ apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.codekidX'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -28,11 +28,11 @@ android {
 
 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-alpha4', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
+    implementation 'com.google.android.material:material:1.0.0-beta01'
     testImplementation 'junit:junit:4.12'
 }
 

diff --git a/storagechooser/src/main/java/com/codekidlabs/storagechooser/StorageChooser.java b/storagechooser/src/main/java/com/codekidlabs/storagechooser/StorageChooser.java
@@ -4,19 +4,18 @@
 import android.app.Dialog;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.graphics.Typeface;
 import android.os.Environment;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.codekidlabs.storagechooser.fragments.ChooserDialogFragment;
 import com.codekidlabs.storagechooser.models.Config;
 import com.codekidlabs.storagechooser.utils.DiskUtil;
 
-import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.Nullable;
+
 
 public class StorageChooser {
 

diff --git a/...oser/src/main/java/com/codekidlabs/storagechooser/adapters/StorageChooserListAdapter.java b/...oser/src/main/java/com/codekidlabs/storagechooser/adapters/StorageChooserListAdapter.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.graphics.Typeface;
-import android.support.v4.graphics.drawable.DrawableCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.StyleSpan;

diff --git a/...chooser/src/main/java/com/codekidlabs/storagechooser/fragments/ChooserDialogFragment.java b/...chooser/src/main/java/com/codekidlabs/storagechooser/fragments/ChooserDialogFragment.java
@@ -7,8 +7,6 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -33,6 +31,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import static com.codekidlabs.storagechooser.StorageChooser.Theme.OVERVIEW_BG_INDEX;
 import static com.codekidlabs.storagechooser.StorageChooser.Theme.OVERVIEW_HEADER_INDEX;
 import static com.codekidlabs.storagechooser.StorageChooser.Theme.OVERVIEW_TEXT_INDEX;

diff --git a/...oser/src/main/java/com/codekidlabs/storagechooser/fragments/SecondaryChooserFragment.java b/...oser/src/main/java/com/codekidlabs/storagechooser/fragments/SecondaryChooserFragment.java
@@ -11,10 +11,6 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.content.ContextCompat;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
@@ -45,6 +41,7 @@
 import com.codekidlabs.storagechooser.utils.DiskUtil;
 import com.codekidlabs.storagechooser.utils.FileUtil;
 import com.codekidlabs.storagechooser.utils.ResourceUtil;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -53,6 +50,10 @@
 import java.util.List;
 
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+
 import static com.codekidlabs.storagechooser.StorageChooser.Theme;
 
 
@@ -724,15 +725,15 @@ private void playTheAddressBarAnimation() {
 
     private void playTheMultipleButtonAnimation() {
         Animation animation = AnimationUtils.loadAnimation(mContext, R.anim.anim_multiple_button);
-        mMultipleOnSelectButton.setVisibility(View.VISIBLE);
+        mMultipleOnSelectButton.show();
         mMultipleOnSelectButton.startAnimation(animation);
     }
 
 
     private void playTheMultipleButtonEndAnimation() {
         Animation animation = AnimationUtils.loadAnimation(mContext, R.anim.anim_multiple_button_end);
         mMultipleOnSelectButton.startAnimation(animation);
-        mMultipleOnSelectButton.setVisibility(View.INVISIBLE);
+        mMultipleOnSelectButton.hide();
     }
 
 

diff --git a/storagechooser/src/main/java/com/codekidlabs/storagechooser/utils/ResourceUtil.java b/storagechooser/src/main/java/com/codekidlabs/storagechooser/utils/ResourceUtil.java
@@ -2,8 +2,8 @@
 
 
 import android.content.Context;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.ColorUtils;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
 
 import com.codekidlabs.storagechooser.R;
 

diff --git a/storagechooser/src/main/java/com/codekidlabs/storagechooser/utils/ThumbnailUtil.java b/storagechooser/src/main/java/com/codekidlabs/storagechooser/utils/ThumbnailUtil.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.widget.ImageView;
 
 import com.codekidlabs.storagechooser.R;

diff --git a/storagechooser/src/main/res/layout-v21/custom_storage_list.xml b/storagechooser/src/main/res/layout-v21/custom_storage_list.xml
@@ -152,7 +152,7 @@
             android:layout_below="@id/custom_path_header"
             android:background="@color/inactiveGradientColor" />
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/multiple_selection_done_fab"
             app:fabSize="normal"
             android:layout_width="wrap_content"

diff --git a/storagechooser/src/main/res/layout/custom_storage_list.xml b/storagechooser/src/main/res/layout/custom_storage_list.xml
@@ -58,7 +58,9 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="16dp"
+                    android:layout_marginRight="16dp"
                     android:layout_marginStart="16dp"
+                    android:layout_marginLeft="16dp"
                     android:fontFamily="sans-serif-condensed"
                     android:text="blahblahblah"
                     android:textColor="@android:color/white"
@@ -153,10 +155,11 @@
             android:layout_below="@id/custom_path_header"
             android:background="@color/inactiveGradientColor" />
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/multiple_selection_done_fab"
-            android:layout_width="72dip"
-            android:layout_height="72dip"
+            app:fabSize="normal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"