Prechádzať zdrojové kódy

[회원가입][Bug] 휴대폰 인증 Bug 수정

Hasemi 7 rokov pred
rodič
commit
73c216b4fe
29 zmenil súbory, kde vykonal 46 pridanie a 34 odobranie
  1. 2 2
      app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/ClearEditText.java
  2. 5 0
      app/src/main/res/color/radio_color_selector.xml
  3. BIN
      app/src/main/res/drawable-hdpi/checkbox_off.png
  4. BIN
      app/src/main/res/drawable-hdpi/checkbox_on.png
  5. BIN
      app/src/main/res/drawable-hdpi/icon_input_delete.png
  6. BIN
      app/src/main/res/drawable-mdpi/checkbox_off.png
  7. BIN
      app/src/main/res/drawable-mdpi/checkbox_on.png
  8. BIN
      app/src/main/res/drawable-mdpi/icon_input_delete.png
  9. BIN
      app/src/main/res/drawable-xhdpi/checkbox_off.png
  10. BIN
      app/src/main/res/drawable-xhdpi/checkbox_on.png
  11. BIN
      app/src/main/res/drawable-xhdpi/icon_input_delete.png
  12. BIN
      app/src/main/res/drawable-xxhdpi/checkbox_off.png
  13. BIN
      app/src/main/res/drawable-xxhdpi/checkbox_on.png
  14. BIN
      app/src/main/res/drawable-xxhdpi/icon_input_delete.png
  15. BIN
      app/src/main/res/drawable-xxxhdpi/checkbox_off.png
  16. BIN
      app/src/main/res/drawable-xxxhdpi/checkbox_on.png
  17. BIN
      app/src/main/res/drawable-xxxhdpi/icon_input_delete.png
  18. BIN
      app/src/main/res/drawable/cancel.png
  19. BIN
      app/src/main/res/drawable/icon_arcordion_open_arrow.png
  20. BIN
      app/src/main/res/drawable/icon_input_delete.png
  21. BIN
      app/src/main/res/drawable/radio_check.png
  22. 1 1
      app/src/main/res/drawable/radio_selector.xml
  23. 1 1
      app/src/main/res/layout/email_inquiry.xml
  24. 36 29
      app/src/main/res/layout/sign_up_phone_authorization_view.xml
  25. BIN
      app/src/main/res/mipmap-xxxhdpi/icon_coin.png
  26. BIN
      app/src/main/res/mipmap-xxxhdpi/icon_input_clock.png
  27. BIN
      app/src/main/res/mipmap-xxxhdpi/icon_keypad_delete.png
  28. BIN
      app/src/main/res/mipmap-xxxhdpi/icon_process_welcome.png
  29. 1 1
      app/src/main/res/values/styles.xml

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/ClearEditText.java

