Home Verkennen Help
Registreren Inloggen
juney
/
FindCall-SA
Volgen 1
Ster 0
Vork 0
Bestanden Kwesties 0 Pull-aanvragen 0 Wiki
Bladeren bron

디자인 수정 작업

dwkim 9 maanden geleden
bovenliggende
b2e37b170c
commit
107b311417
11 gewijzigde bestanden met toevoegingen van 326 en 178 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 20 0
      app/src/main/res/drawable/border_stroke_bottom_e9f0e8.xml
  2. 4 4
      app/src/main/res/drawable/btn_round_d1dfce.xml
  3. 25 13
      app/src/main/res/layout/act_ask_list.xml
  4. 13 9
      app/src/main/res/layout/act_main.xml
  5. 196 114
      app/src/main/res/layout/act_member_join.xml
  6. 2 2
      app/src/main/res/layout/fmt_my_qrcode.xml
  7. 14 7
      app/src/main/res/layout/item_call_history.xml
  8. 26 19
      app/src/main/res/layout/item_exam.xml
  9. 20 10
      app/src/main/res/layout/item_my_qrcode.xml
  10. 2 0
      app/src/main/res/values/colors.xml
  11. 4 0
      app/src/main/res/values/strings.xml

+ 20 - 0
app/src/main/res/drawable/border_stroke_bottom_e9f0e8.xml
Bestand weergeven 

@@ -0,0 +1,20 @@
1 
+<?xml version="1.0" encoding="utf-8"?>
2 
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 
+    <item>
4 
+        <shape android:shape="rectangle">
5 
+            <solid android:color="@color/color_e9f0e8" />
6 
+        </shape>
7 
+    </item>
8 
+
9 
+    <item android:left="-7dp" android:top="-7dp" android:right="-7dp">
10 
+        <shape android:shape="rectangle">
11 
+            <padding
12 
+                android:bottom="1dp"
13 
+                android:left="1dp"
14 
+                android:right="1dp"
15 
+                android:top="1dp" />
16 
+            <corners android:radius="4dp" />
17 
+            <stroke android:width="2dp" android:color="@color/color_aec0a8" />
18 
+        </shape>
19 
+    </item>
20 
+</layer-list>

+ 4 - 4
app/src/main/res/drawable/btn_round_d1dfce.xml
Bestand weergeven 

@@ -3,8 +3,8 @@
3 3 
         android:shape="rectangle">
4 4 
     <solid android:color="@color/color_d1dfce" />
5 5 
     <corners
6 
-            android:bottomRightRadius="30dp"
7 
-            android:bottomLeftRadius="30dp"
8 
-            android:topLeftRadius="30dp"
9 
-            android:topRightRadius="30dp" />
6 
+            android:bottomRightRadius="20dp"
7 
+            android:bottomLeftRadius="20dp"
8 
+            android:topLeftRadius="20dp"
9 
+            android:topRightRadius="20dp" />
10 10 
 </shape>

+ 25 - 13
app/src/main/res/layout/act_ask_list.xml
Bestand weergeven 

@@ -56,20 +56,24 @@
56 56 
                 android:layout_width="match_parent"
57 57 
                 android:layout_height="wrap_content"
58 58 
                 android:orientation="horizontal"
59 
-                android:layout_marginTop="56dp"
60 
-                android:background="@drawable/border_stroke_bottom_black">
59 
+                android:layout_marginTop="30dp"
60 
+                >
61 61 
                 <androidx.appcompat.widget.AppCompatTextView
62 62 
                     android:id="@+id/tvAlarmInterval"
63 63 
                     android:layout_width="wrap_content"
64 
-                    android:layout_height="wrap_content"
64 
+                    android:layout_height="match_parent"
65 
+                    android:gravity="center"
66 
+                    android:textSize="16dp"
65 67 
                     android:text="이메일"
66 68 
                     android:textStyle="bold"/>
67 69 
                 <androidx.appcompat.widget.AppCompatEditText
68 70 
                     android:id="@+id/etEmail"
69 71 
                     android:layout_width="match_parent"
70 72 
                     android:layout_height="32dp"
73 
+                    android:layout_marginLeft="10dp"
71 74 
                     android:layout_gravity="center"
72 
-                    android:background="@null"
75 
+                    android:textSize="16dp"
76 
+                    android:background="@drawable/border_stroke_bottom_black"
73 77 
                     android:text="@={viewModel.askEmail}"
74 78 
                     android:onTextChanged="@{(text, start, before, count) -> viewModel.onTextChanged(1, text)}"
75 79 
                     android:contentDescription="@string/lbl_no_image" />
 
@@ -80,33 +84,39 @@
80 84 
                 android:layout_height="wrap_content"
81 85 
                 android:orientation="horizontal"
82 86 
                 android:layout_marginTop="18dp"
83 
-                android:background="@drawable/border_stroke_bottom_black">
87 
+                >
84 88 
                 <androidx.appcompat.widget.AppCompatTextView
85 89 
                     android:id="@+id/tvSubject"
86 90 
                     android:layout_width="wrap_content"
87 
-                    android:layout_height="wrap_content"
91 
+                    android:layout_height="match_parent"
92 
+                    android:gravity="center"
93 
+                    android:textSize="16dp"
88 94 
                     android:text="제목"
89 95 
                     android:textStyle="bold" />
90 96 
                 <androidx.appcompat.widget.AppCompatEditText
91 97 
                     android:id="@+id/etSubject"
92 98 
                     android:layout_width="match_parent"
93 99 
                     android:layout_height="32dp"
100 
+                    android:layout_marginLeft="24dp"
94 101 
                     android:layout_gravity="center"
95 
-                    android:background="@null"
102 
+                    android:textSize="16dp"
103 
+                    android:background="@drawable/border_stroke_bottom_black"
96 104 
                     android:text="@={viewModel.askSubject}"
