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

Commit a4ee6f1a authored by tobias's avatar tobias
Browse files

- updated widget list selection style

parent ea75ede8

project.properties

+1 −0
Original line number Diff line number Diff line
@@ -15,3 +15,4 @@ target=android-19 
android.library=false

android.library.reference.1=../task-provider

android.library.reference.2=../PagerSlidingTabStrip/library

android.library.reference.3=../coloredshapecheckbox

res/layout-v11/fragment_task_list_selection.xml

+31 −27
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/edit_name"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="center"

    android:orientation="vertical"

    android:padding="8dp" >

    android:padding="16dp" >



    <TextView

        android:id="@android:id/title"

        style="@style/dialog_text_title"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:gravity="left|center_vertical"

        android:padding="16dp"

        android:padding="8dp"

        android:text="@string/task_list_selection_title" />



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

       android:layout_margin="16dp">



        <ListView

            android:id="@id/android:list"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:divider="@null"

            android:dividerHeight="0px"

            android:drawSelectorOnTop="false" />



        <TextView

            android:id="@id/android:empty"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/task_list_selection_empty" />

    </LinearLayout>



    <LinearLayout

        android:id="@+id/buttonArea"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:gravity="right"

        android:orientation="horizontal" >
@@ -57,7 +37,31 @@ 
            style="@style/dialog_button_primary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@android:string/ok" />

            android:text="@string/accept" />

    </LinearLayout>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_above="@id/buttonArea"

        android:layout_below="@android:id/title"

        android:orientation="vertical"

        android:paddingTop="8dp" >



        <ListView

            android:id="@id/android:list"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:divider="@null"

            android:dividerHeight="0px"

            android:drawSelectorOnTop="false" />



        <TextView

            android:id="@id/android:empty"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/task_list_selection_empty" />

    </LinearLayout>



</RelativeLayout>
 
 No newline at end of file

res/layout-v11/list_item_selection.xml

+13 −13
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"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="8dip"

    android:paddingBottom="8dip">

    android:paddingBottom="8dip"

    android:paddingTop="8dip" >



    <RelativeLayout

        android:id="@+id/list_color_layout"
@@ -13,18 +14,15 @@ 
        android:layout_centerVertical="true"

        android:layout_marginLeft="8dip" >



        <View

            android:id="@+id/color_view"

            android:layout_width="48dip"

            android:layout_height="48dip"

            android:layout_centerInParent="true"

            android:background="@drawable/shape_color_circle" />



        <CheckBox

        <org.dmfs.android.widgets.ColoredShapeCheckBox

            android:id="@android:id/checkbox"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_centerInParent="true" />

            android:layout_centerInParent="true"

            android:checked="true"

            android:clickable="false"

            android:focusable="false"

            app:backgroundShape="@drawable/rect_shape" />

    </RelativeLayout>



    <LinearLayout
@@ -40,14 +38,16 @@ 
            android:id="@android:id/text1"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="text1"

            android:maxLines="1"

            android:singleLine="true"

            android:textAppearance="@android:style/TextAppearance.Medium" />



        <TextView

            android:id="@android:id/text2"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="text2"

            android:maxLines="1"

            android:singleLine="true"

            android:textAppearance="@android:style/TextAppearance.Small" />

    </LinearLayout>

res/layout/fragment_task_list_selection.xml

+33 −35
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/edit_name"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="center"

    android:orientation="vertical"

    android:padding="8dp" >

    android:padding="16dp" >



    <LinearLayout

        android:id="@+id/buttonArea"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_margin="16dp"

        android:orientation="vertical" >

        android:layout_alignParentBottom="true"

        android:gravity="right"

        android:paddingTop="8dip"

        android:orientation="horizontal" >



        <ListView

            android:id="@id/android:list"

            android:layout_width="match_parent"

        <TextView

            android:id="@android:id/button2"

            style="@style/dialog_button_secondary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:divider="@null"

            android:dividerHeight="0px"

            android:drawSelectorOnTop="false" />

            android:layout_marginRight="8dip"

            android:text="@android:string/cancel" />



        <TextView

            android:id="@id/android:empty"

            android:layout_width="match_parent"

            android:id="@android:id/button1"

            style="@style/dialog_button_primary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/task_list_selection_empty" />

            android:text="@string/accept" />

    </LinearLayout>



    <LinearLayout

        android:id="@+id/buttonArea"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:orientation="horizontal" >

        android:layout_above="@id/buttonArea"

        android:layout_alignParentTop="true"

        android:orientation="vertical"

        android:paddingTop="8dp" >



        <TextView

            android:id="@android:id/button2"

            style="@style/dialog_button_secondary"

            android:layout_width="0dp"

        <ListView

            android:id="@id/android:list"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:background="@android:drawable/btn_default"

            android:gravity="center"

            android:text="@android:string/cancel"

            android:textAppearance="?android:attr/textAppearanceMediumInverse" />

            android:background="@android:color/transparent"

            android:overScrollFooter="@null"

            android:divider="@null"

            android:dividerHeight="0px"

            android:drawSelectorOnTop="false" />



        <TextView

            android:id="@android:id/button1"

            style="@style/dialog_button_primary"

            android:layout_width="0dp"

            android:id="@id/android:empty"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:background="@android:drawable/btn_default"

            android:enabled="false"

            android:gravity="center"

            android:text="@android:string/ok"

            android:textAppearance="?android:attr/textAppearanceMediumInverse" />

            android:text="@string/task_list_selection_empty" />

    </LinearLayout>



</LinearLayout>
 
 No newline at end of file
 
</RelativeLayout>
 
 No newline at end of file

res/layout/list_item_selection.xml

+13 −13
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"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="8dip"

    android:paddingBottom="8dip">

    android:paddingBottom="8dip"

    android:paddingTop="8dip" >



    <RelativeLayout

        android:id="@+id/list_color_layout"
@@ -13,18 +14,15 @@ 
        android:layout_centerVertical="true"

        android:layout_marginLeft="8dip" >



        <View

            android:id="@+id/color_view"

            android:layout_width="48dip"

            android:layout_height="48dip"

            android:layout_centerInParent="true"

            android:background="@drawable/shape_color_circle" />



        <CheckBox

        <org.dmfs.android.widgets.ColoredShapeCheckBox

            android:id="@android:id/checkbox"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_centerInParent="true" />

            android:layout_centerInParent="true"

            android:checked="true"

            android:clickable="false"

            android:focusable="false"

            app:backgroundShape="@drawable/rect_shape" />

    </RelativeLayout>



    <LinearLayout
@@ -40,14 +38,16 @@ 
            android:id="@android:id/text1"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="text1"

            android:maxLines="1"

            android:singleLine="true"

            android:textAppearance="@android:style/TextAppearance.Medium.Inverse" />



        <TextView

            android:id="@android:id/text2"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="text2"

            android:maxLines="1"

            android:singleLine="true"

            android:textAppearance="@android:style/TextAppearance.Small" />

    </LinearLayout>