From f8fac5b5f0a6fa8a3340c7e1de8e446a62311ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20R=C3=B6sch?= Date: Tue, 12 Oct 2021 23:43:50 +0200 Subject: [PATCH 1/4] add vaccination appointment screen --- app/build.gradle | 4 +- .../ch/admin/bag/dp3t/home/HomeFragment.java | 21 +++ .../admin/bag/dp3t/networking/ConfigWorker.kt | 4 + .../models/ConfigResponseModel.java | 16 ++ .../VaccinationBookingCantonCollection.java | 18 ++ .../models/VaccinationBookingCantonModel.kt | 16 ++ .../VaccinationBookingInfoCollection.java | 18 ++ .../models/VaccinationBookingInfoModel.kt | 17 ++ .../admin/bag/dp3t/storage/SecureStorage.java | 47 ++++- .../VaccinationAppointmentCantonAdapter.kt | 41 ++++ .../VaccinationAppointmentCantonViewHolder.kt | 26 +++ .../VaccinationAppointmentFragment.kt | 80 ++++++++ .../main/res/drawable/illu_impfung_doc.xml | 100 ++++++++++ app/src/main/res/layout/card_vaccination.xml | 73 ++++++++ app/src/main/res/layout/fragment_home.xml | 7 + .../fragment_vaccination_appointment.xml | 177 ++++++++++++++++++ .../item_vaccination_appointment_canton.xml | 30 +++ common/src/main/res/values-bs/strings.xml | 115 ++++++++++++ common/src/main/res/values-de/strings.xml | 116 ++++++++++++ common/src/main/res/values-es/strings.xml | 115 ++++++++++++ common/src/main/res/values-fr/strings.xml | 115 ++++++++++++ common/src/main/res/values-hr/strings.xml | 115 ++++++++++++ common/src/main/res/values-it/strings.xml | 115 ++++++++++++ common/src/main/res/values-pt/strings.xml | 117 +++++++++++- common/src/main/res/values-rm/strings.xml | 115 ++++++++++++ common/src/main/res/values-sq/strings.xml | 115 ++++++++++++ common/src/main/res/values-sr/strings.xml | 115 ++++++++++++ common/src/main/res/values-ti/strings.xml | 117 +++++++++++- common/src/main/res/values-tr/strings.xml | 117 +++++++++++- common/src/main/res/values/strings.xml | 115 ++++++++++++ 30 files changed, 2188 insertions(+), 9 deletions(-) create mode 100644 app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingCantonCollection.java create mode 100644 app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingCantonModel.kt create mode 100644 app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingInfoCollection.java create mode 100644 app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingInfoModel.kt create mode 100644 app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentCantonAdapter.kt create mode 100644 app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentCantonViewHolder.kt create mode 100644 app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentFragment.kt create mode 100644 app/src/main/res/drawable/illu_impfung_doc.xml create mode 100644 app/src/main/res/layout/card_vaccination.xml create mode 100644 app/src/main/res/layout/fragment_vaccination_appointment.xml create mode 100644 app/src/main/res/layout/item_vaccination_appointment_canton.xml diff --git a/app/build.gradle b/app/build.gradle index 2b50b20e..929f7590 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,8 +24,8 @@ android { applicationId "ch.admin.bag.dp3t" minSdkVersion 23 targetSdkVersion 30 - versionCode 21000 - versionName "2.1.0" + versionCode 22000 + versionName "2.2.0" resConfigs "en", "fr", "de", "it", "pt", "es", "sq", "bs", "hr", "sr", "rm", "tr", "ti" buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L' diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java index 735762b0..825e4027 100644 --- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java +++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java @@ -41,6 +41,7 @@ import org.dpppt.android.sdk.TracingStatus; +import ch.admin.bag.covidcertificate.wallet.vaccination.appointment.VaccinationAppointmentFragment; import ch.admin.bag.dp3t.BuildConfig; import ch.admin.bag.dp3t.R; import ch.admin.bag.dp3t.checkin.CheckinOverviewFragment; @@ -82,6 +83,8 @@ public class HomeFragment extends Fragment { private View reportStatusView; private View reportErrorView; private View checkinCard; + private View vaccinationCardWrapper; + private View vaccinationCard; private View loadingView; private View covidCodeCard; @@ -119,6 +122,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat reportStatusView = reportStatusBubble.findViewById(R.id.report_status); reportErrorView = reportStatusBubble.findViewById(R.id.report_errors); checkinCard = view.findViewById(R.id.card_checkin); + vaccinationCardWrapper = view.findViewById(R.id.card_vaccination_wrapper); + vaccinationCard = view.findViewById(R.id.card_vaccination); headerView = view.findViewById(R.id.home_header_view); scrollView = view.findViewById(R.id.home_scroll_view); loadingView = view.findViewById(R.id.loading_view); @@ -129,6 +134,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat setupTracingView(); setupNotification(); setupCheckinCard(); + setupVaccinationCard(); setupNonProductionHint(); setupScrollBehavior(); setupCovidCodeCard(); @@ -447,6 +453,21 @@ private void setupCheckinCardNonIsolationMode() { duration -> checkinTime.setText(StringUtil.getShortDurationString(duration))); } + private void setupVaccinationCard(){ + if(secureStorage.getShowVaccinationInfo()){ + vaccinationCardWrapper.setVisibility(VISIBLE); + vaccinationCard.setOnClickListener(v -> { + requireActivity().getSupportFragmentManager().beginTransaction() + .setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit) + .replace(R.id.main_fragment_container, VaccinationAppointmentFragment.Companion.newInstance()) + .addToBackStack(VaccinationAppointmentFragment.class.getCanonicalName()) + .commit(); + }); + }else { + vaccinationCardWrapper.setVisibility(View.GONE); + } + } + private void setupCovidCodeCard() { Button covidCodeButton = covidCodeCard.findViewById(R.id.enter_covidcode_button); TextView covidCodeTitle = covidCodeCard.findViewById(R.id.enter_covidcode_title); diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt index 5c333043..e402e8b4 100644 --- a/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt +++ b/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt @@ -88,6 +88,10 @@ class ConfigWorker(context: Context, workerParams: WorkerParameters) : Coroutine secureStorage.setTestInformationUrls(config.testInformationUrls) + secureStorage.setVaccinationBookingInfo(config.vaccinationBookingInfo) + secureStorage.setVaccinationBookingCantons(config.vaccinationBookingCantons) + secureStorage.setShowVaccinationInfo(config.isShowVaccinationInfo) + secureStorage.testLocations = config.testLocations secureStorage.interopCountries = config.interOpsCountries diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/ConfigResponseModel.java b/app/src/main/java/ch/admin/bag/dp3t/networking/models/ConfigResponseModel.java index 205fe5f6..850a3ede 100644 --- a/app/src/main/java/ch/admin/bag/dp3t/networking/models/ConfigResponseModel.java +++ b/app/src/main/java/ch/admin/bag/dp3t/networking/models/ConfigResponseModel.java @@ -23,6 +23,10 @@ public class ConfigResponseModel { private Map testInformationUrls; private boolean checkInUpdateNotificationEnabled; + private VaccinationBookingCantonCollection vaccinationBookingCantons; + private VaccinationBookingInfoCollection vaccinationBookingInfo; + private boolean showVaccinationInfo; + public boolean getDoForceUpdate() { return forceUpdate; } @@ -60,4 +64,16 @@ public boolean isCheckInUpdateNotificationEnabled() { return checkInUpdateNotificationEnabled; } + public VaccinationBookingCantonCollection getVaccinationBookingCantons() { + return vaccinationBookingCantons; + } + + public VaccinationBookingInfoCollection getVaccinationBookingInfo() { + return vaccinationBookingInfo; + } + + public boolean isShowVaccinationInfo() { + return showVaccinationInfo; + } + } diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingCantonCollection.java b/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingCantonCollection.java new file mode 100644 index 00000000..41102878 --- /dev/null +++ b/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingCantonCollection.java @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 Ubique Innovation AG + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 + */ +package ch.admin.bag.dp3t.networking.models; + +import java.util.HashMap; +import java.util.List; + +import ch.admin.bag.covidcertificate.common.config.VaccinationBookingCantonModel; + +public class VaccinationBookingCantonCollection extends HashMap> { +} diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingCantonModel.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingCantonModel.kt new file mode 100644 index 00000000..47e740e2 --- /dev/null +++ b/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingCantonModel.kt @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2021 Ubique Innovation AG + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 + */ + +package ch.admin.bag.covidcertificate.common.config + +data class VaccinationBookingCantonModel( + val name: String, + val linkUrl: String +) diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingInfoCollection.java b/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingInfoCollection.java new file mode 100644 index 00000000..c9fee464 --- /dev/null +++ b/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingInfoCollection.java @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 Ubique Innovation AG + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 + */ +package ch.admin.bag.dp3t.networking.models; + +import java.util.HashMap; +import java.util.Map; + +import ch.admin.bag.covidcertificate.common.config.VaccinationBookingInfoModel; + +public class VaccinationBookingInfoCollection extends HashMap { +} diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingInfoModel.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingInfoModel.kt new file mode 100644 index 00000000..ac7e9413 --- /dev/null +++ b/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingInfoModel.kt @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2021 Ubique Innovation AG + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 + */ + +package ch.admin.bag.covidcertificate.common.config + +data class VaccinationBookingInfoModel( + val title: String, + val text: String, + val info: String +) diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java index f4aa90c4..9e8cf8cc 100644 --- a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java +++ b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java @@ -31,11 +31,10 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import ch.admin.bag.covidcertificate.common.config.VaccinationBookingCantonModel; +import ch.admin.bag.covidcertificate.common.config.VaccinationBookingInfoModel; import ch.admin.bag.dp3t.checkin.models.CheckInState; -import ch.admin.bag.dp3t.networking.models.InfoBoxModelCollection; -import ch.admin.bag.dp3t.networking.models.TestLocationModel; -import ch.admin.bag.dp3t.networking.models.WhatToDoPositiveTestTextsCollection; -import ch.admin.bag.dp3t.networking.models.WhatToDoPositiveTestTextsModel; +import ch.admin.bag.dp3t.networking.models.*; public class SecureStorage { @@ -68,6 +67,9 @@ public class SecureStorage { private static final String KEY_LAST_CONFIG_LOAD_SUCCESS_SDK_INT = "last_config_load_success_sdk_int"; private static final String KEY_T_DUMMY = "KEY_T_DUMMY"; private static final String KEY_WHAT_TO_DO_POSITIVE_TEST_TEXTS = "whatToDoPositiveTestTexts"; + private static final String KEY_VACCINATION_BOOKING_INFO = "vaccinationBookingInfo"; + private static final String KEY_VACCINATION_CANTONS = "vaccinationCantons"; + private static final String KEY_SHOW_VACCINATION_INFO = "showVaccinationInfo"; private static final String KEY_TEST_LOCATIONS = "test_locations"; private static final String KEY_INTEROP_COUNTRIES = "interop_countries"; private static final String KEY_APP_OPEN_AFTER_NOTIFICATION_PENDING = "appOpenAfterNotificationPending"; @@ -322,6 +324,43 @@ public WhatToDoPositiveTestTextsModel getWhatToDoPositiveTestTexts(String langua return map.get(language); } + public void setVaccinationBookingInfo(VaccinationBookingInfoCollection vaccinationBookingInfoCollection) { + prefs.edit().putString(KEY_VACCINATION_BOOKING_INFO, gson.toJson(vaccinationBookingInfoCollection)).apply(); + } + + public VaccinationBookingInfoModel getVaccinationBookingInfo(String language) { + HashMap map = + gson.fromJson(prefs.getString(KEY_VACCINATION_BOOKING_INFO, "null"), + VaccinationBookingInfoCollection.class); + if (map == null) { + return null; + } + return map.get(language); + } + + public void setVaccinationBookingCantons(VaccinationBookingCantonCollection vaccinationBookingCantonCollection) { + prefs.edit().putString(KEY_VACCINATION_CANTONS, gson.toJson(vaccinationBookingCantonCollection)).apply(); + } + + public List getVaccinationBookingCantons(String language) { + HashMap> map = + gson.fromJson(prefs.getString(KEY_VACCINATION_CANTONS, "null"), + VaccinationBookingCantonCollection.class); + if (map == null) { + return null; + } + return map.get(language); + } + + + public void setShowVaccinationInfo(boolean showVaccinationInfo) { + prefs.edit().putBoolean(KEY_SHOW_VACCINATION_INFO, showVaccinationInfo).apply(); + } + + public boolean getShowVaccinationInfo(){ + return prefs.getBoolean(KEY_SHOW_VACCINATION_INFO, false); + } + public void setTestLocations(Map> testLocations) { prefs.edit().putString(KEY_TEST_LOCATIONS, gson.toJson(testLocations)).apply(); } diff --git a/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentCantonAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentCantonAdapter.kt new file mode 100644 index 00000000..0118e913 --- /dev/null +++ b/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentCantonAdapter.kt @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021 Ubique Innovation AG + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 + */ + +package ch.admin.bag.covidcertificate.wallet.vaccination.appointment + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import ch.admin.bag.covidcertificate.common.config.VaccinationBookingCantonModel +import ch.admin.bag.dp3t.databinding.ItemVaccinationAppointmentCantonBinding + +class VaccinationAppointmentCantonAdapter( + private val onCantonClicked: (VaccinationBookingCantonModel) -> Unit +) : RecyclerView.Adapter() { + + private val items = mutableListOf() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VaccinationAppointmentCantonViewHolder { + val binding = ItemVaccinationAppointmentCantonBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return VaccinationAppointmentCantonViewHolder(binding) + } + + override fun onBindViewHolder(holder: VaccinationAppointmentCantonViewHolder, position: Int) { + holder.bind(items[position], onCantonClicked) + } + + override fun getItemCount() = items.size + + fun setItems(newItems: List) { + items.clear() + items.addAll(newItems) + notifyDataSetChanged() + } +} \ No newline at end of file diff --git a/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentCantonViewHolder.kt b/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentCantonViewHolder.kt new file mode 100644 index 00000000..ed5d0d66 --- /dev/null +++ b/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentCantonViewHolder.kt @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2021 Ubique Innovation AG + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 + */ + +package ch.admin.bag.covidcertificate.wallet.vaccination.appointment + +import androidx.recyclerview.widget.RecyclerView +import ch.admin.bag.covidcertificate.common.config.VaccinationBookingCantonModel +import ch.admin.bag.dp3t.databinding.ItemVaccinationAppointmentCantonBinding + +class VaccinationAppointmentCantonViewHolder( + private val binding: ItemVaccinationAppointmentCantonBinding +) : RecyclerView.ViewHolder(binding.root) { + + fun bind(canton: VaccinationBookingCantonModel, onCantonClicked: (VaccinationBookingCantonModel) -> Unit) { + binding.root.setOnClickListener { onCantonClicked.invoke(canton) } + binding.cantonName.text = canton.name + } + +} \ No newline at end of file diff --git a/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentFragment.kt new file mode 100644 index 00000000..4a3acf82 --- /dev/null +++ b/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentFragment.kt @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2021 Ubique Innovation AG + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 + */ + +package ch.admin.bag.covidcertificate.wallet.vaccination.appointment + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.LinearLayout +import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.DividerItemDecoration +import ch.admin.bag.covidcertificate.common.config.VaccinationBookingCantonModel +import ch.admin.bag.covidcertificate.common.config.VaccinationBookingInfoModel +import ch.admin.bag.dp3t.R +import ch.admin.bag.dp3t.databinding.FragmentVaccinationAppointmentBinding +import ch.admin.bag.dp3t.storage.SecureStorage +import ch.admin.bag.dp3t.util.UrlUtil + +class VaccinationAppointmentFragment : Fragment() { + + companion object { + fun newInstance() = VaccinationAppointmentFragment() + } + + private var _binding: FragmentVaccinationAppointmentBinding? = null + private val binding get() = _binding!! + + private val adapter = VaccinationAppointmentCantonAdapter(this::onCantonClicked) + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { + _binding = FragmentVaccinationAppointmentBinding.inflate(inflater, container, false) + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + binding.toolbar.setNavigationOnClickListener { parentFragmentManager.popBackStack() } + setupCantonList() + setupMoreInformationButton() + + val secureStorage = SecureStorage.getInstance(context) + secureStorage.getVaccinationBookingInfo(requireContext().getString(R.string.language_key))?.let { + setupVaccinationBookingInfo(it) + } + adapter.setItems( + secureStorage.getVaccinationBookingCantons(requireContext().getString(R.string.language_key)) ?: emptyList() + ) + + } + + private fun setupCantonList() { + binding.vaccinationAppointmentCantonList.adapter = adapter + } + + private fun setupVaccinationBookingInfo(vaccinationBookingInfo: VaccinationBookingInfoModel) { + binding.vaccinationBookingTitle.text = vaccinationBookingInfo.title + binding.vaccinationBookingText.text = vaccinationBookingInfo.text + binding.vaccinationBookingInfo.text = vaccinationBookingInfo.info + } + + private fun setupMoreInformationButton() { + binding.vaccinationMoreInfoButton.setOnClickListener { + val url = getString(R.string.vaccination_booking_info_url) + UrlUtil.openUrl(requireContext(), url) + } + } + + private fun onCantonClicked(canton: VaccinationBookingCantonModel) { + UrlUtil.openUrl(requireContext(), canton.linkUrl) + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable/illu_impfung_doc.xml b/app/src/main/res/drawable/illu_impfung_doc.xml new file mode 100644 index 00000000..9c271bc5 --- /dev/null +++ b/app/src/main/res/drawable/illu_impfung_doc.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/card_vaccination.xml b/app/src/main/res/layout/card_vaccination.xml new file mode 100644 index 00000000..e5b89da3 --- /dev/null +++ b/app/src/main/res/layout/card_vaccination.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 5d0caab7..bfc8514e 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -62,6 +62,13 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/spacing_medium_large" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_vaccination_appointment_canton.xml b/app/src/main/res/layout/item_vaccination_appointment_canton.xml new file mode 100644 index 00000000..81beaa89 --- /dev/null +++ b/app/src/main/res/layout/item_vaccination_appointment_canton.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/values-bs/strings.xml b/common/src/main/res/values-bs/strings.xml index c2657646..e10d11d1 100644 --- a/common/src/main/res/values-bs/strings.xml +++ b/common/src/main/res/values-bs/strings.xml @@ -1853,4 +1853,119 @@ U tom slučaju kontaktirajte nas ovde:" "Kako biste se prijavili na nekom drugom mestu, najpre se morate odjaviti odavde." + + + "Zakazivanje termina za vakcinaciju u Vašoj blizini" + + + "Vakcinacija se može održati na primer na sledećim mestima u Vašoj blizini: + +- u specifičnim centrima za vakcinaciju +- u bolnicama +- kod Vašeg ličnog lekara ili lekarke +- u vakcinišućim apotekama + +Mnoga mesta nude i vakcinaciju bez zakazanog termina" + + + "Vakcina za Covid-19 preporučena je osobama starijim od 12 godina. Vakcinacija je besplatna." + + + "https://www.ag.ch/coronavirus-impfung" + + + "https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/coronaimpfung/" + + + "https://www.ai.ch/coronavirus-impfung" + + + "https://www.baselland.ch/politik-und-behorden/direktionen/volkswirtschafts-und-gesundheitsdirektion/amt-fur-gesundheit/medizinische-dienste/kantonsarztlicher-dienst/aktuelles/corona-impfung/englisch-english" + + + "http://www.coronaimpfzentrumbasel.ch" + + + "http://www.be.ch/corona-impfung" + + + "https://www.fr.ch/sante/covid-19/covid-19-vaccination" + + + "https://www.ge.ch/en/getting-vaccinated-against-covid-19" + + + "https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817#Impfung" + + + "https://www.gr.ch/DE/institutionen/verwaltung/djsg/ga/coronavirus/info/impfen/Seiten/impfen.aspx" + + + "https://www.jura.ch/fr/Autorites/Coronavirus/Vaccination.html" + + + "http://www.lu.ch/covid_impfung" + + + "https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/covid-19-vaccination/Pages/accueil.aspx" + + + "https://www.nw.ch/gesundheitsamtdienste/6044#Impfung" + + + "https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962#Impfung" + + + "https://www.sg.ch/coronavirus/impfen" + + + "https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-7126057-DE.html" + + + "https://www.sz.ch/corona-impfen" + + + "https://so.ch/coronaimpfung" + + + "https://gesundheit.tg.ch/aktuelles/impfung-fuer-covid-19.html/11590" + + + "http://www.ti.ch/vaccinazione" + + + "https://www.ur.ch/themen/3673" + + + "https://www.vs.ch/de/web/coronavirus#ancre_vaccination" + + + "https://vd.ch/coronavirus-vaccins" + + + "https://www.corona-impfung-zug.ch/en/" + + + "http://www.zh.ch/coronaimpfung" + + + "Termin za vakcinaciju" + + + "Još niste vakcinisani?" + + + "Zakažite sada termin " + + + "https://bag-coronavirus.ch/impfung/" + + + "Dalje informacije oko vakcine za Covid-19" + + + "Napomena" + + + "Izaberite svoj kanton" \ No newline at end of file diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml index fe324068..5382781e 100644 --- a/common/src/main/res/values-de/strings.xml +++ b/common/src/main/res/values-de/strings.xml @@ -1938,4 +1938,120 @@ Dieser Titel wird beim Check-in angezeigt." "Um sich an einem neuen Ort einzuchecken, müssen Sie sich zuerst auschecken." + + + "Impftermin in Ihrer Nähe buchen" + + + "Eine Impfung könnte zum Beispiel an diesen Orten in Ihrer Nähe stattfinden: + +- in spezifischen Impfzentren +- in Spitälern +- bei Ihrem Hausarzt oder Ihrer Hausärztin +- in Impfapotheken + +Viele Orte bieten auch Walk-in-Impfungen ohne Termine an." + + + "Die Covid-19-Impfung ist für Personen ab 12 Jahren empfohlen. Die Impfung ist gratis." + + + "https://www.ag.ch/coronavirus-impfung" + + + "https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/coronaimpfung/" + + + "https://www.ai.ch/coronavirus-impfung" + + + "https://www.bl.ch/impfen" + + + "http://www.coronaimpfzentrumbasel.ch" + + + "http://www.be.ch/corona-impfung" + + + "https://www.fr.ch/sante/covid-19/covid-19-vaccination" + + + "https://www.ge.ch/se-faire-vacciner-contre-covid-19" + + + "https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817#Impfung" + + + "https://www.gr.ch/DE/institutionen/verwaltung/djsg/ga/coronavirus/info/impfen/Seiten/impfen.aspx" + + + "https://www.jura.ch/fr/Autorites/Coronavirus/Vaccination.html" + + + "http://www.lu.ch/covid_impfung" + + + "https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/covid-19-vaccination/Pages/accueil.aspx" + + + "https://www.nw.ch/gesundheitsamtdienste/6044#Impfung" + + + "https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962#Impfung" + + + "https://www.sg.ch/coronavirus/impfen" + + + "https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-7126057-DE.html" + + + "https://www.sz.ch/corona-impfen" + + + "https://so.ch/coronaimpfung" + + + "https://gesundheit.tg.ch/aktuelles/impfung-fuer-covid-19.html/11590" + + + "http://www.ti.ch/vaccinazione" + + + "https://www.ur.ch/themen/3673" + + + "https://www.vs.ch/de/web/coronavirus#ancre_vaccination" + + + "https://vd.ch/coronavirus-vaccins" + + + "https://www.corona-impfung-zug.ch/" + + + "http://www.zh.ch/coronaimpfung" + + + + "Impfen" + + + "Noch nicht geimpft?" + + + "Jetzt Termin buchen" + + + "https://bag-coronavirus.ch/impfung/" + + + "Weitere Informationen rund um die Covid-19-Impfung" + + + "Hinweis" + + + "Wählen Sie Ihren Kanton" \ No newline at end of file diff --git a/common/src/main/res/values-es/strings.xml b/common/src/main/res/values-es/strings.xml index fd0e96c6..c24de199 100644 --- a/common/src/main/res/values-es/strings.xml +++ b/common/src/main/res/values-es/strings.xml @@ -1845,4 +1845,119 @@ Posibles utilizaciones: "Para poder registrarse en una nueva localidad, tiene que primero darse de baja mediante Check-out. " + + + "Concertar una cita para la vacunación cerca de usted" + + + "Es posible vacunarse, por ejemplo, en los siguientes puntos cerca de usted: + +- en centros de vacunación específicos +- en hospitales +- en la consulta de su médico de familia +- en farmacias que ofrecen la vacunación + +Muchos centros ofrecen la posibllidad de vacunarse sin cita previa." + + + "Se recomienda la vacuna contra la Covid-19 a las personas mayores de 12 años. La vacuna es gratuita." + + + "https://www.ag.ch/coronavirus-impfung" + + + "https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/coronaimpfung/" + + + "https://www.ai.ch/coronavirus-impfung" + + + "https://www.baselland.ch/politik-und-behorden/direktionen/volkswirtschafts-und-gesundheitsdirektion/amt-fur-gesundheit/medizinische-dienste/kantonsarztlicher-dienst/aktuelles/corona-impfung/englisch-english" + + + "http://www.coronaimpfzentrumbasel.ch" + + + "http://www.be.ch/corona-impfung" + + + "https://www.fr.ch/sante/covid-19/covid-19-vaccination" + + + "https://www.ge.ch/en/getting-vaccinated-against-covid-19" + + + "https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817#Impfung" + + + "https://www.gr.ch/DE/institutionen/verwaltung/djsg/ga/coronavirus/info/impfen/Seiten/impfen.aspx" + + + "https://www.jura.ch/fr/Autorites/Coronavirus/Vaccination.html" + + + "http://www.lu.ch/covid_impfung" + + + "https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/covid-19-vaccination/Pages/accueil.aspx" + + + "https://www.nw.ch/gesundheitsamtdienste/6044#Impfung" + + + "https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962#Impfung" + + + "https://www.sg.ch/coronavirus/impfen" + + + "https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-7126057-DE.html" + + + "https://www.sz.ch/corona-impfen" + + + "https://so.ch/coronaimpfung" + + + "https://gesundheit.tg.ch/aktuelles/impfung-fuer-covid-19.html/11590" + + + "http://www.ti.ch/vaccinazione" + + + "https://www.ur.ch/themen/3673" + + + "https://www.vs.ch/de/web/coronavirus#ancre_vaccination" + + + "https://vd.ch/coronavirus-vaccins" + + + "https://www.corona-impfung-zug.ch/en/" + + + "http://www.zh.ch/coronaimpfung" + + + "Cita de vacunación" + + + "¿Aún no se ha vacunado?" + + + "Concierte su cita ahora" + + + "https://bag-coronavirus.ch/impfung/" + + + "Más informaciones sobre la vacuna contra la Covid-19" + + + "Observación" + + + "Seleccione su cantón" \ No newline at end of file diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml index 6c9ba8ce..5e14ca8c 100644 --- a/common/src/main/res/values-fr/strings.xml +++ b/common/src/main/res/values-fr/strings.xml @@ -1877,4 +1877,119 @@ Ce titre s’affichera lors du check-in." "Pour vous connecter à un nouvel endroit, vous devez d'abord enregistrer votre départ." + + + "Prendre un rendez-vous de vaccination près de chez vous" + + + "La vaccination pourrait, par exemple, être proposée dans les lieux suivants situés à proximité de chez vous : + +- dans des centres de vaccination désignés +- dans les hôpitaux +- chez votre médecin de famille +- dans les pharmacies + +Il est aussi possible de se faire vacciner sans rendez-vous dans de nombreux endroits." + + + "Gratuite, la vaccination contre le COVID-19 est recommandée pour les personnes dès 12 ans." + + + "https://www.ag.ch/coronavirus-impfung" + + + "https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/coronaimpfung/" + + + "https://www.ai.ch/coronavirus-impfung" + + + "https://www.baselland.ch/politik-und-behorden/direktionen/volkswirtschafts-und-gesundheitsdirektion/amt-fur-gesundheit/medizinische-dienste/kantonsarztlicher-dienst/aktuelles/corona-impfung/franzoesisch-francais" + + + "http://www.coronaimpfzentrumbasel.ch" + + + "https://www.gsi.be.ch/fr/start/themen/coronavirus/impfen.html" + + + "https://www.fr.ch/sante/covid-19/covid-19-vaccination" + + + "https://www.ge.ch/se-faire-vacciner-contre-covid-19" + + + "https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817#Impfung" + + + "https://www.gr.ch/DE/institutionen/verwaltung/djsg/ga/coronavirus/info/impfen/Seiten/impfen.aspx" + + + "https://www.jura.ch/fr/Autorites/Coronavirus/Vaccination.html" + + + "http://www.lu.ch/covid_impfung" + + + "https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/covid-19-vaccination/Pages/accueil.aspx" + + + "https://www.nw.ch/gesundheitsamtdienste/6044#Impfung" + + + "https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962#Impfung" + + + "https://www.sg.ch/coronavirus/impfen" + + + "https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-7126057-DE.html" + + + "https://www.sz.ch/corona-impfen" + + + "https://so.ch/coronaimpfung" + + + "https://gesundheit.tg.ch/aktuelles/impfung-fuer-covid-19.html/11590" + + + "http://www.ti.ch/vaccinazione" + + + "https://www.ur.ch/themen/3673" + + + "https://www.vs.ch/web/coronavirus/#ancre_vaccination" + + + "https://vd.ch/coronavirus-vaccins" + + + "https://www.corona-impfung-zug.ch/" + + + "http://www.zh.ch/coronaimpfung" + + + "Rendez-vous de vaccination" + + + "Pas encore vacciné ?" + + + "Prendre un rendez-vous maintenant" + + + "https://foph-coronavirus.ch/vaccination/" + + + "Plus d’informations sur la vaccination contre le COVID-19" + + + "Information" + + + "Sélectionnez votre canton" \ No newline at end of file diff --git a/common/src/main/res/values-hr/strings.xml b/common/src/main/res/values-hr/strings.xml index 4aa1b44d..db0bb8c0 100644 --- a/common/src/main/res/values-hr/strings.xml +++ b/common/src/main/res/values-hr/strings.xml @@ -1851,4 +1851,119 @@ U tom slučaju kontaktirajte nas ovde:" "Kako biste se prijavili na nekom drugom mestu, najpre se morate odjaviti odavde." + + + "Zakazivanje termina za vakcinaciju u Vašoj blizini" + + + "Vakcinacija se može održati na primer na sledećim mestima u Vašoj blizini: + +- u specifičnim centrima za vakcinaciju +- u bolnicama +- kod Vašeg ličnog lekara ili lekarke +- u vakcinišućim apotekama + +Mnoga mesta nude i vakcinaciju bez zakazanog termina" + + + "Vakcina za Covid-19 preporučena je osobama starijim od 12 godina. Vakcinacija je besplatna." + + + "https://www.ag.ch/coronavirus-impfung" + + + "https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/coronaimpfung/" + + + "https://www.ai.ch/coronavirus-impfung" + + + "https://www.baselland.ch/politik-und-behorden/direktionen/volkswirtschafts-und-gesundheitsdirektion/amt-fur-gesundheit/medizinische-dienste/kantonsarztlicher-dienst/aktuelles/corona-impfung/englisch-english" + + + "http://www.coronaimpfzentrumbasel.ch" + + + "http://www.be.ch/corona-impfung" + + + "https://www.fr.ch/sante/covid-19/covid-19-vaccination" + + + "https://www.ge.ch/en/getting-vaccinated-against-covid-19" + + + "https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817#Impfung" + + + "https://www.gr.ch/DE/institutionen/verwaltung/djsg/ga/coronavirus/info/impfen/Seiten/impfen.aspx" + + + "https://www.jura.ch/fr/Autorites/Coronavirus/Vaccination.html" + + + "http://www.lu.ch/covid_impfung" + + + "https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/covid-19-vaccination/Pages/accueil.aspx" + + + "https://www.nw.ch/gesundheitsamtdienste/6044#Impfung" + + + "https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962#Impfung" + + + "https://www.sg.ch/coronavirus/impfen" + + + "https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-7126057-DE.html" + + + "https://www.sz.ch/corona-impfen" + + + "https://so.ch/coronaimpfung" + + + "https://gesundheit.tg.ch/aktuelles/impfung-fuer-covid-19.html/11590" + + + "http://www.ti.ch/vaccinazione" + + + "https://www.ur.ch/themen/3673" + + + "https://www.vs.ch/de/web/coronavirus#ancre_vaccination" + + + "https://vd.ch/coronavirus-vaccins" + + + "https://www.corona-impfung-zug.ch/en/" + + + "http://www.zh.ch/coronaimpfung" + + + "Termin za vakcinaciju" + + + "Još niste vakcinisani?" + + + "Zakažite sada termin " + + + "https://bag-coronavirus.ch/impfung/" + + + "Dalje informacije oko vakcine za Covid-19" + + + "Napomena" + + + "Izaberite svoj kanton" \ No newline at end of file diff --git a/common/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml index f029a7c6..d05f6de7 100644 --- a/common/src/main/res/values-it/strings.xml +++ b/common/src/main/res/values-it/strings.xml @@ -1888,4 +1888,119 @@ Possibili luoghi d'impiego: "Per fare il check-in altrove, devi prima fare il check-out." + + + "Prendi appuntamento per la vaccinazione nelle tue vicinanze" + + + "Per esempio potresti farti vaccinare in uno di questi luoghi nelle tue vicinanze: + +- in centri di vaccinazione specifici +- negli ospedali +- dal tuo medico di famiglia +- nelle farmacie che vaccinano + +Molti di essi offrono anche vaccinazioni libere senza appuntamento." + + + "La vaccinazione anti-COVID-19 è raccomandata per le persone a partire dai 12 anni ed è gratuita." + + + "https://www.ag.ch/coronavirus-impfung" + + + "https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/coronaimpfung/" + + + "https://www.ai.ch/coronavirus-impfung" + + + "https://www.baselland.ch/politik-und-behorden/direktionen/volkswirtschafts-und-gesundheitsdirektion/amt-fur-gesundheit/medizinische-dienste/kantonsarztlicher-dienst/aktuelles/corona-impfung/italienisch-italiano" + + + "http://www.coronaimpfzentrumbasel.ch" + + + "http://www.be.ch/corona-impfung" + + + "https://www.fr.ch/sante/covid-19/covid-19-vaccination" + + + "https://www.ge.ch/se-faire-vacciner-contre-covid-19" + + + "https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817#Impfung" + + + "https://www.gr.ch/IT/istituzioni/amministrazione/djsg/ga/coronavirus/info/impfen/Seiten/impfen.aspx" + + + "https://www.jura.ch/fr/Autorites/Coronavirus/Vaccination.html" + + + "http://www.lu.ch/covid_impfung" + + + "https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/covid-19-vaccination/Pages/accueil.aspx" + + + "https://www.nw.ch/gesundheitsamtdienste/6044#Impfung" + + + "https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962#Impfung" + + + "https://www.sg.ch/coronavirus/impfen" + + + "https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-7126057-DE.html" + + + "https://www.sz.ch/corona-impfen" + + + "https://so.ch/coronaimpfung" + + + "https://gesundheit.tg.ch/aktuelles/impfung-fuer-covid-19.html/11590" + + + "http://www.ti.ch/vaccinazione" + + + "https://www.ur.ch/themen/3673" + + + "https://www.vs.ch/de/web/coronavirus#ancre_vaccination" + + + "https://vd.ch/coronavirus-vaccins" + + + "https://www.corona-impfung-zug.ch/" + + + "http://www.zh.ch/coronaimpfung" + + + "Appuntamento per la vaccinazione" + + + "Non sei ancora vaccinato?" + + + "Prendi appuntamento ora" + + + "https://ufsp-coronavirus.ch/vaccinazione/" + + + "Ulteriori informazioni sulla vaccinazione anti-COVID-19" + + + "Avvertenza" + + + "Scegli il Cantone" \ No newline at end of file diff --git a/common/src/main/res/values-pt/strings.xml b/common/src/main/res/values-pt/strings.xml index f9e83f40..62678bff 100644 --- a/common/src/main/res/values-pt/strings.xml +++ b/common/src/main/res/values-pt/strings.xml @@ -1385,7 +1385,7 @@ Ligue para:" "Atualização SwissCovid" - "Reset update boarding" + "Update Boarding zurücksetzen" "Um teste de corona é útil e recomendado a partir de 5 dias após a data de contacto indicada." @@ -1855,4 +1855,119 @@ Este título vai ser indicado no check-in." "Para fazer check-in noutro lugar, primeiro é necessário fazer check-out." + + + "Agendar uma data para a vacinação na sua proximidade" + + + "Uma vacinação pode ser feita, por exemplo, nestes lugares na sua proximidade: + +- nos centros de vacinação específicos +- nos hospitais +- no seu médico de família +- nas farmácias de vacinação + +Muitos lugares também oferecem vacinações Walk-in sem agendamento." + + + "A vacina contra a Covid-19 é recomendada para pessoas a partir dos 12 anos de idade. A vacinação é gratuita." + + + "https://www.ag.ch/coronavirus-impfung" + + + "https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/coronaimpfung/" + + + "https://www.ai.ch/coronavirus-impfung" + + + "https://www.baselland.ch/politik-und-behorden/direktionen/volkswirtschafts-und-gesundheitsdirektion/amt-fur-gesundheit/medizinische-dienste/kantonsarztlicher-dienst/aktuelles/corona-impfung/englisch-english" + + + "http://www.coronaimpfzentrumbasel.ch" + + + "http://www.be.ch/corona-impfung" + + + "https://www.fr.ch/sante/covid-19/covid-19-vaccination" + + + "https://www.ge.ch/en/getting-vaccinated-against-covid-19" + + + "https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817#Impfung" + + + "https://www.gr.ch/DE/institutionen/verwaltung/djsg/ga/coronavirus/info/impfen/Seiten/impfen.aspx" + + + "https://www.jura.ch/fr/Autorites/Coronavirus/Vaccination.html" + + + "http://www.lu.ch/covid_impfung" + + + "https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/covid-19-vaccination/Pages/accueil.aspx" + + + "https://www.nw.ch/gesundheitsamtdienste/6044#Impfung" + + + "https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962#Impfung" + + + "https://www.sg.ch/coronavirus/impfen" + + + "https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-7126057-DE.html" + + + "https://www.sz.ch/corona-impfen" + + + "https://so.ch/coronaimpfung" + + + "https://gesundheit.tg.ch/aktuelles/impfung-fuer-covid-19.html/11590" + + + "http://www.ti.ch/vaccinazione" + + + "https://www.ur.ch/themen/3673" + + + "https://www.vs.ch/de/web/coronavirus#ancre_vaccination" + + + "https://vd.ch/coronavirus-vaccins" + + + "https://www.corona-impfung-zug.ch/en/" + + + "http://www.zh.ch/coronaimpfung" + + + "Data agendada para a vacinação" + + + "Ainda não foi vacinado?" + + + "Agende a data agora" + + + "https://bag-coronavirus.ch/impfung/" + + + "Outras informações sobre a vacina contra a Covid-19" + + + "Aviso" + + + "Selecione o seu cantão" \ No newline at end of file diff --git a/common/src/main/res/values-rm/strings.xml b/common/src/main/res/values-rm/strings.xml index e110273d..f05ce8be 100644 --- a/common/src/main/res/values-rm/strings.xml +++ b/common/src/main/res/values-rm/strings.xml @@ -1851,4 +1851,119 @@ Quai pon esser p.ex.: "Per As registrar en in nov lieu stuais Vus l'emprim sortir dal vegl lieu." + + + "Reservar in termin da vaccinaziun en Vossa vischinanza" + + + "Ina vaccinaziun pudess per exempel vegnir fatga en quests lieus en Vossa vischinanza: + +- en centers da vaccinaziun specifics +- en ospitals +- tar Vossa media u tar Voss medi da chasa +- en apotecas da vaccinaziun + +Blers lieus porschan er vaccinaziuns «walk-in» senza termin." + + + "La vaccinaziun cunter COVID-19 è recumandada per persunas a partir da 12 onns. La vaccinaziun è gratuita." + + + "https://www.ag.ch/coronavirus-impfung" + + + "https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/coronaimpfung/" + + + "https://www.ai.ch/coronavirus-impfung" + + + "https://www.bl.ch/impfen" + + + "http://www.coronaimpfzentrumbasel.ch" + + + "http://www.be.ch/corona-impfung" + + + "https://www.fr.ch/sante/covid-19/covid-19-vaccination" + + + "https://www.ge.ch/se-faire-vacciner-contre-covid-19" + + + "https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817#Impfung" + + + "https://www.gr.ch/RM/instituziuns/administraziun/djsg/ga/coronavirus/info/impfen/Seiten/impfen.aspx" + + + "https://www.jura.ch/fr/Autorites/Coronavirus/Vaccination.html" + + + "http://www.lu.ch/covid_impfung" + + + "https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/covid-19-vaccination/Pages/accueil.aspx" + + + "https://www.nw.ch/gesundheitsamtdienste/6044#Impfung" + + + "https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962#Impfung" + + + "https://www.sg.ch/coronavirus/impfen" + + + "https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-7126057-DE.html" + + + "https://www.sz.ch/corona-impfen" + + + "https://so.ch/coronaimpfung" + + + "https://gesundheit.tg.ch/aktuelles/impfung-fuer-covid-19.html/11590" + + + "http://www.ti.ch/vaccinazione" + + + "https://www.ur.ch/themen/3673" + + + "https://www.vs.ch/de/web/coronavirus#ancre_vaccination" + + + "https://vd.ch/coronavirus-vaccins" + + + "https://www.corona-impfung-zug.ch/" + + + "http://www.zh.ch/coronaimpfung" + + + "Termin da vaccinaziun" + + + "Anc betg vaccinada u vaccinà?" + + + "Reservar in termin ussa" + + + "https://bag-coronavirus.ch/impfung/" + + + "Ulteriuras infurmaziuns davart la vaccinaziun cunter COVID-19" + + + "Infurmaziun" + + + "Tscherni Voss chantun" \ No newline at end of file diff --git a/common/src/main/res/values-sq/strings.xml b/common/src/main/res/values-sq/strings.xml index e0746683..c53dcd24 100644 --- a/common/src/main/res/values-sq/strings.xml +++ b/common/src/main/res/values-sq/strings.xml @@ -1856,4 +1856,119 @@ Ky titull shfaqet gjatë Check-in." "Për t’u regjistruar në një vend të ri, së pari duhet të kontrolloheni." + + + "Rezervoni një takim për vaksinim pranë jush" + + + "\"Vaksinimi mund të bëhet pranë jush, për shembull: + +- në qendrat specifike të vaksinimit +- në spitale +- nga mjeku juaj i familjes +- në farmacitë e vaksinimit + +Shumë vende gjithashtu ofrojnë vaksinime pa takim." + + + "Vaksinimi kundër Covid-19 rekomandohet për njerëzit e moshës 12 vjeç e lart. Vaksinimi është falas." + + + "https://www.ag.ch/coronavirus-impfung" + + + "https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/coronaimpfung/" + + + "https://www.ai.ch/coronavirus-impfung" + + + "https://www.baselland.ch/politik-und-behorden/direktionen/volkswirtschafts-und-gesundheitsdirektion/amt-fur-gesundheit/medizinische-dienste/kantonsarztlicher-dienst/aktuelles/corona-impfung/englisch-english" + + + "http://www.coronaimpfzentrumbasel.ch" + + + "http://www.be.ch/corona-impfung" + + + "https://www.fr.ch/sante/covid-19/covid-19-vaccination" + + + "https://www.ge.ch/en/getting-vaccinated-against-covid-19" + + + "https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817#Impfung" + + + "https://www.gr.ch/DE/institutionen/verwaltung/djsg/ga/coronavirus/info/impfen/Seiten/impfen.aspx" + + + "https://www.jura.ch/fr/Autorites/Coronavirus/Vaccination.html" + + + "http://www.lu.ch/covid_impfung" + + + "https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/covid-19-vaccination/Pages/accueil.aspx" + + + "https://www.nw.ch/gesundheitsamtdienste/6044#Impfung" + + + "https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962#Impfung" + + + "https://www.sg.ch/coronavirus/impfen" + + + "https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-7126057-DE.html" + + + "https://www.sz.ch/corona-impfen" + + + "https://so.ch/coronaimpfung" + + + "https://gesundheit.tg.ch/aktuelles/impfung-fuer-covid-19.html/11590" + + + "http://www.ti.ch/vaccinazione" + + + "https://www.ur.ch/themen/3673" + + + "https://www.vs.ch/de/web/coronavirus#ancre_vaccination" + + + "https://vd.ch/coronavirus-vaccins" + + + "https://www.corona-impfung-zug.ch/en/" + + + "http://www.zh.ch/coronaimpfung" + + + "Takimi për vaksinim" + + + "Nuk jeni vaksinuar akoma?" + + + "Rezervoni një takim tani" + + + "https://bag-coronavirus.ch/impfung/" + + + "Më shumë informacion në lidhje me vaksinimin kundra Covid-19" + + + "Këshillë" + + + "Zgjidhni kantonin tuaj" \ No newline at end of file diff --git a/common/src/main/res/values-sr/strings.xml b/common/src/main/res/values-sr/strings.xml index 3ff427b7..ef7b4176 100644 --- a/common/src/main/res/values-sr/strings.xml +++ b/common/src/main/res/values-sr/strings.xml @@ -1851,4 +1851,119 @@ U tom slučaju kontaktirajte nas ovde:" "Kako biste se prijavili na nekom drugom mestu, najpre se morate odjaviti odavde." + + + "Zakazivanje termina za vakcinaciju u Vašoj blizini" + + + "Vakcinacija se može održati na primer na sledećim mestima u Vašoj blizini: + +- u specifičnim centrima za vakcinaciju +- u bolnicama +- kod Vašeg ličnog lekara ili lekarke +- u vakcinišućim apotekama + +Mnoga mesta nude i vakcinaciju bez zakazanog termina" + + + "Vakcina za Covid-19 preporučena je osobama starijim od 12 godina. Vakcinacija je besplatna." + + + "https://www.ag.ch/coronavirus-impfung" + + + "https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/coronaimpfung/" + + + "https://www.ai.ch/coronavirus-impfung" + + + "https://www.baselland.ch/politik-und-behorden/direktionen/volkswirtschafts-und-gesundheitsdirektion/amt-fur-gesundheit/medizinische-dienste/kantonsarztlicher-dienst/aktuelles/corona-impfung/englisch-english" + + + "http://www.coronaimpfzentrumbasel.ch" + + + "http://www.be.ch/corona-impfung" + + + "https://www.fr.ch/sante/covid-19/covid-19-vaccination" + + + "https://www.ge.ch/en/getting-vaccinated-against-covid-19" + + + "https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817#Impfung" + + + "https://www.gr.ch/DE/institutionen/verwaltung/djsg/ga/coronavirus/info/impfen/Seiten/impfen.aspx" + + + "https://www.jura.ch/fr/Autorites/Coronavirus/Vaccination.html" + + + "http://www.lu.ch/covid_impfung" + + + "https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/covid-19-vaccination/Pages/accueil.aspx" + + + "https://www.nw.ch/gesundheitsamtdienste/6044#Impfung" + + + "https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962#Impfung" + + + "https://www.sg.ch/coronavirus/impfen" + + + "https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-7126057-DE.html" + + + "https://www.sz.ch/corona-impfen" + + + "https://so.ch/coronaimpfung" + + + "https://gesundheit.tg.ch/aktuelles/impfung-fuer-covid-19.html/11590" + + + "http://www.ti.ch/vaccinazione" + + + "https://www.ur.ch/themen/3673" + + + "https://www.vs.ch/de/web/coronavirus#ancre_vaccination" + + + "https://vd.ch/coronavirus-vaccins" + + + "https://www.corona-impfung-zug.ch/en/" + + + "http://www.zh.ch/coronaimpfung" + + + "Termin za vakcinaciju" + + + "Još niste vakcinisani?" + + + "Zakažite sada termin " + + + "https://bag-coronavirus.ch/impfung/" + + + "Dalje informacije oko vakcine za Covid-19" + + + "Napomena" + + + "Izaberite svoj kanton" \ No newline at end of file diff --git a/common/src/main/res/values-ti/strings.xml b/common/src/main/res/values-ti/strings.xml index 99cd3035..0294b982 100644 --- a/common/src/main/res/values-ti/strings.xml +++ b/common/src/main/res/values-ti/strings.xml @@ -1368,7 +1368,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ "ምምሕዳስ SwissCovid" - "Reset update boarding" + "Update Boarding zurücksetzen" "መርመራ ኮሮና ካብ 5ይ መዓልቲ ድሕሪ ዝተረኣየ ዕለት ርክብ ጠቓሚ እዩ ከምኡ'ውን ክግበር ይመርጽ።" @@ -1839,4 +1839,119 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ "ናብ ካልእ ቦታ ኽትከይድ እንተ ደሊኻ ፈለማ ክትወጽእ (ቸክ-ኣውት ክትገብር) ኣሎካ።" + + + "ቈጸራ ክታበት ኣብ ከባቢኻ መዝግብ" + + + "ንኣብነት ኣብዚ ኣብ ጥቓኻ ዘለ ቦታታት ክትኽተብ ትኽእል ኢኻ፥ + +- ኣብ እተወሰነ ማእከላት ክታበት +- ኣብ ሆስፒታላት +- ምስ ዘቤታዊ ሓኪም +- ኣብ ናይ ክታበት ፋርማሲታት + +ኣብ መብዛሕትኦም ቦታታት ብዘይ ቈጸራ ብቐጥታ ክትኽተብ ትኽእል።" + + + "ክታበት ኮቪድ-19 ነቶም 12 ዓመትን ልዕሊኡን ዝዕድሚኦም ሰባት ተመኺሩ። እቲ ክታበት ነጻ እዩ።" + + + "https://www.ag.ch/coronavirus-impfung" + + + "https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/coronaimpfung/" + + + "https://www.ai.ch/coronavirus-impfung" + + + "https://www.baselland.ch/politik-und-behorden/direktionen/volkswirtschafts-und-gesundheitsdirektion/amt-fur-gesundheit/medizinische-dienste/kantonsarztlicher-dienst/aktuelles/corona-impfung/englisch-english" + + + "http://www.coronaimpfzentrumbasel.ch" + + + "http://www.be.ch/corona-impfung" + + + "https://www.fr.ch/sante/covid-19/covid-19-vaccination" + + + "https://www.ge.ch/en/getting-vaccinated-against-covid-19" + + + "https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817#Impfung" + + + "https://www.gr.ch/DE/institutionen/verwaltung/djsg/ga/coronavirus/info/impfen/Seiten/impfen.aspx" + + + "https://www.jura.ch/fr/Autorites/Coronavirus/Vaccination.html" + + + "http://www.lu.ch/covid_impfung" + + + "https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/covid-19-vaccination/Pages/accueil.aspx" + + + "https://www.nw.ch/gesundheitsamtdienste/6044#Impfung" + + + "https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962#Impfung" + + + "https://www.sg.ch/coronavirus/impfen" + + + "https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-7126057-DE.html" + + + "https://www.sz.ch/corona-impfen" + + + "https://so.ch/coronaimpfung" + + + "https://gesundheit.tg.ch/aktuelles/impfung-fuer-covid-19.html/11590" + + + "http://www.ti.ch/vaccinazione" + + + "https://www.ur.ch/themen/3673" + + + "https://www.vs.ch/de/web/coronavirus#ancre_vaccination" + + + "https://vd.ch/coronavirus-vaccins" + + + "https://www.corona-impfung-zug.ch/en/" + + + "http://www.zh.ch/coronaimpfung" + + + "ቆጸራ ክታበት" + + + "ገና ኣይተኸተብካን።" + + + "ሕጂ ቘጸራ ሓዝ" + + + "https://bag-coronavirus.ch/impfung/" + + + "ብዛዕባ ክታበት ኮቪድ-19 ዝያዳ ሓበሬታ" + + + "ምልክታ" + + + "ካንቶንካ ምረጽ" \ No newline at end of file diff --git a/common/src/main/res/values-tr/strings.xml b/common/src/main/res/values-tr/strings.xml index 12af29fc..239c54bc 100644 --- a/common/src/main/res/values-tr/strings.xml +++ b/common/src/main/res/values-tr/strings.xml @@ -1368,7 +1368,7 @@ O halde şu numarayı arayın:" "SwissCovid Güncellemesi " - "Reset update boarding" + "Update Boarding zurücksetzen" "Gösterilen temas tarihinden sonraki 5. gün itibariyle bir korona testi yapılması uygundur ve tavsiye edilir." @@ -1839,4 +1839,119 @@ Bu başlık check-in sırasında gösterilir." "Yeni bir yere Check-in yapmak için öncelikle Check-out yapmanız gerekir." + + + "Yakınınızda aşı randevusu alın" + + + "Örneğin yakınınızdaki şu yerlerde aşı yaptırabilirsiniz: + +- özel aşı merkezlerinde +- kliniklerde +- eile hekiminizde +- aşı yapan eczanelerde + +Birçok yerde, randevu almadan doğrudan aşı yaptırılabilmektedir." + + + "Covid-19 aşısı 12 yaş ve üstü kişilere tavsiye edilmektedir. Aşı ücretsizdir." + + + "https://www.ag.ch/coronavirus-impfung" + + + "https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/coronaimpfung/" + + + "https://www.ai.ch/coronavirus-impfung" + + + "https://www.baselland.ch/politik-und-behorden/direktionen/volkswirtschafts-und-gesundheitsdirektion/amt-fur-gesundheit/medizinische-dienste/kantonsarztlicher-dienst/aktuelles/corona-impfung/englisch-english" + + + "http://www.coronaimpfzentrumbasel.ch" + + + "http://www.be.ch/corona-impfung" + + + "https://www.fr.ch/sante/covid-19/covid-19-vaccination" + + + "https://www.ge.ch/en/getting-vaccinated-against-covid-19" + + + "https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817#Impfung" + + + "https://www.gr.ch/DE/institutionen/verwaltung/djsg/ga/coronavirus/info/impfen/Seiten/impfen.aspx" + + + "https://www.jura.ch/fr/Autorites/Coronavirus/Vaccination.html" + + + "http://www.lu.ch/covid_impfung" + + + "https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/covid-19-vaccination/Pages/accueil.aspx" + + + "https://www.nw.ch/gesundheitsamtdienste/6044#Impfung" + + + "https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962#Impfung" + + + "https://www.sg.ch/coronavirus/impfen" + + + "https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-7126057-DE.html" + + + "https://www.sz.ch/corona-impfen" + + + "https://so.ch/coronaimpfung" + + + "https://gesundheit.tg.ch/aktuelles/impfung-fuer-covid-19.html/11590" + + + "http://www.ti.ch/vaccinazione" + + + "https://www.ur.ch/themen/3673" + + + "https://www.vs.ch/de/web/coronavirus#ancre_vaccination" + + + "https://vd.ch/coronavirus-vaccins" + + + "https://www.corona-impfung-zug.ch/en/" + + + "http://www.zh.ch/coronaimpfung" + + + "Aşı randevusu" + + + "Henüz aşı olmadınız mı?" + + + "Hemen randevu alın" + + + "https://bag-coronavirus.ch/impfung/" + + + "Covid-19 aşısıyla ilgili ayrıntılı bilgi" + + + "Not" + + + "Kantonunuzu seçin" \ No newline at end of file diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 1763573b..0cb1987e 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1877,4 +1877,119 @@ Possible locations: "To check in to a new location, you first need to check out." + + + "Book a vaccination appointment near you" + + + "Vaccination may be performed at the following locations near you: + +- at specific vaccination centres +- in hospitals +- at your general practitioner's surgery +- at a vaccination pharmacy + +Many places also offer walk-in vaccinations without an appointment." + + + "The COVID-19 vaccination is recommended for those over 12. It's free of charge." + + + "https://www.ag.ch/coronavirus-impfung" + + + "https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/coronaimpfung/" + + + "https://www.ai.ch/coronavirus-impfung" + + + "https://www.baselland.ch/politik-und-behorden/direktionen/volkswirtschafts-und-gesundheitsdirektion/amt-fur-gesundheit/medizinische-dienste/kantonsarztlicher-dienst/aktuelles/corona-impfung/englisch-english" + + + "http://www.coronaimpfzentrumbasel.ch" + + + "http://www.be.ch/corona-impfung" + + + "https://www.fr.ch/sante/covid-19/covid-19-vaccination" + + + "https://www.ge.ch/en/getting-vaccinated-against-covid-19" + + + "https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817#Impfung" + + + "https://www.gr.ch/DE/institutionen/verwaltung/djsg/ga/coronavirus/info/impfen/Seiten/impfen.aspx" + + + "https://www.jura.ch/fr/Autorites/Coronavirus/Vaccination.html" + + + "http://www.lu.ch/covid_impfung" + + + "https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/covid-19-vaccination/Pages/accueil.aspx" + + + "https://www.nw.ch/gesundheitsamtdienste/6044#Impfung" + + + "https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962#Impfung" + + + "https://www.sg.ch/coronavirus/impfen" + + + "https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-7126057-DE.html" + + + "https://www.sz.ch/corona-impfen" + + + "https://so.ch/coronaimpfung" + + + "https://gesundheit.tg.ch/aktuelles/impfung-fuer-covid-19.html/11590" + + + "http://www.ti.ch/vaccinazione" + + + "https://www.ur.ch/themen/3673" + + + "https://www.vs.ch/de/web/coronavirus#ancre_vaccination" + + + "https://vd.ch/coronavirus-vaccins" + + + "https://www.corona-impfung-zug.ch/en/" + + + "http://www.zh.ch/coronaimpfung" + + + "Vaccination appointment" + + + "Not vaccinated yet?" + + + "Book an appointment now" + + + "https://foph-coronavirus.ch/vaccination/" + + + "More information about the COVID-19 vaccination" + + + "Attention" + + + "Select your canton" \ No newline at end of file From e3b171caf568ed8e4f8715d8412e0ef6bf8024e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20R=C3=B6sch?= Date: Thu, 14 Oct 2021 09:10:39 +0200 Subject: [PATCH 2/4] resolve pr comments --- .../main/java/ch/admin/bag/dp3t/home/HomeFragment.java | 2 +- .../dp3t/vaccination/VaccinationAppointmentFragment.kt | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java index 825e4027..7d9401a5 100644 --- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java +++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java @@ -459,7 +459,7 @@ private void setupVaccinationCard(){ vaccinationCard.setOnClickListener(v -> { requireActivity().getSupportFragmentManager().beginTransaction() .setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit) - .replace(R.id.main_fragment_container, VaccinationAppointmentFragment.Companion.newInstance()) + .replace(R.id.main_fragment_container, VaccinationAppointmentFragment.newInstance()) .addToBackStack(VaccinationAppointmentFragment.class.getCanonicalName()) .commit(); }); diff --git a/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentFragment.kt index 4a3acf82..0c826be3 100644 --- a/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentFragment.kt +++ b/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentFragment.kt @@ -14,9 +14,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.LinearLayout import androidx.fragment.app.Fragment -import androidx.recyclerview.widget.DividerItemDecoration import ch.admin.bag.covidcertificate.common.config.VaccinationBookingCantonModel import ch.admin.bag.covidcertificate.common.config.VaccinationBookingInfoModel import ch.admin.bag.dp3t.R @@ -27,6 +25,7 @@ import ch.admin.bag.dp3t.util.UrlUtil class VaccinationAppointmentFragment : Fragment() { companion object { + @JvmStatic fun newInstance() = VaccinationAppointmentFragment() } @@ -40,6 +39,11 @@ class VaccinationAppointmentFragment : Fragment() { return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) binding.toolbar.setNavigationOnClickListener { parentFragmentManager.popBackStack() } From 209e6aef4b2c8f1e53cf933ec5cb43cc442ef364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20R=C3=B6sch?= Date: Thu, 14 Oct 2021 15:17:48 +0200 Subject: [PATCH 3/4] fix package name --- app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java | 2 +- .../models/VaccinationBookingCantonCollection.java | 2 -- .../dp3t/networking/models/VaccinationBookingCantonModel.kt | 2 +- .../networking/models/VaccinationBookingInfoCollection.java | 3 --- .../dp3t/networking/models/VaccinationBookingInfoModel.kt | 2 +- .../main/java/ch/admin/bag/dp3t/storage/SecureStorage.java | 4 ++-- .../dp3t/vaccination/VaccinationAppointmentCantonAdapter.kt | 4 ++-- .../vaccination/VaccinationAppointmentCantonViewHolder.kt | 4 ++-- .../bag/dp3t/vaccination/VaccinationAppointmentFragment.kt | 6 +++--- 9 files changed, 12 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java index 7d9401a5..da68c6db 100644 --- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java +++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java @@ -41,7 +41,7 @@ import org.dpppt.android.sdk.TracingStatus; -import ch.admin.bag.covidcertificate.wallet.vaccination.appointment.VaccinationAppointmentFragment; +import ch.admin.bag.dp3t.vaccination.VaccinationAppointmentFragment; import ch.admin.bag.dp3t.BuildConfig; import ch.admin.bag.dp3t.R; import ch.admin.bag.dp3t.checkin.CheckinOverviewFragment; diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingCantonCollection.java b/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingCantonCollection.java index 41102878..26984f69 100644 --- a/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingCantonCollection.java +++ b/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingCantonCollection.java @@ -12,7 +12,5 @@ import java.util.HashMap; import java.util.List; -import ch.admin.bag.covidcertificate.common.config.VaccinationBookingCantonModel; - public class VaccinationBookingCantonCollection extends HashMap> { } diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingCantonModel.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingCantonModel.kt index 47e740e2..a85b27b7 100644 --- a/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingCantonModel.kt +++ b/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingCantonModel.kt @@ -8,7 +8,7 @@ * SPDX-License-Identifier: MPL-2.0 */ -package ch.admin.bag.covidcertificate.common.config +package ch.admin.bag.dp3t.networking.models data class VaccinationBookingCantonModel( val name: String, diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingInfoCollection.java b/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingInfoCollection.java index c9fee464..664127e3 100644 --- a/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingInfoCollection.java +++ b/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingInfoCollection.java @@ -10,9 +10,6 @@ package ch.admin.bag.dp3t.networking.models; import java.util.HashMap; -import java.util.Map; - -import ch.admin.bag.covidcertificate.common.config.VaccinationBookingInfoModel; public class VaccinationBookingInfoCollection extends HashMap { } diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingInfoModel.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingInfoModel.kt index ac7e9413..b7afd500 100644 --- a/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingInfoModel.kt +++ b/app/src/main/java/ch/admin/bag/dp3t/networking/models/VaccinationBookingInfoModel.kt @@ -8,7 +8,7 @@ * SPDX-License-Identifier: MPL-2.0 */ -package ch.admin.bag.covidcertificate.common.config +package ch.admin.bag.dp3t.networking.models data class VaccinationBookingInfoModel( val title: String, diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java index 9e8cf8cc..956fe5fd 100644 --- a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java +++ b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java @@ -31,8 +31,8 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import ch.admin.bag.covidcertificate.common.config.VaccinationBookingCantonModel; -import ch.admin.bag.covidcertificate.common.config.VaccinationBookingInfoModel; +import ch.admin.bag.dp3t.networking.models.VaccinationBookingCantonModel; +import ch.admin.bag.dp3t.networking.models.VaccinationBookingInfoModel; import ch.admin.bag.dp3t.checkin.models.CheckInState; import ch.admin.bag.dp3t.networking.models.*; diff --git a/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentCantonAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentCantonAdapter.kt index 0118e913..734161b9 100644 --- a/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentCantonAdapter.kt +++ b/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentCantonAdapter.kt @@ -8,12 +8,12 @@ * SPDX-License-Identifier: MPL-2.0 */ -package ch.admin.bag.covidcertificate.wallet.vaccination.appointment +package ch.admin.bag.dp3t.vaccination import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import ch.admin.bag.covidcertificate.common.config.VaccinationBookingCantonModel +import ch.admin.bag.dp3t.networking.models.VaccinationBookingCantonModel import ch.admin.bag.dp3t.databinding.ItemVaccinationAppointmentCantonBinding class VaccinationAppointmentCantonAdapter( diff --git a/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentCantonViewHolder.kt b/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentCantonViewHolder.kt index ed5d0d66..3dc9aa8d 100644 --- a/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentCantonViewHolder.kt +++ b/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentCantonViewHolder.kt @@ -8,10 +8,10 @@ * SPDX-License-Identifier: MPL-2.0 */ -package ch.admin.bag.covidcertificate.wallet.vaccination.appointment +package ch.admin.bag.dp3t.vaccination import androidx.recyclerview.widget.RecyclerView -import ch.admin.bag.covidcertificate.common.config.VaccinationBookingCantonModel +import ch.admin.bag.dp3t.networking.models.VaccinationBookingCantonModel import ch.admin.bag.dp3t.databinding.ItemVaccinationAppointmentCantonBinding class VaccinationAppointmentCantonViewHolder( diff --git a/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentFragment.kt index 0c826be3..e433d8ad 100644 --- a/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentFragment.kt +++ b/app/src/main/java/ch/admin/bag/dp3t/vaccination/VaccinationAppointmentFragment.kt @@ -8,15 +8,15 @@ * SPDX-License-Identifier: MPL-2.0 */ -package ch.admin.bag.covidcertificate.wallet.vaccination.appointment +package ch.admin.bag.dp3t.vaccination import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import ch.admin.bag.covidcertificate.common.config.VaccinationBookingCantonModel -import ch.admin.bag.covidcertificate.common.config.VaccinationBookingInfoModel +import ch.admin.bag.dp3t.networking.models.VaccinationBookingCantonModel +import ch.admin.bag.dp3t.networking.models.VaccinationBookingInfoModel import ch.admin.bag.dp3t.R import ch.admin.bag.dp3t.databinding.FragmentVaccinationAppointmentBinding import ch.admin.bag.dp3t.storage.SecureStorage From 0222eded6f7e0bcf049594f50d15dbd110c8ef10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20R=C3=B6sch?= Date: Fri, 15 Oct 2021 09:23:00 +0200 Subject: [PATCH 4/4] remove additional quote in albanian translations --- common/src/main/res/values-sq/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/res/values-sq/strings.xml b/common/src/main/res/values-sq/strings.xml index c53dcd24..34fda218 100644 --- a/common/src/main/res/values-sq/strings.xml +++ b/common/src/main/res/values-sq/strings.xml @@ -1861,7 +1861,7 @@ Ky titull shfaqet gjatë Check-in." "Rezervoni një takim për vaksinim pranë jush" - "\"Vaksinimi mund të bëhet pranë jush, për shembull: + "Vaksinimi mund të bëhet pranë jush, për shembull: - në qendrat specifike të vaksinimit - në spitale