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

Commit cf359c95 authored by Daniel Applebaum's avatar Daniel Applebaum
Browse files

Major ergonomic re-work of MessageView controls. Provide options (in 

Account settings) for scrolling the navigation buttons with the
message, or keeping the buttons on screen.  Scrolling mode can be
automatically switched based on availability of keyboard. (Issue 197
and Issue 194)

Add ability to flag/unflag message from options menu
parent b6e9910e

res/layout-land/message_view.xml

+47 −3
Original line number Diff line number Diff line
@@ -7,19 +7,63 @@ 
    android:background="@android:color/white">

    <ScrollView

        android:layout_width="fill_parent"

        android:layout_height="0dip"

        android:layout_height="fill_parent"

        android:layout_weight="1"

        android:scrollbarStyle="outsideInset"

        android:foregroundGravity="fill"

        android:fillViewport="true"

        android:fadingEdge="none">

        <LinearLayout

            android:orientation="vertical"

            android:layout_width="fill_parent"

            android:layout_height="0dip"

            android:layout_height="fill_parent"

            android:layout_weight="1">



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



            <View

       	     	android:layout_width="fill_parent"

        	 	android:layout_height="0px"

         	 	android:layout_weight="1" /> 

			<LinearLayout

		    	android:id="@+id/scrolling_buttons"

		        android:orientation="horizontal"

		        android:layout_width="fill_parent"

		        android:layout_height="57px"

		        android:background="@drawable/ic_email_thread_open_bottom_default"

		        android:gravity="bottom">

		        <Button

		           android:id="@+id/previous_scrolling"

		           android:text="@string/message_view_prev_action"

		           android:layout_height="wrap_content"

		           android:layout_width="0dip"

		           android:layout_weight="1" />

		        <Button

		            android:id="@+id/reply_scrolling"

		            android:text="@string/reply_action"

		            android:layout_height="wrap_content"

		            android:layout_width="0dip"

		            android:layout_weight="1" />

		        <Button

		            android:id="@+id/delete_scrolling"

		            android:text="@string/delete_action"

		            android:layout_height="wrap_content"

		            android:layout_width="0dip"

		            android:layout_weight="1" />

		        <Button

		            android:id="@+id/forward_scrolling"

		            android:text="@string/forward_action"

		            android:layout_height="wrap_content"

		            android:layout_width="0dip"

		            android:layout_weight="1" />

		         <Button

		            android:id="@+id/next_scrolling"

		            android:text="@string/message_view_next_action"

		            android:layout_height="wrap_content"

		            android:layout_width="0dip"

		            android:layout_weight="1" />

		    </LinearLayout>

        </LinearLayout>

      

    </ScrollView>

    <LinearLayout

    	android:id="@+id/bottom_buttons"

res/layout/message_view.xml

+59 −38
Original line number Diff line number Diff line
@@ -10,38 +10,71 @@ 
        android:layout_height="0dip"

        android:layout_weight="1"

        android:scrollbarStyle="outsideInset"

        android:fillViewport="true"

        android:fadingEdge="none">

        <LinearLayout

            android:orientation="vertical"

            android:layout_width="fill_parent"

            android:layout_height="0dip"

            android:layout_weight="1">

   <!--          <RelativeLayout

    			android:id="@+id/top_buttons"

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

            <View

       	     	android:layout_width="fill_parent"

                android:layout_height="54px"

                android:paddingTop="4px">

        	 	android:layout_height="0px"

         	 	android:layout_weight="1" /> 

		   <LinearLayout

		    	android:id="@+id/extra_buttons"

		        android:orientation="horizontal"

		        android:layout_width="fill_parent"

		        android:layout_height="57px"

		        android:background="@drawable/ic_email_thread_open_bottom_default"

		        android:gravity="center_vertical">

		        <Button

                    android:id="@+id/previous"

		            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/reply_all"

		            android:text="@string/reply_all_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" />

		    </LinearLayout> 

			<LinearLayout

		    	android:id="@+id/scrolling_buttons"

		        android:orientation="horizontal"

		        android:layout_width="fill_parent"

		        android:layout_height="57px"

		        android:background="@drawable/ic_email_thread_open_bottom_default"

		        android:gravity="center_vertical">

		        <Button

		            android:id="@+id/previous_scrolling"

		            android:text="@string/message_view_prev_action"

		            android:layout_height="wrap_content"

                    android:layout_width="wrap_content"

                    android:minWidth="@dimen/button_minWidth"

                    android:layout_alignParentLeft="true"

                    android:layout_centerVertical="true" />

		            android:layout_width="0dip"

		            android:layout_weight="1" />

		            

		        <Button

		            android:id="@+id/delete_scrolling"

		            android:text="@string/delete_action"

		            android:layout_height="wrap_content"

		            android:layout_width="0dip"

		            android:layout_weight="1" />

		       <Button

                    android:id="@+id/next"

		            android:id="@+id/next_scrolling"

		            android:text="@string/message_view_next_action"

		            android:layout_height="wrap_content"

                    android:layout_width="wrap_content"

                    android:minWidth="@dimen/button_minWidth"

                    android:layout_alignParentRight="true"

                    android:layout_centerVertical="true" />

            </RelativeLayout>

            -->



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



		            android:layout_width="0dip"

		            android:layout_weight="1" /> 

		    </LinearLayout>

        </LinearLayout>

    </ScrollView>

    <LinearLayout
