diff --git a/android/app/src/main/java/net/pengcook/android/presentation/comment/bottomsheet/CommentMenuBottomFragment.kt b/android/app/src/main/java/net/pengcook/android/presentation/comment/bottomsheet/CommentMenuBottomFragment.kt index 2411ff8e..3764cadb 100644 --- a/android/app/src/main/java/net/pengcook/android/presentation/comment/bottomsheet/CommentMenuBottomFragment.kt +++ b/android/app/src/main/java/net/pengcook/android/presentation/comment/bottomsheet/CommentMenuBottomFragment.kt @@ -8,10 +8,12 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.viewModels import com.google.android.material.bottomsheet.BottomSheetDialogFragment +import dagger.hilt.android.AndroidEntryPoint import net.pengcook.android.R import net.pengcook.android.databinding.FragmentCommentMenuBottomBinding import net.pengcook.android.presentation.core.model.Comment +@AndroidEntryPoint class CommentMenuBottomFragment : BottomSheetDialogFragment() { private var _binding: FragmentCommentMenuBottomBinding? = null private val binding diff --git a/android/app/src/main/res/layout/fragment_comment_menu_bottom.xml b/android/app/src/main/res/layout/fragment_comment_menu_bottom.xml index 9599d6de..ac171911 100644 --- a/android/app/src/main/res/layout/fragment_comment_menu_bottom.xml +++ b/android/app/src/main/res/layout/fragment_comment_menu_bottom.xml @@ -26,6 +26,7 @@ @@ -34,7 +35,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:text="UserName : " + android:text="@string/comment_menu_username" android:textColor="@color/text_color" android:textSize="16sp" android:textStyle="bold" @@ -47,7 +48,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{comment.userName}" - android:textColor="@color/text_color" + android:textColor="@color/yellow_strong" android:textSize="16sp" android:textStyle="bold" app:layout_constraintStart_toEndOf="@id/tv_username_title" @@ -60,7 +61,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="Comment : " + android:text="@string/comment_menu_comment_content" android:textColor="@color/text_color" android:textSize="16sp" android:textStyle="bold" @@ -72,7 +73,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:text="@{comment.message}" - android:textColor="@color/text_color" + android:textColor="@color/yellow_strong" android:textSize="16sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -91,7 +92,7 @@ android:gravity="center" android:onClick="@{() -> vm.onReport()}" android:padding="14dp" - android:text="Report" + android:text="@string/comment_menu_report" android:textColor="@color/text_color" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="parent" @@ -111,7 +112,7 @@ android:fontFamily="@font/notosans_bold" android:gravity="center" android:padding="14dp" - android:text="Block" + android:text="@string/comment_menu_block" android:textColor="@color/text_color" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="@id/tv_report" @@ -147,7 +148,7 @@ android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/report_title_bottom" - android:textColor="@color/text_color" + android:textColor="@color/yellow_strong" android:textSize="16sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/app/src/main/res/layout/item_textfield_with_action.xml b/android/app/src/main/res/layout/item_textfield_with_action.xml index 6a98c589..367c59a8 100644 --- a/android/app/src/main/res/layout/item_textfield_with_action.xml +++ b/android/app/src/main/res/layout/item_textfield_with_action.xml @@ -39,6 +39,7 @@ android:padding="16dp" android:textSize="16sp" android:maxLength="30" + android:paddingEnd="40dp" android:text="@={content}" app:layout_constraintTop_toTopOf="parent" tools:hint="Hint" /> diff --git a/android/app/src/main/res/values-ko-rKR/strings.xml b/android/app/src/main/res/values-ko-rKR/strings.xml index 304d243b..467425d0 100644 --- a/android/app/src/main/res/values-ko-rKR/strings.xml +++ b/android/app/src/main/res/values-ko-rKR/strings.xml @@ -138,6 +138,11 @@ 유저 %s가 신고되었습니다. 댓글이 삭제되었습니다. + 유저명 : + 댓글 내용 : + 삭제하기 + 차단하기 + 신고하기 신고 사유를 선택해주세요. 신고 사유를 선택해주세요. diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 818a1361..49f73a0a 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -133,6 +133,12 @@ User %s Reported Comment Deleted + UserName : + Comment : + Delete my comment + Block + Report + Please choose the reason of report Choose reason of report