From 09a8019c66790a281ddb6b970f7f37d6ebce9145 Mon Sep 17 00:00:00 2001 From: klaus Date: Mon, 1 Dec 2025 18:00:16 +0900 Subject: [PATCH] =?UTF-8?q?MessageActivity=20=EB=AC=B8=EC=9E=90=EC=97=B4?= =?UTF-8?q?=20=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 --- .../sodalive/message/text/TextMessageFragment.kt | 2 +- .../sodalive/message/voice/VoiceMessageFragment.kt | 3 +-- app/src/main/res/layout/fragment_text_message.xml | 10 +++++----- app/src/main/res/layout/fragment_voice_message.xml | 10 +++++----- app/src/main/res/values-en/strings.xml | 7 +++++++ app/src/main/res/values-ja/strings.xml | 7 +++++++ app/src/main/res/values/strings.xml | 7 +++++++ 7 files changed, 33 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/message/text/TextMessageFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/message/text/TextMessageFragment.kt index 4170f9c8..103de8ae 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/message/text/TextMessageFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/message/text/TextMessageFragment.kt @@ -133,7 +133,7 @@ class TextMessageFragment : BaseFragment( viewModel.isLoading.observe(viewLifecycleOwner) { if (it) { - loadingDialog.show(screenWidth, "문자 메시지를 불러오고 있습니다.") + loadingDialog.show(screenWidth, getString(R.string.screen_message_loading_text)) } else { loadingDialog.dismiss() } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageFragment.kt index 0aca2a58..0fc89abf 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageFragment.kt @@ -13,7 +13,6 @@ import android.widget.Toast import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.orhanobut.logger.Logger import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.base.BaseFragment import kr.co.vividnext.sodalive.common.LoadingDialog @@ -258,7 +257,7 @@ class VoiceMessageFragment : BaseFragment( viewModel.isLoading.observe(viewLifecycleOwner) { if (it) { - loadingDialog.show(screenWidth, "음성 메시지를 불러오고 있습니다.") + loadingDialog.show(screenWidth, getString(R.string.screen_message_loading_voice)) } else { loadingDialog.dismiss() } diff --git a/app/src/main/res/layout/fragment_text_message.xml b/app/src/main/res/layout/fragment_text_message.xml index f7a4c5fe..7eaf45ca 100644 --- a/app/src/main/res/layout/fragment_text_message.xml +++ b/app/src/main/res/layout/fragment_text_message.xml @@ -12,7 +12,7 @@ android:layout_marginHorizontal="10dp" android:layout_marginTop="20dp" android:fontFamily="@font/gmarket_sans_medium" - android:text="※ 보관하지 않은 받은 메시지는 3일 후, 자동 삭제됩니다." + android:text="@string/screen_message_notice_autodelete" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -37,7 +37,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="25dp" android:paddingVertical="10.7dp" - android:text="받은 메시지" + android:text="@string/screen_message_filter_receive" android:textColor="@color/color_777777" android:textSize="12sp" /> @@ -50,7 +50,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="25dp" android:paddingVertical="10.7dp" - android:text="보낸 메시지" + android:text="@string/screen_message_filter_sent" android:textColor="@color/color_777777" android:textSize="12sp" /> @@ -62,7 +62,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="25dp" android:paddingVertical="10.7dp" - android:text="보관함" + android:text="@string/screen_message_filter_keep" android:textColor="@color/color_777777" android:textSize="12sp" /> @@ -94,7 +94,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" android:lineSpacingExtra="4sp" - android:text="메시지가 없습니다.\n친구들과 소통해보세요!" + android:text="@string/screen_message_empty" android:textColor="@color/color_bbbbbb" android:textSize="10.7sp" tools:ignore="SmallSp" /> diff --git a/app/src/main/res/layout/fragment_voice_message.xml b/app/src/main/res/layout/fragment_voice_message.xml index 153ba105..95510893 100644 --- a/app/src/main/res/layout/fragment_voice_message.xml +++ b/app/src/main/res/layout/fragment_voice_message.xml @@ -12,7 +12,7 @@ android:layout_marginHorizontal="10dp" android:layout_marginTop="20dp" android:fontFamily="@font/gmarket_sans_medium" - android:text="※ 보관하지 않은 받은 메시지는 3일 후, 자동 삭제됩니다." + android:text="@string/screen_message_notice_autodelete" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -37,7 +37,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="25dp" android:paddingVertical="10.7dp" - android:text="받은 메시지" + android:text="@string/screen_message_filter_receive" android:textColor="@color/color_777777" android:textSize="12sp" /> @@ -50,7 +50,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="25dp" android:paddingVertical="10.7dp" - android:text="보낸 메시지" + android:text="@string/screen_message_filter_sent" android:textColor="@color/color_777777" android:textSize="12sp" /> @@ -62,7 +62,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="25dp" android:paddingVertical="10.7dp" - android:text="보관함" + android:text="@string/screen_message_filter_keep" android:textColor="@color/color_777777" android:textSize="12sp" /> @@ -93,7 +93,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" android:lineSpacingExtra="4sp" - android:text="메시지가 없습니다.\n친구들과 소통해보세요!" + android:text="@string/screen_message_empty" android:textColor="@color/color_bbbbbb" android:textSize="10.7sp" tools:ignore="SmallSp" /> diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 73d00554..55b4af9d 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -253,6 +253,13 @@ Messages Text Voice + ※ Received messages that are not kept are automatically deleted after 3 days. + Received + Sent + Saved + No messages.\nTry connecting with friends! + Loading text messages… + Loading voice messages… Loading live rooms… Cancel reservation Enter a reason for cancellation. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 7dc3faa2..db4f6d49 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -253,6 +253,13 @@ メッセージ テキスト ボイス + ※ 保管していない受信メッセージは3日後に自動で削除されます。 + 受信メッセージ + 送信メッセージ + 保存箱 + メッセージがありません。\n友達と交流してみましょう! + テキストメッセージを読み込み中です。 + ボイスメッセージを読み込み中です。 ライブを読み込み中です。 予約キャンセル キャンセル理由を入力してください。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 84c92bb1..2c670cdf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -252,6 +252,13 @@ 메시지 문자 음성 + ※ 보관하지 않은 받은 메시지는 3일 후, 자동 삭제됩니다. + 받은 메시지 + 보낸 메시지 + 보관함 + 메시지가 없습니다.\n친구들과 소통해보세요! + 문자 메시지를 불러오고 있습니다. + 음성 메시지를 불러오고 있습니다. 라이브를 불러오고 있습니다. 예약취소 취소사유를 입력하세요.