@@ -51,12 +84,6 @@ 
        android:layout_height="57px"

        android:background="@drawable/ic_email_thread_open_bottom_default"

        android:gravity="center_vertical">

 <!--         <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/previous"

            android:text="@string/message_view_prev_action"
@@ -76,11 +103,5 @@ 
            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" /> -->

    </LinearLayout>

</LinearLayout>

res/menu/message_view_option.xml

+12 −6
Original line number 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/forward"

        android:alphabeticShortcut="f"

        android:title="@string/forward_action"

        android:icon="@drawable/ic_menu_forward_mail"

    />

    <item

        android:id="@+id/reply"

        android:alphabeticShortcut="r"
@@ -18,6 +12,12 @@ 
        android:title="@string/reply_all_action"

        android:icon="@drawable/ic_menu_reply_all"

    />

    <item

        android:id="@+id/forward"

        android:alphabeticShortcut="f"

        android:title="@string/forward_action"

        android:icon="@drawable/ic_menu_forward_mail"

    />

    <item

        android:id="@+id/mark_as_unread"

        android:alphabeticShortcut="u"
@@ -29,6 +29,12 @@ 
        android:alphabeticShortcut="q"

        android:title="@string/delete_action"

        android:icon="@drawable/ic_menu_delete"

    />

     <item

        android:id="@+id/flag"

        android:alphabeticShortcut="s"

        android:title="@string/flag_action"

        android:icon="@drawable/ic_menu_forward_mail"

    />

    <item

        android:id="@+id/send_alternate"

res/values/arrays.xml

+12 −0
Original line number Diff line number Diff line
@@ -64,6 +64,18 @@ 
        <item>NOT_SECOND_CLASS</item> 

    </string-array>

    

    <string-array name="account_settings_hide_buttons_entries">

        <item>@string/account_settings_hide_buttons_never</item>

       <item>@string/account_settings_hide_buttons_keyboard_avail</item>

       <item>@string/account_settings_hide_buttons_always</item>

    </string-array>



    <string-array name="account_settings_hide_buttons_values">

        <item>NEVER</item>

        <item>KEYBOARD_AVAILABLE</item>

        <item>ALWAYS</item>

    </string-array>

  

     <string-array name="account_settings_folder_sync_mode_entries">

        <item>@string/account_settings_folder_sync_mode_all</item>

       <item>@string/account_settings_folder_sync_mode_first_class</item>

res/values/strings.xml

+5 −3
Original line number Diff line number Diff line
@@ -282,8 +282,10 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based 
    <string name="account_settings_notify_sync_summary">Notify in status bar while email is checked</string>

    <string name="account_settings_show_combined_label">Show combined Inbox</string>

    

    <string name="account_settings_hide_buttons_label">Hide buttons</string>

    <string name="account_settings_hide_buttons_summary">While viewing message if keyboard is available</string>

    <string name="account_settings_hide_buttons_label">Scroll navigation buttons</string>

    <string name="account_settings_hide_buttons_never">Never</string>

    <string name="account_settings_hide_buttons_keyboard_avail">When keyboard is available</string>

    <string name="account_settings_hide_buttons_always">Always</string>

    

    <string name="account_settings_display_sync">Display and synchronization</string>
@@ -364,6 +366,6 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based 
    Message\u000AK, N - Next Message\u000AZ - Zoom Out\u000AShift-Z -

    Zoom In\u000aG - Flag</string>

    <string name="message_list_help_key">Del (or D) - Delete\u000AR -

    Reply\u000AA - Reply All\u000AC - Compose\u000AF - Forward\\u000aG - Flagu000AQ

    Reply\u000AA - Reply All\u000AC - Compose\u000AF - Forward\u000aG - Flag\u000AQ

    - Return to Accounts</string>

</resources>