filestack · sethk4783 · Dec 18, 2023 · Aug 3, 2023 · Aug 4, 2023 · Aug 18, 2023
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.71'
+    ext.kotlin_version = '1.6.21'
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/filestack/build.gradle b/filestack/build.gradle
@@ -1,5 +1,4 @@
 plugins {
-    id 'com.github.dcendents.android-maven' version '2.0'
     id 'com.jfrog.bintray' version '1.7.3'
 }
 
@@ -11,15 +10,14 @@ version = '5.3.0'
 project.archivesBaseName = 'filestack-android'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
-        versionCode 1
-        versionName version
+        targetSdkVersion 33
+        multiDexEnabled = true
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
         vectorDrawables {
             useSupportLibrary true
@@ -40,14 +38,14 @@ android {
 dependencies {
     api 'com.filestack:filestack-java:0.9.0'
 
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support:customtabs:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.browser:browser:1.0.0'
 
     implementation 'com.squareup.picasso:picasso:2.5.2'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
 
-    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'
     })
     testImplementation 'junit:junit:4.12'

diff --git a/filestack/src/androidTest/java/com/filestack/android/ExampleInstrumentedTest.java b/filestack/src/androidTest/java/com/filestack/android/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.filestack.android;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/filestack/src/main/AndroidManifest.xml b/filestack/src/main/AndroidManifest.xml
@@ -8,13 +8,14 @@
 
     <application
         android:allowBackup="true"
-        android:supportsRtl="true">
+        android:supportsRtl="true" >
 
         <activity
             android:name=".FsActivity"
             android:launchMode="singleTop"
             android:label="@string/filestack__picker_title"
-            android:theme="@style/FilestackNoActionBar">
+            android:theme="@style/FilestackNoActionBar"
+            android:exported="true">
 
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

diff --git a/filestack/src/main/java/com/filestack/android/FsActivity.java b/filestack/src/main/java/com/filestack/android/FsActivity.java
@@ -5,41 +5,36 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
-import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.NavigationView;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.ColorUtils;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.view.MenuCompat;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.WindowCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v4.widget.ImageViewCompat;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.AppCompatImageButton;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.navigation.NavigationView;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.view.GravityCompat;
+import androidx.core.view.MenuCompat;
+import androidx.core.view.MenuItemCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.core.widget.ImageViewCompat;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.AppCompatImageButton;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ImageButton;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.filestack.CloudResponse;

diff --git a/filestack/src/main/java/com/filestack/android/FsConstants.java b/filestack/src/main/java/com/filestack/android/FsConstants.java
@@ -34,8 +34,12 @@ public class FsConstants {
     public static final String EXTRA_FILE_LINK = "fileLink";
     /** For uploads, returns upload status string. */
     public static final String EXTRA_STATUS = "status";
+    /** For uploads, returns upload percent uploaded. */
+    public static final String EXTRA_PERCENT = "percent";
     /** Indicates an upload completed successfully. */
     public static final String STATUS_COMPLETE = "complete";
+    /** Indicates an upload is still in progress. */
+    public static final String STATUS_IN_PROGRESS = "inProgress";
     /** Indicates an upload failed. */
     public static final String STATUS_FAILED = "failed";
 

diff --git a/filestack/src/main/java/com/filestack/android/Theme.java b/filestack/src/main/java/com/filestack/android/Theme.java
@@ -1,11 +1,9 @@
 package com.filestack.android;
 
-import android.content.Context;
 import android.graphics.Color;
-import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
 
 public class Theme implements Parcelable {
 

diff --git a/filestack/src/main/java/com/filestack/android/internal/CameraFragment.java b/filestack/src/main/java/com/filestack/android/internal/CameraFragment.java
@@ -7,11 +7,11 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.ImageViewCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.core.view.ViewCompat;
+import androidx.core.widget.ImageViewCompat;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.View;

diff --git a/filestack/src/main/java/com/filestack/android/internal/CloudAuthFragment.java b/filestack/src/main/java/com/filestack/android/internal/CloudAuthFragment.java
@@ -1,15 +1,14 @@
 package com.filestack.android.internal;
 
-import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.customtabs.CustomTabsIntent;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.ImageViewCompat;
+import androidx.annotation.Nullable;
+import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.widget.ImageViewCompat;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.View;

diff --git a/filestack/src/main/java/com/filestack/android/internal/CloudListAdapter.java b/filestack/src/main/java/com/filestack/android/internal/CloudListAdapter.java
@@ -1,8 +1,8 @@
 package com.filestack.android.internal;
 
 import android.os.Bundle;
-import android.support.v4.graphics.ColorUtils;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.graphics.ColorUtils;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.text.format.Formatter;
 import android.view.LayoutInflater;
@@ -11,7 +11,6 @@
 
 import com.filestack.CloudItem;
 import com.filestack.CloudResponse;
-import com.filestack.android.R;
 import com.filestack.android.Selection;
 import com.filestack.android.Theme;
 

diff --git a/filestack/src/main/java/com/filestack/android/internal/CloudListFragment.java b/filestack/src/main/java/com/filestack/android/internal/CloudListFragment.java
@@ -3,12 +3,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/filestack/src/main/java/com/filestack/android/internal/CloudListViewHolder.java b/filestack/src/main/java/com/filestack/android/internal/CloudListViewHolder.java
@@ -2,10 +2,10 @@
 
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.support.annotation.ColorInt;
-import android.support.v4.graphics.ColorUtils;
-import android.support.v4.widget.ImageViewCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.ColorInt;
+import androidx.core.graphics.ColorUtils;
+import androidx.core.widget.ImageViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

diff --git a/filestack/src/main/java/com/filestack/android/internal/LocalFilesFragment.java b/filestack/src/main/java/com/filestack/android/internal/LocalFilesFragment.java
@@ -9,10 +9,10 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.OpenableColumns;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.ImageViewCompat;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.core.view.ViewCompat;
+import androidx.core.widget.ImageViewCompat;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.View;

diff --git a/filestack/src/main/java/com/filestack/android/internal/SpacingDecoration.java b/filestack/src/main/java/com/filestack/android/internal/SpacingDecoration.java
@@ -1,10 +1,10 @@
 package com.filestack.android.internal;
 
 import android.graphics.Rect;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.view.View;
 
 // Taken from https://stackoverflow.com/a/32971704/5121687

diff --git a/filestack/src/main/java/com/filestack/android/internal/SquareImageView.java b/filestack/src/main/java/com/filestack/android/internal/SquareImageView.java
@@ -1,7 +1,7 @@
 package com.filestack.android.internal;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 
 public class SquareImageView extends AppCompatImageView {