97 105 
                     android:contentDescription="@string/lbl_no_image" />
98 106 
             </LinearLayout>
99 107
100 108 
             <LinearLayout
101 109 
                 android:layout_width="match_parent"
102 
-                android:layout_height="wrap_content"
110 
+                android:layout_height="match_parent"
103 111 
                 android:orientation="vertical"
104 112 
                 android:layout_marginTop="18dp"
105 
-                android:background="@drawable/border_stroke_black">
113 
+                android:layout_marginBottom="10dp"
114 
+                android:background="@null">
106 115 
                 <androidx.appcompat.widget.AppCompatTextView
107 116 
                     android:id="@+id/tvContent"
108 117 
                     android:layout_width="match_parent"
109 118 
                     android:layout_height="wrap_content"
119 
+                    android:textSize="16dp"
110 120 
                     android:background="@drawable/border_stroke_bottom_black"
111 121 
                     android:text="내용"
112 122 
                     android:textStyle="bold" />
 
@@ -114,13 +124,15 @@
114 124 
                 <androidx.appcompat.widget.AppCompatEditText
115 125 
                     android:id="@+id/etContent"
116 126 
                     android:layout_width="match_parent"
117 
-                    android:layout_height="wrap_content"
118 
-                    android:layout_marginTop="16dp"
127 
+                    android:layout_height="match_parent"
128 
+                    android:layout_marginTop="5dp"
129 
+                    android:background="@drawable/border_stroke_539e39"
130 
+                    android:gravity="top|left"
119 131 
                     android:inputType="text|textMultiLine"
120 
-                    android:scrollbars="vertical"
121 132 
                     android:lines="25"
133 
+                    android:scrollbars="vertical"
122 134 
                     android:text="@={viewModel.askDesc}"
123 
-                    android:gravity="top|left"/>
135 
+                    android:textSize="16dp" />
124 136 
             </LinearLayout>
125 137
126 138 
         </LinearLayout>

+ 13 - 9
app/src/main/res/layout/act_main.xml
Bestand weergeven 

@@ -103,12 +103,13 @@
103 103 
                 android:layout_width="wrap_content"
104 104 
                 android:layout_height="wrap_content"
105 105 
                 android:orientation="horizontal"
106 
-                android:gravity="center">
106 
+                android:gravity="center"
107 
+                android:padding="2.5dp">
107 108 
                 <androidx.appcompat.widget.AppCompatImageView
108 109 
                     android:id="@+id/fmbSet"
109 110 
                     android:layout_width="74dp"
110 111 
                     android:layout_height="74dp"
111 
-                    android:padding="5dp"
112 
+                    android:layout_margin="3dp"
112 113 
                     android:contentDescription="@string/lbl_no_image"
113 114 
                     android:background="@{viewModel.btnFloatingSetEnable ? @drawable/ico_set : @drawable/ico_floating_set_disable}"
114 115 
                     android:onClick="@{() -> viewModel.onClickFloatingMenu(floatingType.SET)}" />
 
@@ -117,7 +118,7 @@
117 118 
                     android:id="@+id/fmbFaq"
118 119 
                     android:layout_width="74dp"
119 120 
                     android:layout_height="74dp"
120 
-                    android:padding="5dp"
121 
+                    android:layout_margin="3dp"
121 122 
                     android:contentDescription="@string/lbl_no_image"
122 123 
                     android:background="@{viewModel.btnFloatingSetEnable ? @drawable/ico_faq : @drawable/ico_floating_set_disable}"
123 124 
                     android:onClick="@{() -> viewModel.onClickFloatingMenu(floatingType.FAQ)}" />
 
@@ -128,12 +129,13 @@
128 129 
                 android:layout_width="wrap_content"
129 130 
                 android:layout_height="wrap_content"
130 131 
                 android:orientation="horizontal"
131 
-                android:gravity="center">
132 
+                android:gravity="center"
133 
+                android:padding="2.5dp">
132 134 
                 <androidx.appcompat.widget.AppCompatImageView
133 135 
                     android:id="@+id/fmbAsk"
134 136 
                     android:layout_width="74dp"
135 137 
                     android:layout_height="74dp"
136 
-                    android:padding="5dp"
138 
+                    android:layout_margin="3dp"
137 139 
                     android:contentDescription="@string/lbl_no_image"
138 140 
                     android:background="@{viewModel.btnFloatingAskEnable ? @drawable/ico_ask : @drawable/ico_floating_ask_disable}"
139 141 
                     android:onClick="@{() -> viewModel.onClickFloatingMenu(floatingType.ASK)}" />
 
@@ -142,7 +144,7 @@
142 144 
                     android:id="@+id/fmbNotice"
143 145 
                     android:layout_width="74dp"
144 146 
                     android:layout_height="74dp"
145 
-                    android:padding="5dp"
147 
+                    android:layout_margin="3dp"
146 148 
                     android:contentDescription="@string/lbl_no_image"
147 149 
                     android:background="@{viewModel.btnFloatingNoticeEnable ? @drawable/ico_notice : @drawable/ico_floating_notice_disable}"
148 150 
                     android:onClick="@{() -> viewModel.onClickFloatingMenu(floatingType.NOTICE)}" />
 
@@ -153,12 +155,13 @@
153 155 
                 android:layout_width="wrap_content"
154 156 
                 android:layout_height="wrap_content"
155 157 
                 android:orientation="horizontal"
156 
-                android:gravity="center">
158 
+                android:gravity="center"
159 
+                android:padding="2.5dp">
157 160 
                 <androidx.appcompat.widget.AppCompatImageView
158 161 
                     android:id="@+id/fmbManual"
159 162 
                     android:layout_width="74dp"
160 163 
                     android:layout_height="74dp"
161 
-                    android:padding="5dp"
164 
+                    android:layout_margin="3dp"
162 165 
                     android:contentDescription="@string/lbl_no_image"
