aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2019-03-31 15:00:07 +0200
committerChristian Schneppe <christian@pix-art.de>2019-03-31 15:00:07 +0200
commita2c2b2e658617e14342f95b3d467900778c309cd (patch)
tree465912612f4c61b3b6a203284df9a71505e012c4
parent9fa77720e18b493e2199ed0d0f74a15126bf719e (diff)
rename "advanced mode" in WelcomeActivity to "I have an account"
-rw-r--r--src/main/java/de/pixart/messenger/ui/WelcomeActivity.java4
-rw-r--r--src/main/res/layout/welcome.xml4
-rw-r--r--src/main/res/values/strings.xml2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
index 0ea648370..f871a095b 100644
--- a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
@@ -79,8 +79,8 @@ public class WelcomeActivity extends XmppActivity {
addInviteUri(intent);
startActivity(intent);
});
- final Button useAdvancedMode = findViewById(R.id.use_advanced_mode);
- useAdvancedMode.setOnClickListener(v -> {
+ final Button useExistingAccount = findViewById(R.id.use_existing_account);
+ useExistingAccount.setOnClickListener(v -> {
List<Account> accounts = xmppConnectionService.getAccounts();
Intent intent = new Intent(WelcomeActivity.this, EditAccountActivity.class);
if (accounts.size() == 1) {
diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml
index 457d44b28..bc21464c4 100644
--- a/src/main/res/layout/welcome.xml
+++ b/src/main/res/layout/welcome.xml
@@ -79,12 +79,12 @@
android:textColor="?attr/colorAccent" />
<Button
- android:id="@+id/use_advanced_mode"
+ android:id="@+id/use_existing_account"
style="@style/Widget.Conversations.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
- android:text="@string/welcome_advanced_mode"
+ android:text="@string/welcome_existing_account"
android:textColor="?attr/colorAccent" />
</LinearLayout>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 1f463846e..477c74ddc 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -513,7 +513,7 @@
<string name="magic_create_text">We will guide you through the process of creating an account with a random password, which you can use or change to your own password on the next page. \nThan you will be able to communicate with users of this and other providers by giving them your full Jabber-ID.</string>
<string name="your_full_jid_will_be">Your Jabber-ID will be: %s</string>
<string name="create_account">Create new account</string>
- <string name="welcome_advanced_mode">Advanced mode</string>
+ <string name="welcome_existing_account">I have an account</string>
<string name="pick_your_username">Choose your username</string>
<string name="pref_manually_change_presence">Manage availability manually</string>
<string name="pref_manually_change_presence_summary">Set your availability when editing your status message.</string>