SCCapstone · jmfalzarano · Apr 17, 2022 · Apr 17, 2022 · Apr 17, 2022 · Apr 17, 2022
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/edu/sc/purplelimited/#Activity.java b/app/src/main/java/edu/sc/purplelimited/#Activity.java
@@ -1,7 +1,6 @@
 package edu.sc.purplelimited;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
@@ -16,12 +15,8 @@
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.database.DataSnapshot;
-import com.google.firebase.database.DatabaseError;
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
-import com.google.firebase.database.ValueEventListener;
-
-import java.util.Map;
 
 public class LoginActivity extends AppCompatActivity {
 
@@ -33,16 +28,11 @@ public class LoginActivity extends AppCompatActivity {
     private CheckBox RememberMe;
     private int cnt = 3; //base amount of login attempts
 
-    static String userName = "admin";
-    String userPassword = "admin"; //these are hard-coded for testing
+    static String userName;
+    String userPassword;
 
     boolean isValid = false;
 
-    public UserAccount userAccount;
-
-    SharedPreferences sharedPreferences;
-    SharedPreferences.Editor sharedPreferencesEditor;
-
     FirebaseDatabase database;
     DatabaseReference usersReference;
 
@@ -57,33 +47,8 @@ protected void onCreate(Bundle savedInstanceState) {
         AttemptsInfo = findViewById(R.id.noAttempts);
         Login = findViewById(R.id.loginbutton);
         Register = findViewById(R.id.registerbutton);
-        RememberMe = findViewById(R.id.RememberMe);
-
-        userAccount = new UserAccount();
-
-        sharedPreferences = getApplicationContext().getSharedPreferences("UserAccount", MODE_PRIVATE);
-        sharedPreferencesEditor = sharedPreferences.edit();
-
-        // Check to see if the shared preferences file exists
-        if(sharedPreferences != null) {
-
-            Map<String, ?> preferencesMap = sharedPreferences.getAll();
-
-            if(preferencesMap.size() != 0) {
-                userAccount.loadAccount(preferencesMap);
-            }
-
-            String savedUsername = sharedPreferences.getString("SavedUsername", "");
-            String savedPassword = sharedPreferences.getString("SavedPassword", "");
 
-            if(sharedPreferences.getBoolean("Checkbox", false)) {
-                Name.setText(savedUsername);
-                Password.setText(savedPassword);
-                RememberMe.setChecked(true);
-            }
-        }
-
-            // When login button is clicked
+        // When login button is clicked
         Login.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -154,20 +119,7 @@ public void onClick(View view) {
             }
         });
 
-        // If the 'Remember Me' checkbox is checked..
-       RememberMe.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                sharedPreferencesEditor.putBoolean("RememberMeCheckbox", RememberMe.isChecked());
-                sharedPreferencesEditor.apply();
-            }
-        });
-    }
-
-    private boolean validate(String userName, String userPassword) {
-        return userAccount.checkAccount(userName, userPassword); // moved validate from here to the UserAccount.java
     }
-
     public static String getCurrentUserName() {
         return userName;
     }

diff --git a/app/src/main/java/edu/sc/purplelimited/RegistrationActivity.java b/app/src/main/java/edu/sc/purplelimited/RegistrationActivity.java
@@ -1,13 +1,11 @@
 package edu.sc.purplelimited;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
-
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -24,13 +22,9 @@ public class RegistrationActivity extends AppCompatActivity {
     private EditText RegistrationPassword;
     private EditText RegistrationPassword2;
     private Button Register2;
+    private Button Back;
     private static FirebaseDatabase database;
     private static DatabaseReference usersReference;
-    /*
-    public UserAccount userAccount;
-    SharedPreferences sharedPreferences;
-    SharedPreferences.Editor sharedPreferencesEditor;
-         */
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -42,13 +36,7 @@ protected void onCreate(Bundle savedInstanceState) {
         RegistrationPassword = findViewById(R.id.RegistrationPassword);
         RegistrationPassword2 = findViewById(R.id.RegistrationPassword2);
         Register2 = findViewById(R.id.logoutbutton);
-
-        /*
-        userAccount = new UserAccount();
-
-        sharedPreferences = getApplicationContext().getSharedPreferences("UserAccount", MODE_PRIVATE);
-        sharedPreferencesEditor = sharedPreferences.edit();
-        */
+        Back = findViewById(R.id.backbutton);
 
         // Instantiate Firebase database instance and users reference
         database = FirebaseDatabase.getInstance();
@@ -90,6 +78,14 @@ public void onCancelled(@NonNull DatabaseError error) {/*empty*/}
                 }
             }
         });
