diff --git a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java index b7e117f8c..fdb4d622e 100644 --- a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java @@ -58,7 +58,7 @@ public class LoginActivity extends AppCompatActivity { @BindView(R.id.edit_text_domain) EditText editText; @BindView(R.id.button_login) Button button; - @BindView(R.id.no_account) TextView noAccount; + @BindView(R.id.whats_an_instance) TextView whatsAnInstance; private static String urlEncode(String string) { try { @@ -208,11 +208,11 @@ public class LoginActivity extends AppCompatActivity { final Context context = this; - noAccount.setOnClickListener(new View.OnClickListener() { + whatsAnInstance.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { AlertDialog dialog = new AlertDialog.Builder(context) - .setMessage(R.string.dialog_no_account) + .setMessage(R.string.dialog_whats_an_instance) .setPositiveButton(R.string.action_close, new DialogInterface.OnClickListener() { @Override diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 7eb95cbe3..82a87e6e5 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -49,8 +49,10 @@ + android:id="@+id/whats_an_instance" + android:text="@string/link_whats_an_instance" /> + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 75e0d85fc..641726687 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -86,13 +86,16 @@ What\'s happening? Content warning - No account? + What\'s an instance? - - Similar to an email address, a Mastodon account can be provided by any one of many - websites.\n\nSo the address of any instance can be entered here, which will direct you - there to either make an account or log in.\n\nMore can be found at - mastodon.social. + The address or domain of any instance can be entered + here, such as mastodon.social, icosahedron.website, social.tchncs.de, and + more! + \n\nIf you don\'t yet have an account, you can enter the name of the instance you\'d like to + join and create an account there.\n\nAn instance is a single place where your account is + hosted, but you can easily communicate with and follow folks on other instances as though + you were on the same site. + \n\nMore info can be found at mastodon.social. Finishing Media Upload Uploading…