163 166 
                     android:background="@{viewModel.btnFloatingManualEnable ? @drawable/ico_manual : @drawable/ico_floating_manual_disable}"
164 167 
                     android:onClick="@{() -> viewModel.onClickFloatingMenu(floatingType.MANUAL)}" />
 
@@ -167,7 +170,7 @@
167 170 
                     android:id="@+id/fmbQrcode"
168 171 
                     android:layout_width="74dp"
169 172 
                     android:layout_height="74dp"
170 
-                    android:padding="5dp"
173 
+                    android:layout_margin="3dp"
171 174 
                     android:contentDescription="@string/lbl_no_image"
172 175 
                     android:background="@{viewModel.btnFloatingQrEnable ? @drawable/ico_qrcode : @drawable/ico_floating_qr_disable}"
173 176 
                     android:onClick="@{() -> viewModel.onClickFloatingMenu(floatingType.QR)}" />
 
@@ -203,6 +206,7 @@
203 206 
             app:borderWidth="0dp"
204 207 
             app:fabCustomSize="82dp"
205 208 
             android:text="FAB"
209 
+            app:maxImageSize="70dp"
206 210 
             android:onClick="@{() -> viewModel.onClickFloatingButton()}"
207 211 
             android:src="@drawable/ico_floating_menu"
208 212 
             app:layout_constraintBottom_toBottomOf="parent"

+ 196 - 114
app/src/main/res/layout/act_member_join.xml
Bestand weergeven 

@@ -46,7 +46,7 @@
46 46 
                     android:textSize="@dimen/_32sdp" />
47 47
48 48 
                 <LinearLayout
49 
-                    android:id="@+id/layoutContent"
49 
+                    android:id="@+id/layoutBirthContent"
50 50 
                     android:layout_width="match_parent"
51 51 
                     android:layout_height="wrap_content"
52 52 
                     android:orientation="vertical"
 
@@ -54,148 +54,230 @@
54 54
55 55 
                     <LinearLayout
56 56 
                         android:layout_width="match_parent"
57 
-                        android:layout_height="@dimen/_36sdp"
58 
-                        android:orientation="horizontal"
57 
+                        android:layout_height="60dp"
58 
+                        android:orientation="vertical"
59 59 
                         android:gravity="center"
60 60 
                         android:layout_marginStart="@dimen/_16sdp"
61 61 
                         android:layout_marginEnd="@dimen/_16sdp">
62 
+                        <LinearLayout
63 
+                            android:layout_width="match_parent"
64 
+                            android:layout_height="25dp"
65 
+                            android:orientation="horizontal"
66 
+                            android:gravity="center"
67 
+                            android:layout_marginStart="@dimen/_16sdp"
68 
+                            android:layout_marginEnd="@dimen/_16sdp">
62 69 
                         <androidx.appcompat.widget.AppCompatTextView
63 70 
                             android:layout_width="0dp"
64 
-                            android:layout_height="@dimen/_30sdp"
71 
+                            android:layout_height="25dp"
65 72 
                             android:layout_weight="0.3"
66 
-                            android:gravity="right|center_vertical"
67 
-                            android:textSize="@dimen/_14sdp"
73 
+                            android:gravity="left|center_vertical"
74 
+                            android:textSize="16dp"
68 75 
                             android:paddingEnd="@dimen/_12sdp"
69 76 
                             android:textColor="@color/color_black"
70 77 
                             android:text="@string/lbl_birth"
71 78 
                             android:layout_alignParentRight="true"/>