+        // Clicking the Back Button
+        Back.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                // Go to Login Activity
+                startActivity(new Intent(RegistrationActivity.this, LoginActivity.class));
+            }
+        });
     }
 
     boolean validate(String name, String password, String password2)

diff --git a/app/src/main/java/edu/sc/purplelimited/UserAccount.java b/app/src/main/java/edu/sc/purplelimited/UserAccount.java
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -60,7 +60,9 @@
         android:shadowDy="2"
         android:shadowRadius="5"
         android:textColor="@color/white"
-        android:textColorHint="@color/white" />
+        android:textColorHint="@color/white"
+        android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^*()-+=_"
+        />
 
     <EditText
         android:id="@+id/userPassword"
@@ -81,7 +83,8 @@
         android:shadowDy="2"
         android:shadowRadius="5"
         android:textColor="@color/white"
-        android:textColorHint="@color/white" />
+        android:textColorHint="@color/white"
+        android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^*()-+=_"/>
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/#button"
@@ -115,16 +118,9 @@
         android:shadowDy="2"
         android:shadowRadius="5"
         android:text="Number of attempts remaining: 3"
+        android:textStyle="bold"
         android:textColor="@color/white" />
 
-    <CheckBox
-        android:id="@+id/RememberMe"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/userPassword"
-        android:layout_marginTop="24dp"
-        android:layout_marginEnd="10dp"
-        android:text="Remember Me" />
 
 
-</RelativeLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_registration.xml b/app/src/main/res/layout/activity_registration.xml
@@ -30,17 +30,19 @@
 
     <TextView
         android:id="@+id/PassText"
-        android:layout_width="313dp"
-        android:layout_height="20dp"
+        android:layout_width="407dp"
+        android:layout_height="56dp"
         android:layout_below="@id/RegistrationPassword2"
         android:layout_marginStart="49dp"
-        android:layout_marginTop="200dp"
         android:layout_marginEnd="49dp"
-        android:text="Passwords should be a minimum of 8 characters long"
-        app:layout_constraintBottom_toTopOf="@+id/RegistrationPassword2"
+        android:padding="20dp"
+        android:shadowColor="@color/black"
+        android:text="Passwords should be a minimum of 8 characters"
+        android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.351"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/RegistrationPassword" />
+        app:layout_constraintTop_toBottomOf="@+id/RegistrationPassword2" />
 
     <EditText
         android:id="@+id/RegistrationName"
@@ -61,7 +63,8 @@
         app:layout_constraintBottom_toTopOf="@+id/RegistrationPassword"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/TopText" />
+        app:layout_constraintTop_toBottomOf="@+id/TopText"
+        android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^*()-+=_"/>
 
     <EditText
         android:id="@+id/RegistrationPassword"
@@ -83,7 +86,8 @@
         app:layout_constraintBottom_toTopOf="@+id/RegistrationPassword2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/RegistrationName" />
+        app:layout_constraintTop_toBottomOf="@+id/RegistrationName"
+        android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^*()-+=_"/>
 
     <EditText
         android:id="@+id/RegistrationPassword2"
@@ -105,7 +109,8 @@
         app:layout_constraintBottom_toTopOf="@+id/logoutbutton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/RegistrationPassword" />
+        app:layout_constraintTop_toBottomOf="@+id/RegistrationPassword"
+        android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^*()-+=_"/>
 
     <Button
         android:id="@+id/logoutbutton"
@@ -128,4 +133,23 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/RegistrationPassword2" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <Button
+        android:id="@+id/backbutton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/logoutbutton"
+        android:layout_centerHorizontal="true"
+        android:backgroundTint="@color/design_default_color_secondary"
+        android:shadowColor="@color/black"
+        android:shadowDx="2"
+        android:shadowDy="2"
+        android:shadowRadius="5"
+        android:text="Back"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/RegistrationPassword2"
+        app:layout_constraintVertical_bias="0.415" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>