Skip to content

Commit 4a1a5ee

Browse files
peter-j0ypeter-j0y
committed
💄 앱 전체적인 UI 수정
1 parent 8849ad4 commit 4a1a5ee

21 files changed

+310
-257
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:padding="10dp"
4+
android:shape="rectangle" >
5+
<solid android:color="@color/mogakrun_primary" />
6+
<corners
7+
android:topLeftRadius="12dp"
8+
android:topRightRadius="12dp" />
9+
</shape>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<vector android:height="24dp" android:tint="#ACD182"
1+
<vector android:height="24dp" android:tint="@color/gray"
22
android:viewportHeight="24" android:viewportWidth="24"
33
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
44
<path android:fillColor="@android:color/white" android:pathData="M19.77,5.03l1.4,1.4L8.43,19.17l-5.6,-5.6 1.4,-1.4 4.2,4.2L19.77,5.03m0,-2.83L8.43,13.54l-4.2,-4.2L0,13.57 8.43,22 24,6.43 19.77,2.2z"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<vector android:height="24dp" android:tint="#ACD182"
1+
<vector android:height="24dp" android:tint="?attr/colorOnPrimary"
22
android:viewportHeight="24" android:viewportWidth="24"
33
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
44
<path android:fillColor="@android:color/white" android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<vector android:height="24dp" android:tint="#ACD182"
1+
<vector android:height="24dp" android:tint="?attr/colorOnPrimary"
22
android:viewportHeight="24" android:viewportWidth="24"
33
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
44
<path android:fillColor="@android:color/white" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,16 @@
2626

2727
<com.google.android.material.bottomnavigation.BottomNavigationView
2828
android:id="@+id/bottom_navigation"
29-
app:itemTextColor="@drawable/bottom_navigation_color_selector"
30-
app:itemIconTint="@drawable/bottom_navigation_color_selector"
3129
style="@style/Widget.MaterialComponents.BottomNavigationView.Colored"
3230
android:layout_width="0dp"
3331
android:layout_height="wrap_content"
32+
app:itemIconTint="@drawable/bottom_navigation_color_selector"
33+
app:itemTextAppearanceActive="@style/MoGakRunText.Regular.Small"
34+
app:itemTextAppearanceInactive="@style/MoGakRunText.Regular.Small"
35+
app:itemTextColor="@drawable/bottom_navigation_color_selector"
3436
app:layout_constraintBottom_toBottomOf="parent"
35-
app:layout_constraintStart_toStartOf="parent"
3637
app:layout_constraintEnd_toEndOf="parent"
38+
app:layout_constraintStart_toStartOf="parent"
3739
app:menu="@menu/bottom_navigation_menu" />
3840

3941
</androidx.constraintlayout.widget.ConstraintLayout>

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
android:layout_height="wrap_content"
7878
android:layout_marginTop="12dp"
7979
android:text="@string/running_history_label_start_running_time"
80+
android:textAppearance="@style/MoGakRunText.Regular.Small"
8081
app:layout_constraintStart_toStartOf="parent"
8182
app:layout_constraintTop_toTopOf="parent" />
8283

@@ -96,6 +97,7 @@
9697
android:layout_marginStart="12dp"
9798
android:layout_marginTop="12dp"
9899
android:text="@string/running_total_time"
100+
android:textAppearance="@style/MoGakRunText.Regular.Small"
99101
app:layout_constraintStart_toStartOf="@id/view_vertical_partition_line"
100102
app:layout_constraintTop_toTopOf="parent" />
101103

@@ -113,6 +115,7 @@
113115
android:layout_height="wrap_content"
114116
android:layout_marginTop="12dp"
115117
android:text="@string/running_history_label_running_distance"
118+
android:textAppearance="@style/MoGakRunText.Regular.Small"
116119
app:layout_constraintStart_toStartOf="parent"
117120
app:layout_constraintTop_toBottomOf="@id/view_horizontal_partition_line" />
118121

@@ -121,7 +124,7 @@
121124
android:layout_width="wrap_content"
122125
android:layout_height="wrap_content"
123126
android:layout_marginTop="24dp"
124-
android:layout_marginEnd="44dp"
127+
android:layout_marginEnd="32dp"
125128
app:layout_constraintEnd_toStartOf="@id/view_vertical_partition_line"
126129
app:layout_constraintTop_toBottomOf="@id/view_horizontal_partition_line"
127130
tools:text="11.7km" />
@@ -132,6 +135,7 @@
132135
android:layout_marginStart="12dp"
133136
android:layout_marginTop="12dp"
134137
android:text="@string/running_history_label_running_pace"
138+
android:textAppearance="@style/MoGakRunText.Regular.Small"
135139
app:layout_constraintStart_toStartOf="@id/view_vertical_partition_line"
136140
app:layout_constraintTop_toBottomOf="@id/view_horizontal_partition_line" />
137141

