From 1eeb363ae730170aa3eb33fba5256c6410fc5011 Mon Sep 17 00:00:00 2001 From: youngjinc Date: Wed, 21 Jun 2023 12:26:42 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[refactor]=20di=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EA=B2=BD=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hyeeyoung/wishboard/{domain => }/di/NetworkModule.kt | 2 +- .../com/hyeeyoung/wishboard/{domain => }/di/RepositoryModule.kt | 2 +- .../com/hyeeyoung/wishboard/{domain => }/di/ServiceModule.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename app/src/main/java/com/hyeeyoung/wishboard/{domain => }/di/NetworkModule.kt (97%) rename app/src/main/java/com/hyeeyoung/wishboard/{domain => }/di/RepositoryModule.kt (96%) rename app/src/main/java/com/hyeeyoung/wishboard/{domain => }/di/ServiceModule.kt (96%) diff --git a/app/src/main/java/com/hyeeyoung/wishboard/domain/di/NetworkModule.kt b/app/src/main/java/com/hyeeyoung/wishboard/di/NetworkModule.kt similarity index 97% rename from app/src/main/java/com/hyeeyoung/wishboard/domain/di/NetworkModule.kt rename to app/src/main/java/com/hyeeyoung/wishboard/di/NetworkModule.kt index f0707bc6..39fd9547 100644 --- a/app/src/main/java/com/hyeeyoung/wishboard/domain/di/NetworkModule.kt +++ b/app/src/main/java/com/hyeeyoung/wishboard/di/NetworkModule.kt @@ -1,4 +1,4 @@ -package com.hyeeyoung.wishboard.domain.di +package com.hyeeyoung.wishboard.di import com.google.gson.Gson import com.google.gson.GsonBuilder diff --git a/app/src/main/java/com/hyeeyoung/wishboard/domain/di/RepositoryModule.kt b/app/src/main/java/com/hyeeyoung/wishboard/di/RepositoryModule.kt similarity index 96% rename from app/src/main/java/com/hyeeyoung/wishboard/domain/di/RepositoryModule.kt rename to app/src/main/java/com/hyeeyoung/wishboard/di/RepositoryModule.kt index b4ba4be9..fdfc26c9 100644 --- a/app/src/main/java/com/hyeeyoung/wishboard/domain/di/RepositoryModule.kt +++ b/app/src/main/java/com/hyeeyoung/wishboard/di/RepositoryModule.kt @@ -1,4 +1,4 @@ -package com.hyeeyoung.wishboard.domain.di +package com.hyeeyoung.wishboard.di import com.hyeeyoung.wishboard.data.repositories.* import com.hyeeyoung.wishboard.domain.repositories.* diff --git a/app/src/main/java/com/hyeeyoung/wishboard/domain/di/ServiceModule.kt b/app/src/main/java/com/hyeeyoung/wishboard/di/ServiceModule.kt similarity index 96% rename from app/src/main/java/com/hyeeyoung/wishboard/domain/di/ServiceModule.kt rename to app/src/main/java/com/hyeeyoung/wishboard/di/ServiceModule.kt index d3135a94..31a4a546 100644 --- a/app/src/main/java/com/hyeeyoung/wishboard/domain/di/ServiceModule.kt +++ b/app/src/main/java/com/hyeeyoung/wishboard/di/ServiceModule.kt @@ -1,4 +1,4 @@ -package com.hyeeyoung.wishboard.domain.di +package com.hyeeyoung.wishboard.di import com.hyeeyoung.wishboard.data.services.retrofit.* import dagger.Module From ac3443a1c357db031eb34fb88ff20b94c3acf0a5 Mon Sep 17 00:00:00 2001 From: youngjinc Date: Wed, 21 Jun 2023 15:18:18 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[refactor]=20=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85=20>=20=EC=9D=B4=EC=9A=A9=EC=95=BD=EA=B4=80=20?= =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20span=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20=EB=A6=AC=ED=8C=A9?= =?UTF-8?q?=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sign/screens/SignUpPasswordFragment.kt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/hyeeyoung/wishboard/presentation/sign/screens/SignUpPasswordFragment.kt b/app/src/main/java/com/hyeeyoung/wishboard/presentation/sign/screens/SignUpPasswordFragment.kt index 16446573..3a30815a 100644 --- a/app/src/main/java/com/hyeeyoung/wishboard/presentation/sign/screens/SignUpPasswordFragment.kt +++ b/app/src/main/java/com/hyeeyoung/wishboard/presentation/sign/screens/SignUpPasswordFragment.kt @@ -2,12 +2,13 @@ package com.hyeeyoung.wishboard.presentation.sign.screens import android.content.Intent import android.os.Bundle -import android.text.Spannable import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan import android.text.style.ForegroundColorSpan import android.view.View import androidx.core.content.res.ResourcesCompat +import androidx.core.text.set +import androidx.core.text.toSpannable import androidx.hilt.navigation.fragment.hiltNavGraphViewModels import androidx.navigation.fragment.findNavController import com.hyeeyoung.wishboard.R @@ -49,8 +50,6 @@ class SignUpPasswordFragment : } private fun initializeView() { - binding.signTerm.movementMethod = LinkMovementMethod.getInstance() - val clickableSpanTerms = object : ClickableSpan() { override fun onClick(widget: View) { moveWebViewActivity( @@ -68,11 +67,15 @@ class SignUpPasswordFragment : } } - (binding.signTerm.text as? Spannable)?.apply { - setSpan(clickableSpanTerms, 5, 9, Spannable.SPAN_INCLUSIVE_INCLUSIVE) - setSpan(ForegroundColorSpan(ResourcesCompat.getColor(resources, R.color.green_700, null)), 5, 9, Spannable.SPAN_INCLUSIVE_INCLUSIVE) - setSpan(clickableSpanPersonalInfo, 11, 20, Spannable.SPAN_INCLUSIVE_INCLUSIVE) - setSpan(ForegroundColorSpan(ResourcesCompat.getColor(resources, R.color.green_700, null)), 11, 20, Spannable.SPAN_INCLUSIVE_INCLUSIVE) + with(binding.signTerm) { + movementMethod = LinkMovementMethod.getInstance() + val spannable = text.toSpannable() + spannable[5..9] = clickableSpanTerms + spannable[5..9] = + ForegroundColorSpan(ResourcesCompat.getColor(resources, R.color.green_700, null)) + spannable[11..20] = clickableSpanPersonalInfo + spannable[11..20] = + ForegroundColorSpan(ResourcesCompat.getColor(resources, R.color.green_700, null)) } }