72 
-                        <androidx.appcompat.widget.AppCompatEditText
73 
-                            android:id="@+id/etBirthYear"
74 
-                            android:layout_width="0dp"
75 
-                            android:layout_height="@dimen/_30sdp"
76 
-                            android:layout_weight="0.3"
77 
-                            android:background="@drawable/selector_edittext_focus"
78 
-                            android:paddingStart="@dimen/_2sdp"
79 
-                            android:inputType="number"
80 
-                            android:text="@={viewModel.strBirthYear}"
81 
-                            android:maxLength="4"
82 
-                            android:gravity="center_vertical"/>
83 
-                        <androidx.appcompat.widget.AppCompatEditText
84 
-                            android:id="@+id/etBirthMonth"
85 
-                            android:layout_width="0dp"
86 
-                            android:layout_height="@dimen/_30sdp"
87 
-                            android:layout_weight="0.2"
88 
-                            android:layout_marginStart="@dimen/_2sdp"
89 
-                            android:paddingStart="@dimen/_2sdp"
90 
-                            android:background="@drawable/selector_edittext_focus"
91 
-                            android:inputType="number"
92 
-                            android:text="@={viewModel.strBirthMonth}"
93 
-                            android:maxLength="2"
94 
-                            android:gravity="center_vertical"/>
95 
-                        <androidx.appcompat.widget.AppCompatEditText
96 
-                            android:id="@+id/etBirthDay"
97 
-                            android:layout_width="0dp"
98 
-                            android:layout_height="@dimen/_30sdp"
99 
-                            android:layout_weight="0.2"
100 
-                            android:layout_marginStart="@dimen/_2sdp"
101 
-                            android:paddingStart="@dimen/_2sdp"
102 
-                            android:background="@drawable/selector_edittext_focus"
103 
-                            android:inputType="number"
104 
-                            android:text="@={viewModel.strBirthDay}"
105 
-                            android:maxLength="2"
106 
-                            android:gravity="center_vertical"/>
79 
+                        </LinearLayout>
80 
+                        <LinearLayout
81 
+                            android:layout_width="match_parent"
82 
+                            android:layout_height="30dp"
83 
+                            android:orientation="horizontal"
84 
+                            android:gravity="center"
85 
+                            android:layout_marginStart="@dimen/_16sdp"
86 
+                            android:layout_marginEnd="@dimen/_16sdp">
87 
+                            <androidx.appcompat.widget.AppCompatEditText
88 
+                                android:id="@+id/etBirthYear"
89 
+                                android:layout_width="0dp"
90 
+                                android:layout_height="30dp"
91 
+                                android:layout_weight="0.3"
92 
+                                android:background="@drawable/border_stroke_539e39"
93 
+                                android:paddingStart="@dimen/_2sdp"
94 
+                                android:inputType="number"
95 
+                                android:textSize="16dp"
96 
+                                android:text="@={viewModel.strBirthYear}"
97 
+                                android:maxLength="4"
98 
+                                android:hint="@string/hint_reg_yyyy"
99 
+                                android:textColorHint="@color/color_6e6e6e"
100 
+                                android:textAlignment="center"
101 
+                                android:gravity="center_vertical"/>
102 
+                            <androidx.appcompat.widget.AppCompatEditText
103 
+                                android:id="@+id/etBirthMonth"
104 
+                                android:layout_width="0dp"
105 
+                                android:layout_height="30dp"
106 
+                                android:layout_weight="0.2"
107 
+                                android:layout_marginStart="@dimen/_2sdp"
108 
+                                android:paddingStart="@dimen/_2sdp"
109 
+                                android:background="@drawable/border_stroke_539e39"
110 
+                                android:inputType="number"
111 
+                                android:textSize="16dp"
112 
+                                android:text="@={viewModel.strBirthMonth}"
113 
+                                android:maxLength="2"
114 
+                                android:hint="@string/hint_reg_mm"
115 
+                                android:textColorHint="@color/color_6e6e6e"
116 
+                                android:textAlignment="center"
117 
+                                android:gravity="center_vertical"/>
118 
+                            <androidx.appcompat.widget.AppCompatEditText
119 
+                                android:id="@+id/etBirthDay"
120 
+                                android:layout_width="0dp"
121 
+                                android:layout_height="30dp"
122 
+                                android:layout_weight="0.2"
123 
+                                android:layout_marginStart="@dimen/_2sdp"
124 
+                                android:paddingStart="@dimen/_2sdp"
125 
+                                android:background="@drawable/border_stroke_539e39"
126 
+                                android:inputType="number"
127 
+                                android:textSize="16dp"
128 
+                                android:text="@={viewModel.strBirthDay}"
129 
+                                android:maxLength="2"
130 
+                                android:hint="@string/hint_reg_dd"
131 
+                                android:textColorHint="@color/color_6e6e6e"
132 
+                                android:textAlignment="center"
133 
+                                android:gravity="center_vertical"/>
134 
+                        </LinearLayout>
107 135 
                     </LinearLayout>
136 
+                </LinearLayout>
137 
+                <LinearLayout
138 
+                    android:id="@+id/layoutGendContent"
139 
+                    android:layout_width="match_parent"
140 
+                    android:layout_height="wrap_content"
141 
+                    android:orientation="vertical"
142 
+                    android:layout_marginTop="5dp">
108 143
109 144 
                     <LinearLayout
110 145 
                         android:layout_width="match_parent"
111 
-                        android:layout_height="@dimen/_36sdp"
112 
-                        android:orientation="horizontal"
146 
+                        android:layout_height="60dp"
147 
+                        android:orientation="vertical"
113 148 
                         android:gravity="center"
114 149 
                         android:layout_marginStart="@dimen/_16sdp"
115 150 
                         android:layout_marginEnd="@dimen/_16sdp">
116 
-                        <androidx.appcompat.widget.AppCompatTextView
117 
-                            android:layout_width="0dp"
118 
-                            android:layout_height="@dimen/_30sdp"
119 
-                            android:layout_weight="0.3"
120 
-                            android:gravity="right|center_vertical"
121 
-                            android:textSize="@dimen/_14sdp"
122 
-                            android:paddingEnd="@dimen/_12sdp"
123 
-                            android:textColor="@color/color_black"
124 
-                            android:text="@string/lbl_gender"
125 
-                            android:layout_alignParentRight="true"/>
126 151 
                         <LinearLayout
127 
-                            android:layout_width="0dp"
128 
-                            android:layout_height="@dimen/_30sdp"
129 
-                            android:layout_weight="0.7"
152 
+                            android:layout_width="match_parent"
153 
+                            android:layout_height="25dp"
154 
+                            android:orientation="horizontal"
155 
+                            android:gravity="center"
156 
+                            android:layout_marginStart="@dimen/_16sdp"
157 
+                            android:layout_marginEnd="@dimen/_16sdp">
158 
+                            <androidx.appcompat.widget.AppCompatTextView
159 
+                                android:layout_width="0dp"
160 
+                                android:layout_height="25dp"
161 
+                                android:layout_weight="0.3"
162 
+                                android:gravity="left|center_vertical"
163 
+                                android:textSize="16dp"
164 
+                                android:paddingEnd="@dimen/_12sdp"
165 
+                                android:textColor="@color/color_black"
166 
+                                android:text="@string/lbl_gender"
167 
+                                android:layout_alignParentRight="true"/>
168 
+                        </LinearLayout>
169 
+                        <LinearLayout
170 
+                            android:layout_width="match_parent"
171 
+                            android:layout_height="30dp"
130 172 
                             android:orientation="horizontal"
131 
-                            android:paddingStart="16dp"
132 
-                            android:gravity="center">
133 
-                            <RadioGroup
134 
-                                android:id="@+id/radioGroup"
173 
+                            android:gravity="center"
174 
+                            android:layout_marginStart="@dimen/_16sdp"
175 
+                            android:layout_marginEnd="@dimen/_16sdp">
176 
+
177 
+                            <LinearLayout
178 
+                                android:layout_width="0dp"
179 
+                                android:layout_height="@dimen/_30sdp"
180 
+                                android:layout_weight="0.7"
181 
+                                android:gravity="left|center_vertical"
135 182 
                                 android:orientation="horizontal"