@@ -140,7 +144,7 @@
140144
android:layout_width="wrap_content"
141145
android:layout_height="wrap_content"
142146
android:layout_marginTop="24dp"
143-
android:layout_marginEnd="44dp"
147+
android:layout_marginEnd="28dp"
144148
app:layout_constraintEnd_toEndOf="parent"
145149
app:layout_constraintTop_toBottomOf="@id/view_horizontal_partition_line"
146150
tools:text="6.3km/h" />
@@ -154,6 +158,7 @@
154158
android:layout_margin="12dp"
155159
android:onClick="@{() -> vm.onCheckingPauseOrResume()}"
156160
android:text="@string/running_pause_or_resume"
161+
android:textAppearance="@style/MoGakRunText.Regular.Small"
157162
app:layout_constraintBottom_toBottomOf="parent"
158163
app:layout_constraintEnd_toStartOf="@id/btn_finish"
159164
app:layout_constraintStart_toStartOf="parent" />
@@ -165,6 +170,7 @@
165170
android:layout_margin="12dp"
166171
android:onClick="@{() -> vm.onFinishButtonClicked()}"
167172
android:text="@string/running_finish"
173+
android:textAppearance="@style/MoGakRunText.Regular.Small"
168174
app:layout_constraintBottom_toBottomOf="parent"
169175
app:layout_constraintEnd_toEndOf="parent"
170176
app:layout_constraintStart_toEndOf="@id/btn_pause_or_resume" />
@@ -173,8 +179,8 @@
173179
android:id="@+id/frame_progress_running"
174180
android:layout_width="match_parent"
175181
android:layout_height="match_parent"
176-
android:background="@color/black"
177182
android:alpha="0.8"
183+
android:background="@color/black"
178184
android:translationZ="@{vm.runningState instanceof RunningState.NotRunning ? 10f : 0f }"
179185
android:visibility="@{vm.runningState instanceof RunningState.NotRunning ? View.VISIBLE : View.GONE }">
180186

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
android:layout_height="wrap_content"
1717
android:layout_marginTop="20dp"
1818
android:text="@string/my_run_edit_nick_name_dialog_description"
19+
android:textAppearance="@style/MoGakRunText.Bold.Medium"
1920
app:layout_constraintEnd_toEndOf="parent"
2021
app:layout_constraintStart_toStartOf="parent"
2122
app:layout_constraintTop_toTopOf="parent" />
@@ -27,10 +28,13 @@
2728
android:layout_marginHorizontal="20dp"
2829
android:layout_marginTop="20dp"
2930
android:autofillHints="name"
31+
android:background="@drawable/community_create_running_post_edit_text_background"
3032
android:hint="@string/my_run_edit_nick_name_dialog_hint"
3133
android:inputType="textPersonName"
3234
android:maxLength="20"
3335
android:maxLines="1"
36+
android:padding="12dp"
37+
android:textAppearance="@style/MoGakRunText.Bold.Medium"
3438
app:layout_constraintEnd_toEndOf="parent"
3539
app:layout_constraintStart_toStartOf="parent"
3640
app:layout_constraintTop_toBottomOf="@id/tv_dialog_description" />

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
android:layout_width="match_parent"
2626
android:layout_height="?attr/actionBarSize"
2727
android:background="@color/mogakrun_background"
28-
app:titleTextAppearance="@style/MoGakRunText.Bold.Medium"
29-
app:title="@string/text_community" />
28+
app:title="@string/text_community"
29+
app:titleTextAppearance="@style/MoGakRunText.Bold.Medium" />
3030

3131
</com.google.android.material.appbar.AppBarLayout>
3232

@@ -35,10 +35,11 @@
3535
android:layout_width="match_parent"
3636
android:layout_height="wrap_content"
3737
android:background="@color/mogakrun_background"
38-
app:tabIndicatorColor="@color/mogakrun_on_primary"
3938
app:layout_constraintEnd_toEndOf="parent"
4039
app:layout_constraintStart_toStartOf="parent"
41-
app:layout_constraintTop_toBottomOf="@id/app_bar">
40+
app:layout_constraintTop_toBottomOf="@id/app_bar"
41+
app:tabIndicatorColor="@color/mogakrun_on_primary"
42+
app:tabTextAppearance="@style/MoGakRunText.Regular.Small">
4243

