Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Adds link to pick an instance

This commit is contained in:
stom79 2018-08-19 14:07:07 +02:00
parent bc547ffedf
commit f9e287c197
4 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java
View File

@ -39,6 +39,7 @@ import android.widget.AutoCompleteTextView;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import org.json.JSONArray;
@ -72,7 +73,6 @@ public class LoginActivity extends BaseActivity {
private EditText login_passwd;
boolean isLoadingInstance = false;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -216,7 +216,14 @@ public class LoginActivity extends BaseActivity {
retrievesClientId();
}
});
TextView instances_social = findViewById(R.id.instances_social);
instances_social.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://instances.social"));
startActivity(browserIntent);
}
});
login_instance.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View v, boolean hasFocus) {

13
app/src/main/res/layout-sw600dp/activity_login.xml
View File

@ -41,6 +41,19 @@
android:gravity="center"
android:orientation="vertical"
android:layout_height="wrap_content">
<TextView
android:id="@+id/instances_social"
android:textAllCaps="false"
android:gravity="center"
android:drawablePadding="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorAccent"
android:text="@string/no_account_yet" />
<android.support.design.widget.TextInputLayout
android:id="@+id/login_instance_layout"
android:layout_width="300dp"

12
app/src/main/res/layout/activity_login.xml
View File

@ -47,6 +47,18 @@
android:orientation="vertical"
android:layout_height="wrap_content"
>
<TextView
android:id="@+id/instances_social"
android:textAllCaps="false"
android:gravity="center"
android:drawablePadding="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorAccent"
android:text="@string/no_account_yet" />
<android.support.design.widget.TextInputLayout
android:id="@+id/login_instance_layout"
android:layout_width="match_parent"

1
app/src/main/res/values/strings.xml
View File

@ -543,6 +543,7 @@
<string name="set_share_details">Add toot details when sharing</string>
<string name="support_the_app_on_liberapay">Support the app on Liberapay</string>
<string name="alert_regex">There is an error in the regular expression!</string>
<string name="no_account_yet">No account yet?</string>
<string-array translatable="false" name="proxy_type_choice">
<item>HTTP</item>
<item>SOCKS</item>