remove circle button dependency and use android design fab

Author: codekidX

gradle.properties

@@ -14,4 +14,4 @@ org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true

storagechooser/build.gradle

@@ -33,7 +33,6 @@ dependencies {
     })
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support:design:27.1.1'
-    implementation 'com.github.markushi:circlebutton:1.1'
     testImplementation 'junit:junit:4.12'
 }
 

storagechooser/src/main/java/com/codekidlabs/storagechooser/fragments/SecondaryChooserFragment.java

@@ -13,9 +13,11 @@
 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;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -50,7 +52,6 @@
 import java.util.Comparator;
 import java.util.List;
 
-import at.markushi.ui.CircleButton;
 
 import static com.codekidlabs.storagechooser.StorageChooser.Theme;
 
@@ -73,7 +74,7 @@ public class SecondaryChooserFragment extends android.app.DialogFragment {
     private Button mCreateButton;
     private ImageView mNewFolderImageView;
     private EditText mFolderNameEditText;
-    private CircleButton mMultipleOnSelectButton;
+    private FloatingActionButton mMultipleOnSelectButton;
     private RelativeLayout mNewFolderView;
     private ProgressBar mFilesProgress;
     private String mBundlePath;
@@ -341,9 +342,12 @@ private View getLayout(LayoutInflater inflater, ViewGroup container) {
             mContent = mConfig.getContent();
         }
 
+        final Context contextThemeWrapper = new ContextThemeWrapper(getActivity(), R.style.DialogTheme);
+        LayoutInflater li = inflater.cloneInContext(contextThemeWrapper);
+
         mContext = getActivity().getApplicationContext();
         mResourceUtil = new ResourceUtil(mContext);
-        mLayout = inflater.inflate(R.layout.custom_storage_list, container, false);
+        mLayout = li.inflate(R.layout.custom_storage_list, container, false);
 
         initListView(mContext, mLayout, mConfig.isShowMemoryBar());
 
@@ -406,7 +410,7 @@ private void updateUI() {
             mNewFolderImageView.setImageTintList(ColorStateList.valueOf(scheme[Theme.SEC_ADDRESS_TINT_INDEX]));
             mBackButton.setImageTintList(ColorStateList.valueOf(scheme[Theme.SEC_ADDRESS_TINT_INDEX]));
         }
-        mMultipleOnSelectButton.setColor(scheme[Theme.SEC_DONE_FAB_INDEX]);
+        mMultipleOnSelectButton.setBackgroundTintList(ColorStateList.valueOf(scheme[Theme.SEC_DONE_FAB_INDEX]));
         mLayout.findViewById(R.id.custom_path_header).setBackgroundColor(scheme[Theme.SEC_ADDRESS_BAR_BG]);
 
         // ----

storagechooser/src/main/res/layout-v21/custom_storage_list.xml

@@ -98,7 +98,7 @@
             android:layout_centerInParent="true"
             android:layout_width="150dp"
             android:layout_height="wrap_content"
-            android:visibility="visible"
+            android:visibility="invisible"
             />
 
 
@@ -152,18 +152,16 @@
             android:layout_below="@id/custom_path_header"
             android:background="@color/inactiveGradientColor" />
 
-        <at.markushi.ui.CircleButton
+        <android.support.design.widget.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_margin="16dp"
-            android:drawableTop="@drawable/ic_chevron_left_white_24dp"
-            android:src="@drawable/ic_check_white_24dp"
-            android:visibility="invisible"
-            app:cb_color="@color/colorAccent"
-            app:cb_pressedRingWidth="8dip" />
+            app:srcCompat="@drawable/ic_check_white_24dp"
+            android:visibility="invisible" />
 
     </RelativeLayout>
 

storagechooser/src/main/res/layout/custom_storage_list.xml

@@ -97,7 +97,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/custom_path_header"
-            android:visibility="visible"
+            android:visibility="invisible"
             />
 
 
@@ -153,19 +153,16 @@
             android:layout_below="@id/custom_path_header"
             android:background="@color/inactiveGradientColor" />
 
-        <at.markushi.ui.CircleButton
+        <android.support.design.widget.FloatingActionButton
             android:id="@+id/multiple_selection_done_fab"
             android:layout_width="72dip"
             android:layout_height="72dip"
             android:layout_alignParentBottom="true"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:layout_margin="16dp"
-            android:drawableTop="@drawable/ic_chevron_left_white_24dp"
             android:src="@drawable/ic_check_white_24dp"
-            android:visibility="invisible"
-            app:cb_color="@color/colorAccent"
-            app:cb_pressedRingWidth="8dip" />
+            android:visibility="invisible" />
 
     </RelativeLayout>