diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/RegisterUnavailableDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/RegisterUnavailableDialog.kt index de698c5a..e1e4b2b6 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/RegisterUnavailableDialog.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/RegisterUnavailableDialog.kt @@ -4,6 +4,7 @@ package pl.szczodrzynski.edziennik.ui.dialogs +import android.text.method.LinkMovementMethod import android.view.LayoutInflater import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity @@ -56,6 +57,7 @@ class RegisterUnavailableDialog( Utils.openUrl(activity, status.message.url) } } + b.text.movementMethod = LinkMovementMethod.getInstance() dialog = MaterialAlertDialogBuilder(activity) .setView(b.root) .setPositiveButton(R.string.close) { dialog, _ -> diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeAvailabilityCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeAvailabilityCard.kt index 26c8d609..eefd4f6f 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeAvailabilityCard.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeAvailabilityCard.kt @@ -4,6 +4,7 @@ package pl.szczodrzynski.edziennik.ui.modules.home.cards +import android.text.Html import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -58,8 +59,8 @@ class HomeAvailabilityCard( var onInfoClick = { _: View -> } if (status != null && !status.available && status.message != null) { - b.homeAvailabilityTitle.text = status.message.title - b.homeAvailabilityText.text = status.message.contentShort + b.homeAvailabilityTitle.text = Html.fromHtml(status.message.title) + b.homeAvailabilityText.text = Html.fromHtml(status.message.contentShort) b.homeAvailabilityUpdate.isVisible = false b.homeAvailabilityIcon.setImageResource(R.drawable.ic_sync) if (status.message.icon != null) diff --git a/app/src/main/res/layout/dialog_register_unavailable.xml b/app/src/main/res/layout/dialog_register_unavailable.xml index 2d395494..da86a52b 100644 --- a/app/src/main/res/layout/dialog_register_unavailable.xml +++ b/app/src/main/res/layout/dialog_register_unavailable.xml @@ -45,7 +45,7 @@ android:id="@+id/title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@{message.title}" + android:text="@{Html.fromHtml(message.title)}" android:textAppearance="@style/NavView.TextView.Title" tools:text="Dziennik nie dziaƂa" />