Skip to content

Commit e168340

Browse files
jeeminiminijeeminimini
committed
feat : bottom_sheet design 1
1 parent d260f66 commit e168340

File tree

6 files changed

+110
-33
lines changed

6 files changed

+110
-33
lines changed

โ€Žpresentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class AlarmSettingViewModel @Inject constructor(
7777
}
7878

7979
fun callAlarm(time: String) {
80-
alarmFunctions.callAlarm(time, alarmTime.value ?: 0, ALARM_CODE)
80+
alarmFunctions.callAlarm("01:00:00", alarmTime.value ?: 0, ALARM_CODE)
8181
}
8282

8383
private fun cancelAlarm() {

โ€Žpresentation/src/main/res/drawable/ic_alarm_white.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="40dp"
3+
android:height="40dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
7+
<path
8+
android:fillColor="@color/main_dark_grey"
9+
android:pathData="M22,5.7l-4.6,-3.9 -1.3,1.5 4.6,3.9L22,5.7zM7.9,3.4L6.6,1.9 2,5.7l1.3,1.5 4.6,-3.8zM12.5,8L11,8v6l4.7,2.9 0.8,-1.2 -4,-2.4L12.5,8zM12,4c-5,0 -9,4 -9,9s4,9 9,9 9,-4 9,-9 -4,-9 -9,-9zM12,20c-3.9,0 -7,-3.1 -7,-7s3.1,-7 7,-7 7,3.1 7,7 -3.1,7 -7,7z"
10+
android:strokeWidth="1.0"
11+
android:strokeColor="#FFFFFF"/>
12+
13+
</vector>

โ€Žpresentation/src/main/res/drawable/selected_mission_button.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<shape xmlns:android="http://schemas.android.com/apk/res/android"
33
android:shape="oval">
44

5-
<solid android:color="@color/purple_700" />
5+
<solid android:color="@color/red" />
66

77
</shape>

โ€Žpresentation/src/main/res/drawable/unselected_mission_button.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<shape xmlns:android="http://schemas.android.com/apk/res/android"
33
android:shape="oval">
44

5-
<solid android:color="@color/purple_500" />
5+
<solid android:color="@color/main_yellow" />
66

77
</shape>

โ€Žpresentation/src/main/res/layout/bottom_sheet_home_state_expanded.xml

Lines changed: 93 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -42,99 +42,162 @@
4242
android:orientation="horizontal"
4343
app:layout_constraintGuide_begin="35dp" />
4444

45+
<ImageView
46+
android:id="@+id/image_view_start_position"
47+
android:layout_width="wrap_content"
48+
android:layout_height="wrap_content"
49+
android:background="@drawable/ic_start_marker"
50+
android:elevation="15dp"
51+
app:layout_constraintBottom_toBottomOf="@id/text_view_start_position"
52+
app:layout_constraintEnd_toStartOf="@id/text_view_start_position"
53+
app:layout_constraintHorizontal_chainStyle="spread_inside"
54+
app:layout_constraintStart_toStartOf="@id/guide_line_start"
55+
app:layout_constraintTop_toTopOf="@id/text_view_start_position"
56+
app:layout_constraintVertical_bias="0.0" />
57+
4558
<TextView
4659
android:id="@+id/text_view_start_position"
4760
android:layout_width="0dp"
4861
android:layout_height="wrap_content"
49-
android:background="@drawable/background_gray_d9_8"
62+
android:layout_marginStart="5dp"
63+
android:background="@drawable/background_button"
64+
android:elevation="15dp"
5065
android:ellipsize="end"
5166
android:maxLines="1"
52-
android:padding="8dp"
67+
android:paddingHorizontal="10dp"
68+
android:paddingVertical="8dp"
5369
android:text="@{@string/start_position_text(viewModel.alarmItem.startPosition)}"
5470
android:textColor="@color/black"
55-
android:textSize="24sp"
56-
android:textStyle="bold"
71+
android:textSize="20sp"
5772
app:layout_constraintEnd_toEndOf="@id/guide_line_end"
73+
app:layout_constraintStart_toEndOf="@id/image_view_start_position"
74+
app:layout_constraintTop_toTopOf="@id/guideline_top"
75+
tools:text="์ถœ๋ฐœ์ง€ : ์˜ˆ์„ฑ์œ ํ† ํ”ผ์•„" />
76+
77+
<ImageView
78+
android:id="@+id/image_view_end_position"
79+
android:layout_width="wrap_content"
80+
android:layout_height="wrap_content"
81+
android:background="@drawable/ic_place_marker"
82+
android:elevation="15dp"
83+
app:layout_constraintBottom_toBottomOf="@id/text_view_end_position"
84+
app:layout_constraintEnd_toStartOf="@id/text_view_end_position"
85+
app:layout_constraintHorizontal_chainStyle="spread_inside"
5886
app:layout_constraintStart_toStartOf="@id/guide_line_start"
59-
app:layout_constraintTop_toTopOf="@id/guideline_top" />
87+
app:layout_constraintTop_toTopOf="@id/text_view_end_position"
88+
app:layout_constraintVertical_bias="0.0" />
6089

6190
<TextView
6291
android:id="@+id/text_view_end_position"
6392
android:layout_width="0dp"
6493
android:layout_height="wrap_content"
6594
android:layout_marginTop="8dp"
66-
android:background="@drawable/background_gray_d9_8"
95+
android:layout_marginStart="5dp"
96+
android:background="@drawable/background_button"
97+
android:elevation="15dp"
6798
android:ellipsize="end"
6899
android:maxLines="1"
69-
android:padding="8dp"
100+
android:paddingHorizontal="10dp"
101+
android:paddingVertical="8dp"
70102
android:text="@{@string/end_position_text(viewModel.alarmItem.endPosition)}"
71103
android:textColor="@color/black"
72-
android:textSize="24sp"
73-
android:textStyle="bold"
104+
android:textSize="20sp"
74105
app:layout_constraintEnd_toEndOf="@id/guide_line_end"
106+
app:layout_constraintStart_toEndOf="@id/image_view_end_position"
107+
app:layout_constraintTop_toBottomOf="@id/text_view_start_position"
108+
tools:text="๋„์ฐฉ์ง€ : ์•„๋‚จํƒ€์›Œ๋นŒ๋”ฉ" />
109+
110+
<ImageView
111+
android:id="@+id/image_view_last_time"
112+
android:layout_width="40dp"
113+
android:layout_height="40dp"
114+
android:background="@drawable/ic_alarm"
115+
android:elevation="15dp"
116+
app:layout_constraintBottom_toBottomOf="@id/text_view_last_time"
117+
app:layout_constraintEnd_toStartOf="@id/text_view_last_time"
118+
app:layout_constraintHorizontal_chainStyle="spread_inside"
75119
app:layout_constraintStart_toStartOf="@id/guide_line_start"
76-
app:layout_constraintTop_toBottomOf="@id/text_view_start_position" />
120+
app:layout_constraintTop_toTopOf="@id/text_view_last_time"
121+
app:layout_constraintVertical_bias="0.0" />
77122

78123
<TextView
79124
android:id="@+id/text_view_last_time"
80125
android:layout_width="0dp"
81126
android:layout_height="wrap_content"
82127
android:layout_marginTop="8dp"
83-
android:background="@drawable/background_gray_d9_8"
128+
android:layout_marginStart="5dp"
129+
android:background="@drawable/background_button"
130+
android:elevation="15dp"
84131
android:ellipsize="end"
85132
android:maxLines="1"
86-
android:padding="8dp"
133+
android:paddingHorizontal="10dp"
134+
android:paddingVertical="8dp"
87135
android:text="@{@string/last_time_text(viewModel.alarmItem.lastTime)}"
88136
android:textColor="@color/black"
89-
android:textSize="24sp"
90-
android:textStyle="bold"
137+
android:textSize="20sp"
91138
app:layout_constraintEnd_toEndOf="@id/guide_line_end"
139+
app:layout_constraintStart_toEndOf="@id/image_view_last_time"
140+
app:layout_constraintTop_toBottomOf="@id/text_view_end_position"
141+
tools:text="๋ง‰์ฐจ์‹œ๊ฐ„ : 24:09:09" />
142+
143+
<ImageView
144+
android:id="@+id/image_view_walk_time"
145+
android:layout_width="40dp"
146+
android:layout_height="40dp"
147+
android:background="@drawable/ic_baseline_directions_walk_32"
148+
android:elevation="15dp"
149+
app:layout_constraintBottom_toBottomOf="@id/text_view_walk_time"
150+
app:layout_constraintEnd_toStartOf="@id/text_view_walk_time"
151+
app:layout_constraintHorizontal_chainStyle="spread_inside"
92152
app:layout_constraintStart_toStartOf="@id/guide_line_start"
93-
app:layout_constraintTop_toBottomOf="@id/text_view_end_position" />
153+
app:layout_constraintTop_toTopOf="@id/text_view_walk_time"
154+
app:layout_constraintVertical_bias="0.0" />
94155

95156
<TextView
96157
android:id="@+id/text_view_walk_time"
97158
android:layout_width="0dp"
98159
android:layout_height="wrap_content"
99160
android:layout_marginTop="8dp"
100-
android:background="@drawable/background_gray_d9_8"
161+
android:layout_marginStart="5dp"
162+
android:background="@drawable/background_button"
163+
android:elevation="15dp"
101164
android:ellipsize="end"
102165
android:maxLines="1"
103-
android:padding="8dp"
166+
android:paddingHorizontal="10dp"
167+
android:paddingVertical="8dp"
104168
android:text="@{@string/walk_time_text(viewModel.alarmItem.walkTime)}"
105169
android:textColor="@color/black"
106-
android:textSize="24sp"
107-
android:textStyle="bold"
170+
android:textSize="20sp"
108171
app:layout_constraintEnd_toEndOf="@id/guide_line_end"
109-
app:layout_constraintStart_toStartOf="@id/guide_line_start"
110-
app:layout_constraintTop_toBottomOf="@id/text_view_last_time" />
172+
app:layout_constraintStart_toEndOf="@id/image_view_walk_time"
173+
app:layout_constraintTop_toBottomOf="@id/text_view_last_time"
174+
tools:text="๋„๋ณด์‹œ๊ฐ„ : 9๋ถ„" />
111175

112176
<TextView
113177
android:id="@+id/text_view_mission_start"
114178
android:layout_width="180dp"
115179
android:layout_height="180dp"
116180
android:background="@drawable/selector_mission_start_button"
117181
android:gravity="center"
118-
android:text="@string/mission_start"
119-
android:textColor="@color/black"
120-
android:textSize="36sp"
121-
android:textStyle="bold"
122182
android:onClick="@{() -> fragment.setMissionStart()}"
183+
android:text="@string/mission_start"
184+
android:textColor="@color/white"
185+
android:textSize="30sp"
186+
android:elevation="15dp"
123187
app:layout_constraintBottom_toTopOf="@id/button_alarm_turn_off"
124188
app:layout_constraintEnd_toEndOf="@id/guide_line_end"
125189
app:layout_constraintStart_toStartOf="@id/guide_line_start"
126190
app:layout_constraintTop_toBottomOf="@id/text_view_walk_time" />
127191

128-
<com.google.android.material.button.MaterialButton
192+
<Button
129193
android:id="@+id/button_alarm_turn_off"
130-
style="@style/Widget.Material3.Button.OutlinedButton"
131194
android:layout_width="0dp"
132195
android:layout_height="wrap_content"
133196
android:layout_marginBottom="24dp"
134197
android:text="@string/alarm_delete_text"
135-
android:textColor="@color/black"
136-
android:textSize="24sp"
137-
android:textStyle="bold"
198+
android:textColor="@color/white"
199+
android:textSize="20sp"
200+
android:background="@drawable/button_background"
138201
app:layout_constraintBottom_toBottomOf="parent"
139202
app:layout_constraintEnd_toEndOf="@id/guide_line_end"
140203
app:layout_constraintStart_toStartOf="@id/guide_line_start" />

โ€Žpresentation/src/main/res/values/colors.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@
2020
<color name="hint_text_color">#808590</color>
2121
<color name="blue">#2196F3</color>
2222
<color name="red">#F44336</color>
23+
<color name="light_coral">#FFB9B9</color>
2324
</resources>

0 commit comments

Comments
ย (0)