[공통][Common] 통합테스트 요청 사항 구현 중

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/pin/CustomPinView.java

@@ -10,7 +10,6 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -36,7 +35,7 @@ import kr.co.zumo.app.lifeplus.util.StringUtil;
 public class CustomPinView extends ConstraintLayout implements IPinContract.View {
 
   private ArrayList<Integer> numberList;
-  private ArrayList<Button> buttonList;
+  private ArrayList<TextView> buttonList;
   private ArrayList<ImageView> imageList;
   private String password;
   private String guideString = "";
@@ -46,7 +45,7 @@ public class CustomPinView extends ConstraintLayout implements IPinContract.View
   private TextView textGuide;
   private TextView textTitle;
   private TextView textReset;
-  private Button buttonShuffle;
+  private TextView buttonShuffle;
   private ImageButton buttonDelete;
   private ImageView imageClose;
   private View viewHelp;
@@ -130,8 +129,8 @@ public class CustomPinView extends ConstraintLayout implements IPinContract.View
    * IPinContract.View
    ***********************************/
 
-  private ArrayList<Button> createButtonListFromView(View view) {
-    ArrayList<Button> list = new ArrayList<>();
+  private ArrayList<TextView> createButtonListFromView(View view) {
+    ArrayList<TextView> list = new ArrayList<>();
     list.add(view.findViewById(R.id.button_0));
     list.add(view.findViewById(R.id.button_1));
     list.add(view.findViewById(R.id.button_2));
@@ -188,7 +187,7 @@ public class CustomPinView extends ConstraintLayout implements IPinContract.View
     int passwordSize = password.length();
 
     if (passwordSize < 4) {
-      password += ((Button) view).getText().toString().charAt(0);
+      password += ((TextView) view).getText().toString().charAt(0);
 
       updateImageAfterPinInput();
 
@@ -287,7 +286,7 @@ public class CustomPinView extends ConstraintLayout implements IPinContract.View
   private void setEnabledInternal(boolean enabled) {
     buttonDelete.setEnabled(enabled);
     buttonShuffle.setEnabled(enabled);
-    for (Button button : buttonList) {
+    for (TextView button : buttonList) {
       button.setEnabled(enabled);
     }
     for (ImageView imageView : imageList) {

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

@@ -194,21 +194,40 @@
         android:layout_weight="1"
         />
 
-      <Button
+      <TextView
         android:id="@+id/button_0"
-        style="@style/PinButton"
+        android:minHeight="34dp"
+        android:minWidth="58dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="11dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:lineSpacingExtra="10sp"
+        android:textColor="@color/C666666"
+        android:textSize="25sp"
         tools:text="2"
         />
 
+
       <Space
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="2"
         />
 
-      <Button
+      <TextView
         android:id="@+id/button_1"
-        style="@style/PinButton"
+        android:minHeight="34dp"
+        android:minWidth="58dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="11dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:lineSpacingExtra="10sp"
+        android:textColor="@color/C666666"
+        android:textSize="25sp"
         tools:text="2"
         />
 
@@ -218,9 +237,18 @@
         android:layout_weight="2"
         />
 
-      <Button
+      <TextView
         android:id="@+id/button_2"
-        style="@style/PinButton"
+        android:minHeight="34dp"
+        android:minWidth="58dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="11dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:lineSpacingExtra="10sp"
+        android:textColor="@color/C666666"
+        android:textSize="25sp"
         tools:text="2"
         />
 
@@ -245,9 +273,18 @@
         android:layout_weight="1"
         />
 
-      <Button
+      <TextView
         android:id="@+id/button_3"
-        style="@style/PinButton"
+        android:minHeight="34dp"
+        android:minWidth="58dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="11dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:lineSpacingExtra="10sp"
+        android:textColor="@color/C666666"
+        android:textSize="25sp"
         tools:text="2"
         />
 
@@ -257,9 +294,18 @@
         android:layout_weight="2"
         />
 
-      <Button
+      <TextView
         android:id="@+id/button_4"
-        style="@style/PinButton"
+        android:minHeight="34dp"
+        android:minWidth="58dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="11dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:lineSpacingExtra="10sp"
+        android:textColor="@color/C666666"
+        android:textSize="25sp"
         tools:text="2"
         />
 
@@ -269,9 +315,18 @@
         android:layout_weight="2"
         />
 
-      <Button
+      <TextView
         android:id="@+id/button_5"
-        style="@style/PinButton"
+        android:minHeight="34dp"
+        android:minWidth="58dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="11dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:lineSpacingExtra="10sp"
+        android:textColor="@color/C666666"
+        android:textSize="25sp"
         tools:text="2"
         />
 
@@ -296,21 +351,38 @@
         android:layout_weight="1"
         />
 
-      <Button
+      <TextView
         android:id="@+id/button_6"
-        style="@style/PinButton"
+        android:minHeight="34dp"
+        android:minWidth="58dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="11dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:lineSpacingExtra="10sp"
+        android:textColor="@color/C666666"
+        android:textSize="25sp"
         tools:text="2"
         />
-
       <Space
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="2"
         />
 
-      <Button
+      <TextView
         android:id="@+id/button_7"
-        style="@style/PinButton"
+        android:minHeight="34dp"
+        android:minWidth="58dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="11dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:lineSpacingExtra="10sp"
+        android:textColor="@color/C666666"
+        android:textSize="25sp"
         tools:text="2"
         />
 
@@ -320,9 +392,18 @@
         android:layout_weight="2"
         />
 
-      <Button
+      <TextView
         android:id="@+id/button_8"
-        style="@style/PinButton"
+        android:minHeight="34dp"
+        android:minWidth="58dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="11dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:lineSpacingExtra="10sp"
+        android:textColor="@color/C666666"
+        android:textSize="25sp"
         tools:text="2"
         />
 
@@ -347,21 +428,38 @@
         android:layout_weight="1"
         />
 
-      <Button
+      <TextView
         android:id="@+id/button_shuffle"
-        style="@style/PinButton"
+        android:minHeight="34dp"
+        android:minWidth="58dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="11dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:lineSpacingExtra="10sp"
+        android:textColor="@color/C666666"
+        android:textSize="14sp"
         android:text="@string/sign_up_shuffle"
-        android:textSize="14sp"/>
-
+        />
       <Space
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="2"
         />
 
-      <Button
+      <TextView
         android:id="@+id/button_9"
-        style="@style/PinButton"
+        android:minHeight="34dp"
+        android:minWidth="58dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="11dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:lineSpacingExtra="10sp"
+        android:textColor="@color/C666666"
+        android:textSize="25sp"
         tools:text="2"
         />
 

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

@@ -37,7 +37,7 @@
       <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="#333333"/>
+        android:background="@color/C666666"/>
 
     </LinearLayout>
 
@@ -55,7 +55,7 @@
         android:layout_marginBottom="5dp"
         android:gravity="end"
         android:lineSpacingExtra="7sp"
-        android:textColor="#666666"
+        android:textColor="@color/C999999"
         android:textSize="12sp"
         tools:text="@string/sign_up_completed_name"
         />
@@ -67,7 +67,7 @@
         android:layout_marginBottom="5dp"
         android:gravity="end"
         android:lineSpacingExtra="7sp"
-        android:textColor="#666666"
+        android:textColor="@color/C999999"
         android:textSize="12sp"
         tools:text="@string/sign_up_completed_gender"
         />
@@ -79,7 +79,7 @@
         android:layout_marginBottom="5dp"
         android:gravity="end"
         android:lineSpacingExtra="7sp"
-        android:textColor="#666666"
+        android:textColor="@color/C999999"
         android:textSize="12sp"
         tools:text="@string/sign_up_completed_birth_date"
         />
@@ -91,7 +91,7 @@
         android:layout_marginBottom="17dp"
         android:gravity="end"
         android:lineSpacingExtra="7sp"
-        android:textColor="#666666"
+        android:textColor="@color/C999999"
         android:textSize="12sp"
         tools:text="@string/sign_up_completed_phone_number"
         />