Browse Source

[공통][Common] 버튼 radius 요청 반영

Hasemi 7 years ago
parent
commit
8c8bec1361

+ 1 - 0
app/src/main/res/drawable/black_button_disabled.xml

@@ -1,4 +1,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
   <solid android:color="#c5c5c5"/>
+  <corners android:radius="2dp"/>
 </shape>

+ 1 - 0
app/src/main/res/drawable/black_button_enabled.xml

@@ -1,4 +1,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
   <solid android:color="#000000"/>
+  <corners android:radius="2dp"/>
 </shape>

+ 1 - 0
app/src/main/res/drawable/input_black_border.xml

@@ -3,6 +3,7 @@
   <item>
     <shape android:shape="rectangle">
       <stroke android:color="#000000" android:width="1dp"/>
+      <corners android:radius="2dp"/>
     </shape>
   </item>
 </selector>

+ 6 - 0
app/src/main/res/drawable/rectangle_black_radius_2.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+  <solid android:color="@color/C000000"/>
+  <corners
+    android:radius="2dp"/>
+</shape>

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

@@ -56,7 +56,7 @@
     android:layout_marginStart="25dp"
     android:layout_marginEnd="25dp"
     android:layout_marginBottom="25dp"
-    android:background="@color/C000000"
+    android:background="@drawable/rectangle_black_radius_2"
     android:lineSpacingExtra="6sp"
     android:text="@string/retry"
     android:textColor="#ffffff"

+ 0 - 270
app/src/main/res/layout/setting_update_user_information.xml

@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:orientation="vertical">
-
-  <RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="25dp"
-    android:layout_marginEnd="25dp"
-    android:layout_marginBottom="31dp"
-    >
-
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentStart="true"
-      android:layout_centerVertical="true"
-      android:lineSpacingExtra="7sp"
-      android:text="@string/setting_user_information_default_title"
-      android:textColor="@color/C000000"
-      android:textSize="18sp"/>
-
-    <ProgressBar
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentTop="true"
-      android:layout_alignParentEnd="true"/>
-
-  </RelativeLayout>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="25dp"
-    android:layout_marginEnd="25dp"
-    android:orientation="vertical">
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="horizontal"
-      android:weightSum="10"
-      >
-
-      <EditText
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="9"
-        android:background="@null"
-        android:hint="@string/phone_identify_name"
-        android:textColorHint="@color/CC5C5C5"
-        />
-
-      <ImageView
-        android:layout_width="0dp"
-        android:layout_height="15dp"
-        android:layout_gravity="bottom"
-        android:layout_weight="1"
-        app:srcCompat="@drawable/ic_checkbtn_off"
-        />
-    </LinearLayout>
-  </LinearLayout>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="24dp"
-    android:layout_marginTop="10dp"
-    android:layout_marginEnd="25dp"
-    android:layout_marginRight="24dp"
-    android:orientation="vertical">
-
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="@color/CE5E5E5"/>
-
-  </LinearLayout>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="24dp"
-    android:layout_marginTop="12dp"
-    android:orientation="vertical">
-
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:lineSpacingExtra="4sp"
-      android:textColor="@color/CF12815"
-      android:textSize="11sp"
-      tools:text="@string/setting_update_information_name_validation"
-      />
-
-  </LinearLayout>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="25dp"
-    android:layout_marginTop="23dp"
-    android:layout_marginEnd="25dp"
-    android:orientation="vertical">
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="horizontal"
-      android:weightSum="10"
-      >
-
-      <EditText
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="9"
-        android:background="@null"
-        android:hint="@string/phone_identify_birth"
-        android:textColorHint="@color/CC5C5C5"
-        />
-
-      <ImageView
-        android:layout_width="0dp"
-        android:layout_height="15dp"
-        android:layout_gravity="bottom"
-        android:layout_weight="1"
-        app:srcCompat="@drawable/ic_checkbtn_off"
-        />
-    </LinearLayout>
-  </LinearLayout>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="24dp"
-    android:layout_marginTop="10dp"
-    android:layout_marginRight="24dp"
-    android:orientation="vertical">
-
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="@color/CE5E5E5"/>
-
-  </LinearLayout>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="24dp"
-    android:layout_marginTop="12dp"
-    android:orientation="vertical">
-
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:lineSpacingExtra="4sp"
-      android:textColor="@color/CF12815"
-      android:textSize="11sp"
-      tools:text="@string/setting_update_birth_date_validation"
-      />
-
-  </LinearLayout>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="25dp"
-    android:layout_marginEnd="25dp"
-    android:orientation="vertical">
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="horizontal"
-      android:weightSum="10"
-      >
-
-      <EditText
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="23dp"
-        android:layout_weight="9"
-        android:background="@null"
-        android:hint="@string/email_korean"
-        android:textColorHint="@color/CC5C5C5"
-        />
-
-      <ImageView
-        android:layout_width="0dp"
-        android:layout_height="15dp"
-        android:layout_gravity="bottom"
-        android:layout_weight="1"
-        app:srcCompat="@drawable/ic_checkbtn_off"
-        />
-    </LinearLayout>
-  </LinearLayout>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="24dp"
-    android:layout_marginTop="10dp"
-    android:layout_marginRight="24dp"
-    android:orientation="vertical">
-
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="@color/CE5E5E5"/>
-
-  </LinearLayout>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="24dp"
-    android:layout_marginTop="12dp"
-    android:orientation="vertical">
-
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:lineSpacingExtra="4sp"
-      android:textColor="@color/CF12815"
-      android:textSize="11sp"
-      tools:text="@string/setting_update_email_validation"
-      />
-
-  </LinearLayout>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginStart="25dp"
-    android:layout_marginEnd="25dp"
-    android:layout_marginBottom="25dp"
-    android:orientation="horizontal"
-    android:weightSum="4">
-
-    <Button
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_gravity="bottom"
-      android:layout_marginEnd="4dp"
-      android:layout_weight="2"
-      android:background="@drawable/input_black_border"
-      android:text="@string/cancel"
-      />
-
-    <Button
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_gravity="bottom"
-      android:layout_marginStart="4dp"
-      android:layout_weight="2"
-      android:background="@color/C000000"
-      android:lineSpacingExtra="6sp"
-      android:text="@string/update_success"
-      android:textColor="@color/CFFFFFF"
-      android:textSize="15sp"
-      />
-  </LinearLayout>
-
-</LinearLayout>

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

@@ -482,7 +482,7 @@
         android:layout_gravity="bottom"
         android:layout_marginStart="4dp"
         android:layout_weight="2"
-        android:background="@color/C000000"
+        android:background="@drawable/rectangle_black_radius_2"
         android:lineSpacingExtra="6sp"
         android:text="@string/user_quit_request"
         android:textColor="@color/CFFFFFF"

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

@@ -238,7 +238,7 @@
         android:layout_gravity="bottom"
         android:layout_marginStart="4dp"
         android:layout_weight="2"
-        android:background="@color/C000000"
+        android:background="@drawable/rectangle_black_radius_2"
         android:lineSpacingExtra="6sp"
         android:text="@string/quit"
         android:textColor="@color/CFFFFFF"

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

@@ -67,7 +67,7 @@
       android:layout_alignParentStart="true"
       android:layout_alignParentBottom="true"
       android:layout_gravity="bottom"
-      android:background="@color/C000000"
+      android:background="@drawable/rectangle_black_radius_2"
       android:text="@string/confirm"
       android:textColor="@color/CFFFFFF"
       android:textSize="15sp"/>