Browse Source

Move thread action to the right and show if available only

main
M66B 6 years ago
parent
commit
8ac235791f
3 changed files with 9 additions and 7 deletions
  1. +2
    -0
      app/src/main/java/eu/faircode/email/FragmentMessage.java
  2. +6
    -6
      app/src/main/res/menu/action_view_top.xml
  3. +1
    -1
      app/src/main/res/values/strings.xml

+ 2
- 0
app/src/main/java/eu/faircode/email/FragmentMessage.java View File

@ -240,6 +240,8 @@ public class FragmentMessage extends Fragment {
db.attachment().liveAttachments(id).removeObservers(FragmentMessage.this); db.attachment().liveAttachments(id).removeObservers(FragmentMessage.this);
db.attachment().liveAttachments(id).observe(FragmentMessage.this, attachmentsObserver); db.attachment().liveAttachments(id).observe(FragmentMessage.this, attachmentsObserver);
top_navigation.getMenu().findItem(R.id.action_thread).setVisible(message.count > 1);
MenuItem actionSeen = top_navigation.getMenu().findItem(R.id.action_seen); MenuItem actionSeen = top_navigation.getMenu().findItem(R.id.action_seen);
actionSeen.setIcon(message.ui_seen actionSeen.setIcon(message.ui_seen
? R.drawable.baseline_visibility_off_24 ? R.drawable.baseline_visibility_off_24


+ 6
- 6
app/src/main/res/menu/action_view_top.xml View File

@ -2,18 +2,18 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_seen"
android:icon="@drawable/baseline_visibility_off_black_18"
android:title="@string/title_seen"
app:showAsAction="ifRoom" />
<item <item
android:id="@+id/action_thread" android:id="@+id/action_thread"
android:icon="@drawable/baseline_message_24" android:icon="@drawable/baseline_message_24"
android:title="@string/title_thread" android:title="@string/title_thread"
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item
android:id="@+id/action_seen"
android:icon="@drawable/baseline_visibility_off_black_18"
android:title="@string/title_seen"
app:showAsAction="ifRoom" />
<item <item
android:id="@+id/action_move" android:id="@+id/action_move"
android:icon="@drawable/baseline_folder_24" android:icon="@drawable/baseline_folder_24"


+ 1
- 1
app/src/main/res/values/strings.xml View File

@ -82,9 +82,9 @@
<string name="title_subject_reply">Re: %1$s</string> <string name="title_subject_reply">Re: %1$s</string>
<string name="title_subject_forward">Fwd: %1$s</string> <string name="title_subject_forward">Fwd: %1$s</string>
<string name="title_thread">Thread</string>
<string name="title_seen">Read</string> <string name="title_seen">Read</string>
<string name="title_unseen">Unread</string> <string name="title_unseen">Unread</string>
<string name="title_thread">Thread</string>
<string name="title_move">Move</string> <string name="title_move">Move</string>
<string name="title_forward">Forward</string> <string name="title_forward">Forward</string>
<string name="title_reply_all">Reply to all</string> <string name="title_reply_all">Reply to all</string>


Loading…
Cancel
Save