diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-04-22 13:46:26 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-04-22 13:46:26 +0200 |
commit | 848aa600cb99524d276b9c6ef3f2f3824e6f2dcc (patch) | |
tree | 208c51cb8d73ae6863951b7f7c9f74a54e31940d /src/main/res | |
parent | 0e36a08f455d2bc6896573c1ac5b147ea6ff3edc (diff) |
integrate invite to Pix-Art Messenger
Diffstat (limited to '')
-rw-r--r-- | src/main/res/layout/choose_account_dialog.xml | 22 | ||||
-rw-r--r-- | src/main/res/menu/activity_conversations.xml | 13 | ||||
-rw-r--r-- | src/main/res/menu/fragment_conversation.xml | 5 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 1 |
4 files changed, 32 insertions, 9 deletions
diff --git a/src/main/res/layout/choose_account_dialog.xml b/src/main/res/layout/choose_account_dialog.xml new file mode 100644 index 000000000..da747fbf4 --- /dev/null +++ b/src/main/res/layout/choose_account_dialog.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingBottom="?attr/dialog_vertical_padding" + android:paddingLeft="?attr/dialog_horizontal_padding" + android:paddingRight="?attr/dialog_horizontal_padding" + android:paddingTop="?attr/dialog_vertical_padding"> + + <Spinner + android:id="@+id/account" + android:layout_width="fill_parent" + android:layout_height="wrap_content" /> + + </LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/src/main/res/menu/activity_conversations.xml b/src/main/res/menu/activity_conversations.xml index aa2d54919..a396194c6 100644 --- a/src/main/res/menu/activity_conversations.xml +++ b/src/main/res/menu/activity_conversations.xml @@ -8,10 +8,6 @@ android:visible="@bool/show_qr_code_scan" app:showAsAction="always" /> <item - android:id="@+id/action_check_updates" - app:showAsAction="never" - android:title="@string/action_check_update" /> - <item android:id="@+id/action_accounts" android:orderInCategory="90" android:title="@string/action_accounts" @@ -21,5 +17,14 @@ android:orderInCategory="100" android:title="@string/action_settings" app:showAsAction="never" /> + <item + android:id="@+id/action_check_updates" + app:showAsAction="never" + android:title="@string/action_check_update" /> + <item + android:id="@+id/action_invite_user" + android:orderInCategory="100" + app:showAsAction="never" + android:title="@string/invite_user" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/fragment_conversation.xml b/src/main/res/menu/fragment_conversation.xml index 78edffeca..1fb3f1391 100644 --- a/src/main/res/menu/fragment_conversation.xml +++ b/src/main/res/menu/fragment_conversation.xml @@ -73,11 +73,6 @@ app:showAsAction="never" android:title="@string/action_end_conversation" /> <item - android:id="@+id/action_invite_user" - android:orderInCategory="100" - app:showAsAction="never" - android:title="@string/invite_user" /> - <item android:id="@+id/action_create_issue" android:orderInCategory="100" app:showAsAction="never" diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 6b72fa1a7..809b77dba 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -781,4 +781,5 @@ <string name="pref_theme_dark">Dark theme</string> <string name="pref_theme_options_summary">Select the color palette</string> <string name="pref_theme_options">Theme</string> + <string name="chooce_account">Choose account</string> </resources> |