136 
-                                android:layout_width="match_parent"
137 
-                                android:layout_height="match_parent"
138 
-                                android:paddingLeft="@dimen/_36sdp"
139 
-                                android:paddingRight="@dimen/_36sdp"
140 
-                                android:onCheckedChanged="@{viewModel::onGenderChanged}">
141 
-                                <RadioButton
142 
-                                    android:id="@+id/rbMan"
143 
-                                    android:layout_width="0dp"
144 
-                                    android:layout_height="wrap_content"
145 
-                                    android:layout_weight="1"
146 
-                                    android:layoutDirection="rtl"
147 
-                                    android:button="@drawable/selector_radio_button"
148 
-                                    android:paddingLeft="@dimen/_22sdp"
149 
-                                    android:checked="@={viewModel.chkRbMan}"
150 
-                                    android:text="@string/lbl_gender_man" />
151 
-
152 
-                                <RadioButton
153 
-                                    android:id="@+id/rbWoman"
154 
-                                    android:layout_width="0dp"
155 
-                                    android:layout_height="wrap_content"
156 
-                                    android:layout_weight="1"
157 
-                                    android:layoutDirection="rtl"
158 
-                                    android:button="@drawable/selector_radio_button"
159 
-                                    android:paddingLeft="@dimen/_22sdp"
160 
-                                    android:checked="@={viewModel.chkRbWoman}"
161 
-                                    android:text="@string/lbl_gender_woman" />
162 
-                            </RadioGroup>
183 
+                                android:paddingStart="0dp">
184 
+
185 
+                                <RadioGroup
186 
+                                    android:id="@+id/radioGroup"
187 
+                                    android:layout_width="match_parent"
188 
+                                    android:layout_height="match_parent"
189 
+                                    android:layout_gravity="left"
190 
+                                    android:gravity="left|center_vertical"
191 
+                                    android:onCheckedChanged="@{viewModel::onGenderChanged}"
192 
+                                    android:orientation="horizontal"
193 
+                                    android:paddingLeft="@dimen/_36sdp"
194 
+                                    android:paddingRight="@dimen/_36sdp">
195 
+
196 
+                                    <RadioButton
197 
+                                        android:id="@+id/rbMan"
198 
+                                        android:layout_width="0dp"
199 
+                                        android:layout_height="wrap_content"
200 
+                                        android:layout_weight="1"
201 
+                                        android:button="@drawable/selector_radio_button"
202 
+                                        android:checked="@={viewModel.chkRbMan}"
203 
+                                        android:layoutDirection="rtl"
204 
+                                        android:paddingLeft="@dimen/_22sdp"
205 
+                                        android:text="@string/lbl_gender_man"
206 
+                                        android:textAlignment="textStart"
207 
+                                        android:textSize="16dp" />
208 
+
209 
+                                    <RadioButton
210 
+                                        android:id="@+id/rbWoman"
211 
+                                        android:layout_width="0dp"
212 
+                                        android:layout_height="wrap_content"
213 
+                                        android:layout_weight="1"
214 
+                                        android:button="@drawable/selector_radio_button"
215 
+                                        android:checked="@={viewModel.chkRbWoman}"
216 
+                                        android:layoutDirection="rtl"
217 
+                                        android:paddingLeft="@dimen/_22sdp"
218 
+                                        android:text="@string/lbl_gender_woman"
219 
+                                        android:textSize="16dp" />
220 
+                                </RadioGroup>
221 
+                            </LinearLayout>
163 222 
                         </LinearLayout>
164 223 
                     </LinearLayout>
165 
-
224 
+                </LinearLayout>
225 
+                <LinearLayout
226 
+                    android:id="@+id/layoutHpContent"
227 
+                    android:layout_width="match_parent"
228 
+                    android:layout_height="wrap_content"
229 
+                    android:orientation="vertical"
230 
+                    android:layout_marginTop="5dp">
166 231 
                     <LinearLayout
167 232 
                         android:layout_width="match_parent"
168 
-                        android:layout_height="@dimen/_36sdp"
169 
-                        android:orientation="horizontal"
233 
+                        android:layout_height="60dp"
234 
+                        android:orientation="vertical"
170 235 
                         android:gravity="center"
171 236 
                         android:layout_marginStart="@dimen/_16sdp"
172 237 
                         android:layout_marginEnd="@dimen/_16sdp">
