diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/ErrorDetailsDialog.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/ErrorDetailsDialog.kt index 6f9d0f12c..3e8048c4a 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/ErrorDetailsDialog.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/ErrorDetailsDialog.kt @@ -4,11 +4,11 @@ import android.content.ClipData import android.content.ClipboardManager import android.content.Context import android.os.Bundle -import android.text.method.LinkMovementMethod import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.text.HtmlCompat import androidx.core.text.htmlEncode +import androidx.core.text.method.LinkMovementMethodCompat import androidx.core.text.parseAsHtml import androidx.fragment.app.FragmentManager import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -37,7 +37,7 @@ class ErrorDetailsDialog : AlertDialogFragment() { override fun onViewBindingCreated(binding: DialogErrorDetailsBinding, savedInstanceState: Bundle?) { super.onViewBindingCreated(binding, savedInstanceState) with(binding.textViewMessage) { - movementMethod = LinkMovementMethod.getInstance() + movementMethod = LinkMovementMethodCompat.getInstance() text = context.getString( R.string.manga_error_description_pattern, exception.message?.htmlEncode().orEmpty(), diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsFragment.kt index de890e911..24bcd4850 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsFragment.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsFragment.kt @@ -1,7 +1,6 @@ package org.koitharu.kotatsu.details.ui import android.os.Bundle -import android.text.method.LinkMovementMethod import android.transition.TransitionManager import android.view.LayoutInflater import android.view.View @@ -13,6 +12,7 @@ import androidx.core.content.ContextCompat import androidx.core.graphics.Insets import androidx.core.text.buildSpannedString import androidx.core.text.color +import androidx.core.text.method.LinkMovementMethodCompat import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.core.view.updatePadding @@ -107,7 +107,7 @@ class DetailsFragment : binding.infoLayout.textViewSource.setOnClickListener(this) binding.textViewDescription.addOnLayoutChangeListener(this) binding.textViewDescription.viewTreeObserver.addOnDrawListener(this) - binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance() + binding.textViewDescription.movementMethod = LinkMovementMethodCompat.getInstance() binding.chipsTags.onChipClickListener = this binding.recyclerViewRelated.addItemDecoration( SpacingItemDecoration(resources.getDimensionPixelOffset(R.dimen.grid_spacing)), diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoSheet.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoSheet.kt index 3593b0e69..cc3f71d6a 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoSheet.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoSheet.kt @@ -2,7 +2,6 @@ package org.koitharu.kotatsu.details.ui.scrobbling import android.content.Intent import android.os.Bundle -import android.text.method.LinkMovementMethod import android.view.LayoutInflater import android.view.MenuItem import android.view.View @@ -12,6 +11,7 @@ import android.widget.RatingBar import android.widget.Toast import androidx.appcompat.widget.PopupMenu import androidx.core.net.toUri +import androidx.core.text.method.LinkMovementMethodCompat import androidx.fragment.app.FragmentManager import androidx.fragment.app.activityViewModels import coil.ImageLoader @@ -71,7 +71,7 @@ class ScrobblingInfoSheet : binding.ratingBar.onRatingBarChangeListener = this binding.buttonMenu.setOnClickListener(this) binding.imageViewCover.setOnClickListener(this) - binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance() + binding.textViewDescription.movementMethod = LinkMovementMethodCompat.getInstance() menu = PopupMenu(binding.root.context, binding.buttonMenu).apply { inflate(R.menu.opt_scrobbling) diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewFragment.kt index 2849030df..712d717f7 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewFragment.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewFragment.kt @@ -1,12 +1,12 @@ package org.koitharu.kotatsu.list.ui.preview import android.os.Bundle -import android.text.method.LinkMovementMethod import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView import androidx.core.graphics.Insets +import androidx.core.text.method.LinkMovementMethodCompat import androidx.core.view.isVisible import androidx.fragment.app.viewModels import coil.ImageLoader @@ -52,7 +52,7 @@ class PreviewFragment : BaseFragment(), View.OnClickList super.onViewBindingCreated(binding, savedInstanceState) binding.buttonClose.isVisible = activity is MangaListActivity binding.buttonClose.setOnClickListener(this) - binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance() + binding.textViewDescription.movementMethod = LinkMovementMethodCompat.getInstance() binding.chipsTags.onChipClickListener = this binding.textViewAuthor.setOnClickListener(this) binding.imageViewCover.setOnClickListener(this) diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/LinksPreference.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/LinksPreference.kt index 4317f93ea..2820a6ecb 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/LinksPreference.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/LinksPreference.kt @@ -1,9 +1,9 @@ package org.koitharu.kotatsu.settings.utils import android.content.Context -import android.text.method.LinkMovementMethod import android.util.AttributeSet import android.widget.TextView +import androidx.core.text.method.LinkMovementMethodCompat import androidx.preference.Preference import androidx.preference.PreferenceViewHolder @@ -13,11 +13,9 @@ class LinksPreference @JvmOverloads constructor( defStyleAttr: Int = androidx.preference.R.attr.preferenceStyle, defStyleRes: Int = 0, ) : Preference(context, attrs, defStyleAttr, defStyleRes) { - - override fun onBindViewHolder(holder: PreferenceViewHolder) { super.onBindViewHolder(holder) val summaryView = holder.findViewById(android.R.id.summary) as TextView - summaryView.movementMethod = LinkMovementMethod.getInstance() + summaryView.movementMethod = LinkMovementMethodCompat.getInstance() } -} \ No newline at end of file +}