chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases Activity

Clarifies a bit of the explanation on the login page.

Browse source
This commit is contained in:
Vavassor 2017-04-02 19:55:41 -04:00
parent eccebc9215
commit e46e50ac60
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/keylesspalace/tusky/LoginActivity.java
View file

@ -58,7 +58,7 @@ public class LoginActivity extends AppCompatActivity {
@BindView(R.id.edit_text_domain) EditText editText; @BindView(R.id.edit_text_domain) EditText editText;
@BindView(R.id.button_login) Button button; @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) { private static String urlEncode(String string) {
try { try {
@ -208,11 +208,11 @@ public class LoginActivity extends AppCompatActivity {
final Context context = this; final Context context = this;
noAccount.setOnClickListener(new View.OnClickListener() { whatsAnInstance.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
AlertDialog dialog = new AlertDialog.Builder(context) AlertDialog dialog = new AlertDialog.Builder(context)
.setMessage(R.string.dialog_no_account) .setMessage(R.string.dialog_whats_an_instance)
.setPositiveButton(R.string.action_close, .setPositiveButton(R.string.action_close,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@Override @Override

6
app/src/main/res/layout/activity_login.xml
View file

@ -49,8 +49,10 @@
<TextView <TextView
android:layout_width="250dp" android:layout_width="250dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="5dp"
android:textAlignment="center" android:textAlignment="center"
android:id="@+id/no_account" android:id="@+id/whats_an_instance"
android:text="@string/link_no_account" /> android:text="@string/link_whats_an_instance" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

15
app/src/main/res/values/strings.xml
View file

@ -86,13 +86,16 @@
<string name="hint_compose">What\'s happening?</string> <string name="hint_compose">What\'s happening?</string>
<string name="hint_content_warning">Content warning</string> <string name="hint_content_warning">Content warning</string>
<string name="link_no_account">No account?</string> <string name="link_whats_an_instance">What\'s an instance?</string>
<string name="dialog_no_account"> <string name="dialog_whats_an_instance">The address or domain of any instance can be entered
Similar to an email address, a Mastodon account can be provided by any one of many here, such as mastodon.social, icosahedron.website, social.tchncs.de, and
websites.\n\nSo the address of any instance can be entered here, which will direct you <a href="https://github.com/tootsuite/mastodon/blob/master/docs/Using-Mastodon/List-of-Mastodon-instances.md">more!</a>
there to either make an account or log in.\n\nMore can be found at \n\nIf you don\'t yet have an account, you can enter the name of the instance you\'d like to
<a href="https://mastodon.social/about">mastodon.social</a>. 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 <a href="https://mastodon.social/about">mastodon.social</a>.
</string> </string>
<string name="dialog_title_finishing_media_upload">Finishing Media Upload</string> <string name="dialog_title_finishing_media_upload">Finishing Media Upload</string>
<string name="dialog_message_uploading_media">Uploading…</string> <string name="dialog_message_uploading_media">Uploading…</string>