klaus/sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

문자열 리소스 참조로 화면 문구 정리

Browse Source
This commit is contained in:
klaus
2025-12-30 15:46:01 +09:00
parent 1d002c4045
commit dfaa3961bf
43 changed files with 670 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt
View File

@@ -22,6 +22,7 @@ import kr.co.vividnext.sodalive.common.Constants
import kr.co.vividnext.sodalive.common.FunctionButtonHelper
import kr.co.vividnext.sodalive.common.LoadingDialog
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
import kr.co.vividnext.sodalive.common.SodaLiveApplicationHolder
import kr.co.vividnext.sodalive.databinding.FragmentMyBinding
import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity
import kr.co.vividnext.sodalive.extensions.dpToPx
@@ -317,21 +318,21 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat
}
if (SharedPreferenceManager.role == MemberRole.CREATOR.name) {
binding.tvMyChannel.visibility = View.VISIBLE
binding.tvMyChannel.setOnClickListener {
startActivity(
Intent(
requireContext(),
UserProfileActivity::class.java
).apply {
putExtra(
Constants.EXTRA_USER_ID,
SharedPreferenceManager.userId
)
}
)
}
} else {
binding.tvMyChannel.visibility = View.VISIBLE
binding.tvMyChannel.setOnClickListener {
startActivity(
Intent(
requireContext(),
UserProfileActivity::class.java
).apply {
putExtra(
Constants.EXTRA_USER_ID,
SharedPreferenceManager.userId
)
}
)
}
} else {
binding.tvMyChannel.visibility = View.GONE
}
} else {
@@ -344,12 +345,14 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat
(requireActivity() as MainActivity).showLoginActivity()
}
binding.tvCanAmount.text = "0"
binding.tvCanAmount.text =
SodaLiveApplicationHolder.get().getString(R.string.common_zero)
binding.tvCanAmount.setOnClickListener {
(requireActivity() as MainActivity).showLoginActivity()
}
binding.tvPointAmount.text = "0"
binding.tvPointAmount.text =
SodaLiveApplicationHolder.get().getString(R.string.common_zero)
binding.tvPointAmount.setOnClickListener {
(requireActivity() as MainActivity).showLoginActivity()
}

18
app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmListViewModel.kt
View File

@@ -5,8 +5,10 @@ import androidx.lifecycle.MutableLiveData
import com.orhanobut.logger.Logger
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.schedulers.Schedulers
import kr.co.vividnext.sodalive.R
import kr.co.vividnext.sodalive.base.BaseViewModel
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
import kr.co.vividnext.sodalive.common.SodaLiveApplicationHolder
class AlarmListViewModel(private val repository: AlarmListRepository) : BaseViewModel() {
private val _toastLiveData = MutableLiveData<String?>()
@@ -47,7 +49,8 @@ class AlarmListViewModel(private val repository: AlarmListRepository) : BaseView
_toastLiveData.postValue(it.message)
} else {
_toastLiveData.postValue(
"알 수 없는 오류가 발생했습니다. 다시 시도해 주세요."
SodaLiveApplicationHolder.get()
.getString(R.string.screen_live_room_unknown_error)
)
}
}
@@ -55,7 +58,10 @@ class AlarmListViewModel(private val repository: AlarmListRepository) : BaseView
{
_isLoading.value = false
it.message?.let { message -> Logger.e(message) }
_toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
_toastLiveData.postValue(
SodaLiveApplicationHolder.get()
.getString(R.string.screen_live_room_unknown_error)
)
}
)
)
@@ -77,7 +83,8 @@ class AlarmListViewModel(private val repository: AlarmListRepository) : BaseView
_toastLiveData.postValue(it.message)
} else {
_toastLiveData.postValue(
"알 수 없는 오류가 발생했습니다. 다시 시도해 주세요."
SodaLiveApplicationHolder.get()
.getString(R.string.screen_live_room_unknown_error)
)
}
}
@@ -85,7 +92,10 @@ class AlarmListViewModel(private val repository: AlarmListRepository) : BaseView
{
_isLoading.value = false
it.message?.let { message -> Logger.e(message) }
_toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
_toastLiveData.postValue(
SodaLiveApplicationHolder.get()
.getString(R.string.screen_live_room_unknown_error)
)
}
)
)

8
app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/db/Alarm.kt
View File

