diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-08-04 00:26:37 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-08-04 00:26:37 +0200 |
| commit | 2df6517e8d2ee026e69ec5ec56bd92bd28e9d017 (patch) | |
| tree | 0ab274158ce4fed1cc29a4b62afc5278886fc897 /src/main/res | |
| parent | 16f2aad5973163e7d473153af282f5fa5783ec36 (diff) | |
use blabber.im as default domain
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/activity_magic_create.xml | 10 | ||||
| -rw-r--r-- | src/main/res/values/defaults.xml | 5 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/main/res/layout/activity_magic_create.xml b/src/main/res/layout/activity_magic_create.xml index 8eb312ace..25b82205a 100644 --- a/src/main/res/layout/activity_magic_create.xml +++ b/src/main/res/layout/activity_magic_create.xml @@ -54,9 +54,9 @@ style="@style/Widget.Conversations.EditText" android:layout_width="match_parent" android:layout_height="wrap_content" + android:hint="@string/username_hint" android:imeOptions="actionNext" android:inputType="text" - android:hint="@string/username_hint" android:textColor="?attr/text_Color_Main" /> <TextView @@ -83,6 +83,14 @@ android:textAppearance="@style/TextAppearance.Conversations.Caption" android:visibility="invisible" /> + <TextView + android:id="@+id/server_info" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/welcome_server_info" + android:textAppearance="@style/TextAppearance.Conversations.Caption" /> + <Button android:id="@+id/create_account" style="@style/Widget.Conversations.Button.Borderless" diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index 49c1a849a..c96f22f3d 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -21,6 +21,7 @@ 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 modified source code at https://github.com/kriztan/Pix-Art-Messenger + \n\n\n\Pix-Art Messenger recommends blabber.im as provider. More information can be found at https://blabber.im </string> <string name="pref_about_libraries" translatable="false"><b>Libraries</b> \n\nhttps://www.bouncycastle.org\n(The MIT License (MIT)) @@ -225,8 +226,8 @@ <item>chat.hipchat.com</item> <item>googlemail.com</item> <item>nsa.li</item> - <item>blabber.im</item> - <item>buzon.uy</item> + <item>blabber.im</item> + <item>buzon.uy</item> </string-array> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4a5b4e3c6..c17784722 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -806,4 +806,5 @@ <string name="delete_message">Delete message</string> <string name="conference_destroyed">This group chat has been destroyed</string> <string name="no_application_found_to_view_contact">No application found to view contact</string> + <string name="welcome_server_info">We recommend the use of blabber.im as your provider.</string> </resources> |