mirror of https://github.com/tasks/tasks
Lots of polish to edit page, dialogs, making things work on small screen, etc.
parent
b546dc86e8
commit
0df9ae4c39
Binary file not shown.
Before Width: | Height: | Size: 712 B After Width: | Height: | Size: 619 B |
Binary file not shown.
Before Width: | Height: | Size: 940 B After Width: | Height: | Size: 870 B |
Binary file not shown.
Before Width: | Height: | Size: 850 B After Width: | Height: | Size: 596 B |
@ -1,108 +1,114 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ScrollView
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_height="fill_parent"
|
||||
android:orientation="vertical">
|
||||
<ScrollView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:paddingLeft="9dip"
|
||||
android:paddingRight="9dip">
|
||||
android:layout_height="fill_parent">
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:paddingLeft="9dip"
|
||||
android:paddingRight="9dip">
|
||||
|
||||
<!-- Shared with -->
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="5dip"
|
||||
android:paddingBottom="5dip"
|
||||
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
|
||||
android:text="@string/actfm_EPA_share_with" />
|
||||
<com.todoroo.astrid.ui.PeopleContainer
|
||||
android:id="@+id/share_container"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
<LinearLayout
|
||||
android:id="@+id/share_additional"
|
||||
android:orientation="vertical"
|
||||
android:padding="5dip"
|
||||
android:visibility="gone"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content">
|
||||
<View
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="1dip"
|
||||
android:background="@android:drawable/divider_horizontal_dark" />
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="5dip"
|
||||
android:paddingBottom="5dip"
|
||||
android:text="@string/actfm_EPA_message_text" />
|
||||
<EditText
|
||||
android:id="@+id/message"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:scrollbars="vertical"
|
||||
android:text="@string/actfm_EPA_message_body"
|
||||
android:autoText="true"
|
||||
android:capitalize="sentences"
|
||||
android:singleLine="false" />
|
||||
<TextView
|
||||
android:id="@+id/tag_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="5dip"
|
||||
android:visibility="gone"
|
||||
android:text="@string/actfm_EPA_tag_label" />
|
||||
<EditText
|
||||
android:id="@+id/tag_name"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone"
|
||||
android:hint="@string/actfm_EPA_tag_hint" />
|
||||
<View
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="1dip"
|
||||
android:background="@android:drawable/divider_horizontal_dark" />
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:id="@+id/collaborators"
|
||||
android:orientation="vertical"
|
||||
android:padding="5dip"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
<CheckBox
|
||||
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
|
||||
android:id="@+id/checkbox_facebook"
|
||||
android:text="@string/actfm_EPA_facebook"
|
||||
android:paddingLeft="45dip"
|
||||
android:visibility="gone"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
<CheckBox
|
||||
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
|
||||
android:id="@+id/checkbox_twitter"
|
||||
android:text="@string/actfm_EPA_twitter"
|
||||
android:paddingLeft="45dip"
|
||||
android:visibility="gone"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
<View
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="1dip"
|
||||
android:layout_margin="15dip"
|
||||
android:visibility="gone"
|
||||
android:background="@android:drawable/divider_horizontal_dark" />
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="15dip"
|
||||
android:text="@string/actfm_EPA_intro"
|
||||
android:gravity="center"
|
||||
android:visibility="gone"
|
||||
android:textColor="#ee9900" />
|
||||
<!-- Shared with -->
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="5dip"
|
||||
android:paddingBottom="5dip"
|
||||
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
|
||||
android:text="@string/actfm_EPA_share_with" />
|
||||
<com.todoroo.astrid.ui.PeopleContainer
|
||||
android:id="@+id/share_container"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
<LinearLayout
|
||||
android:id="@+id/share_additional"
|
||||
android:orientation="vertical"
|
||||
android:padding="5dip"
|
||||
android:visibility="gone"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content">
|
||||
<View
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="1dip"
|
||||
android:background="@android:drawable/divider_horizontal_dark" />
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="5dip"
|
||||
android:paddingBottom="5dip"
|
||||
android:text="@string/actfm_EPA_message_text" />
|
||||
<EditText
|
||||
android:id="@+id/message"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:scrollbars="vertical"
|
||||
android:text="@string/actfm_EPA_message_body"
|
||||
android:autoText="true"
|
||||
android:capitalize="sentences"
|
||||
android:singleLine="false" />
|
||||
<TextView
|
||||
android:id="@+id/tag_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="5dip"
|
||||
android:visibility="gone"
|
||||
android:text="@string/actfm_EPA_tag_label" />
|
||||
<EditText
|
||||
android:id="@+id/tag_name"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone"
|
||||
android:hint="@string/actfm_EPA_tag_hint" />
|
||||
<View
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="1dip"
|
||||
android:background="@android:drawable/divider_horizontal_dark" />
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:id="@+id/collaborators"
|
||||
android:orientation="vertical"
|
||||
android:padding="5dip"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
<CheckBox
|
||||
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
|
||||
android:id="@+id/checkbox_facebook"
|
||||
android:text="@string/actfm_EPA_facebook"
|
||||
android:paddingLeft="45dip"
|
||||
android:visibility="gone"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
<CheckBox
|
||||
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
|
||||
android:id="@+id/checkbox_twitter"
|
||||
android:text="@string/actfm_EPA_twitter"
|
||||
android:paddingLeft="45dip"
|
||||
android:visibility="gone"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
<View
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="1dip"
|
||||
android:layout_margin="15dip"
|
||||
android:visibility="gone"
|
||||
android:background="@android:drawable/divider_horizontal_dark" />
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="15dip"
|
||||
android:text="@string/actfm_EPA_intro"
|
||||
android:gravity="center"
|
||||
android:visibility="gone"
|
||||
android:textColor="#ee9900" />
|
||||
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
<include layout="@layout/control_dialog_ok"/>
|
||||
</LinearLayout>
|
||||
|
@ -1,65 +1,71 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ScrollView
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:minWidth="320dip"
|
||||
android:paddingLeft="5dip"
|
||||
android:paddingRight="5dip">
|
||||
<LinearLayout
|
||||
android:id="@+id/reminders_body"
|
||||
android:orientation="vertical"
|
||||
android:orientation="vertical">
|
||||
<ScrollView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
android:layout_height="fill_parent"
|
||||
android:minWidth="320dip"
|
||||
android:paddingLeft="5dip"
|
||||
android:paddingRight="5dip">
|
||||
<LinearLayout
|
||||
android:id="@+id/reminders_body"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
|
||||
<!-- reminders -->
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/TEA_reminder_label"
|
||||
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
|
||||
<CheckBox
|
||||
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
|
||||
android:id="@+id/reminder_due"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="5dip"
|
||||
android:button="@drawable/btn_check_small"
|
||||
android:text="@string/TEA_reminder_due" />
|
||||
<CheckBox
|
||||
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
|
||||
android:id="@+id/reminder_overdue"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="5dip"
|
||||
android:button="@drawable/btn_check_small"
|
||||
android:text="@string/TEA_reminder_overdue" />
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
<CheckBox
|
||||
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
|
||||
android:id="@+id/reminder_random"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="5dip"
|
||||
android:button="@drawable/btn_check_small"
|
||||
android:text="@string/TEA_reminder_random" />
|
||||
<Spinner
|
||||
android:id="@+id/reminder_random_interval"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
</LinearLayout>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/TEA_reminder_alarm_label"
|
||||
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
|
||||
<Spinner
|
||||
android:id="@+id/reminder_alarm"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
<!-- reminders -->
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/TEA_reminder_label"
|
||||
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
|
||||
<CheckBox
|
||||
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
|
||||
android:id="@+id/reminder_due"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="5dip"
|
||||
android:button="@drawable/btn_check_small"
|
||||
android:text="@string/TEA_reminder_due" />
|
||||
<CheckBox
|
||||
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
|
||||
android:id="@+id/reminder_overdue"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="5dip"
|
||||
android:button="@drawable/btn_check_small"
|
||||
android:text="@string/TEA_reminder_overdue" />
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
<CheckBox
|
||||
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
|
||||
android:id="@+id/reminder_random"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="5dip"
|
||||
android:button="@drawable/btn_check_small"
|
||||
android:text="@string/TEA_reminder_random" />
|
||||
<Spinner
|
||||
android:id="@+id/reminder_random_interval"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
</LinearLayout>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/TEA_reminder_alarm_label"
|
||||
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
|
||||
<Spinner
|
||||
android:id="@+id/reminder_alarm"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
<include layout="@layout/control_dialog_ok"/>
|
||||
</LinearLayout>
|
Loading…
Reference in New Issue