Basic logic and layout for a title-only task adapter row

pull/14/head
Sam Bosley 12 years ago
parent 6f826f1f24
commit e88eec54a3

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
** Copyright (c) 2012 Todoroo Inc
**
** See the file "LICENSE" for the full license governing this code.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="?attr/asTaskRowSelector"
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/rowBody"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dip"
android:layout_marginBottom="10dip">
<LinearLayout
android:id="@+id/task_row"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:layout_centerVertical="true"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingLeft="4dip" >
<!-- task name -->
<TextView
android:id="@+id/title"
style="@style/TextAppearance.TAd_ItemTitle"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="100"
android:gravity="center_vertical"
android:maxLines="2" />
<!-- due date -->
</LinearLayout>
</RelativeLayout>
</LinearLayout>

@ -885,6 +885,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
case 1: case 1:
return R.layout.task_adapter_row_simple; return R.layout.task_adapter_row_simple;
case 2: case 2:
return R.layout.task_adapter_row_title_only;
case 0: case 0:
default: default:
return R.layout.task_adapter_row; return R.layout.task_adapter_row;

@ -35,6 +35,7 @@ import android.text.Spannable;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.Spanned; import android.text.Spanned;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextUtils.TruncateAt;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.util.TypedValue; import android.util.TypedValue;
@ -186,6 +187,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
protected OnCompletedTaskListener onCompletedTaskListener = null; protected OnCompletedTaskListener onCompletedTaskListener = null;
public boolean isFling = false; public boolean isFling = false;
protected final int resource; protected final int resource;
protected final boolean titleOnly;
protected final LayoutInflater inflater; protected final LayoutInflater inflater;
private DetailLoaderThread detailLoader; private DetailLoaderThread detailLoader;
private ActionsLoaderThread actionsLoader; private ActionsLoaderThread actionsLoader;
@ -229,6 +231,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
this.query = query; this.query = query;
this.resource = resource; this.resource = resource;
this.titleOnly = resource == R.layout.task_adapter_row_title_only;
this.fragment = fragment; this.fragment = fragment;
this.resources = fragment.getResources(); this.resources = fragment.getResources();
this.onCompletedTaskListener = onCompletedTaskListener; this.onCompletedTaskListener = onCompletedTaskListener;
@ -336,10 +339,14 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
boolean showFullTaskTitle = Preferences.getBoolean(R.string.p_fullTaskTitle, false); boolean showFullTaskTitle = Preferences.getBoolean(R.string.p_fullTaskTitle, false);
boolean showNotes = Preferences.getBoolean(R.string.p_showNotes, false); boolean showNotes = Preferences.getBoolean(R.string.p_showNotes, false);
if (showFullTaskTitle) { if (showFullTaskTitle && !titleOnly) {
viewHolder.nameView.setMaxLines(Integer.MAX_VALUE); viewHolder.nameView.setMaxLines(Integer.MAX_VALUE);
viewHolder.nameView.setSingleLine(false); viewHolder.nameView.setSingleLine(false);
viewHolder.nameView.setEllipsize(null); viewHolder.nameView.setEllipsize(null);
} else if (titleOnly) {
viewHolder.nameView.setMaxLines(1);
viewHolder.nameView.setSingleLine(true);
viewHolder.nameView.setEllipsize(TruncateAt.END);
} }
if (showNotes && !simpleLayout) { if (showNotes && !simpleLayout) {
@ -355,6 +362,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
viewHolder.details1.setTag(viewHolder); viewHolder.details1.setTag(viewHolder);
// add UI component listeners // add UI component listeners
if (!titleOnly)
addListeners(view); addListeners(view);
return view; return view;
@ -374,6 +382,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
task.readFromCursor(cursor); task.readFromCursor(cursor);
setFieldContentsAndVisibility(view); setFieldContentsAndVisibility(view);
if (!titleOnly)
setTaskAppearance(viewHolder, task); setTaskAppearance(viewHolder, task);
} }
@ -407,11 +416,13 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
public synchronized void setFieldContentsAndVisibility(View view) { public synchronized void setFieldContentsAndVisibility(View view) {
ViewHolder viewHolder = (ViewHolder)view.getTag(); ViewHolder viewHolder = (ViewHolder)view.getTag();
Task task = viewHolder.task; Task task = viewHolder.task;
if (fontSize < 16) { if (fontSize < 16 || titleOnly) {
viewHolder.rowBody.setMinimumHeight(0); viewHolder.rowBody.setMinimumHeight(0);
if (viewHolder.completeBox != null)
viewHolder.completeBox.setMinimumHeight(0); viewHolder.completeBox.setMinimumHeight(0);
} else { } else {
viewHolder.rowBody.setMinimumHeight(minRowHeight); viewHolder.rowBody.setMinimumHeight(minRowHeight);
if (viewHolder.completeBox != null)
viewHolder.completeBox.setMinimumHeight(minRowHeight); viewHolder.completeBox.setMinimumHeight(minRowHeight);
} }
@ -432,6 +443,9 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
nameView.setText(nameValue); nameView.setText(nameValue);
} }
if (titleOnly)
return;
float dueDateTextWidth = setupDueDateAndTags(viewHolder, task); float dueDateTextWidth = setupDueDateAndTags(viewHolder, task);
String details; String details;

Loading…
Cancel
Save