From adc2f759c4634ae1402075699cb8fb83c37a29ae Mon Sep 17 00:00:00 2001 From: klaus Date: Mon, 1 Dec 2025 21:27:28 +0900 Subject: [PATCH] =?UTF-8?q?AlarmActivity=20=EB=AC=B8=EC=9E=90=EC=97=B4=20?= =?UTF-8?q?=EB=A6=AC=EC=86=8C=EC=8A=A4=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/vividnext/sodalive/mypage/alarm/AlarmActivity.kt | 9 +++++---- app/src/main/res/layout/activity_alarm.xml | 2 +- app/src/main/res/values-en/strings.xml | 5 +++++ app/src/main/res/values-ja/strings.xml | 5 +++++ app/src/main/res/values/strings.xml | 5 +++++ 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmActivity.kt index f88ca466..54a2393e 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmActivity.kt @@ -12,6 +12,7 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailViewModel import kr.co.vividnext.sodalive.base.BaseActivity import kr.co.vividnext.sodalive.common.Constants @@ -86,10 +87,10 @@ class AlarmActivity : BaseActivity( private fun setAlarmData(alarm: Alarm) { binding.tvTitle.text = alarm.title - binding.tvTime.text = SimpleDateFormat("hh:mm", Locale.getDefault()) - .format(alarm.time) - binding.tvDate.text = SimpleDateFormat("MM월 dd일", Locale.getDefault()) - .format(alarm.time) + val timePattern = getString(R.string.alarm_time_format) + val datePattern = getString(R.string.alarm_date_format) + binding.tvTime.text = SimpleDateFormat(timePattern, Locale.getDefault()).format(alarm.time) + binding.tvDate.text = SimpleDateFormat(datePattern, Locale.getDefault()).format(alarm.time) setVolume(alarm.volume) } diff --git a/app/src/main/res/layout/activity_alarm.xml b/app/src/main/res/layout/activity_alarm.xml index 802cbcfa..be6d3235 100644 --- a/app/src/main/res/layout/activity_alarm.xml +++ b/app/src/main/res/layout/activity_alarm.xml @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="189dp" - android:contentDescription="@null" + android:contentDescription="@string/alarm_stop_content_description" android:gravity="center" android:src="@drawable/ic_alarm_stop" /> diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 40b3d4af..acf42bad 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -431,4 +431,9 @@ ※ Social login users can tap \'Delete account\' without entering a password to proceed automatically. Delete account Please select a reason for deleting your account. + + + hh:mm + MMM d + Stop alarm button diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 2a60b834..56f4ccf3 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -431,4 +431,9 @@ ※ ソーシャルログイン利用者はパスワードを入力せず「退会する」をタップすると自動で退会できます。 退会する 退会理由を選択してください。 + + + hh:mm + M月 d日 + アラーム停止ボタン diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4a1a8212..ed293259 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -430,4 +430,9 @@ ※ 소셜 로그인 이용자는 비밀번호를 입력하지 말고 \'탈퇴하기\'를 클릭하면 자동 탈퇴됩니다. 탈퇴하기 계정을 삭제하려는 이유를 선택해 주세요. + + + hh:mm + MM월 dd일 + 알람 끄기 버튼