@@ -2,6 +2,8 @@ package kr.co.vividnext.sodalive.mypage.alarm.db
import androidx.room.Entity
import androidx.room.PrimaryKey
import kr.co.vividnext.sodalive.R
import kr.co.vividnext.sodalive.common.SodaLiveApplicationHolder
@Entity(tableName = "alarms")
data class Alarm(
@@ -16,6 +18,10 @@ data class Alarm(
var isEnabled: Boolean = true
) {
fun getDaysText(): String {
return if (days.size == 7) "매일" else days.joinToString(", ")
return if (days.size == 7) {
SodaLiveApplicationHolder.get().getString(R.string.alarm_add_everyday)
} else {
days.joinToString(", ")
}
}
}

16
app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/scheduler/AlarmScheduler.kt
View File

@@ -4,7 +4,9 @@ import android.app.AlarmManager
import android.app.PendingIntent
import android.content.Context
import android.content.Intent
import kr.co.vividnext.sodalive.R
import kr.co.vividnext.sodalive.common.Constants
import kr.co.vividnext.sodalive.common.SodaLiveApplicationHolder
import kr.co.vividnext.sodalive.mypage.alarm.db.Alarm
import kr.co.vividnext.sodalive.mypage.alarm.receiver.AlarmReceiver
import java.util.Calendar
@@ -109,13 +111,13 @@ class AlarmScheduler(private val context: Context) {
private fun getDayOfWeek(day: String): Int {
return when (day) {
"일" -> Calendar.SUNDAY
"월" -> Calendar.MONDAY
"화" -> Calendar.TUESDAY
"수" -> Calendar.WEDNESDAY
"목" -> Calendar.THURSDAY
"금" -> Calendar.FRIDAY
"토" -> Calendar.SATURDAY
SodaLiveApplicationHolder.get().getString(R.string.day_sun_short) -> Calendar.SUNDAY
SodaLiveApplicationHolder.get().getString(R.string.day_mon_short) -> Calendar.MONDAY
SodaLiveApplicationHolder.get().getString(R.string.day_tue_short) -> Calendar.TUESDAY
SodaLiveApplicationHolder.get().getString(R.string.day_wed_short) -> Calendar.WEDNESDAY
SodaLiveApplicationHolder.get().getString(R.string.day_thu_short) -> Calendar.THURSDAY
SodaLiveApplicationHolder.get().getString(R.string.day_fri_short) -> Calendar.FRIDAY
SodaLiveApplicationHolder.get().getString(R.string.day_sat_short) -> Calendar.SATURDAY
else -> Calendar.MONDAY
}
}

6
app/src/main/java/kr/co/vividnext/sodalive/mypage/auth/Auth.kt
View File

@@ -8,7 +8,9 @@ import kr.co.bootpay.android.Bootpay
import kr.co.bootpay.android.events.BootpayEventListener
import kr.co.bootpay.android.models.Payload
import kr.co.vividnext.sodalive.BuildConfig
import kr.co.vividnext.sodalive.R
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
import kr.co.vividnext.sodalive.common.SodaLiveApplicationHolder
import java.util.Date
object Auth {
@@ -18,9 +20,9 @@ object Auth {
val payload = Payload()
.setApplicationId(BuildConfig.BOOTPAY_APP_ID)
.setOrderName("본인인증")
.setOrderName(SodaLiveApplicationHolder.get().getString(R.string.auth_title))
.setPg("다날")
.setMethod("본인인증")
.setMethod(SodaLiveApplicationHolder.get().getString(R.string.auth_title))
.setAuthenticationId(authenticationId)
.setPrice(0.toDouble())

6
app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt
View File

@@ -33,6 +33,7 @@ import kr.co.vividnext.sodalive.base.BaseActivity
import kr.co.vividnext.sodalive.common.Constants
import kr.co.vividnext.sodalive.common.LoadingDialog
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
import kr.co.vividnext.sodalive.common.SodaLiveApplicationHolder
import kr.co.vividnext.sodalive.databinding.ActivityCanPaymentBinding
import kr.co.vividnext.sodalive.extensions.formatMoney
import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse
@@ -46,7 +47,10 @@ class CanPaymentActivity : BaseActivity<ActivityCanPaymentBinding>(
ActivityCanPaymentBinding::inflate
) {
enum class PaymentMethod(val method: String) {
UNIFIED("통합 결제"),
UNIFIED(
SodaLiveApplicationHolder.get()
.getString(R.string.screen_can_payment_method_unified)
),
PHONE("휴대폰"),
KAKAOPAY("카카오페이")
}

7
app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentTempActivity.kt
View File

@@ -20,6 +20,7 @@ import kr.co.vividnext.sodalive.R
import kr.co.vividnext.sodalive.base.BaseActivity
import kr.co.vividnext.sodalive.common.LoadingDialog
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
import kr.co.vividnext.sodalive.common.SodaLiveApplicationHolder
import kr.co.vividnext.sodalive.databinding.ActivityCanPaymentBinding
import kr.co.vividnext.sodalive.extensions.fontSpan
import kr.co.vividnext.sodalive.extensions.moneyFormat
@@ -31,7 +32,11 @@ class CanPaymentTempActivity : BaseActivity<ActivityCanPaymentBinding>(
ActivityCanPaymentBinding::inflate
) {
enum class PaymentMethod(val method: String) {
UNIFIED("통합 결제"), PHONE("휴대폰")
UNIFIED(
SodaLiveApplicationHolder.get()
.getString(R.string.screen_can_payment_method_unified)
),
PHONE("휴대폰")
}
private val viewModel: CanPaymentTempViewModel by inject()