diff options
Diffstat (limited to 'src/main/res')
-rw-r--r-- | src/main/res/layout/create_conference_dialog.xml | 3 | ||||
-rw-r--r-- | src/main/res/layout/dialog_join_conference.xml | 1 | ||||
-rw-r--r-- | src/main/res/layout/enter_jid_dialog.xml | 1 | ||||
-rw-r--r-- | src/main/res/menu/message_context.xml | 6 | ||||
-rw-r--r-- | src/main/res/values/defaults.xml | 4 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 3 |
6 files changed, 14 insertions, 4 deletions
diff --git a/src/main/res/layout/create_conference_dialog.xml b/src/main/res/layout/create_conference_dialog.xml index 3496b17f5..85a4cbf89 100644 --- a/src/main/res/layout/create_conference_dialog.xml +++ b/src/main/res/layout/create_conference_dialog.xml @@ -38,7 +38,8 @@ style="@style/Widget.Conversations.EditText" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/create_dialog_group_chat_name" /> + android:hint="@string/create_dialog_group_chat_name" + android:imeOptions="actionNext" /> </android.support.design.widget.TextInputLayout> </LinearLayout> </layout>
\ No newline at end of file diff --git a/src/main/res/layout/dialog_join_conference.xml b/src/main/res/layout/dialog_join_conference.xml index 15017d5c1..27acefc4a 100644 --- a/src/main/res/layout/dialog_join_conference.xml +++ b/src/main/res/layout/dialog_join_conference.xml @@ -40,6 +40,7 @@ style="@style/Widget.Conversations.EditText" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:imeOptions="actionDone" android:inputType="textEmailAddress" /> </android.support.design.widget.TextInputLayout> diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml index 4c0214f96..11f673916 100644 --- a/src/main/res/layout/enter_jid_dialog.xml +++ b/src/main/res/layout/enter_jid_dialog.xml @@ -40,6 +40,7 @@ style="@style/Widget.Conversations.EditText" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:imeOptions="actionDone" android:inputType="textEmailAddress" android:textColor="?attr/text_Color_Main" /> </android.support.design.widget.TextInputLayout> diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml index 4112dfb8c..d92f85af4 100644 --- a/src/main/res/menu/message_context.xml +++ b/src/main/res/menu/message_context.xml @@ -2,9 +2,13 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item + android:id="@+id/open_with" + android:title="@string/open_with" + android:visible="false" /> + <item android:id="@+id/share_with" android:title="@string/share_with" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/copy_message" android:title="@string/copy_to_clipboard" diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index 5de3e4920..4645b2a4e 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -7,7 +7,7 @@ <string name="type_web" translatable="false">Web browser</string> <string name="type_console" translatable="false">Console</string> <string name="pref_about_message" translatable="false"><b>Pix-Art Messenger</b> - \n\nCopyright © 2014-2018 Christian Schneppe + \n\nCopyright © 2014-2019 Christian Schneppe \n\nhttp://jabber.pix-art.de \n\nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ GNU General Public License for more details. \n\nYou should have received a copy of the GNU General Public License along with this program. If not, see https://www.gnu.org/licenses - \n\nDownload the full original source code at https://github.com/siacs/Conversations (Copyright © 2014-2018 Daniel Gultsch) + \n\nDownload the full original source code at https://github.com/siacs/Conversations (Copyright © 2014-2019 Daniel Gultsch) \n\nDownload the modified source code at https://github.com/kriztan/Pix-Art-Messenger \n\nPix-Art Messenger recommends blabber.im as provider. More information can be found at https://blabber.im \n\nYou can support me by making a donation in form of a gift in sense of § 516 ff BGB i.e. a gratuitous donation. diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e80438379..8867502a4 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -859,4 +859,7 @@ <string name="autojoin_groupchat">Automatically join this group chat</string> <string name="pref_play_gif_inside">Play GIF files in chat</string> <string name="pref_play_gif_inside_summary">Setting this to true plays GIF files directly inside the chat view.</string> + <string name="open_with">Open with…</string> + <string name="choose_account">Choose account</string> + <string name="set_profile_picture">Pix-Art Messenger profile picture</string> </resources> |