173 
-                        <androidx.appcompat.widget.AppCompatTextView
174 
-                            android:layout_width="0dp"
175 
-                            android:layout_height="@dimen/_30sdp"
176 
-                            android:layout_weight="0.3"
177 
-                            android:gravity="right|center_vertical"
178 
-                            android:textSize="@dimen/_14sdp"
179 
-                            android:paddingEnd="@dimen/_12sdp"
180 
-                            android:textColor="@color/color_black"
181 
-                            android:text="@string/lbl_phone"
182 
-                            android:layout_alignParentRight="true"/>
183 
-
184 
-                        <androidx.appcompat.widget.AppCompatEditText
185 
-                            android:id="@+id/etPhone"
186 
-                            android:layout_width="0dp"
187 
-                            android:layout_height="@dimen/_30sdp"
188 
-                            android:layout_weight="0.7"
189 
-                            android:paddingStart="16dp"
190 
-                            android:inputType="number"
191 
-                            android:text="@={viewModel.strPhoneNo}"
192 
-                            android:maxLength="13"
193 
-                            android:background="@drawable/selector_edittext_focus"
194 
-                            android:onTextChanged="@{(text, start, before, count) -> viewModel.onTextChanged(1, text)}"
195 
-                            android:gravity="center_vertical"/>
238 
+                        <LinearLayout
239 
+                            android:layout_width="match_parent"
240 
+                            android:layout_height="25dp"
241 
+                            android:orientation="horizontal"
242 
+                            android:gravity="center"
243 
+                            android:layout_marginStart="@dimen/_16sdp"
244 
+                            android:layout_marginEnd="@dimen/_16sdp">
245 
+                            <androidx.appcompat.widget.AppCompatTextView
246 
+                                android:layout_width="0dp"
247 
+                                android:layout_height="25dp"
248 
+                                android:layout_weight="0.3"
249 
+                                android:gravity="left|center_vertical"
250 
+                                android:textSize="16dp"
251 
+                                android:paddingEnd="@dimen/_12sdp"
252 
+                                android:textColor="@color/color_black"
253 
+                                android:text="@string/lbl_phone"
254 
+                                android:layout_alignParentRight="true"/>
255 
+                        </LinearLayout>
256 
+                        <LinearLayout
257 
+                            android:layout_width="match_parent"
258 
+                            android:layout_height="30dp"
259 
+                            android:orientation="horizontal"
260 
+                            android:gravity="center"
261 
+                            android:layout_marginStart="@dimen/_16sdp"
262 
+                            android:layout_marginEnd="@dimen/_16sdp">
263 
+                            <androidx.appcompat.widget.AppCompatEditText
264 
+                                android:id="@+id/etPhone"
265 
+                                android:layout_width="0dp"
266 
+                                android:layout_height="30dp"
267 
+                                android:layout_weight="0.7"
268 
+                                android:paddingStart="16dp"
269 
+                                android:inputType="number"
270 
+                                android:textSize="16dp"
271 
+                                android:text="@={viewModel.strPhoneNo}"
272 
+                                android:maxLength="13"
273 
+                                android:hint="@string/hint_reg_hp"
274 
+                                android:textColorHint="@color/color_6e6e6e"
275 
+                                android:background="@drawable/border_stroke_539e39"
276 
+                                android:onTextChanged="@{(text, start, before, count) -> viewModel.onTextChanged(1, text)}"
277 
+                                android:gravity="center_vertical"/>
278 
+                        </LinearLayout>
196 279 
                     </LinearLayout>
197 280 
                 </LinearLayout>
198 
-
199 281 
             </LinearLayout>
200 282
201 283 
             <androidx.appcompat.widget.AppCompatButton

+ 2 - 2
app/src/main/res/layout/fmt_my_qrcode.xml
Bestand weergeven 

@@ -28,7 +28,7 @@
28 28 
                 android:layout_height="0dp"
29 29 
                 android:layout_marginLeft="16dp"
30 30 
                 android:layout_marginRight="16dp"
31 
-                android:layout_marginTop="10dp"
31 
+                android:layout_marginTop="5dp"
32 32 
                 android:paddingBottom="10dp"
33 33 
                 myQrList="@{viewModel.dataList}"
34 34 
                 app:layout_constraintStart_toStartOf="parent"
 
@@ -40,7 +40,7 @@
40 40 
                 android:layout_width="wrap_content"
41 41 
                 android:layout_height="wrap_content"
42 42 
                 android:gravity="center"
43 
-                android:layout_marginTop="72dp"
43 
+                android:layout_marginTop="100dp"
44 44 
                 app:layout_constraintStart_toStartOf="parent"
45 45 
                 app:layout_constraintEnd_toEndOf="parent"
46 46 
                 app:layout_constraintTop_toBottomOf="@id/myQrRecyclerView">

+ 14 - 7
app/src/main/res/layout/item_call_history.xml
Bestand weergeven 

@@ -8,17 +8,19 @@
8 8 
     </data>
9 9
10 10 
     <androidx.constraintlayout.widget.ConstraintLayout
11 
+        android:id="@+id/callHistoryCont"
11 12 
         android:layout_width="match_parent"
12 13 
         android:layout_height="wrap_content"
13 
-        android:layout_margin="12dp"
14 
-        android:padding="12dp">
14 
+        android:background="@drawable/border_stroke_bottom_e9f0e8"
15 
+        android:layout_margin="5dp"
16 
+        android:padding="5dp">
15 17
16 18 
         <androidx.cardview.widget.CardView
17 19 
             android:id="@+id/ivSymbol"
18 20 
             android:layout_width="30dp"
19 21 
             android:layout_height="30dp"
20 22 
             app:cardCornerRadius="100dp"
21 
-            android:layout_margin="12dp"
23 
+            android:layout_margin="2dp"
22 24 
             app:cardBackgroundColor="@color/color_558b2f"
23 25 
             app:layout_constraintHorizontal_weight="1"
24 26 
             app:layout_constraintStart_toStartOf="parent"
 
@@ -48,19 +50,24 @@
48 50 
                 android:layout_width="match_parent"
49 51 
                 android:layout_height="wrap_content"
50 52 
                 android:layout_marginTop="6dp"
53 
+                android:textStyle="bold"
54 
+                android:textSize="16dp"
51 55 
                 android:text="내 차 호출" />
52 56 
             <TextView
53 57 
                 android:id="@+id/tvCallMsg"
54 58 
                 android:layout_width="match_parent"
55 59 
                 android:layout_height="wrap_content"
56 60 
                 android:layout_marginTop="6dp"
57 
-                android:text="내 차 호출" />
61 
+                android:textStyle="bold"
62 
+                android:textSize="16dp"
63 
+                android:text="차량을 이동해 주세요!" />
58 64 
             <TextView
59 65 
                 android:id="@+id/tvCallDate"
60 66 
                 android:layout_width="match_parent"
61 67 
                 android:layout_height="wrap_content"
62 68 
                 android:layout_marginTop="6dp"
63 
-                android:text="내 차 호출" />
69 
+                android:textSize="16dp"
70 
+                android:text="2024.09.23 13:00" />
64 71 
         </LinearLayout>
65 72
66 73 
         <ImageView
 
@@ -77,13 +84,13 @@
77 84 
             android:id="@+id/ivApply"
78 85 
             android:layout_width="49dp"
