archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Centered task checkbox and it no longer cuts off on animation. Also centered text and set max lines to 2

Browse Source
pull/14/head
Andrew Shaw 14 years ago
parent 0d56cc8c83
commit d67c5adab2
2 changed files with 80 additions and 82 deletions
Show Stats Download Patch File Download Diff File

84
astrid/res/layout/task_adapter_row.xml
Unescape Escape View File

@ -1,89 +1,87 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- See the file "LICENSE" for the full license governing this code. --> <!-- 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:minHeight="60dip"
android:gravity="center_vertical"
android:orientation="horizontal">
<RelativeLayout android:id="@+id/rowBody" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
android:id="@+id/rowBody"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="70dip"
android:layout_marginLeft="10dip"
android:paddingBottom="4dip" > android:paddingBottom="4dip" >
<!-- completion check-box --> <!-- completion check-box -->
<CheckBox android:id="@+id/completeBox"
<CheckBox
android:id="@+id/completeBox"
android:layout_width="45dip" android:layout_width="45dip"
android:layout_height="wrap_content" android:layout_height="fill_parent"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginTop="10dip" android:layout_marginLeft="10dip"
android:layout_marginRight="5dip"
android:scaleType="fitCenter"
android:gravity="center_horizontal|center_vertical"
android:button="@drawable/btn_check" /> android:button="@drawable/btn_check" />
<!-- assignee photo --> <!-- assignee photo -->
<greendroid.widget.AsyncImageView <greendroid.widget.AsyncImageView
android:id="@+id/picture" android:id="@+id/picture"
android:layout_width="35dip" android:layout_width="35dip"
android:layout_height="35dip" android:layout_height="35dip"
android:layout_marginTop="10dip" android:layout_marginLeft="10dip"
android:scaleType="fitCenter"
astrid:defaultSrc="@drawable/icn_default_person_image" astrid:defaultSrc="@drawable/icn_default_person_image"
android:scaleType="fitCenter"
android:visibility="gone" /> android:visibility="gone" />
<LinearLayout android:id="@+id/task_row" <LinearLayout
android:id="@+id/task_row"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="fill_parent"
android:layout_toRightOf="@id/completeBox"
android:layout_alignTop="@id/completeBox" android:layout_alignTop="@id/completeBox"
android:paddingLeft="5dip" android:layout_toRightOf="@id/completeBox"
android:paddingBottom="4dip" android:orientation="horizontal"
android:paddingTop="4dip" android:paddingLeft="5dip" >
android:orientation="horizontal">
<!-- task name --> <!-- task name -->
<TextView android:id="@+id/title"
<TextView
android:id="@+id/title"
style="@style/TextAppearance.TAd_ItemTitle"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="fill_parent"
android:layout_weight="100" android:layout_weight="100"
android:maxLines="2" android:gravity="center_vertical"
style="@style/TextAppearance.TAd_ItemTitle"/> android:maxLines="2" />
<!-- due date --> <!-- due date -->
<TextView android:id="@+id/dueDate"
<TextView
android:id="@+id/dueDate"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:gravity="center_vertical|right" android:layout_marginRight="4dip"
android:layout_marginRight="4dip"/> android:gravity="center_vertical|right" />
</LinearLayout> </LinearLayout>
<!-- details line 1 --> <!-- details line 1 -->
<TextView android:id="@+id/details1"
<TextView
android:id="@+id/details1"
style="@style/TextAppearance.TAd_ItemDetails"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/task_row"
android:layout_alignLeft="@id/task_row" android:layout_alignLeft="@id/task_row"
android:layout_marginTop="-5dip" android:layout_below="@id/task_row"
android:layout_marginLeft="5dip" android:layout_marginLeft="5dip"
style="@style/TextAppearance.TAd_ItemDetails" android:layout_marginTop="-5dip"
android:visibility="gone" /> android:visibility="gone" />
<!-- details line 2 --> <!-- details line 2 -->
<TextView android:id="@+id/details2"
<TextView
android:id="@+id/details2"
style="@style/TextAppearance.TAd_ItemDetails"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/details1"
android:layout_alignLeft="@id/task_row" android:layout_alignLeft="@id/task_row"
android:layout_below="@id/details1"
android:layout_marginLeft="5dip" android:layout_marginLeft="5dip"
style="@style/TextAppearance.TAd_ItemDetails"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
</LinearLayout>

2
astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
Unescape Escape View File

@ -210,7 +210,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
decorationManager = new DecorationManager(); decorationManager = new DecorationManager();
taskActionManager = new TaskActionManager(); taskActionManager = new TaskActionManager();
scaleAnimation = new ScaleAnimation(1.6f, 1.0f, 1.6f, 1.0f, scaleAnimation = new ScaleAnimation(1.4f, 1.0f, 1.4f, 1.0f,
Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f); Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
scaleAnimation.setDuration(100); scaleAnimation.setDuration(100);

Write Preview
Loading…
Cancel
Save