Restored importance bars, though they are all now the same height. also tweaks to actions bar

pull/14/head
Tim Su 14 years ago
parent dcae53dce6
commit a7536dcf4d

@ -24,6 +24,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:minHeight="38dip"
android:paddingLeft="40dip" android:paddingLeft="40dip"
android:paddingRight="6dip" android:paddingRight="6dip"
android:orientation="vertical"> android:orientation="vertical">
@ -44,22 +45,25 @@
<!-- other details go here --> <!-- other details go here -->
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/actions" <LinearLayout android:id="@+id/actions"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_below="@id/details" android:layout_below="@id/details"
android:background="#4499bbcc"
android:visibility="gone" android:visibility="gone"
android:paddingLeft="40dip" android:paddingTop="4dip"
android:paddingLeft="6dip"
android:paddingRight="6dip" android:paddingRight="6dip"
android:orientation="vertical" /> android:orientation="horizontal" />
<!-- importance --> <!-- importance -->
<View android:id="@+id/importance" <View android:id="@+id/importance"
android:layout_width="2dip" android:layout_width="2dip"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:minHeight="38dip"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentTop="true" /> android:layout_alignParentTop="true" />

@ -24,6 +24,7 @@ import android.widget.CursorAdapter;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.LinearLayout.LayoutParams;
import com.timsu.astrid.R; import com.timsu.astrid.R;
import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property;
@ -49,14 +50,6 @@ import com.todoroo.astrid.utility.Preferences;
*/ */
public class TaskAdapter extends CursorAdapter { public class TaskAdapter extends CursorAdapter {
private final class RowClickListener implements
OnClickListener {
@Override
public void onClick(View v) {
}
}
public interface OnCompletedTaskListener { public interface OnCompletedTaskListener {
public void onCompletedTask(Task item, boolean newState); public void onCompletedTask(Task item, boolean newState);
} }
@ -219,7 +212,6 @@ public class TaskAdapter extends CursorAdapter {
if(completedItems.containsKey(task.getId())) if(completedItems.containsKey(task.getId()))
task.setValue(Task.COMPLETION_DATE, DateUtilities.now()); task.setValue(Task.COMPLETION_DATE, DateUtilities.now());
completeBox.setChecked(task.isCompleted()); completeBox.setChecked(task.isCompleted());
completeBox.setVisibility(View.VISIBLE);
} }
// due date / completion date // due date / completion date
@ -270,15 +262,10 @@ public class TaskAdapter extends CursorAdapter {
} }
} }
final LinearLayout actionsView = viewHolder.actions;
actionsView.setVisibility(View.GONE);
viewHolder.expanded = false;
// importance bar - must be set at end when view height is determined // importance bar - must be set at end when view height is determined
final View importanceView = viewHolder.importance; { final View importanceView = viewHolder.importance; {
int value = task.getValue(Task.IMPORTANCE); int value = task.getValue(Task.IMPORTANCE);
importanceView.setBackgroundColor(IMPORTANCE_COLORS[value]); importanceView.setBackgroundColor(IMPORTANCE_COLORS[value]);
importanceView.setVisibility(View.VISIBLE);
} }
} }
@ -375,11 +362,14 @@ public class TaskAdapter extends CursorAdapter {
LinearLayout actions = viewHolder.actions; LinearLayout actions = viewHolder.actions;
actions.setVisibility(viewHolder.expanded ? View.VISIBLE : View.GONE); actions.setVisibility(viewHolder.expanded ? View.VISIBLE : View.GONE);
if(viewHolder.expanded && actions.getChildCount() == 0) { if(viewHolder.expanded && actions.getChildCount() == 0) {
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT, 1f);
Button edit = new Button(activity); Button edit = new Button(activity);
edit.setText(R.string.TAd_actionEditTask); edit.setText(R.string.TAd_actionEditTask);
edit.setLayoutParams(params);
edit.setOnClickListener(new OnClickListener() { edit.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View view) {
Intent intent = new Intent(activity, TaskEditActivity.class); Intent intent = new Intent(activity, TaskEditActivity.class);
intent.putExtra(TaskEditActivity.ID_TOKEN, viewHolder.task.getId()); intent.putExtra(TaskEditActivity.ID_TOKEN, viewHolder.task.getId());
activity.startActivityForResult(intent, TaskListActivity.ACTIVITY_EDIT_TASK); activity.startActivityForResult(intent, TaskListActivity.ACTIVITY_EDIT_TASK);

Loading…
Cancel
Save