mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-19 12:28:53 +01:00
Merge pull request #220 from gavine99/select_all_141
select all on conversations and compose screens. new compose 'show status' option
This commit is contained in:
@@ -34,6 +34,13 @@
|
||||
android:visible="false"
|
||||
app:showAsAction="always" />
|
||||
|
||||
<item
|
||||
android:id="@+id/select_all"
|
||||
android:icon="?attr/actionModeSelectAllDrawable"
|
||||
android:title="@string/main_menu_select_all"
|
||||
android:visible="false"
|
||||
app:showAsAction="always" />
|
||||
|
||||
<item
|
||||
android:id="@+id/info"
|
||||
android:icon="@drawable/ic_more_vert_black_24dp"
|
||||
@@ -46,14 +53,14 @@
|
||||
android:icon="@drawable/ic_info_black_24dp"
|
||||
android:title="@string/compose_menu_copy"
|
||||
android:visible="false"
|
||||
app:showAsAction="ifRoom" />
|
||||
app:showAsAction="always" />
|
||||
|
||||
<item
|
||||
android:id="@+id/delete"
|
||||
android:icon="@drawable/ic_delete_white_24dp"
|
||||
android:title="@string/compose_menu_delete"
|
||||
android:visible="false"
|
||||
app:showAsAction="ifRoom" />
|
||||
app:showAsAction="always" />
|
||||
|
||||
<item
|
||||
android:id="@+id/copy"
|
||||
@@ -69,6 +76,13 @@
|
||||
android:visible="false"
|
||||
app:showAsAction="ifRoom" />
|
||||
|
||||
<item
|
||||
android:id="@+id/show_status"
|
||||
android:icon="@android:drawable/ic_menu_more"
|
||||
android:title="@string/compose_menu_show_status"
|
||||
android:visible="false"
|
||||
app:showAsAction="ifRoom" />
|
||||
|
||||
<item
|
||||
android:id="@+id/previous"
|
||||
android:icon="@drawable/ic_keyboard_arrow_up_black_24dp"
|
||||
|
||||
@@ -20,26 +20,33 @@
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item
|
||||
android:id="@+id/select_all"
|
||||
android:icon="?attr/actionModeSelectAllDrawable"
|
||||
android:title="@string/main_menu_select_all"
|
||||
android:visible="false"
|
||||
app:showAsAction="always" />
|
||||
|
||||
<item
|
||||
android:id="@+id/archive"
|
||||
android:icon="@drawable/ic_archive_white_24dp"
|
||||
android:title="@string/main_menu_archive"
|
||||
android:visible="false"
|
||||
app:showAsAction="ifRoom" />
|
||||
app:showAsAction="always" />
|
||||
|
||||
<item
|
||||
android:id="@+id/unarchive"
|
||||
android:icon="@drawable/ic_inbox_black_24dp"
|
||||
android:title="@string/main_menu_unarchive"
|
||||
android:visible="false"
|
||||
app:showAsAction="ifRoom" />
|
||||
app:showAsAction="always" />
|
||||
|
||||
<item
|
||||
android:id="@+id/delete"
|
||||
android:icon="@drawable/ic_delete_white_24dp"
|
||||
android:title="@string/main_menu_delete"
|
||||
android:visible="false"
|
||||
app:showAsAction="ifRoom" />
|
||||
app:showAsAction="always" />
|
||||
|
||||
<item
|
||||
android:id="@+id/add"
|
||||
|
||||
@@ -44,6 +44,7 @@
|
||||
<string name="main_drawer_open_cd">Open navigation drawer</string>
|
||||
<string name="main_title_selected">%d selected</string>
|
||||
<string name="main_menu_clear">Clear</string>
|
||||
<string name="main_menu_select_all">Select all</string>
|
||||
<string name="main_menu_archive">Archive</string>
|
||||
<string name="main_menu_unarchive">Unarchive</string>
|
||||
<string name="main_menu_delete">Delete</string>
|
||||
@@ -123,6 +124,7 @@
|
||||
<string name="compose_no_valid_recipients">Can\'t send to other participants</string>
|
||||
<string name="compose_menu_copy">Copy text</string>
|
||||
<string name="compose_menu_forward">Forward</string>
|
||||
<string name="compose_menu_show_status">Show status</string>
|
||||
<string name="compose_menu_delete">Delete</string>
|
||||
<string name="compose_menu_previous">Previous</string>
|
||||
<string name="compose_menu_next">Next</string>
|
||||
@@ -428,7 +430,11 @@
|
||||
<string name="button_undo">Undo</string>
|
||||
|
||||
<string name="toast_copied">Copied</string>
|
||||
<string name="toast_archived">Archived conversation</string>
|
||||
<plurals name="toast_archived">
|
||||
<item quantity="one">Archived conversation</item>
|
||||
<item quantity="other">Archived %d conversations</item>
|
||||
</plurals>
|
||||
|
||||
<string name="toast_qksms_plus">You must unlock QUIK+ to use this</string>
|
||||
|
||||
<plurals name="notification_new_messages">
|
||||
|
||||
Reference in New Issue
Block a user