浏览代码

Fix issue with fab

Mario Danic 8 年之前
父节点
当前提交
b4ed6a8d78

+ 8 - 0
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -48,6 +48,7 @@ import android.view.ViewGroup;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.ListView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -206,6 +207,13 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
         if (getResources().getBoolean(R.bool.bottom_toolbar_enabled)) {
             bottomNavigationView.setVisibility(View.VISIBLE);
             prepareBottomNavigationView();
+        } else {
+            View fabView = v.findViewById(R.id.fab_main);
+            RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams)
+                    fabView.getLayoutParams();
+            layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, 1);
+            fabView.setLayoutParams(layoutParams);
+            fabView.invalidate();
         }
 
         Bundle args = getArguments();

+ 1 - 2
src/main/res/layout/list_fragment.xml

@@ -88,8 +88,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
         app:fab_addButtonColorNormal="@color/primary_button_background_color"
         app:fab_addButtonColorPressed="@color/owncloud_blue"
         app:fab_addButtonPlusIconColor="@color/white"
@@ -97,6 +95,7 @@
         android:layout_marginBottom="@dimen/standard_margin"
         android:layout_marginRight="@dimen/standard_margin"
         android:layout_marginEnd="@dimen/standard_margin"
+        android:layout_above="@+id/bottom_navigation_view"
         android:visibility="gone">
 
         <com.getbase.floatingactionbutton.FloatingActionButton

+ 1 - 1
src/modified/res/values/setup.xml

@@ -66,7 +66,7 @@
     <bool name="videos_enabled">true</bool>
 
     <!-- Bottom toolbar -->
-    <bool name="bottom_toolbar_enabled">true</bool>
+    <bool name="bottom_toolbar_enabled">false</bool>
 
     <!-- Help, imprint and feedback -->
     <bool name="calendar_contacts_enabled">true</bool>