From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 18 Aug 2015 21:23:36 +0000 (+0200)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~69
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/99e6db3d34f7f7498cc0d5bcc49fb3b7487511c1?hp=-c

Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
---

99e6db3d34f7f7498cc0d5bcc49fb3b7487511c1
diff --combined res/values/colors.xml
index d3426536,8ca0a4e5..49780a78
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@@ -26,19 -26,16 +26,20 @@@
      <color name="list_item_lastmod_and_filesize_text">#989898</color>
      <color name="black">#000000</color>
      <color name="white">#FFFFFF</color>
 +    <color name="fab_white">#fafafa</color>
 +    <color name="white_pressed">#f1f1f1</color>
 +    <color name="half_black">#808080</color>
 +    <color name="black_semi_transparent">#B2000000</color>
      <color name="textColor">#303030</color>
      <color name="drawerMenuTextColor">#000000</color>
      <color name="list_divider_background">#fff0f0f0</color>
      <color name="filelist_icon_backgorund">#DDDDDD</color>
      <color name="dark_background_text_color">#EEEEEE</color>
-     <color name="login_text_color">@color/dark_background_text_color</color>
-     <color name="login_text_hint_color">#777777</color>
+     <color name="login_text_color">#757575</color>
+     <color name="login_text_hint_color">#757575</color>
      <color name="primary_button_color">@color/owncloud_blue_accent</color>
      <color name="secondary_button_color">#D6D7D7</color>
+     <color name="transparent">#00000000</color>
  
      <!-- Colors -->
      <color name="color_accent">@color/owncloud_blue_accent</color>
diff --combined res/values/styles.xml
index dac28d9c,7df7639e..f37e4279
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@@ -53,6 -53,14 +53,14 @@@
  
  	<style name="ownCloud.Dialog" parent="Theme.AppCompat.Light.Dialog" />
  
+ 	<style name="ProgressDialogTheme" parent="ownCloud.Dialog">
+ 		<item name="colorAccent">@color/color_accent</item>
+ 		<item name="android:textColorPrimary">@color/primary</item>
+ 		<item name="android:windowFrame">@color/transparent</item>
+ 		<item name="android:windowBackground">@color/transparent</item>
+ 		<item name="android:windowTitleBackgroundStyle">@drawable/process_dialog_background</item>
+ 	</style>
+ 
  	<style name="ownCloud.Button" parent="Widget.AppCompat.Button">
  		<item name="colorButtonNormal">@color/primary</item>
  	</style>
@@@ -119,11 -127,6 +127,11 @@@
  		<item name="buttonBarStyle">@style/Theme.ownCloud.Dialog.ButtonBar</item>
  	</style>
  
 +	<style name="menu_labels_style">
 +		<item name="android:background">@drawable/fab_label_background</item>
 +		<item name="android:textColor">@color/fab_white</item>
 +	</style>
 +
  	<!-- Button Bar hack due to Lollipop bug:
  		https://code.google.com/p/android/issues/detail?id=78302
  	fix see:
diff --combined src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index ce9d2e6f,fbb209e5..146d0ba2
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@@ -29,19 -29,14 +29,19 @@@ import android.content.Intent
  import android.os.Bundle;
  import android.support.v4.widget.SwipeRefreshLayout;
  import android.view.ContextMenu;
 +import android.view.LayoutInflater;
  import android.view.Menu;
  import android.view.MenuInflater;
  import android.view.MenuItem;
  import android.view.View;
 +import android.view.ViewGroup;
  import android.widget.AdapterView;
  import android.widget.AdapterView.AdapterContextMenuInfo;
 +import android.widget.ListView;
  import android.widget.PopupMenu;
 +import android.widget.Toast;
  
 +import com.getbase.floatingactionbutton.FloatingActionsMenu;
  import com.owncloud.android.R;
  import com.owncloud.android.authentication.AccountUtils;
  import com.owncloud.android.datamodel.FileDataStorageManager;
@@@ -113,43 -108,6 +113,43 @@@ public class OCFileListFragment extend
          }
      }
  
 +    /**
 +     * {@inheritDoc}
 +     */
 +    @Override
 +    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 +        Log_OC.i(TAG, "onCreateView() start");
 +        View v = super.onCreateView(inflater, container, savedInstanceState);
 +
 +        // Setup FAB listeners
 +        getFabUpload().setOnClickListener(new View.OnClickListener() {
 +            @Override
 +            public void onClick(View v) {
 +                ((FileDisplayActivity)getActivity()).uploadLocalFilesSelected();
 +                getFabMain().collapse();
 +            }
 +        });
 +
 +        getFabMkdir().setOnClickListener(new View.OnClickListener() {
 +            @Override
 +            public void onClick(View v) {
 +                ((FileDisplayActivity) getActivity()).createFolder();
 +                getFabMain().collapse();
 +            }
 +        });
 +
 +        getFabUploadFromApp().setOnClickListener(new View.OnClickListener() {
 +            @Override
 +            public void onClick(View v) {
 +                ((FileDisplayActivity) getActivity()).uploadFromOtherAppsSelected();
 +                getFabMain().collapse();
 +            }
 +        });
 +
 +        Log_OC.i(TAG, "onCreateView() end");
 +        return v;
 +    }
 +
      
      @Override
      public void onDetach() {
@@@ -235,7 -193,6 +235,6 @@@
                  }
              }
  
-             MenuItem menuItem = new DialogMenuItem(item.getItemId());
              FileActionsDialogFragment dialog = FileActionsDialogFragment.newInstance(menu, fileIndex);
              dialog.setTargetFragment(this, 0);
              dialog.show(getFragmentManager(), FileActionsDialogFragment.FTAG_FILE_ACTIONS);