Skip to content

Commit e95e560

Browse files
committed
style: AlarmStartFragment UI 변경
1 parent 9652f89 commit e95e560

File tree

10 files changed

+322
-52
lines changed

10 files changed

+322
-52
lines changed

presentation/src/main/assets/moving_bus.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

presentation/src/main/java/com/stop/alarm/AlarmFunctions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class AlarmFunctions(
1818
val alarmSettingPendingIntent = context.getAlarmSettingPendingIntent()
1919
val alarmSettingNotification = context.getAlarmSettingNotification(
2020
alarmSettingPendingIntent,
21-
"알람이 막차시간 ${lastTime}에서 ${alarmTime}전에 울릴예정입니다."
21+
"알람이 ${lastTime} ${alarmTime}전에 울릴 예정입니다"
2222
)
2323
notificationManager.notify(ALARM_NOTIFICATION_ID, alarmSettingNotification)
2424

presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class AlarmSettingFragment : Fragment() {
6464
}
6565

6666
private fun initView() {
67-
with(binding) {
67+
with (binding) {
6868
numberPickerAlarmTime.minValue = 0
6969
numberPickerAlarmTime.maxValue = 60
7070

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

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

7878
fun callAlarm(time: String) {
79-
alarmFunctions.callAlarm(time, alarmTime.value ?: 0)
79+
alarmFunctions.callAlarm("00:30:00", alarmTime.value ?: 0)
8080
}
8181

8282
private fun cancelAlarm() {

presentation/src/main/java/com/stop/ui/mission/MissionWorker.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class MissionWorker @AssistedInject constructor(
122122

123123
companion object {
124124
const val NOTIFICATION_ID = 82
125-
private const val NOTIFICATION_CONTENT = "사용자의 위치를 추적중입니다."
125+
private const val NOTIFICATION_CONTENT = "사용자의 위치를 트래킹 중입니다"
126126
private const val INTERVAL_UNIT = 1000L
127127
const val MISSION_CODE = 88
128128
}

presentation/src/main/res/layout/fragment_alarm_setting.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,26 @@
4242
android:layout_width="wrap_content"
4343
android:layout_height="wrap_content"
4444
android:orientation="vertical"
45-
app:layout_constraintGuide_begin="16dp" />
45+
app:layout_constraintGuide_begin="15dp" />
4646

4747
<androidx.constraintlayout.widget.Guideline
4848
android:id="@+id/guide_line_end"
4949
android:layout_width="wrap_content"
5050
android:layout_height="wrap_content"
5151
android:orientation="vertical"
52-
app:layout_constraintGuide_end="16dp" />
52+
app:layout_constraintGuide_end="15dp" />
5353

5454
<androidx.constraintlayout.widget.Guideline
5555
android:id="@+id/guideline_top"
5656
android:layout_width="wrap_content"
5757
android:layout_height="wrap_content"
5858
android:orientation="horizontal"
59-
app:layout_constraintGuide_begin="35dp" />
59+
app:layout_constraintGuide_begin="50dp" />
6060

6161
<View
6262
android:id="@+id/view_top"
6363
android:layout_width="0dp"
64-
android:layout_height="120dp"
64+
android:layout_height="115dp"
6565
android:background="@color/main_dark_grey"
6666
app:layout_constraintEnd_toEndOf="parent"
6767
app:layout_constraintStart_toStartOf="parent"
@@ -71,9 +71,8 @@
7171
android:id="@+id/view_search"
7272
android:layout_width="0dp"
7373
android:layout_height="50dp"
74-
android:layout_marginBottom="15dp"
7574
android:background="@drawable/background_search"
76-
app:layout_constraintBottom_toBottomOf="@id/view_top"
75+
app:layout_constraintTop_toTopOf="@id/guideline_top"
7776
app:layout_constraintEnd_toEndOf="@id/guide_line_end"
7877
app:layout_constraintStart_toStartOf="@id/guide_line_start" />
7978

0 commit comments

Comments
 (0)