Commit 10ddbe35 authored by Harri Kirik's avatar Harri Kirik
Browse files

COVAPP-462: Update the Health Board link

parent b7794976
......@@ -18,7 +18,7 @@ import org.dpppt.android.app.common.util.ViewModelFactory
import org.dpppt.android.app.common.util.addUrlSpans
import org.dpppt.android.app.common.util.exhaustive
import org.dpppt.android.app.common.util.setTextWithBoldSpans
import org.dpppt.android.app.common.util.setTextWithTwoClickableSpans
import org.dpppt.android.app.common.util.setTextWithClickableSpan
import org.dpppt.android.app.databinding.FragmentContactsBinding
import org.dpppt.android.app.di.Injector
import org.dpppt.android.app.main.model.InfectedStatus
......@@ -98,13 +98,10 @@ class ContactsFragment : MvvmFragment(R.layout.fragment_contacts), ViewBindingHo
private fun initClickableText() {
requireBinding {
descriptionCallView.addUrlSpans()
healthBoardRecommendationsView.setTextWithTwoClickableSpans(
getString(R.string.contacts_health_board_recommendations_link),
getString(R.string.contacts_health_board_recommendations_link_clickable_part_1),
{ viewModel.healthBoardRecommendationsClicked() },
getString(R.string.contacts_health_board_recommendations_link_clickable_part_2),
{ viewModel.healthBoardRecommendationsClicked() },
)
healthBoardRecommendationsView.setTextWithClickableSpan(
getString(R.string.contacts_health_board_recommendations),
getString(R.string.contacts_health_board_recommendations_clickable_part),
) { viewModel.healthBoardRecommendationsClicked() }
}
}
}
......@@ -160,7 +160,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_16"
android:layout_marginEnd="@dimen/size_4"
android:text="@string/contacts_health_board_recommendations_link"
android:text="@string/contacts_health_board_recommendations"
app:layout_constraintEnd_toStartOf="@+id/endGuideline"
app:layout_constraintStart_toStartOf="@+id/listStartGuidline"
app:layout_constraintTop_toBottomOf="@+id/descriptionStayHomeView"
......
......@@ -168,9 +168,8 @@ Aitäh, et hoiad lähedasi."</string>
<string name="dp3t_sdk_service_notification_error_sync_api">"Esines sünkroniseerimisviga. Nakatunud võtmete laadimine ebaõnnestus. Kui viga kordub siis kontakteeru kasutajatoega."</string>
<string name="dp3t_sdk_service_notification_error_gaen_not_available">"Google kontaktiteavitus ei tööta praegu sellel seadmel. Palun kontrolli, et seade ja rakendused oleks ajakohased ning et Google Play Services teek oleks installitud. Kui viga kordub siis kontakteeru kasutajatoega."</string>
<string name="dp3t_sdk_service_notification_error_gaen_unexpectedly_disabled">"Google kontaktiteavitus on väljalülitatud. Palun lülita see sisse Seaded -&gt; Google -&gt; COVID-19-ga kokkupuute märguanded. Kui viga kordub siis kontakteeru kasutajatoega."</string>
<string name="contacts_health_board_recommendations_link">"Tutvu Eneseisolatsiooni reeglite ja Terviseameti soovitustega"</string>
<string name="contacts_health_board_recommendations_link_clickable_part_1">"Eneseisolatsiooni reeglite"</string>
<string name="contacts_health_board_recommendations_link_clickable_part_2">"Terviseameti soovitustega"</string>
<string name="contacts_health_board_recommendations">"Tutvu Eneseisolatsiooni reeglite ja Terviseameti soovitustega"</string>
<string name="contacts_health_board_recommendations_clickable_part">"Eneseisolatsiooni reeglite ja Terviseameti soovitustega"</string>
<string name="debug_state_show_pre_share_screen">"Võtmete jagamise eelne ekraan"</string>
<string name="confirm_infection_pre_share_info_title">"Anonüümsete koodide jagamine"</string>
<string name="confirm_infection_pre_share_info_subtitle">"Anna luba oma telefonil jagada anonüümseid koode HOIA rakendusega, vajutades “Jaga”, “Отправить” või “Share” nupule."</string>
......
......@@ -168,9 +168,8 @@ Aitäh, et hoiad lähedasi."</string>
<string name="dp3t_sdk_service_notification_error_sync_api">"A backend synchronisation error has occurred. Failed to load new infection data. If the problem persists, contact support."</string>
<string name="dp3t_sdk_service_notification_error_gaen_not_available">"Google Exposure Notification API is currently not available on this device. Please check that your device and applications are up to date and that Google Play Services is installed. If the problem persists, contact support."</string>
<string name="dp3t_sdk_service_notification_error_gaen_unexpectedly_disabled">"Google Exposure Notification API is currently disabled. Please enable it from Settings -&gt; Google -&gt; COVID-19 Exposure Notifications. If the problem persists, contact support."</string>
<string name="contacts_health_board_recommendations_link">"Tutvu Eneseisolatsiooni reeglite ja Terviseameti soovitustega"</string>
<string name="contacts_health_board_recommendations_link_clickable_part_1">"Eneseisolatsiooni reeglite"</string>
<string name="contacts_health_board_recommendations_link_clickable_part_2">"Terviseameti soovitustega"</string>
<string name="contacts_health_board_recommendations">"Tutvu Eneseisolatsiooni reeglite ja Terviseameti soovitustega"</string>
<string name="contacts_health_board_recommendations_clickable_part">"Eneseisolatsiooni reeglite ja Terviseameti soovitustega"</string>
<string name="debug_state_show_pre_share_screen">"Share keys intro screen"</string>
<string name="confirm_infection_pre_share_info_title">"Share anonymous codes"</string>
<string name="confirm_infection_pre_share_info_subtitle">"Anna luba oma telefonil jagada anonüümseid koode HOIA rakendusega, vajutades “Jaga”, “Отправить” või “Share” nupule."</string>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment