Skip to content

Commit f8f71d8

Browse files
yuni-juyuni-ju
authored
Merge pull request #600 from Daily-DAYO/layout/issue-595
#595 [layout] Fix CustomTextField
2 parents 7c78be6 + d66f84e commit f8f71d8

File tree

7 files changed

+451
-141
lines changed

7 files changed

+451
-141
lines changed

‎presentation/src/main/java/daily/dayo/presentation/view/TextField.kt

Lines changed: 368 additions & 140 deletions
Large diffs are not rendered by default.

‎presentation/src/main/res/drawable/ic_trailing_check.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="20dp"
3+
android:height="20dp"
4+
android:viewportWidth="20"
5+
android:viewportHeight="20">
6+
<path
7+
android:pathData="M10,10m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
8+
android:fillColor="#23C882"/>
9+
<path
10+
android:pathData="M6.445,9.758L8.955,12.667L13.556,7.333"
11+
android:strokeWidth="2"
12+
android:fillColor="#00000000"
13+
android:strokeColor="#ffffff"/>
14+
</vector>

‎presentation/src/main/res/drawable/ic_trailing_delete.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="20dp"
3+
android:height="20dp"
4+
android:viewportWidth="20"
5+
android:viewportHeight="20">
6+
<path
7+
android:pathData="M10,10m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
8+
android:fillColor="#E8EAEE"/>
9+
<path
10+
android:strokeWidth="1"
11+
android:pathData="M7,7.194L12.806,13"
12+
android:fillColor="#00000000"
13+
android:strokeColor="#9FA5AE"
14+
android:strokeLineCap="square"/>
15+
<path
16+
android:strokeWidth="1"
17+
android:pathData="M13,7L7,13"
18+
android:fillColor="#00000000"
19+
android:strokeColor="#9FA5AE"
20+
android:strokeLineCap="square"/>
21+
</vector>

‎presentation/src/main/res/drawable/ic_trailing_error.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="20dp"
3+
android:height="20dp"
4+
android:viewportWidth="20"
5+
android:viewportHeight="20">
6+
<path
7+
android:pathData="M10,10m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
8+
android:fillColor="#FF4545"/>
9+
<path
10+
android:pathData="M7.334,7.505L12.495,12.666"
11+
android:strokeWidth="2"
12+
android:fillColor="#00000000"
13+
android:strokeColor="#ffffff"
14+
android:strokeLineCap="square"/>
15+
<path
16+
android:pathData="M12.667,7.333L7.334,12.667"
17+
android:strokeWidth="2"
18+
android:fillColor="#00000000"
19+
android:strokeColor="#ffffff"
20+
android:strokeLineCap="square"/>
21+
</vector>

‎presentation/src/main/res/drawable/ic_trailing_invisible.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:width="20dp"
4+
android:height="20dp"
5+
android:viewportWidth="20"
6+
android:viewportHeight="20">
7+
<path
8+
android:fillColor="#FFE8EAEE"
9+
android:pathData="M13.64 4.55c-2.6-0.83-5.46-0.74-8 0.27C3.13 5.84 1.1 7.68 0 10c0.56 1.28 1.42 2.43 2.51 3.37 1.1 0.94 2.42 1.65 3.85 2.07 2.6 0.84 5.46 0.74 8-0.27C16.87 14.16 18.9 12.31 20 10c-0.55-1.28-1.41-2.43-2.51-3.37-1.1-0.94-2.41-1.65-3.85-2.08ZM10 14.2c-0.9 0-1.79-0.25-2.54-0.7-0.76-0.46-1.34-1.12-1.69-1.88C5.43 10.85 5.33 10 5.51 9.2s0.61-1.56 1.25-2.14C7.4 6.47 8.22 6.07 9.11 5.9c0.88-0.16 1.8-0.08 2.64 0.24C12.6 6.47 13.3 7 13.81 7.7c0.5 0.69 0.77 1.5 0.77 2.32 0 1.1-0.49 2.17-1.34 2.95-0.86 0.79-2.03 1.23-3.24 1.23Z" />
10+
<path
11+
android:fillColor="#FFE8EAEE"
12+
android:pathData="M10 8.2c-0.4 0-0.78 0.1-1.1 0.3-0.33 0.2-0.58 0.48-0.73 0.8-0.15 0.34-0.19 0.7-0.11 1.05 0.07 0.35 0.26 0.67 0.54 0.93 0.28 0.25 0.63 0.42 1.01 0.5 0.39 0.06 0.78 0.03 1.15-0.11 0.36-0.14 0.67-0.37 0.88-0.67 0.22-0.3 0.34-0.64 0.34-1 0-0.24-0.05-0.47-0.15-0.7-0.1-0.21-0.25-0.41-0.43-0.58-0.18-0.17-0.4-0.3-0.64-0.4C10.52 8.25 10.26 8.2 10 8.2Z" />
13+
</vector>

