ClaytonWWilson/Listify
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/Listify.git synced 2026-03-10 18:55:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implemented Confirm Password and quantity fetching from shopping list v.1

Browse Source
This commit is contained in:
Aaron Sun
2020-10-08 21:30:08 -07:00
parent 7a210f5ac9
commit e7d2ec333a
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Listify/app/src/main/java/com/example/listify/ListPage.java
View File

@@ -89,7 +89,7 @@ public class ListPage extends AppCompatActivity {
pNames.add(item.getDescription()); pNames.add(item.getDescription());
pStores.add("Kroger"); pStores.add("Kroger");
pPrices.add(item.getPrice().toString()); pPrices.add(item.getPrice().toString());
pQuantity.add("1"); pQuantity.add(entry.getQuantity().toString());
pImages.add(R.drawable.placeholder); pImages.add(R.drawable.placeholder);
pListItemPair.add(entry); pListItemPair.add(entry);
} }

8
Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
View File

@@ -39,9 +39,17 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog
public void onClick(View v) { public void onClick(View v) {
EditText emailText = (EditText) findViewById(R.id.editTextTextEmailAddress); EditText emailText = (EditText) findViewById(R.id.editTextTextEmailAddress);
EditText passwordText = (EditText) findViewById(R.id.editTextTextPassword); EditText passwordText = (EditText) findViewById(R.id.editTextTextPassword);
EditText confirmPasswordText = (EditText) findViewById(R.id.editTextTextPassword2);
String email = emailText.getText().toString(); String email = emailText.getText().toString();
String password = passwordText.getText().toString(); String password = passwordText.getText().toString();
String confirmPassword = confirmPasswordText.getText().toString();
if(!password.equals(confirmPassword)) {
TextView invalidCred = findViewById(R.id.textView3);
invalidCred.setText("\"Confirm Password\" does not match \"Password\".");
return;
}
try { try {
am.startSignUp(email, password); am.startSignUp(email, password);

15
Listify/app/src/main/res/layout/activity_signup.xml
View File

@@ -14,7 +14,7 @@
android:text="Sign up" android:text="Sign up"
app:layout_constraintEnd_toStartOf="@+id/textView3" app:layout_constraintEnd_toStartOf="@+id/textView3"
app:layout_constraintStart_toStartOf="@+id/textView3" app:layout_constraintStart_toStartOf="@+id/textView3"
app:layout_constraintTop_toBottomOf="@+id/editTextTextPassword" /> app:layout_constraintTop_toBottomOf="@+id/editTextTextPassword2" />
<Button <Button
android:id="@+id/button1" android:id="@+id/button1"
@@ -27,27 +27,27 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<EditText <EditText
android:id="@+id/editTextTextPersonName" android:id="@+id/editTextTextPassword"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="23dp" android:layout_marginTop="23dp"
android:ems="10" android:ems="10"
android:hint="Username" android:hint="Password"
android:inputType="textPersonName" android:inputType="textPersonName"
app:layout_constraintStart_toStartOf="@+id/editTextTextEmailAddress" app:layout_constraintStart_toStartOf="@+id/editTextTextEmailAddress"
app:layout_constraintTop_toBottomOf="@+id/editTextTextEmailAddress" /> app:layout_constraintTop_toBottomOf="@+id/editTextTextEmailAddress" />
<EditText <EditText
android:id="@+id/editTextTextPassword" android:id="@+id/editTextTextPassword2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="1dp" android:layout_marginEnd="1dp"
android:layout_marginTop="26dp" android:layout_marginTop="26dp"
android:ems="10" android:ems="10"
android:hint="Password" android:hint="Confirm Password"
android:inputType="textPassword" android:inputType="textPassword"
app:layout_constraintEnd_toEndOf="@+id/editTextTextPersonName" app:layout_constraintEnd_toEndOf="@+id/editTextTextPassword"
app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName" /> app:layout_constraintTop_toBottomOf="@+id/editTextTextPassword" />
<EditText <EditText
android:id="@+id/editTextTextEmailAddress" android:id="@+id/editTextTextEmailAddress"
@@ -75,6 +75,7 @@
android:id="@+id/textView3" android:id="@+id/textView3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:text="" android:text=""
app:layout_constraintBottom_toTopOf="@+id/button2" app:layout_constraintBottom_toTopOf="@+id/button2"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"