messed up during merge confict (fix #92)

Author: codekidX

storagechooser/build.gradle

@@ -33,6 +33,7 @@ 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,7 +13,6 @@
 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;
@@ -52,6 +51,7 @@
 import java.util.Comparator;
 import java.util.List;
 
+import at.markushi.ui.CircleButton;
 
 import static com.codekidlabs.storagechooser.StorageChooser.Theme;
 
@@ -74,7 +74,7 @@ public class SecondaryChooserFragment extends android.app.DialogFragment {
     private Button mCreateButton;
     private ImageView mNewFolderImageView;
     private EditText mFolderNameEditText;
-    private FloatingActionButton mMultipleOnSelectButton;
+    private CircleButton mMultipleOnSelectButton;
     private RelativeLayout mNewFolderView;
     private ProgressBar mFilesProgress;
     private String mBundlePath;
@@ -410,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.setBackgroundTintList(ColorStateList.valueOf(scheme[Theme.SEC_DONE_FAB_INDEX]));
+        mMultipleOnSelectButton.setColor(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

@@ -152,16 +152,18 @@
             android:layout_below="@id/custom_path_header"
             android:background="@color/inactiveGradientColor" />
 
-        <android.support.design.widget.FloatingActionButton
+        <at.markushi.ui.CircleButton
             android:id="@+id/multiple_selection_done_fab"
-            app:fabSize="normal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="72dip"
+            android:layout_height="72dip"
             android:layout_alignParentBottom="true"
             android:layout_alignParentEnd="true"
             android:layout_margin="16dp"
-            app:srcCompat="@drawable/ic_check_white_24dp"
-            android:visibility="invisible" />
+            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" />
 
     </RelativeLayout>
 

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

@@ -153,16 +153,19 @@
             android:layout_below="@id/custom_path_header"
             android:background="@color/inactiveGradientColor" />
 
-        <android.support.design.widget.FloatingActionButton
+        <at.markushi.ui.CircleButton
             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" />
+            android:visibility="invisible"
+            app:cb_color="@color/colorAccent"
+            app:cb_pressedRingWidth="8dip" />
 
     </RelativeLayout>