79 86 
             android:layout_height="20dp"
80 
-            android:layout_marginTop="12dp"
87 
+            android:layout_marginTop="42dp"
81 88 
             android:text="미응답"
82 89 
             android:textSize="16sp"
83 90 
             android:textAlignment="center"
84 91 
             android:background="@color/color_aec0a8"
85 92 
             app:layout_constraintEnd_toEndOf="parent"
86 93 
             app:layout_constraintTop_toBottomOf="@id/ivNewItem" />
87 
-
88 94 
     </androidx.constraintlayout.widget.ConstraintLayout>
95 
+
89 96 
 </layout>

+ 26 - 19
app/src/main/res/layout/item_exam.xml
Bestand weergeven 

@@ -7,15 +7,15 @@
7 7 
     </data>
8 8
9 9 
     <androidx.constraintlayout.widget.ConstraintLayout
10 
+        android:id="@+id/container"
10 11 
         android:layout_width="match_parent"
11 
-        android:layout_height="wrap_content"
12 
-        android:layout_marginBottom="15dp"
13 
-        android:id="@+id/container">
12 
+        android:layout_height="match_parent"
13 
+        android:layout_marginBottom="10dp">
14 14
15 15 
         <com.noorija.secret.guard.custom.CircleImageView
16 16 
             android:id="@+id/ivProfile"
17 
-            android:layout_width="64dp"
18 
-            android:layout_height="67dp"
17 
+            android:layout_width="100dp"
18 
+            android:layout_height="100dp"
19 19 
             android:layout_margin="15dp"
20 20 
             android:src="@drawable/ico_item_qr"
21 21 
             app:layout_constraintStart_toStartOf="parent"
 
@@ -25,60 +25,67 @@
25 25 
             android:id="@+id/layoutInfo"
26 26 
             android:layout_width="wrap_content"
27 27 
             android:layout_height="wrap_content"
28 
-            android:orientation="vertical"
29 
-            android:layout_marginTop="20dp"
30 28 
             android:layout_gravity="center_vertical"
31 
-            app:layout_constraintStart_toEndOf="@id/ivProfile"
29 
+            android:layout_marginTop="30dp"
30 
+            android:orientation="vertical"
32 31 
             app:layout_constraintEnd_toEndOf="parent"
32 
+            app:layout_constraintStart_toEndOf="@id/ivProfile"
33 33 
             app:layout_constraintTop_toTopOf="parent">
34 34
35 35 
             <TextView
36 36 
                 android:layout_width="match_parent"
37 37 
                 android:layout_height="wrap_content"
38 38 
                 android:gravity="center"
39 
-                android:text="내 차 (Master)" />
39 
+                android:text="내 차 (Master)"
40 
+                android:textSize="16dp" />
41 
+
40 42 
             <TextView
41 43 
                 android:layout_width="match_parent"
42 44 
                 android:layout_height="wrap_content"
43 45 
                 android:gravity="center"
44 
-                android:text="123가1234" />
46 
+                android:text="123가1234"
47 
+                android:textSize="16dp" />
48 
+
45 49 
             <TextView
46 50 
                 android:layout_width="match_parent"
47 51 
                 android:layout_height="wrap_content"
48 52 
                 android:gravity="center"
49 
-                android:text="등록일 : 2024.04.17" />
53 
+                android:text="등록일 : 2024.04.17"
54 
+                android:textSize="16dp" />
50 55
51 56 
         </LinearLayout>
52 57
53 58 
         <LinearLayout
54 59 
             android:id="@+id/layoutBtn"
55 60 
             android:layout_width="match_parent"
56 
-            android:layout_height="wrap_content"
57 
-            android:orientation="horizontal"
61 
+            android:layout_height="150dp"
58 62 
             android:animateLayoutChanges="true"
63 
+            android:orientation="horizontal"
59 64 
             app:layout_constraintRight_toRightOf="parent"
60 65 
             app:layout_constraintTop_toBottomOf="@+id/ivProfile">
61 66
62 67 
             <androidx.appcompat.widget.AppCompatTextView
63 68 
                 android:layout_width="0dp"
64 
-                android:layout_height="wrap_content"
69 
+                android:layout_height="50dp"
65 70 
                 android:layout_weight="1"
66 
-                android:gravity="center"
67 71 
                 android:background="@color/color_8cd797"
72 
+                android:gravity="center"
68 73 
                 android:text="다운로드" />
74 
+
69 75 
             <androidx.appcompat.widget.AppCompatTextView
70 76 
                 android:layout_width="0dp"
71 
-                android:layout_height="wrap_content"
77 
+                android:layout_height="50dp"
72 78 
                 android:layout_weight="1"
73 
-                android:gravity="center"
74 79 
                 android:background="@color/color_8bc34a"
80 
+                android:gravity="center"
75 81 
                 android:text="변경" />
82 
+
76 83 
             <androidx.appcompat.widget.AppCompatTextView
77 84 
                 android:layout_width="0dp"
78 
-                android:layout_height="wrap_content"
85 
+                android:layout_height="50dp"
79 86 
                 android:layout_weight="1"
80 
-                android:gravity="center"
81 87 
                 android:background="@color/color_aec0a8"
88 
+                android:gravity="center"
82 89 
                 android:text="삭제" />
83 90 
         </LinearLayout>
84 91

+ 20 - 10
app/src/main/res/layout/item_my_qrcode.xml
Bestand weergeven 

@@ -9,13 +9,16 @@
9 9 
     <androidx.constraintlayout.widget.ConstraintLayout
10 10 
         android:layout_width="match_parent"
11 11 
         android:layout_height="wrap_content"
12 
-        android:id="@+id/container">
12 
+        android:id="@+id/container"
13 
+        android:layout_margin="5dp"
14 
+        android:padding="2dp"
15 
+        android:background="@drawable/border_stroke_bottom_e9f0e8">
13 16
14 17 
         <androidx.appcompat.widget.AppCompatImageView
