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

Merge branch 'login_changes' into 'develop' 

design changes in login activity

See merge request tom79/fedilab!932
This commit is contained in:
Thomas 2019-11-16 12:23:42 +01:00
parent f5ce94b691 8feeeeafb1
commit 21008ef3ea
2 changed files with 188 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/app/fedilab/android/activities/LoginActivity.java
View File

@ -51,6 +51,7 @@ import android.widget.Toast;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
@ -107,7 +108,7 @@ public class LoginActivity extends BaseActivity {
private UpdateAccountInfoAsyncTask.SOCIAL socialNetwork;
private String basicAuth;
private InstanceNodeInfo instanceNodeInfo;
private LinearLayout step_login_credential, step_instance;
private ConstraintLayout step_login_credential, step_instance;
private TextView instance_chosen;
private ImageView info_instance;

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

@ -25,181 +25,209 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
android:id="@+id/main_logo"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:contentDescription="@string/app_logo" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/step_instance"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
<ImageView
android:id="@+id/main_logo"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:contentDescription="@string/app_logo"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/login_instance_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="100dp"
android:layout_marginTop="30dp"
app:errorEnabled="true"
app:layout_constraintEnd_toStartOf="@id/info_instance"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/main_logo">
<androidx.appcompat.widget.AppCompatAutoCompleteTextView
android:id="@+id/login_instance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:dropDownAnchor="@id/login_instance_layout"
android:hint="@string/instance_example"
android:imeOptions="actionNext"
android:inputType="textWebEmailAddress"
android:maxLines="1" />
</com.google.android.material.textfield.TextInputLayout>
<ImageView
android:id="@+id/info_instance"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginEnd="100dp"
android:contentDescription="@string/more_information"
android:src="@drawable/ic_info_login"
app:layout_constraintBottom_toBottomOf="@id/login_instance_layout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/login_instance_layout" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier_instance_bottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="info_instance,login_instance_layout" />
<Button
android:id="@+id/connect_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:drawableStart="@drawable/ic_check_circle"
android:drawablePadding="10dp"
android:gravity="center"
android:maxLines="1"
android:paddingStart="15dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
android:paddingBottom="12dp"
android:text="@string/connect_instance"
android:textAllCaps="false"
android:textSize="20sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/barrier_instance_bottom" />
<TextView
android:id="@+id/create_an_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="30dp"
android:drawableStart="@drawable/mastodon_icon_item"
android:drawablePadding="10dp"
android:gravity="center"
android:text="@string/join_mastodon"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/connect_button" />
<TextView
android:id="@+id/create_an_account_peertube"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:drawableStart="@drawable/peertube_icon"
android:drawablePadding="10dp"
android:gravity="center"
android:text="@string/join_peertube"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/create_an_account" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/step_login_credential"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="@dimen/activity_vertical_margin_login"
android:layout_marginLeft="@dimen/activity_vertical_margin_login"
android:layout_marginTop="20dp"
android:layout_marginEnd="@dimen/activity_vertical_margin_login"
android:layout_marginRight="@dimen/activity_vertical_margin_login"
android:layout_marginBottom="20dp"
android:gravity="center"
android:orientation="vertical">
android:paddingStart="50dp"
android:paddingEnd="50dp"
android:visibility="gone">
<LinearLayout
android:id="@+id/step_instance"
android:layout_width="match_parent"
<TextView
android:id="@+id/instance_chosen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:textColor="?colorAccent"
android:textSize="20sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/login_instance_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:errorEnabled="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<AutoCompleteTextView
android:id="@+id/login_instance"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:hint="@string/instance_example"
android:imeOptions="actionNext"
android:inputType="textWebEmailAddress"
android:maxLines="1" />
<ImageView
android:id="@+id/info_instance"
android:layout_width="30dp"
android:layout_height="30dp"
android:contentDescription="@string/more_information"
android:src="@drawable/ic_info_login" />
</LinearLayout>
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/connect_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:drawableStart="@drawable/ic_check_circle"
android:drawablePadding="10dp"
android:gravity="center"
android:maxLines="1"
android:paddingStart="15dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
android:paddingBottom="12dp"
android:text="@string/connect_instance"
android:textAllCaps="false"
android:textSize="20sp" />
<TextView
android:id="@+id/create_an_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="30dp"
android:drawableStart="@drawable/mastodon_icon_item"
android:drawablePadding="10dp"
android:gravity="center"
android:text="@string/join_mastodon"
android:textSize="16sp" />
<TextView
android:id="@+id/create_an_account_peertube"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:drawableStart="@drawable/peertube_icon"
android:drawablePadding="10dp"
android:gravity="center"
android:text="@string/join_peertube"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/step_login_credential"
android:layout_width="match_parent"
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/login_uid_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/instance_chosen">
<TextView
android:id="@+id/instance_chosen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="10dp"
android:textColor="?colorAccent"
android:textSize="16sp" />
<LinearLayout
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/login_uid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:autofillHints="username"
android:hint="@string/username"
android:inputType="textEmailAddress"
android:maxLines="1" />
<EditText
android:id="@+id/login_uid"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:hint="@string/username"
android:inputType="textEmailAddress"
android:maxLines="1" />
</LinearLayout>
</com.google.android.material.textfield.TextInputLayout>
<LinearLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/login_passwd_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/login_uid_container">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/login_passwd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:autofillHints="password"
android:hint="@string/password"
android:inputType="textPassword"
android:maxLines="1" />
<EditText
android:id="@+id/login_passwd"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:hint="@string/password"
android:inputType="textPassword"
android:maxLines="1" />
</LinearLayout>
</com.google.android.material.textfield.TextInputLayout>
<TextView
android:id="@+id/login_issue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:visibility="gone" />
<TextView
android:id="@+id/login_issue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/login_passwd_container" />
<Button
android:id="@+id/login_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:drawableStart="@drawable/mastodon_icon"
android:drawablePadding="10dp"
android:gravity="center"
android:maxLines="1"
android:paddingStart="15dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
android:paddingBottom="12dp"
android:text="@string/login"
android:textAllCaps="false"
android:textSize="20sp" />
</LinearLayout>
<Button
android:id="@+id/login_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:drawableStart="@drawable/mastodon_icon"
android:drawablePadding="10dp"
android:gravity="center"
android:maxLines="1"
android:paddingStart="15dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
android:paddingBottom="12dp"
android:text="@string/login"
android:textAllCaps="false"
android:textSize="20sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/login_issue" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>