From: Andy Scherzinger Date: Wed, 4 Nov 2015 09:06:45 +0000 (+0100) Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab X-Git-Tag: beta-20151202~3^2~2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0e9ddf44e12cf70d4556c8cc1c3e9abbed8a5d55?hp=72b330d25b673a702ebdcfcac8f2884fe214ecfd Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab --- diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml index 17b098aa..ee1f26a7 100644 --- a/res/layout/list_item.xml +++ b/res/layout/list_item.xml @@ -92,7 +92,7 @@ android:orientation="horizontal"> #B2000000 @color/black #000000 - #eee + #f8f8f8 #DDDDDD #EEEEEE #757575 diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java index e9e96145..a41e4fe5 100644 --- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java @@ -193,9 +193,9 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter { switch (viewType){ case LIST_ITEM: - TextView fileSizeV = (TextView) view.findViewById(R.id.last_size); + TextView fileSizeV = (TextView) view.findViewById(R.id.file_size); TextView fileSizeSeparatorV = (TextView) view.findViewById(R.id.file_separator); - TextView lastModV = (TextView) view.findViewById(R.id.file_mod); + TextView lastModV = (TextView) view.findViewById(R.id.last_mod); ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox); lastModV.setVisibility(View.VISIBLE); @@ -225,8 +225,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter { } } else { //Folder - fileSizeSeparatorV.setVisibility(View.INVISIBLE); - fileSizeV.setVisibility(View.INVISIBLE); + fileSizeSeparatorV.setVisibility(View.GONE); + fileSizeV.setVisibility(View.GONE); } case GRID_ITEM: diff --git a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java index 54705dab..a6839e55 100644 --- a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java @@ -120,9 +120,9 @@ public class LocalFileListAdapter extends BaseAdapter implements ListAdapter { } fileIcon.setTag(file.hashCode()); - TextView fileSizeV = (TextView) view.findViewById(R.id.last_size); + TextView fileSizeV = (TextView) view.findViewById(R.id.file_size); TextView fileSizeSeparatorV = (TextView) view.findViewById(R.id.file_separator); - TextView lastModV = (TextView) view.findViewById(R.id.file_mod); + TextView lastModV = (TextView) view.findViewById(R.id.last_mod); ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox); if (!file.isDirectory()) { fileSizeSeparatorV.setVisibility(View.VISIBLE);