Skip to content

Commit

Permalink
feat #725: string res 적용
Browse files Browse the repository at this point in the history
  • Loading branch information
chattymin committed Jun 5, 2024
1 parent 3ea8480 commit 3a2c1ab
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ class PokeMainActivity : AppCompatActivity() {
imgUserProfileSomeonePokeMe.load(it) { transformations(CircleCropTransformation()) }
} ?: imgUserProfileSomeonePokeMe.setImageResource(R.drawable.ic_empty_profile)
tvUserNameSomeonePokeMe.text = pokeMeItem.name
tvUserGenerationSomeonePokeMe.text = "${pokeMeItem.generation}${pokeMeItem.part}"
tvUserGenerationSomeonePokeMe.text = getString(R.string.poke_user_info, pokeMeItem.generation, pokeMeItem.part)
tvFriendsStatusSomeonePokeMe.text =
if (pokeMeItem.isFirstMeet) {
pokeMeItem.mutualRelationMessage
Expand Down Expand Up @@ -346,7 +346,7 @@ class PokeMainActivity : AppCompatActivity() {
imgUserProfilePokeMyFriend.load(it) { transformations(CircleCropTransformation()) }
} ?: imgUserProfilePokeMyFriend.setImageResource(R.drawable.ic_empty_profile)
tvUserNamePokeMyFriend.text = pokeFriendItem.name
tvUserGenerationPokeMyFriend.text = "${pokeFriendItem.generation}${pokeFriendItem.part}"
tvUserGenerationSomeonePokeMe.text = getString(R.string.poke_user_info, pokeFriendItem.generation, pokeFriendItem.part)
}
imgUserProfilePokeMyFriendOutline.setRelationStrokeColor(pokeFriendItem.relationName)
tvCountPokeMyFriend.text = "${pokeFriendItem.pokeNum}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class PokeNotificationAdapter(
imgUserProfile.load(it) { transformations(CircleCropTransformation()) }
} ?: imgUserProfile.setImageResource(R.drawable.ic_empty_profile)
tvUserName.text = item.name
tvUserGeneration.text = "${item.generation}${item.part}"
tvUserGeneration.text = root.context.getString(R.string.poke_user_info, item.generation, item.part)
tvUserFriendsStatus.text =
if (item.isFirstMeet) {
item.mutualRelationMessage
Expand Down

0 comments on commit 3a2c1ab

Please sign in to comment.