@@ -61,9 +61,9 @@ public class ClearEditText extends AppCompatEditText implements TextWatcher, Vie
    * clear icon setting 및 eventListener setting
    */
   public void init() {
-    Drawable tempDrawable = ContextCompat.getDrawable(getContext(), R.drawable.cancel);
+    Drawable tempDrawable = ContextCompat.getDrawable(getContext(), R.drawable.icon_input_delete);
     clearDrawable = DrawableCompat.wrap(tempDrawable);
-    DrawableCompat.setTintList(clearDrawable, getHintTextColors());
+    //DrawableCompat.setTintList(clearDrawable, getHintTextColors());
     clearDrawable.setBounds(0, 0, clearDrawable.getIntrinsicWidth(), clearDrawable.getIntrinsicHeight());
     setClearIconVisible(false);
 

+ 5 - 0
app/src/main/res/color/radio_color_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="#888888" android:state_checked="false" />
+  <item android:color="#000000" android:state_checked="true"/>
+</selector>

BIN
app/src/main/res/drawable-hdpi/checkbox_off.png


BIN
app/src/main/res/drawable-hdpi/checkbox_on.png


BIN
app/src/main/res/drawable-hdpi/icon_input_delete.png


BIN
app/src/main/res/drawable-mdpi/checkbox_off.png


BIN
app/src/main/res/drawable-mdpi/checkbox_on.png


BIN
app/src/main/res/drawable-mdpi/icon_input_delete.png


BIN
app/src/main/res/drawable-xhdpi/checkbox_off.png


BIN
app/src/main/res/drawable-xhdpi/checkbox_on.png


BIN
app/src/main/res/drawable-xhdpi/icon_input_delete.png


BIN
app/src/main/res/drawable-xxhdpi/checkbox_off.png


BIN
app/src/main/res/drawable-xxhdpi/checkbox_on.png


BIN
app/src/main/res/drawable-xxhdpi/icon_input_delete.png


BIN
app/src/main/res/drawable-xxxhdpi/checkbox_off.png


BIN
app/src/main/res/drawable-xxxhdpi/checkbox_on.png


BIN
app/src/main/res/drawable-xxxhdpi/icon_input_delete.png


BIN
app/src/main/res/drawable/cancel.png


BIN
app/src/main/res/drawable/icon_arcordion_open_arrow.png


BIN
app/src/main/res/drawable/icon_input_delete.png


BIN
app/src/main/res/drawable/radio_check.png


+ 1 - 1
app/src/main/res/drawable/radio_selector.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/radio_uncheck" android:state_checked="false"/>
+  <item android:drawable="@drawable/radio_uncheck" android:state_checked="false" />
   <item android:drawable="@drawable/radio_check" android:state_checked="true"/>
 </selector>

+ 1 - 1
app/src/main/res/layout/email_inquiry.xml

@@ -31,7 +31,7 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_weight="2"
-      android:src="@drawable/cancel"
+      android:src="@drawable/icon_input_delete"
       />
     <TextView
       android:layout_width="0dp"

+ 36 - 29
app/src/main/res/layout/sign_up_phone_authorization_view.xml

@@ -46,8 +46,11 @@
         android:layout_weight="3"
         android:background="@null"
         android:hint="@string/phone_identify_name_hint"
+        android:inputType="text"
         android:lineSpacingExtra="5.5sp"
-        android:textColor="#c5c5c5"
+        android:maxLength="30"
+        android:textColor="#000000"
+        android:textColorHint="#c5c5c5"
         android:textSize="14sp"
         />
 
@@ -69,7 +72,8 @@
           android:drawablePadding="5dp"
           android:gravity="center"
           android:padding="8dp"
-          android:text="@string/phone_identify_local"/>
+          android:text="@string/phone_identify_local"
+          android:textColor="@color/radio_color_selector"/>
 
         <RadioButton
           android:id="@+id/radio_button_foreign"
@@ -81,7 +85,8 @@
           android:drawablePadding="5dp"
           android:gravity="center"
           android:padding="8dp"
-          android:text="@string/phone_identify_foreign"/>
+          android:text="@string/phone_identify_foreign"
+          android:textColor="@color/radio_color_selector"/>
       </RadioGroup>
 
     </LinearLayout>
@@ -134,8 +139,11 @@
         android:layout_weight="2"
         android:background="@null"
         android:hint="@string/phone_identify_birth_hint"
+        android:inputType="number"
         android:lineSpacingExtra="5.5sp"
-        android:textColor="#c5c5c5"
+        android:maxLength="8"
+        android:textColor="#000000"
+        android:textColorHint="#c5c5c5"
         android:textSize="14sp"
         />
 
@@ -158,7 +166,8 @@
           android:drawablePadding="5dp"
           android:gravity="center"
           android:padding="8dp"
-          android:text="@string/phone_identify_male"/>
+          android:text="@string/phone_identify_male"
+          android:textColor="@color/radio_color_selector"/>
 
         <RadioButton
           android:id="@+id/radio_button_female"
@@ -170,7 +179,8 @@
           android:drawablePadding="5dp"
           android:gravity="center"
           android:padding="8dp"
-          android:text="@string/phone_identify_female"/>
+          android:text="@string/phone_identify_female"
+          android:textColor="@color/radio_color_selector"/>
       </RadioGroup>
     </LinearLayout>
 
@@ -439,8 +449,11 @@
         android:layout_weight="3"
         android:background="@null"
         android:hint="@string/phone_identify_phone_hint"
+        android:inputType="number"
         android:lineSpacingExtra="5.5sp"
-        android:textColor="#c5c5c5"
+        android:maxLength="8"
+        android:textColor="#000000"
+        android:textColorHint="#c5c5c5"
         android:textSize="14sp"
         />
 
@@ -504,30 +517,35 @@
         android:layout_height="wrap_content"
         android:layout_weight="6"
         android:background="@null"
+        android:hint="@string/phone_identify_six_characters"
+        android:inputType="number"
         android:lineSpacingExtra="5.5sp"
-        android:text="@string/phone_identify_six_characters"
-        android:textColor="#c5c5c5"
+        android:maxLength="6"
+        android:textColor="#000000"
+        android:textColorHint="#c5c5c5"
         android:textSize="14sp"/>
 
       <LinearLayout
         android:id="@+id/phone_identify_layout"
-        android:orientation="horizontal"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:orientation="horizontal">
 
         <ImageView
-          android:layout_width="0dp"
-          android:layout_height="15dp"
+          android:layout_width="13dp"
+          android:layout_height="13dp"
           android:layout_gravity="center"
-          android:layout_weight="1"
+          android:layout_marginLeft="8.8dp"
+          android:layout_marginRight="5.3dp"
           android:src="@drawable/icon_input_clock"
           />
 
         <TextView
           android:id="@+id/text_view_phone_identify_time"
-          android:layout_width="0dp"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:layout_weight="1"
+          android:layout_marginRight="12dp"
           android:lineSpacingExtra="5.5sp"
           android:textColor="#999999"
           android:textSize="14sp"
@@ -536,14 +554,13 @@
 
         <TextView
           android:id="@+id/button_phone_identify_time_expansion"
-          android:layout_width="0dp"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:layout_weight="2"
           android:gravity="end"
           android:lineSpacingExtra="3.5sp"
+          android:text="@string/phone_identify_time_delay"
           android:textColor="@color/button_state_color"
           android:textSize="12sp"
-          android:text="@string/phone_identify_time_delay"
           />
       </LinearLayout>
     </LinearLayout>
@@ -561,16 +578,6 @@
         android:layout_height="1dp"
         android:background="#e5e5e5"/>
 
-    </LinearLayout>
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="67dp"
-      android:layout_marginLeft="24.5dp"
-      android:layout_marginRight="24.5dp"
-      android:layout_marginTop="7dp">
-
       <TextView
         android:id="@+id/text_authorized_number_validation"
         android:layout_width="wrap_content"

BIN
app/src/main/res/mipmap-xxxhdpi/icon_coin.png


BIN
app/src/main/res/mipmap-xxxhdpi/icon_input_clock.png


BIN
app/src/main/res/mipmap-xxxhdpi/icon_keypad_delete.png


BIN
app/src/main/res/mipmap-xxxhdpi/icon_process_welcome.png


+ 1 - 1
app/src/main/res/values/styles.xml

@@ -30,7 +30,7 @@
     <item name="actionBarSize">45dp</item>
     <item name="colorPrimary">@color/white</item>
     <item name="colorPrimaryDark">@color/black</item>
-    <item name="colorAccent">@color/white</item>
+    <item name="colorAccent">@color/black</item>
   </style>
 
   <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>