Skip to content

Commit

Permalink
[mod] #24 코리 반영
Browse files Browse the repository at this point in the history
  • Loading branch information
@hyunjium
hyunjium committed Jan 9, 2024
1 parent bad8a54 commit efcfe08
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 39 deletions.
0 ...res/drawable/mypage_middle_box_bg_btm.xml → ...ain/res/drawable/shape_bottom_radius8.xml
View file
File renamed without changes.
0 ...drawable/mypage_rip_middle_box_bg_mid.xml → app/src/main/res/drawable/shape_ripple.xml
View file
File renamed without changes.
0 ...drawable/mypage_rip_middle_box_bg_btm.xml → .../drawable/shape_ripple_bottom_radius8.xml
View file
File renamed without changes.
0 ...rc/main/res/drawable/mypage_myinfo_bg.xml → ...in/res/drawable/shape_ripple_radius30.xml
View file
File renamed without changes.
0 ...c/main/res/drawable/mypage_rip_box_bg.xml → ...ain/res/drawable/shape_ripple_radius8.xml
View file
File renamed without changes.
5 changes: 3 additions & 2 deletions ...res/drawable/mypage_middle_box_bg_top.xml → ...c/main/res/drawable/shape_top_radius8.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/white_FFFFFF" />
<corners android:topLeftRadius="8dp"
android:topRightRadius="8dp"/>
<corners
android:topLeftRadius="8dp"
android:topRightRadius="8dp" />
</shape>
51 changes: 22 additions & 29 deletions app/src/main/res/layout/fragment_mypage.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,30 +47,28 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:background="@drawable/mypage_myinfo_bg"
android:background="@drawable/shape_ripple_radius30"
android:clickable="true"
android:focusable="true"
android:text="@string/mypage_myinfo"
android:textColor="@color/gray_700_464747"
app:layout_constraintBottom_toBottomOf="@id/tv_mypage_name"
app:layout_constraintEnd_toEndOf="parent" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_mypage_ex_info"
android:id="@+id/cl_mypage_exercise_info"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="28dp"
android:background="@drawable/mypage_rip_box_bg"
android:background="@drawable/shape_ripple_radius8"
android:clickable="true"
android:focusable="true"
android:paddingVertical="26dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_mypage_name">

<ImageView
android:id="@+id/iv_mypage_ex_info"
android:id="@+id/iv_mypage_exercise_info"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="20dp"
Expand All @@ -81,35 +79,35 @@
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/tv_mypage_ex_info"
android:id="@+id/tv_mypage_exercise_info"
style="@style/H6_semi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="@string/mypage_ex_info"
android:text="@string/mypage_exercise_info"
android:textColor="@color/gray_900_161616"
app:layout_constraintStart_toEndOf="@+id/iv_mypage_ex_info"
app:layout_constraintStart_toEndOf="@+id/iv_mypage_exercise_info"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/tv_mypage_check_ex"
android:id="@+id/tv_mypage_check_exercise"
style="@style/Caption2_re"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/mypage_check_ex_info"
android:text="@string/mypage_check_exercise_info"
android:textColor="@color/gray_500_9D9EA0"
app:layout_constraintStart_toStartOf="@id/tv_mypage_ex_info"
app:layout_constraintTop_toBottomOf="@id/tv_mypage_ex_info" />
app:layout_constraintStart_toStartOf="@id/tv_mypage_exercise_info"
app:layout_constraintTop_toBottomOf="@id/tv_mypage_exercise_info" />

<ImageView
android:id="@+id/iv_mypage_arrow1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
android:src="@drawable/ic_arrow"
app:layout_constraintBottom_toBottomOf="@id/tv_mypage_check_ex"
app:layout_constraintBottom_toBottomOf="@id/tv_mypage_check_exercise"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_mypage_ex_info" />
app:layout_constraintTop_toTopOf="@id/tv_mypage_exercise_info" />
</androidx.constraintlayout.widget.ConstraintLayout>

