Fix UI issues

build.gradle

@@ -13,7 +13,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'com.google.gms:google-services:3.0.0'
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Mar 05 21:13:56 CET 2017
+#Wed Mar 15 00:10:20 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -294,10 +294,15 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
             navigationView.getMenu().setGroupVisible(R.id.drawer_menu_accounts, false);
         }
 
-        if (getResources().getBoolean(R.bool.bottom_toolbar_enabled)) {
+        boolean searchSupported = AccountUtils.hasSearchSupport(AccountUtils.
+                getCurrentOwnCloudAccount(MainApp.getAppContext()));
+
+        if (getResources().getBoolean(R.bool.bottom_toolbar_enabled) || !searchSupported) {
             navigationView.getMenu().removeItem(R.id.nav_photos);
             navigationView.getMenu().removeItem(R.id.nav_all_files);
-            navigationView.getMenu().removeItem(R.id.nav_settings);
+            if (getResources().getBoolean(R.bool.bottom_toolbar_enabled)) {
+                navigationView.getMenu().removeItem(R.id.nav_settings);
+            }
             navigationView.getMenu().removeItem(R.id.nav_favorites);
         }
 

src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -239,7 +239,10 @@ public class ExtendedListFragment extends Fragment
                         if (getActivity() != null && !(getActivity() instanceof FolderPickerActivity)) {
                             setFabEnabled(!hasFocus);
 
-                            if (getResources().getBoolean(R.bool.bottom_toolbar_enabled)) {
+                            boolean searchSupported = AccountUtils.hasSearchSupport(AccountUtils.
+                                    getCurrentOwnCloudAccount(MainApp.getAppContext()));
+
+                            if (getResources().getBoolean(R.bool.bottom_toolbar_enabled) && searchSupported ) {
                                 BottomNavigationView bottomNavigationView = (BottomNavigationView) getActivity().
                                         findViewById(R.id.bottom_navigation_view);
                                 if (hasFocus) {
@@ -656,7 +659,7 @@ public class ExtendedListFragment extends Fragment
                             R.string.file_list_empty_search, R.drawable.ic_search_light_grey);
                 } else if (searchType == FAVORITE_SEARCH_FILTER) {
                     setMessageForEmptyList(R.string.file_list_empty_headline_server_search,
-                            R.string.file_list_empty_favorites_filter, R.drawable.ic_favorite_grey);
+                            R.string.file_list_empty_favorites_filter, R.drawable.ic_star_light_grey);
                 } else if (searchType == VIDEO_SEARCH_FILTER) {
                     setMessageForEmptyList(R.string.file_list_empty_headline_server_search_videos,
                             R.string.file_list_empty_text_videos_filter, R.drawable.ic_list_empty_video);

src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -201,7 +201,10 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
             currentSearchType = SearchType.NO_SEARCH;
         }
 
-        if (getResources().getBoolean(R.bool.bottom_toolbar_enabled)) {
+        boolean searchSupported = AccountUtils.hasSearchSupport(AccountUtils.
+                getCurrentOwnCloudAccount(MainApp.getAppContext()));
+
+        if (getResources().getBoolean(R.bool.bottom_toolbar_enabled) && searchSupported) {
             bottomNavigationView.setVisibility(View.VISIBLE);
             prepareBottomNavigationView();
         }

src/main/res/layout/list_fragment.xml

@@ -88,9 +88,9 @@
         android:id="@+id/fab_main"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/bottom_navigation_view"
         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"
@@ -135,6 +135,7 @@
     <android.support.design.widget.BottomNavigationView
         android:id="@+id/bottom_navigation_view"
         android:visibility="gone"
+        android:layout_below="@+id/fab_main"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"