diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AddAlarmActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AddAlarmActivity.kt index e4f96484..203fa5c5 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AddAlarmActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AddAlarmActivity.kt @@ -1,6 +1,5 @@ package kr.co.vividnext.sodalive.mypage.alarm -import android.annotation.SuppressLint import android.app.Activity import android.app.DatePickerDialog import android.content.Context @@ -13,6 +12,7 @@ import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels import com.orhanobut.logger.Logger +import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.base.BaseActivity import kr.co.vividnext.sodalive.common.Constants import kr.co.vividnext.sodalive.databinding.ActivityAddAlarmBinding @@ -95,7 +95,7 @@ class AddAlarmActivity : BaseActivity( binding.tvSave.setOnClickListener { saveAlarm() } - binding.toolbar.tvBack.text = "알람 설정" + binding.toolbar.tvBack.text = getString(R.string.alarm_add_title) binding.toolbar.tvBack.setOnClickListener { finish() } binding.tvCancel.setOnClickListener { finish() } @@ -158,20 +158,22 @@ class AddAlarmActivity : BaseActivity( updateResultText() } - @SuppressLint("SetTextI18n") private fun updateResultText() { selectedDays.clear() dayCheckBoxes.filter { it.isChecked }.map { selectedDays.add(it.text.toString()) } if (selectedDays.isNotEmpty()) { binding.tvDaysOrDate.text = if (selectedDays.size == 7) { - "매일" + getString(R.string.alarm_add_everyday) } else { - "매주 ${selectedDays.joinToString(", ")}" + getString( + R.string.alarm_add_weekly_format, + selectedDays.joinToString(", ") + ) } } else { val dateFormat = SimpleDateFormat( - "yyyy년 M월 d일 (E)", + getString(R.string.alarm_add_date_format), Locale.getDefault() ) val formattedDate = dateFormat.format(selectedDateCalendar.time) @@ -226,7 +228,11 @@ class AddAlarmActivity : BaseActivity( selectedContentTitle.isBlank() || selectedContentCreatorNickname.isBlank() ) { - Toast.makeText(applicationContext, "알람 콘텐츠를 선택하세요", Toast.LENGTH_LONG).show() + Toast.makeText( + applicationContext, + getString(R.string.alarm_add_select_content_toast), + Toast.LENGTH_LONG + ).show() return false } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/select_audio_content/AlarmSelectAudioContentActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/select_audio_content/AlarmSelectAudioContentActivity.kt index 4da1c34d..e53aaa2e 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/select_audio_content/AlarmSelectAudioContentActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/select_audio_content/AlarmSelectAudioContentActivity.kt @@ -8,6 +8,7 @@ import android.view.View import android.widget.Toast import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.audio_content.order.AudioContentOrderListViewModel import kr.co.vividnext.sodalive.audio_content.order.OrderType import kr.co.vividnext.sodalive.base.BaseActivity @@ -33,7 +34,7 @@ class AlarmSelectAudioContentActivity : BaseActivity @@ -78,43 +78,43 @@ + android:text="@string/day_sun_short" /> + android:text="@string/day_mon_short" /> + android:text="@string/day_tue_short" /> + android:text="@string/day_wed_short" /> + android:text="@string/day_thu_short" /> + android:text="@string/day_fri_short" /> + android:text="@string/day_sat_short" /> @@ -165,7 +165,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:fontFamily="@font/gmarket_sans_medium" - android:text="콘텐츠를 선택해주세요" + android:text="@string/alarm_add_content_placeholder" android:textColor="@color/color_3bb9f1" android:textSize="12sp" /> @@ -184,7 +184,7 @@ android:layout_height="wrap_content" android:layout_marginTop="21dp" android:fontFamily="@font/gmarket_sans_medium" - android:text="볼륨" + android:text="@string/alarm_add_volume_label" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -214,7 +214,7 @@ android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" - android:text="취소" + android:text="@string/cancel" android:textColor="@color/color_3bb9f1" android:textSize="18.3sp" /> @@ -228,7 +228,7 @@ android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" - android:text="저장" + android:text="@string/alarm_add_save" android:textColor="@color/white" android:textSize="18.3sp" /> diff --git a/app/src/main/res/layout/activity_alarm_select_audio_content.xml b/app/src/main/res/layout/activity_alarm_select_audio_content.xml index add1a2b8..958eeb46 100644 --- a/app/src/main/res/layout/activity_alarm_select_audio_content.xml +++ b/app/src/main/res/layout/activity_alarm_select_audio_content.xml @@ -23,7 +23,7 @@ android:layout_height="match_parent" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="소장중인 콘텐츠가 없습니다.\n콘텐츠 마켓에서 원하는 알람 콘텐츠를 먼저 구매(소장)하세요." + android:text="@string/alarm_select_empty" android:textColor="@android:color/darker_gray" android:textSize="18sp" android:visibility="gone" /> diff --git a/app/src/main/res/layout/item_audio_content_order_list.xml b/app/src/main/res/layout/item_audio_content_order_list.xml index 4418bd0b..51e82f20 100644 --- a/app/src/main/res/layout/item_audio_content_order_list.xml +++ b/app/src/main/res/layout/item_audio_content_order_list.xml @@ -155,7 +155,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="2.7dp" - android:text="소장중" + android:text="@string/alarm_select_badge_owned" android:textColor="@color/black" android:textSize="10.3sp" android:visibility="gone" @@ -168,7 +168,7 @@ android:background="@drawable/bg_round_corner_2_6_660fd4" android:paddingHorizontal="5.3dp" android:paddingVertical="2.7dp" - android:text="대여중" + android:text="@string/alarm_select_badge_rental" android:textColor="@color/white" android:textSize="10.3sp" android:visibility="gone" diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index ed342f72..b8db2d1f 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -453,4 +453,19 @@ to get unlimited slot(s) + Set alarm + Enter alarm name + Content + Select content + Volume + Save + Every day + Every %1$s + yyyy MMM d (EEE) + Please select alarm content. + Select date + Select content + You don’t have any owned content.\nPlease purchase alarm content in the content market first. + Owned + Rented diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 6e4e74a5..0e7b8899 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -453,4 +453,19 @@ 無制限 スロットを購入 + アラーム設定 + アラーム名を入力 + コンテンツ + コンテンツを選択してください + 音量 + 保存 + 毎日 + 毎週 %1$s + yyyy年 M月 d日 (E) + アラームコンテンツを選択してください。 + 日付を選択 + コンテンツ選択 + 所有中のコンテンツがありません。\nアラームに設定するコンテンツをマーケットで購入してください。 + 所有中 + レンタル中 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 850aba14..0509f4c7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -452,4 +452,19 @@ 으로 무제한 슬롯 구매하기 + 알람 설정 + 알람 이름 입력 + 콘텐츠 + 콘텐츠를 선택해주세요 + 볼륨 + 저장 + 매일 + 매주 %1$s + yyyy년 M월 d일 (E) + 알람 콘텐츠를 선택하세요 + 날짜 선택 + 콘텐츠 선택 + 소장중인 콘텐츠가 없습니다.\n콘텐츠 마켓에서 원하는 알람 콘텐츠를 먼저 구매(소장)하세요. + 소장중 + 대여중