‎presentation/src/main/res/drawable/ic_trailing_visible.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:width="20dp"
4+
android:height="20dp"
5+
android:viewportWidth="20"
6+
android:viewportHeight="20">
7+
<path
8+
android:fillColor="#FF767B83"
9+
android:pathData="M13.64 4.55c-2.6-0.83-5.46-0.74-8 0.27C3.13 5.84 1.1 7.68 0 10c0.56 1.28 1.42 2.43 2.51 3.37 1.1 0.94 2.42 1.65 3.85 2.07 2.6 0.84 5.46 0.74 8-0.27C16.87 14.16 18.9 12.31 20 10c-0.55-1.28-1.41-2.43-2.51-3.37-1.1-0.94-2.41-1.65-3.85-2.08ZM10 14.2c-0.9 0-1.79-0.25-2.54-0.7-0.76-0.46-1.34-1.12-1.69-1.88C5.43 10.85 5.33 10 5.51 9.2s0.61-1.56 1.25-2.14C7.4 6.47 8.22 6.07 9.11 5.9c0.88-0.16 1.8-0.08 2.64 0.24C12.6 6.47 13.3 7 13.81 7.7c0.5 0.69 0.77 1.5 0.77 2.32 0 1.1-0.49 2.17-1.34 2.95-0.86 0.79-2.03 1.23-3.24 1.23Z" />
10+
<path
11+
android:fillColor="#FF767B83"
12+
android:pathData="M10 8.2c-0.4 0-0.78 0.1-1.1 0.3-0.33 0.2-0.58 0.48-0.73 0.8-0.15 0.34-0.19 0.7-0.11 1.05 0.07 0.35 0.26 0.67 0.54 0.93 0.28 0.25 0.63 0.42 1.01 0.5 0.39 0.06 0.78 0.03 1.15-0.11 0.36-0.14 0.67-0.37 0.88-0.67 0.22-0.3 0.34-0.64 0.34-1 0-0.24-0.05-0.47-0.15-0.7-0.1-0.21-0.25-0.41-0.43-0.58-0.18-0.17-0.4-0.3-0.64-0.4C10.52 8.25 10.26 8.2 10 8.2Z" />
13+
</vector>

‎presentation/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
<string name="email_address_certificate_alert_message_resend">인증번호가 발송되었습니다.</string>
286286
<string name="email_address_certificate_alert_message_match_fail">잘못된 인증번호입니다. 다시 확인해보세요.</string>
287287
<string name="email_address_certificate_alert_message_match_fail_toast">인증 실패 하였습니다.</string>
288-
<string name="email_address_certificate_alert_message_time_fail">제한 시간을 초과했어요.</string>
288+
<string name="email_address_certificate_alert_message_time_fail">제한시간을 초과했어요! 인증번호를 다시 받아주세요.</string>
289289

290290
<!-- Signup -->
291291
<!-- Signup Email Set Address -->

0 commit comments

Comments
 (0)