Skip to content

Commit 07f9a2a

Browse files
AlexLavoie42AlexLavoie42
committed
Final Polish
1 parent 9b70745 commit 07f9a2a

6 files changed

+51
-24
lines changed

‎app/src/main/java/ca/payguard/MainActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* for PayGuard MVP.
3333
*/
3434
public class MainActivity extends AppCompatActivity {
35-
private final boolean DEBUG_NO_PIN = true;
35+
private final boolean DEBUG_NO_PIN = false;
3636

3737
private static TableSet tableGui;
3838
public static ArrayList<Button> tblBtns = new ArrayList<>();

‎app/src/main/res/layout/activity_edit_payment.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@
5454
android:layout_width="wrap_content"
5555
android:layout_height="wrap_content"
5656
android:ems="10"
57+
android:gravity="center_horizontal"
5758
android:text="@string/payment_type"
59+
android:textSize="24sp"
60+
android:textStyle="bold"
5861
app:layout_constraintBottom_toBottomOf="parent"
5962
app:layout_constraintEnd_toEndOf="parent"
6063
app:layout_constraintStart_toStartOf="parent"
@@ -63,8 +66,8 @@
6366

6467
<TextView
6568
android:id="@+id/currentAmount"
66-
android:layout_width="wrap_content"
67-
android:layout_height="wrap_content"
69+
android:layout_width="309dp"
70+
android:layout_height="24dp"
6871
android:ems="10"
6972
android:text="@string/current_auth"
7073
app:layout_constraintStart_toStartOf="@+id/paymentType"

‎app/src/main/res/layout/activity_email_confirmation.xml

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
android:layout_width="wrap_content"
1212
android:layout_height="wrap_content"
1313
android:text="@string/confirmation_message"
14+
android:textSize="18sp"
15+
android:textStyle="bold"
1416
app:layout_constraintBottom_toBottomOf="parent"
1517
app:layout_constraintEnd_toEndOf="parent"
1618
app:layout_constraintStart_toStartOf="parent"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
android:layout_height="40dp"
1313
android:ems="10"
1414
android:hint="Email"
15-
android:inputType="textPersonName"
15+
android:inputType="textEmailAddress"
1616
app:layout_constraintBottom_toBottomOf="parent"
1717
app:layout_constraintEnd_toEndOf="parent"
1818
app:layout_constraintHorizontal_bias="0.498"

‎app/src/main/res/layout/activity_manual_card_input.xml

+20-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
android:id="@+id/exp_year"
2323
android:layout_width="116dp"
2424
android:layout_height="27dp"
25+
android:layout_marginEnd="108dp"
26+
android:layout_marginRight="108dp"
2527
android:ems="10"
2628
android:hint="@string/expYear"
2729
android:inputType="number"
@@ -32,6 +34,8 @@
3234
android:id="@+id/exp_month"
3335
android:layout_width="116dp"
3436
android:layout_height="27dp"
37+
android:layout_marginEnd="24dp"
38+
android:layout_marginRight="24dp"
3539
android:ems="10"
3640
android:hint="@string/expMonth"
3741
android:inputType="number"
@@ -42,9 +46,24 @@
4246
android:id="@+id/next"
4347
android:layout_width="473dp"
4448
android:layout_height="40dp"
49+
android:layout_marginTop="24dp"
4550
android:onClick="onNext"
4651
android:text="@string/manualPayButton"
47-
app:layout_constraintEnd_toEndOf="@+id/exp_year"
52+
app:layout_constraintEnd_toEndOf="@+id/PAN"
4853
app:layout_constraintTop_toBottomOf="@+id/exp_month" />
4954

55+
<TextView
56+
android:id="@+id/textView"
57+
android:layout_width="wrap_content"
58+
android:layout_height="wrap_content"
59+
android:text="Enter Credit Card Info"
60+
android:textSize="24sp"
61+
android:textStyle="bold"
62+
app:layout_constraintBottom_toTopOf="@+id/PAN"
63+
app:layout_constraintEnd_toEndOf="parent"
64+
app:layout_constraintHorizontal_bias="0.498"
65+
app:layout_constraintStart_toStartOf="parent"
66+
app:layout_constraintTop_toTopOf="parent"
67+
app:layout_constraintVertical_bias="0.923" />
68+
5069
</androidx.constraintlayout.widget.ConstraintLayout>

‎app/src/main/res/layout/activity_payment.xml

+22-19
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,28 @@
7171
</androidx.constraintlayout.widget.ConstraintLayout>
7272

7373
<TextView
74-
android:id="@+id/paymentType"
75-
android:layout_width="wrap_content"
76-
android:layout_height="wrap_content"
77-
android:ems="10"
78-
android:text="@string/payment_type"
79-
app:layout_constraintBottom_toBottomOf="parent"
80-
app:layout_constraintEnd_toEndOf="parent"
81-
app:layout_constraintStart_toStartOf="parent"
82-
app:layout_constraintTop_toTopOf="parent"
83-
app:layout_constraintVertical_bias="0.247" />
84-
85-
<TextView
86-
android:id="@+id/currentAmount"
87-
android:layout_width="wrap_content"
88-
android:layout_height="wrap_content"
89-
android:ems="10"
90-
android:text="@string/current_auth"
91-
app:layout_constraintStart_toStartOf="@+id/paymentType"
92-
app:layout_constraintTop_toBottomOf="@+id/paymentType" />
74+
android:id="@+id/paymentType"
75+
android:layout_width="wrap_content"
76+
android:layout_height="wrap_content"
77+
android:ems="10"
78+
android:gravity="center_horizontal"
79+
android:text="@string/payment_type"
80+
android:textSize="24sp"
81+
android:textStyle="bold"
82+
app:layout_constraintBottom_toBottomOf="parent"
83+
app:layout_constraintEnd_toEndOf="parent"
84+
app:layout_constraintStart_toStartOf="parent"
85+
app:layout_constraintTop_toTopOf="parent"
86+
app:layout_constraintVertical_bias="0.247" />
87+
88+
<TextView
89+
android:id="@+id/currentAmount"
90+
android:layout_width="309dp"
91+
android:layout_height="24dp"
92+
android:ems="10"
93+
android:text="@string/current_auth"
94+
app:layout_constraintStart_toStartOf="@+id/paymentType"
95+
app:layout_constraintTop_toBottomOf="@+id/paymentType" />
9396

9497
<ImageView
9598
android:id="@+id/logo"

0 commit comments

Comments
 (0)