<TextView
Expand All @@ -118,23 +116,22 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:background="@drawable/mypage_middle_box_bg_top"
android:background="@drawable/shape_top_radius8"
android:paddingStart="20dp"
android:paddingTop="20dp"
android:paddingBottom="4dp"
android:text="@string/mypage_app_info"
android:textColor="@color/gray_500_9D9EA0"
app:layout_constraintEnd_toEndOf="@id/cl_mypage_ex_info"
app:layout_constraintStart_toStartOf="@id/cl_mypage_ex_info"
app:layout_constraintTop_toBottomOf="@id/cl_mypage_ex_info" />
app:layout_constraintEnd_toEndOf="@id/cl_mypage_exercise_info"
app:layout_constraintStart_toStartOf="@id/cl_mypage_exercise_info"
app:layout_constraintTop_toBottomOf="@id/cl_mypage_exercise_info" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_mypage_service_use"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/mypage_rip_middle_box_bg_mid"
android:background="@drawable/shape_ripple"
android:clickable="true"
android:focusable="true"
app:layout_constraintEnd_toEndOf="@id/tv_mypage_app_info"
app:layout_constraintStart_toStartOf="@id/tv_mypage_app_info"
app:layout_constraintTop_toBottomOf="@id/tv_mypage_app_info">
Expand Down Expand Up @@ -176,9 +173,8 @@
android:id="@+id/cl_mypage_privacy_policy"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/mypage_rip_middle_box_bg_mid"
android:background="@drawable/shape_ripple"
android:clickable="true"
android:focusable="true"
app:layout_constraintEnd_toEndOf="@id/tv_mypage_app_info"
app:layout_constraintStart_toStartOf="@id/tv_mypage_app_info"
app:layout_constraintTop_toBottomOf="@id/view_mypage_bar1">
Expand Down Expand Up @@ -220,9 +216,8 @@
android:id="@+id/cl_mypage_open_source"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/mypage_rip_middle_box_bg_mid"
android:background="@drawable/shape_ripple"
android:clickable="true"
android:focusable="true"
app:layout_constraintEnd_toEndOf="@id/tv_mypage_app_info"
app:layout_constraintStart_toStartOf="@id/tv_mypage_app_info"
app:layout_constraintTop_toBottomOf="@id/view_mypage_bar2">
Expand Down Expand Up @@ -264,9 +259,8 @@
android:id="@+id/cl_mypage_developer_info"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/mypage_rip_middle_box_bg_btm"
android:background="@drawable/shape_ripple_bottom_radius8"
android:clickable="true"
android:focusable="true"
app:layout_constraintEnd_toEndOf="@id/tv_mypage_app_info"
app:layout_constraintStart_toStartOf="@id/tv_mypage_app_info"
app:layout_constraintTop_toBottomOf="@id/view_mypage_bar3">
Expand Down Expand Up @@ -300,9 +294,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginBottom="21dp"
android:background="@drawable/mypage_rip_box_bg"
android:background="@drawable/shape_ripple_radius8"
android:clickable="true"
android:focusable="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/cl_mypage_developer_info"
app:layout_constraintStart_toStartOf="@id/cl_mypage_developer_info"
Expand Down
10 changes: 4 additions & 6 deletions app/src/main/res/layout/fragment_mypage_myinfo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="34dp"
android:background="@drawable/mypage_middle_box_bg_top"
android:background="@drawable/shape_top_radius8"
android:paddingVertical="20dp"
android:paddingStart="20dp"
android:text="@string/mypage_name"
Expand Down Expand Up @@ -74,7 +74,7 @@
android:id="@+id/tv_myinfo_age"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/mypage_middle_box_bg_btm"
android:background="@drawable/shape_bottom_radius8"
android:paddingVertical="20dp"
android:paddingStart="20dp"
android:text="@string/mypage_age"
Expand All @@ -99,9 +99,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:background="@drawable/mypage_rip_box_bg"
android:background="@drawable/shape_ripple_radius8"
android:clickable="true"
android:focusable="true"
app:layout_constraintEnd_toEndOf="@id/tv_myinfo_age"
app:layout_constraintStart_toStartOf="@id/tv_myinfo_age"
app:layout_constraintTop_toBottomOf="@id/tv_myinfo_age">
Expand Down Expand Up @@ -135,9 +134,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:background="@drawable/mypage_rip_box_bg"
android:background="@drawable/shape_ripple_radius8"
android:clickable="true"
android:focusable="true"
app:layout_constraintEnd_toEndOf="@id/cl_myinfo_logout"
app:layout_constraintStart_toStartOf="@id/cl_myinfo_logout"
app:layout_constraintTop_toBottomOf="@id/cl_myinfo_logout">
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<!-- my page -->
<string name="mypage_nickname">의지뿜뿜 부모님</string>
<string name="mypage_myinfo">내 정보</string>
<string name="mypage_ex_info">운동 정보</string>
<string name="mypage_check_ex_info">내 운동 정보를 확인하세요!</string>
<string name="mypage_exercise_info">운동 정보</string>
<string name="mypage_check_exercise_info">내 운동 정보를 확인하세요!</string>
<string name="mypage_app_info">앱 정보</string>
<string name="mypage_service_use">서비스 이용약관</string>
<string name="mypage_privacy_policy">개인정보 처리방침</string>
Expand Down

0 comments on commit efcfe08

Please sign in to comment.