[Feat] 특수문자 처리 완료

placepic · Mar 30, 2021 · e10620f · e10620f
1 parent 65d188f
commit e10620f
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 8 deletions.
diff --git a/app/src/main/java/place/pic/data/remote/response/PlaceGridItemResponse.kt b/app/src/main/java/place/pic/data/remote/response/PlaceGridItemResponse.kt
@@ -1,5 +1,8 @@
 package place.pic.data.remote.response
 
+import android.os.Build
+import android.text.Html
+import androidx.annotation.RequiresApi
 import place.pic.data.entity.PlaceGridItem
 
 /**
@@ -14,10 +17,11 @@ data class PlaceGridItemResponse(
     val likeCnt: Int,
     val subwayName: List<String>
 ) {
+    @RequiresApi(Build.VERSION_CODES.N)
     fun toPlaceGridItem() = PlaceGridItem(
         imageUrl = placeImageUrl,
         placeIdx = placeIdx,
-        placeName = placeName,
+        placeName = Html.fromHtml(placeName, Html.FROM_HTML_MODE_LEGACY).toString(),
         likeCount = likeCnt,
         subwayName = subwayName
     )

diff --git a/app/src/main/java/place/pic/data/remote/response/PlaceItemResponse.kt b/app/src/main/java/place/pic/data/remote/response/PlaceItemResponse.kt
@@ -1,5 +1,8 @@
 package place.pic.data.remote.response
 
+import android.os.Build
+import android.text.Html
+import androidx.annotation.RequiresApi
 import place.pic.data.entity.Place
 import place.pic.data.entity.PlaceGridItem
 import java.util.*
@@ -28,9 +31,10 @@ data class PlaceItemResponse(
     val likeCnt: Int,
     val commentCnt: Int
 ) {
+    @RequiresApi(Build.VERSION_CODES.N)
     fun toPlace() = Place(
         id = placeIdx,
-        name = placeName,
+        name = Html.fromHtml(placeName, Html.FROM_HTML_MODE_LEGACY).toString(),
         imageUrl = imageUrl.getOrElse(0) { "" },
         subways = subway.map { it.toSubway() },
         keywordTags = tag.map { it.toKeywordTag() },
@@ -41,10 +45,11 @@ data class PlaceItemResponse(
         commentCnt = commentCnt
     )
 
+    @RequiresApi(Build.VERSION_CODES.N)
     fun toPlaceGridItem() = PlaceGridItem(
         imageUrl = imageUrl.getOrElse(0) { "" },
         placeIdx = placeIdx,
-        placeName = placeName,
+        placeName = Html.fromHtml(placeName, Html.FROM_HTML_MODE_LEGACY).toString(),
         likeCount = likeCount,
         subwayName = subway.map { it.subwayName }
     )

diff --git a/app/src/main/java/place/pic/ui/main/detail/DetailViewActivity.kt b/app/src/main/java/place/pic/ui/main/detail/DetailViewActivity.kt
@@ -1,8 +1,11 @@
 package place.pic.ui.main.detail
 
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
+import android.text.Html
 import android.view.View
+import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import com.bumptech.glide.Glide
 import com.naver.maps.geometry.LatLng
@@ -227,15 +230,16 @@ class DetailViewActivity : AppCompatActivity(), View.OnClickListener,OnMapReadyC
     }
 
     /*서버 연결시 뷰에 뿌려주는 함수 작업.*/
+    @RequiresApi(Build.VERSION_CODES.N)
     private fun bindingDetail(detailResponse: DetailResponse) {
         //본격 개막장 함수
         insertUploadUserDataInView(detailResponse.uploader)
         insertImageInViewPager(detailResponse.imageUrl)
         insertKeywordInDetailChip(detailResponse.keyword)
         insertDateTime(detailResponse.placeCreatedAt.toLong())
         val title = detailResponse.placeName
-        tv_detail_title.text = title
-        tv_detail_top_title.text = title
+        tv_detail_title.text = Html.fromHtml(title, Html.FROM_HTML_MODE_LEGACY).toString()
+        tv_detail_top_title.text = Html.fromHtml(title, Html.FROM_HTML_MODE_LEGACY).toString()
         tv_detail_content.text = detailResponse.placeReview
         insertCategory(detailResponse.categoryIdx)
         tv_detail_subway_info.text = detailStringForm(detailResponse.subway, "/")

diff --git a/app/src/main/java/place/pic/ui/search/place/PlaceSearchViewHolder.kt b/app/src/main/java/place/pic/ui/search/place/PlaceSearchViewHolder.kt
@@ -1,8 +1,11 @@
 package place.pic.ui.search.place
 
 import android.graphics.Color
+import android.os.Build
+import android.text.Html
 import android.view.View
 import android.widget.TextView
+import androidx.annotation.RequiresApi
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.graphics.createBitmap
 import androidx.core.view.isVisible
@@ -22,8 +25,9 @@ class PlaceSearchViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
     private val alreadyInView = itemView.findViewById<View>(R.id.view_already)
     private val alreadyInText = itemView.findViewById<TextView>(R.id.tv_already)
 
+    @RequiresApi(Build.VERSION_CODES.N)
     fun bind(placeSearchData : PlaceSearchData) {
-        placeName.text = placeSearchData.placeName
+        placeName.text = Html.fromHtml(placeSearchData.placeName, Html.FROM_HTML_MODE_LEGACY).toString()
         placeLocation.text = placeSearchData.placeLocation
 
         if (placeSearchData.alreadyIn) { // 이미 등록된 view

diff --git a/app/src/main/java/place/pic/ui/upload/UploadPlaceViewModel.kt b/app/src/main/java/place/pic/ui/upload/UploadPlaceViewModel.kt
@@ -2,6 +2,9 @@ package place.pic.ui.upload
 
 import android.content.Context
 import android.content.Intent
+import android.os.Build
+import android.text.Html
+import androidx.annotation.RequiresApi
 import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData

diff --git a/app/src/main/res/layout/activity_upload_place.xml b/app/src/main/res/layout/activity_upload_place.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
-
+        <import type="android.text.Html" />
         <import type="android.view.View" />
 
         <variable
@@ -96,7 +96,7 @@
                     android:layout_marginTop="16dp"
                     android:fontFamily="@font/noto_sans_bold"
                     android:gravity="top"
-                    android:text="@{viewModel.placeTitle}"
+                    android:text="@{Html.fromHtml(viewModel.placeTitle, Html.FROM_HTML_MODE_LEGACY).toString()}"
                     android:textColor="@color/black36"
                     android:textSize="22dp"
                     android:textStyle="bold"