fix: EditField order and type of input

- Add some Ux improvment

Author: MohammadHossein

app/src/main/java/ir/mk/learnx/Home.java

@@ -11,6 +11,7 @@
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -52,6 +53,8 @@ protected void onCreate(Bundle savedInstanceState) {
         recyclerView.setAdapter(homeCourseListAdapter);
 
         Button exit = findViewById(R.id.exit);
+        if(!Account.getLoggedInAccount().getUsername().equals(""))
+            exit.setVisibility(View.VISIBLE);
         exit.setOnClickListener(v -> {
             Account.setLoggedInAccount(null);
             Intent i = new Intent(Home.this, LandingPageActivity.class);
@@ -89,7 +92,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
     @Override
     public void onBackPressed() {
-        if (Account.getLoggedInAccount() == null) {
+        if (Account.getLoggedInAccount().getUsername().equals("")) {
             Intent i = new Intent(Home.this, LandingPageActivity.class);
             startActivity(i);
         } else {

app/src/main/java/ir/mk/learnx/login/SignUpActivity.java

@@ -12,13 +12,14 @@
 
 import com.bumptech.glide.Glide;
 
+import ir.mk.learnx.Home;
 import ir.mk.learnx.R;
 import ir.mk.learnx.model.Account;
 
 public class SignUpActivity extends AppCompatActivity {
     private static final int SELECT_PICTURE = 100;
     private static ImageView imageView;
-    private Uri profilePictureUri;
+    private Uri profilePictureUri = Uri.EMPTY;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -38,14 +39,16 @@ protected void onCreate(Bundle savedInstanceState) {
 
         button.setOnClickListener(v -> {
             if (!usernameField.getText().toString().isEmpty() && !emailField.getText().toString().isEmpty() &&
-                    !passwordField.getText().toString().isEmpty() && !firstNameField.getText().toString().isEmpty() &&
-                    !lastNameField.getText().toString().isEmpty()) {
-                new Account(firstNameField.getText().toString(), lastNameField.getText().toString(),
+                    !getStringFromField(passwordField).isEmpty() && !firstNameField.getText().toString().isEmpty() &&
+                    !getStringFromField(lastNameField).isEmpty()) {
+                Account account = new Account(firstNameField.getText().toString(), lastNameField.getText().toString(),
                         0, 0, usernameField.getText().toString(),
                         passwordField.getText().toString(), emailField.getText().toString(), 0,
                 profilePictureUri);
+                Account.loginUser(getStringFromField(usernameField), getStringFromField(passwordField));
                 Toast.makeText(this, "حساب کاربری با موفقیت ساخته شد", Toast.LENGTH_LONG).show();
-                Intent i = new Intent(SignUpActivity.this, LandingPageActivity.class);
+                Intent i = new Intent(SignUpActivity.this, Home.class);
+                startActivity(i);
             } else {
                 Toast.makeText(this, "خطایی رخ داده است دوباره تلاش کنید", Toast.LENGTH_LONG).show();
             }
@@ -55,6 +58,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
     }
 
+    public String getStringFromField(EditText editText){
+        return editText.getText().toString();
+    }
+
     @Override
     public void onBackPressed() {
         Intent i = new Intent(SignUpActivity.this, LandingPageActivity.class);

app/src/main/res/drawable-v24/ic_baseline_account_circle_24_green.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#00D0AF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
+</vector>

app/src/main/res/layout/activity_home.xml

@@ -67,7 +67,7 @@
             android:text="خروج"
             android:textSize="10sp"
             app:layout_constraintStart_toStartOf="parent"
-            android:background="@color/red"
+            android:background="@drawable/button_shape"
             android:visibility="gone"
             app:layout_constraintTop_toTopOf="parent" />
 

app/src/main/res/layout/activity_login.xml

@@ -47,15 +47,14 @@
         android:layout_gravity="start"
         android:layout_marginStart="48dp"
         android:layout_marginTop="16dp"
-        android:layout_marginEnd="48dp"
         android:layout_marginBottom="64dp"
         android:enabled="false"
         android:text="@string/login_button_login_page"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/sign_up_password_field"
-        app:layout_constraintVertical_bias="0.2" />
+        app:layout_constraintVertical_bias="0.2"
+        android:layout_marginLeft="48dp" />
 
     <ProgressBar
         android:id="@+id/loading"

app/src/main/res/layout/activity_sign_up.xml

@@ -4,13 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingTop="40dp"
     tools:context=".login.SignUpActivity">
 
     <ImageView
         android:id="@+id/sign_up_profile_picture"
         android:layout_width="80dp"
         android:layout_height="80dp"
-        android:background="@drawable/ic_baseline_account_circle_24"
+        android:background="@drawable/ic_baseline_account_circle_24_green"
         app:layout_constraintBottom_toTopOf="@+id/sign_up_email_field"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -24,6 +25,7 @@
         android:layout_marginEnd="24dp"
         android:hint="آدرس پست الکترونیکی"
         android:inputType="textEmailAddress"
+        android:imeOptions="actionNext"
         android:selectAllOnFocus="true"
         android:textDirection="rtl"
         app:layout_constraintEnd_toEndOf="parent"
@@ -36,17 +38,16 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="8dp"
         android:layout_marginEnd="24dp"
+        android:gravity="end"
         android:hint="@string/login_pass_field"
         android:imeOptions="actionDone"
         android:inputType="textPassword"
         android:selectAllOnFocus="true"
         android:textDirection="rtl"
-        android:gravity="end"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/sign_up_email_field"
+        app:layout_constraintTop_toBottomOf="@+id/sign_up_username"
         tools:targetApi="jelly_bean_mr1" />
 
     <EditText
@@ -56,7 +57,8 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
         android:hint="نام خانوادگی"
-        android:imeOptions="actionDone"
+        android:imeOptions="actionNext"
+        android:inputType="textEmailSubject"
         android:selectAllOnFocus="true"
         android:textDirection="rtl"
         app:layout_constraintEnd_toEndOf="parent"
@@ -71,12 +73,13 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
         android:hint="نام"
-        android:imeOptions="actionDone"
+        android:inputType="textEmailSubject"
+        android:imeOptions="actionNext"
         android:selectAllOnFocus="true"
         android:textDirection="rtl"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/sign_up_password_field"
+        app:layout_constraintTop_toBottomOf="@+id/sign_up_email_field"
         tools:targetApi="jelly_bean_mr1" />
 
     <EditText
@@ -86,7 +89,8 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
         android:hint="شناسه کاربری"
-        android:imeOptions="actionDone"
+        android:imeOptions="actionNext"
+        android:inputType="textEmailSubject"
         android:selectAllOnFocus="true"
         android:textDirection="rtl"
         app:layout_constraintEnd_toEndOf="parent"
@@ -101,14 +105,12 @@
         android:layout_height="wrap_content"
         android:layout_gravity="start"
         android:layout_marginStart="48dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="48dp"
         android:layout_marginBottom="64dp"
         android:enabled="true"
-        android:text="ثبت‌نام"
+        android:textSize="20sp"
+        android:text="ثبت نام"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintVertical_bias="0.2" />
+        android:layout_marginLeft="48dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -25,7 +25,7 @@
     <string name="landing_page_sign_up_button">ثبت‌نام</string>
     <string name="login_pass_field">رمز عبور</string>
     <string name="login_button_login_page">ورود</string>
-    <string name="login_page_username_field">شناسه‌کابری یا ایمیل</string>
+    <string name="login_page_username_field">نام کاربری یا ایمیل</string>
     <string name="get_data_from_server">در حال ارتباط با سرور</string>
 
 </resources>