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

Commit 4117175b authored by Bao-Long Nguyen-Trong's avatar Bao-Long Nguyen-Trong
Browse files

Fixed issue 858: Added option to choose which side the widgets in message list will be on

parent 5d2df0b1

res/layout-land/message_list_item_left.xml

0 → 100644
+55 −0
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"

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:paddingRight="1dip"

    android:paddingTop="2dip"

    android:background="@drawable/message_list_item_background">

    <View

        android:id="@+id/chip"

        android:background="@drawable/appointment_indicator_leftside_1"

        android:layout_width="4dip"

        android:layout_height="20dip"

        android:layout_centerVertical="true"

	    android:layout_alignParentLeft="true" />

    <include

        layout="@layout/message_list_widgets_left"

        android:id="@+id/widgets"

        android:layout_toRightOf="@+id/chip" />

    <TextView

        android:id="@+id/subject"

        android:ellipsize="end"

        android:singleLine="true"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="?android:attr/textColorPrimary"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:paddingLeft="5dip"

        android:paddingRight="3dip"

        android:layout_centerVertical="true"

        android:layout_alignWithParentIfMissing="true"

        android:layout_toRightOf="@+id/widgets" 

        android:layout_toLeftOf="@+id/from"/>

    <TextView

        android:id="@+id/from"

        android:ellipsize="end"

        android:singleLine="true"

        android:layout_width="110dip"

        android:layout_height="wrap_content"

        android:paddingRight="3dip"

        android:layout_centerVertical="true"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="?android:attr/textColorSecondary"

        android:layout_toLeftOf="@+id/date" />

    <TextView

        android:id="@+id/date"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:singleLine="true"

        android:textColor="?android:attr/textColorPrimary"

        android:layout_width="70dip"

        android:layout_height="wrap_content"

        android:gravity="right"

        android:layout_centerVertical="true"

        android:layout_alignParentRight="true" />

</RelativeLayout>

res/layout-land/message_list_item.xml→res/layout-land/message_list_item_right.xml

+5 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
        android:layout_height="20dip"

        android:layout_centerVertical="true"

	    android:layout_alignParentLeft="true" />

    <include layout="@layout/message_list_widgets" android:id="@+id/widgets" /> 

    <include layout="@layout/message_list_widgets_right" android:id="@+id/widgets" /> 

    <TextView

        android:id="@+id/date"

        android:textAppearance="?android:attr/textAppearanceSmall"
@@ -22,7 +22,8 @@ 
        android:layout_width="70dip"

        android:paddingRight="3dip"

        android:layout_height="wrap_content"

        android:gravity="right|bottom"

        android:gravity="right"

        android:layout_centerVertical="true"

        android:layout_alignWithParentIfMissing="true"

        android:layout_toLeftOf="@+id/widgets" />

    <TextView
@@ -31,6 +32,7 @@ 
        android:singleLine="true"

        android:layout_width="110dip"

        android:layout_height="wrap_content"

        android:layout_centerVertical="true"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="?android:attr/textColorSecondary"

        android:paddingLeft="3dip"
@@ -44,6 +46,7 @@ 
        android:textColor="?android:attr/textColorPrimary"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_centerVertical="true"

        android:paddingLeft="10dip"

        android:layout_marginRight="1dip"

        android:layout_alignWithParentIfMissing="true"

res/layout/message_list_item_left.xml

0 → 100644
+54 −0
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"

    android:layout_width="fill_parent"

    android:layout_height="38dip"

    android:paddingRight="1dip"

    android:paddingTop="2dip"

    android:background="#999999"

    >

    <View

        android:id="@+id/chip"

        android:background="@drawable/appointment_indicator_leftside_1"

        android:layout_width="4dip"

        android:layout_height="fill_parent"

        android:layout_centerVertical="true"

        android:layout_alignParentLeft="true"/>

    <include

        layout="@layout/message_list_widgets_left"

        android:id="@+id/widgets"

        android:layout_toRightOf="@+id/chip" />

    <TextView

        android:id="@+id/subject"

        android:ellipsize="end"

        android:singleLine="true"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="?android:attr/textColorPrimary"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:paddingLeft="5dip"

        android:layout_toRightOf="@+id/widgets" />

      <TextView

        android:id="@+id/from"

        android:ellipsize="end"

        android:singleLine="true"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:paddingLeft="5dip"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="?android:attr/textColorSecondary"

        android:layout_alignParentBottom="true"

        android:layout_toRightOf="@+id/widgets" />

    <TextView

        android:id="@+id/date"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:singleLine="true"

        android:gravity="right|bottom"

        android:textColor="?android:attr/textColorSecondary"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:layout_alignParentRight="true"

        android:layout_toRightOf="@+id/from"

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

</RelativeLayout>

res/layout/message_list_item.xml→res/layout/message_list_item_right.xml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
        android:layout_width="4dip"

        android:layout_height="fill_parent"

        android:layout_centerVertical="true" />

    <include layout="@layout/message_list_widgets" android:id="@+id/widgets" /> 

    <include layout="@layout/message_list_widgets_right" android:id="@+id/widgets" /> 

    <TextView

        android:id="@+id/subject"

        android:ellipsize="end"

res/layout/message_list_widgets_left.xml

0 → 100644
+28 −0
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"

        android:layout_width="wrap_content"

        android:layout_height="30dip"

        android:layout_centerVertical="true"

        android:paddingLeft="5dip"

        >

         <CheckBox

                 android:id="@+id/flagged"

                 android:layout_width="wrap_content"

                 android:layout_height="wrap_content"

                 android:focusable="false"

                 style="?android:attr/starStyle"

                 android:layout_gravity="center_vertical"

                />

            <!-- http://stackoverflow.com/questions/1121192/android-custom-listview-unable-to-click-on-items

                    we want something a bit bigger than it is right now -->

          <CheckBox

                android:id="@+id/selected_checkbox"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_centerVertical="true"

                android:focusable="false"

                android:button="@drawable/checkbox"

                android:background="@drawable/checkbox_background"

                />

    </LinearLayout>