Skip to content

Commit 812b535

Browse files
Move TagColor data class to SubjectFormatter
1 parent f805ab6 commit 812b535

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

Diff for: app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ import com.infomaniak.mail.data.models.thread.Thread
5454
import com.infomaniak.mail.databinding.*
5555
import com.infomaniak.mail.ui.main.folder.ThreadListAdapter.ThreadListViewHolder
5656
import com.infomaniak.mail.ui.main.thread.SubjectFormatter
57+
import com.infomaniak.mail.ui.main.thread.SubjectFormatter.TagColor
5758
import com.infomaniak.mail.utils.RealmChangesBinding
5859
import com.infomaniak.mail.utils.Utils.runCatchingRealm
5960
import com.infomaniak.mail.utils.extensions.*

Diff for: app/src/main/java/com/infomaniak/mail/ui/main/thread/SubjectFormatter.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ import android.graphics.Paint
2323
import android.text.StaticLayout
2424
import android.text.TextPaint
2525
import android.text.TextUtils.*
26+
import androidx.annotation.ColorRes
2627
import androidx.core.content.res.ResourcesCompat
2728
import com.infomaniak.mail.MatomoMail.trackExternalEvent
2829
import com.infomaniak.mail.R
2930
import com.infomaniak.mail.data.models.thread.Thread
3031
import com.infomaniak.mail.utils.ExternalUtils.findExternalRecipients
3132
import com.infomaniak.mail.utils.extensions.MergedContactDictionary
32-
import com.infomaniak.mail.utils.extensions.TagColor
3333
import com.infomaniak.mail.utils.extensions.formatSubject
3434
import com.infomaniak.mail.utils.extensions.postfixWithTag
3535
import javax.inject.Inject
@@ -153,6 +153,8 @@ class SubjectFormatter @Inject constructor(private val context: Context) {
153153
val tagTextPaint: TextPaint,
154154
)
155155

156+
data class TagColor(@ColorRes val backgroundColorRes: Int, @ColorRes val textColorRes: Int)
157+
156158
companion object {
157159

158160
fun getTagsPaint(context: Context) = TextPaint(Paint.ANTI_ALIAS_FLAG).apply {

Diff for: app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPromptFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import com.infomaniak.mail.MatomoMail.trackEvent
3434
import com.infomaniak.mail.R
3535
import com.infomaniak.mail.data.LocalSettings
3636
import com.infomaniak.mail.databinding.FragmentAiPromptBinding
37-
import com.infomaniak.mail.utils.extensions.TagColor
37+
import com.infomaniak.mail.ui.main.thread.SubjectFormatter.TagColor
3838
import com.infomaniak.mail.utils.extensions.postfixWithTag
3939
import dagger.hilt.android.AndroidEntryPoint
4040
import kotlinx.coroutines.Dispatchers

Diff for: app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPropositionFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ import com.infomaniak.mail.data.models.ai.AiPromptOpeningStatus
4040
import com.infomaniak.mail.databinding.DialogAiReplaceContentBinding
4141
import com.infomaniak.mail.databinding.FragmentAiPropositionBinding
4242
import com.infomaniak.mail.ui.alertDialogs.AiDescriptionAlertDialog
43+
import com.infomaniak.mail.ui.main.thread.SubjectFormatter.TagColor
4344
import com.infomaniak.mail.ui.newMessage.AiViewModel.PropositionStatus
4445
import com.infomaniak.mail.ui.newMessage.AiViewModel.Shortcut
4546
import com.infomaniak.mail.utils.SimpleIconPopupMenu
46-
import com.infomaniak.mail.utils.extensions.TagColor
4747
import com.infomaniak.mail.utils.extensions.changeToolbarColorOnScroll
4848
import com.infomaniak.mail.utils.extensions.postfixWithTag
4949
import com.infomaniak.mail.utils.extensions.setSystemBarsColors

Diff for: app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt

-2
Original file line numberDiff line numberDiff line change
@@ -607,5 +607,3 @@ fun ViewPager2.removeOverScrollForApiBelow31() {
607607
(getChildAt(0) as? RecyclerView)?.overScrollMode = View.OVER_SCROLL_NEVER
608608
}
609609
}
610-
611-
data class TagColor(@ColorRes val backgroundColorRes: Int, @ColorRes val textColorRes: Int)

0 commit comments

Comments
 (0)