Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2825066b authored by tobias's avatar tobias
Browse files

Merge branch 'new_list_style' of...

Merge branch 'new_list_style' of ssh://gitosis@git.dmfs.org:23023/android-tasks/tasks.git into new_list_style
parents 959e4309 458bdf23
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res/org.dmfs.tasks"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:paddingBottom="8dip"
+0 −10
Original line number Diff line number Diff line
@@ -19,16 +19,6 @@
            android:singleLine="true" />
    </LinearLayout>

    <EditText
        android:id="@android:id/text1"
        style="@style/field_editor_text_value"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:inputType="textMultiLine"
        android:singleLine="false"
        android:textAllCaps="false" >
    </EditText>

    <LinearLayout
        android:id="@+id/checklist"
        android:layout_width="match_parent"
+1 −9
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<org.dmfs.tasks.widget.CheckListFieldView xmlns:android="http://schemas.android.com/apk/res/android"
    style="@style/task_widget"
    android:visibility="gone" >
    android:visibility="visible" >

    <include layout="@layout/detail_header" />

    <TextView
        android:id="@+id/text"
        style="@style/field_view_text_value"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:autoLink="all" >
    </TextView>

    <LinearLayout
        android:id="@+id/checklist"
        android:layout_width="match_parent"
+1 −1
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res/org.dmfs.tasks"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:paddingBottom="8dip"
+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@
    <string name="task_title">Title</string>
    <string name="task_location">Location</string>
    <string name="task_description">Description</string>
    <string name="task_checklist">Check list</string>
    <string name="task_start">Start</string>
    <string name="task_due">Due</string>
    <string name="task_completed">Completed</string>
Loading