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

Commit d3f96333 authored by cketti's avatar cketti
Browse files

Merge branch 'fragments'

parents f62ac401 93b13362

res/layout-land/message_view_bottom_buttons.xml

deleted100644 → 0
+0 −47
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

<LinearLayout

        android:id="@+id/bottom_buttons"

        android:orientation="horizontal"

        android:layout_width="fill_parent"

        android:layout_height="57dip"

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

        android:gravity="center_vertical">

        <Button

            android:id="@+id/previous"

            android:text="@string/message_view_prev_action"

            android:contentDescription="@string/previous_action"

            android:textSize="35dip"

            android:layout_height="wrap_content"

            android:padding="0dip"

            android:layout_width="0dip"

            android:layout_weight="1" />

        <Button

            android:id="@+id/reply"

            android:text="@string/reply_action"

            android:layout_height="wrap_content"

            android:layout_width="0dip"

            android:layout_weight="1" />

        <Button

            android:id="@+id/delete"

            android:text="@string/delete_action"

            android:layout_height="wrap_content"

            android:layout_width="0dip"

            android:layout_weight="1" />

        <Button

            android:id="@+id/forward"

            android:text="@string/forward_action"

            android:layout_height="wrap_content"

            android:layout_width="0dip"

            android:layout_weight="1" />

         <Button

            android:id="@+id/next"

            android:text="@string/message_view_next_action"

            android:contentDescription="@string/next_action"

            android:textSize="35dip"

            android:padding="0dip"

            android:layout_height="wrap_content"

            android:layout_width="0dip"

            android:layout_weight="1" />

    </LinearLayout>

</merge>

res/layout/message_list.xml

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

<?xml version="1.0" encoding="utf-8"?>

<LinearLayout

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

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

    android:id="@+id/message_list_container"

    android:layout_width="fill_parent"

    android:layout_width="fill_parent"

    android:layout_height="fill_parent"

    android:layout_height="fill_parent"

    android:orientation="vertical"

    android:orientation="vertical" />
 
    android:background="?android:attr/colorBackground">

    <com.handmark.pulltorefresh.library.PullToRefreshListView

        android:id="@+id/message_list"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent"

        android:cacheColorHint="?android:attr/colorBackground"

        android:layout_weight="5"



    />

</LinearLayout>

res/layout/message_list_fragment.xml

0 → 100644
+9 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<com.handmark.pulltorefresh.library.PullToRefreshListView

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

    android:id="@+id/message_list"

    android:layout_width="fill_parent"

    android:layout_height="fill_parent"

    android:layout_weight="5"

    android:background="?android:attr/colorBackground"

    android:cacheColorHint="?android:attr/colorBackground" />

res/layout/message_view.xml

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

<?xml version="1.0" encoding="utf-8"?>

<LinearLayout

<LinearLayout

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

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

    android:id="@id/message"

    android:orientation="vertical"

    android:orientation="vertical"

    android:layout_width="fill_parent"

    android:layout_width="fill_parent"

    android:layout_height="fill_parent">

    android:layout_height="fill_parent">



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



</LinearLayout>
 
</LinearLayout>

res/menu/message_view_fragment.xml

0 → 100644
+68 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

    <item

        android:id="@+id/delete"

        android:alphabeticShortcut="q"

        android:title="@string/delete_action"

        android:icon="?attr/iconActionDelete"

        android:showAsAction="always"

    />

    <item

        android:id="@+id/single_message_options"

        android:icon="?attr/iconActionSingleMessageOptions"

        android:showAsAction="ifRoom"

        android:title="@string/single_message_options_action">

        <menu>

            <item

                android:id="@+id/reply"

                android:title="@string/reply_action"/>

            <item

                android:id="@+id/reply_all"

                android:title="@string/reply_all_action"/>

            <item

                android:id="@+id/forward"

                android:title="@string/forward_action"/>

            <item

                android:id="@+id/share"

                android:title="@string/send_alternate_action" />

        </menu>

    </item>

    <item

        android:id="@+id/archive"

        android:title="@string/archive_action"

        android:icon="?attr/iconActionArchive"

        android:showAsAction="ifRoom"

    />

    <item

        android:id="@+id/spam"

        android:title="@string/spam_action"

        android:icon="?attr/iconActionSpam"

        android:showAsAction="ifRoom"

    />

    <item

        android:id="@+id/move"

            android:showAsAction="ifRoom"

                android:icon="?attr/iconActionMoveOrCopy"

        android:title="@string/move_action"

    />

    <item

        android:id="@+id/copy"

        android:title="@string/copy_action"

    />

    <item

        android:id="@+id/toggle_unread"

        android:alphabeticShortcut="u"

        android:title="@string/mark_as_unread_action"

        android:showAsAction="never"

    />

    <item

        android:id="@+id/select_text"

        android:title="@string/select_text_action"

        android:showAsAction="never"

    />

    <item

        android:id="@+id/toggle_message_view_theme"

        android:title="@string/message_view_theme_action_dark"

        android:showAsAction="never"

    />

</menu>