Skip to content

Commit

Permalink
Revert "[FIX/#163] 흔들기 페이지에서 동적으로 생성한 뷰에 할당된 텍스트가 영역을 넘치는 문제 해결"
Browse files Browse the repository at this point in the history
  • Loading branch information
unam98 authored Sep 13, 2024
1 parent 6af90f5 commit a5c421e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 29 deletions.
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
package com.teumteum.teumteum.presentation.familiar.shaketopic.shake

import android.animation.ValueAnimator
import android.annotation.SuppressLint
import android.content.Context
import android.graphics.Canvas
import android.graphics.Paint
import android.text.Layout
import android.text.StaticLayout
import android.text.TextPaint
import android.util.AttributeSet
import android.view.View
import androidx.core.content.ContextCompat
Expand All @@ -25,7 +21,6 @@ class InterestView(

private val views = mutableListOf<InterestViewConfig>()

@SuppressLint("DrawAllocation")
override fun onDraw(canvas: Canvas) {
super.onDraw(canvas)
views.forEach { view ->
Expand All @@ -42,30 +37,19 @@ class InterestView(
paint
)

// 텍스트 그리기 설정
val textPaint = TextPaint().apply {
color = ContextCompat.getColor(context, com.teumteum.base.R.color.elevation_level01)
textSize = TransformUtils.dpToPx(16f).toFloat()
typeface = ResourcesCompat.getFont(context, com.teumteum.base.R.font.pretendard_semibold)
}

// 텍스트 레이아웃 생성
val textWidth = view.width - (radius * 2) // 텍스트 영역 너비 조정
val staticLayout = StaticLayout.Builder.obtain(view.text, 0, view.text.length, textPaint, textWidth.toInt())
.setAlignment(Layout.Alignment.ALIGN_CENTER)
.setLineSpacing(1f, 1f) // 줄 간격 설정
.setIncludePad(false)
.build()

canvas.save()
// 텍스트를 그리기 위한 위치 조정
val textX = view.x + radius
val textY = view.y + (view.height - staticLayout.height) / 2f
canvas.translate(textX, textY)
staticLayout.draw(canvas)
canvas.restore()
// 텍스트 그리기
paint.color =
ContextCompat.getColor(context, com.teumteum.base.R.color.elevation_level01)
paint.textSize = TransformUtils.dpToPx(16f).toFloat()
paint.typeface =
ResourcesCompat.getFont(context, com.teumteum.base.R.font.pretendard_semibold)
paint.textAlign = Paint.Align.CENTER
val textX = view.x + view.width / 2
val textY = view.y + view.height / 2 - (paint.descent() + paint.ascent()) / 2
canvas.drawText(view.text, textX, textY, paint)
}
}

fun addUserInterest(interestViewConfig: InterestViewConfig) {
views.add(interestViewConfig)
resolveCollisions()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class CardCompleteFragment
submitInterestList(interests)
isModify = false
setIsModifyDetail(false)
isModifyDetail = false
// isModifyDetail = false
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/item_topic.xml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
android:textAlignment="center"
android:textColor="@color/graphic_pink"
android:textFontWeight="900"
android:textSize="17sp"
android:textSize="24sp"
android:visibility="invisible"
app:layout_constraintBottom_toTopOf="@id/tv_balance_question_second"
app:layout_constraintEnd_toEndOf="@id/iv_back_balance_background"
Expand Down

0 comments on commit a5c421e

Please sign in to comment.