Skip to content

Commit 765c786

Browse files
peter-j0ypeter-j0y
committed
💄 마이런, 운동선택, 인증글 작성 페이지 툴바 변경 및 러닝 시작 화면 UI 변경
1 parent d05bc9b commit 765c786

File tree

5 files changed

+28
-41
lines changed

5 files changed

+28
-41
lines changed

‎presentation/src/main/res/layout/fragment_create_running_post.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
android:id="@+id/top_app_bar"
3030
style="@style/Widget.MaterialComponents.Toolbar.Primary"
3131
android:layout_width="match_parent"
32+
android:background="@color/mogakrun_background"
3233
android:layout_height="?attr/actionBarSize"
3334
app:titleTextAppearance="@style/MoGakRunText.Bold.Medium"
3435
app:title="@string/community_create_running_post_title" />

‎presentation/src/main/res/layout/fragment_my_run.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
style="@style/Widget.MaterialComponents.Toolbar.Primary"
2727
android:layout_width="match_parent"
2828
android:layout_height="?attr/actionBarSize"
29+
android:background="@color/mogakrun_background"
2930
app:menu="@menu/my_run_setting_menu"
3031
app:titleTextAppearance="@style/MoGakRunText.Bold.Medium"
3132
app:title="@string/bottom_navigation_menu_my_run" />

‎presentation/src/main/res/layout/fragment_running_start.xml

Lines changed: 24 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -97,57 +97,40 @@
9797
app:layout_constraintStart_toStartOf="parent"
9898
app:layout_constraintTop_toBottomOf="@id/tv_runner_count_unit" />
9999

100+
<com.airbnb.lottie.LottieAnimationView
101+
android:id="@+id/lottie_anim_running_start"
102+
android:layout_width="0dp"
103+
android:layout_height="0dp"
104+
app:layout_constraintBottom_toTopOf="@+id/card_view_start_running"
105+
app:layout_constraintEnd_toEndOf="parent"
106+
app:layout_constraintStart_toStartOf="parent"
107+
app:layout_constraintTop_toBottomOf="@id/tv_runner_count_suffix"
108+
app:lottie_autoPlay="true"
109+
app:lottie_loop="true"
110+
app:lottie_rawRes="@raw/runing_tab_animation" />
111+
100112
<androidx.cardview.widget.CardView
113+
android:id="@+id/card_view_start_running"
101114
enableWithNetworkState="@{vm.networkState}"
102115
android:layout_width="0dp"
103-
android:layout_height="0dp"
116+
android:layout_height="wrap_content"
104117
android:onClick="@{() -> vm.onStartButtonClicked()}"
105118
app:cardBackgroundColor="@color/mogakrun_primary_light"
106-
app:cardCornerRadius="999dp"
119+
app:cardCornerRadius="20dp"
107120
app:layout_constraintBottom_toBottomOf="parent"
108-
app:layout_constraintDimensionRatio="1:1"
109121
app:layout_constraintEnd_toEndOf="@id/width_end"
110122
app:layout_constraintStart_toStartOf="@id/width_start"
111123
app:layout_constraintTop_toBottomOf="@id/tv_runner_count_suffix">
112124

113-
<androidx.constraintlayout.widget.ConstraintLayout
114-
android:layout_width="match_parent"
115-
android:layout_height="match_parent"
116-
android:orientation="vertical">
117-
118-
<androidx.constraintlayout.widget.Guideline
119-
android:id="@+id/guide_running_start"
120-
android:layout_width="match_parent"
121-
android:layout_height="0dp"
122-
android:orientation="horizontal"
123-
app:layout_constraintGuide_percent="0.66" />
124-
125-
<com.airbnb.lottie.LottieAnimationView
126-
android:id="@+id/lottie_anim_running_start"
127-
android:layout_width="0dp"
128-
android:layout_height="0dp"
129-
app:layout_constraintBottom_toBottomOf="@id/guide_running_start"
130-
app:layout_constraintEnd_toEndOf="parent"
131-
app:layout_constraintStart_toStartOf="parent"
132-
app:layout_constraintTop_toTopOf="parent"
133-
app:lottie_autoPlay="true"
134-
app:lottie_loop="true"
135-
app:lottie_rawRes="@raw/runing_tab_animation" />
136-
137-
<TextView
138-
style="@style/MoGakRunText.Regular.Large"
139-
android:layout_width="wrap_content"
140-
android:layout_height="wrap_content"
141-
android:layout_marginTop="5dp"
142-
android:gravity="center"
143-
android:text="@string/runner_start_button_text"
144-
android:textColor="?attr/colorOnPrimary"
145-
app:layout_constraintEnd_toEndOf="parent"
146-
app:layout_constraintStart_toStartOf="parent"
147-
app:layout_constraintTop_toBottomOf="@id/guide_running_start" />
148-
149-
</androidx.constraintlayout.widget.ConstraintLayout>
150-
125+
<TextView
126+
style="@style/MoGakRunText.Regular.Large"
127+
android:layout_width="wrap_content"
128+
android:layout_height="wrap_content"
129+
android:layout_gravity="center"
130+
android:text="@string/runner_start_button_text"
131+
android:textColor="?attr/colorOnPrimary"
132+
android:textAppearance="@style/MoGakRunText.Bold.Large"
133+
android:paddingVertical="16dp"/>
151134

152135
</androidx.cardview.widget.CardView>
153136

‎presentation/src/main/res/layout/fragment_select_running_history.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
android:id="@+id/top_app_bar"
2424
style="@style/Widget.MaterialComponents.Toolbar.Primary"
2525
android:layout_width="match_parent"
26+
android:background="@color/mogakrun_background"
2627
android:layout_height="?attr/actionBarSize"
2728
app:titleTextAppearance="@style/MoGakRunText.Bold.Medium"
2829
app:title="@string/community_select_running_history_title" />

‎presentation/src/main/res/layout/fragment_setting.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<com.google.android.material.appbar.MaterialToolbar
2222
android:id="@+id/top_app_bar"
2323
style="@style/Widget.MaterialComponents.Toolbar.Primary"
24+
android:background="@color/mogakrun_background"
2425
android:layout_width="match_parent"
2526
android:layout_height="?attr/actionBarSize"
2627
app:title="@string/my_run_tool_bar_menu_setting"

0 commit comments

Comments
 (0)