Merge remote-tracking branch 'upstream/120120_as_new_task_icons' into 4.0
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 2.8 KiB |
After Width: | Height: | Size: 4.7 KiB |
After Width: | Height: | Size: 4.7 KiB |
After Width: | Height: | Size: 4.7 KiB |
After Width: | Height: | Size: 4.7 KiB |
After Width: | Height: | Size: 3.1 KiB |
After Width: | Height: | Size: 3.1 KiB |
After Width: | Height: | Size: 3.1 KiB |
After Width: | Height: | Size: 3.1 KiB |
After Width: | Height: | Size: 4.9 KiB |
After Width: | Height: | Size: 4.9 KiB |
After Width: | Height: | Size: 4.9 KiB |
After Width: | Height: | Size: 4.9 KiB |
@ -0,0 +1,11 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<item android:state_checked="false"
|
||||||
|
android:state_enabled="true"
|
||||||
|
android:drawable="@drawable/check_box_repeat_1" />
|
||||||
|
<item android:state_checked="true"
|
||||||
|
android:state_enabled="true"
|
||||||
|
android:drawable="@drawable/check_box_repeat_checked_1" />
|
||||||
|
|
||||||
|
</selector>
|
@ -0,0 +1,11 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<item android:state_checked="false"
|
||||||
|
android:state_enabled="true"
|
||||||
|
android:drawable="@drawable/check_box_repeat_2" />
|
||||||
|
<item android:state_checked="true"
|
||||||
|
android:state_enabled="true"
|
||||||
|
android:drawable="@drawable/check_box_repeat_checked_2" />
|
||||||
|
|
||||||
|
</selector>
|
@ -0,0 +1,11 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<item android:state_checked="false"
|
||||||
|
android:state_enabled="true"
|
||||||
|
android:drawable="@drawable/check_box_repeat_3" />
|
||||||
|
<item android:state_checked="true"
|
||||||
|
android:state_enabled="true"
|
||||||
|
android:drawable="@drawable/check_box_repeat_checked_3" />
|
||||||
|
|
||||||
|
</selector>
|
@ -0,0 +1,11 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<item android:state_checked="false"
|
||||||
|
android:state_enabled="true"
|
||||||
|
android:drawable="@drawable/check_box_repeat_4" />
|
||||||
|
<item android:state_checked="true"
|
||||||
|
android:state_enabled="true"
|
||||||
|
android:drawable="@drawable/check_box_repeat_checked_4" />
|
||||||
|
|
||||||
|
</selector>
|
@ -1,84 +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"
|
|
||||||
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
|
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:minHeight="60dip"
|
android:paddingBottom="4dip" >
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:orientation="horizontal">
|
<!-- completion check-box -->
|
||||||
|
|
||||||
<RelativeLayout android:id="@+id/rowBody"
|
<CheckBox
|
||||||
|
android:id="@+id/completeBox"
|
||||||
|
android:layout_width="45dip"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:layout_marginLeft="10dip"
|
||||||
|
android:button="@drawable/btn_check" />
|
||||||
|
<!-- assignee photo -->
|
||||||
|
|
||||||
|
<greendroid.widget.AsyncImageView
|
||||||
|
android:id="@+id/picture"
|
||||||
|
android:layout_width="35dip"
|
||||||
|
android:layout_height="35dip"
|
||||||
|
android:layout_marginLeft="10dip"
|
||||||
|
astrid:defaultSrc="@drawable/icn_default_person_image"
|
||||||
|
android:scaleType="fitCenter"
|
||||||
|
android:visibility="gone" />
|
||||||
|
|
||||||
|
<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_marginLeft="15dip"
|
android:layout_alignTop="@id/completeBox"
|
||||||
android:paddingBottom="4dip">
|
android:layout_toRightOf="@id/completeBox"
|
||||||
|
android:orientation="horizontal"
|
||||||
<!-- completion check-box -->
|
android:paddingLeft="5dip" >
|
||||||
<CheckBox android:id="@+id/completeBox"
|
|
||||||
android:layout_width="wrap_content"
|
<!-- task name -->
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentTop="true"
|
<TextView
|
||||||
android:layout_marginTop="5dip"
|
android:id="@+id/title"
|
||||||
android:button="@drawable/btn_check"/>
|
style="@style/TextAppearance.TAd_ItemTitle"
|
||||||
<!-- assignee photo -->
|
|
||||||
<greendroid.widget.AsyncImageView android:id="@+id/picture"
|
|
||||||
android:layout_width="35dip"
|
|
||||||
android:layout_height="35dip"
|
|
||||||
android:padding="5dip"
|
|
||||||
android:scaleType="fitCenter"
|
|
||||||
astrid:defaultSrc="@drawable/icn_default_person_image"
|
|
||||||
android:visibility="gone"/>
|
|
||||||
|
|
||||||
<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_weight="100"
|
||||||
android:layout_alignTop="@id/completeBox"
|
android:gravity="center_vertical"
|
||||||
android:paddingLeft="5dip"
|
android:maxLines="2" />
|
||||||
android:paddingTop="4dip"
|
|
||||||
android:paddingBottom="4dip"
|
<!-- due date -->
|
||||||
android:orientation="horizontal">
|
|
||||||
|
<TextView
|
||||||
<!-- task name -->
|
android:id="@+id/dueDate"
|
||||||
<TextView android:id="@+id/title"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_weight="100"
|
|
||||||
style="@style/TextAppearance.TAd_ItemTitle"/>
|
|
||||||
|
|
||||||
<!-- due date -->
|
|
||||||
<TextView android:id="@+id/dueDate"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentRight="true"
|
|
||||||
android:layout_marginRight="4dip"
|
|
||||||
android:singleLine="true"/>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<!-- details line 1 -->
|
|
||||||
<TextView android:id="@+id/details1"
|
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="fill_parent"
|
||||||
android:layout_below="@id/task_row"
|
android:layout_alignParentRight="true"
|
||||||
android:layout_alignLeft="@id/task_row"
|
android:layout_marginRight="4dip"
|
||||||
android:layout_marginTop="-5dip"
|
android:gravity="center_vertical|right" />
|
||||||
android:layout_marginLeft="5dip"
|
</LinearLayout>
|
||||||
style="@style/TextAppearance.TAd_ItemDetails"
|
|
||||||
android:visibility="gone" />
|
<!-- details line 1 -->
|
||||||
|
|
||||||
<!-- details line 2 -->
|
<TextView
|
||||||
<TextView android:id="@+id/details2"
|
android:id="@+id/details1"
|
||||||
android:layout_width="fill_parent"
|
style="@style/TextAppearance.TAd_ItemDetails"
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_below="@id/details1"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignLeft="@id/task_row"
|
android:layout_alignLeft="@id/task_row"
|
||||||
android:layout_marginLeft="5dip"
|
android:layout_below="@id/task_row"
|
||||||
style="@style/TextAppearance.TAd_ItemDetails"
|
android:layout_marginLeft="5dip"
|
||||||
android:visibility="gone" />
|
android:layout_marginTop="-5dip"
|
||||||
|
android:visibility="gone" />
|
||||||
</RelativeLayout>
|
|
||||||
|
<!-- details line 2 -->
|
||||||
</LinearLayout>
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/details2"
|
||||||
|
style="@style/TextAppearance.TAd_ItemDetails"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignLeft="@id/task_row"
|
||||||
|
android:layout_below="@id/details1"
|
||||||
|
android:layout_marginLeft="5dip"
|
||||||
|
android:visibility="gone" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|