4344
</com.google.android.material.tabs.TabLayout>
4445

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

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
android:layout_width="0dp"
4040
android:layout_height="wrap_content"
4141
android:layout_margin="16dp"
42-
android:background="@color/mogakrun_primary"
42+
android:background="@drawable/community_create_running_post_edit_text_background"
43+
android:backgroundTint="@color/mogakrun_secondary"
4344
app:counterEnabled="true"
4445
app:layout_constraintEnd_toStartOf="@id/btn_duplicate_check"
4546
app:layout_constraintStart_toStartOf="parent"
@@ -49,11 +50,13 @@
4950
android:id="@+id/et_group_name"
5051
android:layout_width="match_parent"
5152
android:layout_height="wrap_content"
52-
android:background="@color/mogakrun_secondary"
53+
android:background="@drawable/community_create_group_edit_text_background"
5354
android:hint="@string/text_group_name"
5455
android:maxLength="20"
5556
android:text="@={viewModel.groupName}"
56-
android:textColor="@color/mogakrun_on_secondary" />
57+
android:textAppearance="@style/MoGakRunText.Regular.Medium"
58+
android:textColor="@color/mogakrun_on_secondary"
59+
android:textCursorDrawable="?attr/colorOnSecondary" />
5760

5861
</com.google.android.material.textfield.TextInputLayout>
5962

@@ -65,6 +68,7 @@
6568
android:enabled="@{viewModel.isDoubleCheckButtonEnable()}"
6669
android:onClick="@{() -> viewModel.onDuplicateCheckButtonClicked()}"
6770
android:text="@string/text_duplicate_check"
71+
android:textAppearance="@style/MoGakRunText.Regular.Small"
6872
app:layout_constraintBottom_toTopOf="@id/time_and_date_picker"
6973
app:layout_constraintEnd_toEndOf="parent"
7074
app:layout_constraintTop_toBottomOf="@id/app_bar" />
@@ -74,7 +78,8 @@
7478
android:layout_width="0dp"
7579
android:layout_height="70dp"
7680
android:layout_margin="16dp"
77-
android:background="@color/mogakrun_secondary_dark"
81+
android:background="@drawable/community_create_running_post_edit_text_background"
82+
android:backgroundTint="@color/mogakrun_secondary"
7883
android:paddingHorizontal="8dp"
7984
android:scrollbars="none"
8085
app:layout_constraintEnd_toStartOf="@id/btn_select_rule"
@@ -95,6 +100,7 @@
95100
android:layout_margin="16dp"
96101
android:onClick="@{() -> viewModel.onAddRuleButtonClicked()}"
97102
android:text="@string/text_select_rule"
103+
android:textAppearance="@style/MoGakRunText.Regular.Small"
98104
app:layout_constraintBottom_toTopOf="@id/text_input_layout_group_introduce"
99105
app:layout_constraintEnd_toEndOf="parent"
100106
app:layout_constraintTop_toBottomOf="@id/text_input_layout_group_name" />
@@ -104,7 +110,8 @@
104110
android:layout_width="0dp"
105111
android:layout_height="0dp"
106112
android:layout_margin="16dp"
107-
android:background="@color/mogakrun_primary"
113+
android:background="@drawable/community_create_running_post_edit_text_background"
114+
android:backgroundTint="@color/mogakrun_secondary"
108115
android:gravity="top|start"
109116
app:counterEnabled="true"
110117
app:layout_constraintBottom_toBottomOf="parent"
@@ -117,13 +124,15 @@
117124
android:layout_width="match_parent"
118125
android:layout_height="match_parent"
119126
android:layout_weight="1"
120-
android:background="@color/mogakrun_secondary"
127+
android:background="@drawable/community_create_group_edit_text_background"
121128
android:gravity="top|start"
122129
android:hint="@string/text_group_introduce"
123130
android:maxLength="200"
124131
android:minLines="2"
125132
android:text="@={viewModel.groupIntroduce}"
126-
android:textColor="@color/mogakrun_on_secondary" />
133+
android:textAppearance="@style/MoGakRunText.Regular.Medium"
134+
android:textColor="@color/mogakrun_on_secondary"
135+
android:textCursorDrawable="?attr/colorOnSecondary" />
127136

128137
</com.google.android.material.textfield.TextInputLayout>
129138

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

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,17 @@
3131
android:background="@color/mogakrun_background"
3232
app:title="@{viewModel.groupInfo.name}"
3333
app:titleTextAppearance="@style/MoGakRunText.Bold.Medium"
34-
tools:title ="수피치 그룹"/>
34+
tools:title="수피치 그룹" />
3535

3636
</com.google.android.material.appbar.AppBarLayout>
3737

3838
<androidx.core.widget.NestedScrollView
3939
android:layout_width="0dp"
4040
android:layout_height="0dp"
41-
app:layout_constraintStart_toStartOf="parent"
42-
app:layout_constraintEnd_toEndOf="parent"
43-
app:layout_constraintTop_toBottomOf="@id/app_bar"
4441
app:layout_constraintBottom_toBottomOf="parent"
45-
android:background="@color/mogakrun_secondary">
42+
app:layout_constraintEnd_toEndOf="parent"
43+
app:layout_constraintStart_toStartOf="parent"
44+
app:layout_constraintTop_toBottomOf="@id/app_bar">
4645

