projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
838aaff
)
correct text field names
author
Andy Scherzinger
<info@andy-scherzinger.de>
Mon, 2 Nov 2015 14:26:00 +0000
(15:26 +0100)
committer
Andy Scherzinger
<info@andy-scherzinger.de>
Mon, 2 Nov 2015 14:26:00 +0000
(15:26 +0100)
res/layout/list_item.xml
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
patch
|
blob
|
blame
|
history
diff --git
a/res/layout/list_item.xml
b/res/layout/list_item.xml
index
a72bdaf
..
71efa7d
100644
(file)
--- a/
res/layout/list_item.xml
+++ b/
res/layout/list_item.xml
@@
-92,7
+92,7
@@
android:orientation="horizontal">
\r
\r
<TextView
\r
android:orientation="horizontal">
\r
\r
<TextView
\r
- android:id="@+id/
last
_size"
\r
+ android:id="@+id/
file
_size"
\r
android:layout_width="wrap_content"
\r
android:layout_height="wrap_content"
\r
android:text="Size MB"
\r
android:layout_width="wrap_content"
\r
android:layout_height="wrap_content"
\r
android:text="Size MB"
\r
@@
-109,7
+109,7
@@
android:textSize="@dimen/two_line_secondary_text_size"/>
\r
\r
<TextView
\r
android:textSize="@dimen/two_line_secondary_text_size"/>
\r
\r
<TextView
\r
- android:id="@+id/
file
_mod"
\r
+ android:id="@+id/
last
_mod"
\r
android:layout_width="wrap_content"
\r
android:layout_height="wrap_content"
\r
android:gravity="right"
\r
android:layout_width="wrap_content"
\r
android:layout_height="wrap_content"
\r
android:gravity="right"
\r
diff --git
a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index
e9e9614
..
f561ceb
100644
(file)
--- 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 {
\r
switch (viewType){
\r
case LIST_ITEM:
\r
\r
switch (viewType){
\r
case LIST_ITEM:
\r
- TextView fileSizeV = (TextView) view.findViewById(R.id.
last
_size);
\r
+ TextView fileSizeV = (TextView) view.findViewById(R.id.
file
_size);
\r
TextView fileSizeSeparatorV = (TextView) view.findViewById(R.id.file_separator);
\r
TextView fileSizeSeparatorV = (TextView) view.findViewById(R.id.file_separator);
\r
- TextView lastModV = (TextView) view.findViewById(R.id.
file
_mod);
\r
+ TextView lastModV = (TextView) view.findViewById(R.id.
last
_mod);
\r
ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
\r
\r
lastModV.setVisibility(View.VISIBLE);
\r
ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
\r
\r
lastModV.setVisibility(View.VISIBLE);
\r
diff --git
a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index
54705da
..
a6839e5
100644
(file)
--- 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());
}
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 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);
ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
if (!file.isDirectory()) {
fileSizeSeparatorV.setVisibility(View.VISIBLE);