First bugfix release. Also, added a link to the "No Account?" dialog on the login page.

main
Vavassor 8 years ago
parent e48bf683f7
commit 263d586a51
  1. 4
      app/build.gradle
  2. 5
      app/src/main/java/com/keylesspalace/tusky/LoginActivity.java
  3. 5
      app/src/main/res/values/strings.xml

@ -7,8 +7,8 @@ android {
applicationId "com.keylesspalace.tusky" applicationId "com.keylesspalace.tusky"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 25 targetSdkVersion 25
versionCode 9 versionCode 10
versionName "1.0.0" versionName "1.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary true vectorDrawables.useSupportLibrary true
} }

@ -23,6 +23,7 @@ import android.content.SharedPreferences;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.text.method.LinkMovementMethod;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
@ -191,7 +192,7 @@ public class LoginActivity extends AppCompatActivity {
noAccount.setOnClickListener(new View.OnClickListener() { noAccount.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
new AlertDialog.Builder(context) AlertDialog dialog = new AlertDialog.Builder(context)
.setMessage(R.string.dialog_no_account) .setMessage(R.string.dialog_no_account)
.setPositiveButton(R.string.action_close, .setPositiveButton(R.string.action_close,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@ -201,6 +202,8 @@ public class LoginActivity extends AppCompatActivity {
} }
}) })
.show(); .show();
TextView textView = (TextView) dialog.findViewById(android.R.id.message);
textView.setMovementMethod(LinkMovementMethod.getInstance());
} }
}); });
} }

@ -92,8 +92,9 @@
<string name="dialog_no_account"> <string name="dialog_no_account">
Similar to an email address, a Mastodon account can be provided by any one of many Similar to an email address, a Mastodon account can be provided by any one of many
websites.\n\nSo, find the address of one you\'d like to join and enter it here. This will websites.\n\nSo the address of any instance can be entered here, which will direct you
direct you there to either make an account or log in. there to either make an account or log in.\n\nMore 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>

Loading…
Cancel
Save