15 18 
             android:id="@+id/ivProfile"
16 
-            android:layout_width="64dp"
17 
-            android:layout_height="67dp"
18 
-            android:layout_margin="15dp"
19 
+            android:layout_width="100dp"
20 
+            android:layout_height="100dp"
21 
+            android:layout_margin="1dp"
19 22 
             android:src="@drawable/ico_item_qr"
20 23 
             app:layout_constraintStart_toStartOf="parent"
21 24 
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -25,7 +28,7 @@
25 28 
             android:layout_width="wrap_content"
26 29 
             android:layout_height="wrap_content"
27 30 
             android:orientation="vertical"
28 
-            android:layout_marginTop="20dp"
31 
+            android:layout_marginTop="15dp"
29 32 
             android:layout_gravity="center_vertical"
30 33 
             app:layout_constraintStart_toEndOf="@id/ivProfile"
31 34 
             app:layout_constraintEnd_toEndOf="parent"
 
@@ -35,17 +38,21 @@
35 38 
                 android:id="@+id/tvCarInfo"
36 39 
                 android:layout_width="match_parent"
37 40 
                 android:layout_height="wrap_content"
41 
+                android:textSize="16dp"
42 
+                android:textStyle="bold"
38 43 
                 android:gravity="center" />
39 44 
             <androidx.appcompat.widget.AppCompatTextView
40 45 
                 android:id="@+id/tvCarNumber"
41 46 
                 android:layout_width="match_parent"
42 47 
                 android:layout_height="wrap_content"
43 48 
                 android:gravity="center"
49 
+                android:textSize="16dp"
44 50 
                 android:text="@{data.carInfo}" />
45 51 
             <androidx.appcompat.widget.AppCompatTextView
46 52 
                 android:id="@+id/tvRegDate"
47 53 
                 android:layout_width="match_parent"
48 54 
                 android:layout_height="wrap_content"
55 
+                android:textSize="16dp"
49 56 
                 android:gravity="center" />
50 57
51 58 
         </LinearLayout>
 
@@ -53,33 +60,36 @@
53 60 
         <LinearLayout
54 61 
             android:id="@+id/layoutBtn"
55 62 
             android:layout_width="match_parent"
56 
-            android:layout_height="wrap_content"
63 
+            android:layout_height="35dp"
57 64 
             android:orientation="horizontal"
58 
-            android:layout_marginTop="10dp"
65 
+            android:layout_marginTop="1dp"
59 66 
             app:layout_constraintRight_toRightOf="parent"
60 67 
             app:layout_constraintTop_toBottomOf="@+id/ivProfile">
61 68
62 69 
             <androidx.appcompat.widget.AppCompatTextView
63 70 
                 android:layout_width="0dp"
64 
-                android:layout_height="wrap_content"
71 
+                android:layout_height="35dp"
65 72 
                 android:layout_weight="1"
66 73 
                 android:gravity="center"
74 
+                android:textSize="16dp"
67 75 
                 android:background="@color/color_8cd797"
68 76 
                 android:text="@string/btn_download"
69 77 
                 android:onClick="@{() -> viewModel.onClickDownload(data)}" />
70 78 
             <androidx.appcompat.widget.AppCompatTextView
71 79 
                 android:layout_width="0dp"
72 
-                android:layout_height="wrap_content"
80 
+                android:layout_height="35dp"
73 81 
                 android:layout_weight="1"
74 82 
                 android:gravity="center"
83 
+                android:textSize="16dp"
75 84 
                 android:background="@color/color_8bc34a"
76 85 
                 android:text="@string/btn_change"
77 86 
                 android:onClick="@{() -> viewModel.onClickChange(data)}" />
78 87 
             <androidx.appcompat.widget.AppCompatTextView
79 88 
                 android:layout_width="0dp"
80 
-                android:layout_height="wrap_content"
89 
+                android:layout_height="35dp"
81 90 
                 android:layout_weight="1"
82 91 
                 android:gravity="center"
92 
+                android:textSize="16dp"
83 93 
                 android:background="@color/color_aec0a8"
84 94 
                 android:text="@string/btn_delete"
85 95 
                 android:onClick="@{() -> viewModel.onClickDelete(data)}" />

+ 2 - 0
app/src/main/res/values/colors.xml
Bestand weergeven 

@@ -36,6 +36,7 @@
36 36 
     <color name="color_e9f0e8">#e9f0e8</color>
37 37 
     <color name="color_ea1d1d">#ea1d1d</color>
38 38 
     <color name="color_f3ffe4">#f3ffe4</color>
39 
+    <color name="color_d8f4e8">#d8f4e8</color>
39 40
40 41
41 42 
     <color name="color_3c3c3c">#3c3c3c</color>
 
@@ -49,4 +50,5 @@
49 50 
     <color name="color_fd5151">#fd5151</color>
50 51 
     <color name="color_ff3f1c">#ff3f1c</color>
51 52
53 
+
52 54 
 </resources>

+ 4 - 0
app/src/main/res/values/strings.xml
Bestand weergeven 

@@ -94,6 +94,10 @@
94 94 
     <string name="hint_car_type">차종을 입력하세요(선택)</string>
95 95 
     <string name="hint_car_number">차량번호를 입력하세요(선택)</string>
96 96 
     <string name="hint_relay_msg">전달할 문구를 입력하세요</string>
97 
+    <string name="hint_reg_yyyy">YYYY</string>
98 
+    <string name="hint_reg_mm">MM</string>
99 
+    <string name="hint_reg_dd">DD</string>
100 
+    <string name="hint_reg_hp">01000000000</string>
97 101
98 102 
     <string name="download_success">파일이 단말의\n내장메모리 > Download 폴더에\n저장되었습니다.</string>
99 103 
     <string name="download_pause">다운로드가 중단되었습니다.</string>