sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

[UI] Improve register unavailable dialog and card.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2020-09-03 23:50:53 +02:00
parent b7e35d0322
commit 22c540a3d4
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/RegisterUnavailableDialog.kt
View File

@ -4,6 +4,7 @@
package pl.szczodrzynski.edziennik.ui.dialogs package pl.szczodrzynski.edziennik.ui.dialogs
import android.text.method.LinkMovementMethod
import android.view.LayoutInflater import android.view.LayoutInflater
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
@ -56,6 +57,7 @@ class RegisterUnavailableDialog(
Utils.openUrl(activity, status.message.url) Utils.openUrl(activity, status.message.url)
} }
} }
b.text.movementMethod = LinkMovementMethod.getInstance()
dialog = MaterialAlertDialogBuilder(activity) dialog = MaterialAlertDialogBuilder(activity)
.setView(b.root) .setView(b.root)
.setPositiveButton(R.string.close) { dialog, _ -> .setPositiveButton(R.string.close) { dialog, _ ->

5
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeAvailabilityCard.kt
View File

@ -4,6 +4,7 @@
package pl.szczodrzynski.edziennik.ui.modules.home.cards package pl.szczodrzynski.edziennik.ui.modules.home.cards
import android.text.Html
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -58,8 +59,8 @@ class HomeAvailabilityCard(
var onInfoClick = { _: View -> } var onInfoClick = { _: View -> }
if (status != null && !status.available && status.message != null) { if (status != null && !status.available && status.message != null) {
b.homeAvailabilityTitle.text = status.message.title b.homeAvailabilityTitle.text = Html.fromHtml(status.message.title)
b.homeAvailabilityText.text = status.message.contentShort b.homeAvailabilityText.text = Html.fromHtml(status.message.contentShort)
b.homeAvailabilityUpdate.isVisible = false b.homeAvailabilityUpdate.isVisible = false
b.homeAvailabilityIcon.setImageResource(R.drawable.ic_sync) b.homeAvailabilityIcon.setImageResource(R.drawable.ic_sync)
if (status.message.icon != null) if (status.message.icon != null)

2
app/src/main/res/layout/dialog_register_unavailable.xml
View File

@ -45,7 +45,7 @@
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{message.title}" android:text="@{Html.fromHtml(message.title)}"
android:textAppearance="@style/NavView.TextView.Title" android:textAppearance="@style/NavView.TextView.Title"
tools:text="Dziennik nie działa" /> tools:text="Dziennik nie działa" />