4746
<androidx.constraintlayout.widget.ConstraintLayout
4847
android:layout_width="match_parent"
@@ -51,58 +50,55 @@
5150

5251
<TextView
5352
android:id="@+id/tv_group_name"
54-
style="@style/MoGakRunText.ExtraBold"
5553
android:layout_width="0dp"
5654
android:layout_height="wrap_content"
5755
android:layout_margin="16dp"
58-
android:gravity="center"
5956
android:text="@{viewModel.groupInfo.name}"
57+
android:textAppearance="@style/MoGakRunText.Regular.Large"
6058
app:layout_constraintEnd_toEndOf="parent"
6159
app:layout_constraintStart_toStartOf="parent"
6260
app:layout_constraintTop_toTopOf="parent"
6361
tools:text="수피치와 함께 춤을\n출까 말까" />
6462

6563
<TextView
6664
android:id="@+id/tv_group_introduce"
67-
style="@style/MoGakRunText.Bold.Large"
6865
android:layout_width="0dp"
6966
android:layout_height="wrap_content"
7067
android:layout_margin="16dp"
71-
android:gravity="center"
7268
android:text="@{viewModel.groupInfo.introduce}"
69+
android:textAppearance="@style/MoGakRunText.Regular.Medium"
7370
app:layout_constraintEnd_toEndOf="parent"
7471
app:layout_constraintStart_toStartOf="parent"
7572
app:layout_constraintTop_toBottomOf="@id/tv_group_name"
7673
tools:text="우리 그룹은요\n이러쿵\n저러쿵\n이렇고요\n저렇고요" />
7774

7875
<TextView
7976
android:id="@+id/tv_rules"
80-
style="@style/MoGakRunText.Bold.Medium"
8177
android:layout_width="0dp"
8278
android:layout_height="wrap_content"
8379
android:layout_margin="16dp"
84-
android:gravity="center"
8580
android:text="@{viewModel.groupInfo.rules.toString()}"
81+
android:textAppearance="@style/MoGakRunText.Regular.Small"
8682
app:layout_constraintEnd_toEndOf="parent"
8783
app:layout_constraintStart_toStartOf="parent"
8884
app:layout_constraintTop_toBottomOf="@id/tv_group_introduce"
8985
tools:text="규칙들\n이 적히게\n됩니다." />
9086

9187
<TextView
9288
android:id="@+id/tv_head_count"
93-
style="@style/MoGakRunText.Bold.Medium"
9489
android:layout_width="0dp"
9590
android:layout_height="wrap_content"
9691
android:layout_margin="16dp"
9792
android:gravity="center"
9893
android:text="@{@string/text_headcount(viewModel.groupInfo.headCount)}"
94+
android:textAppearance="@style/MoGakRunText.Regular.Small"
9995
app:layout_constraintEnd_toEndOf="parent"
10096
app:layout_constraintTop_toBottomOf="@id/tv_rules"
10197
tools:text="40명" />
10298

10399
<TextView
104100
android:id="@+id/tv_leader"
105-
style="@style/MoGakRunText.Bold.Medium"
101+
style="@style/MoGakRunText.Regular.Small"
106102
android:layout_width="0dp"
107103
android:layout_height="wrap_content"
108104
android:layout_margin="16dp"
@@ -117,8 +113,9 @@
117113
android:layout_width="wrap_content"
118114
android:layout_height="wrap_content"
119115
android:layout_margin="16dp"
120-
android:text="@string/text_recruit"
121116
android:onClick="@{() -> viewModel.onRecruitButtonClicked()}"
117+
android:text="@string/text_recruit"
118+
android:textAppearance="@style/MoGakRunText.Regular.Small"
122119
android:visibility="invisible"
123120
app:layout_constraintEnd_toEndOf="parent"
124121
app:layout_constraintTop_toBottomOf="@id/tv_head_count" />
@@ -128,8 +125,8 @@
128125
android:layout_width="wrap_content"
129126
android:layout_height="wrap_content"
130127
android:layout_margin="16dp"
131-
android:text="@string/text_exit_group"
132128
android:onClick="@{() -> viewModel.onExitGroupButtonClicked()}"
129+
android:text="@string/text_exit_group"
133130
android:visibility="invisible"
134131
app:layout_constraintEnd_toEndOf="parent"
135132
app:layout_constraintTop_toBottomOf="@id/tv_head_count" />

0 commit comments

Comments
 (0)