Improve FAB with new drawable and some fixes

javiersantos · Jun 17, 2015 · 3b07328 · 3b07328
1 parent 80ecb98
commit 3b07328
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ Modern, easy and customizable app manager for Android with Material Design.
 
 ## Third Party Libraries
 * [Material Design Library](https://github.com/navasmdc/MaterialDesignLibrary)
-* [Floating Action Button](https://github.com/makovkastar/FloatingActionButton)
+* [Android Floating Action Button](https://github.com/futuresimple/android-floating-action-button)
 * [Material Dialogs](https://github.com/afollestad/material-dialogs)
 * [Ambil Warna](https://github.com/yukuku/ambilwarna)
 * [Materialish Progress](https://github.com/pnikosis/materialish-progress)

diff --git a/app/app.iml b/app/app.iml
@@ -74,9 +74,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/22.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.getbase/floatingactionbutton/1.9.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.navasmdc/MaterialDesign/1.5/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.yukuku/ambilwarna/2.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.melnykov/floatingactionbutton/1.3.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/iconics/1.0.2/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/materialdrawer/3.0.7/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.pnikosis/materialish-progress/1.5/jars" />
@@ -99,17 +99,16 @@
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="MaterialDesign-1.5" level="project" />
-    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="iconics-1.0.2" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="materialish-progress-1.5" level="project" />
     <orderEntry type="library" exported="" name="materialdrawer-3.0.7" level="project" />
-    <orderEntry type="library" exported="" name="floatingactionbutton-1.3.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="ambilwarna-2.0" level="project" />
+    <orderEntry type="library" exported="" name="floatingactionbutton-1.9.1" level="project" />
     <orderEntry type="library" exported="" name="material-dialogs-0.7.6.0" level="project" />
     <orderEntry type="library" exported="" name="recyclerviewfastscroller-0.1.3" level="project" />
     <orderEntry type="library" exported="" name="cardview-v7-22.2.0" level="project" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     compile 'com.android.support:support-v4:22.2.0'
     compile 'commons-io:commons-io:2.4'
     compile 'com.github.navasmdc:MaterialDesign:1.5@aar'
-    compile 'com.melnykov:floatingactionbutton:1.3.0'
+    compile 'com.getbase:floatingactionbutton:1.9.1'
     compile 'com.afollestad:material-dialogs:0.7.6.0'
     compile 'com.github.yukuku:ambilwarna:2.0'
     compile 'com.pnikosis:materialish-progress:1.5'

diff --git a/app/src/main/java/com/javiersantos/mlmanager/activities/AppActivity.java b/app/src/main/java/com/javiersantos/mlmanager/activities/AppActivity.java
@@ -18,13 +18,13 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.getbase.floatingactionbutton.FloatingActionButton;
 import com.javiersantos.mlmanager.AppInfo;
 import com.javiersantos.mlmanager.R;
 import com.javiersantos.mlmanager.utils.AppPreferences;
 import com.javiersantos.mlmanager.utils.UtilsApp;
 import com.javiersantos.mlmanager.utils.UtilsDialog;
 import com.javiersantos.mlmanager.utils.UtilsUI;
-import com.melnykov.fab.FloatingActionButton;
 
 import java.io.File;
 
@@ -139,7 +139,7 @@ public void onClick(View view) {
             @Override
             public void onClick(View view) {
                 try {
-                    File file = UtilsApp.copyFile(context, appInfo);
+                    UtilsApp.copyFile(context, appInfo);
                     UtilsDialog.showSavedDialog(context, appInfo).show();
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -157,8 +157,9 @@ public void onClick(View view) {
         cache.setVisibility(View.GONE);
 
         // FAB
-        fab.setImageDrawable(getResources().getDrawable(R.drawable.ic_share));
-        fab.setBackgroundColor(appPreferences.getFABColorPref());
+        fab.setIcon(R.drawable.ic_send_white);
+        fab.setColorNormal(appPreferences.getFABColorPref());
+        fab.setColorPressed(UtilsUI.darker(appPreferences.getFABColorPref(), 0.8));
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

diff --git a/app/src/main/res/drawable-hdpi/ic_send_white.png b/app/src/main/res/drawable-hdpi/ic_send_white.png
diff --git a/app/src/main/res/drawable-hdpi/ic_share.png b/app/src/main/res/drawable-hdpi/ic_share.png
diff --git a/app/src/main/res/drawable-mdpi/ic_send_white.png b/app/src/main/res/drawable-mdpi/ic_send_white.png
diff --git a/app/src/main/res/drawable-mdpi/ic_share.png b/app/src/main/res/drawable-mdpi/ic_share.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_send_white.png b/app/src/main/res/drawable-xhdpi/ic_send_white.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_share.png b/app/src/main/res/drawable-xhdpi/ic_share.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_send_white.png b/app/src/main/res/drawable-xxhdpi/ic_send_white.png
diff --git a/app/src/main/res/layout/fab.xml b/app/src/main/res/layout/fab.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.melnykov.fab.FloatingActionButton
+<com.getbase.floatingactionbutton.FloatingActionButton
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/fab"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="bottom|right"
-    android:layout_margin="16dp"
-    fab:fab_colorNormal="@color/fab"
-    fab:fab_colorPressed="@color/fabDark"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:fab="http://schemas.android.com/tools" />
+    android:layout_margin="@dimen/fab_margin"
+    app:fab_colorNormal="@color/fab" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -3,7 +3,6 @@
     <color name="primary">#3F51B5</color>
     <color name="primary_dark">#303F9F</color>
     <color name="fab">#E91E63</color>
-    <color name="fabDark">#AD1457</color>
     <color name="accent">#448AFF</color>
     <color name="text_primary">#212121</color>
     <color name="bkg_card">#8C9EFF</color>

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -2,4 +2,8 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
+
+    <!-- Custom dimens -->
+    <dimen name="fab_margin">16dp</dimen>
+
 </resources>