소스 검색

use own FAB library to support colored FAB main button.

tobiasKaminsky 8 년 전
부모
커밋
db7f93fd14
3개의 변경된 파일7개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      build.gradle
  2. 6 0
      src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
  3. 0 3
      src/main/res/layout/list_fragment.xml

+ 1 - 1
build.gradle

@@ -184,7 +184,7 @@ dependencies {
     compile 'com.jakewharton:disklrucache:2.0.2'
     compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
     compile "com.android.support:cardview-v7:${supportLibraryVersion}"
-    compile 'com.getbase:floatingactionbutton:1.10.1'
+    compile 'com.github.tobiasKaminsky:android-floating-action-button:1.10.2'
     compile 'com.google.code.findbugs:annotations:2.0.1'
     compile group: 'commons-io', name: 'commons-io', version: '2.4'
     compile 'com.github.evernote:android-job:v1.1.9'

+ 6 - 0
src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -55,6 +55,7 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.getbase.floatingactionbutton.AddFloatingActionButton;
 import com.getbase.floatingactionbutton.FloatingActionButton;
 import com.getbase.floatingactionbutton.FloatingActionsMenu;
 import com.owncloud.android.MainApp;
@@ -405,6 +406,11 @@ public class ExtendedListFragment extends Fragment
 
         mFabMain = (FloatingActionsMenu) v.findViewById(R.id.fab_main);
 
+        AddFloatingActionButton addButton = mFabMain.getAddButton();
+        addButton.setColorNormal(primaryColor);
+        addButton.setColorPressed(primaryColorDark);
+        addButton.setPlusColor(fontColor);
+
         mFabUpload = (FloatingActionButton) v.findViewById(R.id.fab_upload);
         mFabUpload.setColorNormal(primaryColor);
         mFabUpload.setColorPressed(primaryColorDark);

+ 0 - 3
src/main/res/layout/list_fragment.xml

@@ -88,9 +88,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        app:fab_addButtonColorNormal="@color/primary_button_background_color"
-        app:fab_addButtonColorPressed="@color/primary"
-        app:fab_addButtonPlusIconColor="@color/white"
         app:fab_labelStyle="@style/menu_labels_style"
         android:layout_marginBottom="@dimen/standard_margin"
         android:layout_marginRight="@dimen/standard_margin"