From 263649b50835e48438f69e87f68db1689730a3a7 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Wed, 23 May 2012 15:58:34 -0700 Subject: [PATCH] Lots of polish to the files control set --- .../todoroo/astrid/files/FilesControlSet.java | 13 ++++---- astrid/res/drawable/file_name_background.xml | 9 ++++++ astrid/res/layout/control_set_files.xml | 3 +- .../res/layout/control_set_files_display.xml | 5 +++- astrid/res/layout/file_display_row.xml | 30 +++++++++++++++++++ astrid/res/layout/file_row.xml | 18 ++++++----- 6 files changed, 62 insertions(+), 16 deletions(-) create mode 100644 astrid/res/drawable/file_name_background.xml create mode 100644 astrid/res/layout/file_display_row.xml diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java b/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java index fb42f3f82..16f6fa6e6 100644 --- a/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java @@ -52,8 +52,10 @@ public class FilesControlSet extends PopupControlSet { protected void refreshDisplayView() { fileDisplayList.removeAllViews(); for (final Metadata m : files) { - View fileRow = inflater.inflate(R.layout.file_row, null); - setUpFileRow(m, fileRow, fileDisplayList); + View fileRow = inflater.inflate(R.layout.file_display_row, null); + LayoutParams lp = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); + lp.gravity = Gravity.RIGHT; + setUpFileRow(m, fileRow, fileDisplayList, lp); } } @@ -99,10 +101,11 @@ public class FilesControlSet extends PopupControlSet { fileList = (LinearLayout) getView().findViewById(R.id.files_list); final LinearLayout finalList = fileList; fileList.removeAllViews(); + LayoutParams lp = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT); for (final Metadata m : files) { final View fileRow = inflater.inflate(R.layout.file_row, null); - setUpFileRow(m, fileRow, fileList); + setUpFileRow(m, fileRow, fileList, lp); View name = fileRow.findViewById(R.id.file_text); View clearFile = fileRow.findViewById(R.id.remove_file); clearFile.setVisibility(View.VISIBLE); @@ -135,7 +138,7 @@ public class FilesControlSet extends PopupControlSet { } } - private void setUpFileRow(Metadata m, View row, LinearLayout parent) { + private void setUpFileRow(Metadata m, View row, LinearLayout parent, LayoutParams lp) { TextView nameView = (TextView) row.findViewById(R.id.file_text); TextView typeView = (TextView) row.findViewById(R.id.file_type); String name = getNameString(m); @@ -147,8 +150,6 @@ public class FilesControlSet extends PopupControlSet { else typeView.setText(type); - LayoutParams lp = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); - lp.gravity = Gravity.RIGHT; parent.addView(row, lp); } diff --git a/astrid/res/drawable/file_name_background.xml b/astrid/res/drawable/file_name_background.xml new file mode 100644 index 000000000..fbdf2c9bf --- /dev/null +++ b/astrid/res/drawable/file_name_background.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/astrid/res/layout/control_set_files.xml b/astrid/res/layout/control_set_files.xml index d7ca6a8b8..c5f287318 100644 --- a/astrid/res/layout/control_set_files.xml +++ b/astrid/res/layout/control_set_files.xml @@ -14,8 +14,7 @@ android:id="@+id/files_list" android:orientation="vertical" android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="right"> + android:layout_height="wrap_content"> diff --git a/astrid/res/layout/control_set_files_display.xml b/astrid/res/layout/control_set_files_display.xml index 4ed481fcb..2061c62b4 100644 --- a/astrid/res/layout/control_set_files_display.xml +++ b/astrid/res/layout/control_set_files_display.xml @@ -8,7 +8,8 @@ android:id="@+id/display_row_body" android:orientation="horizontal" android:layout_width="fill_parent" - android:layout_height="50dip" + android:layout_height="wrap_content" + android:minHeight="50dip" android:paddingLeft="10dip" android:paddingRight="10dip" android:gravity="center_vertical"> @@ -26,6 +27,8 @@ android:layout_weight="1" android:gravity="right" android:paddingLeft="10dip" + android:paddingTop="5dip" + android:paddingBottom="5dip" android:orientation="vertical"/> + + + + + + \ No newline at end of file diff --git a/astrid/res/layout/file_row.xml b/astrid/res/layout/file_row.xml index ad8018ebd..2a2e97abb 100644 --- a/astrid/res/layout/file_row.xml +++ b/astrid/res/layout/file_row.xml @@ -1,15 +1,21 @@ + android:layout_width="fill_parent" + android:layout_height="40dip" + android:layout_marginTop="5dip" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_weight="1" + android:textAppearance="@style/TextAppearance.EditRowDisplay" + android:background="@drawable/file_name_background" + android:gravity="center"/> + android:layout_marginRight="5dip"/> \ No newline at end of file