diff --git a/.gitignore b/.gitignore
index 0d6cc89a..79212f48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,9 @@ app/release/output.json
.DS_Store
environment.properties
+
+#commitlint
+node_modules
+package-lock.json
+commitlint.config.js
+package.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8997c11f..7bc256f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,11 +4,51 @@ All notable changes to this project will be documented in this file.
### 1.0.6 (2020-09-15)
-### Bug Fixes
-
* Return to healthy state implemented for alerted contacts (close contacts) after 14 days.
-* Multi-language - co-official languages
-* Texts and design adjustments to meet Ministry of Health requirements
-* Privacy policies and conditions of use adjustments
+* Multi-language - co-official languages.
+* Texts and design adjustments to meet Ministry of Health requirements.
+* Privacy policies and conditions of use adjustments.
* Accessibility improvements.
-* Bug fixing
\ No newline at end of file
+* Bug fixing.
+
+### 1.0.7 (2020-10-08)
+
+* Added symptom/PCR date in positive communication.
+* Send fake positive communications.
+* DP-3T version upgrade.
+* Improved accessibility.
+* Bug fixing.
+
+### 1.1.0 (2020-10-29)
+
+* Implemented functionalities for interoperability with other European applications.
+* Implemented review functionality for new privacy policy and terms of use.
+* New language settings functionality.
+* Improved accessibility.
+* Bug fixing.
+
+### 1.2.0 (2020-12-17)
+
+* DP-3T version upgrade.
+* Radar COVID statistics view.
+* Application status information view.
+* Opening reminder notification.
+* Confinement counter.
+* Share link for easy download.
+* Added French language.
+* Get positive code from SMS.
+* Accessibility improvements:
+ * Increased text size and contrast.
+ * Changed links style.
+ * Tagged elements on screen.
+ * Incorporated headings.
+
+### 1.3.0 (2021-02-17)
+
+* Changed privacy policy.
+* Anonymous metrics report to measure application efficiency.
+* Added Romanian language.
+* Bug fixing.
+* Accessibility improvements:
+ * Fixed "Status Change" header in healed pop-up.
+ * Added closing icon on popups.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..30c5c9e6
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,129 @@
+
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+ and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+ overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+ advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+ address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+soporte.radarcovid@economia.gob.es.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
diff --git a/README.md b/README.md
index d9a570b0..8b2b9f49 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
## Introduction
@@ -21,7 +21,9 @@ These are the tools used to develop the solution:
Clone this repository and import into **Android Studio**.
+```bash
git clone https://github.com/RadarCOVID/radar-covid-android.git
+```
## Building
### Create APK
diff --git a/THIRD-PARTY-NOTICES b/THIRD-PARTY-NOTICES
index bdecaa02..fcd9c595 100644
--- a/THIRD-PARTY-NOTICES
+++ b/THIRD-PARTY-NOTICES
@@ -7,7 +7,7 @@ RadarCOVID/radar-covid-android software.
In the event that we overlooked to list a required notice, please bring this
to our attention by contacting us via this email:
-soporte.radarcovid@covid19.gob.es
+soporte.radarcovid@economia.gob.es
Components:
diff --git a/app/build.gradle b/app/build.gradle
index 45e8a6a0..245e1406 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,6 +12,7 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
+apply plugin: 'com.google.protobuf'
android {
compileSdkVersion 29
@@ -21,8 +22,9 @@ android {
applicationId "es.gob.radarcovid"
minSdkVersion 23
targetSdkVersion 29
- versionCode 6
- versionName "1.0.6"
+ versionCode 11
+ versionName "1.4.0"
+ resConfigs "en", "es", "ro", "ca", "gl", "eu", "fr"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -111,6 +113,13 @@ android {
buildConfigField 'String', 'PUBLIC_KEY_VERIFICATION', '"LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlHYk1CQUdCeXFHU000OUFnRUdCU3VCQkFBakE0R0dBQVFCbUlXU0ptdGVGNkh2VnI0M1V5SzliZStlNkpPQgpDRjlVaXpMeis4a3padkVEc25nMGl3VEF3UVB0QzdBMDlzQjVMM3EwSUl1N250Yzd4U1VqSUdTakZvd0JXL0xPCnFtMTBYQ1NkUWNZT3BMTi85dUI1emZKVUZOY3B6Ynk4dDAzSlg3TUZiYi9vQm1pcFNNNHptSm1UajR3Qm9XZ2sKRlF6ZEJHcnAwR2laUU9WVXRtUT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg=="'
buildConfigField 'String', 'CERTIFICATE_PIN', '"sha256/BZkFfM++uLfyl8jDpVoLvQWjyGm0xNAZRjEXy9jX798="'
+ buildConfigField 'String', 'CERTIFICATE_PIN_NEW', '"sha256/Bf/HXif22OO34dBnWpk7AEktor0HAzDwetIWrzJ39D4="'
+
+ buildConfigField("String", "SAFETY_NET_API_KEY", loadProperty("pre.safetyNet"))
+
+ buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://radarcovidpre.covid19.gob.es/qr"'
+ buildConfigField "String", "QR_CODE_HOST_NAME", '"radarcovidpre.covid19.gob.es"'
+ manifestPlaceholders = [qrCodeHostName: "radarcovidpre.covid19.gob.es"]
}
pro {
dimension = 'environment'
@@ -125,6 +134,13 @@ android {
buildConfigField 'String', 'PUBLIC_KEY_VERIFICATION', '"LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlHYk1CQUdCeXFHU000OUFnRUdCU3VCQkFBakE0R0dBQVFBWjM1ZzlhN1M2MjdXMVlpOEVsVmdNS012dkdUUAo5R0hiUHZHTzhLekNLQk84WTZOc0JSTHlJeWUwZmdxR0ZXM2Z5dHVxcnFSNi9wSllDUWFXN1IyUnY3OEF4OXJhCmlYbmRVSmVyVk9KSHJRaFgxbnMrTjZxaVUxT0I4a3dUaWVuaCtuZDVVbXZUN24vK3hod3djK1RYa1lnNDBxOVcKUTRiVjBMbHRWbGRUSUlTK1QxOD0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg=="'
buildConfigField 'String', 'CERTIFICATE_PIN', '"sha256/V5NaZx/jvh7NR/Ne6tXTw/g2Pcu9ztv08prWsUh7czI="'
+ buildConfigField 'String', 'CERTIFICATE_PIN_NEW', '"sha256/9psJkMemKz3JXVfw1TiLRoitC2eswaL9FfwF8JFbwrk="'
+
+ buildConfigField("String", "SAFETY_NET_API_KEY", loadProperty("pro.safetyNet"))
+
+ buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://radarcovid.covid19.gob.es/qr"'
+ buildConfigField "String", "QR_CODE_HOST_NAME", '"radarcovid.covid19.gob.es"'
+ manifestPlaceholders = [qrCodeHostName: "radarcovid.covid19.gob.es"]
}
}
@@ -158,6 +174,20 @@ def existProjectProperties() {
return propertiesFile.exists()
}
+def loadProperty(String propertyName) {
+ String property = "\"DEFAULT_VALUE\""
+ def propertiesFile = project.rootProject.file("project.properties")
+ if (propertiesFile.exists()) {
+ def properties = new Properties()
+ properties.load(new FileInputStream(propertiesFile))
+ property = properties.getProperty(propertyName)
+ }
+ if (property == null)
+ return "\"DEFAULT_VALUE\""
+ else
+ return property
+}
+
def loadCredential(String environmentVariableName, String propertyName) {
String credential = System.getProperty(environmentVariableName)
if (credential == null) {
@@ -179,6 +209,28 @@ def loadCredential(String environmentVariableName, String propertyName) {
return credential
}
+protobuf {
+ protoc {
+ artifact = 'com.google.protobuf:protoc:3.0.0'
+ }
+ plugins {
+ javalite {
+ artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
+ }
+ }
+ generateProtoTasks {
+ all().each { task ->
+ task.builtins {
+ remove javanone
+ }
+ task.plugins {
+ javalite {}
+ }
+ }
+ }
+}
+
+
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
// The google exposure library, required for DP3T, is resolved by the aar located in libs folder
@@ -187,6 +239,8 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.core:core-ktx:1.3.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+ implementation 'androidx.lifecycle:lifecycle-process:2.3.0'
+ implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
testImplementation 'junit:junit:4.13'
testImplementation "org.mockito:mockito-core:3.5.6"
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
@@ -195,11 +249,8 @@ dependencies {
androidTestImplementation 'androidx.test:rules:1.3.0'
androidTestImplementation "org.mockito:mockito-core:3.5.6"
- // Recommended: Add the Firebase SDK for Google Analytics.
- implementation 'com.google.firebase:firebase-analytics-ktx:17.5.0'
-
//Views
- implementation 'com.google.android.material:material:1.2.0'
+ implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
implementation "org.funktionale:funktionale-either:1.2"
@@ -230,22 +281,35 @@ dependencies {
implementation "com.squareup.retrofit2:converter-scalars:$rootProject.retrofitVersion"
//WorkerManager
- implementation 'androidx.work:work-runtime:2.4.0'
+ implementation 'androidx.work:work-runtime:2.5.0-beta01'
//JWT Token
- implementation 'io.jsonwebtoken:jjwt-api:0.11.1'
- runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.1'
- runtimeOnly('io.jsonwebtoken:jjwt-orgjson:0.11.1') {
+ implementation 'io.jsonwebtoken:jjwt-api:0.11.2'
+ runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.2'
+ runtimeOnly('io.jsonwebtoken:jjwt-orgjson:0.11.2') {
exclude group: 'org.json', module: 'json'
}
implementation 'org.bouncycastle:bcprov-jdk15on:1.65'
//DP3T
- implementation 'org.dpppt:dp3t-sdk-android:1.0.3'
+ implementation 'org.dpppt:dp3t-sdk-android:2.0.0'
implementation 'com.google.android.gms:play-services-tasks:17.2.0'
//DP3T aar dependencies
- implementation 'com.google.android.gms:play-services-base:17.4.0'
+ implementation 'com.google.android.gms:play-services-base:17.5.0'
implementation 'androidx.security:security-crypto:1.1.0-alpha02'
+ //SafetyNet
+ implementation 'com.google.android.gms:play-services-safetynet:17.0.0'
+
+ // google vision gradle
+ implementation 'com.google.android.gms:play-services-vision:20.1.3'
+
+ //CrowdNotifier
+ implementation 'org.crowdnotifier:crowdnotifier-sdk-android:2.1.0'
+ implementation 'com.google.protobuf:protobuf-lite:3.0.1'
+
+ //Biometrics
+ implementation "androidx.biometric:biometric-ktx:1.2.0-alpha03"
+
}
\ No newline at end of file
diff --git a/app/libs/play-services-nearby-18.0.3-eap.aar b/app/libs/play-services-nearby-18.0.3-eap.aar
deleted file mode 100644
index e962ff05..00000000
Binary files a/app/libs/play-services-nearby-18.0.3-eap.aar and /dev/null differ
diff --git a/app/libs/play-services-nearby-exposurenotification-1.7.2-eap.aar b/app/libs/play-services-nearby-exposurenotification-1.7.2-eap.aar
new file mode 100644
index 00000000..a2ec17e3
Binary files /dev/null and b/app/libs/play-services-nearby-exposurenotification-1.7.2-eap.aar differ
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 32dc58e8..0253471c 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -29,3 +29,5 @@
@com.squareup.otto.Subscribe public *;
@com.squareup.otto.Produce public *;
}
+
+-keep class com.sun.jna.** { *; }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b8f7cf67..e0dd9834 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,9 +14,11 @@
package="es.gob.radarcovid">
+
+
-
\ No newline at end of file
+
diff --git a/app/src/main/java/es/gob/radarcovid/RadarCovidApplication.kt b/app/src/main/java/es/gob/radarcovid/RadarCovidApplication.kt
index f11f92c1..3b72d3af 100644
--- a/app/src/main/java/es/gob/radarcovid/RadarCovidApplication.kt
+++ b/app/src/main/java/es/gob/radarcovid/RadarCovidApplication.kt
@@ -10,10 +10,19 @@
package es.gob.radarcovid
+import android.content.IntentFilter
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
import dagger.android.AndroidInjector
import dagger.android.support.DaggerApplication
import es.gob.radarcovid.common.base.broadcast.ExposureStatusChangeBroadcastReceiver
import es.gob.radarcovid.common.di.component.DaggerApplicationComponent
+import es.gob.radarcovid.datamanager.repository.PreferencesRepository
+import es.gob.radarcovid.features.worker.FakeInfectionReportWorker
+import es.gob.radarcovid.features.worker.VenueMatcherWorker
import io.reactivex.rxjava3.plugins.RxJavaPlugins
import okhttp3.CertificatePinner
import org.dpppt.android.sdk.DP3T
@@ -23,30 +32,41 @@ import javax.inject.Inject
import javax.inject.Named
-class RadarCovidApplication : DaggerApplication() {
+class RadarCovidApplication : DaggerApplication(), LifecycleObserver {
@Inject
lateinit var certificatePinner: CertificatePinner
+ @Inject
+ lateinit var preferencesRepository: PreferencesRepository
+
@Inject
@Named("userAgent")
lateinit var userAgent: String
override fun onCreate() {
super.onCreate()
+ ProcessLifecycleOwner.get().lifecycle.addObserver(this)
initRxJavaSettings()
DP3T.init(
this,
- ApplicationInfo(packageName, BuildConfig.REPORT_URL, BuildConfig.BUCKET_URL),
+ ApplicationInfo(BuildConfig.REPORT_URL, BuildConfig.BUCKET_URL),
SignatureUtil.getPublicKeyFromBase64OrThrow(BuildConfig.PUBLIC_KEY),
BuildConfig.DEBUG
)
DP3T.setCertificatePinner(certificatePinner)
- DP3T.setUserAgent(userAgent)
+ DP3T.setUserAgent { userAgent }
+ DP3T.setErrorNotificationGracePeriod(0)
+
+ FakeInfectionReportWorker.start(this, preferencesRepository)
registerReceiver(ExposureStatusChangeBroadcastReceiver(), DP3T.getUpdateIntentFilter())
+ LocalBroadcastManager.getInstance(this).registerReceiver(
+ ExposureStatusChangeBroadcastReceiver(),
+ IntentFilter(VenueMatcherWorker.ACTION_NEW_VENUE_EXPOSURE_NOTIFICATION)
+ )
}
@@ -62,4 +82,14 @@ class RadarCovidApplication : DaggerApplication() {
}
}
+ @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
+ fun onAppBackgrounded() {
+ preferencesRepository.setApplicationActive(false)
+ }
+
+ @OnLifecycleEvent(Lifecycle.Event.ON_START)
+ fun onAppForegrounded() {
+ preferencesRepository.setApplicationActive(true)
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/base/BaseActivity.kt b/app/src/main/java/es/gob/radarcovid/common/base/BaseActivity.kt
index d6e6949f..bd691e0d 100644
--- a/app/src/main/java/es/gob/radarcovid/common/base/BaseActivity.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/base/BaseActivity.kt
@@ -11,7 +11,15 @@
package es.gob.radarcovid.common.base
import android.content.Context
+import android.os.Build
+import android.os.VibrationEffect
+import android.os.Vibrator
+import android.view.View
+import android.view.accessibility.AccessibilityManager
import android.view.inputmethod.InputMethodManager
+import androidx.core.view.AccessibilityDelegateCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
import dagger.android.support.DaggerAppCompatActivity
import es.gob.radarcovid.BuildConfig
import es.gob.radarcovid.R
@@ -47,6 +55,19 @@ abstract class BaseActivity : DaggerAppCompatActivity() {
progressBar?.dismissWithAnimation()
}
+ fun hideLoadingWithCommonError() {
+ val title = labelManager.getText("ALERT_GENERIC_ERROR_TITLE", R.string.error_generic_title)
+ .toString()
+ val message = labelManager.getText("ALERT_GENERIC_ERROR", R.string.error_common_message)
+ .toString()
+ val button = labelManager.getText(
+ "ALERT_ACCEPT_BUTTON",
+ R.string.accept
+ ).toString()
+
+ progressBar?.showError(title, message, button)
+ }
+
fun hideLoadingWithError(error: Throwable) {
val title = if (error.message == null)
labelManager.getText("ALERT_GENERIC_ERROR_TITLE", R.string.error_generic_title)
@@ -116,4 +137,33 @@ abstract class BaseActivity : DaggerAppCompatActivity() {
}
}
+ fun isAccessibilityEnabled() =
+ (getSystemService(Context.ACCESSIBILITY_SERVICE) as AccessibilityManager).isEnabled
+
+ fun setAccessibilityAction(view: View, action: String) {
+ ViewCompat.setAccessibilityDelegate(view, object : AccessibilityDelegateCompat() {
+ override fun onInitializeAccessibilityNodeInfo(
+ host: View,
+ info: AccessibilityNodeInfoCompat
+ ) {
+ super.onInitializeAccessibilityNodeInfo(host, info)
+ // A custom action description. For example, you could use "pause"
+ // to have TalkBack speak "double-tap to pause."
+ val customClick = AccessibilityNodeInfoCompat.AccessibilityActionCompat(
+ AccessibilityNodeInfoCompat.ACTION_CLICK, action
+ )
+ info.addAction(customClick)
+ }
+ })
+ }
+
+ fun vibratePhone() {
+ val vibrator = getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+ if (Build.VERSION.SDK_INT >= 26) {
+ vibrator.vibrate(VibrationEffect.createOneShot(200, VibrationEffect.DEFAULT_AMPLITUDE))
+ } else {
+ vibrator.vibrate(200)
+ }
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/base/BaseFragment.kt b/app/src/main/java/es/gob/radarcovid/common/base/BaseFragment.kt
index 136a0ed0..98a9023c 100644
--- a/app/src/main/java/es/gob/radarcovid/common/base/BaseFragment.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/base/BaseFragment.kt
@@ -10,6 +10,8 @@
package es.gob.radarcovid.common.base
+import android.content.Context
+import android.view.accessibility.AccessibilityManager
import dagger.android.support.DaggerFragment
import es.gob.radarcovid.R
import es.gob.radarcovid.common.view.CMDialog
@@ -44,6 +46,19 @@ abstract class BaseFragment : DaggerFragment() {
progressBar?.dismissWithAnimation()
}
+ fun hideLoadingWithCommonError() {
+ val title = labelManager.getText("ALERT_GENERIC_ERROR_TITLE", R.string.error_generic_title)
+ .toString()
+ val message = labelManager.getText("ALERT_GENERIC_ERROR", R.string.error_common_message)
+ .toString()
+ val button = labelManager.getText(
+ "ALERT_ACCEPT_BUTTON",
+ R.string.accept
+ ).toString()
+
+ progressBar?.showError(title, message, button)
+ }
+
fun hideLoadingWithError(error: Throwable) {
val title = if (error.message == null)
labelManager.getText("ALERT_GENERIC_ERROR_TITLE", R.string.error_generic_title)
@@ -101,4 +116,9 @@ abstract class BaseFragment : DaggerFragment() {
.show()
}
+ fun isAccessibilityEnabled(): Boolean =
+ activity?.let {
+ (it.getSystemService(Context.ACCESSIBILITY_SERVICE) as AccessibilityManager).isEnabled
+ } ?: false
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/base/Constants.kt b/app/src/main/java/es/gob/radarcovid/common/base/Constants.kt
index 8c2c3e5c..9b9159ff 100644
--- a/app/src/main/java/es/gob/radarcovid/common/base/Constants.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/base/Constants.kt
@@ -10,11 +10,25 @@
package es.gob.radarcovid.common.base
+import es.gob.radarcovid.BuildConfig
+
object Constants {
- const val URL_PRIVACY_POLICY =
- "https://radarcovid.covid19.gob.es/terms-of-service/privacy-policy.html"
- const val URL_USAGE_CONDITIONS =
- "https://radarcovid.covid19.gob.es/terms-of-service/use-conditions.html"
+ const val SO_NAME = "Android"
+
+ const val DATE_FORMAT = "dd/MM/yyyy"
+
+ const val INCOMING_CODE_QUERY_PARAM = "code"
+ const val HOST_REPORT = "report"
+ const val HOST_QR_CODE = BuildConfig.QR_CODE_HOST_NAME
+
+ const val NOTIFICATION_REMINDER_DEFAULT = 1440
+
+ const val KPI_MATCH_CONFIRMED = "MATCH_CONFIRMED"
+ const val ANALYTICS_PERIOD_DEFAULT = 1440
+
+ //Encrypted shared preferences
+ const val ENCRYPTED_PREFERENCES_NAME = "app_encrypted_preferences"
+ const val ENCRYPTED_PREFERENCES_KEY_SIZE = 256
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/base/SafeClickListener.kt b/app/src/main/java/es/gob/radarcovid/common/base/SafeClickListener.kt
new file mode 100644
index 00000000..36591aa7
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/base/SafeClickListener.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.base
+
+import android.os.SystemClock
+import android.view.View
+
+class SafeClickListener(
+ private var defaultInterval: Int = 1000,
+ private val onSafeCLick: (View) -> Unit
+) : View.OnClickListener {
+ private var lastTimeClicked: Long = 0
+ override fun onClick(v: View) {
+ if (SystemClock.elapsedRealtime() - lastTimeClicked < defaultInterval) {
+ return
+ }
+ lastTimeClicked = SystemClock.elapsedRealtime()
+ onSafeCLick(v)
+ }
+}
diff --git a/app/src/main/java/es/gob/radarcovid/common/base/broadcast/ExposureStatusChangeBroadcastReceiver.kt b/app/src/main/java/es/gob/radarcovid/common/base/broadcast/ExposureStatusChangeBroadcastReceiver.kt
index d4e36944..159946cf 100644
--- a/app/src/main/java/es/gob/radarcovid/common/base/broadcast/ExposureStatusChangeBroadcastReceiver.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/base/broadcast/ExposureStatusChangeBroadcastReceiver.kt
@@ -30,6 +30,7 @@ import es.gob.radarcovid.datamanager.usecase.GetHealingTimeUseCase
import es.gob.radarcovid.datamanager.utils.LabelManager
import es.gob.radarcovid.features.splash.view.SplashActivity
import es.gob.radarcovid.features.worker.HealerWorker
+import es.gob.radarcovid.features.worker.VenueMatcherWorker
import es.gob.radarcovid.models.domain.ExposureInfo
import org.dpppt.android.sdk.DP3T
import javax.inject.Inject
@@ -62,9 +63,10 @@ class ExposureStatusChangeBroadcastReceiver : DaggerBroadcastReceiver() {
)
showHighExposureNotification(it)
}
- }, 1000)
+ }, 2000)
}
DP3T.ACTION_UPDATE -> BUS.post(EventExposureStatusChange())
+ VenueMatcherWorker.ACTION_NEW_VENUE_EXPOSURE_NOTIFICATION -> BUS.post(EventExposureStatusChange())
}
}
diff --git a/app/src/main/java/es/gob/radarcovid/common/base/utils/JwtTokenUtils.kt b/app/src/main/java/es/gob/radarcovid/common/base/utils/JwtTokenUtils.kt
index c1e9f0c0..93180666 100644
--- a/app/src/main/java/es/gob/radarcovid/common/base/utils/JwtTokenUtils.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/base/utils/JwtTokenUtils.kt
@@ -23,7 +23,9 @@ class JwtTokenUtils @Inject constructor() {
fun getOnset(token: String): Date {
val jwt = parseToken(token)
- val formatter = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
+ val formatter = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).apply {
+ timeZone = TimeZone.getTimeZone("UTC")
+ }
return formatter.parse(jwt.body["onset"] as? String ?: "") ?: Date()
}
diff --git a/app/src/main/java/es/gob/radarcovid/common/di/component/ApplicationComponent.kt b/app/src/main/java/es/gob/radarcovid/common/di/component/ApplicationComponent.kt
index 50f8630b..98128e97 100644
--- a/app/src/main/java/es/gob/radarcovid/common/di/component/ApplicationComponent.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/di/component/ApplicationComponent.kt
@@ -16,17 +16,14 @@ import dagger.Component
import dagger.android.AndroidInjector
import dagger.android.support.AndroidSupportInjectionModule
import es.gob.radarcovid.RadarCovidApplication
-import es.gob.radarcovid.common.di.module.ActivitiesModule
-import es.gob.radarcovid.common.di.module.ServicesModule
-import es.gob.radarcovid.common.di.module.NetworkModule
-import es.gob.radarcovid.common.di.module.RepositoryModule
-import es.gob.radarcovid.common.di.module.ViewsModule
+import es.gob.radarcovid.common.di.module.*
import es.gob.radarcovid.common.di.scope.PerApplication
import javax.inject.Named
@PerApplication
@Component(
modules = [NetworkModule::class,
+ EncryptedSharedPreferencesModule::class,
RepositoryModule::class,
ActivitiesModule::class,
ViewsModule::class,
diff --git a/app/src/main/java/es/gob/radarcovid/common/di/module/ActivitiesModule.kt b/app/src/main/java/es/gob/radarcovid/common/di/module/ActivitiesModule.kt
index 6934bd2f..976c8500 100644
--- a/app/src/main/java/es/gob/radarcovid/common/di/module/ActivitiesModule.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/di/module/ActivitiesModule.kt
@@ -18,12 +18,22 @@ import es.gob.radarcovid.features.covidreport.form.di.CovidReportModule
import es.gob.radarcovid.features.covidreport.form.view.CovidReportActivity
import es.gob.radarcovid.features.exposure.di.ExposureModule
import es.gob.radarcovid.features.exposure.view.ExposureActivity
+import es.gob.radarcovid.features.information.di.InformationModule
+import es.gob.radarcovid.features.information.view.InformationActivity
import es.gob.radarcovid.features.main.di.MainModule
import es.gob.radarcovid.features.main.view.MainActivity
import es.gob.radarcovid.features.onboarding.di.OnboardingModule
import es.gob.radarcovid.features.onboarding.view.OnboardingActivity
+import es.gob.radarcovid.features.qrcodescan.di.QRScanModule
+import es.gob.radarcovid.features.qrcodescan.view.QRScanActivity
import es.gob.radarcovid.features.splash.di.SplashModule
import es.gob.radarcovid.features.splash.view.SplashActivity
+import es.gob.radarcovid.features.stats.di.StatsModule
+import es.gob.radarcovid.features.stats.view.StatsFragment
+import es.gob.radarcovid.features.venuerecord.di.VenueRecordModule
+import es.gob.radarcovid.features.venuerecord.view.VenueRecordActivity
+import es.gob.radarcovid.features.venuevisited.di.VenueVisitedModule
+import es.gob.radarcovid.features.venuevisited.view.VenueVisitedActivity
@Module
abstract class ActivitiesModule {
@@ -45,11 +55,31 @@ abstract class ActivitiesModule {
abstract fun bindsExposureActivity(): ExposureActivity
@PerActivity
- @ContributesAndroidInjector(modules = [CovidReportModule::class])
+ @ContributesAndroidInjector(modules = [CovidReportModule::class, CovidReportFragmentModule::class])
abstract fun bindsReportActivity(): CovidReportActivity
+ @PerActivity
+ @ContributesAndroidInjector(modules = [InformationModule::class, InformationModule::class])
+ abstract fun bindsInformationActivity(): InformationActivity
+
+ @PerActivity
+ @ContributesAndroidInjector(modules = [StatsModule::class])
+ abstract fun bindsStatsActivity(): StatsFragment
+
@PerActivity
@ContributesAndroidInjector
abstract fun bindsConfirmationActivity(): ConfirmationActivity
+ @PerActivity
+ @ContributesAndroidInjector(modules = [QRScanModule::class])
+ abstract fun bindsQRScanActivity(): QRScanActivity
+
+ @PerActivity
+ @ContributesAndroidInjector(modules = [VenueRecordModule::class, VenueRecordFragmentsModule::class])
+ abstract fun bindsVenueRecordActivity(): VenueRecordActivity
+
+ @PerActivity
+ @ContributesAndroidInjector(modules = [VenueVisitedModule::class])
+ abstract fun bindsVenueVisitedActivity(): VenueVisitedActivity
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/di/module/CovidReportFragmentModule.kt b/app/src/main/java/es/gob/radarcovid/common/di/module/CovidReportFragmentModule.kt
new file mode 100644
index 00000000..9f2447ca
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/di/module/CovidReportFragmentModule.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.di.module
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import es.gob.radarcovid.common.di.scope.PerFragment
+import es.gob.radarcovid.features.covidreport.form.pages.step0.view.Step0MyHealthFragment
+import es.gob.radarcovid.features.covidreport.form.pages.step0.di.Step0MyHealthModule
+import es.gob.radarcovid.features.covidreport.form.pages.step1.view.Step1MyHealthFragment
+import es.gob.radarcovid.features.covidreport.form.pages.step1.di.Step1MyHealthModule
+import es.gob.radarcovid.features.covidreport.form.pages.step2.di.Step2MyHealthModule
+import es.gob.radarcovid.features.covidreport.form.pages.step2.view.Step2MyHealthFragment
+
+@Module
+abstract class CovidReportFragmentModule {
+
+ @PerFragment
+ @ContributesAndroidInjector(modules = [Step0MyHealthModule::class])
+ abstract fun bindsStep0Fragments(): Step0MyHealthFragment
+
+ @PerFragment
+ @ContributesAndroidInjector(modules = [Step1MyHealthModule::class])
+ abstract fun bindsStep1Fragments(): Step1MyHealthFragment
+
+ @PerFragment
+ @ContributesAndroidInjector(modules = [Step2MyHealthModule::class])
+ abstract fun bindsStep2Fragments(): Step2MyHealthFragment
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/di/module/EncryptedSharedPreferencesModule.kt b/app/src/main/java/es/gob/radarcovid/common/di/module/EncryptedSharedPreferencesModule.kt
new file mode 100644
index 00000000..642670ac
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/di/module/EncryptedSharedPreferencesModule.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.di.module
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.security.keystore.KeyGenParameterSpec
+import android.security.keystore.KeyProperties
+import androidx.security.crypto.EncryptedSharedPreferences
+import androidx.security.crypto.MasterKey
+import dagger.Module
+import dagger.Provides
+import es.gob.radarcovid.common.base.Constants.ENCRYPTED_PREFERENCES_KEY_SIZE
+import es.gob.radarcovid.common.base.Constants.ENCRYPTED_PREFERENCES_NAME
+import es.gob.radarcovid.common.di.scope.PerApplication
+import javax.inject.Named
+
+@Module
+class EncryptedSharedPreferencesModule {
+
+
+ @Provides
+ @PerApplication
+ fun providesEncryptedSharedPreferences(@Named("applicationContext") application: Context): SharedPreferences? {
+ try {
+
+ val keyGenParameterSpec = KeyGenParameterSpec.Builder(
+ MasterKey.DEFAULT_MASTER_KEY_ALIAS,
+ KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT
+ ).setBlockModes(KeyProperties.BLOCK_MODE_GCM)
+ .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
+ .setKeySize(ENCRYPTED_PREFERENCES_KEY_SIZE)
+ .build()
+
+ val masterKeyAlias = MasterKey.Builder(application, MasterKey.DEFAULT_MASTER_KEY_ALIAS)
+ .setKeyGenParameterSpec(keyGenParameterSpec)
+ .build()
+
+ return EncryptedSharedPreferences.create(
+ application,
+ ENCRYPTED_PREFERENCES_NAME,
+ masterKeyAlias,
+ EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+ EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+
+ )
+
+ } catch (ex: Exception) {
+ return null
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/di/module/MainFragmentsModule.kt b/app/src/main/java/es/gob/radarcovid/common/di/module/MainFragmentsModule.kt
index 3b244803..7e8cb922 100644
--- a/app/src/main/java/es/gob/radarcovid/common/di/module/MainFragmentsModule.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/di/module/MainFragmentsModule.kt
@@ -19,6 +19,10 @@ import es.gob.radarcovid.features.home.di.HomeModule
import es.gob.radarcovid.features.home.view.HomeFragment
import es.gob.radarcovid.features.mydata.di.MyDataModule
import es.gob.radarcovid.features.mydata.view.MyDataFragment
+import es.gob.radarcovid.features.settings.di.SettingsModule
+import es.gob.radarcovid.features.settings.view.SettingsFragment
+import es.gob.radarcovid.features.venue.di.VenueModule
+import es.gob.radarcovid.features.venue.view.VenueFragment
@Module
abstract class MainFragmentsModule {
@@ -35,4 +39,12 @@ abstract class MainFragmentsModule {
@ContributesAndroidInjector(modules = [HelplineModule::class])
abstract fun bindsHelplineFragment(): HelplineFragment
+ @PerFragment
+ @ContributesAndroidInjector(modules = [SettingsModule::class, SettingsFragmentsModule::class])
+ abstract fun bindsSettingsFragment(): SettingsFragment
+
+ @PerFragment
+ @ContributesAndroidInjector(modules = [VenueModule::class])
+ abstract fun bindsVenueFragment(): VenueFragment
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/di/module/NetworkModule.kt b/app/src/main/java/es/gob/radarcovid/common/di/module/NetworkModule.kt
index 783d0f16..3f1f4ffd 100644
--- a/app/src/main/java/es/gob/radarcovid/common/di/module/NetworkModule.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/di/module/NetworkModule.kt
@@ -10,12 +10,18 @@
package es.gob.radarcovid.common.di.module
+import android.content.Context
+import android.content.SharedPreferences
+import com.google.gson.GsonBuilder
import dagger.Module
import dagger.Provides
import es.gob.radarcovid.BuildConfig
+import es.gob.radarcovid.common.base.Constants.DATE_FORMAT
import es.gob.radarcovid.common.di.scope.PerApplication
import es.gob.radarcovid.datamanager.api.ApiInterface
import es.gob.radarcovid.datamanager.api.UserAgentInterceptor
+import es.gob.radarcovid.datamanager.attestation.AttestationClient
+import es.gob.radarcovid.datamanager.attestation.SafetyNetAttestationClient
import es.gob.radarcovid.datamanager.repository.BuildInfoRepository
import es.gob.radarcovid.datamanager.repository.SystemInfoRepository
import okhttp3.CertificatePinner
@@ -28,6 +34,7 @@ import retrofit2.converter.scalars.ScalarsConverterFactory
import java.net.URI
import javax.inject.Named
+
@Module
class NetworkModule {
@@ -55,6 +62,7 @@ class NetworkModule {
fun providesCertificatePinner(): CertificatePinner =
CertificatePinner.Builder()
.add(URI(BuildConfig.API_URL).host, BuildConfig.CERTIFICATE_PIN)
+ .add(URI(BuildConfig.API_URL).host, BuildConfig.CERTIFICATE_PIN_NEW)
.build()
@Provides
@@ -76,7 +84,13 @@ class NetworkModule {
fun providesRetrofit(httpClient: OkHttpClient): Retrofit.Builder = Retrofit.Builder()
.client(httpClient)
.addConverterFactory(ScalarsConverterFactory.create())
- .addConverterFactory(GsonConverterFactory.create())
+ .addConverterFactory(
+ GsonConverterFactory.create(
+ GsonBuilder()
+ .setDateFormat(DATE_FORMAT)
+ .create()
+ )
+ )
@Provides
@PerApplication
@@ -85,4 +99,18 @@ class NetworkModule {
.build()
.create(ApiInterface::class.java)
+
+ @Provides
+ @PerApplication
+ fun providesAttestationClient(@Named("applicationContext") application: Context): AttestationClient = SafetyNetAttestationClient(
+ application,
+ SafetyNetAttestationClient.AttestationParameters(
+ apiKey = BuildConfig.SAFETY_NET_API_KEY,
+ apkPackageName = application.packageName,
+ requiresBasicIntegrity = false,
+ requiresCtsProfile = false,
+ requiresHardwareAttestation = false
+ )
+ )
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/di/module/OnboardingFragmentsModule.kt b/app/src/main/java/es/gob/radarcovid/common/di/module/OnboardingFragmentsModule.kt
index 9ccc6d9e..df56fc4d 100644
--- a/app/src/main/java/es/gob/radarcovid/common/di/module/OnboardingFragmentsModule.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/di/module/OnboardingFragmentsModule.kt
@@ -13,8 +13,6 @@ package es.gob.radarcovid.common.di.module
import dagger.Module
import dagger.android.ContributesAndroidInjector
import es.gob.radarcovid.common.di.scope.PerFragment
-import es.gob.radarcovid.features.locale.di.LocaleSelectionModule
-import es.gob.radarcovid.features.locale.view.LocaleSelectionFragment
import es.gob.radarcovid.features.onboarding.pages.legal.di.LegalInfoModule
import es.gob.radarcovid.features.onboarding.pages.legal.view.LegalInfoFragment
import es.gob.radarcovid.features.onboarding.pages.welcome.di.WelcomeModule
@@ -24,15 +22,11 @@ import es.gob.radarcovid.features.onboarding.pages.welcome.view.WelcomeFragment
abstract class OnboardingFragmentsModule {
@PerFragment
- @ContributesAndroidInjector(modules = [WelcomeModule::class])
+ @ContributesAndroidInjector(modules = [WelcomeModule::class, WelcomeFragmentsModule::class])
abstract fun bindsWelcomeFragment(): WelcomeFragment
@PerFragment
@ContributesAndroidInjector(modules = [LegalInfoModule::class])
abstract fun bindsLegalInfoFragment(): LegalInfoFragment
- @PerFragment
- @ContributesAndroidInjector(modules = [LocaleSelectionModule::class])
- abstract fun bindsLocaleSelectionFragment(): LocaleSelectionFragment
-
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/di/module/RepositoryModule.kt b/app/src/main/java/es/gob/radarcovid/common/di/module/RepositoryModule.kt
index 97fd7277..c7493e79 100644
--- a/app/src/main/java/es/gob/radarcovid/common/di/module/RepositoryModule.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/di/module/RepositoryModule.kt
@@ -31,12 +31,13 @@ class RepositoryModule {
@Provides
@PerApplication
- fun providesExposureStatusRepository(repository: ExposureStatusRepositoryImpl): ExposureStatusRepository =
+ fun providesFakeInfectionReportRepository(repository: FakeInfectionReportRepositoryImpl): FakeInfectionReportRepository =
repository
@Provides
@PerApplication
- fun providesDomainRepository(repository: DomainRepositoryImpl): DomainRepository = repository
+ fun providesExposureStatusRepository(repository: ExposureStatusRepositoryImpl): ExposureStatusRepository =
+ repository
@Provides
@PerApplication
@@ -45,10 +46,14 @@ class RepositoryModule {
@Provides
@PerApplication
- fun providesExampleRepository(repository: ExampleRepositoryImpl): ExampleRepository = repository
+ fun providesApiRepository(repository: ApiRepositoryImpl): ApiRepository = repository
+
+ @Provides
+ @PerApplication
+ fun providesCrowdNotifierRepository(repository: CrowdNotifierRepositoryImpl): CrowdNotifierRepository = repository
@Provides
@PerApplication
- fun providesApiRepository(repository: ApiRepositoryImpl): ApiRepository = repository
+ fun providesEncryptedPreferencesRepository(repository: EncryptedPreferencesRepositoryImpl): EncryptedPreferencesRepository = repository
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/di/module/ServicesModule.kt b/app/src/main/java/es/gob/radarcovid/common/di/module/ServicesModule.kt
index 64c8d55f..4a4b3217 100644
--- a/app/src/main/java/es/gob/radarcovid/common/di/module/ServicesModule.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/di/module/ServicesModule.kt
@@ -14,11 +14,15 @@ import dagger.Module
import dagger.android.ContributesAndroidInjector
import es.gob.radarcovid.common.base.broadcast.ExposureStatusChangeBroadcastReceiver
import es.gob.radarcovid.common.di.scope.PerService
-import es.gob.radarcovid.features.worker.HealerWorker
+import es.gob.radarcovid.features.worker.*
@Module
abstract class ServicesModule {
+ @PerService
+ @ContributesAndroidInjector
+ abstract fun bindsFakeInfectedReportWorker(): FakeInfectionReportWorker
+
@PerService
@ContributesAndroidInjector
abstract fun bindsHealerWorker(): HealerWorker
@@ -27,4 +31,20 @@ abstract class ServicesModule {
@ContributesAndroidInjector
abstract fun bindsExposureStatusChangeBroadcastReceiver(): ExposureStatusChangeBroadcastReceiver
+ @PerService
+ @ContributesAndroidInjector
+ abstract fun bindsReminderWorker(): ReminderWorker
+
+ @PerService
+ @ContributesAndroidInjector
+ abstract fun bindsAnalyticsWorker(): AnalyticsWorker
+
+ @PerService
+ @ContributesAndroidInjector
+ abstract fun bindsVenueRecordWorker(): VenueRecordWorker
+
+ @PerService
+ @ContributesAndroidInjector
+ abstract fun bindsVenueMatcherWorker(): VenueMatcherWorker
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/di/module/SettingsFragmentsModule.kt b/app/src/main/java/es/gob/radarcovid/common/di/module/SettingsFragmentsModule.kt
new file mode 100644
index 00000000..2a6b6fda
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/di/module/SettingsFragmentsModule.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.di.module
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import es.gob.radarcovid.common.di.scope.PerSubFragment
+import es.gob.radarcovid.features.locale.di.LocaleSelectionModule
+import es.gob.radarcovid.features.locale.view.LocaleSelectionFragment
+
+@Module
+abstract class SettingsFragmentsModule {
+
+ @PerSubFragment
+ @ContributesAndroidInjector(modules = [LocaleSelectionModule::class])
+ abstract fun bindsLocaleSelectionFragment(): LocaleSelectionFragment
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/di/module/VenueRecordFragmentsModule.kt b/app/src/main/java/es/gob/radarcovid/common/di/module/VenueRecordFragmentsModule.kt
new file mode 100644
index 00000000..bfa6b0ff
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/di/module/VenueRecordFragmentsModule.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.di.module
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import es.gob.radarcovid.common.di.scope.PerFragment
+import es.gob.radarcovid.features.venuerecord.pages.confirmrecord.di.ConfirmRecordModule
+import es.gob.radarcovid.features.venuerecord.pages.confirmrecord.view.ConfirmRecordFragment
+import es.gob.radarcovid.features.venuerecord.pages.checkout.di.CheckOutModule
+import es.gob.radarcovid.features.venuerecord.pages.checkout.view.CheckOutFragment
+import es.gob.radarcovid.features.venuerecord.pages.errorcapturedcode.di.ErrorCapturedCodeModule
+import es.gob.radarcovid.features.venuerecord.pages.errorcapturedcode.view.ErrorCapturedCodeFragment
+import es.gob.radarcovid.features.venuerecord.pages.checkin.di.CheckInModule
+import es.gob.radarcovid.features.venuerecord.pages.checkin.view.CheckInFragment
+import es.gob.radarcovid.features.venuerecord.pages.recordsuccess.di.RecordSuccessModule
+import es.gob.radarcovid.features.venuerecord.pages.recordsuccess.view.RecordSuccessFragment
+
+@Module
+abstract class VenueRecordFragmentsModule {
+
+ @PerFragment
+ @ContributesAndroidInjector(modules = [ConfirmRecordModule::class])
+ abstract fun bindsCapturedCodeFragment(): ConfirmRecordFragment
+
+ @PerFragment
+ @ContributesAndroidInjector(modules = [ErrorCapturedCodeModule::class])
+ abstract fun bindsErrorCapturedCodeFragment(): ErrorCapturedCodeFragment
+
+ @PerFragment
+ @ContributesAndroidInjector(modules = [CheckInModule::class])
+ abstract fun bindsRecordInitiatedFragment(): CheckInFragment
+
+ @PerFragment
+ @ContributesAndroidInjector(modules = [CheckOutModule::class])
+ abstract fun bindsCheckOutFragment(): CheckOutFragment
+
+ @PerFragment
+ @ContributesAndroidInjector(modules = [RecordSuccessModule::class])
+ abstract fun bindsRecordSuccessFragment(): RecordSuccessFragment
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/di/module/ViewsModule.kt b/app/src/main/java/es/gob/radarcovid/common/di/module/ViewsModule.kt
index e3058927..68aaec1d 100644
--- a/app/src/main/java/es/gob/radarcovid/common/di/module/ViewsModule.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/di/module/ViewsModule.kt
@@ -13,7 +13,11 @@ package es.gob.radarcovid.common.di.module
import dagger.Module
import dagger.android.ContributesAndroidInjector
import es.gob.radarcovid.common.view.*
+import es.gob.radarcovid.common.view.adapter.SingleChoiceAdapter
+import es.gob.radarcovid.features.home.view.ShareDialog
+import es.gob.radarcovid.features.information.view.InformationDialog
import es.gob.radarcovid.features.main.view.ExposureHealedDialog
+import es.gob.radarcovid.features.stats.view.StatsCountriesDialog
@Module
abstract class ViewsModule {
@@ -36,6 +40,37 @@ abstract class ViewsModule {
@ContributesAndroidInjector
abstract fun bindsLowRiskInfoDialog(): ExposureHealedDialog
+ @ContributesAndroidInjector
+ abstract fun bindShareDialog(): ShareDialog
+
@ContributesAndroidInjector
abstract fun bindsLabelCheckBox(): LabelCheckBox
+
+ @ContributesAndroidInjector
+ abstract fun bindsLabelConstraintLayout(): LabelConstraintLayout
+
+ @ContributesAndroidInjector
+ abstract fun bindsMoreInfoButton(): MoreInfoButton
+
+ @ContributesAndroidInjector
+ abstract fun bindsLabelRadioButton(): LabelRadioButton
+
+ @ContributesAndroidInjector
+ abstract fun bindsStepsProgress(): StepsProgress
+
+ @ContributesAndroidInjector
+ abstract fun bindsSingleChoiceAdapter(): SingleChoiceAdapter
+
+ @ContributesAndroidInjector
+ abstract fun bindsLegalTermsDialog(): LegalTermsDialog
+
+ @ContributesAndroidInjector
+ abstract fun bindsInformationDialog(): InformationDialog
+
+ @ContributesAndroidInjector
+ abstract fun bindsStatsCountriesDialog(): StatsCountriesDialog
+
+ @ContributesAndroidInjector
+ abstract fun bindsSegmentedControlLabelButton(): SegmentedControlLabelButton
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/di/module/WelcomeFragmentsModule.kt b/app/src/main/java/es/gob/radarcovid/common/di/module/WelcomeFragmentsModule.kt
new file mode 100644
index 00000000..8e028c60
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/di/module/WelcomeFragmentsModule.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.di.module
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import es.gob.radarcovid.common.di.scope.PerSubFragment
+import es.gob.radarcovid.features.locale.di.LocaleSelectionModule
+import es.gob.radarcovid.features.locale.view.LocaleSelectionFragment
+
+
+@Module
+abstract class WelcomeFragmentsModule {
+
+ @PerSubFragment
+ @ContributesAndroidInjector(modules = [LocaleSelectionModule::class])
+ abstract fun bindsLocaleSelectionFragment(): LocaleSelectionFragment
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/extensions/CharSequence.kt b/app/src/main/java/es/gob/radarcovid/common/extensions/CharSequence.kt
new file mode 100644
index 00000000..8da2fbe1
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/extensions/CharSequence.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.extensions
+
+import android.text.Spannable
+import android.text.Spanned
+import android.text.TextPaint
+import android.text.style.URLSpan
+import android.text.style.UnderlineSpan
+
+fun CharSequence.removeUnderline(): Spanned {
+ val s = this as Spannable
+ for (u in s.getSpans(0, s.length, URLSpan::class.java)) {
+ s.setSpan(object : UnderlineSpan() {
+ override fun updateDrawState(tp: TextPaint) {
+ tp.isUnderlineText = false
+ }
+ }, s.getSpanStart(u), s.getSpanEnd(u), 0)
+ }
+ return s
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/extensions/Date.kt b/app/src/main/java/es/gob/radarcovid/common/extensions/Date.kt
index e370ee4c..aa4a4825 100644
--- a/app/src/main/java/es/gob/radarcovid/common/extensions/Date.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/extensions/Date.kt
@@ -12,11 +12,98 @@ package es.gob.radarcovid.common.extensions
import java.text.SimpleDateFormat
import java.util.*
+import java.util.concurrent.TimeUnit
const val DATE_FORMAT_VERBOSE = "dd.MM.yyyy"
const val DATE_FORMAT_TIMESTAMP = "dd/MM/yyyy HH:mm:ss"
+const val DATE_FORMAT = "dd/MM/yyyy"
+const val DATE_DAY_FORMAT = "MMMM d"
fun Date.format(): String = SimpleDateFormat(DATE_FORMAT_VERBOSE, Locale.getDefault()).format(this)
fun Date.toTimeStamp(): String =
- SimpleDateFormat(DATE_FORMAT_TIMESTAMP, Locale.getDefault()).format(this)
\ No newline at end of file
+ SimpleDateFormat(DATE_FORMAT_TIMESTAMP, Locale.getDefault()).format(this)
+
+fun Date.getDayString(): String =
+ SimpleDateFormat("dd", Locale.getDefault()).format(this)
+
+fun Date.getNameDayString(locale: String): String =
+ SimpleDateFormat("EEEE", Locale.forLanguageTag(locale)).format(this).capitalize()
+
+fun Date.geMonthNameDefault(): String =
+ SimpleDateFormat("MMMM", Locale.getDefault()).format(this).capitalize()
+
+fun Date.geMonthName(locale: String): String =
+ SimpleDateFormat("MMMM", Locale.forLanguageTag(locale)).format(this).capitalize()
+
+fun Date.getYearString(): String =
+ SimpleDateFormat("yyyy", Locale.getDefault()).format(this)
+
+fun Date.getHourString(): String =
+ SimpleDateFormat("HH:mm", Locale.getDefault()).format(this)
+
+fun Date.getDayAndMonth(locale: String): String =
+ SimpleDateFormat("d MMMM", Locale.forLanguageTag(locale)).format(this).capitalizeWord()
+
+fun Date.toDateFormat(): String =
+ SimpleDateFormat(DATE_FORMAT, Locale.getDefault()).format(this)
+
+fun Date.isToday(): Boolean {
+ Calendar.getInstance().apply {
+ return this.get(Calendar.DAY_OF_YEAR) == get(Calendar.DAY_OF_YEAR)
+ }
+}
+
+fun Date.isYesterday(): Boolean {
+ Calendar.getInstance().apply {
+ return this.get(Calendar.DAY_OF_YEAR) - get(Calendar.DAY_OF_YEAR) == 1
+ }
+}
+
+fun Date.add(field: Int, amount: Int): Date {
+ Calendar.getInstance().apply {
+ time = this@add
+ add(field, amount)
+ return time
+ }
+}
+
+fun Date.addYears(years: Int): Date {
+ return add(Calendar.YEAR, years)
+}
+
+fun Date.addMonths(months: Int): Date {
+ return add(Calendar.MONTH, months)
+}
+
+fun Date.addDays(days: Int): Date {
+ return add(Calendar.DAY_OF_MONTH, days)
+}
+
+fun Date.addHours(hours: Int): Date {
+ return add(Calendar.HOUR_OF_DAY, hours)
+}
+
+fun Date.addMinutes(minutes: Int): Date {
+ return add(Calendar.MINUTE, minutes)
+}
+
+fun Date.addSeconds(seconds: Int): Date {
+ return add(Calendar.SECOND, seconds)
+}
+
+fun Date.getDaysAgo(): Long {
+ val millisElapsed = System.currentTimeMillis() - time
+ return TimeUnit.MILLISECONDS.toDays(millisElapsed)
+}
+
+fun Date.getTimeElapsed(date: Date): String {
+ val millisElapsed = date.time - time
+ val hours = TimeUnit.MILLISECONDS.toHours(millisElapsed)
+ val minutes = TimeUnit.MILLISECONDS.toMinutes(millisElapsed)
+ return if (hours <= 0) {
+ "$minutes'"
+ } else {
+ "${hours}h"
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/extensions/String.kt b/app/src/main/java/es/gob/radarcovid/common/extensions/String.kt
index a32ee01b..6b6e843d 100644
--- a/app/src/main/java/es/gob/radarcovid/common/extensions/String.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/extensions/String.kt
@@ -12,6 +12,7 @@ package es.gob.radarcovid.common.extensions
import android.text.Spanned
import androidx.core.text.HtmlCompat
+import java.util.*
fun String?.default(default: String): String = when {
this == null -> default
@@ -20,3 +21,14 @@ fun String?.default(default: String): String = when {
}
fun String?.parseHtml(): Spanned = HtmlCompat.fromHtml(this ?: "", HtmlCompat.FROM_HTML_MODE_LEGACY)
+
+fun String.capitalizeWord(): String {
+ val words: List = split(" ")
+ var capitalizeWord = ""
+ words.forEach {
+ val first = it.substring(0, 1)
+ val afterFirst = it.substring(1)
+ capitalizeWord += first.toUpperCase(Locale.ROOT) + afterFirst + " "
+ }
+ return capitalizeWord.trim { it <= ' ' }
+}
diff --git a/app/src/main/java/es/gob/radarcovid/common/extensions/View.kt b/app/src/main/java/es/gob/radarcovid/common/extensions/View.kt
new file mode 100644
index 00000000..74fd496d
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/extensions/View.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.extensions
+
+import android.view.View
+import androidx.core.view.AccessibilityDelegateCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
+import es.gob.radarcovid.common.base.SafeClickListener
+
+fun View.setSafeOnClickListener(onSafeClick: (View) -> Unit) {
+ val safeClickListener = SafeClickListener {
+ onSafeClick(it)
+ }
+ setOnClickListener(safeClickListener)
+}
+
+fun View.setAccessibilityAction(action: String) {
+ ViewCompat.setAccessibilityDelegate(this, object : AccessibilityDelegateCompat() {
+ override fun onInitializeAccessibilityNodeInfo(
+ host: View,
+ info: AccessibilityNodeInfoCompat
+ ) {
+ super.onInitializeAccessibilityNodeInfo(host, info)
+ // A custom action description. For example, you could use "pause"
+ // to have TalkBack speak "double-tap to pause."
+ val customClick = AccessibilityNodeInfoCompat.AccessibilityActionCompat(
+ AccessibilityNodeInfoCompat.ACTION_CLICK, action
+ )
+ info.addAction(customClick)
+ }
+ })
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/CMCheckBox.kt b/app/src/main/java/es/gob/radarcovid/common/view/CMCheckBox.kt
deleted file mode 100644
index a6b5bd36..00000000
--- a/app/src/main/java/es/gob/radarcovid/common/view/CMCheckBox.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2020 Gobierno de España
- *
- * 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 es.gob.radarcovid.common.view
-
-import android.content.Context
-import android.text.method.LinkMovementMethod
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.widget.CompoundButton
-import android.widget.LinearLayout
-import androidx.core.content.ContextCompat
-import es.gob.radarcovid.R
-import kotlinx.android.synthetic.main.view_cmcheckbox.view.*
-
-class CMCheckBox @JvmOverloads constructor(
- context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr) {
-
- var isChecked: Boolean = false
- set(value) {
- field = value
- checkBox.isChecked = value
- }
- get() = checkBox.isChecked
-
- init {
- orientation = HORIZONTAL
- LayoutInflater.from(context).inflate(R.layout.view_cmcheckbox, this)
- val typedArray = context.obtainStyledAttributes(attrs, R.styleable.CMCheckBox)
- val text = typedArray.getText(R.styleable.CMCheckBox_android_text)
- typedArray.recycle()
- textView.text = text
- }
-
- fun setOnCheckedChangeListener(listener: CompoundButton.OnCheckedChangeListener?) {
- checkBox.setOnCheckedChangeListener(listener)
- }
-
- fun setText(text: CharSequence?) {
- textView.text = text
- textView.movementMethod = LinkMovementMethod.getInstance()
- textView.highlightColor = ContextCompat.getColor(context, R.color.black_28)
- }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/CMDialog.kt b/app/src/main/java/es/gob/radarcovid/common/view/CMDialog.kt
index d23833d2..e7bc2af3 100644
--- a/app/src/main/java/es/gob/radarcovid/common/view/CMDialog.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/view/CMDialog.kt
@@ -16,24 +16,20 @@ import android.graphics.drawable.ColorDrawable
import android.view.LayoutInflater
import android.view.View
import android.widget.Button
-import android.widget.ImageButton
-import android.widget.TextView
import androidx.appcompat.app.AlertDialog
import es.gob.radarcovid.R
-
object CMDialog {
class Builder(private val context: Context) {
private val view: View =
LayoutInflater.from(context).inflate(R.layout.dialog, null)
- private val textViewTitle = view.findViewById(R.id.textViewDialogTitle)
+ private val textViewTitle = view.findViewById(R.id.textViewDialogTitle)
private val textViewDescription =
- view.findViewById(R.id.textViewDialogDescription)
+ view.findViewById(R.id.textViewDialogDescription)
private val buttonOk = view.findViewById(R.id.buttonOk)
private val buttonCancel = view.findViewById(R.id.buttonCancel)
- private val buttonClose = view.findViewById(R.id.buttonClose)
private val dialog: AlertDialog = AlertDialog.Builder(context)
.setView(view)
.setCancelable(false)
@@ -57,14 +53,6 @@ object CMDialog {
return this
}
- fun setCloseButton(onCloseButtonClick: ((AlertDialog) -> Unit)): Builder {
- buttonClose.visibility = View.VISIBLE
- buttonClose.setOnClickListener {
- onCloseButtonClick(dialog)
- }
- return this
- }
-
fun setPositiveButton(
resId: Int,
onPositiveButtonClick: ((AlertDialog) -> Unit)
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/CodeEditText.kt b/app/src/main/java/es/gob/radarcovid/common/view/CodeEditText.kt
deleted file mode 100644
index aa6df540..00000000
--- a/app/src/main/java/es/gob/radarcovid/common/view/CodeEditText.kt
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2020 Gobierno de España
- *
- * 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 es.gob.radarcovid.common.view
-
-import android.content.Context
-import android.text.Editable
-import android.text.InputFilter
-import android.text.Spanned
-import android.text.TextWatcher
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.inputmethod.InputMethodManager
-import android.widget.EditText
-import androidx.appcompat.widget.LinearLayoutCompat
-import androidx.core.text.isDigitsOnly
-import es.gob.radarcovid.R
-import kotlinx.android.synthetic.main.view_code_edittext.view.*
-
-
-class CodeEditText @JvmOverloads constructor(
- context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
-) : LinearLayoutCompat(context, attrs, defStyleAttr) {
-
- companion object {
- private const val NON_VALID_CHARACTER = "-"
- }
-
- private var editTexts: Array
-
- var textChangedListener: ((String) -> Unit)? = null
-
- var previousText: String = ""
-
- init {
- LayoutInflater.from(context).inflate(R.layout.view_code_edittext, this)
- editTexts = arrayOf(
- editTextCode1,
- editTextCode2,
- editTextCode3,
- editTextCode4,
- editTextCode5,
- editTextCode6,
- editTextCode7,
- editTextCode8,
- editTextCode9,
- editTextCode10,
- editTextCode11,
- editTextCode12
- )
-
- setOnClickListener {
- focusLastEditText()
- }
-
- editTexts.forEachIndexed { index, editText ->
-
- editText.filters = arrayOf(object : InputFilter {
- override fun filter(
- source: CharSequence?,
- start: Int,
- end: Int,
- dest: Spanned?,
- dstart: Int,
- dend: Int
- ): CharSequence {
- return if (source?.isDigitsOnly() == true)
- source
- else
- NON_VALID_CHARACTER
- }
- }, InputFilter.LengthFilter(1))
-
- editText.addTextChangedListener(object : TextWatcher {
- override fun afterTextChanged(s: Editable?) {
- s?.let { text ->
- if (text.toString() == NON_VALID_CHARACTER) {
- editText.setText("")
- } else if (text.length == 1) {
- if (index < editTexts.size - 1)
- editTexts[index + 1].requestFocus()
- }
- if (text.toString() != NON_VALID_CHARACTER) {
- if (getText() != previousText) {
- previousText = getText()
- textChangedListener?.invoke(getText())
- }
- }
- }
- }
-
- override fun beforeTextChanged(
- s: CharSequence?,
- start: Int,
- count: Int,
- after: Int
- ) {
-
- }
-
- override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-
- }
- })
-
- editText.onDeleteButtonClickListener = {
- if (index > 0) {
- if (editText.text?.isEmpty() == true) {
- editTexts[index - 1].apply { setText("") }.requestFocus()
- } else {
- editText.setText("")
- }
- }
- }
-
- editText.setOnTouchListener { _, _ ->
- focusLastEditText()
- true
- }
- }
- }
-
- private fun focusLastEditText() {
- editTexts.find { it.text.isNullOrEmpty() || editTexts.indexOf(it) == editTexts.lastIndex }
- ?.let {
- it.requestFocus()
- showKeyboard(context, it)
- }
- }
-
- private fun showKeyboard(context: Context, editText: EditText) {
- (context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager?)?.toggleSoftInputFromWindow(
- editText.windowToken,
- InputMethodManager.SHOW_FORCED,
- InputMethodManager.HIDE_IMPLICIT_ONLY
- )
- }
-
- fun getText(): String = editTexts.map { it.text }.joinToString("")
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/CommonDialog.kt b/app/src/main/java/es/gob/radarcovid/common/view/CommonDialog.kt
new file mode 100644
index 00000000..2fd2360f
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/view/CommonDialog.kt
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.view
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.ImageView
+import androidx.appcompat.app.AlertDialog
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.extensions.setSafeOnClickListener
+
+object CommonDialog {
+
+ class Builder(private val context: Context) {
+
+ private val view: View =
+ LayoutInflater.from(context).inflate(R.layout.dialog_common, null)
+ private val textViewTitle = view.findViewById(R.id.textViewDialogTitle)
+ private val textViewMessage =
+ view.findViewById(R.id.textViewMessage)
+ private val buttonClose = view.findViewById(R.id.buttonClose)
+ private val buttonOk = view.findViewById(R.id.buttonOk)
+ private val buttonCancel = view.findViewById(R.id.buttonCancel)
+ private val imageView = view.findViewById(R.id.imageView)
+ private val spaceView = view.findViewById(R.id.spaceView)
+ private val dialog: AlertDialog = AlertDialog.Builder(context)
+ .setView(view)
+ .setCancelable(false)
+ .create().apply {
+ window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+ }
+
+ fun setTitle(resId: Int): Builder = setTitle(context.getString(resId))
+
+ fun setTitle(text: String): Builder {
+ textViewTitle.visibility = View.VISIBLE
+ textViewTitle.text = text
+ return this
+ }
+
+ fun setMessage(resId: Int): Builder = setMessage(context.getString(resId))
+
+ fun setMessage(text: String): Builder {
+ textViewMessage.visibility = View.VISIBLE
+ textViewMessage.text = text
+ return this
+ }
+
+ fun setPositiveButton(
+ resId: Int,
+ onPositiveButtonClick: ((AlertDialog) -> Unit)
+ ): Builder = setPositiveButton(context.getString(resId), onPositiveButtonClick)
+
+ fun setPositiveButton(
+ text: String,
+ onPositiveButtonClick: ((AlertDialog) -> Unit)
+ ): Builder {
+ buttonOk.visibility = View.VISIBLE
+ buttonOk.text = text
+ buttonOk.setSafeOnClickListener {
+ onPositiveButtonClick(dialog)
+ }
+ return this
+ }
+
+ fun setNegativeButton(
+ resId: Int,
+ onNegativeButtonClick: ((AlertDialog) -> Unit)
+ ): Builder = setNegativeButton(context.getString(resId), onNegativeButtonClick)
+
+ fun setNegativeButton(
+ text: String,
+ onNegativeButtonClick: ((AlertDialog) -> Unit)
+ ): Builder {
+ buttonCancel.visibility = View.VISIBLE
+ buttonCancel.text = text
+ buttonCancel.setSafeOnClickListener {
+ onNegativeButtonClick(dialog)
+ }
+ return this
+ }
+
+ fun setCloseButton(
+ onCloseButtonClick: ((AlertDialog) -> Unit)
+ ): Builder {
+ buttonClose.setSafeOnClickListener {
+ onCloseButtonClick(dialog)
+ }
+ return this
+ }
+
+ fun setImage(src: Int): Builder {
+ imageView.visibility = View.VISIBLE
+ spaceView.visibility = View.GONE
+ imageView.setImageResource(src)
+ return this
+ }
+
+ fun build(): AlertDialog = dialog
+
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/HintSpinnerAdapter.kt b/app/src/main/java/es/gob/radarcovid/common/view/HintSpinnerAdapter.kt
deleted file mode 100644
index 424542d2..00000000
--- a/app/src/main/java/es/gob/radarcovid/common/view/HintSpinnerAdapter.kt
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2020 Gobierno de España
- *
- * 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 es.gob.radarcovid.common.view
-
-import android.content.Context
-import android.database.DataSetObserver
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ArrayAdapter
-import android.widget.ListAdapter
-import android.widget.SpinnerAdapter
-import android.widget.TextView
-import es.gob.radarcovid.R
-
-
-class HintSpinnerAdapter(
- context: Context,
- private val hintText: String,
- private val dropdownLayout: Int = R.layout.row_spinner,
- objects: List
-) : SpinnerAdapter, ListAdapter {
-
- constructor(
- context: Context,
- hintResourceId: Int,
- dropdownLayout: Int = R.layout.row_spinner,
- objects: List
- ) : this(context, context.resources.getString(hintResourceId), dropdownLayout, objects)
-
- private val extra = 1
-
- private val adapter: SpinnerAdapter = ArrayAdapter(
- context,
- dropdownLayout,
- objects
- )
- private val layoutInflater: LayoutInflater = LayoutInflater.from(context)
- private val emptyView: View = View(context)
-
- override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View =
- if (position == 0) {
- layoutInflater.inflate(dropdownLayout, parent, false).apply {
- (this as TextView).text = hintText
- }
- } else
- adapter.getView(position - extra, null, parent)
-
- override fun getDropDownView(
- position: Int,
- convertView: View?,
- parent: ViewGroup?
- ): View? { // Android BUG! http://code.google.com/p/android/issues/detail?id=17128 -
-// Spinner does not support multiple view types
- return if (position == 0) {
-// layoutInflater.inflate(nothingSelectedDropdownLayout, parent, false).apply {
-// (this as TextView).text = hintText
-// }
- emptyView
- } else adapter.getDropDownView(position - extra, null, parent)
- // Could re-use the convertView if possible, use setTag...
- }
-
- override fun getCount(): Int {
- val count = adapter.count
- return if (count == 0) 0 else count + extra
- }
-
- override fun getItem(position: Int): Any? =
- if (position == 0)
- null
- else
- adapter.getItem(position - extra)
-
-
- override fun getItemViewType(position: Int): Int = 0
-
- override fun getViewTypeCount(): Int = 1
-
- override fun getItemId(position: Int): Long =
- if (position >= extra)
- adapter.getItemId(position - extra)
- else
- (position - extra).toLong()
-
-
- override fun hasStableIds(): Boolean = adapter.hasStableIds()
-
- override fun isEmpty(): Boolean = adapter.isEmpty
-
- override fun registerDataSetObserver(observer: DataSetObserver?) {
- adapter.registerDataSetObserver(observer)
- }
-
- override fun unregisterDataSetObserver(observer: DataSetObserver?) {
- adapter.unregisterDataSetObserver(observer)
- }
-
- override fun areAllItemsEnabled(): Boolean = false
-
- override fun isEnabled(position: Int): Boolean =
- position != 0 // Don't allow the 'nothing selected'
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/LabelButton.kt b/app/src/main/java/es/gob/radarcovid/common/view/LabelButton.kt
index de152302..1b5dfe50 100644
--- a/app/src/main/java/es/gob/radarcovid/common/view/LabelButton.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/view/LabelButton.kt
@@ -12,7 +12,11 @@ package es.gob.radarcovid.common.view
import android.content.Context
import android.util.AttributeSet
+import android.view.View
import androidx.appcompat.widget.AppCompatButton
+import androidx.core.view.AccessibilityDelegateCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
import dagger.android.HasAndroidInjector
import es.gob.radarcovid.R
import es.gob.radarcovid.datamanager.utils.LabelManager
@@ -25,8 +29,6 @@ class LabelButton @JvmOverloads constructor(
@Inject
lateinit var labelManager: LabelManager
- private var labelId: String?
-
init {
(context.applicationContext as HasAndroidInjector)
.androidInjector()
@@ -38,9 +40,29 @@ class LabelButton @JvmOverloads constructor(
0, 0
).apply {
try {
- labelId = getString(R.styleable.LabelButton_labelId)
+ val labelId = getString(R.styleable.LabelButton_labelId) ?: ""
val defaultText = getText(R.styleable.LabelButton_android_text)
text = labelManager.getText(labelId, defaultText)
+
+ val actionDescriptionLabelId =
+ getString(R.styleable.LabelButton_actionDescriptionLabelId)
+ val defaultTextAction = getText(R.styleable.LabelButton_actionDescription) ?: ""
+ val actionDescription =
+ labelManager.getText(actionDescriptionLabelId, defaultTextAction).toString()
+ if (actionDescription.isNotEmpty()) {
+ setAccessibilityAction(actionDescription)
+ }
+
+ val contentDescriptionLabelId =
+ getString(R.styleable.LabelButton_contentDescriptionLabelId)
+ val defaultTextContent =
+ getText(R.styleable.LabelButton_android_contentDescription) ?: ""
+ val customContentDescription =
+ labelManager.getText(contentDescriptionLabelId, defaultTextContent).toString()
+ if (customContentDescription.isNotEmpty()) {
+ contentDescription = customContentDescription
+ }
+
} finally {
recycle()
}
@@ -56,8 +78,21 @@ class LabelButton @JvmOverloads constructor(
text = labelManager.getText(labelId, defaultText)
}
- fun reloadText() {
- text = labelManager.getText(labelId, text)
+ private fun setAccessibilityAction(action: String) {
+ ViewCompat.setAccessibilityDelegate(this, object : AccessibilityDelegateCompat() {
+ override fun onInitializeAccessibilityNodeInfo(
+ host: View,
+ info: AccessibilityNodeInfoCompat
+ ) {
+ super.onInitializeAccessibilityNodeInfo(host, info)
+ // A custom action description. For example, you could use "pause"
+ // to have TalkBack speak "double-tap to pause."
+ val customClick = AccessibilityNodeInfoCompat.AccessibilityActionCompat(
+ AccessibilityNodeInfoCompat.ACTION_CLICK, action
+ )
+ info.addAction(customClick)
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/LabelCheckBox.kt b/app/src/main/java/es/gob/radarcovid/common/view/LabelCheckBox.kt
index ac6f7723..df387882 100644
--- a/app/src/main/java/es/gob/radarcovid/common/view/LabelCheckBox.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/view/LabelCheckBox.kt
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.view
import android.content.Context
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/LabelConstraintLayout.kt b/app/src/main/java/es/gob/radarcovid/common/view/LabelConstraintLayout.kt
new file mode 100644
index 00000000..8286cbef
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/view/LabelConstraintLayout.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.AccessibilityDelegateCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
+import dagger.android.HasAndroidInjector
+import es.gob.radarcovid.R
+import es.gob.radarcovid.datamanager.utils.LabelManager
+import javax.inject.Inject
+
+class LabelConstraintLayout : ConstraintLayout {
+
+ @Inject
+ lateinit var labelManager: LabelManager
+
+ private var customContentDescription: String? = null
+
+ constructor(context: Context) : super(context)
+
+ constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
+ init(context, attrs, this)
+ }
+
+ constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+ context,
+ attrs,
+ defStyleAttr
+ ) {
+ init(context, attrs, this)
+ }
+
+ private fun init(context: Context, attrs: AttributeSet?, view: View) {
+ if (attrs != null) {
+ (context.applicationContext as HasAndroidInjector)
+ .androidInjector()
+ .inject(this)
+ context.theme.obtainStyledAttributes(
+ attrs,
+ R.styleable.LabelConstraintLayout,
+ 0, 0
+ ).apply {
+ try {
+ val actionDescriptionLabelId =
+ getString(R.styleable.LabelConstraintLayout_actionDescriptionLabelId)
+ val defaultActionDescription =
+ getText(R.styleable.LabelConstraintLayout_actionDescription) ?: ""
+ val actionDescription =
+ labelManager.getText(actionDescriptionLabelId, defaultActionDescription)
+ .toString()
+ if (actionDescription.isNotEmpty())
+ setAccessibilityAction(actionDescription)
+
+ } finally {
+ recycle()
+ }
+ }
+ }
+ }
+
+ private fun setAccessibilityAction(action: String) {
+ ViewCompat.setAccessibilityDelegate(this, object : AccessibilityDelegateCompat() {
+ override fun onInitializeAccessibilityNodeInfo(
+ host: View,
+ info: AccessibilityNodeInfoCompat
+ ) {
+ super.onInitializeAccessibilityNodeInfo(host, info)
+ // A custom action description. For example, you could use "pause"
+ // to have TalkBack speak "double-tap to pause."
+ val customClick = AccessibilityNodeInfoCompat.AccessibilityActionCompat(
+ AccessibilityNodeInfoCompat.ACTION_CLICK, action
+ )
+ info.addAction(customClick)
+ }
+ })
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/LabelDotTextView.kt b/app/src/main/java/es/gob/radarcovid/common/view/LabelDotTextView.kt
index ac40bf46..b9ef7d3a 100644
--- a/app/src/main/java/es/gob/radarcovid/common/view/LabelDotTextView.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/view/LabelDotTextView.kt
@@ -19,6 +19,7 @@ import android.widget.LinearLayout
import android.widget.TextView
import dagger.android.HasAndroidInjector
import es.gob.radarcovid.R
+import es.gob.radarcovid.common.extensions.removeUnderline
import es.gob.radarcovid.datamanager.utils.LabelManager
import kotlinx.android.synthetic.main.view_dotted_textview.view.*
import javax.inject.Inject
@@ -57,6 +58,24 @@ class LabelDotTextView @JvmOverloads constructor(
2 -> imageViewDot.visibility = View.GONE
}
textView.text = labelManager.getText(labelId, defaultText)
+
+ val contentDescriptionLabelId =
+ getString(R.styleable.LabelDotTextView_contentDescriptionLabelId)
+ val defaultTextContent =
+ getText(R.styleable.LabelDotTextView_contentDescription) ?: ""
+ val customContentDescription =
+ labelManager.getText(contentDescriptionLabelId, defaultTextContent).toString()
+ if (!customContentDescription.isEmpty()) {
+ textView.setCustomContentDescription(customContentDescription)
+ }
+
+ val isLink = getBoolean(R.styleable.LabelDotTextView_isLink, false)
+ val removeUnderlineLink =
+ getBoolean(R.styleable.LabelDotTextView_removeUnderlineLink, false)
+ if (isLink) textView.setIsLink()
+ if (removeUnderlineLink)
+ removeUnderlineLink()
+
} finally {
recycle()
}
@@ -78,4 +97,8 @@ class LabelDotTextView @JvmOverloads constructor(
fun reloadText() {
textView.text = labelManager.getText(labelId, textView.text)
}
+
+ fun removeUnderlineLink() {
+ textView.text = textView.text.removeUnderline()
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/LabelRadioButton.kt b/app/src/main/java/es/gob/radarcovid/common/view/LabelRadioButton.kt
new file mode 100644
index 00000000..120e730a
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/view/LabelRadioButton.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.view
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatRadioButton
+import dagger.android.HasAndroidInjector
+import es.gob.radarcovid.R
+import es.gob.radarcovid.datamanager.utils.LabelManager
+import javax.inject.Inject
+
+class LabelRadioButton @JvmOverloads constructor(
+ context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : AppCompatRadioButton(context, attrs, defStyleAttr) {
+
+ @Inject
+ lateinit var labelManager: LabelManager
+ private var labelId: String?
+ private var contentDescriptionLabelId: String?
+
+ init {
+ (context.applicationContext as HasAndroidInjector)
+ .androidInjector()
+ .inject(this)
+ context.theme.obtainStyledAttributes(
+ attrs,
+ R.styleable.LabelRadioButton,
+ 0, 0
+ ).apply {
+ try {
+ labelId = getString(R.styleable.LabelRadioButton_labelId)
+ val defaultText = getText(R.styleable.LabelRadioButton_android_text) ?: ""
+ text = labelManager.getText(labelId, defaultText)
+
+ contentDescriptionLabelId =
+ getString(R.styleable.LabelImageButton_contentDescriptionLabelId)
+ val defaultTextContent =
+ getText(R.styleable.LabelImageButton_android_contentDescription)
+ contentDescription =
+ labelManager.getText(contentDescriptionLabelId, defaultTextContent)
+ } finally {
+ recycle()
+ }
+ }
+ }
+
+ fun setText(labelId: String?, defaultText: CharSequence) {
+ text = labelManager.getText(labelId, defaultText)
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/LabelTextView.kt b/app/src/main/java/es/gob/radarcovid/common/view/LabelTextView.kt
index 83f601ba..683d391e 100644
--- a/app/src/main/java/es/gob/radarcovid/common/view/LabelTextView.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/view/LabelTextView.kt
@@ -11,12 +11,21 @@
package es.gob.radarcovid.common.view
import android.content.Context
+import android.text.method.LinkMovementMethod
+import android.text.style.URLSpan
import android.util.AttributeSet
+import android.view.View
import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.text.toSpanned
+import androidx.core.view.AccessibilityDelegateCompat
import androidx.core.view.ViewCompat
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
import dagger.android.HasAndroidInjector
import es.gob.radarcovid.R
+import es.gob.radarcovid.common.base.utils.NavigationUtils
+import es.gob.radarcovid.common.extensions.removeUnderline
import es.gob.radarcovid.datamanager.utils.LabelManager
+import java.util.*
import javax.inject.Inject
class LabelTextView @JvmOverloads constructor(
@@ -26,9 +35,15 @@ class LabelTextView @JvmOverloads constructor(
@Inject
lateinit var labelManager: LabelManager
+ @Inject
+ lateinit var navigationUtils: NavigationUtils
+
private var labelId: String?
- private var isHeading: Boolean = false
+ private var isLink: Boolean = false
+ private var removeUnderlineLink: Boolean = false
+
+ private var customContentDescription: String?
init {
(context.applicationContext as HasAndroidInjector)
@@ -42,10 +57,37 @@ class LabelTextView @JvmOverloads constructor(
).apply {
try {
labelId = getString(R.styleable.LabelTextView_labelId)
- val defaultText = getText(R.styleable.LabelTextView_android_text)
+ val defaultText = getText(R.styleable.LabelTextView_android_text) ?: ""
text = labelManager.getText(labelId, defaultText)
- isHeading = getBoolean(R.styleable.LabelTextView_isHeading, false)
+
+ val actionDescriptionLabelId =
+ getString(R.styleable.LabelTextView_actionDescriptionLabelId)
+ val defaultTextAction = getText(R.styleable.LabelTextView_actionDescription) ?: ""
+ val actionDescription =
+ labelManager.getText(actionDescriptionLabelId, defaultTextAction).toString()
+ if (!actionDescription.isNullOrEmpty()) {
+ setAccessibilityAction(actionDescription)
+ }
+
+ val contentDescriptionLabelId =
+ getString(R.styleable.LabelTextView_contentDescriptionLabelId)
+ val defaultTextContent =
+ getText(R.styleable.LabelTextView_android_contentDescription) ?: ""
+ customContentDescription =
+ labelManager.getText(contentDescriptionLabelId, defaultTextContent).toString()
+ if (!customContentDescription.isNullOrEmpty()) {
+ setContentDescription(customContentDescription!!)
+ }
+
+
+ val isHeading = getBoolean(R.styleable.LabelTextView_isHeading, false)
setIsHeading(isHeading)
+
+ isLink = getBoolean(R.styleable.LabelTextView_isLink, false)
+ removeUnderlineLink =
+ getBoolean(R.styleable.LabelTextView_removeUnderlineLink, false)
+ setLinkParameters()
+
} finally {
recycle()
}
@@ -53,20 +95,74 @@ class LabelTextView @JvmOverloads constructor(
}
- fun setText(labelId: String?, resId: Int) {
- setText(labelId, context.getString(resId))
+ override fun setText(text: CharSequence?, type: BufferType?) {
+ super.setText(text, type)
+ text?.let {
+ if (customContentDescription.isNullOrEmpty())
+ contentDescription = it.toString().toLowerCase(Locale.ROOT)
+ }
}
fun setText(labelId: String?, defaultText: CharSequence) {
text = labelManager.getText(labelId, defaultText)
}
- fun reloadText() {
- text = labelManager.getText(labelId, text)
+ fun setLinkParameters() {
+ if (isLink)
+ setIsLink()
+ if (removeUnderlineLink)
+ removeUnderlineLink()
+ }
+
+ private fun getTextUrl(): String? {
+ val spanned = text.toSpanned()
+ val spans = spanned.getSpans(0, spanned.length, URLSpan::class.java)
+ return if (!spans.isNullOrEmpty())
+ (spans[0] as URLSpan).url
+ else
+ null
+ }
+
+ fun setIsLink() {
+ movementMethod = LinkMovementMethod.getInstance()
+ getTextUrl()?.let { url ->
+ setOnClickListener {
+ navigationUtils.navigateToBrowser(context, url)
+ }
+ }
+ }
+
+ fun setCustomContentDescription(customContentDescription: String) {
+ this.customContentDescription = customContentDescription
+ contentDescription = customContentDescription
+ }
+
+ fun removeUnderlineLink() {
+ text = text.removeUnderline()
}
private fun setIsHeading(isHeading: Boolean) {
ViewCompat.setAccessibilityHeading(this, isHeading)
}
+ private fun setAccessibilityAction(action: String) {
+ ViewCompat.setAccessibilityDelegate(this, object : AccessibilityDelegateCompat() {
+ override fun onInitializeAccessibilityNodeInfo(
+ host: View,
+ info: AccessibilityNodeInfoCompat
+ ) {
+ super.onInitializeAccessibilityNodeInfo(host, info)
+ // A custom action description. For example, you could use "pause"
+ // to have TalkBack speak "double-tap to pause."
+ val customClick = AccessibilityNodeInfoCompat.AccessibilityActionCompat(
+ AccessibilityNodeInfoCompat.ACTION_CLICK, action
+ )
+ info.addAction(customClick)
+ }
+ })
+ }
+
+ private fun setContentDescription(desc: String) {
+ contentDescription = desc
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/LegalTermsDialog.kt b/app/src/main/java/es/gob/radarcovid/common/view/LegalTermsDialog.kt
new file mode 100644
index 00000000..5a7f28f1
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/view/LegalTermsDialog.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.view
+
+import android.app.AlertDialog
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import dagger.android.HasAndroidInjector
+import es.gob.radarcovid.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.dialog_legal_terms.*
+
+class LegalTermsDialog(context: Context) : LayoutContainer {
+
+ private val dialog: Dialog
+
+ override val containerView: View =
+ LayoutInflater.from(context).inflate(R.layout.dialog_legal_terms, null)
+
+ init {
+ initializeInjector(context)
+
+ dialog = AlertDialog.Builder(context)
+ .setView(containerView)
+ .setCancelable(false)
+ .create()
+ .apply {
+ window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+ }
+
+ buttonOk.setOnClickListener { dialog.dismiss() }
+
+ checkBoxTermsAndConditions.setOnClickListener {
+ enableDisableButton()
+ }
+
+ checkBoxUsageConditions.setOnClickListener {
+ enableDisableButton()
+ }
+
+ }
+
+ private fun enableDisableButton() {
+ buttonOk.isEnabled = checkBoxTermsAndConditions.isChecked && checkBoxUsageConditions.isChecked
+ }
+
+ fun show(onPositiveButtonClick: ((Dialog) -> Unit)) {
+ buttonOk.setOnClickListener {
+ dialog.dismiss()
+ onPositiveButtonClick(dialog)
+ }
+ dialog.show()
+ dialog.window?.setLayout(
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT
+ )
+ }
+
+ private fun initializeInjector(context: Context) {
+ (context.applicationContext as? HasAndroidInjector)?.androidInjector()?.inject(this)
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/ListDialog.kt b/app/src/main/java/es/gob/radarcovid/common/view/ListDialog.kt
new file mode 100644
index 00000000..cac87938
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/view/ListDialog.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.view
+
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.view.adapter.SingleChoiceAdapter
+import kotlinx.android.synthetic.main.dialog_stats_countries.*
+import kotlinx.android.synthetic.main.list_dialog.*
+import kotlinx.android.synthetic.main.list_dialog.buttonClose
+
+class ListDialog(context: Context, view: View) : Dialog(context) {
+ init {
+ setContentView(view)
+ window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+ window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+ }
+
+ fun initList(
+ items: List,
+ selectedItemIndex: Int,
+ onItemClickListener: (Dialog, Int) -> Unit
+ ) {
+ listView.adapter =
+ SingleChoiceAdapter(context, items, selectedItemIndex) { position ->
+ onItemClickListener(this, position)
+ }
+ listView.post {
+ listView.smoothScrollToPositionFromTop(selectedItemIndex, 0, 0)
+ }
+ buttonClose.setOnClickListener { this.dismiss() }
+ }
+
+ class Builder(context: Context) {
+
+ private val view: View =
+ LayoutInflater.from(context).inflate(R.layout.list_dialog, null)
+ private val textViewTitle = view.findViewById(R.id.textViewDialogTitle)
+ private val buttonOk = view.findViewById(R.id.buttonOk)
+ private val buttonCancel = view.findViewById(R.id.buttonCancel)
+ private val listDialog: ListDialog = ListDialog(context, view)
+
+ fun setPositiveButton(
+ text: String,
+ onPositiveButtonClick: ((Dialog) -> Unit)
+ ): Builder {
+ buttonOk.visibility = View.VISIBLE
+ buttonOk.text = text
+ buttonOk.setOnClickListener {
+ onPositiveButtonClick(listDialog)
+ }
+ return this
+ }
+
+ fun setNegativeButton(
+ text: String,
+ onNegativeButtonClick: ((Dialog) -> Unit)
+ ): Builder {
+ buttonCancel.visibility = View.VISIBLE
+ buttonCancel.text = text
+ buttonCancel.setOnClickListener {
+ onNegativeButtonClick(listDialog)
+ }
+ return this
+ }
+
+ fun setTitle(title: String): Builder {
+ this.textViewTitle.visibility = View.VISIBLE
+ this.textViewTitle.text = title
+ return this
+ }
+
+ fun setItems(
+ items: List,
+ selectedItemIndex: Int,
+ onItemClickListener: (Dialog, Int) -> Unit
+ ): Builder {
+ listDialog.initList(items, selectedItemIndex, onItemClickListener)
+ return this
+ }
+
+ fun build(): ListDialog = listDialog
+
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/LoadingDialog.kt b/app/src/main/java/es/gob/radarcovid/common/view/LoadingDialog.kt
index 215c1540..3f56941a 100644
--- a/app/src/main/java/es/gob/radarcovid/common/view/LoadingDialog.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/view/LoadingDialog.kt
@@ -73,7 +73,6 @@ class LoadingDialog(context: Context) :
}
fun showError(title: String?, message: String?, button: String, onClick: (() -> Unit) = {}) {
- buttonClose.setOnClickListener { dismissWithAnimation() }
title?.let {
textViewDialogTitle.visibility = View.VISIBLE
textViewDialogTitle.text = title
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/MoreInfoButton.kt b/app/src/main/java/es/gob/radarcovid/common/view/MoreInfoButton.kt
index adf12903..819f3d98 100644
--- a/app/src/main/java/es/gob/radarcovid/common/view/MoreInfoButton.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/view/MoreInfoButton.kt
@@ -14,12 +14,38 @@ import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
+import dagger.android.HasAndroidInjector
import es.gob.radarcovid.R
+import es.gob.radarcovid.datamanager.utils.LabelManager
+import kotlinx.android.synthetic.main.view_more_info_button.view.*
+import javax.inject.Inject
class MoreInfoButton @JvmOverloads constructor(
context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+ @Inject
+ lateinit var labelManager: LabelManager
+
+ private var labelId: String?
+
init {
+ (context.applicationContext as HasAndroidInjector)
+ .androidInjector()
+ .inject(this)
+
LayoutInflater.from(context).inflate(R.layout.view_more_info_button, this)
+
+ context.obtainStyledAttributes(attrs, R.styleable.MoreInfoButton).apply {
+ try {
+ labelId = getString(R.styleable.MoreInfoButton_labelId)
+ val defaultText = getText(R.styleable.MoreInfoButton_android_text) ?: ""
+ textViewMoreInfo.setText(labelId, defaultText)
+ textViewMoreInfo.setIsLink()
+ textViewMoreInfo.removeUnderlineLink()
+ } finally {
+ recycle()
+ }
+ }
}
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/RequestView.kt b/app/src/main/java/es/gob/radarcovid/common/view/RequestView.kt
index 91788928..9466b788 100644
--- a/app/src/main/java/es/gob/radarcovid/common/view/RequestView.kt
+++ b/app/src/main/java/es/gob/radarcovid/common/view/RequestView.kt
@@ -16,6 +16,8 @@ interface RequestView {
fun hideLoading()
+ fun hideLoadingWithCommonError()
+
fun hideLoadingWithError(error: Throwable)
fun hideLoadingWithError(
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/SegmentedControl.kt b/app/src/main/java/es/gob/radarcovid/common/view/SegmentedControl.kt
new file mode 100644
index 00000000..ac50f673
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/view/SegmentedControl.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.LinearLayout
+import android.widget.RadioGroup
+import es.gob.radarcovid.R
+
+
+class SegmentedControl : RadioGroup {
+
+ constructor(context: Context?) : super(context) {
+ init()
+ }
+
+ constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) {
+ init()
+ }
+
+ private fun init() {
+ // Set background
+ }
+
+ override fun generateLayoutParams(attrs: AttributeSet?): LayoutParams {
+ return adjustLayoutParams(super.generateLayoutParams(attrs))
+ }
+
+ override fun generateDefaultLayoutParams(): LinearLayout.LayoutParams {
+ return adjustLayoutParams(super.generateDefaultLayoutParams() as LayoutParams)
+ }
+
+ private fun adjustLayoutParams(params: LayoutParams): LayoutParams {
+ // Make all buttons the same size if the orientation is horizontal
+ if (orientation == HORIZONTAL) {
+ params.width = 0
+ params.weight = 1f
+ }
+ return params
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/SegmentedControlLabelButton.kt b/app/src/main/java/es/gob/radarcovid/common/view/SegmentedControlLabelButton.kt
new file mode 100644
index 00000000..0651e99d
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/view/SegmentedControlLabelButton.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.view
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatRadioButton
+import dagger.android.HasAndroidInjector
+import es.gob.radarcovid.R
+import es.gob.radarcovid.datamanager.utils.LabelManager
+import javax.inject.Inject
+
+class SegmentedControlLabelButton @JvmOverloads constructor(
+ context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : AppCompatRadioButton(context, attrs, R.attr.segmentedControlButtonStyle) {
+
+ @Inject
+ lateinit var labelManager: LabelManager
+
+ init {
+ (context.applicationContext as HasAndroidInjector)
+ .androidInjector()
+ .inject(this)
+
+ context.theme.obtainStyledAttributes(
+ attrs,
+ R.styleable.SegmentedControlLabelButton,
+ 0, 0
+ ).apply {
+
+ try {
+ val labelId = getString(R.styleable.SegmentedControlLabelButton_labelId)
+ val defaultText =
+ getText(R.styleable.SegmentedControlLabelButton_android_text) ?: ""
+ text = labelManager.getText(labelId, defaultText)
+
+ val contentDescriptionLabelId =
+ getString(R.styleable.SegmentedControlLabelButton_contentDescriptionLabelId)
+ val defaultTextContent =
+ getText(R.styleable.SegmentedControlLabelButton_android_contentDescription)
+ ?: ""
+ val customContentDescription =
+ labelManager.getText(contentDescriptionLabelId, defaultTextContent).toString()
+ val actualStep = getInteger(R.styleable.SegmentedControlLabelButton_actualStep, 0)
+ val numberSteps = getInteger(R.styleable.SegmentedControlLabelButton_numberSteps, 2)
+ val stepDescription = labelManager.getText("MY_HEALTH_RANGER", R.string.venue_checkout_steps).toString()
+ if (!customContentDescription.isNullOrEmpty()) {
+ contentDescription = "$customContentDescription ${stepDescription.replace("$1",actualStep.toString())
+ .replace("$2",numberSteps.toString())}"
+ }
+
+ } finally {
+ recycle()
+ }
+ }
+ }
+
+}
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/StepsProgress.kt b/app/src/main/java/es/gob/radarcovid/common/view/StepsProgress.kt
new file mode 100644
index 00000000..c7b738ad
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/view/StepsProgress.kt
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.view
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.constraintlayout.widget.ConstraintLayout
+import dagger.android.HasAndroidInjector
+import es.gob.radarcovid.R
+import es.gob.radarcovid.datamanager.utils.LabelManager
+import kotlinx.android.synthetic.main.layout_progress_steps.view.*
+import javax.inject.Inject
+
+class StepsProgress @JvmOverloads constructor(
+ context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+ @Inject
+ lateinit var labelManager: LabelManager
+
+ private var labelId: String?
+ private var defaultText: CharSequence
+ private var contentDescriptionLabelId: String?
+ private var defaultTextContent: CharSequence
+
+ init {
+ inflate(context, R.layout.layout_progress_steps, this)
+
+ (context.applicationContext as HasAndroidInjector)
+ .androidInjector()
+ .inject(this)
+
+
+ context.theme.obtainStyledAttributes(
+ attrs,
+ R.styleable.StepsProgress,
+ 0, 0
+ ).apply {
+ try {
+
+ labelId = getString(R.styleable.StepsProgress_labelId)
+ defaultText = getText(R.styleable.StepsProgress_android_text) ?: ""
+ contentDescriptionLabelId =
+ getString(R.styleable.StepsProgress_contentDescriptionLabelId)
+ defaultTextContent =
+ getText(R.styleable.StepsProgress_android_contentDescription) ?: ""
+
+ val actualStep = getInteger(R.styleable.StepsProgress_actualStep, 0)
+ val numberSteps = getInteger(R.styleable.StepsProgress_numberSteps, 2)
+
+ setSteps(actualStep, numberSteps)
+
+ } finally {
+ recycle()
+ }
+ }
+ }
+
+
+ fun setSteps(actual: Int, total: Int) {
+ progressBar.progress = actual
+ progressBar.max = total
+ setText()
+ setContentDescription()
+ }
+
+ private fun getActualStep(): String =
+ progressBar.progress.toString()
+
+
+ private fun getNumberSteps(): String =
+ progressBar.max.toString()
+
+
+ private fun setText() {
+ val steps = labelManager.getText(labelId, defaultText).toString()
+ textSteps.text = formatTextSteps(steps)
+ }
+
+ private fun setContentDescription() {
+ val description =
+ labelManager.getText(contentDescriptionLabelId, defaultTextContent).toString()
+ contentDescription = formatTextSteps(description)
+ }
+
+ private fun formatTextSteps(description: String): String {
+ return description.replace("$1", getActualStep())
+ .replace("$2", getNumberSteps())
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/adapter/ListAdapter.kt b/app/src/main/java/es/gob/radarcovid/common/view/adapter/ListAdapter.kt
new file mode 100644
index 00000000..06630b21
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/view/adapter/ListAdapter.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.view.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import es.gob.radarcovid.R
+
+class ListAdapter(private val myDataset: List) :
+ RecyclerView.Adapter() {
+
+ class ListViewHolder(val textView: TextView) : RecyclerView.ViewHolder(textView)
+
+ override fun onCreateViewHolder(
+ parent: ViewGroup,
+ viewType: Int
+ ): ListViewHolder {
+ val textView = LayoutInflater.from(parent.context)
+ .inflate(R.layout.item_list, parent, false) as TextView
+ return ListViewHolder(textView)
+ }
+
+ override fun onBindViewHolder(holder: ListViewHolder, position: Int) {
+ holder.textView.text = myDataset[position]
+ }
+
+ override fun getItemCount() = myDataset.size
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/adapter/SingleChoiceAdapter.kt b/app/src/main/java/es/gob/radarcovid/common/view/adapter/SingleChoiceAdapter.kt
new file mode 100644
index 00000000..b4139931
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/view/adapter/SingleChoiceAdapter.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.view.adapter
+
+import android.content.Context
+import android.graphics.Typeface
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import dagger.android.HasAndroidInjector
+import es.gob.radarcovid.R
+import es.gob.radarcovid.datamanager.utils.LabelManager
+import javax.inject.Inject
+
+class SingleChoiceAdapter(
+ private val context: Context,
+ private val items: List,
+ private var selectedItemIndex: Int,
+ private val onItemClickListener: ((Int) -> Unit)
+) : BaseAdapter() {
+
+ init {
+ (context.applicationContext as HasAndroidInjector)
+ .androidInjector()
+ .inject(this)
+ }
+
+ private val inflater: LayoutInflater = LayoutInflater.from(context)
+
+ private val isAccessibilityEnabled: Boolean =
+ (context.getSystemService(Context.ACCESSIBILITY_SERVICE) as android.view.accessibility.AccessibilityManager).isEnabled
+
+ @Inject
+ lateinit var labelManager: LabelManager
+
+ override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
+
+ val viewHolder: View = convertView ?: inflater.inflate(R.layout.list_item, parent, false)
+
+ val textView = viewHolder.findViewById(R.id.textViewListItem)
+ textView.text = getItem(position)
+
+ if (position == selectedItemIndex) {
+ textView.contentDescription =
+ "${getItem(position)} ${labelManager.getText(
+ "ACC_SELECTED",
+ R.string.single_choice_selected
+ )}"
+ textView.setTypeface(textView.typeface, Typeface.BOLD)
+ textView.setTextColor(ContextCompat.getColor(context, R.color.black))
+ if (isAccessibilityEnabled)
+ textView.setBackgroundResource(R.color.purple_FF)
+ } else {
+ textView.contentDescription = getItem(position)
+ textView.typeface = Typeface.create(textView.typeface, Typeface.NORMAL)
+ textView.setTextColor(ContextCompat.getColor(context, R.color.purple_9C))
+ if (isAccessibilityEnabled)
+ textView.setBackgroundResource(android.R.color.transparent)
+ }
+
+ textView.setOnClickListener {
+ selectedItemIndex = position
+ textView.contentDescription =
+ "${labelManager.getText("ACC_SELECTED", R.string.single_choice_selected)} ${getItem(
+ position
+ )}"
+ notifyDataSetChanged()
+ onItemClickListener(position)
+ }
+
+ return viewHolder
+ }
+
+ override fun getItem(position: Int): String = items[position]
+
+ override fun getItemId(position: Int): Long = position.toLong()
+
+ override fun getCount(): Int = items.size
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/common/view/adapter/VenueListAdapter.kt b/app/src/main/java/es/gob/radarcovid/common/view/adapter/VenueListAdapter.kt
new file mode 100644
index 00000000..859bd241
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/common/view/adapter/VenueListAdapter.kt
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.common.view.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.extensions.*
+import es.gob.radarcovid.common.view.LabelButton
+import es.gob.radarcovid.datamanager.utils.LabelManager
+import es.gob.radarcovid.models.domain.*
+
+class VenueListAdapter(
+ private var items: List,
+ private val locale: String,
+ private val labelManager: LabelManager
+) :
+ RecyclerView.Adapter() {
+
+ var onItemClick: ((VenueRecord) -> Unit)? = null
+
+ fun setData(newItems: List) {
+ items = newItems
+ }
+
+ override fun getItemViewType(position: Int): Int {
+ return items[position].viewType.ordinal
+ }
+
+ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+ return when (VenueVisitedRecyclerType.values()[viewType]) {
+ VenueVisitedRecyclerType.HEADER -> {
+ VenueHeaderViewHolder(
+ LayoutInflater.from(parent.context)
+ .inflate(R.layout.item_venue_header, parent, false)
+ )
+ }
+ VenueVisitedRecyclerType.VENUE -> {
+ VenueItemViewHolder(
+ LayoutInflater.from(parent.context)
+ .inflate(R.layout.item_venue, parent, false)
+ )
+ }
+ }
+ }
+
+ override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+ val item = items[position]
+ when (item.viewType) {
+ VenueVisitedRecyclerType.HEADER -> {
+ (holder as VenueHeaderViewHolder).bind(item as VenueHeaderItem, locale)
+ }
+ VenueVisitedRecyclerType.VENUE -> {
+ (holder as VenueItemViewHolder).bind(item as VenueVisitedItem, labelManager) {
+ onItemClick?.invoke(it)
+ }
+ }
+ }
+ }
+
+ override fun getItemCount(): Int =
+ items.size
+
+ class VenueHeaderViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+ private val textView = itemView.findViewById(R.id.textView) as TextView
+
+ fun bind(item: VenueHeaderItem, locale: String) {
+ textView.text =
+ "${item.date.getNameDayString(locale)}, ${item.date.getDayAndMonth(locale)}"
+ }
+ }
+
+ class VenueItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+ private val textViewName = itemView.findViewById(R.id.textViewName) as TextView
+ private val textViewTime = itemView.findViewById(R.id.textViewTime) as TextView
+ private val archiveButton = itemView.findViewById(R.id.archiveButton) as LabelButton
+
+ fun bind(
+ item: VenueVisitedItem,
+ labelManager: LabelManager,
+ onClick: (VenueRecord) -> Unit
+ ) {
+ textViewName.text = item.venueItem.name
+ textViewTime.text = if (item.venueItem.moreFiveHours) {
+ "${item.venueItem.dateIn.getHourString()} (+5h)"
+ }else {
+ "${item.venueItem.dateIn.getHourString()} (${
+ item.venueItem.dateIn.getTimeElapsed(item.venueItem.dateOut!!)
+ })"
+ }
+ if (item.venueItem.hidden) {
+ archiveButton.setBackgroundResource(R.drawable.ic_archive_hidden)
+ } else {
+ archiveButton.setBackgroundResource(R.drawable.ic_archive)
+ }
+ setButtonAccessibility(item.venueItem.hidden, labelManager)
+ archiveButton.setSafeOnClickListener {
+ onClick(item.venueItem)
+ setButtonAccessibility(item.venueItem.hidden, labelManager)
+ }
+ }
+
+ private fun setButtonAccessibility(isHidden: Boolean, labelManager: LabelManager) {
+ if (isHidden) {
+ archiveButton.contentDescription =
+ "${labelManager.getText("ACC_VENUE_HIDDEN", R.string.acc_venue_hidden)}"
+ archiveButton.setAccessibilityAction(
+ labelManager.getText(
+ "ACC_VENUE_SHOW_ACTION",
+ R.string.acc_show_action
+ ).toString()
+ )
+ } else {
+ archiveButton.contentDescription =
+ "${labelManager.getText("ACC_VENUE_SHOWN", R.string.acc_venue_shown)}"
+ archiveButton.setAccessibilityAction(
+ labelManager.getText(
+ "ACC_VENUE_HIDE_ACTION",
+ R.string.acc_hide_action
+ ).toString()
+ )
+ }
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/api/ApiInterface.kt b/app/src/main/java/es/gob/radarcovid/datamanager/api/ApiInterface.kt
index 34aca022..fc95f46b 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/api/ApiInterface.kt
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/api/ApiInterface.kt
@@ -10,8 +10,10 @@
package es.gob.radarcovid.datamanager.api
+import es.gob.radarcovid.models.request.RequestKpi
import es.gob.radarcovid.models.request.RequestVerifyCode
import es.gob.radarcovid.models.response.*
+import okhttp3.ResponseBody
import retrofit2.Call
import retrofit2.http.*
@@ -19,41 +21,63 @@ interface ApiInterface {
companion object {
- const val SEDIA_USER_TOKEN = "SEDIA-UserToken"
+ const val EFGS_SHARING = "X-EFGS-Sharing"
}
@GET("/")
fun test(): Call
- @GET("/configuration/token/uuid")
- fun getUuid(): Call
-
@GET("/configuration/settings")
fun getSettings(): Call
@GET("/configuration/texts")
fun getLabels(
- @Header(SEDIA_USER_TOKEN) uuid: String,
@Query("locale") language: String,
- @Query("ccaa") region: String
+ @Query("ccaa") region: String,
+ @Query("platform") platform: String,
+ @Query("version") version: String
): Call
@GET("/configuration/masterData/locales")
fun getLanguages(
- @Header(SEDIA_USER_TOKEN) uuid: String,
- @Query("locale") language: String
+ @Query("locale") language: String,
+ @Query("platform") platform: String,
+ @Query("version") version: String
): Call
@GET("/configuration/masterData/ccaa")
fun getRegions(
- @Header(SEDIA_USER_TOKEN) uuid: String,
@Query("locale") language: String,
- @Query("additionalInfo") additionalInfo: Boolean
+ @Query("additionalInfo") additionalInfo: Boolean,
+ @Query("platform") platform: String,
+ @Query("version") version: String
): Call
@POST("/verification/verify/code")
- fun verifyCode(@Body body: RequestVerifyCode): Call
+ fun verifyCode(
+ @Body body: RequestVerifyCode,
+ @Header(EFGS_SHARING) sharingEFGSHeader: String
+ ): Call
+
+ @GET("/configuration/masterData/countries")
+ fun getCountries(
+ @Query("locale") language: String,
+ @Query("platform") platform: String,
+ @Query("version") version: String
+ ): Call
+
+ @GET("kpi/statistics/basics")
+ fun getStats(): Call
+ @POST("/kpi/google")
+ fun sendKpi(
+ @Body body: RequestKpi
+ ): Call
+ @Headers("Accept: application/x-protobuf")
+ @GET("/notifyme/v1/traceKeys ")
+ fun getTraceKeys(
+ @Query("keyBundleTag") keyBundleTag: Long
+ ): Call
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/repository/ExampleRepository.kt b/app/src/main/java/es/gob/radarcovid/datamanager/attestation/AttestationClient.kt
similarity index 59%
rename from app/src/main/java/es/gob/radarcovid/datamanager/repository/ExampleRepository.kt
rename to app/src/main/java/es/gob/radarcovid/datamanager/attestation/AttestationClient.kt
index 9d24a6a4..b11f40d5 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/repository/ExampleRepository.kt
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/attestation/AttestationClient.kt
@@ -8,12 +8,13 @@
* SPDX-License-Identifier: MPL-2.0
*/
-package es.gob.radarcovid.datamanager.repository
+package es.gob.radarcovid.datamanager.attestation
-import org.funktionale.either.Either
+interface AttestationClient {
-interface ExampleRepository {
-
- fun exampleRequest(): Either
-
-}
\ No newline at end of file
+ fun attest(
+ onSuccess: (String?) -> Unit,
+ onError: (Exception) -> Unit,
+ nonce: String
+ )
+}
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/attestation/SafetyNetAttestationClient.kt b/app/src/main/java/es/gob/radarcovid/datamanager/attestation/SafetyNetAttestationClient.kt
new file mode 100644
index 00000000..5981fc3d
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/attestation/SafetyNetAttestationClient.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.datamanager.attestation
+
+import android.content.Context
+import android.util.Base64
+import com.google.android.gms.safetynet.SafetyNet
+import com.google.gson.Gson
+
+class SafetyNetAttestationClient(
+ private val context: Context,
+ private val parameters: AttestationParameters
+) : AttestationClient {
+ data class AttestationParameters(
+ internal val apiKey: String,
+ internal val apkPackageName: String,
+ internal val requiresBasicIntegrity: Boolean,
+ internal val requiresCtsProfile: Boolean,
+ internal val requiresHardwareAttestation: Boolean
+ )
+
+ override fun attest(onSuccess: (String?) -> Unit, onError: (Exception) -> Unit, nonce: String) {
+ val nonceByteArray = Base64.decode(nonce, Base64.DEFAULT)
+ SafetyNet.getClient(context).attest(nonceByteArray, parameters.apiKey)
+ .addOnSuccessListener() {
+ // Indicates communication with the service was successful.
+ // Use response.getJwsResult() to get the result data.
+ val payload = String(Base64.decode(it.jwsResult.split(".")[1], Base64.DEFAULT))
+
+ var jsonResult: Map = HashMap()
+ jsonResult = Gson().fromJson(
+ payload,
+ jsonResult.javaClass
+ )
+
+ if (nonce != jsonResult["nonce"]) {
+ onSuccess(null)
+ } else if (parameters.apkPackageName != jsonResult["apkPackageName"]) {
+ onSuccess(null)
+ } else if (parameters.requiresBasicIntegrity && jsonResult["basicIntegrity"] != true) {
+ onSuccess(null)
+ } else if (parameters.requiresCtsProfile && jsonResult["ctsProfileMatch"] != true) {
+ onSuccess(null)
+ } else if (parameters.requiresHardwareAttestation) {
+ val evaluationType = jsonResult["evaluationType"] as? String
+ if (evaluationType == null) {
+ onSuccess(null)
+ } else if (!evaluationType.contains("HARDWARE_BACKED")) {
+ onSuccess(null)
+ }
+ } else {
+ onSuccess(it.jwsResult)
+ }
+
+ }
+ .addOnFailureListener() { e ->
+ // An error occurred while communicating with the service.
+ onError(e)
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/mapper/SettingsDataMapper.kt b/app/src/main/java/es/gob/radarcovid/datamanager/mapper/SettingsDataMapper.kt
index 9091c896..6bfda53e 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/mapper/SettingsDataMapper.kt
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/mapper/SettingsDataMapper.kt
@@ -10,6 +10,8 @@
package es.gob.radarcovid.datamanager.mapper
+import es.gob.radarcovid.common.base.Constants.ANALYTICS_PERIOD_DEFAULT
+import es.gob.radarcovid.common.base.Constants.NOTIFICATION_REMINDER_DEFAULT
import es.gob.radarcovid.models.domain.*
import es.gob.radarcovid.models.response.*
import javax.inject.Inject
@@ -28,7 +30,12 @@ class SettingsDataMapper @Inject constructor() {
attenuationFactorMedium = attenuationFactor?.medium ?: 0.5f,
minDurationForExposure = minDurationForExposure ?: 15,
riskScoreClassification = transform(riskScoreClassification),
- appInfo = transform(applicationVersion)
+ appInfo = transform(applicationVersion),
+ legalTermsVersion = legalTermsVersion ?: "",
+ radarCovidDownloadUrl = radarCovidDownloadUrl ?: "",
+ notificationReminder = notificationReminder ?: NOTIFICATION_REMINDER_DEFAULT,
+ timeBetweenKpi = timeBetweenKpi ?: ANALYTICS_PERIOD_DEFAULT,
+ venueConfiguration = transform(venueConfiguration)
)
}
} ?: Settings()
@@ -90,4 +97,14 @@ class SettingsDataMapper @Inject constructor() {
responseSettingsAppVersion?.let {
SettingsAppInfo(it.android?.version ?: "1.0", it.android?.compilation ?: 1)
} ?: SettingsAppInfo()
+
+ private fun transform(responseVenueConfiguration: ResponseVenueConfiguration?): VenueConfiguration =
+ responseVenueConfiguration?.let {
+ VenueConfiguration(
+ recordNotification = it.recordNotification,
+ autoCheckout = it.autoCheckout,
+ quarentineAfterExposed = it.quarentineAfterExposed,
+ troubledPlaceCheck = it.troubledPlaceCheck
+ )
+ } ?: VenueConfiguration()
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/mapper/StatsDataMapper.kt b/app/src/main/java/es/gob/radarcovid/datamanager/mapper/StatsDataMapper.kt
new file mode 100644
index 00000000..7ecce7ff
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/mapper/StatsDataMapper.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.datamanager.mapper
+
+import es.gob.radarcovid.models.domain.StatsData
+import es.gob.radarcovid.models.domain.TotalData
+import es.gob.radarcovid.models.response.ResponseStat
+import es.gob.radarcovid.models.response.ResponseStats
+import es.gob.radarcovid.models.response.TotalDataResponse
+import javax.inject.Inject
+
+class StatsDataMapper @Inject constructor() {
+
+ fun transform(responseStats: ResponseStats?): List = responseStats?.let {
+ it.map { responseStatItem -> transform(responseStatItem) }
+ } ?: emptyList()
+
+ private fun transform(responseStat: ResponseStat?): StatsData =
+ responseStat?.let {
+ StatsData(
+ date = it.date,
+ applicationsDownloads = transform(it.applicationsDownloads),
+ communicatedContagions = transform(it.communicatedContagions)
+ )
+ } ?: StatsData()
+
+
+ private fun transform(applicationsDownloads: TotalDataResponse): TotalData =
+ applicationsDownloads?.let {
+ TotalData(
+ totalActualDay = it.totalActualDay,
+ totalAcummulated = it.totalAcummulated
+ )
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/repository/ApiRepository.kt b/app/src/main/java/es/gob/radarcovid/datamanager/repository/ApiRepository.kt
index ac567645..80171e55 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/repository/ApiRepository.kt
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/repository/ApiRepository.kt
@@ -10,22 +10,48 @@
package es.gob.radarcovid.datamanager.repository
+import es.gob.radarcovid.models.request.RequestKpi
import es.gob.radarcovid.models.request.RequestVerifyCode
import es.gob.radarcovid.models.response.*
+import okhttp3.ResponseBody
import org.funktionale.either.Either
+import retrofit2.Response
interface ApiRepository {
- fun getUuid(): Either
-
fun getSettings(): Either
- fun getLabels(uuid: String, language: String, region: String): Either
+ fun getLabels(
+ language: String,
+ region: String,
+ platform: String,
+ version: String
+ ): Either
+
+ fun getLanguages(
+ language: String,
+ platform: String,
+ version: String
+ ): Either
+
+ fun getRegions(
+ language: String,
+ platform: String,
+ version: String
+ ): Either
+
+ fun verifyCode(body: RequestVerifyCode, sharingCode: String): Either
+
+ fun getCountries(
+ language: String,
+ platform: String,
+ version: String
+ ): Either
- fun getLanguages(uuid: String, language: String): Either
+ fun getStats(): Either
- fun getRegions(uuid: String, language: String): Either
+ fun sendKpi(body: RequestKpi): Either
- fun verifyCode(body: RequestVerifyCode): Either
+ fun getTraceKeys(keyBundleTag: Long): Response
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/repository/ApiRepositoryImpl.kt b/app/src/main/java/es/gob/radarcovid/datamanager/repository/ApiRepositoryImpl.kt
index 13123680..6b3e41c9 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/repository/ApiRepositoryImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/repository/ApiRepositoryImpl.kt
@@ -12,48 +12,77 @@ package es.gob.radarcovid.datamanager.repository
import es.gob.radarcovid.common.base.BaseRepository
import es.gob.radarcovid.datamanager.api.ApiInterface
+import es.gob.radarcovid.models.request.RequestKpi
import es.gob.radarcovid.models.request.RequestVerifyCode
import es.gob.radarcovid.models.response.*
+import okhttp3.ResponseBody
import org.funktionale.either.Either
+import retrofit2.Response
import javax.inject.Inject
class ApiRepositoryImpl @Inject constructor(private val apiInterface: ApiInterface) :
BaseRepository(), ApiRepository {
- override fun getUuid(): Either = callService {
- apiInterface.getUuid()
- }
-
override fun getSettings(): Either = callService {
apiInterface.getSettings()
}
override fun getLabels(
- uuid: String,
language: String,
- region: String
+ region: String,
+ platform: String,
+ version: String
): Either =
callService {
- apiInterface.getLabels(uuid, language, region)
+ apiInterface.getLabels(language, region, platform, version)
}
override fun getLanguages(
- uuid: String,
- language: String
+ language: String,
+ platform: String,
+ version: String
): Either =
callService {
- apiInterface.getLanguages(uuid, language)
+ apiInterface.getLanguages(language, platform, version)
+ }
+
+ override fun getRegions(
+ language: String,
+ platform: String,
+ version: String
+ ): Either =
+ callService {
+ apiInterface.getRegions(language, true, platform, version)
+ }
+
+ override fun verifyCode(
+ body: RequestVerifyCode,
+ sharingCode: String
+ ): Either =
+ callService {
+ apiInterface.verifyCode(body, sharingCode)
+ }
+
+ override fun getCountries(
+ language: String,
+ platform: String,
+ version: String
+ ): Either =
+ callService {
+ apiInterface.getCountries(language, platform, version)
}
- override fun getRegions(uuid: String, language: String): Either =
+ override fun getStats(): Either =
callService {
- apiInterface.getRegions(uuid, language, true)
+ apiInterface.getStats()
}
- override fun verifyCode(body: RequestVerifyCode): Either =
+ override fun sendKpi(body: RequestKpi): Either =
callService {
- apiInterface.verifyCode(body)
+ apiInterface.sendKpi(body)
}
+ override fun getTraceKeys(keyBundleTag: Long): Response =
+ apiInterface.getTraceKeys(keyBundleTag).execute()
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/repository/ContactTracingRepositoryImpl.kt b/app/src/main/java/es/gob/radarcovid/datamanager/repository/ContactTracingRepositoryImpl.kt
index 2caa5a98..5855660d 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/repository/ContactTracingRepositoryImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/repository/ContactTracingRepositoryImpl.kt
@@ -18,7 +18,6 @@ import io.reactivex.rxjava3.core.Completable
import org.dpppt.android.sdk.DP3T
import org.dpppt.android.sdk.GaenAvailability
import org.dpppt.android.sdk.backend.ResponseCallback
-import org.dpppt.android.sdk.internal.nearby.GoogleExposureClient
import org.dpppt.android.sdk.models.ExposeeAuthMethodAuthorization
import java.util.*
import javax.inject.Inject
@@ -43,8 +42,6 @@ class ContactTracingRepositoryImpl @Inject constructor(
}
override fun updateTracingSettings(settings: Settings) {
- GoogleExposureClient.getInstance(activity)
- .setParams(settings.attenuationThresholdLow, settings.attenuationThresholdMedium)
DP3T.setMatchingParameters(
activity,
settings.attenuationThresholdLow,
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/repository/CrowdNotifierRepository.kt b/app/src/main/java/es/gob/radarcovid/datamanager/repository/CrowdNotifierRepository.kt
new file mode 100644
index 00000000..8e27359a
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/repository/CrowdNotifierRepository.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.datamanager.repository
+
+import org.crowdnotifier.android.sdk.model.ExposureEvent
+import org.crowdnotifier.android.sdk.model.ProblematicEventInfo
+import org.crowdnotifier.android.sdk.model.VenueInfo
+
+interface CrowdNotifierRepository {
+
+ fun getVenueInfo(qrCode: String): VenueInfo
+
+ fun checkIn(arrivalTime: Long, departureTime: Long, venueInfo: VenueInfo): Long
+
+ fun checkForMatches(problematicEvents: List): List
+
+ fun cleanOldData(days: Int)
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/repository/CrowdNotifierRepositoryImpl.kt b/app/src/main/java/es/gob/radarcovid/datamanager/repository/CrowdNotifierRepositoryImpl.kt
new file mode 100644
index 00000000..898ec875
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/repository/CrowdNotifierRepositoryImpl.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.datamanager.repository
+
+import android.content.Context
+import es.gob.radarcovid.BuildConfig
+import org.crowdnotifier.android.sdk.CrowdNotifier
+import org.crowdnotifier.android.sdk.model.ExposureEvent
+import org.crowdnotifier.android.sdk.model.ProblematicEventInfo
+import org.crowdnotifier.android.sdk.model.VenueInfo
+import javax.inject.Inject
+import javax.inject.Named
+
+class CrowdNotifierRepositoryImpl @Inject constructor(
+ @Named("applicationContext") private val context: Context
+) : CrowdNotifierRepository {
+
+ override fun getVenueInfo(qrCode: String): VenueInfo =
+ CrowdNotifier.getVenueInfo(qrCode, BuildConfig.ENTRY_QR_CODE_PREFIX)
+
+ override fun checkIn(
+ arrivalTime: Long,
+ departureTime: Long,
+ venueInfo: VenueInfo
+ ): Long =
+ CrowdNotifier.addCheckIn(arrivalTime, departureTime, venueInfo, context)
+
+ override fun checkForMatches(problematicEvents: List): List =
+ CrowdNotifier.checkForMatches(
+ problematicEvents,
+ context
+ )
+
+ override fun cleanOldData(days: Int) =
+ CrowdNotifier.cleanUpOldData(context, days)
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/repository/EncryptedPreferencesRepository.kt b/app/src/main/java/es/gob/radarcovid/datamanager/repository/EncryptedPreferencesRepository.kt
new file mode 100644
index 00000000..0d0eb1d8
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/repository/EncryptedPreferencesRepository.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.datamanager.repository
+
+import es.gob.radarcovid.models.domain.VenueRecord
+
+interface EncryptedPreferencesRepository {
+
+ fun getCurrentVenue(): VenueRecord?
+
+ fun setCurrentVenueRecord(current: VenueRecord)
+
+ fun removeCurrentVenue()
+
+ fun getVisitedVenue(): List
+
+ fun setVisitedVenue(venues: List)
+
+ fun cleanVisitedVenue(maxMinutesToKeep: Int)
+
+ fun setVenueExposureInfo(venue: VenueRecord?)
+
+ fun getVenueExposureInfo(): VenueRecord?
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/repository/EncryptedPreferencesRepositoryImpl.kt b/app/src/main/java/es/gob/radarcovid/datamanager/repository/EncryptedPreferencesRepositoryImpl.kt
new file mode 100644
index 00000000..eaaa8734
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/repository/EncryptedPreferencesRepositoryImpl.kt
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.datamanager.repository
+
+import android.content.SharedPreferences
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import es.gob.radarcovid.common.extensions.addMinutes
+import es.gob.radarcovid.common.extensions.toJson
+import es.gob.radarcovid.models.domain.VenueRecord
+import java.util.*
+import javax.inject.Inject
+
+class EncryptedPreferencesRepositoryImpl @Inject constructor(
+ private val encryptedSharedPreferences: SharedPreferences?
+) : EncryptedPreferencesRepository {
+
+ companion object {
+ private const val KEY_CURRENT_VENUE_RECORD = "key_current_venue_record"
+ private const val KEY_LIST_VENUE_RECORD = "key_list_venue_record"
+ private const val KEY_VENUE_EXPOSURE_INFO = "key_venue_exposure_info"
+ }
+
+ private fun saveToPrefs(key: String, data: String) {
+ encryptedSharedPreferences?.edit()?.putString(key, data)?.apply()
+ }
+
+ private fun getFromPreferences(key: String): String? =
+ encryptedSharedPreferences?.getString(key, null)
+
+ private fun removeFromPrefs(key: String) {
+ encryptedSharedPreferences?.edit()?.remove(key)?.apply()
+ }
+
+ override fun getCurrentVenue(): VenueRecord? {
+ val venueRecord = getFromPreferences(KEY_CURRENT_VENUE_RECORD)
+ return if (venueRecord != null)
+ Gson().fromJson(venueRecord, VenueRecord::class.java)
+ else null
+ }
+
+ override fun setCurrentVenueRecord(current: VenueRecord) {
+ saveToPrefs(KEY_CURRENT_VENUE_RECORD, current.toJson())
+ }
+
+ override fun removeCurrentVenue() {
+ removeFromPrefs(KEY_CURRENT_VENUE_RECORD)
+ }
+
+ override fun getVisitedVenue(): List {
+ val list = getFromPreferences(KEY_LIST_VENUE_RECORD)
+ return if (list != null) {
+ val itemType = object : TypeToken>() {}.type
+ Gson().fromJson(
+ list,
+ itemType
+ )
+ } else {
+ emptyList()
+ }
+ }
+
+ override fun setVisitedVenue(venues: List) {
+ saveToPrefs(KEY_LIST_VENUE_RECORD, venues.toJson())
+ }
+
+ override fun cleanVisitedVenue(maxMinutesToKeep: Int) {
+ val venueList = getVisitedVenue().toMutableList()
+ //val maxDaysToKeep = maxMinutesToKeep / 60 / 24
+ if (venueList.isNotEmpty()) {
+ val lastDateToKeep = Date().addMinutes(-maxMinutesToKeep)
+ venueList.removeAll {
+ it.dateOut?.before(lastDateToKeep) == true
+ }
+ setVisitedVenue(venueList)
+ }
+ }
+
+ override fun setVenueExposureInfo(venue: VenueRecord?) {
+ if (venue != null)
+ saveToPrefs(KEY_VENUE_EXPOSURE_INFO, venue.toJson())
+ else
+ removeFromPrefs(KEY_VENUE_EXPOSURE_INFO)
+ }
+
+ override fun getVenueExposureInfo(): VenueRecord? {
+ val venueString = getFromPreferences(KEY_VENUE_EXPOSURE_INFO)
+ return if (venueString != null) {
+ val itemType = object : TypeToken() {}.type
+ Gson().fromJson(
+ venueString,
+ itemType
+ )
+ } else {
+ return null
+ }
+
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/repository/ExampleRepositoryImpl.kt b/app/src/main/java/es/gob/radarcovid/datamanager/repository/ExampleRepositoryImpl.kt
deleted file mode 100644
index 37de69a0..00000000
--- a/app/src/main/java/es/gob/radarcovid/datamanager/repository/ExampleRepositoryImpl.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2020 Gobierno de España
- *
- * 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 es.gob.radarcovid.datamanager.repository
-
-import es.gob.radarcovid.common.base.BaseRepository
-import es.gob.radarcovid.datamanager.api.ApiInterface
-import org.funktionale.either.Either
-import javax.inject.Inject
-
-class ExampleRepositoryImpl @Inject constructor(private val apiInterface: ApiInterface) :
- BaseRepository(), ExampleRepository {
-
- override fun exampleRequest(): Either = callService {
- apiInterface.test()
- }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/repository/ExposureStatusRepository.kt b/app/src/main/java/es/gob/radarcovid/datamanager/repository/ExposureStatusRepository.kt
index d1f7dda3..f67c3152 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/repository/ExposureStatusRepository.kt
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/repository/ExposureStatusRepository.kt
@@ -18,4 +18,8 @@ interface ExposureStatusRepository {
fun addFakeExposureDate()
+ fun resetExposure()
+
+ fun resetExposureDays()
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/repository/ExposureStatusRepositoryImpl.kt b/app/src/main/java/es/gob/radarcovid/datamanager/repository/ExposureStatusRepositoryImpl.kt
index 4a6d9dd8..d1b62241 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/repository/ExposureStatusRepositoryImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/repository/ExposureStatusRepositoryImpl.kt
@@ -14,6 +14,7 @@ import android.content.Context
import es.gob.radarcovid.datamanager.mapper.ExposureInfoDataMapper
import es.gob.radarcovid.models.domain.ExposureInfo
import org.dpppt.android.sdk.DP3T
+import org.dpppt.android.sdk.internal.AppConfigManager
import org.dpppt.android.sdk.internal.storage.ExposureDayStorage
import org.dpppt.android.sdk.models.DayDate
import org.dpppt.android.sdk.models.ExposureDay
@@ -46,9 +47,23 @@ class ExposureStatusRepositoryImpl @Inject constructor(
else
ExposureDay(-1, DayDate().subtractDays(1), System.currentTimeMillis())
- addExposureDay(context, newExposureDay)
+ addExposureDays(context, listOf(newExposureDay))
}
}
+ override fun resetExposure() {
+ with(AppConfigManager.getInstance(context)) {
+ if (!iAmInfectedIsResettable)
+ iAmInfectedIsResettable = true
+ }
+ DP3T.resetExposureDays(context)
+ DP3T.resetInfectionStatus(context)
+ preferencesRepository.setExposureAnalyticsCount(0)
+ }
+
+ override fun resetExposureDays() {
+ DP3T.resetExposureDays(context)
+ preferencesRepository.setExposureAnalyticsCount(0)
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/repository/DomainRepository.kt b/app/src/main/java/es/gob/radarcovid/datamanager/repository/FakeInfectionReportRepository.kt
similarity index 70%
rename from app/src/main/java/es/gob/radarcovid/datamanager/repository/DomainRepository.kt
rename to app/src/main/java/es/gob/radarcovid/datamanager/repository/FakeInfectionReportRepository.kt
index ad3913b4..401b3d94 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/repository/DomainRepository.kt
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/repository/FakeInfectionReportRepository.kt
@@ -10,10 +10,10 @@
package es.gob.radarcovid.datamanager.repository
-import es.gob.radarcovid.models.domain.ExposureInfo
+import io.reactivex.rxjava3.core.Completable
-interface DomainRepository {
+interface FakeInfectionReportRepository {
- var exposureInfo: ExposureInfo?
+ fun notifyFakeInfected(authCode: String): Completable
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/repository/FakeInfectionReportRepositoryImpl.kt b/app/src/main/java/es/gob/radarcovid/datamanager/repository/FakeInfectionReportRepositoryImpl.kt
new file mode 100644
index 00000000..e789995c
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/repository/FakeInfectionReportRepositoryImpl.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.datamanager.repository
+
+import android.content.Context
+import es.gob.radarcovid.BuildConfig
+import io.reactivex.rxjava3.core.Completable
+import org.dpppt.android.sdk.DP3T
+import org.dpppt.android.sdk.models.ExposeeAuthMethodAuthorization
+import javax.inject.Inject
+import javax.inject.Named
+
+class FakeInfectionReportRepositoryImpl @Inject constructor(
+ @Named("applicationContext") private val context: Context
+) : FakeInfectionReportRepository {
+
+ override fun notifyFakeInfected(authCode: String): Completable =
+ Completable.create {
+ if (BuildConfig.isMock) {
+ it.onComplete()
+ } else {
+ DP3T.sendFakeInfectedRequest(context,
+ ExposeeAuthMethodAuthorization("Bearer $authCode"),
+ { it.onComplete() },
+ { it.onError(Exception("Error notifying fake infection")) }
+ )
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/repository/PreferencesRepository.kt b/app/src/main/java/es/gob/radarcovid/datamanager/repository/PreferencesRepository.kt
index eda8e611..a53763de 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/repository/PreferencesRepository.kt
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/repository/PreferencesRepository.kt
@@ -21,10 +21,6 @@ interface PreferencesRepository {
fun setOnboardingCompleted(onboardingCompleted: Boolean)
- fun getUuid(): String
-
- fun setUuid(uuid: String)
-
fun getInfectionReportDate(): Date?
fun setInfectionReportDate(date: Date)
@@ -57,4 +53,64 @@ interface PreferencesRepository {
fun getHealingTime(): HealingTime
+ fun getTDummy(): Long
+
+ fun setTDummy(time: Long)
+
+ fun setSettingsLegalTermsVersion(version: String)
+
+ fun getSettingsLegalTermsVersion(): String
+
+ fun setSavedLegalTermsVersion(version: String)
+
+ fun getSavedLegalTermsVersion(): String
+
+ fun setRadarCovidDownloadUrl(url: String)
+
+ fun getRadarCovidDownloadUrl(): String
+
+ fun setNotificationReminder(time: Int)
+
+ fun getNotificationReminder(): Int
+
+ fun setExposureAnalyticsCount(count: Int)
+
+ fun getExposureAnalyticsCount(): Int
+
+ fun setAnalyticsPeriod(time: Int)
+
+ fun getAnalyticsPeriod(): Int
+
+ fun setLanguageChanged(changed: Boolean)
+
+ fun getLanguageChanged(): Boolean
+
+ fun setRecordInProgress(recordInProgress: Boolean)
+
+ fun isRecordInProgress(): Boolean
+
+ fun setApplicationActive(active: Boolean)
+
+ fun isApplicationActive(): Boolean
+
+ fun setLastKeyBundleTag(keyBundleTag: Long)
+
+ fun getLastKeyBundleTag(): Long
+
+ fun setRecordNotificationTime(time: Int)
+
+ fun getRecordNotificationTime(): Int
+
+ fun setAutoCheckoutTime(time: Int)
+
+ fun getAutoCheckoutTime(): Int
+
+ fun setTroubledPlaceCheckTime(time: Int)
+
+ fun getTroubledPlaceCheckTime(): Int
+
+ fun setQuarantineAfterVenueExposedTime(time: Int)
+
+ fun getQuarantineAfterVenueExposedTime(): Int
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/repository/PreferencesRepositoryImpl.kt b/app/src/main/java/es/gob/radarcovid/datamanager/repository/PreferencesRepositoryImpl.kt
index 09f36b7e..92d6710a 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/repository/PreferencesRepositoryImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/repository/PreferencesRepositoryImpl.kt
@@ -13,6 +13,8 @@ package es.gob.radarcovid.datamanager.repository
import android.content.Context
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
+import es.gob.radarcovid.common.base.Constants.ANALYTICS_PERIOD_DEFAULT
+import es.gob.radarcovid.common.base.Constants.NOTIFICATION_REMINDER_DEFAULT
import es.gob.radarcovid.common.extensions.toJson
import es.gob.radarcovid.models.domain.HealingTime
import es.gob.radarcovid.models.domain.Language
@@ -27,7 +29,6 @@ class PreferencesRepositoryImpl @Inject constructor(@Named("applicationContext")
companion object {
private const val PREFERENCES_NAME = "app_preferences"
private const val KEY_ONBOARDING_COMPLETED = "onboarding_completed"
- private const val KEY_UUID = "uuid"
private const val KEY_INFECTION_REPORT_DATE = "key_infection_report_date"
private const val KEY_WAS_EXPOSED = "key_was_exposed"
private const val KEY_LABELS = "key_labels"
@@ -36,6 +37,21 @@ class PreferencesRepositoryImpl @Inject constructor(@Named("applicationContext")
private const val KEY_REGIONS = "key_regions"
private const val KEY_LANGUAGES = "key_languages"
private const val KEY_HEALING_TIME = "key_healing_time"
+ private const val KEY_T_DUMMY = "KEY_T_DUMMY"
+ private const val KEY_SAVED_LEGAL_TERMS_VERSION = "key_saved_legal_terms_version"
+ private const val KEY_SETTINGS_LEGAL_TERMS_VERSION = "key_settings_legal_terms_version"
+ private const val KEY_RADARCOVID_DOWNLOAD_URL = "key_radarcovid_download_url"
+ private const val KEY_NOTIFICATION_REMINDER = "key_notification_reminder"
+ private const val KEY_EXPOSURE_ANALYTICS_COUNT = "key_exposure_analytics_count"
+ private const val KEY_ANALYTICS_PERIOD = "key_analytics_period"
+ private const val KEY_LANGUAGE_CHANGED = "key_language_changed"
+ private const val KEY_RECORD_IN_PROGRESS = "key_record_in_progress"
+ private const val KEY_APP_ACTIVE = "key_app_active"
+ private const val KEY_BUNDLE_TAG = "key_bundle_tag"
+ private const val KEY_VENUE_RECORD_NOTIFICATION = "key_venue_record_notification"
+ private const val KEY_VENUE_AUTO_CHECK = "key_venue_auto_check"
+ private const val KEY_VENUE_TROUBLE_PLACE_CHECK = "key_venue_trouble_place_check"
+ private const val KEY_VENUE_QUARANTINE = "key_venue_quarantine"
}
private val preferences = context.getSharedPreferences(PREFERENCES_NAME, Context.MODE_PRIVATE)
@@ -50,17 +66,6 @@ class PreferencesRepositoryImpl @Inject constructor(@Named("applicationContext")
.apply()
}
- override fun getUuid(): String =
- preferences.getString(KEY_UUID, "") ?: ""
-
-
- override fun setUuid(uuid: String) {
- preferences
- .edit()
- .putString(KEY_UUID, uuid)
- .apply()
- }
-
override fun getInfectionReportDate(): Date? {
val infectionReportDateMillis = preferences.getLong(KEY_INFECTION_REPORT_DATE, 0)
return if (infectionReportDateMillis == 0L)
@@ -100,7 +105,7 @@ class PreferencesRepositoryImpl @Inject constructor(@Named("applicationContext")
}
override fun getSelectedLanguage(): String =
- preferences.getString(KEY_CURRENT_LANGUAGE, "es-ES") ?: "es-ES"
+ preferences.getString(KEY_CURRENT_LANGUAGE, "") ?: ""
override fun setLabels(labels: Map) {
preferences.edit()
@@ -167,4 +172,121 @@ class PreferencesRepositoryImpl @Inject constructor(@Named("applicationContext")
return Gson().fromJson(healingTimeJson, HealingTime::class.java)
}
+ override fun getTDummy(): Long {
+ return preferences.getLong(KEY_T_DUMMY, -1)
+ }
+
+ override fun setTDummy(time: Long) {
+ preferences.edit().putLong(KEY_T_DUMMY, time).apply()
+ }
+
+ override fun setSavedLegalTermsVersion(version: String) {
+ preferences.edit().putString(KEY_SAVED_LEGAL_TERMS_VERSION, version).apply()
+ }
+
+ override fun getSavedLegalTermsVersion(): String {
+ return preferences.getString(KEY_SAVED_LEGAL_TERMS_VERSION, "") ?: ""
+ }
+
+ override fun setSettingsLegalTermsVersion(version: String) {
+ preferences.edit().putString(KEY_SETTINGS_LEGAL_TERMS_VERSION, version).apply()
+ }
+
+ override fun getSettingsLegalTermsVersion(): String {
+ return preferences.getString(KEY_SETTINGS_LEGAL_TERMS_VERSION, "") ?: ""
+ }
+
+ override fun setRadarCovidDownloadUrl(url: String) {
+ preferences.edit().putString(KEY_RADARCOVID_DOWNLOAD_URL, url).apply()
+ }
+
+ override fun getRadarCovidDownloadUrl(): String {
+ return preferences.getString(KEY_RADARCOVID_DOWNLOAD_URL, "") ?: ""
+ }
+
+ override fun setNotificationReminder(time: Int) {
+ preferences.edit().putInt(KEY_NOTIFICATION_REMINDER, time).apply()
+ }
+
+ override fun getNotificationReminder(): Int {
+ return preferences.getInt(KEY_NOTIFICATION_REMINDER, NOTIFICATION_REMINDER_DEFAULT)
+ }
+
+ override fun setExposureAnalyticsCount(count: Int) {
+ preferences.edit().putInt(KEY_EXPOSURE_ANALYTICS_COUNT, count).apply()
+ }
+
+ override fun getExposureAnalyticsCount(): Int {
+ return preferences.getInt(KEY_EXPOSURE_ANALYTICS_COUNT, 0)
+ }
+
+ override fun setAnalyticsPeriod(time: Int) {
+ preferences.edit().putInt(KEY_ANALYTICS_PERIOD, time).apply()
+ }
+
+ override fun getAnalyticsPeriod(): Int {
+ return preferences.getInt(KEY_ANALYTICS_PERIOD, ANALYTICS_PERIOD_DEFAULT)
+ }
+
+ override fun setLanguageChanged(changed: Boolean) {
+ preferences.edit()
+ .putBoolean(KEY_LANGUAGE_CHANGED, changed)
+ .apply()
+ }
+
+ override fun getLanguageChanged(): Boolean =
+ preferences.getBoolean(KEY_LANGUAGE_CHANGED, false)
+
+ override fun setRecordInProgress(recordInProgress: Boolean) {
+ preferences.edit()
+ .putBoolean(KEY_RECORD_IN_PROGRESS, recordInProgress)
+ .apply()
+ }
+
+ override fun isRecordInProgress(): Boolean =
+ preferences.getBoolean(KEY_RECORD_IN_PROGRESS, false)
+
+ override fun setApplicationActive(active: Boolean) {
+ preferences.edit()
+ .putBoolean(KEY_APP_ACTIVE, active)
+ .apply()
+ }
+
+ override fun isApplicationActive(): Boolean =
+ preferences.getBoolean(KEY_APP_ACTIVE, false)
+
+ override fun setLastKeyBundleTag(keyBundleTag: Long) {
+ preferences.edit().putLong(KEY_BUNDLE_TAG, keyBundleTag).apply()
+ }
+
+ override fun getLastKeyBundleTag(): Long =
+ preferences.getLong(KEY_BUNDLE_TAG, 0L)
+
+ override fun setRecordNotificationTime(time: Int) {
+ preferences.edit().putInt(KEY_VENUE_RECORD_NOTIFICATION, time).apply()
+ }
+
+ override fun getRecordNotificationTime(): Int =
+ preferences.getInt(KEY_VENUE_RECORD_NOTIFICATION, 60)
+
+ override fun setAutoCheckoutTime(time: Int) {
+ preferences.edit().putInt(KEY_VENUE_AUTO_CHECK, time).apply()
+ }
+
+ override fun getAutoCheckoutTime(): Int =
+ preferences.getInt(KEY_VENUE_AUTO_CHECK, 300)
+
+ override fun setTroubledPlaceCheckTime(time: Int) {
+ preferences.edit().putInt(KEY_VENUE_TROUBLE_PLACE_CHECK, time).apply()
+ }
+
+ override fun getTroubledPlaceCheckTime(): Int =
+ preferences.getInt(KEY_VENUE_TROUBLE_PLACE_CHECK, 120)
+
+ override fun setQuarantineAfterVenueExposedTime(time: Int) {
+ preferences.edit().putInt(KEY_VENUE_QUARANTINE, time).apply()
+ }
+
+ override fun getQuarantineAfterVenueExposedTime(): Int =
+ preferences.getInt(KEY_VENUE_QUARANTINE, 2880)
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/usecase/ExposureInfoUseCase.kt b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/ExposureInfoUseCase.kt
index 42db992f..c59a7f36 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/usecase/ExposureInfoUseCase.kt
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/ExposureInfoUseCase.kt
@@ -26,4 +26,8 @@ class ExposureInfoUseCase @Inject constructor(
fun wasExposed(): Boolean = preferencesRepository.wasExposed()
+ fun resetExposure() = repository.resetExposure()
+
+ fun resetExposureDays() = repository.resetExposureDays()
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/usecase/GetLocaleInfoUseCase.kt b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/GetLocaleInfoUseCase.kt
index 7e2bd718..b0c779cb 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/usecase/GetLocaleInfoUseCase.kt
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/GetLocaleInfoUseCase.kt
@@ -10,6 +10,8 @@
package es.gob.radarcovid.datamanager.usecase
+import es.gob.radarcovid.BuildConfig
+import es.gob.radarcovid.common.base.Constants.SO_NAME
import es.gob.radarcovid.common.base.asyncRequest
import es.gob.radarcovid.datamanager.repository.ApiRepository
import es.gob.radarcovid.datamanager.repository.PreferencesRepository
@@ -21,6 +23,9 @@ class GetLocaleInfoUseCase @Inject constructor(
private val preferencesRepository: PreferencesRepository
) {
+ private val languageCodeCatalan = "ca-ES"
+ private val languageCodeValencian = "va-ES"
+
fun getLocaleInfo(): LocaleInfo = LocaleInfo(
preferencesRepository.getLanguages(),
preferencesRepository.getRegions()
@@ -29,9 +34,21 @@ class GetLocaleInfoUseCase @Inject constructor(
fun getSelectedLanguage(): String =
preferencesRepository.getSelectedLanguage()
- fun setSelectedLanguage(languageCode: String) =
+ fun getSelectedLanguageForLocale(): String {
+ val language = preferencesRepository.getSelectedLanguage()
+ return if (language == languageCodeValencian) languageCodeCatalan else language
+ }
+
+ fun setSelectedLanguage(languageCode: String) {
preferencesRepository.setSelectedLanguage(languageCode)
+ preferencesRepository.setLanguageChanged(true)
+ }
+
+ fun isLanguageChanged(): Boolean =
+ preferencesRepository.getLanguageChanged()
+ fun resetLanguageChanged() =
+ preferencesRepository.setLanguageChanged(false)
fun setSelectedRegion(regionCode: String) =
preferencesRepository.setSelectedRegion(regionCode)
@@ -40,9 +57,10 @@ class GetLocaleInfoUseCase @Inject constructor(
fun getLabels(onSuccess: (Map) -> Unit, onError: (Throwable) -> Unit) {
asyncRequest(onSuccess, onError) {
apiRepository.getLabels(
- preferencesRepository.getUuid(),
preferencesRepository.getSelectedLanguage(),
- preferencesRepository.getSelectedRegion()
+ preferencesRepository.getSelectedRegion(),
+ SO_NAME,
+ BuildConfig.VERSION_NAME
)
}
}
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/usecase/GetReminderTimeUseCase.kt b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/GetReminderTimeUseCase.kt
new file mode 100644
index 00000000..d78abeb5
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/GetReminderTimeUseCase.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.datamanager.usecase
+
+import es.gob.radarcovid.datamanager.repository.PreferencesRepository
+import javax.inject.Inject
+
+class GetReminderTimeUseCase @Inject constructor(private val preferencesRepository: PreferencesRepository) {
+
+ fun getReminderTime(): Int = preferencesRepository.getNotificationReminder()
+
+}
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/usecase/GetStatsUseCase.kt b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/GetStatsUseCase.kt
new file mode 100644
index 00000000..9f1dfd2c
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/GetStatsUseCase.kt
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.datamanager.usecase
+
+import es.gob.radarcovid.BuildConfig
+import es.gob.radarcovid.common.base.Constants
+import es.gob.radarcovid.common.base.asyncRequest
+import es.gob.radarcovid.common.base.mapperScope
+import es.gob.radarcovid.datamanager.mapper.RegionsDataMapper
+import es.gob.radarcovid.datamanager.mapper.StatsDataMapper
+import es.gob.radarcovid.datamanager.repository.ApiRepository
+import es.gob.radarcovid.datamanager.repository.PreferencesRepository
+import es.gob.radarcovid.models.domain.Region
+import es.gob.radarcovid.models.domain.StatsData
+import es.gob.radarcovid.models.domain.StatsRegionData
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.functions.BiFunction
+import javax.inject.Inject
+
+class GetStatsUseCase @Inject constructor(
+ private val apiRepository: ApiRepository,
+ private val preferencesRepository: PreferencesRepository,
+ private val regionsDataMapper: RegionsDataMapper,
+ private val statsDataMapper: StatsDataMapper
+) {
+
+ fun getStatsDataObservable(): Observable =
+ Observable.zip, List, StatsRegionData>(
+ getCountriesObservable(),
+ getStatsObservable(),
+ BiFunction { countries, data ->
+ StatsRegionData(data, countries)
+ })
+
+ private fun getCountriesObservable(): Observable> =
+ Observable.create { emitter ->
+ getRegions(
+ onSuccess = {
+ emitter.onNext(it)
+ emitter.onComplete()
+ },
+ onError = {
+ emitter.onError(it)
+ emitter.onComplete()
+ }
+ )
+ }
+
+ private fun getStatsObservable(): Observable> =
+ Observable.create { emitter ->
+ getStats(
+ onSuccess = {
+ emitter.onNext(it)
+ emitter.onComplete()
+ },
+ onError = {
+ emitter.onError(it)
+ emitter.onComplete()
+ }
+ )
+ }
+
+
+ private fun getRegions(onSuccess: (List) -> Unit, onError: (Throwable) -> Unit) {
+ asyncRequest(onSuccess, onError) {
+ mapperScope(
+ apiRepository.getCountries(
+ preferencesRepository.getSelectedLanguage(),
+ Constants.SO_NAME,
+ BuildConfig.VERSION_NAME
+ )
+ ) {
+ regionsDataMapper.transform(it)
+ }
+ }
+ }
+
+ private fun getStats(onSuccess: (List) -> Unit, onError: (Throwable) -> Unit) {
+ asyncRequest(onSuccess, onError) {
+ mapperScope(
+ apiRepository.getStats()
+ ) {
+ statsDataMapper.transform(it)
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/usecase/LegalTermsUseCase.kt b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/LegalTermsUseCase.kt
new file mode 100644
index 00000000..84764bd7
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/LegalTermsUseCase.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.datamanager.usecase
+
+import es.gob.radarcovid.datamanager.repository.PreferencesRepository
+import javax.inject.Inject
+
+class LegalTermsUseCase @Inject constructor(private val preferencesRepository: PreferencesRepository) {
+
+ fun getSettingsLegalTermsVersionCode(): String =
+ preferencesRepository.getSettingsLegalTermsVersion()
+
+ fun getSavedLegalTermsVersionCode(): String = preferencesRepository.getSavedLegalTermsVersion()
+
+ fun updateLegalTermsVersionCode() {
+ preferencesRepository.setSavedLegalTermsVersion(preferencesRepository.getSettingsLegalTermsVersion())
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/usecase/ReportFakeInfectionUseCase.kt b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/ReportFakeInfectionUseCase.kt
new file mode 100644
index 00000000..a094e4ff
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/ReportFakeInfectionUseCase.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.datamanager.usecase
+
+import es.gob.radarcovid.datamanager.repository.ApiRepository
+import es.gob.radarcovid.datamanager.repository.FakeInfectionReportRepository
+import es.gob.radarcovid.models.request.RequestVerifyCode
+import es.gob.radarcovid.models.response.ResponseToken
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Observable
+import javax.inject.Inject
+import kotlin.random.Random
+
+class ReportFakeInfectionUseCase @Inject constructor(
+ private val fakeInfectionReportRepository: FakeInfectionReportRepository,
+ private val apiRepository: ApiRepository
+) {
+
+ companion object {
+
+ const val FAKE_REPORT_CODE: String = "112358132134"
+
+ }
+
+
+ fun reportFakeInfection(): Completable =
+ getFakeVerifyToken().flatMapCompletable {
+ fakeInfectionReportRepository.notifyFakeInfected(it.token)
+ }.concatWith {
+ it.onComplete()
+ }
+
+ private fun getFakeVerifyToken(): Observable {
+ return Observable.create { emitter ->
+ val result = apiRepository.verifyCode(
+ RequestVerifyCode(null, FAKE_REPORT_CODE),
+ Random.nextInt(0, 2).toString()
+ )
+
+ if (result.isLeft()) {
+ emitter.onError(result.left().get())
+ } else {
+ emitter.onNext(result.right().get())
+ emitter.onComplete()
+ }
+
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/usecase/ReportInfectedUseCase.kt b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/ReportInfectedUseCase.kt
index e6347fb2..27f40f57 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/usecase/ReportInfectedUseCase.kt
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/ReportInfectedUseCase.kt
@@ -14,6 +14,7 @@ import es.gob.radarcovid.common.base.utils.JwtTokenUtils
import es.gob.radarcovid.datamanager.repository.ApiRepository
import es.gob.radarcovid.datamanager.repository.ContactTracingRepository
import es.gob.radarcovid.datamanager.repository.PreferencesRepository
+import es.gob.radarcovid.models.exception.GenericRequestException
import es.gob.radarcovid.models.request.RequestVerifyCode
import es.gob.radarcovid.models.response.ResponseToken
import io.reactivex.rxjava3.core.Completable
@@ -28,20 +29,21 @@ class ReportInfectedUseCase @Inject constructor(
private val jwtTokenUtils: JwtTokenUtils
) {
- fun reportInfected(reportCode: String): Completable {
-
- return getVerifyToken(reportCode).flatMapCompletable {
- contactTracingRepository.notifyInfected(it.token, jwtTokenUtils.getOnset(it.token))
- }.concatWith {
- preferencesRepository.setInfectionReportDate(Date())
- it.onComplete()
+ fun reportInfected(reportCode: String, date: Date?, sharingCode: Int): Completable =
+ if (reportCode == ReportFakeInfectionUseCase.FAKE_REPORT_CODE) {
+ Completable.create { it.onError(GenericRequestException()) }
+ } else {
+ getVerifyToken(reportCode, date, sharingCode).flatMapCompletable {
+ contactTracingRepository.notifyInfected(it.token, jwtTokenUtils.getOnset(it.token))
+ }.concatWith {
+ preferencesRepository.setInfectionReportDate(Date())
+ it.onComplete()
+ }
}
- }
-
- private fun getVerifyToken(reportCode: String): Observable {
+ private fun getVerifyToken(reportCode: String, date: Date?, sharingCode: Int): Observable {
return Observable.create { emitter ->
- val result = apiRepository.verifyCode(RequestVerifyCode(null, reportCode))
+ val result = apiRepository.verifyCode(RequestVerifyCode(date, reportCode), sharingCode.toString())
if (result.isLeft()) {
emitter.onError(result.left().get())
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/usecase/SendAnalyticsUseCase.kt b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/SendAnalyticsUseCase.kt
new file mode 100644
index 00000000..f4a98742
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/SendAnalyticsUseCase.kt
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.datamanager.usecase
+
+import android.os.Handler
+import es.gob.radarcovid.common.base.Constants.KPI_MATCH_CONFIRMED
+import es.gob.radarcovid.common.extensions.DATE_FORMAT_TIMESTAMP
+import es.gob.radarcovid.common.extensions.toTimeStamp
+import es.gob.radarcovid.datamanager.attestation.AttestationClient
+import es.gob.radarcovid.datamanager.repository.ApiRepository
+import es.gob.radarcovid.datamanager.repository.PreferencesRepository
+import es.gob.radarcovid.models.domain.AnalyticsOperationalInfo
+import es.gob.radarcovid.models.domain.ExposureInfo
+import es.gob.radarcovid.models.request.Kpi
+import es.gob.radarcovid.models.request.RequestKpi
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.schedulers.Schedulers
+import java.security.MessageDigest
+import java.security.SecureRandom
+import java.text.SimpleDateFormat
+import java.util.*
+import javax.inject.Inject
+
+class SendAnalyticsUseCase @Inject constructor(
+ private val apiRepository: ApiRepository,
+ private val preferencesRepository: PreferencesRepository,
+ private val attestationClient: AttestationClient
+) {
+
+ companion object {
+ private fun encodeToBase64String(data: ByteArray): String {
+ return android.util.Base64.encodeToString(data, android.util.Base64.NO_WRAP)
+ }
+
+ private fun randomSalt(): String {
+ val salt = ByteArray(16)
+ SecureRandom().nextBytes(salt)
+ return encodeToBase64String(salt)
+ }
+ }
+
+ fun getAnalyticsPeriod(): Int = preferencesRepository.getAnalyticsPeriod()
+
+ fun sendAnalyticsData(exposureInfo: ExposureInfo) {
+
+ //*** KPI - Exposure Analytics ***
+ //Check exposure days to send
+ var exposureAnaliticsCount = preferencesRepository.getExposureAnalyticsCount()
+ if (exposureInfo.exposureDates.size > exposureAnaliticsCount) {
+ val exposureDay = exposureInfo.exposureDates[exposureAnaliticsCount]
+
+ //Send real exposure day
+ sendInfo(exposureDay, false, 0)
+
+ preferencesRepository.setExposureAnalyticsCount(++exposureAnaliticsCount)
+ } else {
+ //Send dummy
+ sendInfo(Date(), true, 0)
+ }
+
+ }
+
+ private fun sendInfo(date: Date, isDummy: Boolean, retryCount: Int) {
+
+ val dateResult = SimpleDateFormat(
+ DATE_FORMAT_TIMESTAMP,
+ Locale.getDefault()
+ ).apply {
+ timeZone = TimeZone.getTimeZone("UTC")
+ }.parse(date.toTimeStamp())
+
+ val operationalInfo = AnalyticsOperationalInfo(
+ kpi = KPI_MATCH_CONFIRMED,
+ date = dateResult.time,
+ value = if (isDummy) 0 else 1,
+ salt = randomSalt()
+ )
+
+ val sha256digest = MessageDigest
+ .getInstance("SHA-256")
+ .digest(operationalInfo.digest.toByteArray())
+
+ attestationClient.attest(
+ onSuccess = { result ->
+ if (result != null) {
+ val requestKpi = RequestKpi(
+ salt = operationalInfo.salt,
+ signedAttestation = result,
+ kpis = arrayListOf(
+ Kpi(
+ kpi = KPI_MATCH_CONFIRMED,
+ timestamp = date.toTimeStamp(),
+ value = if (isDummy) 0 else 1
+ )
+ )
+ )
+
+ sendKpiObservable(requestKpi).subscribeOn(Schedulers.newThread())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe()
+ }
+ },
+ onError = { e ->
+ val newRetryCount = retryCount + 1
+ if (newRetryCount <= 4) {
+ val delayMillis = retryCount * retryCount * 10 * 1000L
+ Handler().postDelayed({
+ sendInfo(date, isDummy, newRetryCount)
+ }, delayMillis)
+ }
+ },
+ nonce = encodeToBase64String(sha256digest)
+ )
+
+ }
+
+ private fun sendKpiObservable(requestKpi: RequestKpi): Completable =
+ Completable.create {
+ val result = apiRepository.sendKpi(requestKpi)
+ if (result.isLeft()) {
+ it.onError(result.left().get())
+ } else {
+ it.onComplete()
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/usecase/SplashUseCase.kt b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/SplashUseCase.kt
index 04e64fdf..5d72a28e 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/usecase/SplashUseCase.kt
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/SplashUseCase.kt
@@ -10,8 +10,11 @@
package es.gob.radarcovid.datamanager.usecase
+import es.gob.radarcovid.BuildConfig
+import es.gob.radarcovid.common.base.Constants.SO_NAME
import es.gob.radarcovid.common.base.asyncRequest
import es.gob.radarcovid.common.base.mapperScope
+import es.gob.radarcovid.common.extensions.default
import es.gob.radarcovid.datamanager.mapper.LanguagesDataMapper
import es.gob.radarcovid.datamanager.mapper.RegionsDataMapper
import es.gob.radarcovid.datamanager.mapper.SettingsDataMapper
@@ -24,7 +27,8 @@ import es.gob.radarcovid.models.domain.Language
import es.gob.radarcovid.models.domain.Region
import es.gob.radarcovid.models.domain.Settings
import io.reactivex.rxjava3.core.Observable
-import io.reactivex.rxjava3.functions.Function4
+import io.reactivex.rxjava3.functions.Function3
+import java.util.*
import javax.inject.Inject
class SplashUseCase @Inject constructor(
@@ -37,56 +41,57 @@ class SplashUseCase @Inject constructor(
private val buildInfoRepository: BuildInfoRepository
) {
+ private val languageCodeSpanish = "es-ES"
+
fun getVersionCode(): Int = buildInfoRepository.getVersionCode()
fun getInitializationObservable(): Observable =
- getUuidObservable().flatMap {
- Observable.zip, List, List, InitializationData>(
- getSettingsObservable(),
- getLabelsObservable(),
- getLanguagesObservable(),
- getRegionsObservable(),
- Function4 { settings, labels, languages, regions ->
- InitializationData(settings, labels, languages, regions)
- })
- .map { initializationData ->
+ getLanguagesObservable().flatMap { languages ->
- preferencesRepository.setHealingTime(initializationData.settings.healingTime)
+ preferencesRepository.setLanguages(languages)
- if (initializationData.labels.isNotEmpty())
- preferencesRepository.setLabels(initializationData.labels)
+ if (initializeDefaultLanguage(languages))
+ getInitializationObservable() // Languages list is not translated in the desired language so we need to make the request again
+ else
+ Observable.zip, List, InitializationData>(
+ getSettingsObservable(),
+ getLabelsObservable(),
+ getRegionsObservable(),
+ Function3 { settings, labels, regions ->
+ InitializationData(settings, labels, regions)
+ })
+ .map { initializationData ->
- if (initializationData.languages.isNotEmpty())
- preferencesRepository.setLanguages(initializationData.languages)
+ if (languages.isNotEmpty())
+ preferencesRepository.setLanguages(languages)
- if (initializationData.regions.isNotEmpty())
- preferencesRepository.setRegions(initializationData.regions)
+ preferencesRepository.setHealingTime(initializationData.settings.healingTime)
- contactTracingRepository.updateTracingSettings(initializationData.settings)
+ preferencesRepository.setSettingsLegalTermsVersion(initializationData.settings.legalTermsVersion)
- initializationData
+ preferencesRepository.setRadarCovidDownloadUrl(initializationData.settings.radarCovidDownloadUrl)
- }
- }
+ preferencesRepository.setNotificationReminder(initializationData.settings.notificationReminder)
- private fun getUuidObservable(): Observable = Observable.create { emitter ->
- if (isUuidInitialized()) {
- emitter.onNext(preferencesRepository.getUuid())
- emitter.onComplete()
- } else {
- getUuid(
- onSuccess = {
- if (it.isNotEmpty())
- preferencesRepository.setUuid(it)
- emitter.onNext(it)
- emitter.onComplete()
- },
- onError = {
- emitter.onError(it)
- emitter.onComplete()
- })
+ preferencesRepository.setAnalyticsPeriod(initializationData.settings.timeBetweenKpi)
+
+ if (initializationData.labels.isNotEmpty())
+ preferencesRepository.setLabels(initializationData.labels)
+
+ if (initializationData.regions.isNotEmpty())
+ preferencesRepository.setRegions(initializationData.regions)
+
+ contactTracingRepository.updateTracingSettings(initializationData.settings)
+
+ preferencesRepository.setRecordNotificationTime(initializationData.settings.venueConfiguration.recordNotification)
+ preferencesRepository.setAutoCheckoutTime(initializationData.settings.venueConfiguration.autoCheckout)
+ preferencesRepository.setTroubledPlaceCheckTime(initializationData.settings.venueConfiguration.troubledPlaceCheck)
+ preferencesRepository.setQuarantineAfterVenueExposedTime(initializationData.settings.venueConfiguration.quarentineAfterExposed)
+
+ initializationData
+
+ }
}
- }
private fun getSettingsObservable(): Observable =
Observable.create { emitter ->
@@ -142,13 +147,6 @@ class SplashUseCase @Inject constructor(
)
}
- private fun getUuid(onSuccess: (String) -> Unit, onError: (Throwable) -> Unit) =
- asyncRequest(onSuccess, onError) {
- mapperScope(apiRepository.getUuid()) {
- it.uuid
- }
- }
-
private fun getSettings(onSuccess: (Settings) -> Unit, onError: (Throwable) -> Unit) =
asyncRequest(onSuccess, onError) {
mapperScope(apiRepository.getSettings()) {
@@ -159,9 +157,10 @@ class SplashUseCase @Inject constructor(
private fun getLabels(onSuccess: (Map) -> Unit, onError: (Throwable) -> Unit) {
asyncRequest(onSuccess, onError) {
apiRepository.getLabels(
- preferencesRepository.getUuid(),
preferencesRepository.getSelectedLanguage(),
- preferencesRepository.getSelectedRegion()
+ preferencesRepository.getSelectedRegion(),
+ SO_NAME,
+ BuildConfig.VERSION_NAME
)
}
}
@@ -171,8 +170,9 @@ class SplashUseCase @Inject constructor(
asyncRequest(onSuccess, onError) {
mapperScope(
apiRepository.getLanguages(
- preferencesRepository.getUuid(),
- preferencesRepository.getSelectedLanguage()
+ preferencesRepository.getSelectedLanguage().default(languageCodeSpanish),
+ SO_NAME,
+ BuildConfig.VERSION_NAME
)
) {
languagesDataMapper.transform(it)
@@ -184,8 +184,9 @@ class SplashUseCase @Inject constructor(
asyncRequest(onSuccess, onError) {
mapperScope(
apiRepository.getRegions(
- preferencesRepository.getUuid(),
- preferencesRepository.getSelectedLanguage()
+ preferencesRepository.getSelectedLanguage(),
+ SO_NAME,
+ BuildConfig.VERSION_NAME
)
) {
regionsDataMapper.transform(it)
@@ -193,8 +194,26 @@ class SplashUseCase @Inject constructor(
}
}
- fun isUuidInitialized() = preferencesRepository.getUuid().isNotEmpty()
+ private fun initializeDefaultLanguage(languages: List): Boolean {
+
+ var reloadLanguagesList = false
+ if (preferencesRepository.getSelectedLanguage().isEmpty()) {
+
+ val systemLanguageCode = Locale.getDefault().toLanguageTag()
+ val availableLanguageCodes = languages.map { it.code }
+
+ if (availableLanguageCodes.contains(systemLanguageCode) && systemLanguageCode != languageCodeSpanish) {
+ preferencesRepository.setSelectedLanguage(systemLanguageCode)
+ reloadLanguagesList = true
+ } else {
+ preferencesRepository.setSelectedLanguage(languageCodeSpanish)
+ }
+ }
+
+ return reloadLanguagesList
+
+ }
fun checkGaenAvailability(callback: (Boolean) -> Unit) =
contactTracingRepository.checkGaenAvailability(callback)
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/usecase/VenueMatcherUseCase.kt b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/VenueMatcherUseCase.kt
new file mode 100644
index 00000000..c35f63e7
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/VenueMatcherUseCase.kt
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.datamanager.usecase
+
+import es.gob.radarcovid.datamanager.repository.ApiRepository
+import es.gob.radarcovid.datamanager.repository.CrowdNotifierRepository
+import es.gob.radarcovid.datamanager.repository.EncryptedPreferencesRepository
+import es.gob.radarcovid.datamanager.repository.PreferencesRepository
+import es.gob.radarcovid.models.domain.ProblematicEventOuterClass
+import es.gob.radarcovid.models.domain.VenueRecord
+import okhttp3.ResponseBody
+import org.crowdnotifier.android.sdk.model.ProblematicEventInfo
+import retrofit2.Response
+import java.io.IOException
+import java.util.*
+import javax.inject.Inject
+
+class VenueMatcherUseCase @Inject constructor(
+ private val crowdNotifierRepository: CrowdNotifierRepository,
+ private val encryptedPreferencesRepository: EncryptedPreferencesRepository,
+ private val preferencesRepository: PreferencesRepository,
+ private val apiRepository: ApiRepository
+) {
+
+ companion object {
+ private const val KEY_BUNDLE_TAG_HEADER = "x-key-bundle-tag"
+ }
+
+ private fun setVenueExposureInfo(venue: VenueRecord?) =
+ encryptedPreferencesRepository.setVenueExposureInfo(venue)
+
+ fun getVenueExposureInfo(): VenueRecord? = encryptedPreferencesRepository.getVenueExposureInfo()
+
+ private fun getVisitedVenueList(): List =
+ encryptedPreferencesRepository.getVisitedVenue()
+
+ fun setVenueNotified() {
+ val venueList = getVisitedVenueList()
+ venueList.forEach { it.isNotified = true }
+ encryptedPreferencesRepository.setVisitedVenue(venueList)
+ }
+
+ fun checkForMatches(): List {
+ //Call to backend to get problematics events
+ val problematicEvents = getTraceKeys(preferencesRepository.getLastKeyBundleTag())
+
+ //Check for matches
+ val exposures = crowdNotifierRepository.checkForMatches(problematicEvents)
+
+ cleanUpOldData()
+
+ if (exposures.isNotEmpty()) {
+ //update local list with exposures
+ val venueList = getVisitedVenueList()
+ exposures.forEach {
+ val venue = venueList.find { x -> x.checkOutId == it.id }
+ if (venue != null) {
+ venue.isExposed = true
+ }
+ }
+ encryptedPreferencesRepository.setVisitedVenue(venueList)
+
+ //Set actual exposure
+ val exposedList = venueList.filter { it.isExposed }.sortedBy { it.dateOut }.toList()
+ setVenueExposureInfo(exposedList.last())
+
+ return exposedList
+
+ } else {
+ //Check actual exposure
+ val exposureVenue = getVisitedVenueList().firstOrNull { it.isExposed }
+ if (exposureVenue == null) {
+ setVenueExposureInfo(null)
+ }
+
+ return emptyList()
+ }
+
+ }
+
+ private fun cleanUpOldData() {
+ crowdNotifierRepository.cleanOldData(preferencesRepository.getQuarantineAfterVenueExposedTime())
+ encryptedPreferencesRepository.cleanVisitedVenue(preferencesRepository.getQuarantineAfterVenueExposedTime())
+ }
+
+ private fun getTraceKeys(keyBundleTag: Long): List {
+ try {
+ val response = apiRepository.getTraceKeys(keyBundleTag)
+ if (response.isSuccessful) {
+ return handleSuccessfulResponse(response)
+ }
+ } catch (e: IOException) {
+ return emptyList()
+ }
+ return emptyList()
+ }
+
+ private fun handleSuccessfulResponse(response: Response): List {
+ return try {
+ val keyBundleTag =
+ response.headers()[KEY_BUNDLE_TAG_HEADER]!!
+ .toLong()
+ preferencesRepository.setLastKeyBundleTag(keyBundleTag)
+ val problematicEventWrapper: ProblematicEventOuterClass.ProblematicEventWrapper =
+ ProblematicEventOuterClass.ProblematicEventWrapper.parseFrom(
+ response.body()!!.byteStream()
+ )
+ val problematicEventInfos = ArrayList()
+ for (event in problematicEventWrapper.eventsList) {
+ problematicEventInfos.add(
+ ProblematicEventInfo(
+ event.identity.toByteArray(),
+ event.secretKeyForIdentity.toByteArray(),
+ event.startTime,
+ event.endTime,
+ event.message.toByteArray(),
+ event.nonce.toByteArray()
+ )
+ )
+ }
+ problematicEventInfos
+ } catch (e: IOException) {
+ return emptyList()
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/usecase/VenueRecordUseCase.kt b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/VenueRecordUseCase.kt
new file mode 100644
index 00000000..1fc5da5d
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/usecase/VenueRecordUseCase.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.datamanager.usecase
+
+import es.gob.radarcovid.datamanager.repository.CrowdNotifierRepository
+import es.gob.radarcovid.datamanager.repository.EncryptedPreferencesRepository
+import es.gob.radarcovid.models.domain.VenueRecord
+import io.reactivex.rxjava3.core.Completable
+import org.crowdnotifier.android.sdk.model.VenueInfo
+import java.util.*
+import javax.inject.Inject
+
+class VenueRecordUseCase @Inject constructor(
+ private val crowdNotifierRepository: CrowdNotifierRepository,
+ private val encryptedPreferencesRepository: EncryptedPreferencesRepository
+) {
+
+ fun isCurrentVenue(): Boolean =
+ encryptedPreferencesRepository.getCurrentVenue() != null
+
+ fun getCurrentVenue(): VenueRecord? =
+ encryptedPreferencesRepository.getCurrentVenue()
+
+ private fun setCurrentVenue(currentVenue: VenueRecord) =
+ encryptedPreferencesRepository.setCurrentVenueRecord(currentVenue)
+
+ fun getVenueInfo(qrCode: String): VenueInfo =
+ crowdNotifierRepository.getVenueInfo(qrCode)
+
+ fun checkIn(qrCaptured: String): Completable =
+ Completable.create { emitter ->
+ try {
+ val venueInfo = getVenueInfo(qrCaptured)
+ val currentVenueRecord = VenueRecord(
+ qr = qrCaptured,
+ name = venueInfo.name,
+ dateIn = Date()
+ )
+ setCurrentVenue(currentVenueRecord)
+
+ emitter.onComplete()
+
+ } catch (e: Exception) {
+ emitter.onError(e)
+ }
+ }
+
+ fun checkOut(dateOut: Date, moreFiveHours: Boolean): Completable =
+ Completable.create { emitter ->
+ try {
+ val currentVenue = encryptedPreferencesRepository.getCurrentVenue()
+ if (currentVenue != null) {
+ val listVisited =
+ encryptedPreferencesRepository.getVisitedVenue().toMutableList()
+ val venueInfo = getVenueInfo(currentVenue.qr)
+
+ currentVenue.dateOut = dateOut
+ currentVenue.checkOutId = crowdNotifierRepository.checkIn(
+ currentVenue.dateIn.time,
+ currentVenue.dateOut!!.time,
+ venueInfo
+ )
+ currentVenue.moreFiveHours = moreFiveHours
+ listVisited.add(currentVenue)
+
+ encryptedPreferencesRepository.setVisitedVenue(listVisited)
+ encryptedPreferencesRepository.removeCurrentVenue()
+ }
+
+ emitter.onComplete()
+
+ } catch (e: Exception) {
+ emitter.onError(e)
+ }
+ }
+
+ fun cancelCheckIn() {
+ encryptedPreferencesRepository.removeCurrentVenue()
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/utils/LabelManager.kt b/app/src/main/java/es/gob/radarcovid/datamanager/utils/LabelManager.kt
index bd28d278..eaafeace 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/utils/LabelManager.kt
+++ b/app/src/main/java/es/gob/radarcovid/datamanager/utils/LabelManager.kt
@@ -41,7 +41,7 @@ class LabelManager @Inject constructor(
it,
HtmlCompat.FROM_HTML_MODE_LEGACY
)
- } ?: SpannedString(default)
+ } ?: SpannedString(default ?: "")
fun getExposureHighDatesText(
@@ -98,6 +98,15 @@ class LabelManager @Inject constructor(
return HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_LEGACY)
}
+ fun getVenueExposureHighDatesText(
+ date: String,
+ daysElapsed: Int?
+ ): Spanned {
+ val text = getFormattedText("VENUE_EXPOSITION_HIGH_DESCRIPTION", daysElapsed.toString(), date)
+ .default(context.getString(R.string.venue_exposure_high_detail_description, daysElapsed.toString(), date))
+ return HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_LEGACY)
+ }
+
fun getFormattedText(labelId: String, vararg values: String): String {
var text: String = labels[labelId] ?: ""
return if (text.isNotEmpty()) {
@@ -110,7 +119,22 @@ class LabelManager @Inject constructor(
}
}
+ fun getFormattedTextHtml(labelId: String, default: String, vararg values: String): Spanned {
+ var text: String = labels[labelId] ?: default
+ return if (text.isNotEmpty()) {
+ values.forEach {
+ text = text.replaceFirst("%@", it)
+ }
+ HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_LEGACY)
+ } else {
+ HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_LEGACY)
+ }
+ }
+
fun getContactPhone(): String =
getText("CONTACT_PHONE", R.string.contact_support_phone).toString()
+ fun getLinkLabel(label: String, url: String): Spanned =
+ HtmlCompat.fromHtml("$label )
+ fun showRegionSelector(
+ regions: List,
+ selectedRegionIndex: Int
+ )
- fun showRegionInfo(phone: String, webName: String)
-
- fun getSelectedRegionIndex():Int
+ fun showRegionInfo(name: String, phone: String, webName: String, url: String)
}
@@ -28,7 +29,11 @@ interface RegionInfoPresenter {
fun onWebButtonClick()
- fun onRegionSelected()
+ fun onRegionButtonClick()
+
+ fun onRegionSelected(position: Int)
+
+ fun onRegionSelectorAcceptButtonClick()
}
diff --git a/app/src/main/java/es/gob/radarcovid/features/exposure/region/view/RegionInfoFragment.kt b/app/src/main/java/es/gob/radarcovid/features/exposure/region/view/RegionInfoFragment.kt
index 74d19688..b979a890 100644
--- a/app/src/main/java/es/gob/radarcovid/features/exposure/region/view/RegionInfoFragment.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/exposure/region/view/RegionInfoFragment.kt
@@ -14,10 +14,9 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import android.widget.AdapterView
import es.gob.radarcovid.R
import es.gob.radarcovid.common.base.BaseFragment
-import es.gob.radarcovid.common.view.HintSpinnerAdapter
+import es.gob.radarcovid.common.view.ListDialog
import es.gob.radarcovid.features.exposure.region.protocols.RegionInfoPresenter
import es.gob.radarcovid.features.exposure.region.protocols.RegionInfoView
import kotlinx.android.synthetic.main.fragment_region_info.*
@@ -47,42 +46,52 @@ class RegionInfoFragment : BaseFragment(), RegionInfoView {
}
private fun initViews() {
- wrapperPhone.setOnClickListener { presenter.onPhoneButtonClick() }
- wrapperWeb.setOnClickListener { presenter.onWebButtonClick() }
- spinnerRegion.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-
- override fun onNothingSelected(parent: AdapterView<*>?) {
-
- }
-
- override fun onItemSelected(
- parent: AdapterView<*>?,
- view: View?,
- position: Int,
- id: Long
- ) {
- if (position > 0)
- presenter.onRegionSelected()
- }
-
- }
+ textViewPhone.setOnClickListener { presenter.onPhoneButtonClick() }
+ textViewWeb.setOnClickListener { presenter.onWebButtonClick() }
+ buttonSelectRegion.setOnClickListener { presenter.onRegionButtonClick() }
}
- override fun setRegions(regions: List) {
- spinnerRegion.adapter =
- HintSpinnerAdapter(
- context!!,
+ override fun showRegionSelector(
+ regions: List,
+ selectedRegionIndex: Int
+ ) {
+ ListDialog.Builder(context!!)
+ .setTitle(
labelManager.getText(
"LOCALE_SELECTION_REGION_DEFAULT",
R.string.locale_selection_region_default
- ).toString(),
- R.layout.row_spinner,
- regions
+ ).toString()
)
+ .setPositiveButton(
+ labelManager.getText(
+ "ALERT_ACCEPT_BUTTON",
+ R.string.accept
+ ).toString()
+ ) {
+ presenter.onRegionSelectorAcceptButtonClick()
+ it.dismiss()
+ }
+ .setNegativeButton(
+ labelManager.getText(
+ "ALERT_CANCEL_BUTTON",
+ R.string.accept
+ ).toString()
+ ) {
+ it.dismiss()
+ }
+ .setItems(regions, selectedRegionIndex) { dialog, position ->
+ presenter.onRegionSelected(position)
+ }
+ .build()
+ .show()
}
- override fun showRegionInfo(phone: String, webName: String) {
-
+ override fun showRegionInfo(name: String, phone: String, webName: String, url: String) {
+
+ buttonSelectRegion.text = name
+ buttonSelectRegion.contentDescription =
+ "$name ${labelManager.getText("ACC_SELECTED", R.string.single_choice_selected)}"
+
wrapperRegionInfo.visibility = View.VISIBLE
if (phone.isNotEmpty()) {
@@ -94,14 +103,12 @@ class RegionInfoFragment : BaseFragment(), RegionInfoView {
if (webName.isNotEmpty()) {
wrapperWeb.visibility = View.VISIBLE
- textViewWeb.text = webName
+ textViewWeb.text = labelManager.getLinkLabel(webName, url)
+ textViewWeb.setLinkParameters()
} else {
- wrapperWeb.visibility = View.VISIBLE
+ wrapperWeb.visibility = View.GONE
}
}
- override fun getSelectedRegionIndex(): Int =
- spinnerRegion.selectedItemPosition - 1 // POSITION 0 IS THE "NON SELECTED" OPTION
-
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/exposure/router/ExposureRouterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/exposure/router/ExposureRouterImpl.kt
index 9f0a31bf..1ed3712e 100644
--- a/app/src/main/java/es/gob/radarcovid/features/exposure/router/ExposureRouterImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/exposure/router/ExposureRouterImpl.kt
@@ -17,14 +17,9 @@ import es.gob.radarcovid.features.exposure.protocols.ExposureRouter
import javax.inject.Inject
class ExposureRouterImpl @Inject constructor(
- private val context: Context,
- private val navigationUtils: NavigationUtils
+ private val context: Context
) : ExposureRouter {
- override fun navigateToCovidReport() = CovidReportActivity.open(context)
-
- override fun navigateToBrowser(url: String) {
- navigationUtils.navigateToBrowser(context, url)
- }
+ override fun navigateToCovidReport() = CovidReportActivity.open(context, null)
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/exposure/view/ExposureActivity.kt b/app/src/main/java/es/gob/radarcovid/features/exposure/view/ExposureActivity.kt
index c62b88d6..a26e9a66 100644
--- a/app/src/main/java/es/gob/radarcovid/features/exposure/view/ExposureActivity.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/exposure/view/ExposureActivity.kt
@@ -18,39 +18,47 @@ import android.view.View
import androidx.core.text.HtmlCompat
import es.gob.radarcovid.R
import es.gob.radarcovid.common.base.BaseBackNavigationActivity
+import es.gob.radarcovid.common.extensions.default
+import es.gob.radarcovid.common.extensions.parseHtml
import es.gob.radarcovid.features.exposure.protocols.ExposurePresenter
import es.gob.radarcovid.features.exposure.protocols.ExposureView
import es.gob.radarcovid.features.main.view.ExposureHealedDialog
import kotlinx.android.synthetic.main.activity_exposure.*
+import kotlinx.android.synthetic.main.layout_back_navigation.*
import kotlinx.android.synthetic.main.layout_exposure_detail_high.*
-import kotlinx.android.synthetic.main.layout_exposure_detail_infected.*
-import kotlinx.android.synthetic.main.layout_exposure_detail_low.*
import javax.inject.Inject
class ExposureActivity : BaseBackNavigationActivity(), ExposureView {
companion object {
- fun open(context: Context) {
- context.startActivity(Intent(context, ExposureActivity::class.java))
- }
+ private const val EXTRA_VENUE_EXPOSURE = "extra_venue_exposure"
+ fun open(context: Context, venueExposure: Boolean) {
+ context.startActivity(Intent(context, ExposureActivity::class.java).apply {
+ putExtra(EXTRA_VENUE_EXPOSURE, venueExposure)
+ })
+ }
}
@Inject
lateinit var presenter: ExposurePresenter
+ private var _isVenueExposure: Boolean = false
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_exposure)
+ _isVenueExposure = intent.getBooleanExtra(EXTRA_VENUE_EXPOSURE, false)
+
initViews()
presenter.viewReady()
}
override fun onResume() {
super.onResume()
- presenter.onResume()
+ presenter.onResume(_isVenueExposure)
}
override fun onPause() {
@@ -59,63 +67,17 @@ class ExposureActivity : BaseBackNavigationActivity(), ExposureView {
}
private fun initViews() {
- textViewOtherSymptomsHigh.setOnClickListener {
- presenter.onUrlButtonClick(
- labelManager.getText(
- "EXPOSITION_HIGH_OTHER_SYMPTOMS_URL",
- R.string.exposure_detail_high_other_symptoms_url
- ).toString()
- )
- }
- textViewSymptomsHighWhatToDo.setOnClickListener {
- presenter.onUrlButtonClick(
- labelManager.getText(
- "EXPOSITION_HIGH_SYMPTOMS_WHAT_TO_DO_URL",
- R.string.exposure_detail_high_symptoms_what_to_do_url
- ).toString()
- )
- }
- textViewSymptomsLowWhatToDo.setOnClickListener {
- presenter.onUrlButtonClick(
- labelManager.getText(
- "EXPOSITION_LOW_SYMPTOMS_WHAT_TO_DO_URL",
- R.string.exposure_detail_low_symptoms_what_to_do_url
- ).toString()
- )
- }
- textViewMoreInfo.setOnClickListener {
- presenter.onUrlButtonClick(
+ imageButtonBack.contentDescription =
+ "${labelManager.getText("ACC_HOME_TITLE", R.string.title_home)} ${
labelManager.getText(
- "EXPOSITION_HIGH_MORE_INFO_URL",
- R.string.exposure_detail_infected_more_info_url
- ).toString()
- )
- }
+ "ACC_BUTTON_BACK_TO",
+ R.string.navigation_back_to
+ )
+ }"
+
wrapperContactButton.setOnClickListener { presenter.onContactButtonClick() }
- buttonMoreInfoLow.setOnClickListener {
- presenter.onUrlButtonClick(
- labelManager.getText(
- "EXPOSURE_LOW_INFO_URL",
- R.string.exposure_detail_info_url
- ).toString()
- )
- }
- buttonMoreInfoHigh.setOnClickListener {
- presenter.onUrlButtonClick(
- labelManager.getText(
- "EXPOSURE_HIGH_INFO_URL",
- R.string.exposure_detail_info_url
- ).toString()
- )
- }
- buttonMoreInfoInfected.setOnClickListener {
- presenter.onUrlButtonClick(
- labelManager.getText(
- "EXPOSURE_INFECTED_INFO_URL",
- R.string.exposure_detail_info_url
- ).toString()
- )
- }
+
+ textViewMoreInfo.text = String.format("%s >", textViewMoreInfo.text)
}
override fun showExposureLevelLow() {
@@ -146,6 +108,7 @@ class ExposureActivity : BaseBackNavigationActivity(), ExposureView {
)
textViewMoreInfo.visibility = View.GONE
+ imageViewRisk.visibility = View.VISIBLE
wrapperExposureHigh.visibility = View.VISIBLE
wrapperExposureLow.visibility = View.GONE
wrapperExposureInfected.visibility = View.GONE
@@ -169,6 +132,24 @@ class ExposureActivity : BaseBackNavigationActivity(), ExposureView {
wrapperExposureHigh.visibility = View.GONE
}
+ override fun showVenueExposureLevelHigh() {
+ wrapperExposure.setBackgroundResource(R.drawable.background_shape_exposure_high)
+ textViewExpositionDetailTitleSmall.text = labelManager.getText(
+ "EXPOSITION_HIGH_TITLE_1",
+ R.string.exposure_detail_high_title_small
+ )
+ textViewExpositionDetailTitle.text = labelManager.getText(
+ "EXPOSITION_HIGH_TITLE_2", R.string.exposure_detail_high_title
+ )
+ textViewMoreInfo.visibility = View.GONE
+
+ imageViewRisk.setImageResource(R.drawable.ic_risk_place)
+ imageViewRisk.visibility = View.VISIBLE
+ wrapperExposureHigh.visibility = View.VISIBLE
+ wrapperExposureLow.visibility = View.GONE
+ wrapperExposureInfected.visibility = View.GONE
+ }
+
override fun setExposureInfo(
date: String,
daysElapsed: Int?,
@@ -180,6 +161,26 @@ class ExposureActivity : BaseBackNavigationActivity(), ExposureView {
labelManager.getExposureHighDatesText(date, daysElapsed, hoursElapsed, minutesElapsed)
}
+ override fun setVenueExposureInfo(date: String, daysElapsed: Int?) {
+ textViewExposureDescription.visibility = View.VISIBLE
+ textViewExposureDescription.text =
+ labelManager.getVenueExposureHighDatesText(date, daysElapsed)
+ }
+
+ override fun setDaysToHeal(daysToHeal: Int) {
+ if (daysToHeal >= 0) {
+ textViewExpositionCount.visibility = View.VISIBLE
+ val labelId =
+ if (daysToHeal == 1) "EXPOSED_EXPOSITION_COUNT_ONE_DAY" else "EXPOSED_EXPOSITION_COUNT_ANYMORE"
+ textViewExpositionCount.text =
+ labelManager.getFormattedText(labelId, daysToHeal.toString())
+ .default(getString(R.string.exposition_block_exposure_high_count)).parseHtml()
+ } else {
+ textViewExpositionCount.visibility = View.INVISIBLE
+ }
+
+ }
+
override fun showExposureDates(exposureDates: String) {
wrapperExposureDates.visibility = View.VISIBLE
textViewExposureDates.text = exposureDates
diff --git a/app/src/main/java/es/gob/radarcovid/features/helpline/di/HelplineModule.kt b/app/src/main/java/es/gob/radarcovid/features/helpline/di/HelplineModule.kt
index 205de640..666024e7 100644
--- a/app/src/main/java/es/gob/radarcovid/features/helpline/di/HelplineModule.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/helpline/di/HelplineModule.kt
@@ -11,18 +11,20 @@
package es.gob.radarcovid.features.helpline.di
import android.app.Activity
+import android.content.Context
import dagger.Module
import dagger.Provides
import es.gob.radarcovid.features.helpline.presenter.HelplinePresenterImpl
import es.gob.radarcovid.features.helpline.protocols.HelplinePresenter
-import es.gob.radarcovid.features.helpline.protocols.HelplineRouter
import es.gob.radarcovid.features.helpline.protocols.HelplineView
-import es.gob.radarcovid.features.helpline.router.HelplineRouterImpl
import es.gob.radarcovid.features.helpline.view.HelplineFragment
@Module
class HelplineModule {
+ @Provides
+ fun providesContext(fragment: HelplineFragment): Context = fragment.context!!
+
@Provides
fun providesActivity(fragment: HelplineFragment): Activity = fragment.activity!!
@@ -32,7 +34,4 @@ class HelplineModule {
@Provides
fun providesPresenter(presenter: HelplinePresenterImpl): HelplinePresenter = presenter
- @Provides
- fun providesRouter(router: HelplineRouterImpl): HelplineRouter = router
-
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/helpline/presenter/HelplinePresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/helpline/presenter/HelplinePresenterImpl.kt
index 522fc015..50079e98 100644
--- a/app/src/main/java/es/gob/radarcovid/features/helpline/presenter/HelplinePresenterImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/helpline/presenter/HelplinePresenterImpl.kt
@@ -11,13 +11,11 @@
package es.gob.radarcovid.features.helpline.presenter
import es.gob.radarcovid.features.helpline.protocols.HelplinePresenter
-import es.gob.radarcovid.features.helpline.protocols.HelplineRouter
import es.gob.radarcovid.features.helpline.protocols.HelplineView
import javax.inject.Inject
class HelplinePresenterImpl @Inject constructor(
- private val view: HelplineView,
- private val router: HelplineRouter
+ private val view: HelplineView
) : HelplinePresenter {
override fun viewReady() {
@@ -28,12 +26,4 @@ class HelplinePresenterImpl @Inject constructor(
view.showDialerForSupport()
}
- override fun onInterViewEmailButtonClick() {
- view.sendMailToInterview()
- }
-
- override fun onUrlButtonClick(url: String) {
- router.navigateToBrowser(url)
- }
-
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/helpline/protocols/Protocols.kt b/app/src/main/java/es/gob/radarcovid/features/helpline/protocols/Protocols.kt
index ca875419..84766128 100644
--- a/app/src/main/java/es/gob/radarcovid/features/helpline/protocols/Protocols.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/helpline/protocols/Protocols.kt
@@ -13,25 +13,13 @@ package es.gob.radarcovid.features.helpline.protocols
interface HelplineView {
fun showDialerForSupport()
-
- fun sendMailToInterview()
-
+
}
interface HelplinePresenter {
fun viewReady()
-
- fun onContactSupportButtonClick()
-
- fun onInterViewEmailButtonClick()
- fun onUrlButtonClick(url: String)
-
-}
-
-interface HelplineRouter {
-
- fun navigateToBrowser(url: String)
+ fun onContactSupportButtonClick()
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/helpline/router/HelplineRouterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/helpline/router/HelplineRouterImpl.kt
deleted file mode 100644
index 26c79532..00000000
--- a/app/src/main/java/es/gob/radarcovid/features/helpline/router/HelplineRouterImpl.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2020 Gobierno de España
- *
- * 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 es.gob.radarcovid.features.helpline.router
-
-import android.app.Activity
-import es.gob.radarcovid.common.base.utils.NavigationUtils
-import es.gob.radarcovid.features.helpline.protocols.HelplineRouter
-import javax.inject.Inject
-
-class HelplineRouterImpl @Inject constructor(
- private val activity: Activity,
- private val navigationUtils: NavigationUtils
-) : HelplineRouter {
-
- override fun navigateToBrowser(url: String) {
- navigationUtils.navigateToBrowser(activity, url)
- }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/helpline/view/HelplineFragment.kt b/app/src/main/java/es/gob/radarcovid/features/helpline/view/HelplineFragment.kt
index 75e062f0..c30db18b 100644
--- a/app/src/main/java/es/gob/radarcovid/features/helpline/view/HelplineFragment.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/helpline/view/HelplineFragment.kt
@@ -16,6 +16,7 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.view.accessibility.AccessibilityEvent
import es.gob.radarcovid.R
import es.gob.radarcovid.common.base.BaseFragment
import es.gob.radarcovid.features.helpline.protocols.HelplinePresenter
@@ -46,35 +47,12 @@ class HelplineFragment : BaseFragment(), HelplineView {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
- initViews()
presenter.viewReady()
}
- private fun initViews() {
- textViewFaqsTitle.setOnClickListener {
- presenter.onUrlButtonClick(
- labelManager.getText(
- "HELPLINE_FAQS_WEB_URL",
- R.string.helpline_faqs_web_url
- ).toString()
- )
- }
- textViewInfoWebTitle.setOnClickListener {
- presenter.onUrlButtonClick(
- labelManager.getText(
- "HELPLINE_INFO_WEB_URL",
- R.string.helpline_info_web_url
- ).toString()
- )
- }
- textViewOtherWebTitle.setOnClickListener {
- presenter.onUrlButtonClick(
- labelManager.getText(
- "HELPLINE_OTHER_WEB_URL",
- R.string.helpline_other_web_url
- ).toString()
- )
- }
+ override fun onResume() {
+ super.onResume()
+ setAccessibilityFocus()
}
override fun showDialerForSupport() {
@@ -85,23 +63,15 @@ class HelplineFragment : BaseFragment(), HelplineView {
})
}
- override fun sendMailToInterview() {
- val emailIntent = Intent(Intent.ACTION_SEND).apply {
- type = "plain/text"
- putExtra(
- Intent.EXTRA_EMAIL,
- arrayOf(labelManager.getText("CONTACT_EMAIL", R.string.contact_email).toString())
- )
-// putExtra(Intent.EXTRA_SUBJECT, "Subject")
-// putExtra(Intent.EXTRA_TEXT, "Text")
- }
-
- startActivity(
- Intent.createChooser(
- emailIntent,
- "Send mail..."
- )
- )
+ private fun setAccessibilityFocus() {
+ if (isAccessibilityEnabled())
+ textViewTitle.postDelayed({
+ if (textViewTitle != null) {
+ textViewTitle.isFocusable = true
+ textViewTitle.requestFocus()
+ textViewTitle.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED)
+ }
+ }, 3000)
}
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/home/presenter/HomePresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/home/presenter/HomePresenterImpl.kt
index 1f6e8f46..58fa52d9 100644
--- a/app/src/main/java/es/gob/radarcovid/features/home/presenter/HomePresenterImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/home/presenter/HomePresenterImpl.kt
@@ -13,15 +13,15 @@ package es.gob.radarcovid.features.home.presenter
import com.squareup.otto.Subscribe
import es.gob.radarcovid.common.base.events.BUS
import es.gob.radarcovid.common.base.events.EventExposureStatusChange
-import es.gob.radarcovid.datamanager.usecase.ExposureInfoUseCase
-import es.gob.radarcovid.datamanager.usecase.ExposureRadarUseCase
-import es.gob.radarcovid.datamanager.usecase.FakeExposureInfoUseCase
-import es.gob.radarcovid.datamanager.usecase.OnboardingCompletedUseCase
+import es.gob.radarcovid.datamanager.repository.PreferencesRepository
+import es.gob.radarcovid.datamanager.usecase.*
import es.gob.radarcovid.features.home.protocols.HomePresenter
import es.gob.radarcovid.features.home.protocols.HomeRouter
import es.gob.radarcovid.features.home.protocols.HomeView
import es.gob.radarcovid.models.domain.Environment
import es.gob.radarcovid.models.domain.ExposureInfo
+import es.gob.radarcovid.models.domain.VenueRecord
+import java.util.concurrent.TimeUnit
import javax.inject.Inject
class HomePresenterImpl @Inject constructor(
@@ -30,24 +30,32 @@ class HomePresenterImpl @Inject constructor(
private val onboardingCompletedUseCase: OnboardingCompletedUseCase,
private val exposureRadarUseCase: ExposureRadarUseCase,
private val exposureInfoUseCase: ExposureInfoUseCase,
- private val fakeExposureInfoUseCase: FakeExposureInfoUseCase
+ private val fakeExposureInfoUseCase: FakeExposureInfoUseCase,
+ private val legalTermsUseCase: LegalTermsUseCase,
+ private val getHealingTimeUseCase: GetHealingTimeUseCase,
+ private val venueMatcherUseCase: VenueMatcherUseCase,
+ private val preferencesRepository: PreferencesRepository
) : HomePresenter {
- override fun viewReady(activateRadar: Boolean) {
+ private var activateRadar: Boolean = false
- if (!onboardingCompletedUseCase.isOnBoardingCompleted()) {
- onboardingCompletedUseCase.setOnboardingCompleted(true)
- view.showInitializationCheckAnimation()
- }
+ override fun viewReady(activateRadar: Boolean) {
- if (activateRadar && !exposureRadarUseCase.isRadarEnabled())
- onSwitchRadarClick(false)
+ this.activateRadar = activateRadar
+ if (needChangeLegalTerms()) {
+ view.showUpdateLegalTermsDialog()
+ } else {
+ whenViewReady(activateRadar)
+ }
}
override fun onResume() {
BUS.register(this)
- updateViews(exposureInfoUseCase.getExposureInfo())
+ updateViews(
+ exposureInfoUseCase.getExposureInfo(),
+ venueMatcherUseCase.getVenueExposureInfo()
+ )
}
override fun onPause() {
@@ -55,11 +63,11 @@ class HomePresenterImpl @Inject constructor(
}
override fun onExposureBlockClick() {
- router.navigateToExpositionDetail()
+ router.navigateToExpositionDetail(false)
}
- override fun onMoreInfoButtonClick(url: String) {
- router.navigateToBrowser(url)
+ override fun onVenueExposureBlockClick() {
+ router.navigateToExpositionDetail(true)
}
override fun onReportButtonClick() {
@@ -69,15 +77,21 @@ class HomePresenterImpl @Inject constructor(
router.navigateToCovidReport()
}
- override fun onBackgroundImageLongClick() {
+ override fun onFakeExposureButtonClick() {
if (fakeExposureInfoUseCase.getEnvironment() == Environment.PRE)
fakeExposureInfoUseCase.addFakeExposureDay()
}
+ override fun onFakeShowExposureHealedDialogClick() {
+ if (fakeExposureInfoUseCase.getEnvironment() == Environment.PRE)
+ view.showExposureHealedDialog()
+ }
+
override fun onSwitchRadarClick(currentlyEnabled: Boolean) {
if (currentlyEnabled) {
view.setRadarBlockChecked(false)
exposureRadarUseCase.setRadarDisabled()
+ view.updateContentDescriptionRadar(false)
} else {
if (view.areBatteryOptimizationsIgnored())
onBatteryOptimizationsIgnored()
@@ -92,30 +106,78 @@ class HomePresenterImpl @Inject constructor(
onSuccess = {
view.hideLoading()
view.setRadarBlockChecked(true)
+ view.updateContentDescriptionRadar(true)
},
onError = {
view.setRadarBlockChecked(false)
- view.hideLoadingWithError(it)
+ view.hideLoadingWithCommonError()
+ view.updateContentDescriptionRadar(false)
},
onCancelled = {
view.setRadarBlockChecked(false)
view.hideLoading()
+ view.updateContentDescriptionRadar(false)
})
}
- @Subscribe
+ override fun needChangeLegalTerms(): Boolean {
+ val settingLegalTermsVersionCode = legalTermsUseCase.getSettingsLegalTermsVersionCode()
+ val savedLegalTermsVersionCode = legalTermsUseCase.getSavedLegalTermsVersionCode()
+ return settingLegalTermsVersionCode != savedLegalTermsVersionCode
+ }
+
+ override fun legalTermsAccepted() {
+ legalTermsUseCase.updateLegalTermsVersionCode()
+ whenViewReady(activateRadar)
+ }
+
+ override fun onButtonShareClick() {
+ view.showShareDialog()
+ }
+
+ override fun doShareApp(message: String) {
+ router.shareApp(message)
+ }
+
+ private fun whenViewReady(activateRadar: Boolean) {
+
+ if (fakeExposureInfoUseCase.getEnvironment() == Environment.PRE)
+ view.setFakeExposureButton()
+
+ if (!onboardingCompletedUseCase.isOnBoardingCompleted()) {
+ onboardingCompletedUseCase.setOnboardingCompleted(true)
+ view.showInitializationCheckAnimation()
+ }
+
+ if (activateRadar && !exposureRadarUseCase.isRadarEnabled())
+ onSwitchRadarClick(false)
+ else
+ view.updateContentDescriptionRadar(exposureRadarUseCase.isRadarEnabled())
+ }
+
+ @Subscribe()
fun onExposureStatusChange(event: EventExposureStatusChange) {
- updateViews(exposureInfoUseCase.getExposureInfo())
+ updateViews(
+ exposureInfoUseCase.getExposureInfo(),
+ venueMatcherUseCase.getVenueExposureInfo()
+ )
}
- private fun showExposureHealedDialogIfRequired(exposureLevel: ExposureInfo.Level) {
+ private fun showExposureHealedDialogIfRequired(
+ exposureLevel: ExposureInfo.Level,
+ daysLeft: Int
+ ) {
if (exposureLevel == ExposureInfo.Level.LOW && exposureInfoUseCase.wasExposed()) {
view.showExposureHealedDialog()
exposureInfoUseCase.setExposed(false)
+ } else if (exposureLevel == ExposureInfo.Level.HIGH && daysLeft < 0) {
+ view.showExposureHealedDialog()
+ exposureInfoUseCase.resetExposure()
+ exposureInfoUseCase.setExposed(false)
}
}
- private fun updateViews(exposureInfo: ExposureInfo) {
+ private fun updateViews(exposureInfo: ExposureInfo, venueExposureInfo: VenueRecord?) {
if (!exposureInfo.exposureNotificationsEnabled && exposureRadarUseCase.isRadarEnabled())
exposureRadarUseCase.setRadarDisabled()
@@ -130,13 +192,40 @@ class HomePresenterImpl @Inject constructor(
view.showReportButton()
}
+ var daysLeftVenueExposure = 0L
+ if (venueExposureInfo != null) {
+ val millisElapsed = System.currentTimeMillis() - venueExposureInfo.dateOut!!.time
+ val daysElapsed = TimeUnit.MILLISECONDS.toDays(millisElapsed)
+ val daysToHeal =
+ preferencesRepository.getQuarantineAfterVenueExposedTime() / 60 / 24
+ daysLeftVenueExposure = daysToHeal - daysElapsed
+ }
+
+ var daysLeft = 0L
when (exposureInfo.level) {
- ExposureInfo.Level.LOW -> view.showExposureBlockLow()
- ExposureInfo.Level.HIGH -> view.showExposureBlockHigh()
+ ExposureInfo.Level.LOW -> {
+ if (venueExposureInfo != null) {
+ view.showVenueExposureBlock(daysLeftVenueExposure.toInt(), true)
+ } else {
+ view.showExposureBlockLow()
+ }
+ }
+ ExposureInfo.Level.HIGH -> {
+ val millisElapsed = System.currentTimeMillis() - exposureInfo.lastExposureDate.time
+ val daysElapsed = TimeUnit.MILLISECONDS.toDays(millisElapsed)
+ val daysToHeal =
+ getHealingTimeUseCase.getHealingTime().exposureHighMinutes / 60 / 24
+ daysLeft = daysToHeal - daysElapsed
+
+ view.showExposureBlockHigh(daysLeft.toInt(), venueExposureInfo == null)
+ if (venueExposureInfo != null) {
+ view.showVenueExposureBlock(daysLeftVenueExposure.toInt(), false)
+ }
+ }
ExposureInfo.Level.INFECTED -> view.showExposureBlockInfected()
}
- showExposureHealedDialogIfRequired(exposureInfo.level)
+ showExposureHealedDialogIfRequired(exposureInfo.level, daysLeft.toInt())
}
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/home/protocols/Protocols.kt b/app/src/main/java/es/gob/radarcovid/features/home/protocols/Protocols.kt
index 7e3b89b4..2b2c4c18 100644
--- a/app/src/main/java/es/gob/radarcovid/features/home/protocols/Protocols.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/home/protocols/Protocols.kt
@@ -18,7 +18,7 @@ interface HomeView : RequestView {
fun showExposureBlockLow()
- fun showExposureBlockHigh()
+ fun showExposureBlockHigh(daysToHeal: Int, hideVenueExposureBlock: Boolean)
fun showExposureBlockInfected()
@@ -28,6 +28,8 @@ interface HomeView : RequestView {
fun hideReportButton()
+ fun setFakeExposureButton()
+
fun setRadarBlockChecked(checked: Boolean)
fun setRadarBlockEnabled(enabled: Boolean)
@@ -40,6 +42,14 @@ interface HomeView : RequestView {
fun showExposureHealedDialog()
+ fun showUpdateLegalTermsDialog()
+
+ fun showShareDialog()
+
+ fun updateContentDescriptionRadar(enabled: Boolean)
+
+ fun showVenueExposureBlock(daysToHeal: Int, hideExposureBlock: Boolean)
+
}
interface HomePresenter {
@@ -52,24 +62,33 @@ interface HomePresenter {
fun onExposureBlockClick()
- fun onMoreInfoButtonClick(url: String)
+ fun onVenueExposureBlockClick()
fun onReportButtonClick()
- fun onBackgroundImageLongClick()
+ fun onButtonShareClick()
+
+ fun doShareApp(message: String)
+
+ fun onFakeExposureButtonClick()
+
+ fun onFakeShowExposureHealedDialogClick()
fun onSwitchRadarClick(currentlyEnabled: Boolean)
fun onBatteryOptimizationsIgnored()
+ fun needChangeLegalTerms(): Boolean
+
+ fun legalTermsAccepted()
+
}
interface HomeRouter {
- fun navigateToExpositionDetail()
+ fun navigateToExpositionDetail(venueExposure: Boolean)
fun navigateToCovidReport()
- fun navigateToBrowser(url: String)
-
+ fun shareApp(text: String)
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/home/router/HomeRouterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/home/router/HomeRouterImpl.kt
index 98fe3837..ceaad113 100644
--- a/app/src/main/java/es/gob/radarcovid/features/home/router/HomeRouterImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/home/router/HomeRouterImpl.kt
@@ -11,6 +11,7 @@
package es.gob.radarcovid.features.home.router
import android.content.Context
+import android.content.Intent
import es.gob.radarcovid.common.base.utils.NavigationUtils
import es.gob.radarcovid.features.covidreport.form.view.CovidReportActivity
import es.gob.radarcovid.features.exposure.view.ExposureActivity
@@ -18,16 +19,22 @@ import es.gob.radarcovid.features.home.protocols.HomeRouter
import javax.inject.Inject
class HomeRouterImpl @Inject constructor(
- private val context: Context,
- private val navigationUtils: NavigationUtils
+ private val context: Context
) : HomeRouter {
- override fun navigateToExpositionDetail() = ExposureActivity.open(context)
+ override fun navigateToExpositionDetail(venueExposure: Boolean) = ExposureActivity.open(context, venueExposure)
- override fun navigateToCovidReport() = CovidReportActivity.open(context)
+ override fun navigateToCovidReport() = CovidReportActivity.open(context, null)
- override fun navigateToBrowser(url: String) {
- navigationUtils.navigateToBrowser(context, url)
+ override fun shareApp(text: String) {
+ val sendIntent: Intent = Intent().apply {
+ action = Intent.ACTION_SEND
+ putExtra(Intent.EXTRA_TEXT, text)
+ type = "text/plain"
+ }
+
+ val shareIntent = Intent.createChooser(sendIntent, null)
+ context.startActivity(shareIntent)
}
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/home/view/HomeFragment.kt b/app/src/main/java/es/gob/radarcovid/features/home/view/HomeFragment.kt
index ade7abda..2f76ed82 100644
--- a/app/src/main/java/es/gob/radarcovid/features/home/view/HomeFragment.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/home/view/HomeFragment.kt
@@ -28,13 +28,18 @@ import android.view.LayoutInflater
import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
+import android.view.accessibility.AccessibilityEvent
import androidx.core.content.ContextCompat
import androidx.core.content.res.ResourcesCompat
+import es.gob.radarcovid.BuildConfig
import es.gob.radarcovid.R
import es.gob.radarcovid.common.base.BaseFragment
import es.gob.radarcovid.common.extensions.default
import es.gob.radarcovid.common.extensions.parseHtml
+import es.gob.radarcovid.common.extensions.setAccessibilityAction
+import es.gob.radarcovid.common.extensions.setSafeOnClickListener
import es.gob.radarcovid.common.view.CMDialog
+import es.gob.radarcovid.common.view.LegalTermsDialog
import es.gob.radarcovid.features.home.protocols.HomePresenter
import es.gob.radarcovid.features.home.protocols.HomeView
import es.gob.radarcovid.features.main.view.ExposureHealedDialog
@@ -49,12 +54,17 @@ class HomeFragment : BaseFragment(), HomeView {
private const val REQUEST_CODE_IGNORE_BATTERY_OPTIMIZATIONS = 1
private const val ARG_ACTIVATE_RADAR = "arg_activate_radar"
-
- fun newInstance(activateRadar: Boolean) = HomeFragment().apply {
- arguments = Bundle().apply {
- putBoolean(ARG_ACTIVATE_RADAR, activateRadar)
+ private const val MANUAL_NAVIGATION = "arg_manual_navigation"
+ private const val BACK_FROM_QR = "back_from_qr"
+
+ fun newInstance(activateRadar: Boolean, manualNavigation: Boolean, backFromQr: Boolean) =
+ HomeFragment().apply {
+ arguments = Bundle().apply {
+ putBoolean(ARG_ACTIVATE_RADAR, activateRadar)
+ putBoolean(MANUAL_NAVIGATION, manualNavigation)
+ putBoolean(BACK_FROM_QR, backFromQr)
+ }
}
- }
}
@@ -83,6 +93,10 @@ class HomeFragment : BaseFragment(), HomeView {
override fun onResume() {
super.onResume()
+ updateViewsForAccessibility(
+ arguments?.getBoolean(MANUAL_NAVIGATION) ?: false,
+ arguments?.getBoolean(BACK_FROM_QR) ?: false
+ )
presenter.onResume()
}
@@ -107,24 +121,21 @@ class HomeFragment : BaseFragment(), HomeView {
event.actionMasked == MotionEvent.ACTION_MOVE
}
- imageViewLogo.setOnLongClickListener {
- presenter.onBackgroundImageLongClick()
- true
- }
- imageViewInitializationCheck.setOnLongClickListener {
- presenter.onBackgroundImageLongClick()
- true
- }
- wrapperExposure.setOnClickListener { presenter.onExposureBlockClick() }
- textViewMoreInfo.setOnClickListener {
- presenter.onMoreInfoButtonClick(
- labelManager.getText(
- "HOME_EXPOSITION_POSITIVE_MORE_INFO_URL",
- R.string.exposition_block_infected_more_info_url
- ).toString()
- )
+ wrapperExposure.setSafeOnClickListener { presenter.onExposureBlockClick() }
+ textViewExpositionTitle.setSafeOnClickListener { presenter.onExposureBlockClick() }
+
+ wrapperVenueExposure.setSafeOnClickListener { presenter.onVenueExposureBlockClick() }
+ textViewVenueExpositionTitle.setSafeOnClickListener { presenter.onVenueExposureBlockClick() }
+
+ buttonCovidReport.setSafeOnClickListener { presenter.onReportButtonClick() }
+
+ buttonShare.setSafeOnClickListener { presenter.onButtonShareClick() }
+ }
+
+ override fun showUpdateLegalTermsDialog() {
+ LegalTermsDialog(requireContext()).show {
+ presenter.legalTermsAccepted()
}
- buttonCovidReport.setOnClickListener { presenter.onReportButtonClick() }
}
override fun showInitializationCheckAnimation() {
@@ -140,7 +151,34 @@ class HomeFragment : BaseFragment(), HomeView {
}.start()
}
+ override fun showVenueExposureBlock(daysToHeal: Int, hideExposureBlock: Boolean) {
+ wrapperVenueExposure.visibility = View.VISIBLE
+ wrapperExposure.visibility = if (hideExposureBlock) View.GONE else View.VISIBLE
+ wrapperVenueExposure.setBackgroundResource(R.drawable.background_shape_exposure_high)
+ textViewVenueExpositionTitle.text =
+ labelManager.getText("HOME_EXPOSITION_TITLE_HIGH", R.string.exposition_block_high_title)
+ textViewVenueExpositionDescription.text =
+ labelManager.getFormattedText(
+ "HOME_VENUE_EXPOSITION_MESSAGE_HIGH",
+ labelManager.getContactPhone()
+ ).default(getString(R.string.venue_exposure_block_high_description)).parseHtml()
+
+ if (daysToHeal >= 0) {
+ val labelId =
+ if (daysToHeal == 1) "HOME_EXPOSITION_COUNT_ONE_DAY" else "HOME_EXPOSITION_COUNT_ANYMORE"
+ textViewVenueExpositionCount.text =
+ labelManager.getFormattedText(labelId, daysToHeal.toString())
+ .default(getString(R.string.exposition_block_high_count)).parseHtml()
+ textViewVenueExpositionCount.visibility = View.VISIBLE
+ } else {
+ textViewVenueExpositionCount.visibility = View.INVISIBLE
+ }
+ }
+
override fun showExposureBlockLow() {
+ wrapperExposure.visibility = View.VISIBLE
+ wrapperVenueExposure.visibility = View.GONE
+ imageViewRisk.visibility = View.GONE
wrapperExposure.setBackgroundResource(R.drawable.background_shape_expure_low)
textViewExpositionTitle.text =
labelManager.getText("HOME_EXPOSITION_TITLE_LOW", R.string.exposition_block_low_title)
@@ -149,11 +187,14 @@ class HomeFragment : BaseFragment(), HomeView {
"HOME_EXPOSITION_MESSAGE_LOW",
R.string.exposition_block_low_description
)
- textViewExpositionTitle.setTextColor(ContextCompat.getColor(context!!, R.color.green))
textViewMoreInfo.visibility = View.GONE
+ textViewExpositionCount.visibility = View.INVISIBLE
}
- override fun showExposureBlockHigh() {
+ override fun showExposureBlockHigh(daysToHeal: Int, hideVenueExposureBlock: Boolean) {
+ wrapperExposure.visibility = View.VISIBLE
+ wrapperVenueExposure.visibility = if (hideVenueExposureBlock) View.GONE else View.VISIBLE
+ imageViewRisk.visibility = View.VISIBLE
wrapperExposure.setBackgroundResource(R.drawable.background_shape_exposure_high)
textViewExpositionTitle.text =
labelManager.getText("HOME_EXPOSITION_TITLE_HIGH", R.string.exposition_block_high_title)
@@ -162,11 +203,25 @@ class HomeFragment : BaseFragment(), HomeView {
"HOME_EXPOSITION_MESSAGE_HIGH",
labelManager.getContactPhone()
).default(getString(R.string.exposition_block_high_description)).parseHtml()
- textViewExpositionTitle.setTextColor(ContextCompat.getColor(context!!, R.color.red))
textViewMoreInfo.visibility = View.GONE
+
+ if (daysToHeal >= 0) {
+ val labelId =
+ if (daysToHeal == 1) "HOME_EXPOSITION_COUNT_ONE_DAY" else "HOME_EXPOSITION_COUNT_ANYMORE"
+ textViewExpositionCount.text =
+ labelManager.getFormattedText(labelId, daysToHeal.toString())
+ .default(getString(R.string.exposition_block_high_count)).parseHtml()
+ textViewExpositionCount.visibility = View.VISIBLE
+ } else {
+ textViewExpositionCount.visibility = View.INVISIBLE
+ }
+
}
override fun showExposureBlockInfected() {
+ wrapperExposure.visibility = View.VISIBLE
+ wrapperVenueExposure.visibility = View.GONE
+ imageViewRisk.visibility = View.GONE
wrapperExposure.setBackgroundResource(R.drawable.background_shape_exposure_infected)
textViewExpositionTitle.text = labelManager.getText(
"HOME_EXPOSITION_TITLE_POSITIVE",
@@ -177,8 +232,8 @@ class HomeFragment : BaseFragment(), HomeView {
"HOME_EXPOSITION_MESSAGE_INFECTED",
R.string.exposition_block_infected_description
)
- textViewExpositionTitle.setTextColor(ContextCompat.getColor(context!!, R.color.red))
textViewMoreInfo.visibility = View.VISIBLE
+ textViewExpositionCount.visibility = View.INVISIBLE
}
override fun showBackgroundEnabled(enabled: Boolean) {
@@ -207,6 +262,29 @@ class HomeFragment : BaseFragment(), HomeView {
buttonCovidReport.visibility = View.GONE
}
+ override fun setFakeExposureButton() {
+ imageViewInitializationCheck.setOnLongClickListener {
+ presenter.onFakeExposureButtonClick()
+ true
+ }
+ imageViewLogo.setOnLongClickListener {
+ presenter.onFakeExposureButtonClick()
+ true
+ }
+ imageViewLogo.contentDescription = getString(R.string.home_exposure_simulation_description)
+
+ textViewVersion.text = context?.getString(
+ R.string.home_exposure_version,
+ BuildConfig.VERSION_NAME,
+ BuildConfig.VERSION_CODE.toString()
+ )
+ textViewVersion.visibility = View.VISIBLE
+ textViewVersion.setOnLongClickListener {
+ presenter.onFakeShowExposureHealedDialogClick()
+ true
+ }
+ }
+
override fun setRadarBlockChecked(checked: Boolean) {
if (switchRadar.isChecked != checked) {
switchRadar.isChecked = checked
@@ -227,9 +305,14 @@ class HomeFragment : BaseFragment(), HomeView {
"HOME_RADAR_MESSAGE_DISABLED",
R.string.radar_block_disabled_description
)
- textViewRadarDescription.setTextColor(ContextCompat.getColor(context!!, R.color.black))
+ textViewRadarDescription.setTextColor(
+ ContextCompat.getColor(
+ requireContext(),
+ R.color.black
+ )
+ )
textViewRadarDescription.setTypeface(
- ResourcesCompat.getFont(context!!, R.font.muli_light),
+ ResourcesCompat.getFont(requireContext(), R.font.roboto_light),
Typeface.NORMAL
)
}
@@ -237,19 +320,19 @@ class HomeFragment : BaseFragment(), HomeView {
}
override fun areBatteryOptimizationsIgnored(): Boolean {
- (context!!.getSystemService(POWER_SERVICE) as PowerManager).let { powerManager ->
- return powerManager.isIgnoringBatteryOptimizations(context!!.packageName)
+ (requireContext().getSystemService(POWER_SERVICE) as PowerManager).let { powerManager ->
+ return powerManager.isIgnoringBatteryOptimizations(requireContext().packageName)
}
}
@SuppressLint("BatteryLife")
override fun requestIgnoreBatteryOptimizations() {
- (context!!.getSystemService(POWER_SERVICE) as PowerManager?)?.let {
- if (!it.isIgnoringBatteryOptimizations(activity!!.packageName)) {
+ (requireContext().getSystemService(POWER_SERVICE) as PowerManager?)?.let {
+ if (!it.isIgnoringBatteryOptimizations(requireContext().packageName)) {
try {
startActivityForResult(Intent().apply {
action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
- data = Uri.parse("package:${activity!!.packageName}")
+ data = Uri.parse("package:${requireContext().packageName}")
}, REQUEST_CODE_IGNORE_BATTERY_OPTIMIZATIONS)
} catch (e: ActivityNotFoundException) {
presenter.onBatteryOptimizationsIgnored()
@@ -259,7 +342,7 @@ class HomeFragment : BaseFragment(), HomeView {
}
override fun showUnableToReportCovidDialog() {
- CMDialog.Builder(context!!)
+ CMDialog.Builder(requireContext())
.setMessage(
labelManager.getText(
"ALERT_RADAR_REQUIRED_TO_REPORT",
@@ -272,17 +355,27 @@ class HomeFragment : BaseFragment(), HomeView {
R.string.accept
).toString()
) { it.dismiss() }
- .setCloseButton { it.dismiss() }
.build()
.show()
}
override fun showExposureHealedDialog() {
- ExposureHealedDialog(context!!).show()
+ ExposureHealedDialog(requireContext()).show()
+ }
+
+ override fun showShareDialog() {
+ ShareDialog(requireContext()) {
+ presenter.doShareApp(
+ labelManager.getText(
+ "SHARE_TEXT",
+ getString(R.string.share_app_text)
+ ).toString()
+ )
+ }.show()
}
private fun showDialogDisableRadarWarning() {
- CMDialog.Builder(context!!)
+ CMDialog.Builder(requireContext())
.setTitle(
labelManager.getText(
"ALERT_HOME_RADAR_TITLE",
@@ -295,7 +388,6 @@ class HomeFragment : BaseFragment(), HomeView {
R.string.radar_warning_message
).toString()
)
- .setCloseButton { it.dismiss() }
.setPositiveButton(
labelManager.getText(
"ALERT_HOME_RADAR_CANCEL_BUTTON",
@@ -327,9 +419,14 @@ class HomeFragment : BaseFragment(), HomeView {
"HOME_RADAR_CONTENT_ACTIVE",
R.string.radar_block_checked_description
)
- textViewRadarDescription.setTextColor(ContextCompat.getColor(context!!, R.color.black))
+ textViewRadarDescription.setTextColor(
+ ContextCompat.getColor(
+ requireContext(),
+ R.color.black
+ )
+ )
textViewRadarDescription.setTypeface(
- ResourcesCompat.getFont(context!!, R.font.muli_light),
+ ResourcesCompat.getFont(requireContext(), R.font.roboto_light),
Typeface.NORMAL
)
} else {
@@ -341,11 +438,52 @@ class HomeFragment : BaseFragment(), HomeView {
"HOME_RADAR_CONTENT_INACTIVE",
R.string.radar_block_not_checked_description
)
- textViewRadarDescription.setTextColor(ContextCompat.getColor(context!!, R.color.red))
+ textViewRadarDescription.setTextColor(
+ ContextCompat.getColor(
+ requireContext(),
+ R.color.red_00
+ )
+ )
textViewRadarDescription.setTypeface(
- ResourcesCompat.getFont(context!!, R.font.muli_bold),
+ ResourcesCompat.getFont(requireContext(), R.font.roboto_bold),
Typeface.NORMAL
)
}
}
+
+ private fun updateViewsForAccessibility(manualNavigation: Boolean, backFromQr: Boolean) {
+ if (isAccessibilityEnabled()) {
+ wrapperExposure.isClickable = false
+ textViewExpositionTitle.isClickable = true
+ } else {
+ wrapperExposure.isClickable = true
+ textViewExpositionTitle.isClickable = false
+ }
+ if (manualNavigation) {
+ if (isAccessibilityEnabled()) {
+ val delay = if (backFromQr) 1000L else 3000L
+ textViewTitle.postDelayed({
+ if (textViewTitle != null) {
+ textViewTitle.isFocusable = true
+ textViewTitle.requestFocus()
+ textViewTitle.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED)
+ }
+ }, delay)
+ }
+ }
+ }
+
+ override fun updateContentDescriptionRadar(enabled: Boolean) {
+ val action = if (enabled)
+ labelManager.getText(
+ "ALERT_HOME_RADAR_OK_BUTTON",
+ R.string.radar_warning_button_negative
+ ).toString()
+ else labelManager.getText(
+ "ALERT_HOME_COVID_NOTIFICATION_OK_BUTTON",
+ R.string.radar_warning_button_activate
+ ).toString()
+ switchRadar.setAccessibilityAction(action)
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/home/view/ShareDialog.kt b/app/src/main/java/es/gob/radarcovid/features/home/view/ShareDialog.kt
new file mode 100644
index 00000000..8e5d70fd
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/home/view/ShareDialog.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.home.view
+
+import android.app.AlertDialog
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import dagger.android.HasAndroidInjector
+import es.gob.radarcovid.R
+import es.gob.radarcovid.datamanager.utils.LabelManager
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.dialog_share_app.*
+import javax.inject.Inject
+
+class ShareDialog(context: Context, onShareClick: ((Dialog) -> Unit)) : LayoutContainer {
+
+ private val dialog: Dialog
+
+ override val containerView: View =
+ LayoutInflater.from(context).inflate(R.layout.dialog_share_app, null)
+
+ @Inject
+ lateinit var labelManager: LabelManager
+
+ init {
+ initializeInjector(context)
+
+ dialog = AlertDialog.Builder(context)
+ .setView(containerView)
+ .create()
+ .apply {
+ window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+ }
+
+ buttonClose.setOnClickListener { dialog.dismiss() }
+ buttonCancel.setOnClickListener { dialog.dismiss() }
+ buttonShare.setOnClickListener { onShareClick(dialog) }
+
+ }
+
+ fun show() {
+ dialog.show()
+ dialog.window?.setLayout(
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT
+ )
+ }
+
+ private fun initializeInjector(context: Context) {
+ (context.applicationContext as? HasAndroidInjector)?.androidInjector()?.inject(this)
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/information/di/InformationModule.kt b/app/src/main/java/es/gob/radarcovid/features/information/di/InformationModule.kt
new file mode 100644
index 00000000..a10b448c
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/information/di/InformationModule.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.information.di
+
+import android.content.Context
+import androidx.appcompat.app.AppCompatActivity
+import dagger.Module
+import dagger.Provides
+import es.gob.radarcovid.common.di.scope.PerActivity
+import es.gob.radarcovid.datamanager.repository.ContactTracingRepository
+import es.gob.radarcovid.datamanager.repository.ContactTracingRepositoryImpl
+import es.gob.radarcovid.features.information.presenter.InformationPresenterImpl
+import es.gob.radarcovid.features.information.protocols.InformationPresenter
+import es.gob.radarcovid.features.information.protocols.InformationRouter
+import es.gob.radarcovid.features.information.protocols.InformationView
+import es.gob.radarcovid.features.information.router.InformationRouterImpl
+import es.gob.radarcovid.features.information.view.InformationActivity
+
+@Module
+class InformationModule {
+
+ @Provides
+ fun providesContext(activity: InformationActivity): Context = activity
+
+ @Provides
+ fun providesActivity(activity: InformationActivity): AppCompatActivity = activity
+
+ @Provides
+ fun providesView(activity: InformationActivity): InformationView = activity
+
+ @Provides
+ @PerActivity
+ fun providesPresenter(presenter: InformationPresenterImpl): InformationPresenter = presenter
+
+ @Provides
+ @PerActivity
+ fun providesContactTracingRepository(repository: ContactTracingRepositoryImpl): ContactTracingRepository =
+ repository
+
+ @Provides
+ @PerActivity
+ fun providesRouter(router: InformationRouterImpl): InformationRouter = router
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/information/presenter/InformationPresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/information/presenter/InformationPresenterImpl.kt
new file mode 100644
index 00000000..3bb8af3c
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/information/presenter/InformationPresenterImpl.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.information.presenter
+
+import es.gob.radarcovid.datamanager.usecase.ExposureInfoUseCase
+import es.gob.radarcovid.datamanager.usecase.ExposureRadarUseCase
+import es.gob.radarcovid.datamanager.usecase.GetLocaleInfoUseCase
+import es.gob.radarcovid.features.information.protocols.InformationPresenter
+import es.gob.radarcovid.features.information.protocols.InformationRouter
+import es.gob.radarcovid.features.information.protocols.InformationView
+import es.gob.radarcovid.models.domain.ExposureInfo
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+class InformationPresenterImpl @Inject constructor(
+ private val view: InformationView,
+ private val exposureInfoUseCase: ExposureInfoUseCase,
+ private val exposureRadarUseCase: ExposureRadarUseCase,
+ private val localeInfoUseCase: GetLocaleInfoUseCase,
+ private val router: InformationRouter
+) : InformationPresenter {
+
+ override fun viewReady() {
+
+ }
+
+
+ override fun onResume() {
+ updateViews(exposureInfoUseCase.getExposureInfo())
+ }
+
+ override fun onHelpButtonClick() {
+ view.showHelpDialog()
+ }
+
+ override fun onSupportMailClick(text: String, subject: String, email: String) {
+ router.navigateToMail(text, subject, email)
+ }
+
+ private fun updateViews(exposureInfo: ExposureInfo) {
+ view.showRadarEnabled(exposureRadarUseCase.isRadarEnabled())
+ view.showBluetoothEnabled()
+
+ val millisElapsed = System.currentTimeMillis() - exposureInfo.lastUpdateTime.time
+ val daysElapsed = TimeUnit.MILLISECONDS.toDays(millisElapsed)
+ view.showLastUpdateDate(
+ exposureInfo.lastUpdateTime,
+ daysElapsed.toInt(),
+ localeInfoUseCase.getSelectedLanguageForLocale()
+ )
+ view.showTerminalData(localeInfoUseCase.getSelectedLanguageForLocale())
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/information/protocols/Protocols.kt b/app/src/main/java/es/gob/radarcovid/features/information/protocols/Protocols.kt
new file mode 100644
index 00000000..142128df
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/information/protocols/Protocols.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.information.protocols
+
+import java.util.*
+
+interface InformationView {
+
+ fun showHelpDialog()
+
+ fun showRadarEnabled(isRadarEnabled: Boolean)
+
+ fun showBluetoothEnabled()
+
+ fun showLastUpdateDate(date: Date, daysElapsed: Int, locale: String)
+
+ fun showTerminalData(locale: String)
+}
+
+interface InformationPresenter {
+
+ fun viewReady()
+
+ fun onResume()
+
+ fun onHelpButtonClick()
+
+ fun onSupportMailClick(text: String, subject: String, email: String)
+
+}
+
+interface InformationRouter {
+
+ fun navigateToMail(text: String, subject: String, email: String)
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/information/router/InformationRouterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/information/router/InformationRouterImpl.kt
new file mode 100644
index 00000000..fbe58e24
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/information/router/InformationRouterImpl.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.information.router
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import es.gob.radarcovid.features.information.protocols.InformationRouter
+import javax.inject.Inject
+
+class InformationRouterImpl @Inject constructor(
+ private val context: Context
+) : InformationRouter {
+
+ override fun navigateToMail(text: String, subject: String, email: String) {
+ val sendIntent: Intent = Intent().apply {
+ action = Intent.ACTION_SEND
+ data = Uri.parse("mailto:")
+ putExtra(Intent.EXTRA_SUBJECT, subject)
+ putExtra(Intent.EXTRA_TEXT, text)
+ putExtra(Intent.EXTRA_EMAIL, arrayOf(email))
+ type = "message/rfc822"
+ }
+
+ val shareIntent = Intent.createChooser(sendIntent, null)
+ context.startActivity(shareIntent)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/information/view/InformationActivity.kt b/app/src/main/java/es/gob/radarcovid/features/information/view/InformationActivity.kt
new file mode 100644
index 00000000..87265e8e
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/information/view/InformationActivity.kt
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.information.view
+
+import android.annotation.SuppressLint
+import android.bluetooth.BluetoothAdapter
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import androidx.core.content.ContextCompat
+import es.gob.radarcovid.BuildConfig
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.base.BaseBackNavigationActivity
+import es.gob.radarcovid.common.base.Constants
+import es.gob.radarcovid.common.extensions.*
+import es.gob.radarcovid.features.information.protocols.InformationPresenter
+import es.gob.radarcovid.features.information.protocols.InformationView
+import kotlinx.android.synthetic.main.activity_information.*
+import kotlinx.android.synthetic.main.layout_back_navigation.*
+import java.util.*
+import javax.inject.Inject
+
+
+class InformationActivity : BaseBackNavigationActivity(), InformationView {
+
+ companion object {
+
+ fun open(context: Context) {
+ context.startActivity(Intent(context, InformationActivity::class.java))
+ }
+
+ }
+
+ @Inject
+ lateinit var presenter: InformationPresenter
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_information)
+
+ initViews()
+ presenter.viewReady()
+ }
+
+ override fun onResume() {
+ super.onResume()
+ presenter.onResume()
+ }
+
+ override fun showHelpDialog() {
+ InformationDialog(this).show()
+ }
+
+ override fun showRadarEnabled(isRadarEnabled: Boolean) {
+ if (isRadarEnabled) {
+ val activeText = labelManager.getText(
+ "ACTIVE",
+ R.string.active
+ ).toString()
+ textViewRadarStatus.text = activeText
+ textViewNotificationStatus.text = activeText
+ textViewRadarStatus.setTextColor(ContextCompat.getColor(this, R.color.green_53))
+ textViewNotificationStatus.setTextColor(ContextCompat.getColor(this, R.color.green_53))
+ imageViewRadarStatus.setImageResource(R.drawable.ic_active)
+ imageViewNotificationStatus.setImageResource(R.drawable.ic_active)
+ } else {
+ val inactiveText = labelManager.getText(
+ "INACTIVE",
+ R.string.inactive
+ ).toString()
+ textViewRadarStatus.text = inactiveText
+ textViewNotificationStatus.text = inactiveText
+ textViewRadarStatus.setTextColor(ContextCompat.getColor(this, R.color.red_00))
+ textViewNotificationStatus.setTextColor(ContextCompat.getColor(this, R.color.red_00))
+ imageViewRadarStatus.setImageResource(R.drawable.ic_inactive)
+ imageViewNotificationStatus.setImageResource(R.drawable.ic_inactive)
+ }
+ }
+
+ override fun showLastUpdateDate(date: Date, daysElapsed: Int, locale: String) {
+
+ if (date.time != 0L) {
+ val dateText = labelManager.getText(
+ "INFO_DATE_FORMAT",
+ R.string.information_date_format
+ ).toString()
+ .replaceFirst("\$D", date.getDayString())
+ .replaceFirst("\$M", date.geMonthName(locale))
+ .replaceFirst("\$Y", date.getYearString())
+ .replaceFirst("\$H", date.getHourString())
+ textViewTitleSyncDate.text = dateText
+
+ val labelId =
+ when (daysElapsed) {
+ 0 -> "INFO_LAST_SYNC_UPDATE"
+ 1 -> "INFO_LAST_SYNC_ONE_DAY"
+ else -> "INFO_LAST_SYNC_ANYMORE"
+ }
+ textViewSyncStatus.text = labelManager.getFormattedText(
+ labelId,
+ daysElapsed.toString()
+ ).default(getString(R.string.information_last_sync_one_day))
+
+ if (daysElapsed > 1) {
+ textViewSyncStatus.setTextColor(ContextCompat.getColor(this, R.color.red_00))
+ imageViewSyncStatus.setImageResource(R.drawable.ic_inactive)
+ }
+
+ } else {
+ val dateText = labelManager.getText(
+ "INFO_LAST_NO_SYNC_UPDATE",
+ R.string.information_no_last_update
+ ).toString()
+ textViewTitleSyncDate.text = "--"
+ textViewSyncStatus.text = dateText
+ textViewSyncStatus.setTextColor(ContextCompat.getColor(this, R.color.blue_E2))
+ imageViewSyncStatus.setImageResource(R.drawable.ic_warning)
+ }
+
+
+ }
+
+ override fun showBluetoothEnabled() {
+ val isBluetoothEnabled =
+ BluetoothAdapter.getDefaultAdapter()?.isEnabled ?: false
+ if (isBluetoothEnabled) {
+ textViewBluetoothStatus.text = labelManager.getText(
+ "ACTIVE",
+ R.string.active
+ ).toString()
+ textViewBluetoothStatus.setTextColor(ContextCompat.getColor(this, R.color.green_53))
+ imageViewBluetoothStatus.setImageResource(R.drawable.ic_active)
+ } else {
+ textViewBluetoothStatus.text = labelManager.getText(
+ "INACTIVE",
+ R.string.inactive
+ ).toString()
+ textViewBluetoothStatus.setTextColor(ContextCompat.getColor(this, R.color.red_00))
+ imageViewBluetoothStatus.setImageResource(R.drawable.ic_inactive)
+ }
+ }
+
+
+ @SuppressLint("SetTextI18n")
+ override fun showTerminalData(locale: String) {
+ textViewVersion.text = BuildConfig.VERSION_NAME
+ textViewSO.text = "${Constants.SO_NAME} ${Build.VERSION.RELEASE}"
+ textViewModel.text = "${Build.MANUFACTURER} ${Build.MODEL}"
+
+ val packageManager: PackageManager = packageManager
+ val lastUpadateDate = Date(packageManager.getPackageInfo(packageName, 0).lastUpdateTime)
+ val dateText = labelManager.getText(
+ "INFO_DATE_FORMAT",
+ R.string.information_date_format
+ ).toString()
+ .replaceFirst("\$D", lastUpadateDate.getDayString())
+ .replaceFirst("\$M", lastUpadateDate.geMonthName(locale))
+ .replaceFirst("\$Y", lastUpadateDate.getYearString())
+ .replaceFirst("\$H", lastUpadateDate.getHourString())
+ textViewUpdateDate.text = dateText
+ }
+
+ private fun initViews() {
+ buttonMaintenance.setSafeOnClickListener {
+ presenter.onHelpButtonClick()
+ }
+ buttonSupportMail.setSafeOnClickListener {
+ val mail = labelManager.getText(
+ "INFO_TECHNICAL_HELP_EMAIL",
+ getString(R.string.information_email_help)
+ ).toString()
+ val message = labelManager.getFormattedTextHtml(
+ "INFO_SUPPORT_MAIL",
+ getString(R.string.information_support_mail),
+ textViewRadarStatus.text.toString(),
+ textViewNotificationStatus.text.toString(),
+ textViewBluetoothStatus.text.toString(),
+ textViewTitleSyncDate.text.toString(),
+ textViewVersion.text.toString(),
+ textViewUpdateDate.text.toString(),
+ textViewSO.text.toString(),
+ textViewModel.text.toString()
+ ).toString()
+ presenter.onSupportMailClick(message, "", mail)
+ }
+ imageButtonBack.contentDescription =
+ "${labelManager.getText("SETTINGS_TITLE", R.string.title_home)} ${
+ labelManager.getText(
+ "ACC_BUTTON_BACK_TO",
+ R.string.navigation_back_to
+ )
+ }"
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/information/view/InformationDialog.kt b/app/src/main/java/es/gob/radarcovid/features/information/view/InformationDialog.kt
new file mode 100644
index 00000000..a9718fc7
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/information/view/InformationDialog.kt
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.information.view
+
+import android.app.AlertDialog
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import dagger.android.HasAndroidInjector
+import es.gob.radarcovid.R
+import es.gob.radarcovid.datamanager.utils.LabelManager
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.dialog_information.*
+import javax.inject.Inject
+
+class InformationDialog(context: Context) : LayoutContainer {
+
+ private val dialog: Dialog
+
+ override val containerView: View =
+ LayoutInflater.from(context).inflate(R.layout.dialog_information, null)
+
+ @Inject
+ lateinit var labelManager: LabelManager
+
+ init {
+ initializeInjector(context)
+
+ dialog = AlertDialog.Builder(context)
+ .setView(containerView)
+ .create()
+ .apply {
+ window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+ }
+
+ buttonClose.setOnClickListener { dialog.dismiss() }
+ buttonCancel.setOnClickListener { dialog.dismiss() }
+
+ setImageContentDescription()
+ }
+
+ fun show() {
+ dialog.show()
+ dialog.window?.setLayout(
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT
+ )
+ }
+
+ private fun initializeInjector(context: Context) {
+ (context.applicationContext as? HasAndroidInjector)?.androidInjector()?.inject(this)
+ }
+
+ private fun setImageContentDescription() {
+ val imageDescription = labelManager.getText(
+ "ACC_IMAGE_DESCRIPTION",
+ R.string.image_desc
+ ).toString()
+
+ val imageBluetooth = labelManager.getText(
+ "INFO_HELP_BLUETOOTH_IMAGE",
+ R.string.information_popup_bluetooth_image
+ ).toString()
+ imageViewBluetooth.contentDescription = "$imageBluetooth $imageDescription"
+
+ val imageRadar = labelManager.getText(
+ "INFO_HELP_RADAR_TITLE",
+ R.string.information_popup_radar
+ ).toString()
+ imageViewRadar.contentDescription = "$imageRadar $imageDescription"
+
+ val imgGoogle = labelManager.getText(
+ "INFO_HELP_NOTIFICATIONS_STEP_2",
+ R.string.information_popup_notifications_step_2
+ ).toString().substring(2)
+ imageViewGooogle.contentDescription = "$imgGoogle $imageDescription"
+
+ val imgExposure = labelManager.getText(
+ "INFO_HELP_NOTIFICATIONS_TITLE",
+ R.string.information_popup_notifications_title
+ ).toString()
+ imageViewNotification.contentDescription = "$imgExposure $imageDescription"
+
+ val imgExposureNootification = labelManager.getText(
+ "INFO_HELP_NOTIFICATIONS_IMAGE",
+ R.string.information_popup_notifications_image
+ ).toString()
+ imageViewNotificationActive.contentDescription =
+ "$imgExposureNootification $imageDescription"
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/locale/di/LocaleSelectionModule.kt b/app/src/main/java/es/gob/radarcovid/features/locale/di/LocaleSelectionModule.kt
index 89dc5213..7347b1cc 100644
--- a/app/src/main/java/es/gob/radarcovid/features/locale/di/LocaleSelectionModule.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/locale/di/LocaleSelectionModule.kt
@@ -12,7 +12,7 @@ package es.gob.radarcovid.features.locale.di
import dagger.Module
import dagger.Provides
-import es.gob.radarcovid.common.di.scope.PerFragment
+import es.gob.radarcovid.common.di.scope.PerSubFragment
import es.gob.radarcovid.features.locale.presenter.LocaleSelectionPresenterImpl
import es.gob.radarcovid.features.locale.protocols.LocaleSelectionPresenter
import es.gob.radarcovid.features.locale.protocols.LocaleSelectionRouter
@@ -27,12 +27,12 @@ class LocaleSelectionModule {
fun providesView(fragment: LocaleSelectionFragment): LocaleSelectionView = fragment
@Provides
- @PerFragment
+ @PerSubFragment
fun providesPresenter(presenter: LocaleSelectionPresenterImpl): LocaleSelectionPresenter =
presenter
@Provides
- @PerFragment
+ @PerSubFragment
fun providesRouter(router: LocaleSelectionRouterImpl): LocaleSelectionRouter = router
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/locale/presenter/LocaleSelectionPresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/locale/presenter/LocaleSelectionPresenterImpl.kt
index a5e2efc8..606a7b9c 100644
--- a/app/src/main/java/es/gob/radarcovid/features/locale/presenter/LocaleSelectionPresenterImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/locale/presenter/LocaleSelectionPresenterImpl.kt
@@ -24,23 +24,30 @@ class LocaleSelectionPresenterImpl @Inject constructor(
) : LocaleSelectionPresenter {
private val localeInfo: LocaleInfo = getLocaleInfoUseCase.getLocaleInfo()
- private val defaultSelectedIndex: Int =
+ private val currentLanguageIndex: Int =
localeInfo.languages.indexOfFirst { it.code == getLocaleInfoUseCase.getSelectedLanguage() }
+ private var selectedLanguageIndex: Int = currentLanguageIndex
override fun viewReady() {
- view.setRegions(localeInfo.regions.map { it.name })
- view.setLanguages(localeInfo.languages.map { it.name })
- if(defaultSelectedIndex > -1)
- view.setSelectedLanguageIndex(defaultSelectedIndex)
+ if (currentLanguageIndex > -1)
+ view.setLanguage(localeInfo.languages[currentLanguageIndex].name)
}
- override fun onApplyButtonClick() {
- getLocaleInfoUseCase.setSelectedRegion(localeInfo.regions[view.getSelectedRegionIndex()].code)
- requestLabels()
+ override fun onLanguageDropdownButtonClick() {
+ selectedLanguageIndex = currentLanguageIndex
+ view.showLanguageSelectionDialog(localeInfo.languages.map { it.name }, currentLanguageIndex)
}
override fun onLanguageSelectionChange(index: Int) {
- if (isLanguageChanged())
+ selectedLanguageIndex = index
+ }
+
+ override fun onLanguagesListAcceptButtonClick(dialogDismissCallback: () -> Unit) {
+ val selectedLanguageCode = localeInfo.languages[selectedLanguageIndex].code
+ val currentLanguage = getLocaleInfoUseCase.getSelectedLanguage()
+ if (selectedLanguageCode == currentLanguage)
+ dialogDismissCallback()
+ else
view.showLanguageChangeDialog()
}
@@ -48,29 +55,10 @@ class LocaleSelectionPresenterImpl @Inject constructor(
applyLocaleSettings()
}
- override fun isLanguageChanged(): Boolean =
- defaultSelectedIndex != view.getSelectedLanguageIndex()
-
- override fun applyLocaleSettings() {
- val selectedLanguage = localeInfo.languages[view.getSelectedLanguageIndex()].code
+ private fun applyLocaleSettings() {
+ val selectedLanguage = localeInfo.languages[selectedLanguageIndex].code
getLocaleInfoUseCase.setSelectedLanguage(selectedLanguage)
router.restartApplication()
}
- override fun restoreLocaleSettings() {
- view.setSelectedLanguageIndex(defaultSelectedIndex)
- }
-
- private fun requestLabels() {
- view.showLoading()
- getLocaleInfoUseCase.getLabels(
- onSuccess = {
- view.hideLoading()
- },
- onError = {
- view.hideLoading()
- }
- )
- }
-
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/locale/protocols/Protocols.kt b/app/src/main/java/es/gob/radarcovid/features/locale/protocols/Protocols.kt
index b88f4a99..0685bd4a 100644
--- a/app/src/main/java/es/gob/radarcovid/features/locale/protocols/Protocols.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/locale/protocols/Protocols.kt
@@ -14,37 +14,24 @@ import es.gob.radarcovid.common.view.RequestView
interface LocaleSelectionView : RequestView {
- fun setRegions(regions: List)
-
- fun setSelectedRegionIndex(index: Int)
-
- fun getSelectedRegionIndex(): Int
-
- fun setLanguages(languages: List)
-
- fun setSelectedLanguageIndex(index: Int)
-
- fun getSelectedLanguageIndex(): Int
-
fun reloadLabels()
fun showLanguageChangeDialog()
+ fun showLanguageSelectionDialog(languages: List, selectedIndex: Int)
+
+ fun setLanguage(language: String)
}
interface LocaleSelectionPresenter {
fun viewReady()
- fun onApplyButtonClick()
+ fun onLanguageDropdownButtonClick()
fun onLanguageSelectionChange(index: Int)
- fun isLanguageChanged(): Boolean
-
- fun applyLocaleSettings()
-
- fun restoreLocaleSettings()
+ fun onLanguagesListAcceptButtonClick(dialogDismissCallback: () -> Unit)
fun onLocaleChangeConfirm()
diff --git a/app/src/main/java/es/gob/radarcovid/features/locale/view/LocaleSelectionFragment.kt b/app/src/main/java/es/gob/radarcovid/features/locale/view/LocaleSelectionFragment.kt
index 87ba3937..7e483cc3 100644
--- a/app/src/main/java/es/gob/radarcovid/features/locale/view/LocaleSelectionFragment.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/locale/view/LocaleSelectionFragment.kt
@@ -14,14 +14,14 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
import es.gob.radarcovid.R
import es.gob.radarcovid.common.base.BaseFragment
import es.gob.radarcovid.common.view.CMDialog
-import es.gob.radarcovid.common.view.HintSpinnerAdapter
+import es.gob.radarcovid.common.view.ListDialog
import es.gob.radarcovid.features.locale.protocols.LocaleSelectionPresenter
import es.gob.radarcovid.features.locale.protocols.LocaleSelectionView
+import es.gob.radarcovid.features.main.view.MainActivity
+import es.gob.radarcovid.features.onboarding.view.OnboardingActivity
import kotlinx.android.synthetic.main.fragment_locale_selection.*
import javax.inject.Inject
@@ -39,7 +39,12 @@ class LocaleSelectionFragment : BaseFragment(), LocaleSelectionView {
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
- return inflater.inflate(R.layout.fragment_locale_selection, container, false)
+ return if (activity is MainActivity) {
+ inflater.inflate(R.layout.fragment_locale_selection_settings, container, false)
+ } else {
+ inflater.inflate(R.layout.fragment_locale_selection, container, false)
+ }
+
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -48,42 +53,6 @@ class LocaleSelectionFragment : BaseFragment(), LocaleSelectionView {
presenter.viewReady()
}
- override fun setRegions(regions: List) {
- spinnerRegion.adapter =
- HintSpinnerAdapter(
- context!!,
- labelManager.getText(
- "LOCALE_SELECTION_REGION_DEFAULT",
- R.string.locale_selection_region_default
- ).toString(),
- R.layout.row_spinner,
- regions
- )
- }
-
- override fun setSelectedRegionIndex(index: Int) {
- spinnerRegion.setSelection(index + 1) // POSITION 0 IS THE "NON SELECTED" OPTION
- }
-
- override fun getSelectedRegionIndex(): Int =
- spinnerRegion.selectedItemPosition - 1 // POSITION 0 IS THE "NON SELECTED" OPTION
-
- override fun setLanguages(languages: List) {
- spinnerLanguage.adapter =
- ArrayAdapter(
- context!!,
- R.layout.row_spinner,
- languages
- )
- }
-
- override fun setSelectedLanguageIndex(index: Int) {
- spinnerLanguage.setSelection(index)
- }
-
- override fun getSelectedLanguageIndex(): Int =
- spinnerLanguage.selectedItemPosition
-
override fun reloadLabels() {
labelManager.reload()
}
@@ -95,7 +64,20 @@ class LocaleSelectionFragment : BaseFragment(), LocaleSelectionView {
"LOCALE_CHANGE_WARNING",
R.string.locale_selection_warning_message
).toString()
+ ).setTitle(
+ labelManager.getText(
+ "LOCALE_CHANGE_LANGUAGE",
+ R.string.locale_selection_region_title
+ ).toString()
)
+ .setNegativeButton(
+ labelManager.getText(
+ "ALERT_CANCEL_BUTTON",
+ R.string.cancel
+ ).toString()
+ ) {
+ it.dismiss()
+ }
.setPositiveButton(
labelManager.getText(
"ALERT_ACCEPT_BUTTON",
@@ -110,41 +92,53 @@ class LocaleSelectionFragment : BaseFragment(), LocaleSelectionView {
}
private fun initViews() {
- spinnerRegion.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-
- override fun onNothingSelected(parent: AdapterView<*>?) {
-
- }
-
- override fun onItemSelected(
- parent: AdapterView<*>?,
- view: View?,
- position: Int,
- id: Long
- ) {
-
- }
+ buttonLanguage.setOnClickListener {
+ presenter.onLanguageDropdownButtonClick()
}
+ }
- spinnerLanguage.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-
- override fun onNothingSelected(parent: AdapterView<*>?) {
+ override fun setLanguage(language: String) {
+ if (activity is OnboardingActivity) {
+ buttonLanguage.text = language
+ }
+ buttonLanguage.contentDescription =
+ "${labelManager.getText(
+ "ACC_BUTTON_SELECTOR_SELECT",
+ R.string.settings_change_language_desc
+ )} $language"
+ }
+ override fun showLanguageSelectionDialog(languages: List, selectedIndex: Int) {
+ ListDialog.Builder(context!!)
+ .setTitle(
+ labelManager.getText(
+ "SETTINGS_LANGUAGE_TITLE",
+ R.string.settings_language_title
+ ).toString()
+ )
+ .setPositiveButton(
+ labelManager.getText(
+ "ALERT_ACCEPT_BUTTON",
+ R.string.accept
+ ).toString()
+ ) {
+ presenter.onLanguagesListAcceptButtonClick {
+ it.dismiss()
+ }
}
-
- override fun onItemSelected(
- parent: AdapterView<*>?,
- view: View?,
- position: Int,
- id: Long
+ .setNegativeButton(
+ labelManager.getText(
+ "ALERT_CANCEL_BUTTON",
+ R.string.accept
+ ).toString()
) {
+ it.dismiss()
+ }.setItems(languages, selectedIndex) { _, position ->
presenter.onLanguageSelectionChange(position)
}
-
- }
+ .build()
+ .show()
}
- fun restoreLocaleSettings() = presenter.restoreLocaleSettings()
-
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/main/presenter/MainPresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/main/presenter/MainPresenterImpl.kt
index 716c018a..e9aec77f 100644
--- a/app/src/main/java/es/gob/radarcovid/features/main/presenter/MainPresenterImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/main/presenter/MainPresenterImpl.kt
@@ -10,38 +10,108 @@
package es.gob.radarcovid.features.main.presenter
-import es.gob.radarcovid.datamanager.usecase.MainUseCase
+import es.gob.radarcovid.datamanager.repository.PreferencesRepository
+import es.gob.radarcovid.datamanager.usecase.*
import es.gob.radarcovid.features.main.protocols.MainPresenter
import es.gob.radarcovid.features.main.protocols.MainRouter
import es.gob.radarcovid.features.main.protocols.MainView
+import es.gob.radarcovid.models.domain.ExposureInfo
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.schedulers.Schedulers
import javax.inject.Inject
class MainPresenterImpl @Inject constructor(
private val view: MainView,
private val router: MainRouter,
- private val mainUseCase: MainUseCase
+ private val mainUseCase: MainUseCase,
+ private val getReminderTimeUseCase: GetReminderTimeUseCase,
+ private val sendAnalyticsUseCase: SendAnalyticsUseCase,
+ private val getLocaleInfoUseCase: GetLocaleInfoUseCase,
+ private val venueRecordUseCase: VenueRecordUseCase,
+ private val exposureInfoUseCase: ExposureInfoUseCase,
+ private val preferencesRepository: PreferencesRepository
) : MainPresenter {
- override fun viewReady(activateRadar: Boolean) {
- router.navigateToHome(activateRadar)
+ override fun onCreate(activateRadar: Boolean, capturedQR: String?) {
+
+ //Setup workers
+ view.cancelNotificationReminder()
+ view.startAnalyticsWorker(sendAnalyticsUseCase.getAnalyticsPeriod())
+
+ /*
+ if (exposureInfoUseCase.getExposureInfo().level != ExposureInfo.Level.INFECTED) {
+ //Start QR matcher worker only if no infected
+ view.startVenueMatcherWorker(preferencesRepository.getTroubledPlaceCheckTime())
+ } else {
+ view.cancelVenueMatcherWorker()
+ }
+ */
+
+ //Redirection logic
+ if (getLocaleInfoUseCase.isLanguageChanged()) {
+ //Redirect to settings when language changed
+ getLocaleInfoUseCase.resetLanguageChanged()
+ view.setSettingSelected()
+ router.navigateToSettings()
+ } else if (venueRecordUseCase.isCurrentVenue()) {
+ //Redirect to venue record when record in progress
+ router.navigateToVenueRecord(true)
+ } else if (!capturedQR.isNullOrEmpty()) {
+ //Redirect to venue record when qr scanned
+ view.setVenueHomeSelected()
+ router.navigateToVenueRecordWithQR(capturedQR)
+ } else {
+ //Home redirection
+ router.navigateToHome(activateRadar, false, false)
+ }
+ }
+
+ override fun onResume(isVenueRecordSelected: Boolean, isHomeSelected: Boolean) {
+ Observable.fromCallable { mainUseCase.syncExposureInfo() }
+ .subscribeOn(Schedulers.io())
+ .subscribe()
+ updateMenuIcon()
+ if (venueRecordUseCase.isCurrentVenue() && (isVenueRecordSelected || isHomeSelected)) {
+ //navigate to home
+ view.setHomeSelected()
+ router.navigateToHome(activateRadar = false, manualNavigation = true, backFromQr = true)
+ } else if (isVenueRecordSelected) {
+ router.navigateToVenueRecord(false)
+ }
+ }
+
+ override fun onStop() {
+ view.createNotificationReminder(getReminderTimeUseCase.getReminderTime())
}
- override fun onResume() {
- mainUseCase.syncExposureInfo()
+ override fun onRestart() {
+ view.cancelNotificationReminder()
}
override fun onHomeButtonClick() {
- router.navigateToHome(false)
+ router.navigateToHome(activateRadar = false, manualNavigation = true, backFromQr = false)
}
override fun onProfileButtonClick() {
router.navigateToProfile()
}
+ override fun onVenueButtonClick() {
+ router.navigateToVenueRecord(venueRecordUseCase.isCurrentVenue())
+ }
+
override fun onHelplineButtonClick() {
router.navigateToHelpline()
}
+ override fun onStatsButtonClick() {
+ router.navigateToStats()
+ }
+
+ override fun onSettingsButtonClick() {
+ router.navigateToSettings()
+ }
+
override fun onBackPressed() {
view.showExitConfirmationDialog()
}
@@ -50,4 +120,8 @@ class MainPresenterImpl @Inject constructor(
view.finish()
}
+ private fun updateMenuIcon() {
+ view.updateVenueIcon(venueRecordUseCase.isCurrentVenue())
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/main/protocols/Protocols.kt b/app/src/main/java/es/gob/radarcovid/features/main/protocols/Protocols.kt
index 385464fd..4e4a5082 100644
--- a/app/src/main/java/es/gob/radarcovid/features/main/protocols/Protocols.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/main/protocols/Protocols.kt
@@ -16,22 +16,50 @@ interface MainView : RequestView {
fun showExitConfirmationDialog()
+ fun createNotificationReminder(time: Int)
+
+ fun cancelNotificationReminder()
+
+ fun startAnalyticsWorker(time: Int)
+
+ fun setSettingSelected()
+
+ fun setHomeSelected()
+
+ fun setVenueHomeSelected()
+
fun finish()
+ fun updateVenueIcon(isVenueRecordSelected: Boolean)
+
+ fun startVenueMatcherWorker(time: Int)
+
+ fun cancelVenueMatcherWorker()
+
}
interface MainPresenter {
- fun viewReady(activateRadar: Boolean)
+ fun onCreate(activateRadar: Boolean, capturedQR: String?)
- fun onResume()
+ fun onResume(isVenueRecordSelected: Boolean, isHomeSelected: Boolean)
+
+ fun onStop()
+
+ fun onRestart()
fun onHomeButtonClick()
-
+
fun onProfileButtonClick()
+ fun onVenueButtonClick()
+
fun onHelplineButtonClick()
+ fun onStatsButtonClick()
+
+ fun onSettingsButtonClick()
+
fun onBackPressed()
fun onExitConfirmed()
@@ -40,10 +68,17 @@ interface MainPresenter {
interface MainRouter {
- fun navigateToHome(activateRadar: Boolean)
+ fun navigateToHome(activateRadar: Boolean, manualNavigation: Boolean, backFromQr: Boolean)
fun navigateToProfile()
fun navigateToHelpline()
+ fun navigateToStats()
+
+ fun navigateToSettings()
+
+ fun navigateToVenueRecord(recordInProgress: Boolean)
+
+ fun navigateToVenueRecordWithQR(capturedQR: String)
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/main/router/MainRouterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/main/router/MainRouterImpl.kt
index 461b9f79..5595c3cf 100644
--- a/app/src/main/java/es/gob/radarcovid/features/main/router/MainRouterImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/main/router/MainRouterImpl.kt
@@ -16,15 +16,19 @@ import es.gob.radarcovid.features.helpline.view.HelplineFragment
import es.gob.radarcovid.features.home.view.HomeFragment
import es.gob.radarcovid.features.main.protocols.MainRouter
import es.gob.radarcovid.features.mydata.view.MyDataFragment
+import es.gob.radarcovid.features.settings.view.SettingsFragment
+import es.gob.radarcovid.features.stats.view.StatsFragment
+import es.gob.radarcovid.features.venue.view.VenueFragment
+import es.gob.radarcovid.features.venuerecord.view.VenueRecordActivity
import javax.inject.Inject
class MainRouterImpl @Inject constructor(private val activity: AppCompatActivity) : MainRouter {
- override fun navigateToHome(activateRadar: Boolean) {
+ override fun navigateToHome(activateRadar: Boolean, manualNavigation: Boolean, backFromQr: Boolean) {
activity
.supportFragmentManager
.beginTransaction()
- .replace(R.id.wrapperContent, HomeFragment.newInstance(activateRadar))
+ .replace(R.id.wrapperContent, HomeFragment.newInstance(activateRadar, manualNavigation, backFromQr))
.commit()
}
@@ -44,4 +48,36 @@ class MainRouterImpl @Inject constructor(private val activity: AppCompatActivity
.commit()
}
+ override fun navigateToStats() {
+ activity
+ .supportFragmentManager
+ .beginTransaction()
+ .replace(R.id.wrapperContent, StatsFragment.newInstance())
+ .commit()
+ }
+
+ override fun navigateToSettings() {
+ activity
+ .supportFragmentManager
+ .beginTransaction()
+ .replace(R.id.wrapperContent, SettingsFragment.newInstance())
+ .commit()
+ }
+
+ override fun navigateToVenueRecord(recordInProgress: Boolean) {
+ if (recordInProgress) {
+ VenueRecordActivity.open(activity)
+ } else {
+ activity
+ .supportFragmentManager
+ .beginTransaction()
+ .replace(R.id.wrapperContent, VenueFragment.newInstance())
+ .commit()
+ }
+ }
+
+ override fun navigateToVenueRecordWithQR(capturedQR: String) {
+ VenueRecordActivity.openWithQR(activity, capturedQR)
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/main/view/ExposureHealedDialog.kt b/app/src/main/java/es/gob/radarcovid/features/main/view/ExposureHealedDialog.kt
index 76807131..6307817a 100644
--- a/app/src/main/java/es/gob/radarcovid/features/main/view/ExposureHealedDialog.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/main/view/ExposureHealedDialog.kt
@@ -50,34 +50,7 @@ class ExposureHealedDialog(context: Context) : LayoutContainer {
}
buttonClose.setOnClickListener { dialog.dismiss() }
-
- dotTextViewP1.setOnClickListener {
- navigationUtils.navigateToBrowser(
- context,
- labelManager.getText(
- "ALERT_HIGH_EXPOSURE_HEALED_BULLET_1_URL",
- R.string.low_risk_info_dialog_p1_url
- ).toString()
- )
- }
- dotTextViewP2.setOnClickListener {
- navigationUtils.navigateToBrowser(
- context,
- labelManager.getText(
- "ALERT_HIGH_EXPOSURE_HEALED_BULLET_2_URL",
- R.string.low_risk_info_dialog_p2_url
- ).toString()
- )
- }
- textViewMoreInfo.setOnClickListener {
- navigationUtils.navigateToBrowser(
- context,
- labelManager.getText(
- "ALERT_HIGH_EXPOSURE_HEALED_MORE_URL",
- R.string.low_risk_info_dialog_more_info_url
- ).toString()
- )
- }
+ imageButtonClose.setOnClickListener { dialog.dismiss() }
buttonOk.setOnClickListener { dialog.dismiss() }
diff --git a/app/src/main/java/es/gob/radarcovid/features/main/view/MainActivity.kt b/app/src/main/java/es/gob/radarcovid/features/main/view/MainActivity.kt
index c863c40f..393ec271 100644
--- a/app/src/main/java/es/gob/radarcovid/features/main/view/MainActivity.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/main/view/MainActivity.kt
@@ -10,15 +10,21 @@
package es.gob.radarcovid.features.main.view
+import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.os.Bundle
+import androidx.core.content.ContextCompat
import androidx.core.view.forEach
+import androidx.core.view.get
import es.gob.radarcovid.R
import es.gob.radarcovid.common.base.BaseActivity
import es.gob.radarcovid.common.view.CMDialog
import es.gob.radarcovid.features.main.protocols.MainPresenter
import es.gob.radarcovid.features.main.protocols.MainView
+import es.gob.radarcovid.features.worker.AnalyticsWorker
+import es.gob.radarcovid.features.worker.ReminderWorker
+import es.gob.radarcovid.features.worker.VenueMatcherWorker
import kotlinx.android.synthetic.main.activity_main.*
import org.dpppt.android.sdk.DP3T
import javax.inject.Inject
@@ -28,6 +34,7 @@ class MainActivity : BaseActivity(), MainView {
companion object {
private const val EXTRA_ACTIVATE_RADAR = "extra_activate_radar"
+ private const val EXTRA_CAPTURED_QR = "extra_captured_qr"
fun open(context: Context, activateRadar: Boolean) =
context.startActivity(Intent(context, MainActivity::class.java).apply {
@@ -35,6 +42,12 @@ class MainActivity : BaseActivity(), MainView {
putExtra(EXTRA_ACTIVATE_RADAR, activateRadar)
})
+ fun openWithQR(context: Context, capturedQR: String) =
+ context.startActivity(Intent(context, MainActivity::class.java).apply {
+ addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+ putExtra(EXTRA_CAPTURED_QR, capturedQR)
+ })
+
}
@Inject
@@ -51,12 +64,26 @@ class MainActivity : BaseActivity(), MainView {
initViews()
- presenter.viewReady(intent.getBooleanExtra(EXTRA_ACTIVATE_RADAR, false))
+ presenter.onCreate(
+ intent.getBooleanExtra(EXTRA_ACTIVATE_RADAR, false), null
+ )
}
override fun onResume() {
super.onResume()
- presenter.onResume()
+ presenter.onResume(false,
+ bottomNavigation.selectedItemId == R.id.menuItemHome
+ )
+ }
+
+ override fun onStop() {
+ presenter.onStop()
+ super.onStop()
+ }
+
+ override fun onRestart() {
+ super.onRestart()
+ presenter.onRestart()
}
private fun initViews() {
@@ -68,6 +95,10 @@ class MainActivity : BaseActivity(), MainView {
labelManager.getText("ACC_MYDATA_TITLE", R.string.title_mydata)
R.id.menuItemHelpline -> it.title =
labelManager.getText("ACC_HELPLINE_TITLE", R.string.title_helpline)
+ R.id.menuItemStats -> it.title =
+ labelManager.getText("ACC_STATS_TITLE", R.string.title_stats)
+ R.id.menuItemSettings -> it.title =
+ labelManager.getText("ACC_SETTINGS_TITLE", R.string.title_settings)
}
}
bottomNavigation.setOnNavigationItemSelectedListener {
@@ -75,9 +106,23 @@ class MainActivity : BaseActivity(), MainView {
R.id.menuItemHome -> presenter.onHomeButtonClick()
R.id.menuItemProfile -> presenter.onProfileButtonClick()
R.id.menuItemHelpline -> presenter.onHelplineButtonClick()
+ R.id.menuItemStats -> presenter.onStatsButtonClick()
+ R.id.menuItemSettings -> presenter.onSettingsButtonClick()
}
true
}
+ }
+
+ override fun setSettingSelected() {
+ bottomNavigation.selectedItemId = R.id.menuItemSettings
+ }
+
+ override fun setHomeSelected() {
+ //bottomNavigation[0].callOnClick()
+ bottomNavigation.selectedItemId = R.id.menuItemHome
+ }
+
+ override fun setVenueHomeSelected() {
}
@@ -88,6 +133,23 @@ class MainActivity : BaseActivity(), MainView {
bottomNavigation.selectedItemId = R.id.menuItemHome
}
+ @SuppressLint("ResourceType")
+ override fun updateVenueIcon(isVenueRecordSelected: Boolean) {
+ /*
+ if (isVenueRecordSelected) {
+ bottomNavigation.getOrCreateBadge(R.id.menuItemVenue).apply {
+ backgroundColor = ContextCompat.getColor(applicationContext, R.color.red_2300)
+ number = 1
+ badgeTextColor = ContextCompat.getColor(applicationContext, R.color.red_2300)
+ setContentDescriptionQuantityStringsResource(R.plurals.qr_notification)
+ }
+ } else {
+ bottomNavigation.removeBadge(R.id.menuItemVenue)
+ }
+
+ */
+ }
+
override fun showExitConfirmationDialog() {
CMDialog.Builder(this)
.setMessage(
@@ -105,10 +167,35 @@ class MainActivity : BaseActivity(), MainView {
it.dismiss()
presenter.onExitConfirmed()
}
- .setCloseButton {
+ .setNegativeButton(
+ labelManager.getText(
+ "ACC_BUTTON_CLOSE",
+ R.string.dialog_close_button_description
+ ).toString()
+ ) {
it.dismiss()
}
.build()
.show()
}
+
+ override fun startAnalyticsWorker(time: Int) {
+ AnalyticsWorker.start(this, time)
+ }
+
+ override fun startVenueMatcherWorker(time: Int) {
+ VenueMatcherWorker.set(this, time)
+ }
+
+ override fun cancelVenueMatcherWorker() {
+ VenueMatcherWorker.cancel(this)
+ }
+
+ override fun createNotificationReminder(time: Int) {
+ ReminderWorker.set(this, time)
+ }
+
+ override fun cancelNotificationReminder() {
+ ReminderWorker.cancel(this)
+ }
}
diff --git a/app/src/main/java/es/gob/radarcovid/features/mydata/di/MyDataModule.kt b/app/src/main/java/es/gob/radarcovid/features/mydata/di/MyDataModule.kt
index f4d1a84e..f923dc49 100644
--- a/app/src/main/java/es/gob/radarcovid/features/mydata/di/MyDataModule.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/mydata/di/MyDataModule.kt
@@ -16,9 +16,7 @@ import dagger.Provides
import es.gob.radarcovid.common.di.scope.PerFragment
import es.gob.radarcovid.features.mydata.presenter.MyDataPresenterImpl
import es.gob.radarcovid.features.mydata.protocols.MyDataPresenter
-import es.gob.radarcovid.features.mydata.protocols.MyDataRouter
import es.gob.radarcovid.features.mydata.protocols.MyDataView
-import es.gob.radarcovid.features.mydata.router.MyDataRouterImpl
import es.gob.radarcovid.features.mydata.view.MyDataFragment
@Module
@@ -34,8 +32,4 @@ class MyDataModule {
@PerFragment
fun providesPresenter(presenter: MyDataPresenterImpl): MyDataPresenter = presenter
- @Provides
- @PerFragment
- fun providesRouter(router: MyDataRouterImpl): MyDataRouter = router
-
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/mydata/presenter/MyDataPresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/mydata/presenter/MyDataPresenterImpl.kt
index 038dc3b2..c0c25047 100644
--- a/app/src/main/java/es/gob/radarcovid/features/mydata/presenter/MyDataPresenterImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/mydata/presenter/MyDataPresenterImpl.kt
@@ -11,23 +11,13 @@
package es.gob.radarcovid.features.mydata.presenter
import es.gob.radarcovid.features.mydata.protocols.MyDataPresenter
-import es.gob.radarcovid.features.mydata.protocols.MyDataRouter
import javax.inject.Inject
class MyDataPresenterImpl @Inject constructor(
- private val router: MyDataRouter
) : MyDataPresenter {
override fun viewReady() {
}
-
- override fun onConditionsButtonClick() {
- router.navigateToConditions()
- }
-
- override fun onPrivacyButtonClick() {
- router.navigateToPrivacyPolicy()
- }
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/mydata/protocols/Protocols.kt b/app/src/main/java/es/gob/radarcovid/features/mydata/protocols/Protocols.kt
index d6a0d4fd..db459fed 100644
--- a/app/src/main/java/es/gob/radarcovid/features/mydata/protocols/Protocols.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/mydata/protocols/Protocols.kt
@@ -16,16 +16,4 @@ interface MyDataPresenter {
fun viewReady()
- fun onConditionsButtonClick()
-
- fun onPrivacyButtonClick()
-
-}
-
-interface MyDataRouter {
-
- fun navigateToConditions()
-
- fun navigateToPrivacyPolicy()
-
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/mydata/router/MyDataRouterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/mydata/router/MyDataRouterImpl.kt
deleted file mode 100644
index 8394677a..00000000
--- a/app/src/main/java/es/gob/radarcovid/features/mydata/router/MyDataRouterImpl.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Gobierno de España
- *
- * 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 es.gob.radarcovid.features.mydata.router
-
-import androidx.fragment.app.Fragment
-import es.gob.radarcovid.common.base.Constants
-import es.gob.radarcovid.common.base.utils.NavigationUtils
-import es.gob.radarcovid.datamanager.utils.LabelManager
-import es.gob.radarcovid.features.mydata.protocols.MyDataRouter
-import javax.inject.Inject
-
-class MyDataRouterImpl @Inject constructor(
- private val fragment: Fragment,
- private val navigationUtils: NavigationUtils,
- private val labelManager: LabelManager
-) : MyDataRouter {
-
- override fun navigateToConditions() {
- navigationUtils.navigateToBrowser(
- fragment.context!!,
- labelManager.getText("USE_CONDITIONS_URL", Constants.URL_USAGE_CONDITIONS).toString()
- )
- }
-
- override fun navigateToPrivacyPolicy() {
- navigationUtils.navigateToBrowser(
- fragment.context!!,
- labelManager.getText("PRIVACY_POLICY_URL", Constants.URL_PRIVACY_POLICY).toString()
- )
- }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/mydata/view/MyDataFragment.kt b/app/src/main/java/es/gob/radarcovid/features/mydata/view/MyDataFragment.kt
index c5c822e9..106b6d23 100644
--- a/app/src/main/java/es/gob/radarcovid/features/mydata/view/MyDataFragment.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/mydata/view/MyDataFragment.kt
@@ -14,6 +14,7 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.view.accessibility.AccessibilityEvent
import es.gob.radarcovid.R
import es.gob.radarcovid.common.base.BaseFragment
import es.gob.radarcovid.features.mydata.protocols.MyDataPresenter
@@ -41,13 +42,23 @@ class MyDataFragment : BaseFragment(), MyDataView {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
- initViews()
presenter.viewReady()
}
- private fun initViews() {
- textViewConditions.setOnClickListener { presenter.onConditionsButtonClick() }
- textViewPrivacy.setOnClickListener { presenter.onPrivacyButtonClick() }
+ override fun onResume() {
+ super.onResume()
+ setAccessibilityFocus()
+ }
+
+ private fun setAccessibilityFocus() {
+ if (isAccessibilityEnabled())
+ textViewTitle.postDelayed({
+ if (textViewTitle != null) {
+ textViewTitle.isFocusable = true
+ textViewTitle.requestFocus()
+ textViewTitle.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED)
+ }
+ }, 3000)
}
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/di/LegalInfoModule.kt b/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/di/LegalInfoModule.kt
index 867fc4e8..03f9e1d3 100644
--- a/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/di/LegalInfoModule.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/di/LegalInfoModule.kt
@@ -11,14 +11,12 @@
package es.gob.radarcovid.features.onboarding.pages.legal.di
import androidx.fragment.app.Fragment
+import dagger.Module
+import dagger.Provides
import es.gob.radarcovid.features.onboarding.pages.legal.presenter.LegalInfoPresenterImpl
import es.gob.radarcovid.features.onboarding.pages.legal.protocols.LegalInfoPresenter
-import es.gob.radarcovid.features.onboarding.pages.legal.protocols.LegalInfoRouter
import es.gob.radarcovid.features.onboarding.pages.legal.protocols.LegalInfoView
-import es.gob.radarcovid.features.onboarding.pages.legal.router.LegalInfoRouterImpl
import es.gob.radarcovid.features.onboarding.pages.legal.view.LegalInfoFragment
-import dagger.Module
-import dagger.Provides
@Module
class LegalInfoModule {
@@ -32,7 +30,4 @@ class LegalInfoModule {
@Provides
fun providesPresenter(presenter: LegalInfoPresenterImpl): LegalInfoPresenter = presenter
- @Provides
- fun providesRouter(router: LegalInfoRouterImpl): LegalInfoRouter = router
-
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/presenter/LegalInfoPresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/presenter/LegalInfoPresenterImpl.kt
index 144ec417..bedd7517 100644
--- a/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/presenter/LegalInfoPresenterImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/presenter/LegalInfoPresenterImpl.kt
@@ -10,32 +10,28 @@
package es.gob.radarcovid.features.onboarding.pages.legal.presenter
+import es.gob.radarcovid.datamanager.usecase.LegalTermsUseCase
import es.gob.radarcovid.features.onboarding.pages.legal.protocols.LegalInfoPresenter
-import es.gob.radarcovid.features.onboarding.pages.legal.protocols.LegalInfoRouter
import es.gob.radarcovid.features.onboarding.pages.legal.protocols.LegalInfoView
import javax.inject.Inject
class LegalInfoPresenterImpl @Inject constructor(
private val view: LegalInfoView,
- private val router: LegalInfoRouter
+ private val legalTermsUseCase: LegalTermsUseCase
) : LegalInfoPresenter {
override fun viewReady() {
}
- override fun onConditionsButtonClick() {
- router.navigateToConditions()
- }
-
- override fun onPrivacyPolicyButtonClick() {
- router.navigateToPrivacyPolicy()
- }
-
override fun onLegalTermsCheckedChange(checked: Boolean) {
view.setContinueButtonEnabled(checked)
}
+ override fun legalTermsAccepted() {
+ legalTermsUseCase.updateLegalTermsVersionCode()
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/protocols/Protocols.kt b/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/protocols/Protocols.kt
index cd73f953..52d20115 100644
--- a/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/protocols/Protocols.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/protocols/Protocols.kt
@@ -22,18 +22,8 @@ interface LegalInfoPresenter {
fun viewReady()
- fun onConditionsButtonClick()
-
- fun onPrivacyPolicyButtonClick()
-
fun onLegalTermsCheckedChange(checked: Boolean)
-}
-
-interface LegalInfoRouter {
-
- fun navigateToConditions()
-
- fun navigateToPrivacyPolicy()
+ fun legalTermsAccepted()
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/router/LegalInfoRouterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/router/LegalInfoRouterImpl.kt
deleted file mode 100644
index 952ad581..00000000
--- a/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/router/LegalInfoRouterImpl.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2020 Gobierno de España
- *
- * 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 es.gob.radarcovid.features.onboarding.pages.legal.router
-
-import androidx.fragment.app.Fragment
-import es.gob.radarcovid.common.base.Constants
-import es.gob.radarcovid.common.base.utils.NavigationUtils
-import es.gob.radarcovid.datamanager.utils.LabelManager
-import es.gob.radarcovid.features.onboarding.pages.legal.protocols.LegalInfoRouter
-import javax.inject.Inject
-
-
-class LegalInfoRouterImpl @Inject constructor(
- private val fragment: Fragment,
- private val navigationUtils: NavigationUtils,
- private val labelManager: LabelManager
-) : LegalInfoRouter {
-
- override fun navigateToConditions() {
- navigationUtils.navigateToBrowser(
- fragment.context!!,
- labelManager.getText("USE_CONDITIONS_URL", Constants.URL_USAGE_CONDITIONS).toString()
- )
- }
-
- override fun navigateToPrivacyPolicy() {
- navigationUtils.navigateToBrowser(
- fragment.context!!,
- labelManager.getText("PRIVACY_POLICY_URL", Constants.URL_PRIVACY_POLICY).toString()
- )
- }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/view/LegalInfoFragment.kt b/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/view/LegalInfoFragment.kt
index d4945035..ba2ca845 100644
--- a/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/view/LegalInfoFragment.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/legal/view/LegalInfoFragment.kt
@@ -51,14 +51,18 @@ class LegalInfoFragment : BaseFragment(), LegalInfoView {
private fun initViews() {
checkBoxTermsAndConditions.setOnCheckedChangeListener { _, isChecked ->
presenter.onLegalTermsCheckedChange(
- isChecked
+ isChecked && checkBoxUsageConditions.isChecked
)
}
- textViewPrivacyPolicy.setOnClickListener { presenter.onPrivacyPolicyButtonClick() }
- textViewUsageConditions.setOnClickListener { presenter.onConditionsButtonClick() }
+ checkBoxUsageConditions.setOnCheckedChangeListener { _, isChecked ->
+ presenter.onLegalTermsCheckedChange(
+ isChecked && checkBoxTermsAndConditions.isChecked
+ )
+ }
buttonAccept.setOnClickListener {
+ presenter.legalTermsAccepted()
(activity as? OnboardingPageCallback)?.onContinueButtonClick(
1
)
diff --git a/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/welcome/protocols/Protocols.kt b/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/welcome/protocols/Protocols.kt
index c6d4c604..bb1f6464 100644
--- a/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/welcome/protocols/Protocols.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/welcome/protocols/Protocols.kt
@@ -11,9 +11,7 @@
package es.gob.radarcovid.features.onboarding.pages.welcome.protocols
interface WelcomeView {
-
- fun restorePreviousLanguage()
-
+
fun performContinueButtonClick()
fun finish()
diff --git a/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/welcome/view/WelcomeFragment.kt b/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/welcome/view/WelcomeFragment.kt
index d2143dc4..f9248559 100644
--- a/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/welcome/view/WelcomeFragment.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/onboarding/pages/welcome/view/WelcomeFragment.kt
@@ -16,7 +16,6 @@ import android.view.View
import android.view.ViewGroup
import es.gob.radarcovid.R
import es.gob.radarcovid.common.base.BaseFragment
-import es.gob.radarcovid.features.locale.view.LocaleSelectionFragment
import es.gob.radarcovid.features.onboarding.pages.welcome.protocols.WelcomePresenter
import es.gob.radarcovid.features.onboarding.pages.welcome.protocols.WelcomeView
import es.gob.radarcovid.features.onboarding.view.OnboardingPageCallback
@@ -50,12 +49,6 @@ class WelcomeFragment : BaseFragment(), WelcomeView {
buttonContinue.setOnClickListener { presenter.onContinueButtonClick() }
}
- override fun restorePreviousLanguage() {
- (childFragmentManager
- .findFragmentById(R.id.fragmentLocaleSelection) as LocaleSelectionFragment)
- .restoreLocaleSettings()
- }
-
override fun performContinueButtonClick() {
(activity as? OnboardingPageCallback)?.onContinueButtonClick(0)
}
diff --git a/app/src/main/java/es/gob/radarcovid/features/onboarding/presenter/OnboardingPresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/onboarding/presenter/OnboardingPresenterImpl.kt
index 5dd2743a..5b21ef62 100644
--- a/app/src/main/java/es/gob/radarcovid/features/onboarding/presenter/OnboardingPresenterImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/onboarding/presenter/OnboardingPresenterImpl.kt
@@ -10,6 +10,7 @@
package es.gob.radarcovid.features.onboarding.presenter
+import es.gob.radarcovid.datamanager.usecase.GetLocaleInfoUseCase
import es.gob.radarcovid.features.onboarding.protocols.OnboardingPresenter
import es.gob.radarcovid.features.onboarding.protocols.OnboardingRouter
import es.gob.radarcovid.features.onboarding.protocols.OnboardingView
@@ -17,11 +18,12 @@ import javax.inject.Inject
class OnboardingPresenterImpl @Inject constructor(
private val view: OnboardingView,
- private val router: OnboardingRouter
+ private val router: OnboardingRouter,
+ private val getLocaleInfoUseCase: GetLocaleInfoUseCase
) : OnboardingPresenter {
override fun viewReady() {
-
+ getLocaleInfoUseCase.resetLanguageChanged()
}
override fun onExitConfirmed() {
diff --git a/app/src/main/java/es/gob/radarcovid/features/onboarding/view/OnboardingActivity.kt b/app/src/main/java/es/gob/radarcovid/features/onboarding/view/OnboardingActivity.kt
index 151a8688..77148a95 100644
--- a/app/src/main/java/es/gob/radarcovid/features/onboarding/view/OnboardingActivity.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/onboarding/view/OnboardingActivity.kt
@@ -109,7 +109,14 @@ class OnboardingActivity : BaseActivity(), OnboardingView, OnboardingPageCallbac
it.dismiss()
presenter.onExitConfirmed()
}
- .setCloseButton { it.dismiss() }
+ .setNegativeButton(
+ labelManager.getText(
+ "ACC_BUTTON_CLOSE",
+ R.string.dialog_close_button_description
+ ).toString()
+ ) {
+ it.dismiss()
+ }
.build()
.show()
}
diff --git a/app/src/main/java/es/gob/radarcovid/features/qrcodescan/di/QRScanModule.kt b/app/src/main/java/es/gob/radarcovid/features/qrcodescan/di/QRScanModule.kt
new file mode 100644
index 00000000..6c971704
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/qrcodescan/di/QRScanModule.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.qrcodescan.di
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import es.gob.radarcovid.common.di.scope.PerActivity
+import es.gob.radarcovid.features.qrcodescan.presenter.QRScanPresenterImpl
+import es.gob.radarcovid.features.qrcodescan.protocols.ScanQRPresenter
+import es.gob.radarcovid.features.qrcodescan.protocols.ScanQRView
+import es.gob.radarcovid.features.qrcodescan.view.QRScanActivity
+
+@Module
+class QRScanModule {
+
+ @Provides
+ fun providesContext(activity: QRScanActivity): Context = activity
+
+ @Provides
+ fun providesView(activity: QRScanActivity): ScanQRView = activity
+
+ @Provides
+ @PerActivity
+ fun providesPresenter(presenter: QRScanPresenterImpl): ScanQRPresenter = presenter
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/qrcodescan/presenter/QRScanPresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/qrcodescan/presenter/QRScanPresenterImpl.kt
new file mode 100644
index 00000000..35565856
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/qrcodescan/presenter/QRScanPresenterImpl.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.qrcodescan.presenter
+
+import es.gob.radarcovid.features.qrcodescan.protocols.ScanQRPresenter
+import es.gob.radarcovid.features.qrcodescan.protocols.ScanQRView
+import javax.inject.Inject
+
+class QRScanPresenterImpl @Inject constructor(
+ private val view: ScanQRView
+) : ScanQRPresenter {
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/models/response/ResponseUuid.kt b/app/src/main/java/es/gob/radarcovid/features/qrcodescan/protocols/Protocols.kt
similarity index 72%
rename from app/src/main/java/es/gob/radarcovid/models/response/ResponseUuid.kt
rename to app/src/main/java/es/gob/radarcovid/features/qrcodescan/protocols/Protocols.kt
index 1268ab20..4aaaa153 100644
--- a/app/src/main/java/es/gob/radarcovid/models/response/ResponseUuid.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/qrcodescan/protocols/Protocols.kt
@@ -8,6 +8,12 @@
* SPDX-License-Identifier: MPL-2.0
*/
-package es.gob.radarcovid.models.response
+package es.gob.radarcovid.features.qrcodescan.protocols
-data class ResponseUuid (val uuid:String)
\ No newline at end of file
+interface ScanQRView {
+
+}
+
+interface ScanQRPresenter {
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/qrcodescan/view/QRScanActivity.kt b/app/src/main/java/es/gob/radarcovid/features/qrcodescan/view/QRScanActivity.kt
new file mode 100644
index 00000000..dfc58eef
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/qrcodescan/view/QRScanActivity.kt
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.qrcodescan.view
+
+import android.Manifest
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.hardware.Camera
+import android.os.Bundle
+import android.view.SurfaceHolder
+import androidx.core.app.ActivityCompat
+import com.google.android.gms.vision.CameraSource
+import com.google.android.gms.vision.Detector
+import com.google.android.gms.vision.Detector.Detections
+import com.google.android.gms.vision.barcode.Barcode
+import com.google.android.gms.vision.barcode.BarcodeDetector
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.base.BaseBackNavigationActivity
+import es.gob.radarcovid.common.extensions.setAccessibilityAction
+import es.gob.radarcovid.common.extensions.setSafeOnClickListener
+import es.gob.radarcovid.features.qrcodescan.protocols.ScanQRView
+import kotlinx.android.synthetic.main.activity_qr.*
+import java.io.IOException
+
+
+@Suppress("DEPRECATION")
+class QRScanActivity : BaseBackNavigationActivity(), ScanQRView {
+
+ companion object {
+ private const val PERMISSIONS_REQUEST = 100
+ const val EXTRA_QR_RESULT = "EXTRA_QR_RESULT"
+
+ fun open(context: Context) {
+ context.startActivity(Intent(context, QRScanActivity::class.java))
+ }
+ }
+
+ private lateinit var barcodeDetector: BarcodeDetector
+
+ private lateinit var cameraSource: CameraSource
+
+ private var isFlashOn = false
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_qr)
+
+ imageButtonBack.contentDescription =
+ "${labelManager.getText("ACC_VENUE_TITLE", R.string.title_home)} ${
+ labelManager.getText(
+ "ACC_BUTTON_BACK_TO",
+ R.string.navigation_back_to
+ )
+ }"
+
+ barcodeDetector = BarcodeDetector.Builder(this)
+ .setBarcodeFormats(Barcode.QR_CODE)
+ .build()
+
+ cameraSource = CameraSource.Builder(this, barcodeDetector)
+ .setFacing(CameraSource.CAMERA_FACING_BACK)
+ .setAutoFocusEnabled(true)
+ .setRequestedPreviewSize(1600, 1024)
+ .build()
+
+ cameraSurfaceView.holder.addCallback(object : SurfaceHolder.Callback {
+ override fun surfaceCreated(holder: SurfaceHolder) {
+ try {
+ if (ActivityCompat.checkSelfPermission(
+ applicationContext,
+ Manifest.permission.CAMERA
+ ) != PackageManager.PERMISSION_GRANTED
+ ) {
+ requestPermission()
+ } else {
+ cameraSource.start(cameraSurfaceView.holder)
+ setupFlashButton(cameraSource)
+ }
+ } catch (ie: IOException) {
+ println("CAMERA SOURCE ${ie.message}")
+ }
+ }
+
+ override fun surfaceChanged(
+ holder: SurfaceHolder,
+ format: Int,
+ width: Int,
+ height: Int
+ ) {
+ }
+
+ override fun surfaceDestroyed(holder: SurfaceHolder) {
+ cameraSource.stop()
+ }
+ })
+
+ barcodeDetector.setProcessor(object : Detector.Processor {
+ override fun release() {}
+ override fun receiveDetections(detections: Detections) {
+ val barcodes = detections.detectedItems
+ if (barcodes.size() != 0) {
+ val data = barcodes.valueAt(0).displayValue
+ returnData(data)
+ }
+ }
+ })
+ }
+
+ override fun onDestroy() {
+ super.onDestroy()
+ cameraSource.release()
+ barcodeDetector.release()
+ }
+
+ private fun requestPermission() {
+ ActivityCompat.requestPermissions(
+ this,
+ arrayOf(Manifest.permission.CAMERA),
+ PERMISSIONS_REQUEST
+ )
+ }
+
+ override fun onRequestPermissionsResult(
+ requestCode: Int,
+ permissions: Array,
+ grantResults: IntArray
+ ) {
+ super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+ if (requestCode == PERMISSIONS_REQUEST) {
+ if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+ recreate()
+ } else {
+ finish()
+ }
+ }
+ }
+
+ private fun returnData(data: String?) {
+ if (data != null) {
+ val resultIntent = Intent()
+ resultIntent.putExtra(EXTRA_QR_RESULT, data)
+ setResult(RESULT_OK, resultIntent)
+ } else {
+ setResult(RESULT_CANCELED)
+ }
+ finish()
+ }
+
+ private fun setupFlashButton(cameraSource: CameraSource) {
+
+ val camera = getCamera(cameraSource)
+ if (camera != null) {
+
+ setFlashButtonAccessibility()
+ flashButton.setSafeOnClickListener {
+ try {
+ if (isFlashOn) {
+ flashButton.setBackgroundResource(R.drawable.shape_circle_border_white)
+ flashButton.setImageResource(R.drawable.ic_flash_off)
+ } else {
+ flashButton.setBackgroundResource(R.drawable.shape_circle_border_purple)
+ flashButton.setImageResource(R.drawable.ic_flash_on)
+ }
+ val param = camera.parameters
+ param.flashMode =
+ if (!isFlashOn) Camera.Parameters.FLASH_MODE_TORCH else Camera.Parameters.FLASH_MODE_OFF
+ camera.parameters = param
+ isFlashOn = !isFlashOn
+ setFlashButtonAccessibility()
+ } catch (e: Exception) {
+ }
+ }
+ }
+ }
+
+ private fun setFlashButtonAccessibility() {
+ if (isFlashOn) {
+ flashButton.contentDescription =
+ "${labelManager.getText("ACC_FLASH_ON", R.string.title_home)}"
+ flashButton.setAccessibilityAction(
+ labelManager.getText(
+ "ALERT_HOME_RADAR_OK_BUTTON",
+ R.string.title_home
+ ).toString()
+ )
+ } else {
+ flashButton.contentDescription =
+ "${labelManager.getText("ACC_FLASH_OFF", R.string.title_home)}"
+ flashButton.setAccessibilityAction(
+ labelManager.getText(
+ "ALERT_HOME_COVID_NOTIFICATION_OK_BUTTON",
+ R.string.title_home
+ ).toString()
+ )
+ }
+
+ }
+
+ private fun getCamera(cameraSource: CameraSource): Camera? {
+ val declaredFields = CameraSource::class.java.declaredFields
+
+ for (field in declaredFields) {
+ if (field.type == Camera::class.java) {
+ field.isAccessible = true
+ try {
+ return field.get(cameraSource) as Camera
+ } catch (e: IllegalAccessException) {
+ e.printStackTrace()
+ }
+
+ break
+ }
+ }
+ return null
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/settings/di/SettingsModule.kt b/app/src/main/java/es/gob/radarcovid/features/settings/di/SettingsModule.kt
new file mode 100644
index 00000000..8ad0b831
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/settings/di/SettingsModule.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.settings.di
+
+import android.content.Context
+import androidx.fragment.app.Fragment
+import dagger.Module
+import dagger.Provides
+import es.gob.radarcovid.common.di.scope.PerFragment
+import es.gob.radarcovid.features.settings.presenter.SettingsPresenterImpl
+import es.gob.radarcovid.features.settings.protocols.SettingsPresenter
+import es.gob.radarcovid.features.settings.protocols.SettingsRouter
+import es.gob.radarcovid.features.settings.protocols.SettingsView
+import es.gob.radarcovid.features.settings.router.SettingsRouterImpl
+import es.gob.radarcovid.features.settings.view.SettingsFragment
+
+@Module
+class SettingsModule {
+
+ @Provides
+ fun providesContext(fragment: SettingsFragment): Context = fragment.context!!
+
+ @Provides
+ fun providesFragment(fragment: SettingsFragment): Fragment = fragment
+
+ @Provides
+ fun providesView(fragment: SettingsFragment): SettingsView = fragment
+
+ @Provides
+ @PerFragment
+ fun providesPresenter(presenter: SettingsPresenterImpl): SettingsPresenter = presenter
+
+ @Provides
+ @PerFragment
+ fun providesRouter(router: SettingsRouterImpl): SettingsRouter = router
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/settings/presenter/SettingsPresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/settings/presenter/SettingsPresenterImpl.kt
new file mode 100644
index 00000000..210d6263
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/settings/presenter/SettingsPresenterImpl.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.settings.presenter
+
+import es.gob.radarcovid.features.settings.protocols.SettingsPresenter
+import es.gob.radarcovid.features.settings.protocols.SettingsRouter
+import javax.inject.Inject
+
+class SettingsPresenterImpl @Inject constructor(
+ private val router: SettingsRouter
+) : SettingsPresenter {
+
+ override fun viewReady() {
+
+ }
+
+ override fun onInformationClick() {
+ router.navigateToInformation()
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/datamanager/repository/DomainRepositoryImpl.kt b/app/src/main/java/es/gob/radarcovid/features/settings/protocols/Protocols.kt
similarity index 54%
rename from app/src/main/java/es/gob/radarcovid/datamanager/repository/DomainRepositoryImpl.kt
rename to app/src/main/java/es/gob/radarcovid/features/settings/protocols/Protocols.kt
index e5dde209..0cff090f 100644
--- a/app/src/main/java/es/gob/radarcovid/datamanager/repository/DomainRepositoryImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/settings/protocols/Protocols.kt
@@ -8,13 +8,18 @@
* SPDX-License-Identifier: MPL-2.0
*/
-package es.gob.radarcovid.datamanager.repository
+package es.gob.radarcovid.features.settings.protocols
-import es.gob.radarcovid.models.domain.ExposureInfo
-import javax.inject.Inject
+interface SettingsView
-class DomainRepositoryImpl @Inject constructor() : DomainRepository {
+interface SettingsPresenter {
- override var exposureInfo: ExposureInfo? = null
+ fun viewReady()
+ fun onInformationClick()
+}
+
+interface SettingsRouter {
+
+ fun navigateToInformation()
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/settings/router/SettingsRouterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/settings/router/SettingsRouterImpl.kt
new file mode 100644
index 00000000..9c8a51ef
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/settings/router/SettingsRouterImpl.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.settings.router
+
+import android.content.Context
+import es.gob.radarcovid.features.information.view.InformationActivity
+import es.gob.radarcovid.features.settings.protocols.SettingsRouter
+import javax.inject.Inject
+
+class SettingsRouterImpl @Inject constructor(
+ private val context: Context
+) : SettingsRouter {
+
+ override fun navigateToInformation() = InformationActivity.open(context)
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/settings/view/SettingsFragment.kt b/app/src/main/java/es/gob/radarcovid/features/settings/view/SettingsFragment.kt
new file mode 100644
index 00000000..ed36a21b
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/settings/view/SettingsFragment.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.settings.view
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.accessibility.AccessibilityEvent
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.base.BaseFragment
+import es.gob.radarcovid.features.settings.protocols.SettingsPresenter
+import es.gob.radarcovid.features.settings.protocols.SettingsView
+import kotlinx.android.synthetic.main.fragment_settings.*
+import javax.inject.Inject
+
+class SettingsFragment : BaseFragment(), SettingsView {
+
+ companion object {
+ fun newInstance() = SettingsFragment()
+ }
+
+ @Inject
+ lateinit var presenter: SettingsPresenter
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ return inflater.inflate(R.layout.fragment_settings, container, false)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ initViews()
+ presenter.viewReady()
+ }
+
+ override fun onResume() {
+ super.onResume()
+ setAccessibilityFocus()
+ }
+
+ private fun initViews() {
+ buttonInformation.setOnClickListener { presenter.onInformationClick() }
+ }
+
+ private fun setAccessibilityFocus() {
+ if (isAccessibilityEnabled())
+ textViewTitle.postDelayed({
+ if (textViewTitle != null) {
+ textViewTitle.isFocusable = true
+ textViewTitle.requestFocus()
+ textViewTitle.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED)
+ }
+ }, 3000)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/splash/presenter/SplashPresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/splash/presenter/SplashPresenterImpl.kt
index f74c3dd6..0298787b 100644
--- a/app/src/main/java/es/gob/radarcovid/features/splash/presenter/SplashPresenterImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/splash/presenter/SplashPresenterImpl.kt
@@ -10,12 +10,18 @@
package es.gob.radarcovid.features.splash.presenter
+import android.net.Uri
import android.os.Handler
+import es.gob.radarcovid.common.base.Constants.HOST_QR_CODE
+import es.gob.radarcovid.common.base.Constants.HOST_REPORT
+import es.gob.radarcovid.common.base.Constants.INCOMING_CODE_QUERY_PARAM
+import es.gob.radarcovid.datamanager.usecase.ExposureInfoUseCase
import es.gob.radarcovid.datamanager.usecase.OnboardingCompletedUseCase
import es.gob.radarcovid.datamanager.usecase.SplashUseCase
import es.gob.radarcovid.features.splash.protocols.SplashPresenter
import es.gob.radarcovid.features.splash.protocols.SplashRouter
import es.gob.radarcovid.features.splash.protocols.SplashView
+import es.gob.radarcovid.models.domain.ExposureInfo
import es.gob.radarcovid.models.domain.InitializationData
import es.gob.radarcovid.models.exception.NetworkUnavailableException
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
@@ -26,27 +32,28 @@ class SplashPresenterImpl @Inject constructor(
private val view: SplashView,
private val router: SplashRouter,
private val onboardingCompletedUseCase: OnboardingCompletedUseCase,
- private val splashUseCase: SplashUseCase
+ private val splashUseCase: SplashUseCase,
+ private val exposureInfoUseCase: ExposureInfoUseCase
) : SplashPresenter {
private var isWaitingToStart: Boolean = false
private var isInitializationCompleted: Boolean = false
private var activateRadar: Boolean = false
+ private var deepLinkData: Uri? = null
- override fun viewReady(activateRadar: Boolean) {
+ override fun viewReady(activateRadar: Boolean, data: Uri?) {
this.activateRadar = activateRadar
+ deepLinkData = data
requestInitialization()
}
override fun onResume() {
if (isInitializationCompleted) {
- if (splashUseCase.isUuidInitialized()) {
- splashUseCase.checkGaenAvailability { available ->
- if (available)
- navigateToHomeWithDelay()
- else
- view.showPlayServicesRequiredDialog()
- }
+ splashUseCase.checkGaenAvailability { available ->
+ if (available)
+ navigateToHomeWithDelay()
+ else
+ view.showPlayServicesRequiredDialog()
}
}
}
@@ -105,13 +112,39 @@ class SplashPresenterImpl @Inject constructor(
if (!isWaitingToStart) {
isWaitingToStart = true
Handler().postDelayed({
- if (onboardingCompletedUseCase.isOnBoardingCompleted())
- router.navigateToMain(activateRadar)
- else
+ if (!onboardingCompletedUseCase.isOnBoardingCompleted())
router.navigateToOnboarding()
+ else if (deepLinkData != null)
+ urlSchemeToSection()
+ else
+ router.navigateToMain(activateRadar)
view.finish()
}, 2000)
}
}
+ private fun urlSchemeToSection() {
+ var match = false
+ when (deepLinkData?.host) {
+ HOST_REPORT -> {
+ match = true
+ val exposureInfo = exposureInfoUseCase.getExposureInfo()
+ if (exposureInfo.level == ExposureInfo.Level.INFECTED) {
+ router.navigateToMain(activateRadar)
+ } else {
+ val incomingReportCode =
+ deepLinkData?.getQueryParameter(INCOMING_CODE_QUERY_PARAM)
+ router.navigateToReport(incomingReportCode?.filter { it.isDigit() })
+ }
+ }
+ HOST_QR_CODE -> {
+ match = true
+ router.navigateToMainWithQR(deepLinkData.toString())
+ }
+
+ }
+ //Deafult if there is not match
+ if (!match) router.navigateToMain(activateRadar)
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/splash/protocols/Protocols.kt b/app/src/main/java/es/gob/radarcovid/features/splash/protocols/Protocols.kt
index 5b1a4579..db965fdf 100644
--- a/app/src/main/java/es/gob/radarcovid/features/splash/protocols/Protocols.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/splash/protocols/Protocols.kt
@@ -10,6 +10,7 @@
package es.gob.radarcovid.features.splash.protocols
+import android.net.Uri
import es.gob.radarcovid.common.view.RequestView
interface SplashView : RequestView {
@@ -28,7 +29,7 @@ interface SplashView : RequestView {
interface SplashPresenter {
- fun viewReady(activateRadar: Boolean)
+ fun viewReady(activateRadar: Boolean, data: Uri?)
fun onResume()
@@ -52,4 +53,8 @@ interface SplashRouter {
fun navigateToPlayStore()
+ fun navigateToReport(reportCode: String?)
+
+ fun navigateToMainWithQR(capturedQR: String)
+
}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/splash/router/SplashRouterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/splash/router/SplashRouterImpl.kt
index c2c6d61d..7f4f2ce7 100644
--- a/app/src/main/java/es/gob/radarcovid/features/splash/router/SplashRouterImpl.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/splash/router/SplashRouterImpl.kt
@@ -14,12 +14,12 @@ import android.content.ActivityNotFoundException
import android.content.Context
import android.content.Intent
import android.net.Uri
+import es.gob.radarcovid.features.covidreport.form.view.CovidReportActivity
import es.gob.radarcovid.features.main.view.MainActivity
import es.gob.radarcovid.features.onboarding.view.OnboardingActivity
import es.gob.radarcovid.features.splash.protocols.SplashRouter
import javax.inject.Inject
-
class SplashRouterImpl @Inject constructor(private val context: Context) : SplashRouter {
override fun navigateToPlayServicesPage() {
@@ -49,6 +49,14 @@ class SplashRouterImpl @Inject constructor(private val context: Context) : Splas
MainActivity.open(context, activateRadar)
}
+ override fun navigateToMainWithQR(capturedQR: String) {
+ MainActivity.openWithQR(context, capturedQR)
+ }
+
+ override fun navigateToReport(reportCode: String?) {
+ CovidReportActivity.open(context, reportCode)
+ }
+
override fun navigateToPlayStore() {
try {
context.startActivity(
diff --git a/app/src/main/java/es/gob/radarcovid/features/splash/view/SplashActivity.kt b/app/src/main/java/es/gob/radarcovid/features/splash/view/SplashActivity.kt
index d7fea644..a3482d2a 100644
--- a/app/src/main/java/es/gob/radarcovid/features/splash/view/SplashActivity.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/splash/view/SplashActivity.kt
@@ -46,7 +46,10 @@ class SplashActivity : BaseActivity(), SplashView {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_splash)
- presenter.viewReady(intent.getBooleanExtra(EXTRA_ACTIVATE_RADAR, false))
+ presenter.viewReady(
+ intent.getBooleanExtra(EXTRA_ACTIVATE_RADAR, false),
+ intent?.data
+ )
}
override fun onResume() {
@@ -69,10 +72,6 @@ class SplashActivity : BaseActivity(), SplashView {
R.string.warning_connection_description
).toString()
)
- .setCloseButton {
- it.dismiss()
- presenter.onNetworkDialogCloseButtonClick()
- }
.setPositiveButton(
labelManager.getText(
"ALERT_RETRY_BUTTON",
@@ -82,6 +81,15 @@ class SplashActivity : BaseActivity(), SplashView {
it.dismiss()
presenter.onNetworkRetryButtonClick()
}
+ .setNegativeButton(
+ labelManager.getText(
+ "ACC_BUTTON_CLOSE",
+ R.string.dialog_close_button_description
+ ).toString()
+ ) {
+ it.dismiss()
+ presenter.onNetworkDialogCloseButtonClick()
+ }
.build()
.apply {
show()
diff --git a/app/src/main/java/es/gob/radarcovid/features/stats/di/StatsModule.kt b/app/src/main/java/es/gob/radarcovid/features/stats/di/StatsModule.kt
new file mode 100644
index 00000000..80891a3d
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/stats/di/StatsModule.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.stats.di
+
+import androidx.fragment.app.Fragment
+import dagger.Module
+import dagger.Provides
+import es.gob.radarcovid.common.di.scope.PerActivity
+import es.gob.radarcovid.features.stats.presenter.StatsPresenterImpl
+import es.gob.radarcovid.features.stats.protocols.StatsPresenter
+import es.gob.radarcovid.features.stats.protocols.StatsView
+import es.gob.radarcovid.features.stats.view.StatsFragment
+
+@Module
+class StatsModule {
+
+ @Provides
+ fun providesFragment(fragment: StatsFragment): Fragment = fragment
+
+ @Provides
+ fun providesView(fragment: StatsFragment): StatsView = fragment
+
+ @Provides
+ @PerActivity
+ fun providesPresenter(presenter: StatsPresenterImpl): StatsPresenter = presenter
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/stats/presenter/StatsPresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/stats/presenter/StatsPresenterImpl.kt
new file mode 100644
index 00000000..2455074b
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/stats/presenter/StatsPresenterImpl.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.stats.presenter
+
+import es.gob.radarcovid.common.extensions.toDateFormat
+import es.gob.radarcovid.datamanager.usecase.GetStatsUseCase
+import es.gob.radarcovid.features.stats.protocols.StatsPresenter
+import es.gob.radarcovid.features.stats.protocols.StatsView
+import es.gob.radarcovid.models.domain.StatsRegionData
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
+import java.util.*
+import javax.inject.Inject
+
+class StatsPresenterImpl @Inject constructor(
+ private val view: StatsView,
+ private val getStatsUseCase: GetStatsUseCase
+) : StatsPresenter {
+
+ private lateinit var countries: List
+
+ override fun viewReady() {
+ requestCountries()
+ }
+
+ override fun onCountriesClick() {
+ view.showCountriesDialog(countries)
+ }
+
+ private fun requestCountries() {
+ getStatsUseCase.getStatsDataObservable()
+ .subscribeOn(Schedulers.newThread())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(
+ { onSuccess(it) },
+ { onError(it) }
+ )
+ }
+
+ private fun onSuccess(data: StatsRegionData) {
+ this.countries = data.countries.map { it.name }
+ val lastStatsDate = data.statsData.map { x -> x.date }.max() ?: Date()
+ val lastStatsData = data.statsData.find { x -> x.date == lastStatsDate }
+
+ if (lastStatsData != null) {
+ view.setDataView(
+ countries.size.toString(),
+ lastStatsDate.toDateFormat(),
+ String.format("%,d", lastStatsData.applicationsDownloads.totalAcummulated),
+ String.format("%,d", lastStatsData.communicatedContagions.totalAcummulated)
+ )
+ }
+ }
+
+ private fun onError(error: Throwable) {
+ view.showError(error, true)
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/stats/protocols/protocols.kt b/app/src/main/java/es/gob/radarcovid/features/stats/protocols/protocols.kt
new file mode 100644
index 00000000..cf89aa23
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/stats/protocols/protocols.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.stats.protocols
+
+import es.gob.radarcovid.common.view.RequestView
+
+interface StatsView : RequestView {
+
+ fun showCountriesDialog(countries: List)
+
+ fun setDataView(countries: String, date: String, downloads: String, contagions: String)
+}
+
+interface StatsPresenter {
+
+ fun viewReady()
+
+ fun onCountriesClick()
+}
+
+interface StatsRouter {
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/stats/view/StatsCountriesDialog.kt b/app/src/main/java/es/gob/radarcovid/features/stats/view/StatsCountriesDialog.kt
new file mode 100644
index 00000000..c8f637fe
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/stats/view/StatsCountriesDialog.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.stats.view
+
+import android.app.AlertDialog
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.android.HasAndroidInjector
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.view.adapter.ListAdapter
+import es.gob.radarcovid.datamanager.utils.LabelManager
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.dialog_stats_countries.*
+import javax.inject.Inject
+
+class StatsCountriesDialog(context: Context, countries: List) : LayoutContainer {
+
+ private val dialog: Dialog
+
+ override val containerView: View =
+ LayoutInflater.from(context).inflate(R.layout.dialog_stats_countries, null)
+
+ @Inject
+ lateinit var labelManager: LabelManager
+
+ init {
+ initializeInjector(context)
+
+ dialog = AlertDialog.Builder(context)
+ .setView(containerView)
+ .create()
+ .apply {
+ window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+ }
+
+ buttonClose.setOnClickListener { dialog.dismiss() }
+
+ recyclerView.setHasFixedSize(true)
+ recyclerView.layoutManager =
+ LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+ recyclerView.adapter = ListAdapter(countries)
+
+ scrollViewContent.smoothScrollTo(0, 0);
+
+ }
+
+ fun show() {
+ dialog.show()
+ dialog.window?.setLayout(
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT
+ )
+ }
+
+ private fun initializeInjector(context: Context) {
+ (context.applicationContext as? HasAndroidInjector)?.androidInjector()?.inject(this)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/stats/view/StatsFragment.kt b/app/src/main/java/es/gob/radarcovid/features/stats/view/StatsFragment.kt
new file mode 100644
index 00000000..7005b4dc
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/stats/view/StatsFragment.kt
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.stats.view
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.accessibility.AccessibilityEvent
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.base.BaseFragment
+import es.gob.radarcovid.common.extensions.default
+import es.gob.radarcovid.features.stats.protocols.StatsPresenter
+import es.gob.radarcovid.features.stats.protocols.StatsView
+import kotlinx.android.synthetic.main.fragment_stats.*
+import javax.inject.Inject
+
+class StatsFragment : BaseFragment(), StatsView {
+
+ companion object {
+ fun newInstance() = StatsFragment()
+ }
+
+ @Inject
+ lateinit var presenter: StatsPresenter
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ return inflater.inflate(R.layout.fragment_stats, container, false)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ initViews()
+
+ presenter.viewReady()
+ }
+
+ override fun onResume() {
+ super.onResume()
+ setAccessibilityFocus()
+ }
+
+ override fun showCountriesDialog(countries: List) {
+ StatsCountriesDialog(context!!, countries).show()
+ }
+
+ override fun setDataView(
+ countries: String,
+ date: String,
+ downloads: String,
+ contagions: String
+ ) {
+ textViewCountries.text = countries
+ textViewDownloads.text = downloads
+ textViewPositive.text = contagions
+ textViewUpdateData.text = labelManager.getFormattedTextHtml(
+ "STATS_UPDATE",
+ getString(R.string.stats_update_date),
+ date
+ )
+
+ }
+
+ private fun initViews() {
+ textViewCountriesLink.setOnClickListener {
+ presenter.onCountriesClick()
+ }
+ }
+
+ private fun setAccessibilityFocus() {
+ if (isAccessibilityEnabled())
+ textViewTitle.postDelayed({
+ if (textViewTitle != null) {
+ textViewTitle.isFocusable = true
+ textViewTitle.requestFocus()
+ textViewTitle.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED)
+ }
+ }, 3000)
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venue/di/VenueModule.kt b/app/src/main/java/es/gob/radarcovid/features/venue/di/VenueModule.kt
new file mode 100644
index 00000000..b1f6afa2
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venue/di/VenueModule.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venue.di
+
+import android.app.Activity
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import es.gob.radarcovid.common.di.scope.PerFragment
+import es.gob.radarcovid.features.venue.presenter.VenuePresenterImpl
+import es.gob.radarcovid.features.venue.protocols.VenuePresenter
+import es.gob.radarcovid.features.venue.protocols.VenueRouter
+import es.gob.radarcovid.features.venue.protocols.VenueView
+import es.gob.radarcovid.features.venue.router.VenueRouterImpl
+import es.gob.radarcovid.features.venue.view.VenueFragment
+
+@Module
+class VenueModule {
+
+ @Provides
+ fun providesContext(fragment: VenueFragment): Context = fragment.context!!
+
+ @Provides
+ fun providesActivity(fragment: VenueFragment): Activity = fragment.activity!!
+
+ @Provides
+ fun providesView(fragment: VenueFragment): VenueView = fragment
+
+ @Provides
+ fun providesPresenter(presenter: VenuePresenterImpl): VenuePresenter = presenter
+
+ @Provides
+ @PerFragment
+ fun providesRouter(router: VenueRouterImpl): VenueRouter = router
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venue/presenter/VenuePresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/venue/presenter/VenuePresenterImpl.kt
new file mode 100644
index 00000000..07800a54
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venue/presenter/VenuePresenterImpl.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venue.presenter
+
+import es.gob.radarcovid.datamanager.usecase.VenueRecordUseCase
+import es.gob.radarcovid.features.venue.protocols.VenuePresenter
+import es.gob.radarcovid.features.venue.protocols.VenueRouter
+import es.gob.radarcovid.features.venue.protocols.VenueView
+import javax.inject.Inject
+
+class VenuePresenterImpl @Inject constructor(
+ private val router: VenueRouter,
+ private val view: VenueView
+) : VenuePresenter {
+
+ override fun onRecordButtonClick() {
+ router.navigateToVenueRecord()
+ }
+
+ override fun onButtonPlacesClick() {
+ view.authenticateAndShowPlaces()
+ }
+
+ override fun showPlaces() {
+ router.navigateToVenuePlaces()
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venue/protocols/Protocols.kt b/app/src/main/java/es/gob/radarcovid/features/venue/protocols/Protocols.kt
new file mode 100644
index 00000000..2a422d2b
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venue/protocols/Protocols.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venue.protocols
+
+interface VenueView {
+
+ fun authenticateAndShowPlaces()
+}
+
+interface VenuePresenter {
+
+ fun onRecordButtonClick()
+
+ fun onButtonPlacesClick()
+
+ fun showPlaces()
+}
+
+interface VenueRouter {
+
+ fun navigateToVenueRecord()
+
+ fun navigateToVenuePlaces()
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venue/router/VenueRouterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/venue/router/VenueRouterImpl.kt
new file mode 100644
index 00000000..62c21838
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venue/router/VenueRouterImpl.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venue.router
+
+import android.content.Context
+import es.gob.radarcovid.features.venue.protocols.VenueRouter
+import es.gob.radarcovid.features.venuerecord.view.VenueRecordActivity
+import es.gob.radarcovid.features.venuevisited.view.VenueVisitedActivity
+import javax.inject.Inject
+
+class VenueRouterImpl @Inject constructor(
+ private val context: Context
+) : VenueRouter {
+
+ override fun navigateToVenueRecord() {
+ VenueRecordActivity.open(context)
+ }
+
+ override fun navigateToVenuePlaces() {
+ VenueVisitedActivity.open(context)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venue/view/VenueFragment.kt b/app/src/main/java/es/gob/radarcovid/features/venue/view/VenueFragment.kt
new file mode 100644
index 00000000..c2cd6e01
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venue/view/VenueFragment.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venue.view
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.accessibility.AccessibilityEvent
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricPrompt
+import androidx.core.content.ContextCompat
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.base.BaseFragment
+import es.gob.radarcovid.common.extensions.setSafeOnClickListener
+import es.gob.radarcovid.features.venue.protocols.VenuePresenter
+import es.gob.radarcovid.features.venue.protocols.VenueView
+import kotlinx.android.synthetic.main.fragment_venue_home.*
+import javax.inject.Inject
+
+class VenueFragment : BaseFragment(), VenueView {
+
+ companion object {
+ fun newInstance() = VenueFragment()
+ }
+
+ @Inject
+ lateinit var presenter: VenuePresenter
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ return inflater.inflate(R.layout.fragment_venue_home, container, false)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ initViews()
+ }
+
+ override fun onResume() {
+ super.onResume()
+ setAccessibilityFocus()
+ }
+
+ private fun initViews() {
+ buttonVenueRecord.setSafeOnClickListener { presenter.onRecordButtonClick() }
+ buttonPlaces.setSafeOnClickListener { presenter.onButtonPlacesClick() }
+ }
+
+ private fun setAccessibilityFocus() {
+ if (isAccessibilityEnabled())
+ textViewTitle.postDelayed({
+ if (textViewTitle != null) {
+ textViewTitle.isFocusable = true
+ textViewTitle.requestFocus()
+ textViewTitle.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED)
+ }
+ }, 3000)
+ }
+
+ override fun authenticateAndShowPlaces() {
+ val executor = ContextCompat.getMainExecutor(context)
+ val biometricPrompt = BiometricPrompt(requireActivity(), executor,
+ object : BiometricPrompt.AuthenticationCallback() {
+ override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+ super.onAuthenticationSucceeded(result)
+ presenter.showPlaces()
+ }
+ })
+
+ if (BiometricManager.from(requireContext())
+ .canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_WEAK or BiometricManager.Authenticators.DEVICE_CREDENTIAL) == BiometricManager.BIOMETRIC_SUCCESS
+ ) {
+ biometricPrompt.authenticate(
+ BiometricPrompt.PromptInfo.Builder()
+ .setTitle(
+ labelManager.getText(
+ "VENUE_BIOMETRIC_PROMPT_TITLE",
+ R.string.venue_biometric_prompt_tittle
+ )
+ )
+ .setAllowedAuthenticators(BiometricManager.Authenticators.BIOMETRIC_WEAK or BiometricManager.Authenticators.DEVICE_CREDENTIAL)
+ .build()
+ )
+ } else {
+ presenter.showPlaces()
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/di/VenueRecordModule.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/di/VenueRecordModule.kt
new file mode 100644
index 00000000..4f270bea
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/di/VenueRecordModule.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.di
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import es.gob.radarcovid.common.di.scope.PerActivity
+import es.gob.radarcovid.features.venuerecord.presenter.VenueRecordPresenterImpl
+import es.gob.radarcovid.features.venuerecord.protocols.VenueRecordPresenter
+import es.gob.radarcovid.features.venuerecord.protocols.VenueRecordView
+import es.gob.radarcovid.features.venuerecord.view.VenueRecordActivity
+
+@Module
+class VenueRecordModule {
+
+ @Provides
+ fun providesContext(activity: VenueRecordActivity): Context = activity
+
+ @Provides
+ fun providesView(activity: VenueRecordActivity): VenueRecordView = activity
+
+ @Provides
+ @PerActivity
+ fun providesPresenter(presenter: VenueRecordPresenterImpl): VenueRecordPresenter = presenter
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkin/di/CheckInModule.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkin/di/CheckInModule.kt
new file mode 100644
index 00000000..48be0b79
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkin/di/CheckInModule.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.checkin.di
+
+import dagger.Module
+import dagger.Provides
+import es.gob.radarcovid.common.di.scope.PerFragment
+import es.gob.radarcovid.features.venuerecord.pages.checkin.presenter.CheckInPresenterImpl
+import es.gob.radarcovid.features.venuerecord.pages.checkin.protocols.CheckInPresenter
+import es.gob.radarcovid.features.venuerecord.pages.checkin.protocols.CheckInView
+import es.gob.radarcovid.features.venuerecord.pages.checkin.view.CheckInFragment
+
+@Module
+class CheckInModule {
+
+ @Provides
+ fun providesView(fragment: CheckInFragment): CheckInView = fragment
+
+ @Provides
+ @PerFragment
+ fun providesPresenter(presenter: CheckInPresenterImpl): CheckInPresenter = presenter
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkin/presenter/CheckInPresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkin/presenter/CheckInPresenterImpl.kt
new file mode 100644
index 00000000..16cacaba
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkin/presenter/CheckInPresenterImpl.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.checkin.presenter
+
+import es.gob.radarcovid.datamanager.usecase.VenueRecordUseCase
+import es.gob.radarcovid.features.venuerecord.pages.checkin.protocols.CheckInPresenter
+import es.gob.radarcovid.features.venuerecord.pages.checkin.protocols.CheckInView
+import es.gob.radarcovid.models.domain.VenueRecord
+import java.util.*
+import javax.inject.Inject
+
+class CheckInPresenterImpl @Inject constructor(
+ private val view: CheckInView,
+ private val venueRecordUseCase: VenueRecordUseCase
+) : CheckInPresenter {
+
+ private var currentVenue: VenueRecord? = null
+
+ override fun viewReady() {
+ currentVenue = venueRecordUseCase.getCurrentVenue()
+ view.setVenueData(currentVenue)
+ }
+
+ override fun getDateIn(): Date {
+
+ return currentVenue?.dateIn ?: Date()
+ }
+
+ override fun onContinueButtonClick() {
+ view.performContinueButtonClick()
+ }
+
+ override fun onCancelButtonClick() {
+ view.performCancelButtonClick()
+ }
+
+ override fun onExitButtonClick() {
+ view.onHomeButtonClick()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkin/protocols/Protocols.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkin/protocols/Protocols.kt
new file mode 100644
index 00000000..a0fb8721
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkin/protocols/Protocols.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.checkin.protocols
+
+import es.gob.radarcovid.models.domain.VenueRecord
+import java.util.*
+
+interface CheckInView {
+
+ fun performContinueButtonClick()
+
+ fun performCancelButtonClick()
+
+ fun performExitButtonClick()
+
+ fun setVenueInfo(currentVenue: VenueRecord)
+
+ fun startTimer(date: Date)
+
+ fun setVenueData(currentVenue: VenueRecord?)
+
+ fun onHomeButtonClick()
+}
+
+interface CheckInPresenter {
+
+ fun viewReady()
+
+ fun getDateIn(): Date
+
+ fun onContinueButtonClick()
+
+ fun onCancelButtonClick()
+
+ fun onExitButtonClick()
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkin/view/CheckInFragment.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkin/view/CheckInFragment.kt
new file mode 100644
index 00000000..418f5b50
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkin/view/CheckInFragment.kt
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.checkin.view
+
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.base.BaseFragment
+import es.gob.radarcovid.common.extensions.setSafeOnClickListener
+import es.gob.radarcovid.common.view.CommonDialog
+import es.gob.radarcovid.features.venuerecord.pages.checkin.protocols.CheckInPresenter
+import es.gob.radarcovid.features.venuerecord.pages.checkin.protocols.CheckInView
+import es.gob.radarcovid.features.venuerecord.presenter.VenueRecordPresenterImpl
+import es.gob.radarcovid.features.venuerecord.view.VenueRecordPageCallback
+import es.gob.radarcovid.models.domain.VenueRecord
+import kotlinx.android.synthetic.main.fragment_venue_record_checkin.*
+import java.util.*
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+
+class CheckInFragment : BaseFragment(), CheckInView {
+
+ companion object {
+
+ fun newInstance() = CheckInFragment()
+
+ }
+
+ @Inject
+ lateinit var presenter: CheckInPresenter
+
+ lateinit var mainHandler: Handler
+
+ private val updateTextTask = object : Runnable {
+ override fun run() {
+ setTime(presenter.getDateIn())
+ mainHandler.postDelayed(this, 1000)
+ }
+ }
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? = inflater.inflate(R.layout.fragment_venue_record_checkin, container, false)
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ mainHandler = Handler(Looper.getMainLooper())
+ initViews()
+ }
+
+ override fun setVenueData(currentVenue: VenueRecord?) {
+ textViewVenueName.text = currentVenue?.name
+ }
+
+ override fun onResume() {
+ super.onResume()
+ presenter.viewReady()
+ mainHandler.post(updateTextTask)
+ }
+
+ override fun onPause() {
+ super.onPause()
+ mainHandler.removeCallbacks(updateTextTask)
+ }
+
+ private fun initViews() {
+ checkinButtonBack.contentDescription =
+ "${labelManager.getText("ACC_HOME_TITLE", R.string.title_home)} ${
+ labelManager.getText(
+ "ACC_BUTTON_BACK_TO",
+ R.string.navigation_back_to
+ )
+ }"
+
+ buttonConfirm.setSafeOnClickListener { presenter.onContinueButtonClick() }
+ buttonCancel.setSafeOnClickListener { presenter.onCancelButtonClick() }
+ checkinButtonBack.setSafeOnClickListener { presenter.onExitButtonClick() }
+ }
+
+ override fun startTimer(date: Date) {
+ mainHandler.post(updateTextTask)
+ }
+
+ fun setTime(date: Date) {
+ val millisElapsed = System.currentTimeMillis() - date.time
+ val daysElapsed = TimeUnit.MILLISECONDS.toDays(millisElapsed)
+ val hoursElapsed = TimeUnit.MILLISECONDS.toHours(millisElapsed) - (daysElapsed * 24)
+ val minutesElapsed =
+ TimeUnit.MILLISECONDS.toMinutes(millisElapsed) - (hoursElapsed * 60)
+ val secondsElapsed =
+ TimeUnit.MILLISECONDS.toSeconds(millisElapsed) - (hoursElapsed * 60 * 60) - (minutesElapsed * 60)
+ textViewTime.text =
+ String.format("%02d:%02d:%02d", hoursElapsed, minutesElapsed, secondsElapsed)
+ }
+
+ override fun onHomeButtonClick() {
+ CommonDialog.Builder(this.requireContext())
+ .setTitle(
+ labelManager.getText(
+ "VENUE_RECORD_BACK_HOME_TITLE",
+ R.string.venue_record_back_home_title
+ ).toString()
+ )
+ .setMessage(
+ labelManager.getText(
+ "VENUE_RECORD_BACK_HOME_DESC",
+ R.string.venue_record_back_home_desc
+ ).toString()
+ )
+ .setPositiveButton(
+ labelManager.getText(
+ "VENUE_RECORD_BACK_HOME_BUTTON",
+ R.string.venue_record_back_home_button
+ ).toString()
+ ) {
+ it.dismiss()
+ (activity as? VenueRecordPageCallback)?.onBackButtonClick()
+ }
+ .setNegativeButton(
+ labelManager.getText(
+ "ALERT_CANCEL_BUTTON",
+ R.string.cancel
+ ).toString()
+ ) {
+ it.dismiss()
+ }
+ .setCloseButton() {
+ it.dismiss()
+ }
+ .setImage(R.drawable.ic_recording)
+ .build()
+ .show()
+ }
+
+ override fun setVenueInfo(currentVenue: VenueRecord) {
+ textViewVenueName.text = currentVenue.name
+ }
+
+ override fun performContinueButtonClick() {
+ (activity as? VenueRecordPageCallback)?.onContinueButtonClick(VenueRecordPresenterImpl.CHECK_IN_FRAGMENT)
+ }
+
+ override fun performCancelButtonClick() {
+ (activity as? VenueRecordPageCallback)?.onCancelButtonClick()
+ }
+
+ override fun performExitButtonClick() {
+ (activity as? VenueRecordPageCallback)?.onBackButtonClick()
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkout/di/CheckOutModule.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkout/di/CheckOutModule.kt
new file mode 100644
index 00000000..90e379a6
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkout/di/CheckOutModule.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.checkout.di
+
+import dagger.Module
+import dagger.Provides
+import es.gob.radarcovid.common.di.scope.PerFragment
+import es.gob.radarcovid.features.venuerecord.pages.checkout.presenter.CheckOutPresenterImpl
+import es.gob.radarcovid.features.venuerecord.pages.checkout.protocols.CheckOutPresenter
+import es.gob.radarcovid.features.venuerecord.pages.checkout.protocols.CheckOutView
+import es.gob.radarcovid.features.venuerecord.pages.checkout.view.CheckOutFragment
+
+@Module
+class CheckOutModule {
+
+ @Provides
+ fun providesView(fragment: CheckOutFragment): CheckOutView = fragment
+
+ @Provides
+ @PerFragment
+ fun providesPresenter(presenter: CheckOutPresenterImpl): CheckOutPresenter = presenter
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkout/presenter/CheckOutPresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkout/presenter/CheckOutPresenterImpl.kt
new file mode 100644
index 00000000..74e8f818
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkout/presenter/CheckOutPresenterImpl.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.checkout.presenter
+
+import es.gob.radarcovid.common.extensions.addHours
+import es.gob.radarcovid.common.extensions.addMinutes
+import es.gob.radarcovid.datamanager.usecase.VenueRecordUseCase
+import es.gob.radarcovid.features.venuerecord.pages.checkout.protocols.CheckOutPresenter
+import es.gob.radarcovid.features.venuerecord.pages.checkout.protocols.CheckOutView
+import es.gob.radarcovid.models.domain.VenueRecord
+import javax.inject.Inject
+
+enum class VenueTimeOut { NOW, OPT_30, OPT_1, OPT_2, OPT_4, OPT_5 }
+
+class CheckOutPresenterImpl @Inject constructor(
+ private val view: CheckOutView,
+ private val venueRecordUseCase: VenueRecordUseCase
+) : CheckOutPresenter {
+
+ private var currentVenue: VenueRecord? = null
+
+ override fun viewReady() {
+ currentVenue = venueRecordUseCase.getCurrentVenue()
+ view.setVenueData(currentVenue)
+ }
+
+ override fun onContinueButtonClick() {
+ view.performContinueButtonClick()
+ }
+
+ override fun onCancelButtonClick() {
+ view.performCancelButtonClick()
+ }
+
+ override fun onCloseButtonClick() {
+ view.performCloseButtonClick()
+ }
+
+ override fun onControlTimeClick() {
+ view.setButtonContinueEnabled(true)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkout/protocols/Protocols.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkout/protocols/Protocols.kt
new file mode 100644
index 00000000..d301aafb
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkout/protocols/Protocols.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.checkout.protocols
+
+import es.gob.radarcovid.features.venuerecord.pages.checkout.presenter.VenueTimeOut
+import es.gob.radarcovid.models.domain.VenueRecord
+
+interface CheckOutView {
+
+ fun performContinueButtonClick()
+
+ fun performCancelButtonClick()
+
+ fun performCloseButtonClick()
+
+ fun setVenueData(currentVenue: VenueRecord?)
+
+ fun setButtonContinueEnabled(enabled: Boolean)
+}
+
+interface CheckOutPresenter {
+
+ fun viewReady()
+
+ fun onContinueButtonClick()
+
+ fun onCancelButtonClick()
+
+ fun onCloseButtonClick()
+
+ fun onControlTimeClick()
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkout/view/CheckOutFragment.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkout/view/CheckOutFragment.kt
new file mode 100644
index 00000000..0e99103f
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/checkout/view/CheckOutFragment.kt
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.checkout.view
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.base.BaseFragment
+import es.gob.radarcovid.common.extensions.*
+import es.gob.radarcovid.features.venuerecord.pages.checkout.presenter.VenueTimeOut
+import es.gob.radarcovid.features.venuerecord.pages.checkout.protocols.CheckOutPresenter
+import es.gob.radarcovid.features.venuerecord.pages.checkout.protocols.CheckOutView
+import es.gob.radarcovid.features.venuerecord.presenter.VenueRecordPresenterImpl
+import es.gob.radarcovid.features.venuerecord.view.VenueRecordPageCallback
+import es.gob.radarcovid.models.domain.VenueRecord
+import kotlinx.android.synthetic.main.fragment_venue_record_checkout.*
+import javax.inject.Inject
+
+class CheckOutFragment : BaseFragment(), CheckOutView {
+
+ companion object {
+
+ fun newInstance() = CheckOutFragment()
+
+ }
+
+ @Inject
+ lateinit var presenter: CheckOutPresenter
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? = inflater.inflate(R.layout.fragment_venue_record_checkout, container, false)
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ initViews()
+ }
+
+ override fun onResume() {
+ super.onResume()
+ buttonCheckOut.isEnabled = segmentedControlTime.checkedRadioButtonId != -1
+ presenter.viewReady()
+ }
+
+ private fun initViews() {
+ checkoutButtonBack.contentDescription =
+ "${labelManager.getText("VENUE_RECORD_CHECKIN_TITLE", R.string.title_home)} ${
+ labelManager.getText(
+ "ACC_BUTTON_BACK_TO",
+ R.string.navigation_back_to
+ )
+ }"
+
+ buttonCheckOut.setSafeOnClickListener { presenter.onContinueButtonClick() }
+ buttonCancel.setSafeOnClickListener { presenter.onCancelButtonClick() }
+ checkoutButtonBack.setSafeOnClickListener { presenter.onCloseButtonClick() }
+ segmentedControlTime.setOnCheckedChangeListener { r, i -> presenter.onControlTimeClick() }
+ }
+
+ override fun setButtonContinueEnabled(enabled: Boolean) {
+ buttonCheckOut.isEnabled = enabled
+ }
+
+ override fun setVenueData(currentVenue: VenueRecord?) {
+ currentVenue?.let {
+ textViewVenueName.text = it.name
+ if (it.dateIn.isToday()) {
+ textViewDay.text = labelManager.getFormattedTextHtml(
+ "VENUE_RECORD_CHECKOUT_TODAY",
+ getString(R.string.venue_checkout_today),
+ String.format("%s %s", it.dateIn.getDayString(), it.dateIn.geMonthNameDefault())
+ )
+ } else {
+ textViewDay.text = labelManager.getFormattedTextHtml(
+ "VENUE_RECORD_CHECKOUT_YESTERDAY",
+ getString(R.string.venue_checkout_yesterday),
+ String.format("%s %s", it.dateIn.getDayString(), it.dateIn.geMonthNameDefault())
+ )
+ }
+
+ textViewTime.text = labelManager.getFormattedTextHtml(
+ "VENUE_RECORD_CHECKOUT_HOUR",
+ getString(R.string.venue_checkout_hour),
+ it.dateIn.getHourString()
+ )
+ }
+ }
+
+ private fun getTimeOut(): VenueTimeOut =
+ when (segmentedControlTime.checkedRadioButtonId) {
+ R.id.timeOptionNow -> VenueTimeOut.NOW
+ R.id.timeOption30 -> VenueTimeOut.OPT_30
+ R.id.timeOption1 -> VenueTimeOut.OPT_1
+ R.id.timeOption2 -> VenueTimeOut.OPT_2
+ R.id.timeOption4 -> VenueTimeOut.OPT_4
+ else -> VenueTimeOut.OPT_5
+ }
+
+ override fun performContinueButtonClick() {
+ (activity as? VenueRecordPageCallback)?.setVenueTimeOut(getTimeOut())
+ (activity as? VenueRecordPageCallback)?.onContinueButtonClick(VenueRecordPresenterImpl.CHECK_OUT_FRAGMENT)
+ }
+
+ override fun performCancelButtonClick() {
+ (activity as? VenueRecordPageCallback)?.onCancelButtonClick()
+ }
+
+ override fun performCloseButtonClick() {
+ (activity as? VenueRecordPageCallback)?.onBackButtonClick()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/confirmrecord/di/ConfirmRecordModule.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/confirmrecord/di/ConfirmRecordModule.kt
new file mode 100644
index 00000000..0558d8d8
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/confirmrecord/di/ConfirmRecordModule.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.confirmrecord.di
+
+import dagger.Module
+import dagger.Provides
+import es.gob.radarcovid.common.di.scope.PerFragment
+import es.gob.radarcovid.features.venuerecord.pages.confirmrecord.presenter.ConfirmRecordPresenterImpl
+import es.gob.radarcovid.features.venuerecord.pages.confirmrecord.protocols.ConfirmRecordPresenter
+import es.gob.radarcovid.features.venuerecord.pages.confirmrecord.protocols.ConfirmRecordView
+import es.gob.radarcovid.features.venuerecord.pages.confirmrecord.view.ConfirmRecordFragment
+
+@Module
+class ConfirmRecordModule {
+
+ @Provides
+ fun providesView(fragment: ConfirmRecordFragment): ConfirmRecordView = fragment
+
+ @Provides
+ @PerFragment
+ fun providesPresenter(presenter: ConfirmRecordPresenterImpl): ConfirmRecordPresenter = presenter
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/confirmrecord/presenter/ConfirmRecordPresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/confirmrecord/presenter/ConfirmRecordPresenterImpl.kt
new file mode 100644
index 00000000..ee75ce43
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/confirmrecord/presenter/ConfirmRecordPresenterImpl.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.confirmrecord.presenter
+
+import es.gob.radarcovid.datamanager.usecase.VenueRecordUseCase
+import es.gob.radarcovid.features.venuerecord.pages.confirmrecord.protocols.ConfirmRecordPresenter
+import es.gob.radarcovid.features.venuerecord.pages.confirmrecord.protocols.ConfirmRecordView
+import javax.inject.Inject
+
+class ConfirmRecordPresenterImpl @Inject constructor(
+ private val view: ConfirmRecordView,
+ private val venueRecordUseCase: VenueRecordUseCase
+) : ConfirmRecordPresenter {
+
+ override fun onContinueButtonClick() {
+ view.performContinueButtonClick()
+ }
+
+ override fun onCancelButtonClick() {
+ view.performCancelButtonClick()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/confirmrecord/protocols/Protocols.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/confirmrecord/protocols/Protocols.kt
new file mode 100644
index 00000000..f709da93
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/confirmrecord/protocols/Protocols.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.confirmrecord.protocols
+
+interface ConfirmRecordView {
+
+ fun performContinueButtonClick()
+
+ fun performCancelButtonClick()
+}
+
+interface ConfirmRecordPresenter {
+
+ fun onContinueButtonClick()
+
+ fun onCancelButtonClick()
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/confirmrecord/view/ConfirmRecordFragment.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/confirmrecord/view/ConfirmRecordFragment.kt
new file mode 100644
index 00000000..dd317bfd
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/confirmrecord/view/ConfirmRecordFragment.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.confirmrecord.view
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.base.BaseFragment
+import es.gob.radarcovid.common.extensions.setSafeOnClickListener
+import es.gob.radarcovid.features.venuerecord.pages.confirmrecord.protocols.ConfirmRecordPresenter
+import es.gob.radarcovid.features.venuerecord.pages.confirmrecord.protocols.ConfirmRecordView
+import es.gob.radarcovid.features.venuerecord.presenter.VenueRecordPresenterImpl
+import es.gob.radarcovid.features.venuerecord.view.VenueRecordActivity
+import es.gob.radarcovid.features.venuerecord.view.VenueRecordPageCallback
+import kotlinx.android.synthetic.main.fragment_venue_record_confirm.*
+import javax.inject.Inject
+
+class ConfirmRecordFragment : BaseFragment(), ConfirmRecordView {
+
+ companion object {
+
+ fun newInstance() = ConfirmRecordFragment()
+
+ }
+
+ @Inject
+ lateinit var presenter: ConfirmRecordPresenter
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? = inflater.inflate(R.layout.fragment_venue_record_confirm, container, false)
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ initViews()
+ }
+
+ private fun initViews() {
+ confirmButtonBack.contentDescription =
+ "${labelManager.getText("VENUE_HOME_TITLE", R.string.title_home)} ${
+ labelManager.getText(
+ "ACC_BUTTON_BACK_TO",
+ R.string.navigation_back_to
+ )
+ }"
+
+ buttonCheckIn.setSafeOnClickListener { presenter.onContinueButtonClick() }
+ buttonCancel.setSafeOnClickListener { presenter.onCancelButtonClick() }
+ }
+
+ override fun onResume() {
+ super.onResume()
+ textViewVenueName.text = (activity as? VenueRecordActivity)?.getCurrentVenueName()
+ }
+
+ override fun performContinueButtonClick() {
+ (activity as? VenueRecordPageCallback)?.onContinueButtonClick(VenueRecordPresenterImpl.CONFIRM_RECORD_FRAGMENT)
+ }
+
+ override fun performCancelButtonClick() {
+ (activity as? VenueRecordPageCallback)?.onCancelButtonClick()
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/errorcapturedcode/di/ErrorCapturedCodeModule.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/errorcapturedcode/di/ErrorCapturedCodeModule.kt
new file mode 100644
index 00000000..292faa62
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/errorcapturedcode/di/ErrorCapturedCodeModule.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.errorcapturedcode.di
+
+import dagger.Module
+import dagger.Provides
+import es.gob.radarcovid.common.di.scope.PerFragment
+import es.gob.radarcovid.features.venuerecord.pages.errorcapturedcode.presenter.ErrorCapturedCodePresenterImpl
+import es.gob.radarcovid.features.venuerecord.pages.errorcapturedcode.protocols.ErrorCapturedCodePresenter
+import es.gob.radarcovid.features.venuerecord.pages.errorcapturedcode.protocols.ErrorCapturedCodeView
+import es.gob.radarcovid.features.venuerecord.pages.errorcapturedcode.view.ErrorCapturedCodeFragment
+
+@Module
+class ErrorCapturedCodeModule {
+
+ @Provides
+ fun providesView(fragment: ErrorCapturedCodeFragment): ErrorCapturedCodeView = fragment
+
+ @Provides
+ @PerFragment
+ fun providesPresenter(presenter: ErrorCapturedCodePresenterImpl): ErrorCapturedCodePresenter = presenter
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/errorcapturedcode/presenter/ErrorCapturedCodePresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/errorcapturedcode/presenter/ErrorCapturedCodePresenterImpl.kt
new file mode 100644
index 00000000..0348768d
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/errorcapturedcode/presenter/ErrorCapturedCodePresenterImpl.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.errorcapturedcode.presenter
+
+import es.gob.radarcovid.features.venuerecord.pages.errorcapturedcode.protocols.ErrorCapturedCodePresenter
+import es.gob.radarcovid.features.venuerecord.pages.errorcapturedcode.protocols.ErrorCapturedCodeView
+import javax.inject.Inject
+
+class ErrorCapturedCodePresenterImpl @Inject constructor(
+ private val view: ErrorCapturedCodeView
+) : ErrorCapturedCodePresenter {
+
+ override fun onContinueButtonClick() {
+ view.performContinueButtonClick()
+ }
+
+ override fun onCancelButtonClick() {
+ view.performCancelButtonClick()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/errorcapturedcode/protocols/Protocols.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/errorcapturedcode/protocols/Protocols.kt
new file mode 100644
index 00000000..131845ee
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/errorcapturedcode/protocols/Protocols.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.errorcapturedcode.protocols
+
+interface ErrorCapturedCodeView {
+
+ fun performContinueButtonClick()
+
+ fun performCancelButtonClick()
+}
+
+interface ErrorCapturedCodePresenter {
+
+ fun onContinueButtonClick()
+
+ fun onCancelButtonClick()
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/errorcapturedcode/view/ErrorCapturedCodeFragment.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/errorcapturedcode/view/ErrorCapturedCodeFragment.kt
new file mode 100644
index 00000000..69961908
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/errorcapturedcode/view/ErrorCapturedCodeFragment.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.errorcapturedcode.view
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.base.BaseFragment
+import es.gob.radarcovid.common.extensions.setSafeOnClickListener
+import es.gob.radarcovid.features.venuerecord.pages.errorcapturedcode.protocols.ErrorCapturedCodePresenter
+import es.gob.radarcovid.features.venuerecord.pages.errorcapturedcode.protocols.ErrorCapturedCodeView
+import es.gob.radarcovid.features.venuerecord.presenter.QRErrorState
+import es.gob.radarcovid.features.venuerecord.presenter.VenueRecordPresenterImpl
+import es.gob.radarcovid.features.venuerecord.view.VenueRecordActivity
+import es.gob.radarcovid.features.venuerecord.view.VenueRecordPageCallback
+import kotlinx.android.synthetic.main.fragment_venue_record_errorcode.*
+import kotlinx.android.synthetic.main.fragment_venue_record_errorcode.errorButtonBack
+import javax.inject.Inject
+
+class ErrorCapturedCodeFragment : BaseFragment(), ErrorCapturedCodeView {
+
+ companion object {
+
+ fun newInstance() = ErrorCapturedCodeFragment()
+ }
+
+ @Inject
+ lateinit var presenter: ErrorCapturedCodePresenter
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? = inflater.inflate(R.layout.fragment_venue_record_errorcode, container, false)
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ initViews()
+ }
+
+ private fun initViews() {
+
+ errorButtonBack.contentDescription =
+ "${labelManager.getText("ACC_VENUE_TITLE", R.string.title_home)} ${
+ labelManager.getText(
+ "ACC_BUTTON_BACK_TO",
+ R.string.navigation_back_to
+ )
+ }"
+
+ buttonScanQR.setSafeOnClickListener { presenter.onContinueButtonClick() }
+ buttonClose.setSafeOnClickListener { presenter.onCancelButtonClick() }
+ }
+
+ override fun onResume() {
+ super.onResume()
+ setErrorMessage()
+ }
+
+ override fun performContinueButtonClick() {
+ (activity as? VenueRecordPageCallback)?.onContinueButtonClick(VenueRecordPresenterImpl.ERROR_CAPTURED_CODE_FRAGMENT)
+ }
+
+ override fun performCancelButtonClick() {
+ (activity as? VenueRecordPageCallback)?.onBackButtonClick()
+ }
+
+ private fun setErrorMessage() {
+ val error = (activity as VenueRecordActivity).errorState
+ textViewError.text =
+ when (error) {
+ QRErrorState.QR_CODE_NOT_VALID_ANYMORE -> labelManager.getText(
+ "QR_OUTDATED_ERROR",
+ R.string.venue_record_error_not_valid_anymore
+ )
+ QRErrorState.QR_CODE_NOT_YET_VALID -> labelManager.getText(
+ "QR_NOT_VALID_YET_ERROR",
+ R.string.venue_record_error_not_valid_yet
+ )
+ else -> labelManager.getText(
+ "VENUE_RECORD_ERROR_CODE_PARAGRAPH_1",
+ R.string.venue_record_error_code_desc
+ )
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/recordsuccess/di/RecordSuccessModule.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/recordsuccess/di/RecordSuccessModule.kt
new file mode 100644
index 00000000..f9e3e471
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/recordsuccess/di/RecordSuccessModule.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.recordsuccess.di
+
+import dagger.Module
+import dagger.Provides
+import es.gob.radarcovid.features.venuerecord.pages.recordsuccess.view.RecordSuccessFragment
+
+@Module
+class RecordSuccessModule {
+
+ @Provides
+ fun providesView(fragment: RecordSuccessFragment): RecordSuccessFragment = fragment
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/recordsuccess/view/RecordSuccessFragment.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/recordsuccess/view/RecordSuccessFragment.kt
new file mode 100644
index 00000000..d3203ff5
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/pages/recordsuccess/view/RecordSuccessFragment.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.pages.recordsuccess.view
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.base.BaseFragment
+import kotlinx.android.synthetic.main.fragment_venue_record_success.*
+
+class RecordSuccessFragment : BaseFragment() {
+
+ companion object {
+
+ fun newInstance() = RecordSuccessFragment()
+
+ }
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? = inflater.inflate(R.layout.fragment_venue_record_success, container, false)
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ initViews()
+ }
+
+ private fun initViews() {
+ successButtonBack.contentDescription =
+ "${labelManager.getText("ACC_VENUE_TITLE", R.string.title_home)} ${
+ labelManager.getText(
+ "ACC_BUTTON_BACK_TO",
+ R.string.navigation_back_to
+ )
+ }"
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/presenter/VenueRecordPresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/presenter/VenueRecordPresenterImpl.kt
new file mode 100644
index 00000000..c2888033
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/presenter/VenueRecordPresenterImpl.kt
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.presenter
+
+import es.gob.radarcovid.common.extensions.addMinutes
+import es.gob.radarcovid.datamanager.repository.PreferencesRepository
+import es.gob.radarcovid.datamanager.usecase.VenueRecordUseCase
+import es.gob.radarcovid.features.venuerecord.pages.checkout.presenter.VenueTimeOut
+import es.gob.radarcovid.features.venuerecord.protocols.VenueRecordPresenter
+import es.gob.radarcovid.features.venuerecord.protocols.VenueRecordView
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.crowdnotifier.android.sdk.utils.QrUtils
+import java.util.*
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+enum class QRErrorState { NO_VALID_QR_CODE, QR_CODE_NOT_YET_VALID, QR_CODE_NOT_VALID_ANYMORE }
+
+class VenueRecordPresenterImpl @Inject constructor(
+ private val view: VenueRecordView,
+ private val venueRecordUseCase: VenueRecordUseCase,
+ private val preferencesRepository: PreferencesRepository
+) : VenueRecordPresenter {
+
+ companion object {
+ const val ERROR_CAPTURED_CODE_FRAGMENT = 0
+ const val CONFIRM_RECORD_FRAGMENT = 1
+ const val CHECK_IN_FRAGMENT = 2
+ const val CHECK_OUT_FRAGMENT = 3
+ const val RECORD_SUCCESS_FRAGMENT = 4
+ }
+
+ private var qrCaptured: String = ""
+ private var venueName: String = ""
+ private lateinit var timeOut: VenueTimeOut
+
+ override fun onResume(pageIndex: Int) {
+ //Back to app after autocheckout
+ if (pageIndex == CHECK_IN_FRAGMENT && !venueRecordUseCase.isCurrentVenue()) {
+ view.exit()
+ }
+ }
+
+ override fun viewReady() {
+ if (venueRecordUseCase.isCurrentVenue()) {
+ view.showFragment(CHECK_IN_FRAGMENT)
+ } else {
+ startScan()
+ }
+ }
+
+ override fun getCurrentVenueName(): String = venueName
+
+ override fun setVenueTimeOut(venueTimeOut: VenueTimeOut) {
+ timeOut = venueTimeOut
+ }
+
+ override fun onContinueButtonClick(pageIndex: Int) {
+ when (pageIndex) {
+ ERROR_CAPTURED_CODE_FRAGMENT -> {
+ //Retry Scan
+ startScan()
+ }
+ CONFIRM_RECORD_FRAGMENT -> {
+ //do check in
+ doCheckIn()
+ }
+ CHECK_IN_FRAGMENT -> {
+ //Go to check out
+ navigateToCheckOut()
+ }
+ CHECK_OUT_FRAGMENT -> {
+ //do CheckOut
+ doCheckOut()
+ }
+ }
+ }
+
+ override fun onBackPressed(pageIndex: Int) {
+ when (pageIndex) {
+ CHECK_OUT_FRAGMENT ->
+ view.showFragment(CHECK_IN_FRAGMENT)
+ else ->
+ view.exit()
+ }
+ }
+
+ override fun onOkScan(data: String) {
+ qrCaptured = data
+ try {
+ val venueInfo = venueRecordUseCase.getVenueInfo(qrCaptured)
+ venueName = venueInfo.name
+ view.showFragment(CONFIRM_RECORD_FRAGMENT)
+ } catch (e: Exception) {
+ when (e) {
+ is QrUtils.NotYetValidException -> view.showFragmentError(QRErrorState.QR_CODE_NOT_YET_VALID)
+ is QrUtils.NotValidAnymoreException -> view.showFragmentError(QRErrorState.QR_CODE_NOT_VALID_ANYMORE)
+ else -> view.showFragmentError(QRErrorState.NO_VALID_QR_CODE)
+ }
+ }
+
+ }
+
+ override fun onErrorScan() {
+ view.showFragment(ERROR_CAPTURED_CODE_FRAGMENT)
+ }
+
+ override fun cancelRecord() {
+ venueRecordUseCase.cancelCheckIn()
+ view.cancelVenueRecordWorker()
+ }
+
+ private fun startScan() {
+ view.startQRScan()
+ }
+
+ private fun doCheckIn() {
+ venueRecordUseCase.checkIn(qrCaptured)
+ .subscribeOn(Schedulers.newThread())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(
+ { onCheckInSuccess() },
+ { onCheckInError(it) }
+ )
+ }
+
+ private fun onCheckInSuccess() {
+ view.startVenueRecordWorker(preferencesRepository.getRecordNotificationTime())
+ view.showFragment(CHECK_IN_FRAGMENT)
+ }
+
+ private fun onCheckInError(error: Throwable) {
+ view.showError(error, true)
+ }
+
+ private fun navigateToCheckOut() {
+ view.showFragment(CHECK_OUT_FRAGMENT)
+ }
+
+ private fun doCheckOut() {
+ //Calculate time out
+ val currentVenue = venueRecordUseCase.getCurrentVenue()
+
+ val minutes = when (timeOut) {
+ VenueTimeOut.OPT_30 -> 30 //Minutes
+ VenueTimeOut.OPT_1 -> 1 * 60
+ VenueTimeOut.OPT_2 -> 2 * 60
+ VenueTimeOut.OPT_4 -> 4 * 60
+ VenueTimeOut.OPT_5 -> 5 * 60
+ else -> {
+ //NOW
+ val millisElapsed =
+ System.currentTimeMillis() - (if (currentVenue?.dateIn?.time != null) currentVenue.dateIn.time else 0)
+ TimeUnit.MILLISECONDS.toMinutes(millisElapsed).toInt()
+ }
+ }
+ val dateOut = currentVenue?.dateIn?.addMinutes(minutes)
+
+ venueRecordUseCase.checkOut(dateOut ?: Date(),
+ moreFiveHours = timeOut == VenueTimeOut.OPT_5
+ )
+ .subscribeOn(Schedulers.newThread())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(
+ { onCheckOutSuccess() },
+ { onCheckOutError(it) }
+ )
+ }
+
+ private fun onCheckOutSuccess() {
+ view.cancelVenueRecordWorker()
+ view.showFragment(RECORD_SUCCESS_FRAGMENT)
+ }
+
+ private fun onCheckOutError(error: Throwable) {
+ venueRecordUseCase.cancelCheckIn()
+ view.cancelVenueRecordWorker()
+ view.showError(error, true)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/protocols/Protocols.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/protocols/Protocols.kt
new file mode 100644
index 00000000..3a0009a3
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/protocols/Protocols.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.protocols
+
+import es.gob.radarcovid.common.view.RequestView
+import es.gob.radarcovid.features.venuerecord.pages.checkout.presenter.VenueTimeOut
+import es.gob.radarcovid.features.venuerecord.presenter.QRErrorState
+
+interface VenueRecordView : RequestView {
+
+ fun startQRScan()
+
+ fun showFragment(position: Int)
+
+ fun showFragmentError(error: QRErrorState)
+
+ fun onBackButtonClick()
+
+ fun exit()
+
+ fun startVenueRecordWorker(notificationTime: Int)
+
+ fun cancelVenueRecordWorker()
+
+}
+
+interface VenueRecordPresenter {
+
+ fun onResume(pageIndex: Int)
+
+ fun viewReady()
+
+ fun getCurrentVenueName(): String
+
+ fun onContinueButtonClick(pageIndex: Int)
+
+ fun onOkScan(data: String)
+
+ fun onErrorScan()
+
+ fun cancelRecord()
+
+ fun onBackPressed(pageIndex: Int)
+
+ fun setVenueTimeOut(timeOut: VenueTimeOut)
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/view/VenueRecordActivity.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/view/VenueRecordActivity.kt
new file mode 100644
index 00000000..45ee27b8
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/view/VenueRecordActivity.kt
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.view
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.base.BaseBackNavigationActivity
+import es.gob.radarcovid.common.view.CommonDialog
+import es.gob.radarcovid.features.qrcodescan.view.QRScanActivity
+import es.gob.radarcovid.features.venuerecord.pages.checkin.view.CheckInFragment
+import es.gob.radarcovid.features.venuerecord.pages.checkout.presenter.VenueTimeOut
+import es.gob.radarcovid.features.venuerecord.pages.checkout.view.CheckOutFragment
+import es.gob.radarcovid.features.venuerecord.pages.confirmrecord.view.ConfirmRecordFragment
+import es.gob.radarcovid.features.venuerecord.pages.errorcapturedcode.view.ErrorCapturedCodeFragment
+import es.gob.radarcovid.features.venuerecord.pages.recordsuccess.view.RecordSuccessFragment
+import es.gob.radarcovid.features.venuerecord.presenter.QRErrorState
+import es.gob.radarcovid.features.venuerecord.presenter.VenueRecordPresenterImpl
+import es.gob.radarcovid.features.venuerecord.protocols.VenueRecordPresenter
+import es.gob.radarcovid.features.venuerecord.protocols.VenueRecordView
+import es.gob.radarcovid.features.worker.VenueRecordWorker
+import kotlinx.android.synthetic.main.activity_venue_record.*
+import javax.inject.Inject
+
+class VenueRecordActivity : BaseBackNavigationActivity(), VenueRecordView, VenueRecordPageCallback {
+
+ companion object {
+
+ private const val LAUNCH_QR_SCAN = 1
+ private const val QR_VERIFICATION = "qr_verification"
+
+ fun open(context: Context) {
+ context.startActivity(Intent(context, VenueRecordActivity::class.java))
+ }
+
+ fun openWithQR(context: Context, qr: String) =
+ context.startActivity(Intent(context, VenueRecordActivity::class.java).apply {
+ putExtra(QR_VERIFICATION, qr)
+ })
+
+ }
+
+ @Inject
+ lateinit var presenter: VenueRecordPresenter
+
+ var errorState: QRErrorState = QRErrorState.NO_VALID_QR_CODE
+
+ override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+ super.onActivityResult(requestCode, resultCode, data)
+ if (requestCode == LAUNCH_QR_SCAN) {
+ vibratePhone()
+ when (resultCode) {
+ Activity.RESULT_OK -> {
+ val result = data?.getStringExtra(QRScanActivity.EXTRA_QR_RESULT)
+ if (result != null) {
+ presenter.onOkScan(result)
+ }
+ }
+
+ Activity.RESULT_CANCELED -> {
+ presenter.onBackPressed(-1)
+ }
+ }
+ }
+ }
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_venue_record)
+ initViews()
+ val qr = intent.getStringExtra(QR_VERIFICATION)
+ if (qr != null) {
+ presenter.onOkScan(qr)
+ } else {
+ presenter.viewReady()
+ }
+ }
+
+ override fun onResume() {
+ super.onResume()
+ presenter.onResume(viewPager.currentItem)
+ }
+
+ override fun startQRScan() {
+ startActivityForResult(
+ Intent(this, QRScanActivity::class.java),
+ LAUNCH_QR_SCAN
+ )
+ }
+
+ override fun showFragment(position: Int) {
+ viewPager.setCurrentItem(position, false)
+ }
+
+ override fun showFragmentError(error: QRErrorState) {
+ errorState = error
+ viewPager.setCurrentItem(VenueRecordPresenterImpl.ERROR_CAPTURED_CODE_FRAGMENT, false)
+ }
+
+ fun getCurrentVenueName(): String =
+ presenter.getCurrentVenueName()
+
+ private fun initViews() {
+ viewPager.adapter = VenueRecordAdapter(this)
+ viewPager.isUserInputEnabled = false
+ viewPager.offscreenPageLimit = 5
+ }
+
+ private class VenueRecordAdapter(fragmentActivity: FragmentActivity) :
+ FragmentStateAdapter(fragmentActivity) {
+
+ private val totalPages = 5
+
+ override fun getItemCount(): Int = totalPages
+
+ override fun createFragment(position: Int): Fragment =
+ when (position) {
+ VenueRecordPresenterImpl.ERROR_CAPTURED_CODE_FRAGMENT -> ErrorCapturedCodeFragment.newInstance()
+ VenueRecordPresenterImpl.CONFIRM_RECORD_FRAGMENT -> ConfirmRecordFragment.newInstance()
+ VenueRecordPresenterImpl.CHECK_IN_FRAGMENT -> CheckInFragment.newInstance()
+ VenueRecordPresenterImpl.CHECK_OUT_FRAGMENT -> CheckOutFragment.newInstance()
+ VenueRecordPresenterImpl.RECORD_SUCCESS_FRAGMENT -> RecordSuccessFragment.newInstance()
+ else -> ConfirmRecordFragment.newInstance()
+ }
+ }
+
+ override fun onBackPressed() {
+ presenter.onBackPressed(viewPager.currentItem)
+ }
+
+ override fun onContinueButtonClick(pageIndex: Int) {
+ presenter.onContinueButtonClick(pageIndex)
+ }
+
+ override fun onCancelButtonClick() {
+ CommonDialog.Builder(this)
+ .setTitle(
+ labelManager.getText(
+ "VENUE_RECORD_CANCEL_TITLE",
+ R.string.venue_record_cancel_title
+ ).toString()
+ )
+ .setMessage(
+ labelManager.getText(
+ "VENUE_RECORD_CANCEL_TEXT",
+ R.string.venue_record_cancel_text
+ ).toString()
+ )
+ .setPositiveButton(
+ labelManager.getText(
+ "VENUE_RECORD_CANCEL_CONTINUE",
+ R.string.venue_record_cancel_continue
+ ).toString()
+ ) {
+ it.dismiss()
+ }
+ .setNegativeButton(
+ labelManager.getText(
+ "ALERT_CANCEL_BUTTON",
+ R.string.cancel
+ ).toString()
+ ) {
+ it.dismiss()
+ presenter.cancelRecord()
+ this.finish()
+ }
+ .setCloseButton() {
+ it.dismiss()
+ }
+ .build()
+ .show()
+ }
+
+ override fun onBackButtonClick() {
+ onBackPressed()
+ }
+
+ override fun exit() {
+ this.finish()
+ }
+
+ override fun setVenueTimeOut(venueTimeOut: VenueTimeOut) =
+ presenter.setVenueTimeOut(venueTimeOut)
+
+ override fun startVenueRecordWorker(notificationTime: Int) {
+ VenueRecordWorker.set(this, notificationTime)
+ }
+
+ override fun cancelVenueRecordWorker() {
+ VenueRecordWorker.cancel(this)
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuerecord/view/VenueRecordPageCallback.kt b/app/src/main/java/es/gob/radarcovid/features/venuerecord/view/VenueRecordPageCallback.kt
new file mode 100644
index 00000000..1bd3adf0
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuerecord/view/VenueRecordPageCallback.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuerecord.view
+
+import es.gob.radarcovid.features.venuerecord.pages.checkout.presenter.VenueTimeOut
+
+interface VenueRecordPageCallback {
+
+ fun onContinueButtonClick(pageIndex: Int)
+
+ fun onCancelButtonClick()
+
+ fun onBackButtonClick()
+
+ fun setVenueTimeOut(venueTimeOut: VenueTimeOut)
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuevisited/di/VenueVisitedModule.kt b/app/src/main/java/es/gob/radarcovid/features/venuevisited/di/VenueVisitedModule.kt
new file mode 100644
index 00000000..9b0e9747
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuevisited/di/VenueVisitedModule.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuevisited.di
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import es.gob.radarcovid.features.venuevisited.presenter.VenueVisitedPresenterImpl
+import es.gob.radarcovid.features.venuevisited.protocols.VenueVisitedPresenter
+import es.gob.radarcovid.features.venuevisited.protocols.VenueVisitedView
+import es.gob.radarcovid.features.venuevisited.view.VenueVisitedActivity
+
+@Module
+class VenueVisitedModule {
+
+ @Provides
+ fun providesContext(activity: VenueVisitedActivity): Context = activity
+
+ @Provides
+ fun providesView(activity: VenueVisitedActivity): VenueVisitedView = activity
+
+ @Provides
+ fun providesPresenter(presenter: VenueVisitedPresenterImpl): VenueVisitedPresenter = presenter
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuevisited/presenter/VenueVisitedPresenterImpl.kt b/app/src/main/java/es/gob/radarcovid/features/venuevisited/presenter/VenueVisitedPresenterImpl.kt
new file mode 100644
index 00000000..63144f3a
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuevisited/presenter/VenueVisitedPresenterImpl.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuevisited.presenter
+
+import es.gob.radarcovid.common.extensions.format
+import es.gob.radarcovid.datamanager.repository.EncryptedPreferencesRepository
+import es.gob.radarcovid.datamanager.usecase.GetLocaleInfoUseCase
+import es.gob.radarcovid.features.venuevisited.protocols.VenueVisitedPresenter
+import es.gob.radarcovid.features.venuevisited.protocols.VenueVisitedView
+import es.gob.radarcovid.models.domain.VenueHeaderItem
+import es.gob.radarcovid.models.domain.VenueRecord
+import es.gob.radarcovid.models.domain.VenueVisitedItem
+import es.gob.radarcovid.models.domain.VenueVisitedRecyclerItem
+import javax.inject.Inject
+
+class VenueVisitedPresenterImpl @Inject constructor(
+ private val view: VenueVisitedView,
+ private val encryptedPreferencesRepository: EncryptedPreferencesRepository,
+ private val localeInfoUseCase: GetLocaleInfoUseCase
+) : VenueVisitedPresenter {
+
+ override fun viewReady() {
+ getVenueList(showHidden = false, reload = false)
+ }
+
+ override fun getVenueList(showHidden: Boolean, reload: Boolean) {
+ val visitedVenues = encryptedPreferencesRepository.getVisitedVenue()
+ if (visitedVenues.isNullOrEmpty()) {
+ view.setEmptyList()
+ } else {
+ val venueList = if (showHidden) {
+ visitedVenues.sortedBy { it.dateIn }
+ } else {
+ visitedVenues.filter { !it.hidden }
+ .sortedBy { it.dateIn }
+ }
+
+ val numberHidden =
+ visitedVenues.filter { it.hidden }.count()
+ val listItems = ArrayList()
+ var daysAgo = ""
+ venueList.forEach {
+ val newDaysAgo = it.dateIn.format()
+ if (daysAgo != newDaysAgo) {
+ daysAgo = newDaysAgo
+ listItems.add(VenueHeaderItem(date = it.dateIn))
+ }
+ listItems.add(VenueVisitedItem(venueItem = it))
+ }
+ view.setVenueList(
+ listItems,
+ numberHidden,
+ reload,
+ localeInfoUseCase.getSelectedLanguageForLocale()
+ )
+ }
+ }
+
+ override fun changeVisibility(venue: VenueRecord, showHidden: Boolean) {
+ val venueList = encryptedPreferencesRepository.getVisitedVenue().sortedBy { it.dateOut }
+ venueList.find { it.checkOutId == venue.checkOutId }?.hidden = !venue.hidden
+ encryptedPreferencesRepository.setVisitedVenue(venueList)
+ getVenueList(showHidden, reload = true)
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuevisited/protocols/Protocols.kt b/app/src/main/java/es/gob/radarcovid/features/venuevisited/protocols/Protocols.kt
new file mode 100644
index 00000000..328c7191
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuevisited/protocols/Protocols.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuevisited.protocols
+
+import es.gob.radarcovid.models.domain.VenueRecord
+import es.gob.radarcovid.models.domain.VenueVisitedRecyclerItem
+
+interface VenueVisitedView {
+ fun setVenueList(venueItemList: List, numberHidden: Int, reload: Boolean, locale: String)
+
+ fun setEmptyList()
+}
+
+interface VenueVisitedPresenter {
+ fun viewReady()
+
+ fun getVenueList(showHidden: Boolean, reload: Boolean)
+
+ fun changeVisibility(venue: VenueRecord, showHidden: Boolean)
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/venuevisited/view/VenueVisitedActivity.kt b/app/src/main/java/es/gob/radarcovid/features/venuevisited/view/VenueVisitedActivity.kt
new file mode 100644
index 00000000..d698dc3d
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/venuevisited/view/VenueVisitedActivity.kt
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.venuevisited.view
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.base.BaseBackNavigationActivity
+import es.gob.radarcovid.common.extensions.setAccessibilityAction
+import es.gob.radarcovid.common.view.adapter.VenueListAdapter
+import es.gob.radarcovid.features.venuevisited.protocols.VenueVisitedPresenter
+import es.gob.radarcovid.features.venuevisited.protocols.VenueVisitedView
+import es.gob.radarcovid.models.domain.VenueVisitedRecyclerItem
+import kotlinx.android.synthetic.main.activity_venue_visited.*
+import kotlinx.android.synthetic.main.layout_back_navigation.*
+import javax.inject.Inject
+
+class VenueVisitedActivity : BaseBackNavigationActivity(), VenueVisitedView {
+
+ companion object {
+
+ fun open(context: Context) {
+ context.startActivity(Intent(context, VenueVisitedActivity::class.java))
+ }
+
+ }
+
+ @Inject
+ lateinit var presenter: VenueVisitedPresenter
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_venue_visited)
+ initViews()
+ presenter.viewReady()
+ }
+
+ override fun setEmptyList() {
+ emptyMessageLayout.visibility = View.VISIBLE
+ controlLayout.visibility = View.GONE
+ }
+
+ override fun setVenueList(
+ venueItemList: List,
+ numberHidden: Int,
+ reload: Boolean,
+ locale: String
+ ) {
+
+ controlLayout.visibility = View.VISIBLE
+ textViewHiddenPlaces.text = labelManager.getFormattedTextHtml(
+ "VENUE_DIARY_HIDDEN_PLACES",
+ getString(R.string.venue_diary_hidden_places), numberHidden.toString()
+ )
+
+ if (reload) {
+ (recyclerView.adapter as VenueListAdapter).setData(venueItemList)
+ recyclerView.adapter?.notifyDataSetChanged()
+ } else {
+ recyclerView.setHasFixedSize(true)
+ recyclerView.layoutManager =
+ LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
+ recyclerView.adapter = VenueListAdapter(venueItemList, locale, labelManager)
+ (recyclerView.adapter as VenueListAdapter).onItemClick = {
+ presenter.changeVisibility(it, switchHidden.isChecked)
+ }
+ //recyclerView.scrollToPosition(index)
+ (recyclerView.adapter as VenueListAdapter).stateRestorationPolicy =
+ RecyclerView.Adapter.StateRestorationPolicy.ALLOW
+ }
+ }
+
+ private fun initViews() {
+ imageButtonBack.contentDescription =
+ "${labelManager.getText("VENUE_HOME_TITLE", R.string.title_home)} ${
+ labelManager.getText(
+ "ACC_BUTTON_BACK_TO",
+ R.string.navigation_back_to
+ )
+ }"
+
+ setSwitchAccessibility()
+ switchHidden.setOnClickListener {
+ if (!switchHidden.isChecked) {
+ presenter.getVenueList(showHidden = false, reload = true)
+ textViewShowHidden.text =
+ labelManager.getText("VENUE_DIARY_HIDDEN", getString(R.string.venue_diary_hide))
+ } else {
+ presenter.getVenueList(showHidden = true, reload = true)
+ textViewShowHidden.text =
+ labelManager.getText(
+ "VENUE_DIARY_VISIBLE",
+ getString(R.string.venue_diary_show)
+ )
+ }
+ setSwitchAccessibility()
+ }
+ }
+
+ private fun setSwitchAccessibility() {
+ if (switchHidden.isChecked) {
+ switchHidden.contentDescription =
+ "${
+ labelManager.getText(
+ "ACC_DIARY_HIDDEN_SWITCH",
+ R.string.venue_diary_hidden_switch
+ )
+ }"
+ switchHidden.setAccessibilityAction(
+ labelManager.getText(
+ "VENUE_DIARY_HIDE_ACTION",
+ R.string.venue_diary_hide_action
+ ).toString()
+ )
+ } else {
+ switchHidden.contentDescription =
+ "${
+ labelManager.getText(
+ "ACC_DIARY_HIDDEN_SWITCH",
+ R.string.venue_diary_hidden_switch
+ )
+ }"
+ switchHidden.setAccessibilityAction(
+ labelManager.getText(
+ "VENUE_DIARY_SHOW_ACTION",
+ R.string.venue_diary_show_action
+ ).toString()
+ )
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/worker/AnalyticsWorker.kt b/app/src/main/java/es/gob/radarcovid/features/worker/AnalyticsWorker.kt
new file mode 100644
index 00000000..c06db440
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/worker/AnalyticsWorker.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.worker
+
+import android.content.Context
+import androidx.work.*
+import dagger.android.HasAndroidInjector
+import es.gob.radarcovid.datamanager.usecase.ExposureInfoUseCase
+import es.gob.radarcovid.datamanager.usecase.SendAnalyticsUseCase
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+class AnalyticsWorker(context: Context, workerParams: WorkerParameters) :
+ Worker(context, workerParams) {
+
+ init {
+ (context.applicationContext as? HasAndroidInjector)
+ ?.androidInjector()
+ ?.inject(this)
+ }
+
+ companion object {
+
+ private const val TAG = "AnalyticsWorker"
+
+ fun start(context: Context, executionDelay: Int) {
+ start(context, executionDelay, ExistingWorkPolicy.KEEP)
+ }
+
+ fun start(context: Context, executionDelay: Int, existingWorkPolicy: ExistingWorkPolicy) {
+ //Execution control - do not execute if value is negative
+ if (executionDelay > 0) {
+ val constraints = Constraints.Builder()
+ .setRequiredNetworkType(NetworkType.CONNECTED)
+ .build()
+ val work =
+ OneTimeWorkRequest
+ .Builder(AnalyticsWorker::class.java)
+ .setInitialDelay(executionDelay.toLong(), TimeUnit.MINUTES)
+ .setConstraints(constraints)
+ .addTag(TAG)
+ .build()
+ WorkManager.getInstance(context)
+ .enqueueUniqueWork(TAG, existingWorkPolicy, work)
+ } else {
+ //Clean pending process
+ WorkManager.getInstance(context).cancelAllWorkByTag(TAG)
+ }
+ }
+ }
+
+ @Inject
+ lateinit var sendAnalyticsUseCase: SendAnalyticsUseCase
+
+ @Inject
+ lateinit var exposureInfoUseCase: ExposureInfoUseCase
+
+ override fun doWork(): Result {
+ val period = sendAnalyticsUseCase.getAnalyticsPeriod()
+
+ //Execution control - do not re-schedule if value is negative
+ if (period > 0) {
+ val exposureInfo = exposureInfoUseCase.getExposureInfo()
+ sendAnalyticsUseCase.sendAnalyticsData(exposureInfo)
+ start(applicationContext, period, ExistingWorkPolicy.REPLACE)
+ }
+
+ return Result.success()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/worker/FakeInfectionReportWorker.kt b/app/src/main/java/es/gob/radarcovid/features/worker/FakeInfectionReportWorker.kt
new file mode 100644
index 00000000..a64cd067
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/worker/FakeInfectionReportWorker.kt
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.worker
+
+import android.content.Context
+import androidx.work.*
+import dagger.android.HasAndroidInjector
+import es.gob.radarcovid.BuildConfig
+import es.gob.radarcovid.datamanager.repository.PreferencesRepository
+import es.gob.radarcovid.datamanager.usecase.ReportFakeInfectionUseCase
+import org.dpppt.android.sdk.DP3T
+import java.security.SecureRandom
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import kotlin.math.ln
+
+private const val FACTOR_HOUR_MILLIS = 60 * 60 * 1000L
+private const val FACTOR_DAY_MILLIS: Long = 24 * FACTOR_HOUR_MILLIS
+private const val MAX_DELAY_HOURS: Long = 48
+private val SAMPLING_RATE =
+ if (BuildConfig.DEBUG) 1.0f else 0.2f
+
+class FakeInfectionReportWorker(context: Context, workerParams: WorkerParameters) :
+ Worker(context, workerParams) {
+
+ init {
+ (context.applicationContext as? HasAndroidInjector)
+ ?.androidInjector()
+ ?.inject(this)
+ }
+
+ companion object {
+
+ private var clock: Clock = ClockImpl()
+
+ private const val TAG = "FakeInfectionReportWorker"
+
+ fun start(context: Context, preferencesRepository: PreferencesRepository) {
+ var tDummy: Long = preferencesRepository.getTDummy()
+ if (tDummy == -1L) {
+ tDummy = clock.currentTimeMillis() + clock.syncInterval()
+ preferencesRepository.setTDummy(tDummy)
+ }
+ start(context, tDummy, ExistingWorkPolicy.KEEP)
+ }
+
+ private fun start(
+ context: Context,
+ tDummy: Long,
+ existingWorkPolicy: ExistingWorkPolicy
+ ) {
+
+ val now = clock.currentTimeMillis()
+ val executionDelay = 0L.coerceAtLeast(tDummy - now)
+
+ val constraints = Constraints.Builder()
+ .setRequiredNetworkType(NetworkType.CONNECTED)
+ .build()
+ val work =
+ OneTimeWorkRequest
+ .Builder(FakeInfectionReportWorker::class.java)
+ .setInitialDelay(executionDelay, TimeUnit.MILLISECONDS)
+ .setConstraints(constraints)
+ .addTag(TAG)
+ .build()
+ WorkManager.getInstance(context)
+ .enqueueUniqueWork(TAG, existingWorkPolicy, work)
+ }
+
+ }
+
+ @Inject
+ lateinit var reportFakeInfectionUseCase: ReportFakeInfectionUseCase
+
+ @Inject
+ lateinit var preferencesRepository: PreferencesRepository
+
+ override fun doWork(): Result {
+ val now = clock.currentTimeMillis()
+
+ var tDummy: Long = preferencesRepository.getTDummy()
+ if (tDummy < 0) {
+ //if t_dummy < 0 because of some weird state, we reset it
+ tDummy = now + clock.syncInterval()
+ }
+ //to make sure we can still write the EncryptedSharedPreferences, we always write the value back
+ preferencesRepository.setTDummy(tDummy)
+
+ var send = false
+ while (tDummy < now && !send) {
+ // only do request if it was planned to do in the last 48h
+ if (tDummy >= now - FACTOR_HOUR_MILLIS * MAX_DELAY_HOURS) {
+ DP3T.addWorkerStartedToHistory(applicationContext, "fake")
+ val success = executeFakeRequest()
+ if (success) {
+ send = true
+ } else {
+ return Result.retry()
+ }
+ }
+ tDummy += clock.syncInterval()
+ preferencesRepository.setTDummy(tDummy)
+ }
+
+ start(applicationContext, tDummy, ExistingWorkPolicy.REPLACE)
+ return Result.success()
+ }
+
+ private fun executeFakeRequest(): Boolean {
+ return try {
+ reportFakeInfectionUseCase.reportFakeInfection().blockingAwait()
+ true
+ }catch (e: Exception) {
+ false
+ }
+ }
+
+ interface Clock {
+ fun syncInterval(): Long
+ fun currentTimeMillis(): Long
+ }
+
+ class ClockImpl : Clock {
+ override fun syncInterval(): Long {
+ val newDelayDays: Double =
+ ExponentialDistribution.sampleFromStandard() / SAMPLING_RATE
+ return (newDelayDays * FACTOR_DAY_MILLIS).toLong()
+ }
+
+ override fun currentTimeMillis(): Long {
+ return System.currentTimeMillis()
+ }
+ }
+
+ object ExponentialDistribution {
+ fun sampleFromStandard(): Double {
+ val random = SecureRandom()
+ return -ln(1.0 - random.nextDouble())
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/worker/HealerWorker.kt b/app/src/main/java/es/gob/radarcovid/features/worker/HealerWorker.kt
index 365949e4..6048e312 100644
--- a/app/src/main/java/es/gob/radarcovid/features/worker/HealerWorker.kt
+++ b/app/src/main/java/es/gob/radarcovid/features/worker/HealerWorker.kt
@@ -56,6 +56,7 @@ class HealerWorker(context: Context, workerParams: WorkerParameters) :
val work = OneTimeWorkRequest
.Builder(HealerWorker::class.java)
.setInitialDelay(minutesToHeal, TimeUnit.MINUTES)
+ .addTag(TAG)
.build()
WorkManager.getInstance(context)
.enqueueUniqueWork(TAG, ExistingWorkPolicy.REPLACE, work)
@@ -72,12 +73,12 @@ class HealerWorker(context: Context, workerParams: WorkerParameters) :
if (!iAmInfectedIsResettable)
iAmInfectedIsResettable = true
}
- DP3T.resetExposureDays(applicationContext)
+ exposureInfoUseCase.resetExposureDays()
DP3T.resetInfectionStatus(applicationContext)
showLowExposureNotification(applicationContext, true)
}
ExposureInfo.Level.HIGH -> {
- DP3T.resetExposureDays(applicationContext)
+ exposureInfoUseCase.resetExposureDays()
showLowExposureNotification(applicationContext, false)
}
else -> {
diff --git a/app/src/main/java/es/gob/radarcovid/features/worker/ReminderWorker.kt b/app/src/main/java/es/gob/radarcovid/features/worker/ReminderWorker.kt
new file mode 100644
index 00000000..225a50af
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/worker/ReminderWorker.kt
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.worker
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.work.*
+import dagger.android.HasAndroidInjector
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.base.Constants.NOTIFICATION_REMINDER_DEFAULT
+import es.gob.radarcovid.common.extensions.default
+import es.gob.radarcovid.datamanager.usecase.ExposureInfoUseCase
+import es.gob.radarcovid.datamanager.utils.LabelManager
+import es.gob.radarcovid.features.splash.view.SplashActivity
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+class ReminderWorker(context: Context, workerParams: WorkerParameters) :
+ Worker(context, workerParams) {
+
+ init {
+ (context.applicationContext as? HasAndroidInjector)
+ ?.androidInjector()
+ ?.inject(this)
+ }
+
+ @Inject
+ lateinit var labelManager: LabelManager
+
+ @Inject
+ lateinit var exposureInfoUseCase: ExposureInfoUseCase
+
+ companion object {
+
+ const val NOTIFICATION_REMINDER_ID = 2
+ private const val KEY_DELAY = "KEY_DELAY"
+ private const val FACTOR_MIN_MILLIS = 60 * 1000L
+
+ private const val TAG = "ReminderWorker"
+
+ fun set(context: Context, minutesToNotify: Int) {
+ if (minutesToNotify > 0) {
+ val work = OneTimeWorkRequest
+ .Builder(ReminderWorker::class.java)
+ .setInitialDelay(minutesToNotify.toLong(), TimeUnit.MINUTES)
+ .setInputData(Data.Builder().putInt(KEY_DELAY, minutesToNotify).build())
+ .addTag(TAG)
+ .build()
+ WorkManager.getInstance(context)
+ .enqueueUniqueWork(TAG, ExistingWorkPolicy.REPLACE, work)
+ }
+ }
+
+ fun cancel(context: Context) {
+ WorkManager.getInstance(context).cancelAllWorkByTag(TAG)
+ }
+
+ }
+
+ override fun doWork(): Result {
+ val exposureInfo = exposureInfoUseCase.getExposureInfo()
+ val delayMinutes = inputData.getInt(KEY_DELAY, NOTIFICATION_REMINDER_DEFAULT)
+ val now = System.currentTimeMillis()
+ val lastSync = exposureInfo.lastUpdateTime.time
+ if ((lastSync + (delayMinutes * FACTOR_MIN_MILLIS)) < now) {
+ showReminderNotification(applicationContext)
+ } else {
+ set(applicationContext, delayMinutes)
+ }
+ return Result.success()
+ }
+
+ private fun showReminderNotification(context: Context) {
+ val notificationManager =
+ context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ val channel = NotificationChannel(
+ context.packageName,
+ context.getString(R.string.app_name),
+ NotificationManager.IMPORTANCE_HIGH
+ )
+ channel.lockscreenVisibility = Notification.VISIBILITY_PRIVATE
+ notificationManager.createNotificationChannel(channel)
+ }
+
+ val splashIntent = SplashActivity.getIntent(context, false).apply {
+ flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+ }
+ val pendingIntent =
+ PendingIntent.getActivity(
+ context,
+ 0,
+ splashIntent,
+ PendingIntent.FLAG_UPDATE_CURRENT
+ )
+
+ val message = labelManager.getFormattedText(
+ "NOTIFICATION_REMINDER_BODY",
+ labelManager.getContactPhone()
+ ).default(context.getString(R.string.notification_reminder_body))
+
+ val notification =
+ NotificationCompat.Builder(context, context.packageName)
+ .setContentTitle(
+ labelManager.getFormattedText(
+ "NOTIFICATION_REMINDER_TITLE",
+ labelManager.getContactPhone()
+ ).default(context.getString(R.string.notification_reminder_title))
+ )
+ .setContentText(
+ message
+ )
+ .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+ .setSmallIcon(R.drawable.ic_handshakes)
+ .setContentIntent(pendingIntent)
+ .setAutoCancel(true)
+ .setStyle(NotificationCompat.BigTextStyle().bigText(message))
+ .build()
+
+ notificationManager.notify(
+ NOTIFICATION_REMINDER_ID,
+ notification
+ )
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/worker/VenueMatcherWorker.kt b/app/src/main/java/es/gob/radarcovid/features/worker/VenueMatcherWorker.kt
new file mode 100644
index 00000000..e07a13ca
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/worker/VenueMatcherWorker.kt
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.worker
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.graphics.BitmapFactory
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import androidx.work.*
+import dagger.android.HasAndroidInjector
+import es.gob.radarcovid.BuildConfig
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.base.Constants
+import es.gob.radarcovid.common.extensions.default
+import es.gob.radarcovid.datamanager.usecase.VenueMatcherUseCase
+import es.gob.radarcovid.datamanager.utils.LabelManager
+import es.gob.radarcovid.features.splash.view.SplashActivity
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+
+class VenueMatcherWorker(context: Context, workerParams: WorkerParameters) :
+ Worker(context, workerParams) {
+
+ init {
+ (context.applicationContext as? HasAndroidInjector)
+ ?.androidInjector()
+ ?.inject(this)
+ }
+
+ companion object {
+
+ const val ACTION_NEW_VENUE_EXPOSURE_NOTIFICATION =
+ "${BuildConfig.APPLICATION_ID}.ACTION_NEW_VENUE_EXPOSURE_NOTIFICATION"
+ const val NOTIFICATION_VENUE_EXPOSURE_ID = 4
+ private const val TAG = "VenueMatcherWorker"
+ private const val KEY_DELAY = "KEY_DELAY"
+
+ fun set(context: Context, delayMinutes: Int) {
+ set(context, delayMinutes, ExistingWorkPolicy.KEEP)
+ }
+
+ fun set(context: Context, delayMinutes: Int, existingWorkPolicy: ExistingWorkPolicy) {
+ val work = OneTimeWorkRequest
+ .Builder(VenueMatcherWorker::class.java)
+ .setInitialDelay(delayMinutes.toLong(), TimeUnit.MINUTES)
+ .setInputData(
+ Data.Builder().putInt(KEY_DELAY, delayMinutes).build()
+ )
+ .addTag(TAG)
+ .build()
+ WorkManager.getInstance(context)
+ .enqueueUniqueWork(TAG, existingWorkPolicy, work)
+ }
+
+ fun cancel(context: Context) {
+ WorkManager.getInstance(context).cancelAllWorkByTag(TAG)
+ }
+ }
+
+ @Inject
+ lateinit var venueMatcherUseCase: VenueMatcherUseCase
+
+ @Inject
+ lateinit var labelManager: LabelManager
+
+ override fun doWork(): Result {
+
+ val delayMinutes = inputData.getInt(
+ KEY_DELAY,
+ Constants.NOTIFICATION_REMINDER_DEFAULT
+ )
+
+ val exposureVenues = venueMatcherUseCase.checkForMatches()
+ if (!exposureVenues.isNullOrEmpty()) {
+ showVenueExposureNotification(applicationContext)
+ venueMatcherUseCase.setVenueNotified()
+ }
+
+ //Update views state
+ LocalBroadcastManager.getInstance(applicationContext).sendBroadcast(
+ Intent(
+ ACTION_NEW_VENUE_EXPOSURE_NOTIFICATION
+ )
+ )
+
+ set(applicationContext, delayMinutes, ExistingWorkPolicy.REPLACE)
+
+ return Result.success()
+ }
+
+ private fun showVenueExposureNotification(context: Context) {
+ val notificationManager =
+ context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ val channel = NotificationChannel(
+ context.packageName,
+ context.getString(R.string.app_name),
+ NotificationManager.IMPORTANCE_HIGH
+ )
+ channel.lockscreenVisibility = Notification.VISIBILITY_PRIVATE
+ notificationManager.createNotificationChannel(channel)
+ }
+
+ val splashIntent = SplashActivity.getIntent(context, false).apply {
+ flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+ }
+ val pendingIntent =
+ PendingIntent.getActivity(
+ context,
+ 0,
+ splashIntent,
+ PendingIntent.FLAG_UPDATE_CURRENT
+ )
+
+ val message = labelManager.getFormattedText(
+ "VENUE_EXPOSURE_NOTIFICATION_BODY",
+ labelManager.getContactPhone()
+ ).default(context.getString(R.string.venue_exposure_notification_body))
+
+ val notification =
+ NotificationCompat.Builder(context, context.packageName)
+ .setContentTitle(
+ labelManager.getFormattedText(
+ "NOTIFICATION_TITLE_EXPOSURE_HIGH",
+ labelManager.getContactPhone()
+ ).default(context.getString(R.string.exposure_high_notification_title))
+ )
+ .setContentText(
+ message
+ )
+ .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+ .setLargeIcon(BitmapFactory.decodeResource(context.resources, R.mipmap.ic_launcher))
+ .setSmallIcon(R.drawable.ic_handshakes)
+ .setContentIntent(pendingIntent)
+ .setAutoCancel(true)
+ .setStyle(NotificationCompat.BigTextStyle().bigText(message))
+ .build()
+
+ notificationManager.notify(
+ NOTIFICATION_VENUE_EXPOSURE_ID,
+ notification
+ )
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/features/worker/VenueRecordWorker.kt b/app/src/main/java/es/gob/radarcovid/features/worker/VenueRecordWorker.kt
new file mode 100644
index 00000000..9f5126d5
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/features/worker/VenueRecordWorker.kt
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.features.worker
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.graphics.BitmapFactory
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.work.*
+import dagger.android.HasAndroidInjector
+import es.gob.radarcovid.R
+import es.gob.radarcovid.common.base.Constants
+import es.gob.radarcovid.common.extensions.default
+import es.gob.radarcovid.datamanager.repository.PreferencesRepository
+import es.gob.radarcovid.datamanager.usecase.VenueRecordUseCase
+import es.gob.radarcovid.datamanager.utils.LabelManager
+import es.gob.radarcovid.features.splash.view.SplashActivity
+import java.util.*
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+enum class VenueRecordNotificationType {
+ REMINDER, AUTO_CHECKOUT
+}
+
+class VenueRecordWorker(context: Context, workerParams: WorkerParameters) :
+ Worker(context, workerParams) {
+
+ init {
+ (context.applicationContext as? HasAndroidInjector)
+ ?.androidInjector()
+ ?.inject(this)
+ }
+
+ @Inject
+ lateinit var labelManager: LabelManager
+
+ @Inject
+ lateinit var venueRecordUseCase: VenueRecordUseCase
+
+ @Inject
+ lateinit var preferencesRepository: PreferencesRepository
+
+ companion object {
+
+ const val NOTIFICATION_REMINDER_ID = 3
+ private const val TAG = "VenueRecordWorker"
+ private const val KEY_DELAY = "KEY_DELAY"
+
+ fun set(context: Context, minutesToNotify: Int) {
+ val work = OneTimeWorkRequest
+ .Builder(VenueRecordWorker::class.java)
+ .setInitialDelay(minutesToNotify.toLong(), TimeUnit.MINUTES)
+ .setInputData(
+ Data.Builder().putInt(KEY_DELAY, minutesToNotify).build()
+ )
+ .addTag(TAG)
+ .build()
+ WorkManager.getInstance(context)
+ .enqueueUniqueWork(TAG, ExistingWorkPolicy.REPLACE, work)
+ }
+
+ fun cancel(context: Context) {
+ WorkManager.getInstance(context).cancelAllWorkByTag(TAG)
+ }
+
+ }
+
+ override fun doWork(): Result {
+ val delayMinutes = inputData.getInt(
+ KEY_DELAY,
+ Constants.NOTIFICATION_REMINDER_DEFAULT
+ )
+
+ val currentVenue = venueRecordUseCase.getCurrentVenue()
+ val millisElapsed = System.currentTimeMillis() - currentVenue?.dateIn?.time!!
+ val daysElapsed = TimeUnit.MILLISECONDS.toDays(millisElapsed)
+ val hoursElapsed = TimeUnit.MILLISECONDS.toHours(millisElapsed) - (daysElapsed * 24)
+ val minutesElapsed =
+ TimeUnit.MILLISECONDS.toMinutes(millisElapsed) - (hoursElapsed * 60)
+
+ if (minutesElapsed > preferencesRepository.getAutoCheckoutTime() && !preferencesRepository.isApplicationActive()) {
+ //Auto checkout only if app is in background
+ venueRecordUseCase.checkOut(Date(), moreFiveHours = false).blockingAwait()
+ showVenueRecordNotification(
+ applicationContext,
+ VenueRecordNotificationType.AUTO_CHECKOUT
+ )
+ } else {
+ showVenueRecordNotification(applicationContext, VenueRecordNotificationType.REMINDER)
+ set(applicationContext, delayMinutes)
+ }
+ return Result.success()
+ }
+
+ private fun showVenueRecordNotification(context: Context, type: VenueRecordNotificationType) {
+ val notificationManager =
+ context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ val channel = NotificationChannel(
+ context.packageName,
+ context.getString(R.string.app_name),
+ NotificationManager.IMPORTANCE_HIGH
+ )
+ channel.lockscreenVisibility = Notification.VISIBILITY_PRIVATE
+ notificationManager.createNotificationChannel(channel)
+ }
+
+ val splashIntent = SplashActivity.getIntent(context, false).apply {
+ flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+ }
+ val pendingIntent =
+ PendingIntent.getActivity(
+ context,
+ 0,
+ splashIntent,
+ PendingIntent.FLAG_UPDATE_CURRENT
+ )
+
+ val message = if (type == VenueRecordNotificationType.REMINDER)
+ labelManager.getFormattedText(
+ "VENUE_RECORD_NOTIFICATION_REMINDER_BODY"
+ ).default(context.getString(R.string.venue_record_notification_reminder_body))
+ else
+ labelManager.getFormattedText(
+ "NOTIFICATION_AUTO_CHECKOUT_MESSAGE",
+ (preferencesRepository.getAutoCheckoutTime() / 60).toString()
+ ).default(context.getString(R.string.venue_record_notification_autocheckout_message))
+
+ val title = if (type == VenueRecordNotificationType.REMINDER)
+ labelManager.getFormattedText(
+ "VENUE_RECORD_NOTIFICATION_REMINDER_TITLE"
+ ).default(context.getString(R.string.venue_record_notification_reminder_title))
+ else
+ labelManager.getFormattedText(
+ "NOTIFICATION_AUTO_CHECKOUT_TITLE"
+ ).default(context.getString(R.string.venue_record_notification_autocheckout_title))
+
+ val notification =
+ NotificationCompat.Builder(context, context.packageName)
+ .setContentTitle(title)
+ .setContentText(message)
+ .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+ .setLargeIcon(BitmapFactory.decodeResource(context.resources, R.mipmap.ic_launcher))
+ .setSmallIcon(R.drawable.ic_handshakes)
+ .setContentIntent(pendingIntent)
+ .setAutoCancel(true)
+ .setStyle(NotificationCompat.BigTextStyle().bigText(message))
+ .build()
+
+ notificationManager.notify(
+ NOTIFICATION_REMINDER_ID,
+ notification
+ )
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/models/domain/AnalyticsOperationalInfo.kt b/app/src/main/java/es/gob/radarcovid/models/domain/AnalyticsOperationalInfo.kt
new file mode 100644
index 00000000..14c7a7b9
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/models/domain/AnalyticsOperationalInfo.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.models.domain
+
+data class AnalyticsOperationalInfo(
+ val kpi: String,
+ val date: Long,
+ val value: Int,
+ val salt: String
+) {
+ val digest = "$kpi$date$value$salt"
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/models/domain/InitializationData.kt b/app/src/main/java/es/gob/radarcovid/models/domain/InitializationData.kt
index 518e1c27..f1f99ec0 100644
--- a/app/src/main/java/es/gob/radarcovid/models/domain/InitializationData.kt
+++ b/app/src/main/java/es/gob/radarcovid/models/domain/InitializationData.kt
@@ -13,6 +13,5 @@ package es.gob.radarcovid.models.domain
data class InitializationData(
val settings: Settings,
val labels: Map,
- val languages: List,
val regions: List
)
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/models/domain/Settings.kt b/app/src/main/java/es/gob/radarcovid/models/domain/Settings.kt
index a754353b..64e2f45b 100644
--- a/app/src/main/java/es/gob/radarcovid/models/domain/Settings.kt
+++ b/app/src/main/java/es/gob/radarcovid/models/domain/Settings.kt
@@ -10,6 +10,9 @@
package es.gob.radarcovid.models.domain
+import es.gob.radarcovid.common.base.Constants.ANALYTICS_PERIOD_DEFAULT
+import es.gob.radarcovid.common.base.Constants.NOTIFICATION_REMINDER_DEFAULT
+
data class Settings(
val exposureConfiguration: ExposureConfiguration = ExposureConfiguration(),
val healingTime: HealingTime = HealingTime(),
@@ -31,7 +34,12 @@ data class Settings(
4096
)
),
- val appInfo: SettingsAppInfo = SettingsAppInfo()
+ val appInfo: SettingsAppInfo = SettingsAppInfo(),
+ val legalTermsVersion: String = "",
+ val radarCovidDownloadUrl: String = "",
+ val notificationReminder: Int = NOTIFICATION_REMINDER_DEFAULT,
+ val timeBetweenKpi: Int = ANALYTICS_PERIOD_DEFAULT,
+ val venueConfiguration: VenueConfiguration = VenueConfiguration()
)
data class ExposureConfiguration(
@@ -72,4 +80,11 @@ data class SettingsRiskScore(
val maxValue: Int? = 0
)
-data class SettingsAppInfo(val minVersionName: String = "", val minVersionCode: Int = 1)
\ No newline at end of file
+data class SettingsAppInfo(val minVersionName: String = "", val minVersionCode: Int = 1)
+
+data class VenueConfiguration(
+ val recordNotification: Int = 60,
+ val autoCheckout: Int = 300,
+ val troubledPlaceCheck: Int = 120,
+ val quarentineAfterExposed: Int = 2880
+)
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/models/domain/StatsData.kt b/app/src/main/java/es/gob/radarcovid/models/domain/StatsData.kt
new file mode 100644
index 00000000..a60e12a1
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/models/domain/StatsData.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.models.domain
+
+import java.util.*
+
+data class StatsRegionData(
+ val statsData: List,
+ val countries: List
+)
+
+data class StatsData(
+ val date: Date = Date(),
+ val applicationsDownloads: TotalData = TotalData(),
+ val communicatedContagions: TotalData = TotalData()
+)
+
+data class TotalData(
+ val totalActualDay: Int = 0,
+ val totalAcummulated: Int = 0
+)
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/models/domain/VenueRecord.kt b/app/src/main/java/es/gob/radarcovid/models/domain/VenueRecord.kt
new file mode 100644
index 00000000..428794a9
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/models/domain/VenueRecord.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.models.domain
+
+import java.util.*
+
+enum class VenueVisitedRecyclerType {
+ HEADER, VENUE
+}
+
+data class VenueRecord(
+ var qr: String,
+ var checkOutId: Long? = null,
+ var name: String? = null,
+ var isExposed: Boolean = false,
+ var hidden: Boolean = false,
+ var dateIn: Date,
+ var dateOut: Date? = null,
+ var isNotified: Boolean = false,
+ var moreFiveHours: Boolean = false
+)
+
+abstract class VenueVisitedRecyclerItem(
+ var viewType: VenueVisitedRecyclerType
+)
+
+data class VenueVisitedItem(
+ var venueItem : VenueRecord
+): VenueVisitedRecyclerItem(viewType = VenueVisitedRecyclerType.VENUE)
+
+data class VenueHeaderItem(
+ var date: Date
+): VenueVisitedRecyclerItem(viewType = VenueVisitedRecyclerType.HEADER)
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/models/request/RequestKpi.kt b/app/src/main/java/es/gob/radarcovid/models/request/RequestKpi.kt
new file mode 100644
index 00000000..dca16975
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/models/request/RequestKpi.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.models.request
+
+import java.util.*
+
+data class RequestKpi(
+ val salt: String,
+ val signedAttestation: String,
+ val kpis: ArrayList
+)
+
+data class Kpi(
+ val kpi: String,
+ val timestamp: String,
+ val value: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/models/response/ResponseSettings.kt b/app/src/main/java/es/gob/radarcovid/models/response/ResponseSettings.kt
index 76ea04d2..6c92cb6d 100644
--- a/app/src/main/java/es/gob/radarcovid/models/response/ResponseSettings.kt
+++ b/app/src/main/java/es/gob/radarcovid/models/response/ResponseSettings.kt
@@ -10,6 +10,9 @@
package es.gob.radarcovid.models.response
+import es.gob.radarcovid.common.base.Constants.ANALYTICS_PERIOD_DEFAULT
+import es.gob.radarcovid.common.base.Constants.NOTIFICATION_REMINDER_DEFAULT
+
data class ResponseSettings(
val exposureConfiguration: ResponseSettingsExposureConfiguration? = ResponseSettingsExposureConfiguration(),
val timeBetweenStates: ResponseSettingsTimeBetweenStates? = ResponseSettingsTimeBetweenStates(),
@@ -18,7 +21,12 @@ data class ResponseSettings(
val riskScoreClassification: List? = emptyList(),
val attenuationDurationThresholds: ResponseSettingsAttenuationThresholds? = ResponseSettingsAttenuationThresholds(),
val attenuationFactor: ResponseSettingsAttenuationFactor? = ResponseSettingsAttenuationFactor(),
- val applicationVersion: ResponseSettingsAppVersion? = ResponseSettingsAppVersion()
+ val applicationVersion: ResponseSettingsAppVersion? = ResponseSettingsAppVersion(),
+ val legalTermsVersion: String? = "",
+ val radarCovidDownloadUrl: String? = "",
+ val notificationReminder: Int? = NOTIFICATION_REMINDER_DEFAULT,
+ val timeBetweenKpi: Int? = ANALYTICS_PERIOD_DEFAULT,
+ val venueConfiguration: ResponseVenueConfiguration? = ResponseVenueConfiguration()
)
data class ResponseSettingsExposureConfiguration(
@@ -57,4 +65,11 @@ data class ResponseSettingsAttenuationFactor(val low: Float? = 0f, val medium: F
data class ResponseSettingsAppVersion(val android: ResponseSettingsAppVersionItem? = ResponseSettingsAppVersionItem())
-data class ResponseSettingsAppVersionItem(val version: String? = "1.0", val compilation: Int? = 1)
\ No newline at end of file
+data class ResponseSettingsAppVersionItem(val version: String? = "1.0", val compilation: Int? = 1)
+
+data class ResponseVenueConfiguration(
+ val recordNotification: Int = 60,
+ val autoCheckout: Int = 300,
+ val troubledPlaceCheck: Int = 120,
+ val quarentineAfterExposed: Int = 2880
+)
\ No newline at end of file
diff --git a/app/src/main/java/es/gob/radarcovid/models/response/ResponseStats.kt b/app/src/main/java/es/gob/radarcovid/models/response/ResponseStats.kt
new file mode 100644
index 00000000..234f25c3
--- /dev/null
+++ b/app/src/main/java/es/gob/radarcovid/models/response/ResponseStats.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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 es.gob.radarcovid.models.response
+
+import java.util.*
+
+class ResponseStats : ArrayList()
+
+data class ResponseStat(
+ val date: Date,
+ val applicationsDownloads: TotalDataResponse,
+ val communicatedContagions: TotalDataResponse
+)
+
+data class TotalDataResponse(
+ val totalActualDay: Int,
+ val totalAcummulated: Int
+)
\ No newline at end of file
diff --git a/app/src/main/proto/ProblematicEvent.proto b/app/src/main/proto/ProblematicEvent.proto
new file mode 100644
index 00000000..ea6dd426
--- /dev/null
+++ b/app/src/main/proto/ProblematicEvent.proto
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2020 Gobierno de España
+ *
+ * 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
+ */
+syntax = "proto3";
+package es.gob.radarcovid.models.domain;
+
+message ProblematicEventWrapper {
+ int32 version = 1;
+ repeated ProblematicEvent events = 2;
+}
+
+message ProblematicEvent {
+ bytes identity = 1;
+ bytes secretKeyForIdentity = 2;
+ int64 startTime = 3;
+ int64 endTime = 4;
+ bytes nonce = 5;
+ bytes message = 6;
+}
diff --git a/app/src/main/res/color/color_bottombar_text.xml b/app/src/main/res/color/color_bottombar_text.xml
index 292b8e2b..0f119fe4 100644
--- a/app/src/main/res/color/color_bottombar_text.xml
+++ b/app/src/main/res/color/color_bottombar_text.xml
@@ -1,5 +1,4 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_rate_view_mid.xml b/app/src/main/res/color/selector_color_button.xml
similarity index 68%
rename from app/src/main/res/drawable/selector_rate_view_mid.xml
rename to app/src/main/res/color/selector_color_button.xml
index 39b95456..880a956c 100644
--- a/app/src/main/res/drawable/selector_rate_view_mid.xml
+++ b/app/src/main/res/color/selector_color_button.xml
@@ -8,8 +8,8 @@
~
~ SPDX-License-Identifier: MPL-2.0
-->
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable-ca-hdpi/img_bluetooth.png b/app/src/main/res/drawable-ca-hdpi/img_bluetooth.png
new file mode 100644
index 00000000..cb673c48
Binary files /dev/null and b/app/src/main/res/drawable-ca-hdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-ca-hdpi/img_google.png b/app/src/main/res/drawable-ca-hdpi/img_google.png
new file mode 100644
index 00000000..e1b1c3ab
Binary files /dev/null and b/app/src/main/res/drawable-ca-hdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-ca-hdpi/img_radar.png b/app/src/main/res/drawable-ca-hdpi/img_radar.png
new file mode 100644
index 00000000..fa9cc832
Binary files /dev/null and b/app/src/main/res/drawable-ca-hdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-ca-mdpi/img_bluetooth.png b/app/src/main/res/drawable-ca-mdpi/img_bluetooth.png
new file mode 100644
index 00000000..571d8996
Binary files /dev/null and b/app/src/main/res/drawable-ca-mdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-ca-mdpi/img_google.png b/app/src/main/res/drawable-ca-mdpi/img_google.png
new file mode 100644
index 00000000..a5b3f2bc
Binary files /dev/null and b/app/src/main/res/drawable-ca-mdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-ca-mdpi/img_radar.png b/app/src/main/res/drawable-ca-mdpi/img_radar.png
new file mode 100644
index 00000000..886f5ccf
Binary files /dev/null and b/app/src/main/res/drawable-ca-mdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-ca-xhdpi/img_bluetooth.png b/app/src/main/res/drawable-ca-xhdpi/img_bluetooth.png
new file mode 100644
index 00000000..0a69fc71
Binary files /dev/null and b/app/src/main/res/drawable-ca-xhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-ca-xhdpi/img_google.png b/app/src/main/res/drawable-ca-xhdpi/img_google.png
new file mode 100644
index 00000000..a344da13
Binary files /dev/null and b/app/src/main/res/drawable-ca-xhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-ca-xhdpi/img_radar.png b/app/src/main/res/drawable-ca-xhdpi/img_radar.png
new file mode 100644
index 00000000..ec25e6fc
Binary files /dev/null and b/app/src/main/res/drawable-ca-xhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-ca-xxhdpi/img_bluetooth.png b/app/src/main/res/drawable-ca-xxhdpi/img_bluetooth.png
new file mode 100644
index 00000000..5be4e444
Binary files /dev/null and b/app/src/main/res/drawable-ca-xxhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-ca-xxhdpi/img_google.png b/app/src/main/res/drawable-ca-xxhdpi/img_google.png
new file mode 100644
index 00000000..8cc44edc
Binary files /dev/null and b/app/src/main/res/drawable-ca-xxhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-ca-xxhdpi/img_radar.png b/app/src/main/res/drawable-ca-xxhdpi/img_radar.png
new file mode 100644
index 00000000..0bafd5d4
Binary files /dev/null and b/app/src/main/res/drawable-ca-xxhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-ca-xxxhdpi/img_bluetooth.png b/app/src/main/res/drawable-ca-xxxhdpi/img_bluetooth.png
new file mode 100644
index 00000000..01854173
Binary files /dev/null and b/app/src/main/res/drawable-ca-xxxhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-ca-xxxhdpi/img_google.png b/app/src/main/res/drawable-ca-xxxhdpi/img_google.png
new file mode 100644
index 00000000..67b9154b
Binary files /dev/null and b/app/src/main/res/drawable-ca-xxxhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-ca-xxxhdpi/img_radar.png b/app/src/main/res/drawable-ca-xxxhdpi/img_radar.png
new file mode 100644
index 00000000..80f9a580
Binary files /dev/null and b/app/src/main/res/drawable-ca-xxxhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-es-hdpi/img_bluetooth.png b/app/src/main/res/drawable-es-hdpi/img_bluetooth.png
new file mode 100644
index 00000000..3f1a904e
Binary files /dev/null and b/app/src/main/res/drawable-es-hdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-es-hdpi/img_exposure.png b/app/src/main/res/drawable-es-hdpi/img_exposure.png
new file mode 100644
index 00000000..26d1aec5
Binary files /dev/null and b/app/src/main/res/drawable-es-hdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-es-hdpi/img_exposure_notification.png b/app/src/main/res/drawable-es-hdpi/img_exposure_notification.png
new file mode 100644
index 00000000..087f1bf8
Binary files /dev/null and b/app/src/main/res/drawable-es-hdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-es-hdpi/img_google.png b/app/src/main/res/drawable-es-hdpi/img_google.png
new file mode 100644
index 00000000..9f5a94c4
Binary files /dev/null and b/app/src/main/res/drawable-es-hdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-es-hdpi/img_radar.png b/app/src/main/res/drawable-es-hdpi/img_radar.png
new file mode 100644
index 00000000..e6642216
Binary files /dev/null and b/app/src/main/res/drawable-es-hdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-es-mdpi/img_bluetooth.png b/app/src/main/res/drawable-es-mdpi/img_bluetooth.png
new file mode 100644
index 00000000..714d3e13
Binary files /dev/null and b/app/src/main/res/drawable-es-mdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-es-mdpi/img_exposure.png b/app/src/main/res/drawable-es-mdpi/img_exposure.png
new file mode 100644
index 00000000..49e5c283
Binary files /dev/null and b/app/src/main/res/drawable-es-mdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-es-mdpi/img_exposure_notification.png b/app/src/main/res/drawable-es-mdpi/img_exposure_notification.png
new file mode 100644
index 00000000..96e51fbf
Binary files /dev/null and b/app/src/main/res/drawable-es-mdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-es-mdpi/img_google.png b/app/src/main/res/drawable-es-mdpi/img_google.png
new file mode 100644
index 00000000..3bffbe86
Binary files /dev/null and b/app/src/main/res/drawable-es-mdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-es-mdpi/img_radar.png b/app/src/main/res/drawable-es-mdpi/img_radar.png
new file mode 100644
index 00000000..7e40cdac
Binary files /dev/null and b/app/src/main/res/drawable-es-mdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-es-xhdpi/img_bluetooth.png b/app/src/main/res/drawable-es-xhdpi/img_bluetooth.png
new file mode 100644
index 00000000..9198841b
Binary files /dev/null and b/app/src/main/res/drawable-es-xhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-es-xhdpi/img_exposure.png b/app/src/main/res/drawable-es-xhdpi/img_exposure.png
new file mode 100644
index 00000000..ee5e808e
Binary files /dev/null and b/app/src/main/res/drawable-es-xhdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-es-xhdpi/img_exposure_notification.png b/app/src/main/res/drawable-es-xhdpi/img_exposure_notification.png
new file mode 100644
index 00000000..e48dc6ea
Binary files /dev/null and b/app/src/main/res/drawable-es-xhdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-es-xhdpi/img_google.png b/app/src/main/res/drawable-es-xhdpi/img_google.png
new file mode 100644
index 00000000..e268cae1
Binary files /dev/null and b/app/src/main/res/drawable-es-xhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-es-xhdpi/img_radar.png b/app/src/main/res/drawable-es-xhdpi/img_radar.png
new file mode 100644
index 00000000..79ce60a0
Binary files /dev/null and b/app/src/main/res/drawable-es-xhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-es-xxhdpi/img_bluetooth.png b/app/src/main/res/drawable-es-xxhdpi/img_bluetooth.png
new file mode 100644
index 00000000..d1b09337
Binary files /dev/null and b/app/src/main/res/drawable-es-xxhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-es-xxhdpi/img_exposure.png b/app/src/main/res/drawable-es-xxhdpi/img_exposure.png
new file mode 100644
index 00000000..da0d301c
Binary files /dev/null and b/app/src/main/res/drawable-es-xxhdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-es-xxhdpi/img_exposure_notification.png b/app/src/main/res/drawable-es-xxhdpi/img_exposure_notification.png
new file mode 100644
index 00000000..fbaa9d08
Binary files /dev/null and b/app/src/main/res/drawable-es-xxhdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-es-xxhdpi/img_google.png b/app/src/main/res/drawable-es-xxhdpi/img_google.png
new file mode 100644
index 00000000..402b30e8
Binary files /dev/null and b/app/src/main/res/drawable-es-xxhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-es-xxhdpi/img_radar.png b/app/src/main/res/drawable-es-xxhdpi/img_radar.png
new file mode 100644
index 00000000..977020e6
Binary files /dev/null and b/app/src/main/res/drawable-es-xxhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-es-xxxhdpi/img_bluetooth.png b/app/src/main/res/drawable-es-xxxhdpi/img_bluetooth.png
new file mode 100644
index 00000000..408a060a
Binary files /dev/null and b/app/src/main/res/drawable-es-xxxhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-es-xxxhdpi/img_exposure.png b/app/src/main/res/drawable-es-xxxhdpi/img_exposure.png
new file mode 100644
index 00000000..39fe3e89
Binary files /dev/null and b/app/src/main/res/drawable-es-xxxhdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-es-xxxhdpi/img_exposure_notification.png b/app/src/main/res/drawable-es-xxxhdpi/img_exposure_notification.png
new file mode 100644
index 00000000..49160733
Binary files /dev/null and b/app/src/main/res/drawable-es-xxxhdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-es-xxxhdpi/img_google.png b/app/src/main/res/drawable-es-xxxhdpi/img_google.png
new file mode 100644
index 00000000..92873962
Binary files /dev/null and b/app/src/main/res/drawable-es-xxxhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-es-xxxhdpi/img_radar.png b/app/src/main/res/drawable-es-xxxhdpi/img_radar.png
new file mode 100644
index 00000000..19effe37
Binary files /dev/null and b/app/src/main/res/drawable-es-xxxhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-eu-hdpi/img_bluetooth.png b/app/src/main/res/drawable-eu-hdpi/img_bluetooth.png
new file mode 100644
index 00000000..cbe9db07
Binary files /dev/null and b/app/src/main/res/drawable-eu-hdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-eu-hdpi/img_google.png b/app/src/main/res/drawable-eu-hdpi/img_google.png
new file mode 100644
index 00000000..869b1f64
Binary files /dev/null and b/app/src/main/res/drawable-eu-hdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-eu-hdpi/img_radar.png b/app/src/main/res/drawable-eu-hdpi/img_radar.png
new file mode 100644
index 00000000..bbf968d3
Binary files /dev/null and b/app/src/main/res/drawable-eu-hdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-eu-mdpi/img_bluetooth.png b/app/src/main/res/drawable-eu-mdpi/img_bluetooth.png
new file mode 100644
index 00000000..0d971ec5
Binary files /dev/null and b/app/src/main/res/drawable-eu-mdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-eu-mdpi/img_google.png b/app/src/main/res/drawable-eu-mdpi/img_google.png
new file mode 100644
index 00000000..c49cd2f6
Binary files /dev/null and b/app/src/main/res/drawable-eu-mdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-eu-mdpi/img_radar.png b/app/src/main/res/drawable-eu-mdpi/img_radar.png
new file mode 100644
index 00000000..ac163f17
Binary files /dev/null and b/app/src/main/res/drawable-eu-mdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-eu-xhdpi/img_bluetooth.png b/app/src/main/res/drawable-eu-xhdpi/img_bluetooth.png
new file mode 100644
index 00000000..342bec81
Binary files /dev/null and b/app/src/main/res/drawable-eu-xhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-eu-xhdpi/img_google.png b/app/src/main/res/drawable-eu-xhdpi/img_google.png
new file mode 100644
index 00000000..a6173945
Binary files /dev/null and b/app/src/main/res/drawable-eu-xhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-eu-xhdpi/img_radar.png b/app/src/main/res/drawable-eu-xhdpi/img_radar.png
new file mode 100644
index 00000000..3fddcd66
Binary files /dev/null and b/app/src/main/res/drawable-eu-xhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-eu-xxhdpi/img_bluetooth.png b/app/src/main/res/drawable-eu-xxhdpi/img_bluetooth.png
new file mode 100644
index 00000000..3c5a25b0
Binary files /dev/null and b/app/src/main/res/drawable-eu-xxhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-eu-xxhdpi/img_google.png b/app/src/main/res/drawable-eu-xxhdpi/img_google.png
new file mode 100644
index 00000000..c2655faf
Binary files /dev/null and b/app/src/main/res/drawable-eu-xxhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-eu-xxhdpi/img_radar.png b/app/src/main/res/drawable-eu-xxhdpi/img_radar.png
new file mode 100644
index 00000000..d55bab54
Binary files /dev/null and b/app/src/main/res/drawable-eu-xxhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-eu-xxxhdpi/img_bluetooth.png b/app/src/main/res/drawable-eu-xxxhdpi/img_bluetooth.png
new file mode 100644
index 00000000..8b417b1a
Binary files /dev/null and b/app/src/main/res/drawable-eu-xxxhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-eu-xxxhdpi/img_google.png b/app/src/main/res/drawable-eu-xxxhdpi/img_google.png
new file mode 100644
index 00000000..d422ed18
Binary files /dev/null and b/app/src/main/res/drawable-eu-xxxhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-eu-xxxhdpi/img_radar.png b/app/src/main/res/drawable-eu-xxxhdpi/img_radar.png
new file mode 100644
index 00000000..ca907c55
Binary files /dev/null and b/app/src/main/res/drawable-eu-xxxhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-fr-hdpi/img_bluetooth.png b/app/src/main/res/drawable-fr-hdpi/img_bluetooth.png
new file mode 100644
index 00000000..bceb2b96
Binary files /dev/null and b/app/src/main/res/drawable-fr-hdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-fr-hdpi/img_exposure.png b/app/src/main/res/drawable-fr-hdpi/img_exposure.png
new file mode 100644
index 00000000..f0ca95de
Binary files /dev/null and b/app/src/main/res/drawable-fr-hdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-fr-hdpi/img_exposure_notification.png b/app/src/main/res/drawable-fr-hdpi/img_exposure_notification.png
new file mode 100644
index 00000000..930ea769
Binary files /dev/null and b/app/src/main/res/drawable-fr-hdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-fr-hdpi/img_google.png b/app/src/main/res/drawable-fr-hdpi/img_google.png
new file mode 100644
index 00000000..3fa166a7
Binary files /dev/null and b/app/src/main/res/drawable-fr-hdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-fr-hdpi/img_radar.png b/app/src/main/res/drawable-fr-hdpi/img_radar.png
new file mode 100644
index 00000000..2c6b7b85
Binary files /dev/null and b/app/src/main/res/drawable-fr-hdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-fr-mdpi/img_bluetooth.png b/app/src/main/res/drawable-fr-mdpi/img_bluetooth.png
new file mode 100644
index 00000000..7e560826
Binary files /dev/null and b/app/src/main/res/drawable-fr-mdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-fr-mdpi/img_exposure.png b/app/src/main/res/drawable-fr-mdpi/img_exposure.png
new file mode 100644
index 00000000..ce489aa0
Binary files /dev/null and b/app/src/main/res/drawable-fr-mdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-fr-mdpi/img_exposure_notification.png b/app/src/main/res/drawable-fr-mdpi/img_exposure_notification.png
new file mode 100644
index 00000000..295bd9f5
Binary files /dev/null and b/app/src/main/res/drawable-fr-mdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-fr-mdpi/img_google.png b/app/src/main/res/drawable-fr-mdpi/img_google.png
new file mode 100644
index 00000000..7db9a544
Binary files /dev/null and b/app/src/main/res/drawable-fr-mdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-fr-mdpi/img_radar.png b/app/src/main/res/drawable-fr-mdpi/img_radar.png
new file mode 100644
index 00000000..1e019d80
Binary files /dev/null and b/app/src/main/res/drawable-fr-mdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-fr-xhdpi/img_bluetooth.png b/app/src/main/res/drawable-fr-xhdpi/img_bluetooth.png
new file mode 100644
index 00000000..a1655811
Binary files /dev/null and b/app/src/main/res/drawable-fr-xhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-fr-xhdpi/img_exposure.png b/app/src/main/res/drawable-fr-xhdpi/img_exposure.png
new file mode 100644
index 00000000..251736f3
Binary files /dev/null and b/app/src/main/res/drawable-fr-xhdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-fr-xhdpi/img_exposure_notification.png b/app/src/main/res/drawable-fr-xhdpi/img_exposure_notification.png
new file mode 100644
index 00000000..a02571b9
Binary files /dev/null and b/app/src/main/res/drawable-fr-xhdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-fr-xhdpi/img_google.png b/app/src/main/res/drawable-fr-xhdpi/img_google.png
new file mode 100644
index 00000000..65bd7f88
Binary files /dev/null and b/app/src/main/res/drawable-fr-xhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-fr-xhdpi/img_radar.png b/app/src/main/res/drawable-fr-xhdpi/img_radar.png
new file mode 100644
index 00000000..3176c432
Binary files /dev/null and b/app/src/main/res/drawable-fr-xhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-fr-xxhdpi/img_bluetooth.png b/app/src/main/res/drawable-fr-xxhdpi/img_bluetooth.png
new file mode 100644
index 00000000..3edefd96
Binary files /dev/null and b/app/src/main/res/drawable-fr-xxhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-fr-xxhdpi/img_exposure.png b/app/src/main/res/drawable-fr-xxhdpi/img_exposure.png
new file mode 100644
index 00000000..ee6ea081
Binary files /dev/null and b/app/src/main/res/drawable-fr-xxhdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-fr-xxhdpi/img_exposure_notification.png b/app/src/main/res/drawable-fr-xxhdpi/img_exposure_notification.png
new file mode 100644
index 00000000..9ffaacdd
Binary files /dev/null and b/app/src/main/res/drawable-fr-xxhdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-fr-xxhdpi/img_google.png b/app/src/main/res/drawable-fr-xxhdpi/img_google.png
new file mode 100644
index 00000000..f07c109d
Binary files /dev/null and b/app/src/main/res/drawable-fr-xxhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-fr-xxhdpi/img_radar.png b/app/src/main/res/drawable-fr-xxhdpi/img_radar.png
new file mode 100644
index 00000000..97d8f4fb
Binary files /dev/null and b/app/src/main/res/drawable-fr-xxhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-fr-xxxhdpi/img_bluetooth.png b/app/src/main/res/drawable-fr-xxxhdpi/img_bluetooth.png
new file mode 100644
index 00000000..65070ddf
Binary files /dev/null and b/app/src/main/res/drawable-fr-xxxhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-fr-xxxhdpi/img_exposure.png b/app/src/main/res/drawable-fr-xxxhdpi/img_exposure.png
new file mode 100644
index 00000000..0255de2b
Binary files /dev/null and b/app/src/main/res/drawable-fr-xxxhdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-fr-xxxhdpi/img_exposure_notification.png b/app/src/main/res/drawable-fr-xxxhdpi/img_exposure_notification.png
new file mode 100644
index 00000000..b191c863
Binary files /dev/null and b/app/src/main/res/drawable-fr-xxxhdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-fr-xxxhdpi/img_google.png b/app/src/main/res/drawable-fr-xxxhdpi/img_google.png
new file mode 100644
index 00000000..8128d98b
Binary files /dev/null and b/app/src/main/res/drawable-fr-xxxhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-fr-xxxhdpi/img_radar.png b/app/src/main/res/drawable-fr-xxxhdpi/img_radar.png
new file mode 100644
index 00000000..8df476a6
Binary files /dev/null and b/app/src/main/res/drawable-fr-xxxhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-gl-hdpi/img_bluetooth.png b/app/src/main/res/drawable-gl-hdpi/img_bluetooth.png
new file mode 100644
index 00000000..49411bce
Binary files /dev/null and b/app/src/main/res/drawable-gl-hdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-gl-hdpi/img_google.png b/app/src/main/res/drawable-gl-hdpi/img_google.png
new file mode 100644
index 00000000..64595809
Binary files /dev/null and b/app/src/main/res/drawable-gl-hdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-gl-hdpi/img_radar.png b/app/src/main/res/drawable-gl-hdpi/img_radar.png
new file mode 100644
index 00000000..a0967740
Binary files /dev/null and b/app/src/main/res/drawable-gl-hdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-gl-mdpi/img_bluetooth.png b/app/src/main/res/drawable-gl-mdpi/img_bluetooth.png
new file mode 100644
index 00000000..c0b8d44c
Binary files /dev/null and b/app/src/main/res/drawable-gl-mdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-gl-mdpi/img_google.png b/app/src/main/res/drawable-gl-mdpi/img_google.png
new file mode 100644
index 00000000..ab874bc1
Binary files /dev/null and b/app/src/main/res/drawable-gl-mdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-gl-mdpi/img_radar.png b/app/src/main/res/drawable-gl-mdpi/img_radar.png
new file mode 100644
index 00000000..f54023cb
Binary files /dev/null and b/app/src/main/res/drawable-gl-mdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-gl-xhdpi/img_bluetooth.png b/app/src/main/res/drawable-gl-xhdpi/img_bluetooth.png
new file mode 100644
index 00000000..338816a1
Binary files /dev/null and b/app/src/main/res/drawable-gl-xhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-gl-xhdpi/img_google.png b/app/src/main/res/drawable-gl-xhdpi/img_google.png
new file mode 100644
index 00000000..72bef9e7
Binary files /dev/null and b/app/src/main/res/drawable-gl-xhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-gl-xhdpi/img_radar.png b/app/src/main/res/drawable-gl-xhdpi/img_radar.png
new file mode 100644
index 00000000..e5ab2a2f
Binary files /dev/null and b/app/src/main/res/drawable-gl-xhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-gl-xxhdpi/img_bluetooth.png b/app/src/main/res/drawable-gl-xxhdpi/img_bluetooth.png
new file mode 100644
index 00000000..10e25f75
Binary files /dev/null and b/app/src/main/res/drawable-gl-xxhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-gl-xxhdpi/img_google.png b/app/src/main/res/drawable-gl-xxhdpi/img_google.png
new file mode 100644
index 00000000..e72281e4
Binary files /dev/null and b/app/src/main/res/drawable-gl-xxhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-gl-xxhdpi/img_radar.png b/app/src/main/res/drawable-gl-xxhdpi/img_radar.png
new file mode 100644
index 00000000..33b07abe
Binary files /dev/null and b/app/src/main/res/drawable-gl-xxhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-gl-xxxhdpi/img_bluetooth.png b/app/src/main/res/drawable-gl-xxxhdpi/img_bluetooth.png
new file mode 100644
index 00000000..c253ed36
Binary files /dev/null and b/app/src/main/res/drawable-gl-xxxhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-gl-xxxhdpi/img_google.png b/app/src/main/res/drawable-gl-xxxhdpi/img_google.png
new file mode 100644
index 00000000..bd323491
Binary files /dev/null and b/app/src/main/res/drawable-gl-xxxhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-gl-xxxhdpi/img_radar.png b/app/src/main/res/drawable-gl-xxxhdpi/img_radar.png
new file mode 100644
index 00000000..90d72228
Binary files /dev/null and b/app/src/main/res/drawable-gl-xxxhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-hdpi/img_bluetooth.png b/app/src/main/res/drawable-hdpi/img_bluetooth.png
new file mode 100644
index 00000000..4e10781d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-hdpi/img_exposure.png b/app/src/main/res/drawable-hdpi/img_exposure.png
new file mode 100644
index 00000000..961d5ce1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-hdpi/img_exposure_notification.png b/app/src/main/res/drawable-hdpi/img_exposure_notification.png
new file mode 100644
index 00000000..fd760ad2
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-hdpi/img_google.png b/app/src/main/res/drawable-hdpi/img_google.png
new file mode 100644
index 00000000..9b09f751
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-hdpi/img_radar.png b/app/src/main/res/drawable-hdpi/img_radar.png
new file mode 100644
index 00000000..83157157
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_bluetooth.png b/app/src/main/res/drawable-mdpi/img_bluetooth.png
new file mode 100644
index 00000000..beb76e20
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_exposure.png b/app/src/main/res/drawable-mdpi/img_exposure.png
new file mode 100644
index 00000000..8c20dd36
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_exposure_notification.png b/app/src/main/res/drawable-mdpi/img_exposure_notification.png
new file mode 100644
index 00000000..1d191fa6
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_google.png b/app/src/main/res/drawable-mdpi/img_google.png
new file mode 100644
index 00000000..e70e61b2
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_radar.png b/app/src/main/res/drawable-mdpi/img_radar.png
new file mode 100644
index 00000000..8fdb240e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-ro-hdpi/img_bluetooth.png b/app/src/main/res/drawable-ro-hdpi/img_bluetooth.png
new file mode 100644
index 00000000..c65e6443
Binary files /dev/null and b/app/src/main/res/drawable-ro-hdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-ro-hdpi/img_exposure.png b/app/src/main/res/drawable-ro-hdpi/img_exposure.png
new file mode 100644
index 00000000..5ae92077
Binary files /dev/null and b/app/src/main/res/drawable-ro-hdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-ro-hdpi/img_exposure_notification.png b/app/src/main/res/drawable-ro-hdpi/img_exposure_notification.png
new file mode 100644
index 00000000..729fbb6e
Binary files /dev/null and b/app/src/main/res/drawable-ro-hdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-ro-hdpi/img_google.png b/app/src/main/res/drawable-ro-hdpi/img_google.png
new file mode 100644
index 00000000..ecc96289
Binary files /dev/null and b/app/src/main/res/drawable-ro-hdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-ro-hdpi/img_radar.png b/app/src/main/res/drawable-ro-hdpi/img_radar.png
new file mode 100644
index 00000000..599d8d61
Binary files /dev/null and b/app/src/main/res/drawable-ro-hdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-ro-mdpi/img_bluetooth.png b/app/src/main/res/drawable-ro-mdpi/img_bluetooth.png
new file mode 100644
index 00000000..86eeeaa0
Binary files /dev/null and b/app/src/main/res/drawable-ro-mdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-ro-mdpi/img_exposure.png b/app/src/main/res/drawable-ro-mdpi/img_exposure.png
new file mode 100644
index 00000000..d932a513
Binary files /dev/null and b/app/src/main/res/drawable-ro-mdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-ro-mdpi/img_exposure_notification.png b/app/src/main/res/drawable-ro-mdpi/img_exposure_notification.png
new file mode 100644
index 00000000..27434255
Binary files /dev/null and b/app/src/main/res/drawable-ro-mdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-ro-mdpi/img_google.png b/app/src/main/res/drawable-ro-mdpi/img_google.png
new file mode 100644
index 00000000..fcb88c0e
Binary files /dev/null and b/app/src/main/res/drawable-ro-mdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-ro-mdpi/img_radar.png b/app/src/main/res/drawable-ro-mdpi/img_radar.png
new file mode 100644
index 00000000..aa0d5c33
Binary files /dev/null and b/app/src/main/res/drawable-ro-mdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-ro-xhdpi/img_bluetooth.png b/app/src/main/res/drawable-ro-xhdpi/img_bluetooth.png
new file mode 100644
index 00000000..7f01d2e1
Binary files /dev/null and b/app/src/main/res/drawable-ro-xhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-ro-xhdpi/img_exposure.png b/app/src/main/res/drawable-ro-xhdpi/img_exposure.png
new file mode 100644
index 00000000..bdfa5d47
Binary files /dev/null and b/app/src/main/res/drawable-ro-xhdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-ro-xhdpi/img_exposure_notification.png b/app/src/main/res/drawable-ro-xhdpi/img_exposure_notification.png
new file mode 100644
index 00000000..d41954c2
Binary files /dev/null and b/app/src/main/res/drawable-ro-xhdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-ro-xhdpi/img_google.png b/app/src/main/res/drawable-ro-xhdpi/img_google.png
new file mode 100644
index 00000000..1b82b7fe
Binary files /dev/null and b/app/src/main/res/drawable-ro-xhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-ro-xhdpi/img_radar.png b/app/src/main/res/drawable-ro-xhdpi/img_radar.png
new file mode 100644
index 00000000..8c821316
Binary files /dev/null and b/app/src/main/res/drawable-ro-xhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-ro-xxhdpi/img_bluetooth.png b/app/src/main/res/drawable-ro-xxhdpi/img_bluetooth.png
new file mode 100644
index 00000000..e10fbcf0
Binary files /dev/null and b/app/src/main/res/drawable-ro-xxhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-ro-xxhdpi/img_exposure.png b/app/src/main/res/drawable-ro-xxhdpi/img_exposure.png
new file mode 100644
index 00000000..186074bd
Binary files /dev/null and b/app/src/main/res/drawable-ro-xxhdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-ro-xxhdpi/img_exposure_notification.png b/app/src/main/res/drawable-ro-xxhdpi/img_exposure_notification.png
new file mode 100644
index 00000000..fda17877
Binary files /dev/null and b/app/src/main/res/drawable-ro-xxhdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-ro-xxhdpi/img_google.png b/app/src/main/res/drawable-ro-xxhdpi/img_google.png
new file mode 100644
index 00000000..67654db9
Binary files /dev/null and b/app/src/main/res/drawable-ro-xxhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-ro-xxhdpi/img_radar.png b/app/src/main/res/drawable-ro-xxhdpi/img_radar.png
new file mode 100644
index 00000000..20c32c49
Binary files /dev/null and b/app/src/main/res/drawable-ro-xxhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-ro-xxxhdpi/img_bluetooth.png b/app/src/main/res/drawable-ro-xxxhdpi/img_bluetooth.png
new file mode 100644
index 00000000..3defed30
Binary files /dev/null and b/app/src/main/res/drawable-ro-xxxhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-ro-xxxhdpi/img_exposure.png b/app/src/main/res/drawable-ro-xxxhdpi/img_exposure.png
new file mode 100644
index 00000000..0feddf0d
Binary files /dev/null and b/app/src/main/res/drawable-ro-xxxhdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-ro-xxxhdpi/img_exposure_notification.png b/app/src/main/res/drawable-ro-xxxhdpi/img_exposure_notification.png
new file mode 100644
index 00000000..f81555bd
Binary files /dev/null and b/app/src/main/res/drawable-ro-xxxhdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-ro-xxxhdpi/img_google.png b/app/src/main/res/drawable-ro-xxxhdpi/img_google.png
new file mode 100644
index 00000000..82355496
Binary files /dev/null and b/app/src/main/res/drawable-ro-xxxhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-ro-xxxhdpi/img_radar.png b/app/src/main/res/drawable-ro-xxxhdpi/img_radar.png
new file mode 100644
index 00000000..2903175c
Binary files /dev/null and b/app/src/main/res/drawable-ro-xxxhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index eaf6797a..00000000
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xhdpi/img_bluetooth.png b/app/src/main/res/drawable-xhdpi/img_bluetooth.png
new file mode 100644
index 00000000..58723853
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_exposure.png b/app/src/main/res/drawable-xhdpi/img_exposure.png
new file mode 100644
index 00000000..a6194191
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_exposure_notification.png b/app/src/main/res/drawable-xhdpi/img_exposure_notification.png
new file mode 100644
index 00000000..bb26ee1a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_google.png b/app/src/main/res/drawable-xhdpi/img_google.png
new file mode 100644
index 00000000..f74d33b9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_radar.png b/app/src/main/res/drawable-xhdpi/img_radar.png
new file mode 100644
index 00000000..3d2b2387
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_bluetooth.png b/app/src/main/res/drawable-xxhdpi/img_bluetooth.png
new file mode 100644
index 00000000..5fb72942
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_exposure.png b/app/src/main/res/drawable-xxhdpi/img_exposure.png
new file mode 100644
index 00000000..bda04ad9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_exposure_notification.png b/app/src/main/res/drawable-xxhdpi/img_exposure_notification.png
new file mode 100644
index 00000000..b33024c6
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_google.png b/app/src/main/res/drawable-xxhdpi/img_google.png
new file mode 100644
index 00000000..f4df7b9b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_radar.png b/app/src/main/res/drawable-xxhdpi/img_radar.png
new file mode 100644
index 00000000..07f8bb6d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_bluetooth.png b/app/src/main/res/drawable-xxxhdpi/img_bluetooth.png
new file mode 100644
index 00000000..2bf97516
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_bluetooth.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_exposure.png b/app/src/main/res/drawable-xxxhdpi/img_exposure.png
new file mode 100644
index 00000000..571236b3
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_exposure.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_exposure_notification.png b/app/src/main/res/drawable-xxxhdpi/img_exposure_notification.png
new file mode 100644
index 00000000..b3df4f13
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_exposure_notification.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_google.png b/app/src/main/res/drawable-xxxhdpi/img_google.png
new file mode 100644
index 00000000..d22a174f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_google.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_radar.png b/app/src/main/res/drawable-xxxhdpi/img_radar.png
new file mode 100644
index 00000000..bd38d21a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_radar.png differ
diff --git a/app/src/main/res/drawable/background_button.xml b/app/src/main/res/drawable/background_button.xml
index b07363b0..f2224a31 100644
--- a/app/src/main/res/drawable/background_button.xml
+++ b/app/src/main/res/drawable/background_button.xml
@@ -9,23 +9,11 @@
-->
-
-
-
-
-
+ android:pathData="M8,0L335,0A8,8 0,0 1,343 8L343,48A8,8 0,0 1,335 56L8,56A8,8 0,0 1,0 48L0,8A8,8 0,0 1,8 0z"
+ android:fillColor="#FF493BA7"/>
diff --git a/app/src/main/res/drawable/background_button_gradient.xml b/app/src/main/res/drawable/background_button_disabled.xml
similarity index 68%
rename from app/src/main/res/drawable/background_button_gradient.xml
rename to app/src/main/res/drawable/background_button_disabled.xml
index f7d8e654..59ac5f3f 100644
--- a/app/src/main/res/drawable/background_button_gradient.xml
+++ b/app/src/main/res/drawable/background_button_disabled.xml
@@ -8,14 +8,10 @@
~
~ SPDX-License-Identifier: MPL-2.0
-->
-
-
\ No newline at end of file
+
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/background_exposition_medium.xml b/app/src/main/res/drawable/background_exposition_medium.xml
deleted file mode 100644
index e3cd58c4..00000000
--- a/app/src/main/res/drawable/background_exposition_medium.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/background_segmented_left.xml b/app/src/main/res/drawable/background_segmented_left.xml
new file mode 100644
index 00000000..e89bb8b1
--- /dev/null
+++ b/app/src/main/res/drawable/background_segmented_left.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_segmented_left_pressed.xml b/app/src/main/res/drawable/background_segmented_left_pressed.xml
new file mode 100644
index 00000000..ce6eed86
--- /dev/null
+++ b/app/src/main/res/drawable/background_segmented_left_pressed.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_segmented_middle.xml b/app/src/main/res/drawable/background_segmented_middle.xml
new file mode 100644
index 00000000..bdd41f33
--- /dev/null
+++ b/app/src/main/res/drawable/background_segmented_middle.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_segmented_middle_pressed.xml b/app/src/main/res/drawable/background_segmented_middle_pressed.xml
new file mode 100644
index 00000000..2d312d58
--- /dev/null
+++ b/app/src/main/res/drawable/background_segmented_middle_pressed.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_rate_item_start_selected.xml b/app/src/main/res/drawable/background_segmented_right.xml
similarity index 54%
rename from app/src/main/res/drawable/shape_rate_item_start_selected.xml
rename to app/src/main/res/drawable/background_segmented_right.xml
index 83b5842c..7d47d414 100644
--- a/app/src/main/res/drawable/shape_rate_item_start_selected.xml
+++ b/app/src/main/res/drawable/background_segmented_right.xml
@@ -9,16 +9,16 @@
~ SPDX-License-Identifier: MPL-2.0
-->
-
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_segmented_right_pressed.xml b/app/src/main/res/drawable/background_segmented_right_pressed.xml
new file mode 100644
index 00000000..5d542430
--- /dev/null
+++ b/app/src/main/res/drawable/background_segmented_right_pressed.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_rate_view_start.xml b/app/src/main/res/drawable/background_segmented_selector_left.xml
similarity index 67%
rename from app/src/main/res/drawable/selector_rate_view_start.xml
rename to app/src/main/res/drawable/background_segmented_selector_left.xml
index 16ffee9c..9317767d 100644
--- a/app/src/main/res/drawable/selector_rate_view_start.xml
+++ b/app/src/main/res/drawable/background_segmented_selector_left.xml
@@ -10,6 +10,6 @@
-->
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_segmented_selector_middle.xml b/app/src/main/res/drawable/background_segmented_selector_middle.xml
new file mode 100644
index 00000000..8eaaaaba
--- /dev/null
+++ b/app/src/main/res/drawable/background_segmented_selector_middle.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_segmented_selector_right.xml b/app/src/main/res/drawable/background_segmented_selector_right.xml
new file mode 100644
index 00000000..7c033850
--- /dev/null
+++ b/app/src/main/res/drawable/background_segmented_selector_right.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_spinner.xml b/app/src/main/res/drawable/background_spinner.xml
index eb6f9fde..e6f10d17 100644
--- a/app/src/main/res/drawable/background_spinner.xml
+++ b/app/src/main/res/drawable/background_spinner.xml
@@ -16,7 +16,7 @@
-
- -
-
-
-
-
-
- -
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_active.xml b/app/src/main/res/drawable/ic_active.xml
new file mode 100644
index 00000000..7aec6d84
--- /dev/null
+++ b/app/src/main/res/drawable/ic_active.xml
@@ -0,0 +1,30 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_archive.xml b/app/src/main/res/drawable/ic_archive.xml
new file mode 100644
index 00000000..d05294ed
--- /dev/null
+++ b/app/src/main/res/drawable/ic_archive.xml
@@ -0,0 +1,30 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_archive_hidden.xml b/app/src/main/res/drawable/ic_archive_hidden.xml
new file mode 100644
index 00000000..19f4c31b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_archive_hidden.xml
@@ -0,0 +1,37 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
new file mode 100644
index 00000000..88890d8e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -0,0 +1,30 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_checkbox.xml b/app/src/main/res/drawable/ic_checkbox.xml
index 3c64b932..7117b1d8 100644
--- a/app/src/main/res/drawable/ic_checkbox.xml
+++ b/app/src/main/res/drawable/ic_checkbox.xml
@@ -7,15 +7,14 @@
~
~ SPDX-License-Identifier: MPL-2.0
-->
-
+ android:width="30dp"
+ android:height="30dp"
+ android:viewportWidth="36"
+ android:viewportHeight="36">
diff --git a/app/src/main/res/drawable/ic_checkbox_checked.xml b/app/src/main/res/drawable/ic_checkbox_checked.xml
index fe4039fa..20cf2452 100644
--- a/app/src/main/res/drawable/ic_checkbox_checked.xml
+++ b/app/src/main/res/drawable/ic_checkbox_checked.xml
@@ -7,24 +7,15 @@
~
~ SPDX-License-Identifier: MPL-2.0
-->
-
+ android:width="30dp"
+ android:height="30dp"
+ android:viewportWidth="36"
+ android:viewportHeight="36">
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index 0420fc19..2d165928 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -1,9 +1,30 @@
+
+
+ android:width="20dp"
+ android:height="20dp"
+ android:viewportWidth="20"
+ android:viewportHeight="20">
diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml
new file mode 100644
index 00000000..16f2e913
--- /dev/null
+++ b/app/src/main/res/drawable/ic_download.xml
@@ -0,0 +1,37 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_error_check.xml b/app/src/main/res/drawable/ic_error_check.xml
new file mode 100644
index 00000000..4c05b958
--- /dev/null
+++ b/app/src/main/res/drawable/ic_error_check.xml
@@ -0,0 +1,33 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_dropdown_opened.xml b/app/src/main/res/drawable/ic_flash_off.xml
similarity index 70%
rename from app/src/main/res/drawable/ic_dropdown_opened.xml
rename to app/src/main/res/drawable/ic_flash_off.xml
index 2230deb2..a0478c0a 100644
--- a/app/src/main/res/drawable/ic_dropdown_opened.xml
+++ b/app/src/main/res/drawable/ic_flash_off.xml
@@ -9,15 +9,15 @@
-->
+ android:width="30dp"
+ android:height="32dp"
+ android:viewportWidth="30"
+ android:viewportHeight="32">
diff --git a/app/src/main/res/drawable/ic_dropdown_closed.xml b/app/src/main/res/drawable/ic_flash_on.xml
similarity index 70%
rename from app/src/main/res/drawable/ic_dropdown_closed.xml
rename to app/src/main/res/drawable/ic_flash_on.xml
index e9c912eb..f25d2a60 100644
--- a/app/src/main/res/drawable/ic_dropdown_closed.xml
+++ b/app/src/main/res/drawable/ic_flash_on.xml
@@ -9,15 +9,15 @@
-->
+ android:width="30dp"
+ android:height="32dp"
+ android:viewportWidth="30"
+ android:viewportHeight="32">
diff --git a/app/src/main/res/drawable/ic_helpline.xml b/app/src/main/res/drawable/ic_helpline.xml
index 16299661..98cf7605 100644
--- a/app/src/main/res/drawable/ic_helpline.xml
+++ b/app/src/main/res/drawable/ic_helpline.xml
@@ -9,22 +9,29 @@
-->
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="32"
+ android:viewportHeight="32">
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
index 3d5626cc..b3ef61e8 100644
--- a/app/src/main/res/drawable/ic_home.xml
+++ b/app/src/main/res/drawable/ic_home.xml
@@ -9,46 +9,32 @@
-->
+ android:width="29dp"
+ android:height="29dp"
+ android:viewportWidth="29"
+ android:viewportHeight="29">
-
-
-
-
-
+ android:strokeColor="#757575"
+ android:strokeLineCap="round"/>
-
-
-
-
-
+ android:strokeColor="#757575"
+ android:strokeLineCap="round"/>
+
diff --git a/app/src/main/res/drawable/ic_home_radar.xml b/app/src/main/res/drawable/ic_home_radar.xml
new file mode 100644
index 00000000..3bcea6d3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_radar.xml
@@ -0,0 +1,19 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_inactive.xml b/app/src/main/res/drawable/ic_inactive.xml
new file mode 100644
index 00000000..0bebcfeb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_inactive.xml
@@ -0,0 +1,37 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
new file mode 100644
index 00000000..275cd2c8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -0,0 +1,37 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml
new file mode 100644
index 00000000..5202f411
--- /dev/null
+++ b/app/src/main/res/drawable/ic_language.xml
@@ -0,0 +1,68 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 5274d11d..00000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_health.xml b/app/src/main/res/drawable/ic_location.xml
similarity index 57%
rename from app/src/main/res/drawable/ic_health.xml
rename to app/src/main/res/drawable/ic_location.xml
index b473be39..ff3a9b7c 100644
--- a/app/src/main/res/drawable/ic_health.xml
+++ b/app/src/main/res/drawable/ic_location.xml
@@ -9,26 +9,22 @@
-->
diff --git a/app/src/main/res/drawable/ic_mydata.xml b/app/src/main/res/drawable/ic_mydata.xml
new file mode 100644
index 00000000..cbeefa05
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mydata.xml
@@ -0,0 +1,46 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml
new file mode 100644
index 00000000..d94c31b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notification.xml
@@ -0,0 +1,22 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_notification_big.xml b/app/src/main/res/drawable/ic_notification_big.xml
deleted file mode 100644
index 8049a84b..00000000
--- a/app/src/main/res/drawable/ic_notification_big.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_places_record.xml b/app/src/main/res/drawable/ic_places_record.xml
new file mode 100644
index 00000000..0229065b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_places_record.xml
@@ -0,0 +1,44 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_poll_check.xml b/app/src/main/res/drawable/ic_pointer.xml
similarity index 65%
rename from app/src/main/res/drawable/ic_poll_check.xml
rename to app/src/main/res/drawable/ic_pointer.xml
index 04a7ccca..a18f9971 100644
--- a/app/src/main/res/drawable/ic_poll_check.xml
+++ b/app/src/main/res/drawable/ic_pointer.xml
@@ -9,22 +9,22 @@
-->
+ android:width="15dp"
+ android:height="15dp"
+ android:viewportWidth="15"
+ android:viewportHeight="15">
diff --git a/app/src/main/res/drawable/ic_qr.xml b/app/src/main/res/drawable/ic_qr.xml
new file mode 100644
index 00000000..b9f6f4bf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qr.xml
@@ -0,0 +1,72 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_recording.xml b/app/src/main/res/drawable/ic_recording.xml
new file mode 100644
index 00000000..16eab85d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_recording.xml
@@ -0,0 +1,83 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_risk_contact.xml b/app/src/main/res/drawable/ic_risk_contact.xml
new file mode 100644
index 00000000..4286fc8b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_risk_contact.xml
@@ -0,0 +1,58 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_risk_place.xml b/app/src/main/res/drawable/ic_risk_place.xml
new file mode 100644
index 00000000..6010ad45
--- /dev/null
+++ b/app/src/main/res/drawable/ic_risk_place.xml
@@ -0,0 +1,54 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_scanner_bottom_left.xml b/app/src/main/res/drawable/ic_scanner_bottom_left.xml
new file mode 100644
index 00000000..722c9b3f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_scanner_bottom_left.xml
@@ -0,0 +1,22 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_scanner_bottom_right.xml b/app/src/main/res/drawable/ic_scanner_bottom_right.xml
new file mode 100644
index 00000000..74ec12bb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_scanner_bottom_right.xml
@@ -0,0 +1,22 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_scanner_top_left.xml b/app/src/main/res/drawable/ic_scanner_top_left.xml
new file mode 100644
index 00000000..8921627a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_scanner_top_left.xml
@@ -0,0 +1,22 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_scanner_top_right.xml b/app/src/main/res/drawable/ic_scanner_top_right.xml
new file mode 100644
index 00000000..b2381ed1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_scanner_top_right.xml
@@ -0,0 +1,22 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 00000000..0bbccd81
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,30 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_profile.xml b/app/src/main/res/drawable/ic_share.xml
similarity index 50%
rename from app/src/main/res/drawable/ic_profile.xml
rename to app/src/main/res/drawable/ic_share.xml
index d5c2a550..2fc0ca6e 100644
--- a/app/src/main/res/drawable/ic_profile.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -9,38 +9,43 @@
-->
+ android:width="20dp"
+ android:height="22dp"
+ android:viewportWidth="20"
+ android:viewportHeight="22">
diff --git a/app/src/main/res/drawable/ic_stats.xml b/app/src/main/res/drawable/ic_stats.xml
new file mode 100644
index 00000000..3b9db5f8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_stats.xml
@@ -0,0 +1,38 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_venue.xml b/app/src/main/res/drawable/ic_venue.xml
new file mode 100644
index 00000000..b323a6cc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_venue.xml
@@ -0,0 +1,72 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml
index d695af00..d9c4be07 100644
--- a/app/src/main/res/drawable/ic_warning.xml
+++ b/app/src/main/res/drawable/ic_warning.xml
@@ -9,19 +9,29 @@
-->
+ android:width="22dp"
+ android:height="22dp"
+ android:viewportWidth="22"
+ android:viewportHeight="22">
diff --git a/app/src/main/res/drawable/img_background_settings.xml b/app/src/main/res/drawable/img_background_settings.xml
new file mode 100644
index 00000000..ae60ab6b
--- /dev/null
+++ b/app/src/main/res/drawable/img_background_settings.xml
@@ -0,0 +1,176 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/img_countries.xml b/app/src/main/res/drawable/img_countries.xml
new file mode 100644
index 00000000..d85dcd1f
--- /dev/null
+++ b/app/src/main/res/drawable/img_countries.xml
@@ -0,0 +1,524 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/img_covid_report_step2.xml b/app/src/main/res/drawable/img_covid_report_step2.xml
new file mode 100644
index 00000000..267095e4
--- /dev/null
+++ b/app/src/main/res/drawable/img_covid_report_step2.xml
@@ -0,0 +1,570 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/img_diary.xml b/app/src/main/res/drawable/img_diary.xml
new file mode 100644
index 00000000..50dc199c
--- /dev/null
+++ b/app/src/main/res/drawable/img_diary.xml
@@ -0,0 +1,422 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/img_share.xml b/app/src/main/res/drawable/img_share.xml
new file mode 100644
index 00000000..c9fa29a2
--- /dev/null
+++ b/app/src/main/res/drawable/img_share.xml
@@ -0,0 +1,161 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/img_switch_archive_disabled.xml b/app/src/main/res/drawable/img_switch_archive_disabled.xml
new file mode 100644
index 00000000..43d83fe5
--- /dev/null
+++ b/app/src/main/res/drawable/img_switch_archive_disabled.xml
@@ -0,0 +1,40 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/img_switch_archive_enabled.xml b/app/src/main/res/drawable/img_switch_archive_enabled.xml
new file mode 100644
index 00000000..0fe0b522
--- /dev/null
+++ b/app/src/main/res/drawable/img_switch_archive_enabled.xml
@@ -0,0 +1,41 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/img_switch_disabled.xml b/app/src/main/res/drawable/img_switch_disabled.xml
index 97442356..f507098e 100644
--- a/app/src/main/res/drawable/img_switch_disabled.xml
+++ b/app/src/main/res/drawable/img_switch_disabled.xml
@@ -15,6 +15,6 @@
android:viewportHeight="36">
+
diff --git a/app/src/main/res/drawable/img_switch_track_with_padding_grey.xml b/app/src/main/res/drawable/img_switch_track_with_padding_grey.xml
new file mode 100644
index 00000000..b5361aa1
--- /dev/null
+++ b/app/src/main/res/drawable/img_switch_track_with_padding_grey.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/img_venue.xml b/app/src/main/res/drawable/img_venue.xml
new file mode 100644
index 00000000..67ecd4c4
--- /dev/null
+++ b/app/src/main/res/drawable/img_venue.xml
@@ -0,0 +1,440 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/my_health_radio_selected.xml b/app/src/main/res/drawable/my_health_radio_selected.xml
new file mode 100644
index 00000000..65fc3567
--- /dev/null
+++ b/app/src/main/res/drawable/my_health_radio_selected.xml
@@ -0,0 +1,30 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/my_health_radio_selector.xml b/app/src/main/res/drawable/my_health_radio_selector.xml
new file mode 100644
index 00000000..8b8e8b5f
--- /dev/null
+++ b/app/src/main/res/drawable/my_health_radio_selector.xml
@@ -0,0 +1,23 @@
+
+
+
+-
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/my_health_radio_unselected.xml b/app/src/main/res/drawable/my_health_radio_unselected.xml
new file mode 100644
index 00000000..a048fe88
--- /dev/null
+++ b/app/src/main/res/drawable/my_health_radio_unselected.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/progress_drawable.xml b/app/src/main/res/drawable/progress_drawable.xml
new file mode 100644
index 00000000..1f6f8f77
--- /dev/null
+++ b/app/src/main/res/drawable/progress_drawable.xml
@@ -0,0 +1,33 @@
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_button.xml b/app/src/main/res/drawable/selector_button.xml
new file mode 100644
index 00000000..30aab4cb
--- /dev/null
+++ b/app/src/main/res/drawable/selector_button.xml
@@ -0,0 +1,27 @@
+
+
+
+ -
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_rate_view_end.xml b/app/src/main/res/drawable/selector_segmented.xml
similarity index 68%
rename from app/src/main/res/drawable/selector_rate_view_end.xml
rename to app/src/main/res/drawable/selector_segmented.xml
index fab0f078..e85250c3 100644
--- a/app/src/main/res/drawable/selector_rate_view_end.xml
+++ b/app/src/main/res/drawable/selector_segmented.xml
@@ -10,6 +10,7 @@
-->
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_switch_diary.xml b/app/src/main/res/drawable/selector_switch_diary.xml
new file mode 100644
index 00000000..10be19f1
--- /dev/null
+++ b/app/src/main/res/drawable/selector_switch_diary.xml
@@ -0,0 +1,14 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_rate_item_end_selected.xml b/app/src/main/res/drawable/shape_bottom_rounded_corners_white.xml
similarity index 56%
rename from app/src/main/res/drawable/shape_rate_item_end_selected.xml
rename to app/src/main/res/drawable/shape_bottom_rounded_corners_white.xml
index 63f78962..ea277bad 100644
--- a/app/src/main/res/drawable/shape_rate_item_end_selected.xml
+++ b/app/src/main/res/drawable/shape_bottom_rounded_corners_white.xml
@@ -9,16 +9,17 @@
~ SPDX-License-Identifier: MPL-2.0
-->
-
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_rate_item_mid_selected.xml b/app/src/main/res/drawable/shape_circle_border_purple.xml
similarity index 73%
rename from app/src/main/res/drawable/shape_rate_item_mid_selected.xml
rename to app/src/main/res/drawable/shape_circle_border_purple.xml
index 09648914..5e459d14 100644
--- a/app/src/main/res/drawable/shape_rate_item_mid_selected.xml
+++ b/app/src/main/res/drawable/shape_circle_border_purple.xml
@@ -9,10 +9,8 @@
~ SPDX-License-Identifier: MPL-2.0
-->
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/spinner_background.xml b/app/src/main/res/drawable/shape_circle_border_white.xml
similarity index 70%
rename from app/src/main/res/drawable/spinner_background.xml
rename to app/src/main/res/drawable/shape_circle_border_white.xml
index 1efe534f..7825231f 100644
--- a/app/src/main/res/drawable/spinner_background.xml
+++ b/app/src/main/res/drawable/shape_circle_border_white.xml
@@ -1,3 +1,4 @@
+
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_rate_item_end.xml b/app/src/main/res/drawable/shape_rate_item_end.xml
deleted file mode 100644
index 0e07a99c..00000000
--- a/app/src/main/res/drawable/shape_rate_item_end.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
- -
-
-
-
- -
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_rate_item_mid.xml b/app/src/main/res/drawable/shape_rate_item_mid.xml
deleted file mode 100644
index ed1db9f3..00000000
--- a/app/src/main/res/drawable/shape_rate_item_mid.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
- -
-
-
-
- -
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_rate_item_start.xml b/app/src/main/res/drawable/shape_rate_item_start.xml
deleted file mode 100644
index 95c80612..00000000
--- a/app/src/main/res/drawable/shape_rate_item_start.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
- -
-
-
-
- -
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_rounded_corners_gray_stroke.xml b/app/src/main/res/drawable/shape_rounded_corners_gray_stroke.xml
new file mode 100644
index 00000000..b7187697
--- /dev/null
+++ b/app/src/main/res/drawable/shape_rounded_corners_gray_stroke.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/font/muli_bold.ttf b/app/src/main/res/font/muli_bold.ttf
deleted file mode 100644
index 93831397..00000000
Binary files a/app/src/main/res/font/muli_bold.ttf and /dev/null differ
diff --git a/app/src/main/res/font/muli_extrabold.ttf b/app/src/main/res/font/muli_extrabold.ttf
deleted file mode 100644
index cc5ea443..00000000
Binary files a/app/src/main/res/font/muli_extrabold.ttf and /dev/null differ
diff --git a/app/src/main/res/font/muli_italic.ttf b/app/src/main/res/font/muli_italic.ttf
deleted file mode 100644
index 207ab189..00000000
Binary files a/app/src/main/res/font/muli_italic.ttf and /dev/null differ
diff --git a/app/src/main/res/font/muli_light.ttf b/app/src/main/res/font/muli_light.ttf
deleted file mode 100644
index 6bd6c60b..00000000
Binary files a/app/src/main/res/font/muli_light.ttf and /dev/null differ
diff --git a/app/src/main/res/font/muli_medium.ttf b/app/src/main/res/font/muli_medium.ttf
deleted file mode 100644
index f28c094c..00000000
Binary files a/app/src/main/res/font/muli_medium.ttf and /dev/null differ
diff --git a/app/src/main/res/font/muli_regular.ttf b/app/src/main/res/font/muli_regular.ttf
deleted file mode 100644
index 9776a3e4..00000000
Binary files a/app/src/main/res/font/muli_regular.ttf and /dev/null differ
diff --git a/app/src/main/res/font/muli_semibold.ttf b/app/src/main/res/font/muli_semibold.ttf
deleted file mode 100644
index 86d5ecc6..00000000
Binary files a/app/src/main/res/font/muli_semibold.ttf and /dev/null differ
diff --git a/app/src/main/res/font/roboto_black.ttf b/app/src/main/res/font/roboto_black.ttf
new file mode 100755
index 00000000..2d452383
Binary files /dev/null and b/app/src/main/res/font/roboto_black.ttf differ
diff --git a/app/src/main/res/font/roboto_bold.ttf b/app/src/main/res/font/roboto_bold.ttf
new file mode 100755
index 00000000..d998cf5b
Binary files /dev/null and b/app/src/main/res/font/roboto_bold.ttf differ
diff --git a/app/src/main/res/font/roboto_italic.ttf b/app/src/main/res/font/roboto_italic.ttf
new file mode 100755
index 00000000..5b390ff9
Binary files /dev/null and b/app/src/main/res/font/roboto_italic.ttf differ
diff --git a/app/src/main/res/font/roboto_light.ttf b/app/src/main/res/font/roboto_light.ttf
new file mode 100755
index 00000000..35267989
Binary files /dev/null and b/app/src/main/res/font/roboto_light.ttf differ
diff --git a/app/src/main/res/font/roboto_medium.ttf b/app/src/main/res/font/roboto_medium.ttf
new file mode 100755
index 00000000..f714a514
Binary files /dev/null and b/app/src/main/res/font/roboto_medium.ttf differ
diff --git a/app/src/main/res/font/roboto_regular.ttf b/app/src/main/res/font/roboto_regular.ttf
new file mode 100755
index 00000000..2b6392ff
Binary files /dev/null and b/app/src/main/res/font/roboto_regular.ttf differ
diff --git a/app/src/main/res/font/roboto_thin.ttf b/app/src/main/res/font/roboto_thin.ttf
new file mode 100755
index 00000000..4e797cf7
Binary files /dev/null and b/app/src/main/res/font/roboto_thin.ttf differ
diff --git a/app/src/main/res/layout/activity_confirmation.xml b/app/src/main/res/layout/activity_confirmation.xml
index 03f938b2..aeb6a6f4 100644
--- a/app/src/main/res/layout/activity_confirmation.xml
+++ b/app/src/main/res/layout/activity_confirmation.xml
@@ -40,18 +40,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_exposure.xml b/app/src/main/res/layout/activity_exposure.xml
index c59fc041..c7a2adc7 100644
--- a/app/src/main/res/layout/activity_exposure.xml
+++ b/app/src/main/res/layout/activity_exposure.xml
@@ -54,24 +54,38 @@
android:paddingEnd="16dp"
android:paddingBottom="8dp">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_qr.xml b/app/src/main/res/layout/activity_qr.xml
new file mode 100644
index 00000000..10f11e08
--- /dev/null
+++ b/app/src/main/res/layout/activity_qr.xml
@@ -0,0 +1,200 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_venue_record.xml b/app/src/main/res/layout/activity_venue_record.xml
new file mode 100644
index 00000000..3239c7e8
--- /dev/null
+++ b/app/src/main/res/layout/activity_venue_record.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_venue_visited.xml b/app/src/main/res/layout/activity_venue_visited.xml
new file mode 100644
index 00000000..54c83741
--- /dev/null
+++ b/app/src/main/res/layout/activity_venue_visited.xml
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog.xml b/app/src/main/res/layout/dialog.xml
index 23d4d83a..fc371463 100644
--- a/app/src/main/res/layout/dialog.xml
+++ b/app/src/main/res/layout/dialog.xml
@@ -14,43 +14,26 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shape_rounded_corners_white"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:paddingTop="29dp">
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_exposure_healed.xml b/app/src/main/res/layout/dialog_exposure_healed.xml
index 39fe1b78..bebcf31f 100644
--- a/app/src/main/res/layout/dialog_exposure_healed.xml
+++ b/app/src/main/res/layout/dialog_exposure_healed.xml
@@ -19,28 +19,8 @@
android:layout_height="match_parent"
android:layout_margin="15dp"
android:background="@drawable/shape_rounded_corners_white"
- android:orientation="vertical">
-
-
-
-
+ android:orientation="vertical"
+ android:paddingTop="35dp">
+ app:layout_constraintBottom_toTopOf="@id/buttonOk">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_information.xml b/app/src/main/res/layout/dialog_information.xml
new file mode 100644
index 00000000..643b7cd0
--- /dev/null
+++ b/app/src/main/res/layout/dialog_information.xml
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_legal_terms.xml b/app/src/main/res/layout/dialog_legal_terms.xml
new file mode 100644
index 00000000..7ae1ed64
--- /dev/null
+++ b/app/src/main/res/layout/dialog_legal_terms.xml
@@ -0,0 +1,158 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_loading.xml b/app/src/main/res/layout/dialog_loading.xml
index f4def12d..411a0998 100644
--- a/app/src/main/res/layout/dialog_loading.xml
+++ b/app/src/main/res/layout/dialog_loading.xml
@@ -17,7 +17,6 @@
android:background="#90000000">
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/dialog_stats_countries.xml b/app/src/main/res/layout/dialog_stats_countries.xml
new file mode 100644
index 00000000..380da579
--- /dev/null
+++ b/app/src/main/res/layout/dialog_stats_countries.xml
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_activation_page.xml b/app/src/main/res/layout/fragment_activation_page.xml
index 5c3cd173..e45a5325 100644
--- a/app/src/main/res/layout/fragment_activation_page.xml
+++ b/app/src/main/res/layout/fragment_activation_page.xml
@@ -63,55 +63,80 @@
android:layout_marginBottom="6dp"
android:text="@string/onboarding_title_step_3"
android:textColor="@color/black"
+ app:isHeading="true"
app:labelId="ONBOARDING_STEP_3_TITLE" />
-
+
+
+
+
-
+ android:layout_height="0dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/buttonCovidReport">
-
-
-
+ app:layout_constraintTop_toTopOf="parent">
-
-
-
-
-
+
+
+
+
+
+
+ app:layout_constraintTop_toTopOf="parent">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_legal_info.xml b/app/src/main/res/layout/fragment_legal_info.xml
index 14854cc9..21ca14b0 100644
--- a/app/src/main/res/layout/fragment_legal_info.xml
+++ b/app/src/main/res/layout/fragment_legal_info.xml
@@ -1,5 +1,4 @@
-
-
-
-
-
+ android:layout_height="60dp"
+ android:gravity="center_vertical"
+ android:paddingStart="16dp"
+ android:background="@drawable/background_spinner"
+ android:text="Castellano"
+ android:textColor="@color/black"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:contentDescriptionLabelId="ACC_BUTTON_SELECTOR_SELECT"
+ android:contentDescription="@string/settings_change_language_desc"
+ app:actionDescription="@string/settings_list_action"
+ app:actionDescriptionLabelId="ACC_LIST_ACTION"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_locale_selection_settings.xml b/app/src/main/res/layout/fragment_locale_selection_settings.xml
new file mode 100644
index 00000000..acc56ebe
--- /dev/null
+++ b/app/src/main/res/layout/fragment_locale_selection_settings.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_region_info.xml b/app/src/main/res/layout/fragment_region_info.xml
index 6858a68c..d4325c83 100644
--- a/app/src/main/res/layout/fragment_region_info.xml
+++ b/app/src/main/res/layout/fragment_region_info.xml
@@ -15,12 +15,15 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_stats.xml b/app/src/main/res/layout/fragment_stats.xml
new file mode 100644
index 00000000..ef209741
--- /dev/null
+++ b/app/src/main/res/layout/fragment_stats.xml
@@ -0,0 +1,282 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_step0_my_health.xml b/app/src/main/res/layout/fragment_step0_my_health.xml
new file mode 100644
index 00000000..09e8417f
--- /dev/null
+++ b/app/src/main/res/layout/fragment_step0_my_health.xml
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_step1_my_health.xml b/app/src/main/res/layout/fragment_step1_my_health.xml
new file mode 100644
index 00000000..334e7ca5
--- /dev/null
+++ b/app/src/main/res/layout/fragment_step1_my_health.xml
@@ -0,0 +1,163 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_step2_my_health.xml b/app/src/main/res/layout/fragment_step2_my_health.xml
new file mode 100644
index 00000000..e2204026
--- /dev/null
+++ b/app/src/main/res/layout/fragment_step2_my_health.xml
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_venue_home.xml b/app/src/main/res/layout/fragment_venue_home.xml
new file mode 100644
index 00000000..3168a122
--- /dev/null
+++ b/app/src/main/res/layout/fragment_venue_home.xml
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_venue_record_checkin.xml b/app/src/main/res/layout/fragment_venue_record_checkin.xml
new file mode 100644
index 00000000..f18fb6f5
--- /dev/null
+++ b/app/src/main/res/layout/fragment_venue_record_checkin.xml
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_venue_record_checkout.xml b/app/src/main/res/layout/fragment_venue_record_checkout.xml
new file mode 100644
index 00000000..9cb439a7
--- /dev/null
+++ b/app/src/main/res/layout/fragment_venue_record_checkout.xml
@@ -0,0 +1,267 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_venue_record_confirm.xml b/app/src/main/res/layout/fragment_venue_record_confirm.xml
new file mode 100644
index 00000000..f8e543b3
--- /dev/null
+++ b/app/src/main/res/layout/fragment_venue_record_confirm.xml
@@ -0,0 +1,147 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_venue_record_errorcode.xml b/app/src/main/res/layout/fragment_venue_record_errorcode.xml
new file mode 100644
index 00000000..5b5c2212
--- /dev/null
+++ b/app/src/main/res/layout/fragment_venue_record_errorcode.xml
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_venue_record_success.xml b/app/src/main/res/layout/fragment_venue_record_success.xml
new file mode 100644
index 00000000..883a14e3
--- /dev/null
+++ b/app/src/main/res/layout/fragment_venue_record_success.xml
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_welcome.xml b/app/src/main/res/layout/fragment_welcome.xml
index f2a0ae23..6e5e273f 100644
--- a/app/src/main/res/layout/fragment_welcome.xml
+++ b/app/src/main/res/layout/fragment_welcome.xml
@@ -62,6 +62,7 @@
android:layout_marginEnd="36dp"
android:layout_marginBottom="20dp"
android:text="@string/onboarding_title_step_1"
+ app:isHeading="true"
android:textColor="@color/black"
app:labelId="ONBOARDING_STEP_1_TITLE" />
@@ -106,11 +107,19 @@
style="@style/TitleTip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="50dp"
+ android:layout_marginBottom="20dp"
android:text="@string/onboarding_step1_message_end"
android:textColor="@color/black"
app:labelId="ONBOARDING_STEP_1_THANKS" />
+
+
+
+
diff --git a/app/src/main/res/layout/item_venue_header.xml b/app/src/main/res/layout/item_venue_header.xml
new file mode 100644
index 00000000..49cb6857
--- /dev/null
+++ b/app/src/main/res/layout/item_venue_header.xml
@@ -0,0 +1,18 @@
+
+
-
\ No newline at end of file
+
-
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_select_date_symptom.xml b/app/src/main/res/layout/layout_select_date_symptom.xml
new file mode 100644
index 00000000..1d45b1a8
--- /dev/null
+++ b/app/src/main/res/layout/layout_select_date_symptom.xml
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_dialog.xml b/app/src/main/res/layout/list_dialog.xml
new file mode 100644
index 00000000..350c4af4
--- /dev/null
+++ b/app/src/main/res/layout/list_dialog.xml
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml
new file mode 100644
index 00000000..a336e883
--- /dev/null
+++ b/app/src/main/res/layout/list_item.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_more_info_button.xml b/app/src/main/res/layout/view_more_info_button.xml
index c1647b08..c180f9ad 100644
--- a/app/src/main/res/layout/view_more_info_button.xml
+++ b/app/src/main/res/layout/view_more_info_button.xml
@@ -23,20 +23,22 @@
-
+
@@ -63,4 +82,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 267de859..3c71ba44 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -21,18 +21,23 @@
#FF2A2828
#FFFFFFFF
#FF939393
- #FFD3D3D3
#FF979797
+ #FF757575
#FFF0F0F0
- #FFE7E4E0
+ #FFBDBDBD
- #FF836FAC
#FF70509C
#FF65498D
- #FF7494ED
+ #FFD6CFFF
+ #FF493BA7
+ #FF006CE2
+ #CC818CC1
#FFE06C57
- #FFF19A5A
+ #FFB81C00
+ #FFE32300
#FF58B06A
+ #FF219653
+ #FF459254
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 6db35633..813ab8f4 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -12,5 +12,4 @@
16dp
- 40dp
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 053cd2cd..75eaa445 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,11 +10,17 @@
]>
+
+
+ - Registro activo
+
+
&appname;
/********** ERROR MESSAGES ************/
Error
Se ha producido un error. Compruebe la conexión
+ Se ha producido un error. Vuelve a intentarlo más tarde
/********** Play services dialog ************/
@@ -26,70 +32,13 @@
Por favor, comprueba tu conexión.
Reintentar
- /********** Splash ************/
- Seguimiento de tu exposición al Covid-19
-
/********** Legal Info ************/
- LEGAL
- Información legal
- Términos y condiciones
- Acepto la política de privacidad
- He leído las condiciones de uso
- Aceptar política de privacidad y condiciones de uso
- Recuerda que tienes que aceptar la política de privacidad para continuar
+ Acepto la Política de privacidad
+ He leído las condiciones de uso
+ Acepto política de privacidad
+ He leído las condiciones de uso
Continuar
- /********** Legal Detail ************/
- CONDICIONES DE USO DE &appname;
- AL DESCARGAR Y USAR LA APLICACIÓN MÓVIL “Radar COVID” MANIFIESTAS QUE HAS LEÍDO Y ACEPTAS ESTAS CONDICIONES DE USO Y LA POLÍTICA DE PRIVACIDAD. AQUÍ SE RECOGE TODA LA INFORMACIÓN RELATIVA A TUS DERECHOS Y OBLIGACIONES COMO USUARIO DE ESTA APLICACIÓN.\n\nAVISO IMPORTANTE: \n\n• El USUARIO de esta aplicación queda avisado de que al descargar la aplicación en su dispositivo móvil y utilizarla, se está limitando a participar voluntariamente en una EXPERIENCIA PILOTO CON DATOS FICTICIOS de alerta de contagios de la COVID-19 en LA ISLA DE LA GOMERA. \n\n• Se informa asimismo de que esta aplicación dejará de funcionar una vez que termine la experiencia piloto.\n\n• Por tanto, en el uso de la aplicación, todas las notificaciones de exposiciones a posible contagio de la enfermedad que el usuario pueda recibir corresponden a supuestos simulados y, por el mismo motivo, al tratarse de una experiencia piloto con datos ficticios, las sugerencias de adopción de medidas preventivas y asistenciales que tras esa notificación le facilite la aplicación no tienen otro valor que comprobar que la aplicación es capaz de facilitar sugerencias de ese tipo a un usuario que recibiera una notificación de exposición a posible contagio. \n\n• Tanto en el marco de esta experiencia piloto con datos ficticios como en el caso de que la aplicación se hubiera utilizado en situaciones reales con datos reales , el USUARIO queda avisado de que la utilización de la Aplicación NO CONSTITUYE EN NINGÚN CASO UN SERVICIO DE DIAGNÓSTICO MÉDICO, DE ATENCIÓN DE URGENCIAS O DE PRESCRIPCIÓN DE TRATAMIENTOS FARMACOLÓGICOS , pues la utilización de la Aplicación no podría en ningún caso sustituir la consulta presencial personal frente a un profesional médico debidamente cualificado.
- 1. Qué es &appname; &appname; es una aplicación que promueve la salud pública mediante un sistema de alerta de contagios por la COVID-19, poniendo a disposición de los USUARIOS (en adelante, individualmente, el “USUARIO”, y conjuntamente los “USUARIOS”), la posibilidad de navegar por la Aplicación, accediendo a los contenidos y servicios de Radar COVID, de acuerdo con las presentes CONDICIONES DE USO.\n\nRadar COVID detecta la intensidad de señales Bluetooth intercambiadas entre dispositivos que tienen esta aplicación activa, mediante el empleo de identificadores aleatorios efímeros, que no guardan relación con la identidad del teléfono móvil empleado o el USUARIO. El dispositivo de cada USUARIO descarga periódicamente las claves Bluetooth de todos los USUARIOS de la aplicación que hayan informado a través de la misma que se les ha diagnosticado COVID-19 (previa acreditación de las autoridades sanitarias), procediendo a determinar si el USUARIO ha establecido contacto de riesgo con alguno de ellos, verificado por las señales Bluetooth intercambiadas. Si es el caso, la aplicación le notifica este hecho, a fin de que pueda para tomar medidas, y contribuir de este modo a evitar que el virus se propague.
- 2. Uso de &appname; Para la utilización de los servicios de Radar COVID, es requisito necesario que el USUARIO autorice la activación del sistema de comunicaciones Bluetooth de baja energía por parte de la Aplicación, tras la descarga de la misma.\n\nEl USUARIO acepta sin reserva el contenido de las presentes CONDICIONES DE USO. En consecuencia, el USUARIO deberá leer detenidamente las mismas antes del acceso y de la utilización de cualquier servicio de Radar COVID bajo su entera responsabilidad.\n\nAVISO IMPORTANTE: La utilización de la Aplicación es gratuita, libre y voluntaria para todos los ciudadanos. Para utilizar Radar COVID no es necesario estar registrado, ni aportar ningún dato personal, identificativo o no identificativo. Al activar la aplicación, el USUARIO acepta:\n\na) el envío de señales Bluetooth emitidas de forma anónima por su dispositivo;\n\nb) la recepción y almacenamiento de señales Bluetooth de aplicaciones compatibles con Radar COVID, que se mantienen de forma anónima y descentralizada en los dispositivos de los USUARIOS durante un periodo no superior a 14 días;\n\ny c) la información ofrecida al USUARIO sobre el posible riesgo de contagio, sin que en ningún momento se refieran datos personales de ningún tipo.\n\nEl USUARIO puede informar voluntariamente a la aplicación de un resultado positivo en sus pruebas de COVID-19 mediante el código de confirmación de un solo uso facilitado por las autoridades sanitarias. La validez de este código será cotejada por las autoridades sanitarias para asegurar el correcto funcionamiento de Radar COVID. El USUARIO informará de los resultados de sus pruebas y se le solicitará el consentimiento expreso e inequívoco para compartir las claves generadas diariamente en su dispositivo, y correspondientes a los últimos 14 días. Estas claves son comunicadas a un servidor que las pondrá a disposición del conjunto de aplicaciones Radar COVID para su descarga. Las claves comunicadas no guardan relación alguna con la identificación del dispositivo o el USUARIO.\n\nNo se producirá ninguna discriminación a los potenciales pacientes que requieran servicios sanitarios y no hayan utilizado la aplicación.
- 3. Seguridad y privacidad Las medidas de seguridad implantadas se corresponden con las previstas en el anexo II (Medidas de seguridad) del Real Decreto 3/2010, de 8 de enero, por el que se regula el Esquema Nacional de Seguridad en el ámbito de la Administración Electrónica.\n\nTe informamos que tus datos serán tratados conforme a lo establecido en la Política de Privacidad de la Aplicación , cuyo contenido íntegro se puede consultar en el siguiente enlace: Política de Privacidad .\n\nToda la información se tratará con fines estrictamente de interés público en el ámbito de la salud pública, y ante la situación de emergencia sanitaria decretada, a fin de proteger y salvaguardar un interés esencial para la vida de las personas, en los términos descritos en la política de privacidad. \n\nLa información de la actividad de los USUARIOS es anónima y en ningún momento se exigirá a los USUARIOS ningún dato personal. En todo momento, el USUARIO puede desactivar el sistema de traza de contactos Bluetooth en la aplicación, así como desinstalar la misma.
- 4. Cambio del servicio y terminación Radar COVID siempre está tratando de mejorar el servicio y busca ofrecer funcionalidades adicionales útiles para el USUARIO teniendo siempre presente la preservación de la salud pública. Esto significa que podemos añadir nuevas funciones o mejoras que en ningún caso implicarán el tratamiento de datos personales, así como eliminar algunas de las funciones. Si estas acciones afectan materialmente a los derechos y obligaciones del USUARIO, será informado a través de la Aplicación.\n\nEl USUARIO puede dejar de utilizar la aplicación en cualquier momento y por cualquier motivo, desinstalándola de su dispositivo.
- 5. Propiedad intelectual e industrial La Secretaría General de Administración Digital (SGAD), dependiente de la Secretaría de Estado de Digitalización e Inteligencia Artificial del Ministerio de Asuntos Económicos y Transformación Digital, es la propietaria y TITULAR de todos los derechos de propiedad industrial e intelectual relativos a la Aplicación Radar COVID para dispositivos móviles en todo el territorio nacional.\n\nLos textos, diseños, imágenes, bases de datos, logos, estructura, marcas y demás elementos de Radar COVID están protegidos por las leyes y los tratados internacionales sobre propiedad intelectual e industrial. Cualquier reproducción, transmisión, adaptación, traducción, modificación, comunicación al público, o cualquier otra explotación de todo o parte del contenido de este sitio, efectuada de cualquier forma o por cualquier medio, electrónico, mecánico u otro, están estrictamente prohibidos salvo autorización previa por escrito de su correspondiente TITULAR. Cualquier infracción de estos derechos puede dar lugar a procedimientos extrajudiciales o judiciales civiles o penales que correspondan.\n\nEn este sentido, se otorga al USUARIO únicamente una licencia limitada, temporal, no exclusiva y revocable para que pueda utilizar, descargar y/o instalar Radar COVID en sus dispositivos, conforme a lo previsto en estas condiciones y para los usos previstos. En todo caso, el TITULAR se reserva los derechos no expresamente otorgados al USUARIO en virtud de las presentes condiciones.\n\nLa legitimidad de los derechos de propiedad intelectual o industrial correspondientes a los contenidos aportados por terceros es de la exclusiva responsabilidad de los mismos.\n\nA los efectos de preservar los posibles derechos de propiedad intelectual, en el caso de que cualquier USUARIO o un tercero considere que se ha producido una violación de sus legítimos derechos por la introducción de un determinado contenido en el Radar COVID, deberá notificar dicha circunstancia, por escrito, al TITULAR.
- 6. Responsabilidad y obligaciones Radar COVID se ofrece dedicando los mejores esfuerzos, dado que su calidad y disponibilidad pueden verse afectadas por múltiples factores ajenos al TITULAR como son, entre otros, el volumen de USUARIOS en la ubicación geográfica del USUARIO, limitaciones o restricciones de las redes de terceros operadores o la compatibilidad del dispositivo y sistema operativo utilizado por el USUARIO. Igualmente, los USUARIOS aceptan que el servicio pueda verse interrumpido cuando sea necesario por labores de mantenimiento.\n\nPor todo ello, el TITULAR no será responsable de los problemas de acceso o disponibilidad de Radar COVID y/o sus servicios, ni de los perjuicios que se pudieran causar por ello, cuando éstos procedan de factores ajenos a su ámbito de control. Igualmente, el TITULAR no se hace responsable de los siguientes hechos, ni de fallos, incompatibilidades y/o daños de tus terminales o dispositivos que, en su caso, se pudiesen derivar de la descarga y/o uso de la Aplicación:\n\n1.Actualización, exactitud, exhaustividad, pertinencia, actualidad y fiabilidad de sus contenidos, cualquiera que sea la causa y las dificultades o problemas técnicos o de otra naturaleza en los que tengan su origen dichos hechos.\n\n2.La calidad, titularidad, legitimidad, adecuación o pertinencia de los materiales, y demás contenidos.\n\nComo USUARIO de la Aplicación te obligas a:\n\n1.Impedir el acceso de terceras personas no autorizadas a la aplicación desde tu dispositivo.\n\n2.Notificar al TITULAR con carácter inmediato cualquier indicio de la existencia de una violación en la seguridad en la Aplicación, de usos inapropiados o prohibidos de los servicios prestados desde la misma, o de fallos de seguridad de cualquier índole.\n\n 3.Hacer buen uso de los contenidos, información y servicios prestados desde o a través de la Aplicación, conforme a la ley, la buena fe y a las buenas costumbres generalmente aceptadas, comprometiéndose expresamente a:\n\n3.1.Abstenerse de realizar prácticas o usos de los servicios con fines ilícitos, fraudulentos, lesivos de derechos o intereses del TITULAR o de terceros, infractores de las normas contenidas en el presente documento.\n\n3.2.Abstenerse de realizar cualquier tipo de acción que pudiera inutilizar, sobrecargar o dañar sistemas, equipos o servicios de la Aplicación o accesibles directa o indirectamente a través de esta.\n\n3.3.Respetar los derechos de propiedad intelectual e industrial del TITULAR y de terceros sobre los contenidos, información y servicios prestados desde o a través de la Aplicación, absteniéndose con carácter general de copiar, distribuir, reproducir o comunicar en forma alguna los mismos a terceros, de no mediar autorización expresa y por escrito del TITULAR o de los titulares de dichos derechos.\n\n3.4.No proporcionar información falsa en la Aplicación, siendo el único responsable de la comunicación real y veraz.\n\n3.5.No suplantar la personalidad de un tercero.\n\nEl USUARIO de la Aplicación es el único responsable del uso que decida realizar de los servicios de Radar COVID. El incumplimiento de las obligaciones como USUARIO podrá implicar la baja inmediata de la Aplicación y/o sus servicios; todo ello sin derecho a recibir compensación de ningún tipo, y sin perjuicio de las correspondientes acciones legales a que por parte del TITULAR hubiere lugar.\n\nEl TITULAR no será responsable en ningún caso de la utilización indebida de Radar COVID y de sus contenidos, siendo el USUARIO el único responsable por los daños y perjuicios que pudieran derivarse de un mal uso de estos o de la infracción de lo dispuesto en las presentes condiciones en que pueda incurrir. El USUARIO se compromete a mantener indemne al TITULAR frente a las reclamaciones o sanciones que pudiera recibir de terceros, ya sean particulares o entidades públicas o privadas, por razón de dichas infracciones, así como frente a los daños y perjuicios de todo tipo que pueda sufrir como consecuencia de las mismas.\n\nEn cualquier caso, el TITULAR se reserva, en cualquier momento y sin necesidad de previo aviso, el derecho de modificar o eliminar el contenido, estructura, diseño, servicios y condiciones de acceso y/o uso de esta Aplicación, siempre que lo estime oportuno, siempre que dicho cambio no afecte a los principios y derechos de protección de datos, así como el derecho interpretar las presentes condiciones, en cuantas cuestiones pudiera plantear su aplicación.\n\nAsimismo, queda prohibida la reproducción, distribución, transmisión, adaptación o modificación, por cualquier medio y en cualquier forma, de los contenidos de Radar COVID o sus cursos (textos, diseños, gráficos, informaciones, bases de datos, archivos de sonido y/o imagen, logos y demás elementos de estos sitios), salvo autorización previa de sus legítimos titulares.\n\nLa enumeración anterior tiene mero carácter enunciativo y no es, en ningún caso, exclusivo ni excluyente en ninguno de sus puntos. En todos los supuestos, El TITULAR EXCLUYE CUALQUIER RESPONSABILIDAD POR LOS DAÑOS Y PERJUICIOS DE CUALQUIER NATURALEZA DERIVADOS DIRECTA O INDIRECTAMENTE DE LOS MISMOS Y DE CUALESQUIERA OTROS NO ESPECIFICADOS DE ANÁLOGAS CARACTERISTICAS.\n\nEl TITUTAR NO OFRECE NINGUNA GARANTÍA, EXPRESA, IMPLÍCITA, LEGAL O VOLUNTARIA.\n\nEL TITULAR EXCLUYE EXPRESAMENTE TODAS LAS GARANTÍAS IMPLÍCITAS, INCLUYENDO, A TÍTULO ENUNCIATIVO, PERO NO LIMITATIVO, CUALQUIER GARANTÍA IMPLÍCITA O SANEAMIENTO DE VICIOS OCULTOS, COMERCIABILIDAD, CALIDAD SATISFACTORIA, TÍTULO, IDONEIDAD DEL PRODUCTO PARA UN PROPÓSITO EN PARTICULAR Y CUALQUIER GARANTÍA O CONDICIÓN DE NO INFRACCIÓN. ESTA EXCLUSIÓN DE RESPONSABILIDAD SÓLO SE APLICARÁ EN LA MEDIDA PERMITIDA POR LA LEY IMPERATIVA APLICABLE.
- 7. Enlaces Radar COVID puede incluir dentro de sus contenidos enlaces con sitios pertenecientes y/o gestionados por terceros con el objeto de facilitar el acceso a información y servicios disponibles a través de Internet.\n\nEl TITULAR no asume ninguna responsabilidad derivada de la existencia de enlaces entre los contenidos de Radar COVID y contenidos situados fuera de los mismos o de cualquier otra mención de contenidos externos a este sitio, exceptuando aquellas responsabilidades establecidas en la normativa de protección de datos. Tales enlaces o menciones tienen una finalidad exclusivamente informativa y, en ningún caso, implican el apoyo, aprobación, comercialización o relación alguna entre el TITULAR y las personas o entidades autoras y/o gestoras de tales contenidos o titulares de los sitios donde se encuentren, ni garantía alguna del TITULAR por el correcto funcionamiento de los sitios o contenidos enlazados.\n\nEn este sentido el USUARIO se obliga a poner la máxima diligencia y prudencia en el caso de acceder o usar contenidos o servicios de los sitios a los que acceda en virtud de los mencionados enlaces.
- 8. Hiperenlaces No se admite la reproducción de páginas de Radar COVID mediante hiperenlace desde otra Aplicación móvil o página web, permitiéndose exclusivamente el acceso desde la Aplicación.\n\nEn ningún caso se podrá dar a entender que el TITULAR autoriza el hiperenlace o que ha supervisado o asumido de cualquier forma los servicios o contenidos ofrecidos por la web desde la que se produce el hiperenlace.\n\nNo se podrán realizar manifestaciones o referencias falsas, incorrectas o inexactas sobre las páginas y servicios del TITULAR.\n\nSe prohíbe explícitamente la creación de cualquier tipo de navegador, programa, “browser” o “border environment” sobre las páginas de Radar COVID.\n\nNo se podrán incluir contenidos contrarios a los derechos de terceros, ni contrarios a la moral y las buenas costumbres aceptadas, ni contenidos o informaciones ilícitas, en la página web desde la que se establezca el hiperenlace.\n\nLa existencia de un hiperenlace entre una página web y el Radar COVID no implica la existencia de relaciones entre el TITULAR y el propietario de esa página, ni la aceptación y aprobación de sus contenidos y servicios.
- 9. Ley aplicable y fuero Las presentes condiciones de uso se regirán e interpretarán en todos y cada uno de sus extremos por la Ley Española. En aquellos casos en los que la normativa vigente no prevea la obligación de someterse a un fuero o legislación determinado, el TITULAR y los USUARIOS, con renuncia a cualquier otro fuero que pudiera corresponderles, se someten a los juzgados y tribunales de Madrid capital (España).
- 10. Información corporativa y contacto Dirección: Calle de Manuel Cortina, 2, 28010 Madrid\n\nEl soporte al USUARIO en caso de incidencias y/o reclamaciones será principalmente online y atendido a la mayor brevedad: contacto@covid19.gob.es
-
- POLÍTICA DE PRIVACIDAD DE LA APLICACIÓN &appname;
- Por favor, lee detenidamente esta política de privacidad para usuarios de la aplicación móvil “Radar COVID” (o la “Aplicación”), donde podrás encontrar toda la información sobre los datos que utilizamos, cómo lo usamos y qué control tienes sobre los mismos.\n\n\nAVISO IMPORTANTE: \n\n• El USUARIO de esta aplicación queda avisado de que al descargar la aplicación en su dispositivo móvil y utilizarla, se está limitando a participar voluntariamente en una EXPERIENCIA PILOTO CON DATOS FICTICIOS de alerta de contagios de la COVID-19 en LA ISLA DE LA GOMERA. \n\n• Se informa asimismo de que esta aplicación dejará de funcionar una vez que termine la experiencia piloto.\n\n• Por tanto, en el uso de la aplicación, todas las notificaciones de exposiciones a posible contagio de la enfermedad que el usuario pueda recibir corresponden a supuestos simulados y, por el mismo motivo, al tratarse de una experiencia piloto con datos ficticios, las sugerencias de adopción de medidas preventivas y asistenciales que tras esa notificación le facilite la aplicación no tienen otro valor que comprobar que la aplicación es capaz de facilitar sugerencias de ese tipo a un usuario que recibiera una notificación de exposición a posible contagio. \n\n• Tanto en el marco de esta experiencia piloto con datos ficticios como en el caso de que la aplicación se hubiera utilizado en situaciones reales con datos reales, el USUARIO queda avisado de que la utilización de la Aplicación NO CONSTITUYE EN NINGÚN CASO UN SERVICIO DE DIAGNÓSTICO MÉDICO, DE ATENCIÓN DE URGENCIAS O DE PRESCRIPCIÓN DE TRATAMIENTOS FARMACOLÓGICOS, pues la utilización de la Aplicación no podría en ningún caso sustituir la consulta presencial personal frente a un profesional médico debidamente cualificado.
- 1. ¿Qué es Radar COVID? Radar COVID es una aplicación para dispositivos móviles de alerta de contagios del virus SARS-CoV-2, cuyo TITULAR es la Secretaría General de Administración Digital, dependiente de la Secretaría de Estado de Digitalización e Inteligencia Artificial del Ministerio de Asuntos Económicos y Transformación Digital.\n\nGracias a Radar COVID, aquellos usuarios que se hayan descargado la aplicación y acepten su uso recibirán una notificación en caso de que en los catorce días anteriores a esa notificación hayan estado expuestos a un contacto epidemiológico (a menos de dos metros y más de 15 minutos) con otro usuario (totalmente anónimo) que haya declarado en la aplicación haber dado un resultado positivo en la prueba de COVID 19 (previa acreditación de las autoridades sanitarias). La aplicación le informará exclusivamente sobre el día (dentro de esos catorce anteriores) en que se haya producido la exposición al contacto pero no sobre la identidad del usuario al que haya quedado expuesto (información imposible al ser una aplicación que no solicita, utiliza ni almacena datos de carácter personal de los usuarios) ni la identificación del dispositivo de este, ni sobre el momento o lugar en que la exposición se haya producido.\n\nRecibida una notificación, la aplicación facilitará al usuario expuesto información para la adopción de medidas preventivas y asistenciales, para contribuir con ello a contener la propagación del virus.\n\nEl éxito de la aplicación como herramienta que contribuya a la contención de la propagación está directamente vinculado a que los usuarios sean conscientes, y actúen en consecuencia, de que, a pesar de que comunicar a la aplicación que se ha obtenido un resultado positivo en la prueba de COVID 19 (previa acreditación de las autoridades sanitarias) es voluntario, el no comunicarlo y ser un mero receptor de información de terceros usuarios hace que la aplicación pierda su utilidad preventiva no solo para los demás usuarios sino para el resto de la población en general. El carácter completamente anónimo debería animar, sin duda, al ejercicio de esta actuación responsable.
- 2. ¿Cómo funciona la aplicación? Una vez que te hayas descargado la aplicación, aceptes las condiciones de uso y la política de privacidad y comiences a utilizarla, tu dispositivo móvil generará cada día un identificador pseudo-aleatorio llamado “clave de exposición temporal” con un tamaño de 16 caracteres (16 bytes o 128 bits) que servirá para derivar los “identificadores efímeros Bluetooth” que son intercambiados con otros teléfonos móviles próximos que también tengan descargada la aplicación RadarCOVID.\n\nLos “identificadores efímeros Bluetooth” son códigos pseudo-aleatorios con un tamaño de 16 caracteres (16 bytes, o 128 bits), que se generan por tu teléfono móvil cada 10-20 minutos, a partir de la “clave de exposición temporal” diaria. Estos códigos no contienen información personal, que permita identificar al teléfono móvil o al usuario del mismo. Estos “identificadores efímeros Bluetooth” son transmitidos por tu teléfono móvil varias veces por segundo a dispositivos cercanos, accesibles a través de Bluetooth Low Energy, produciendo un intercambio de códigos aleatorios entre dispositivos para que puedan ser almacenados por teléfonos próximos que hayan descargado la aplicación. De igual manera, cada cinco minutos, tu teléfono móvil escuchará los identificadores efímeros Bluetooth que son transmitidos por otros teléfonos móviles que tengan la aplicación y los almacenará para calcular si has estado con otro usuario contagiado por COVID-19 a lo largo de los últimos 14 días.\n\nTu teléfono almacena las claves de exposición temporal que has generado en los últimos 14 días. Recuerda que estas claves se generan aleatoriamente y no sirven para identificar a tu teléfono móvil ni al USUARIO del mismo.\n\nSi has recibido un diagnóstico positivo por COVID-19, puedes introducir voluntariamente en la aplicación el “código de confirmación de un solo uso” que te facilitará tu Servicio Público de Salud y que será validado en nuestro servidor. En ese momento, la aplicación te solicitará tu consentimiento para remitir a nuestro servidor las 14 últimas claves de exposición temporal almacenadas en tu teléfono, por tanto, solo si lo prestas, éstas se enviarán al servidor de la aplicación que, después de verificar la exactitud del código, servirán para componer un listado diario de claves de exposición temporal de personas contagiadas por COVID-19 que son descargados diariamente desde el servidor por todas las aplicaciones Radar COVID que estén en funcionamiento.\n\nLa información de estos listados sirve para que en tu propio teléfono se pueda comprobar si has tenido contacto estrecho (menos de dos metros y más de 15 minutos) con personas que han reportado un contagio por COVID-19, sin identificar ni a la persona, ni el lugar de la exposición, ni el dispositivo móvil, ni ningún dato personal tuyo o de la otra persona. Es decir, la aplicación descarga periódicamente las claves de exposición temporal compartidas voluntariamente por los usuarios diagnosticados por COVID-19 del servidor, para compararlas con los códigos aleatorios registrados en los días anteriores como resultado de contactos con otros usuarios. Si se encuentra una coincidencia, la aplicación ejecuta un algoritmo en el dispositivo que, en función de la duración y la distancia estimada del contacto, y de acuerdo con los criterios establecidos por las autoridades sanitarias, decide si se muestra una notificación en el dispositivo del usuario expuesto al riesgo de contagio, advirtiéndole del contacto, comunicándole la fecha del mismo e invitándolo a auto-confinarse, y contactar con las autoridades sanitarias.\n\nEstas claves remitidas al servidor no permiten la identificación directa de los usuarios y son necesarias para garantizar el correcto funcionamiento del sistema de alerta de contagios.
- 3. ¿Qué datos tratamos sobre ti? Los datos manejados por la aplicación no permiten la identificación directa del usuario o de su dispositivo, y son solo los necesarios para el único fin de informarte de que has estado expuesto a una situación de riesgo de contagio por la COVID-19, así como para facilitar la posible adopción de medidas preventivas y asistenciales.\n\nEn ningún caso se rastrearán los movimientos de los USUARIOS, excluyendo así cualquier forma de geolocalización.\n\nComo parte del sistema de alerta de contagios de la COVID-19, se procesarán los siguientes datos para los usuarios que hayan dado positivo por COVID-19 para los fines especificados a continuación:\n\n1. Las claves de exposición temporal con las que el dispositivo del usuario ha generado los códigos aleatorios enviados (identificadores efímeros Bluetooth), a los dispositivos con los que el usuario ha entrado en contacto, hasta un máximo de 14 días anteriores. Estas claves no guardan relación alguna con la identidad del USUARIO, y se suben al servidor para que puedan ser descargadas por aplicaciones similares en poder de otros usuarios. Con estas claves, mediante un procesamiento que tiene lugar en el teléfono móvil de forma descentralizada, se puede advertir al USUARIO sobre el riesgo de contagio por haber estado en contacto reciente con una persona que ha sido diagnosticada por COVID-19, sin que la aplicación pueda derivar su identidad o el lugar donde tuvo lugar el contacto.\n\n2. Un código de confirmación de un solo uso de 12 dígitos facilitado por las autoridades sanitarias en caso de prueba positiva por COVID-19. Este código debe ser informado por el usuario para permitir la carga voluntaria de las claves de exposición al servidor.\n\n3. Cuestionario voluntario para la recogida de información sobre la experiencia de uso de la aplicación, comprensión de la misma o percepción sobre la privacidad entre otros.\n\nToda la información se recogerá con fines estrictamente de interés público en el ámbito de la salud pública, y ante la situación de emergencia sanitaria decretada, a fin de proteger y salvaguardar un interés esencial para la vida de las personas, en los términos descritos en esta política de privacidad. \n\nLa legislación aplicable se enumera a continuación:\n\n1. Reglamento (UE) 2016/679, de 27 de abril de 2016, relativo a la protección de las personas físicas en lo que respecta al tratamiento de datos personales y a la libre circulación de estos datos y por el que se deroga la Directiva 95/46/CE (Reglamento General de Protección de Datos).\n\n2. Ley Orgánica 3/2018, de 5 de diciembre, de Protección de Datos Personales y garantía de los derechos digitales.\n\n3. Ley 14/1986, de 25 de abril, General de Sanidad\n\n4. Ley Orgánica 3/1986, de 14 de abril, de Medidas Especiales en Materia de Salud Pública.\n\n5. Ley 33/2011, de 4 de octubre, General de Salud Pública.\n\n6. Real Decreto 463/2020 de 14 de marzo, por el que se declara el estado de alarma para la gestión de la situación de crisis sanitaria ocasionada por el COVID-19 que atribuye al Ministro de Sanidad la necesaria competencia en todo el territorio nacional.\n\n7. Orden Ministerial SND/297/2020 de 27 de marzo, por la que se encomienda a la Secretaría de Estado de Digitalización e Inteligencia Artificial, del Ministerio de Asuntos Económicos y Transformación Digital, el desarrollo de nuevas actuaciones para la gestión de la crisis sanitaria ocasionada por el COVID-19.
- 4. Cómo obtenemos y de dónde proceden tus datos? El código de confirmación de positivo por COVID-19 facilitado por el Servicio Público de Salud. Esto permitirá la subida al servidor del sistema de alerta de contagios las claves de exposición temporal con las que el dispositivo del usuario ha generado los códigos aleatorios enviados (identificadores efímeros Bluetooth), a los dispositivos con los que el usuario ha entrado en contacto, hasta un máximo de 14 días anteriores. Estas claves únicamente se suben al servidor con el consentimiento explícito e inequívoco del USUARIO, al haber introducido un código de confirmación de positivo por COVID-19.
- 5. ¿Para qué y por qué utilizamos tus datos? La recogida, almacenamiento, modificación, estructuración y en su caso, eliminación, de los datos generados, constituirán operaciones de tratamiento llevadas a cabo por el Titular, con la finalidad de garantizar el correcto funcionamiento de la App, mantener la relación de prestación del servicio con el Usuario, y para la gestión, administración, información, prestación y mejora del servicio.\n\nLa información y datos recogidos a través de la Aplicación serán tratados con fines estrictamente de interés público en el ámbito de la salud pública, ante la actual situación de emergencia sanitaria como consecuencia de la pandemia del COVID-19 y la necesidad de su control y propagación, así como para garantizar intereses vitales tuyos o de terceros, de conformidad con la normativa de protección de datos vigente.\n\nA tal efecto, utilizamos tus datos para prestarte el servicio de “Radar COVID” y para que puedas hacer uso de sus funcionalidades de acuerdo con sus condiciones de uso. De conformidad con el Reglamento General de Protección de Datos (RGPD) así como cualquier legislación nacional que resulte aplicable, la Secretaría General de Administración Digital tratará todos los datos generados durante el uso de la App para las siguientes finalidades:\n\n1.Ofrecerte información sobre contactos considerados de riesgo de exposición a la COVID-19.\n\n2.Proporcionarte consejos prácticos y recomendaciones de acciones a seguir según se produzcan situaciones de riesgo de cara a la cuarentena o auto-cuarentena.\n\nEste tratamiento se llevará a cabo a través de la funcionalidad de alerta de contagios que permite identificar situaciones de riesgo por haber estado en contacto estrecho con personas usuarias de la aplicación que se encuentran infectadas por la COVID-19. De esta manera se te informará de las medidas que conviene adoptar después.
- 6. ¿Durante cuánto tiempo conservamos tus datos? Las claves de exposición temporal y los identificadores efímeros de Bluetooth son almacenados en el dispositivo por un periodo de 14 días, después de los cuales son eliminados.\n\nAsimismo, las claves de exposición temporal que hayan sido comunicadas al servidor por los USUARIOS diagnosticados como positivos por COVID-19 también serán eliminadas del servidor al cabo de 14 días.\n\nEn todo caso, ni las claves de exposición temporal ni los identificadores efímeros de Bluetooth contienen datos de carácter personal ni permiten identificador los teléfonos móviles de los usuarios.
- 7. ¿Quién tiene acceso a tus datos? Ni la aplicación “Radar COVID” ni el servidor de alerta de contagios almacenan datos personales de ningún tipo.\n\nLos datos gestionados por la aplicación móvil (claves diarias de exposición temporal e identificadores efímeros Bluetooth) se almacenan únicamente en el dispositivo del usuario a los efectos de poder hacer cálculos y derivar informes al USUARIO sobre su riesgo de exposición a la COVID-19.\n\nSolo en el caso de reportar un diagnóstico positivo por COVID-19, las claves de exposición temporal de los últimos 14 días generadas en el dispositivo, y bajo el consentimiento explícito e inequívoco del USUARIO, son subidas al servidor para su difusión al conjunto de USUARIOS de este sistema.\n\nEstas claves no guardan relación alguna con la identidad de los dispositivos móviles ni con datos personales de los USUARIOS de la Aplicación.
- 8. ¿Cuáles son tus derechos y cómo puedes controlar tus datos? Dado que la aplicación Radar COVID no almacena datos personales, no son de aplicación los derechos de acceso, rectificación, supresión, limitación, oposición y portabilidad, así como a no ser objeto de decisiones basadas únicamente en el tratamiento automatizado de sus datos.\n\nEn todo caso, tenemos obligación de indicarte que te asiste en todo momento el derecho para presentar una reclamación ante Agencia Española de Protección de Datos (www.aepd.es).
- 9. ¿Cómo protegemos tus datos? El sistema Radar COVID no almacena datos personales.\n\nEn todo caso, las medidas de seguridad implantadas se corresponden con las previstas en el anexo II (Medidas de seguridad) del Real Decreto 3/2010, de 8 de enero, por el que se regula el Esquema Nacional de Seguridad en el ámbito de la Administración Electrónica.\n\nFinalmente, te informamos que tanto el almacenamiento como el resto de las actividades del tratamiento de datos no personales utilizados estarán siempre ubicados dentro de la Unión Europea.
- 10. ¿Cuál es la legitimación para el tratamiento de tus datos? Los datos generados se tratarán legítimamente con las siguientes bases legales:\n\n1.El consentimiento del usuario libre, específico, informado e inequívoco del USUARIO, poniendo a su disposición la presente política de privacidad, que deberá aceptar mediante el marcado de la casilla dispuesta al efecto.\n\n2.Razones de interés público en el ámbito de la salud pública, como la protección frente a amenazas transfronterizas graves para la salud (artículo 9.2 i) del RGPD), para el tratamiento de los datos de salud (por ejemplo, el estado de una persona contagiada o información sobre síntomas, etc.).\n\n3.Cumplimiento de una misión realizada en interés público o en el ejercicio de poderes públicos conferidos al responsable del tratamiento (artículo 6.1 e) RGPD).\n\n4.Fines de archivo de interés público, fines de investigación científica o histórica o fines estadísticos (artículo 9.2 j) RGPD).\n\nEl Titular de la Aplicación podrá dar acceso o transmitir los datos a terceros proveedores de servicios, con los que haya suscrito acuerdos de encargo de tratamiento de datos, y que únicamente accedan a dicha información para prestar un servicio en favor y por cuenta del Responsable.
- 11. ¿Qué tienes que tener especialmente en cuenta al utilizar "Radar COVID"? Has de tener en cuenta determinados aspectos relativos a la edad mínima de utilización de Aplicación, la calidad de los datos que nos proporcionas, así como la desinstalación de la Aplicación en tu dispositivo móvil.\n\n1.Edad mínima de utilización: para poder utilizar “Radar COVID” tienes que ser mayor de 18 años o contar con la autorización de tus padres y/o tutores legales. Por tanto, al darte de alta en la Aplicación, garantizas al Titular que eres mayor de dicha edad o, en caso contrario, que cuentas con la mencionada autorización.\n\n2.Calidad de los datos que nos proporcionas: la información que nos facilites en el uso de los servicios de la Aplicación deberá de ser siempre real, veraz y estar actualizada.\n\n3.Desinstalación de la Aplicación: en general, puede haber dos situaciones en las que se proceda a la desactivación técnica de la Aplicación en tu dispositivo: 1) que lo realices voluntariamente, y 2) que desde el Titular se proceda a la desactivación técnica de la Aplicación en tu dispositivo (p.ej. en casos en los que detectemos que has incumplido las condiciones de uso de la Aplicación).
- 12. Política de cookies Utilizamos solamente cookies técnicas que permiten al usuario la navegación y la utilización de las diferentes opciones o servicios que se ofrecen en la Aplicación como, por ejemplo, acceder a partes de acceso restringido o utilizar elementos de seguridad durante la navegación.\n\n\nHe leído el documento POLÍTICA DE PRIVACIDAD DE LA APLICACIÓN “Radar COVID”.
-
/********** Onboarding ************/
Bienvenido a &appname;
Para darte el mejor servicio, por favor, selecciona tu idioma. Si no es castellano, reinicia Radar COVID después de seleccionar
@@ -97,7 +46,7 @@
Comunica de forma anónima tu diagnóstico Covid positivo.
Si estuvieras afectado, comunicaremos la exposición de forma anónima a las personas con las que has estado en contacto.
Gracias por cuidarte y ayudarnos a proteger a los demás.
-
+ IMPORTANTE: La App Radar COVID se ha puesto ya a disposición de todas las Comunidades Autónomas y comenzará a estar activa en cada una de ellas según éstas se vayan incorporando. Tu privacidad es nuestra prioridad
Nuestros compromisos
@@ -115,50 +64,55 @@
Visita la App con frecuencia para visualizar tu grado de exposición al coronavirus.
03
En caso de haber estado expuesto o reportar un diagnóstico positivo sigue las indicaciones que te enviaremos.
- Gracias a la tecnología contact tracing Bluetooth, guardamos las interacciones entre los teléfonos que están próximos entre sí: así, si un usuario confirma que tiene Covid-19, el histórico de teléfonos cercanos nos permite alertar a aquellos que estuvieron cerca para que tomen precauciones . Pero ¡siempre con privacidad asegurada! Los teléfonos cercanos se almacenan con ids cambiantes, de modo que el usuario o el dispositivo no son identificables . ¿Quieres ser alertado en caso de haber estado expuesto al Covid-19? Autoriza tu contact tracing Bluetooth en la app y mantén encendido el Bluetooth de tu móvil.
-
- RECOMENDACIONES
- Protégete a sí mismo y a quienes te rodean informándote y tomando las precauciones adecuadas. Sigue los consejos de tu organismo de salud pública local. Para evitar la propagación de la COVID-19:
- Evitar las visitas innecesarias a los centros de atención médica permite que los sistemas sanitarios funcionen con mayor eficacia, lo que redunda en su protección y en la de los demás
- Lávate las manos con frecuencia. Usa agua y jabón o un desinfectante de manos a base de alcohol.
- Manténte a una distancia segura de cualquier persona que tosa o estornude.
- No te toque los ojos, la nariz o la boca.
- Cuando tosas o estornudes, cúbrete la nariz y la boca con el codo flexionado o con un pañuelo desechable.
- Quédate en casa si te sientes mal.
- Si tienen fiebre, tos y dificultad para respirar, solicita atención médica. Llama con antelación.
- Sigue las instrucciones de tu organismo sanitario local.
Continuar
- Activar Bluetooth
- Continuar sin activar
/********** Menu ************/
- Home
+ Radar
Mis datos
+ QR
Helpline
+ Estadísticas
+ Ajustes
/********** Healing Info Dialog ************/
+ Cambio de estado
Han pasado 14 días desde tu último contacto detectado con alguien diagnosticado de COVID-19. Por este motivo tu estado en a aplicación vuelve a estar “Sin contactos de riesgo identificados”.
- Si no presentas síntomas ni has sido diagnosticado de COVID-19 en los últimos días, puedes volver a tu rutina, manteniendo las precauciones habituales .
- https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov-China/img/COVID19_como_protegerse.jpg
- Si durante los últimos días has presentado síntomas (tos, fiebre o dificultad respiratoria) ponte en contacto con los servicios sanitarios lo antes posible.
- https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov-China/img/COVID19_sintomas.jpg
- Más información de cómo actuar > https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov-China/documentos/20200325_Decalogo_como_actuar_COVID19.pdf
+ Si no presentas síntomas ni has sido diagnosticado de COVID-19 en los últimos días, puedes volver a tu rutina, manteniendo las precauciones habituales
+ https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov/img/COVID19_como_protegerse.jpg
+ Si durante los últimos días has presentado síntomas
+ https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov/img/COVID19_sintomas.jpg
+ Más información de cómo actuar > Más información de cómo actuar
+ https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov/documentos/20200325_Decalogo_como_actuar_COVID19.pdf
Si has sido diagnosticado de COVID-19, para que otras personas puedan ser avisadas de tu exposición es necesario que comuniques tu positivo COVID-19 en la app.
+ /********** Healing Info Dialog ************/
+ Las condiciones de uso y la política de privacidad han sido actualizadas.
+ Para continuar utilizando Radar COVID debes leerlas y aceptarlas
+ Recuerda que seguimos manteniendo nuestros compromisos de anonimato y discreción en el uso de Radar COVID.
+
/********** Home ************/
+
+ RadarCOVID
+
+ Simular contacto de riesgo.
+ PRE - V_%1$s_%2$s
+
Exposición baja
- Exposición media
Contacto estrecho
COVID-19 Positivo
Te informaremos en el caso de un posible contacto de riesgo. Has estado en contacto con una persona contagiada de COVID-19.\nInfórmalo en el 900 112 061 (gratuito) .Has estado en contacto con alguien que ha sido diagnosticado de COVID-19. Debes realizar cuarentena domiciliaria. .
Tu diagnóstico ha sido enviado.\nPor favor, aíslate durante 14 días .Más información >
- https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov-China/img/20.03.24_AislamientoDomiciliario_COVID19.jpg
+ Más información > Más información > https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov/img/20.03.24_AislamientoDomiciliario_COVID19.jpg
+ Acceder a más detalles
+ Te quedan %@ días para finalizarla.
+ Debes realizar cuarentena domiciliaria. Te quedan %@ días para finalizarla.
&appname; activo
&appname; inactivo
@@ -167,12 +121,11 @@
Por favor, activa esta opción para que la aplicación funcione.
Desde este momento, Radar COVID dejará de registrar contactos cercanos
- Notificaciones de exposición a la COVID-19 DESACTIVADAS
-
¿Estas seguro de desactivar &appname;
Si desactivas &appname;, la aplicación dejará de registrar contactos. Ayúdanos a cuidarte
Mantener activo
Desactivar
+ Activar
Es necesario tener el Radar COVID activo para poder enviar el diagnóstico
@@ -180,23 +133,14 @@
/********** Exposure detail common ************/
EXPOSICIÓN
¿Qué debo hacer?
- Más información a través de este enlace
Gracias por seguir cuidándote y cuidando a los demás.
- Tu exposición es media
- Podrías estar infectado
- Por favor, presta atención a posibles síntomas:
- Sigue los consejos de tu centro de salud. Más información aquí
- Tienes más información sobre consejos, sintomas y medidas aquí
- Ayúdanos a cuidar a los demás. Si te han confirmado que eres un caso positivo Covid-19, ayúdanos a parar su propagación reportándolo anónimamentehttps://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov-China/ciudadania.htm
/********** Exposure detail low ************/
RIESGO BAJO
Tu exposición es baja
Sin contactos de riesgo aparentes. (actualizado %1$s)
- Sin contactos de riesgo aparentes.
Mantén las medidas de seguridad y distanciamiento social.
@@ -211,10 +155,15 @@
Ante la aparición de algún síntoma (fiebre, tos, dificultad respiratoria) llama a tu centro de salud
Al toser o estornudar, tápate la boca o la nariz y usa pañuelos desechables o la parte interior del codo
- Cómo actuar si tengo síntomas > https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov-China/documentos/20200325_Decalogo_como_actuar_COVID19.pdf
+ Cómo actuar si tengo síntomas
+ Cómo actuar si tengo síntomas > https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov/documentos/20200325_Decalogo_como_actuar_COVID19.pdf
/********** Exposure detail high ************/
+
+ Aviso a la Comunidad Autónoma
+ Precauciones de seguridad
+
RIESGO ALTO
Tu exposición es alta
Podrías estar infectado desde hace %1$s (actualizado %2$s)
@@ -224,7 +173,6 @@
Sigue las siguientes recomendaciones y los consejos de tu centro de salud:
Tos persistente
Fiebre alta continua
- Sensación de falta de aire
Perdida del gusto o el olfato
@@ -235,24 +183,22 @@
Usa siempre mascarilla quirúrgica
Lávate las manos frecuentemente
- Otros síntomas > https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov-China/img/COVID19_sintomas.jpg
- Cómo actuar si tengo síntomas > https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov-China/documentos/20200325_Decalogo_como_actuar_COVID19.pdf
+ Otros síntomas
+ Otros síntomas > https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov/img/COVID19_sintomas.jpg
+ Cómo actuar si tengo síntomas > https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov/documentos/20200325_Decalogo_como_actuar_COVID19.pdf
/********** Exposure detail infected ************/
DIAGNÓSTICO COMUNICADO
COVID-19 positivo
Tu diagnóstico fue enviado hace %1$s (actualizado %2$s)
- Más información >
- https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov-China/img/20.03.24_AislamientoDomiciliario_COVID19.jpg
+ https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov/img/20.03.24_AislamientoDomiciliario_COVID19.jpg
Tu diagnostico nos ayuda a proteger a los demás. \n\nSin revelar tu identidad en ningún momento, hemos comunicado tu diagnóstico a móviles han estado cerca de ti en los últimos días y les enviaremos una alerta para su seguridad.Sigue las siguientes recomendaciones y los consejos de tu centro de salud
- Sigue las siguientes recomendaciones y los consejos de tu centro de salud
-
/********** Region info ************/
Teléfono COVID
@@ -261,23 +207,45 @@
/********** Covid Report ************/
MI DIAGNÓSTICO
+ CÓDIGO DIAGNÓSTICO
+ COMPARTIR DIAGNÓSTICO
Envía tu diagnóstico COVID positivo
- Enviando tu diagnóstico anónimo COVID-19, estás contribuyendo a detener la propagación del virus.
- Gracias por ayudarnos a cuidar a los demás.
- Tu información está segura y será tratada siempre anónimamente
- Escanear QR
+ Indica la fecha de inicio de síntomas. Si no has tenido síntomas, introduce la de prueba PCR positiva.
+ Gracias por ayudarnos a cuidar a los demás. Tu información está segura y será tratada siempre anónimamente.
+ Indica la fecha de inicio de síntomas. Si no has tenido síntomas, introduce la de prueba PCR positiva.
+ Si no conoces ninguna de estas dos fechas, déjalo en blanco.
+ Esta información permite poder avisar a las personas que han estado en contacto contigo mientras podías transmitir el coronavirus.
+ Comparte tu diagnóstico anónimo con otras aplicaciones europeas
+ Es necesario para avisar a las personas con las que hayas podido tener contacto mientras podías transmitir el coronavirus.
+ Radar COVID forma parte de una red de países en la Unión Europea cuyas aplicaciones interoperan entre sí, funcionando más allá de sus fronteras.
+ Compartir con personas usuarias Radar COVID
+ Compartir con personas usuarias Radar COVID y aplicaciones europeas
Código de diagnóstico
- Introduce el código que te han enviado
- ej. 123456789123
+ Introduce el código que te han proporcionado
+ Fecha de inicio de síntomas
+ ejemplo 123456789123
Al enviar tu diagnóstico los identificadores aleatorios generados en los últimos días servirán para avisar a las personas que hayan estado cerca de ti. Tu identidad no se comparte con nadie.
Enviar diagnóstico anónimo
¿Seguro que no quieres enviar tu diagnóstico?
Por favor, ayúdanos a cuidar a los demas y evitemos que el Covid-19 se propague.
Cancelar
+ Cancelar envío
Se ha producido un error al enviar diagnóstico
Código de diagnóstico
-
- Volver a inicio.
+ Día
+ Mes
+ Año
+ Seleccionar fecha
+ Fecha seleccionada $1
+ - -
+ - - - -
+ Comenzar
+ Continuar
+ Cancelar
+ Código diagnóstico
+ Compartir diagnóstico
+ 1 de 2
+ Pantalla $1 de $2
/********** Network Warning Dialog ************/
@@ -287,23 +255,20 @@
/********** Report Confirmation ************/
+ Diagnóstico enviado
Gracias por contribuir a parar el virus
Tu diagnóstico nos ayudará a proteger a los demás.
Sin revelar tu identidad en ningún momento, vamos a rastrear qué móviles han estado cerca de ti en los últimos días y les enviaremos una alerta para su seguridad.\n\nPor favor, permanece en aislamiento siguiendo las recomendaciones que te han dado los servicios sanitarios.
- Más información > https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov-China/img/20.03.24_AislamientoDomiciliario_COVID19.jpg
+ Más información > https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov/img/20.03.24_AislamientoDomiciliario_COVID19.jpg
¿Qué debo hacer?
Sigue las recomendaciones de tus servicios sanitarios
Permanece en casa, preferentemente en tu habitación y no compartas el baño
Evita el contacto con otras personas
Usa siempre mascarilla quirúrgica
Lávate las manos frecuentemente
- Ante la aparición de algún síntoma (fiebre, tos, dificultad respiratoria) llama a tu centro de salud
Si los síntomas empeoran llama al 112
Gracias por seguir cuidándote y cuidando a los demás.
- https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov-China/ciudadania.htm
-
- Volver a inicio.
/********** My data ************/
@@ -311,23 +276,34 @@
Tu privacidad es lo más importante
NO recogemos ningún dato personal (nombre, dirección, edad, teléfono, correo electrónico…)NO recogemos ningún dato de geolocalización, incluidos los datos del GPSPor tanto:
+ no recogemos ningún dato de geolocalización, incluidos los datos del G P S
Por tanto:\nNO podemos determinar tu identidad ni saber las personas con las que has estado
Los datos son guardados en tu teléfono y la conexión con el servidor están encriptados
- Consulta las condiciones de uso
- Consulta la política de privacidad
+ Consulta las condiciones de uso
+ Consulta la política de privacidad
/********** Helpline ************/
Para más información…
¿Tienes alguna pregunta sobre cómo funciona Radar COVID ? ¿Qué hacer si recibes una notificación?\nConsulta aquí todas tus dudas:
- FAQs Radar COVID
- http://www.google.es
- Web información COVID
- http://www.google.es
- Otros enlaces
- http://www.google.es
+ Preguntas frecuentes Radar COVID
+ FAQs Radar COVID https://radarcovid.gob.es/preguntas-frecuentes
+ Web información COVID https://www.radarcovid.gob.es/
+ Otros enlaces https://www.mscbs.gob.es/profesionales/saludPublica/ccayes/alertasActual/nCov/home.htm
+
+ /********** Settings ************/
+ Ajustes
+ Cambio de idioma
+ Selecciona un idioma
+ Permite seleccionar el idioma de consulta de RadarCOVID
+ cambiar
+ Lista desplegable
+ Cambiar idioma
+ Información de la aplicación
/********** DP3T ************/
@@ -350,18 +326,35 @@
funcione correctamente.
/********** Locale selection module ************/
- *Selecciona tu comunidad autónoma
+ Idioma
Selecciona tu Comunidad Autónoma
- Selecciona tu idioma
Para aplicar los cambios realizados es necesario reiniciar la aplicación.
/********** Accesibility ************/
Botón atrás
Botón entrar
+ Seleccionado
+
+ /********** Estadística ************/
+ Estadísticas de Radar COVID
+ Datos actualizados %1$s
+ Descarga de Radar COVID
+ Casos positivos declarados en Radar COVID
+ Países conectados con Radar COVID
+ Conoce los países conectados
+ Consulta más datos estadísticos en:
+ Web Radar Covid, estadísticas Web Ministerio Sanidad, situación COVID-19 Países conectados con Radar COVID
+ Radar COVID forma parte de una red en continuo crecimiento de países en la Unión Europea cuyas aplicaciones interoperan entre sí, funcionando más allá de sus fronteras.
+ Actualmente Radar COVID contecta con las aplicaciones de los siguientes países:
/********** Common ************/
+ Atrás
+
Cerrar
Actualiza &appname;
@@ -375,19 +368,18 @@
Tu exposición ahora es baja. Por favor, vuelve a activar el radar.
-
- muy mala
- excelente
-
- piloto.appcovid@economia.gob.es Horario lunes a viernes de 08H a 20H
900 112 061
llamada gratuita
Más información
+ Más información Más información Más información Más información Aceptar
- Volver
+ Cancelar
Comunica tu positivo Covid
@@ -407,6 +399,153 @@
- %d min
- %d mins
-
+
+ Hello blank fragment
+
+
+ Hace tiempo que no accedes a Radar COVID
+ Accede regularmente para comprobar si tu riesgo de exposición ha cambiado.
+
+ /********** Information ************/
+ Gráfico
+ Activo
+ Inactivo
+ Información de la aplicación
+ Información útil
+ Comprueba la siguiente información para saber si Radar COVID está funcionando correctamente.
+ Estado Radar COVID
+ Estado notificaciones de exposición
+ Última sincronización
+ Bluetooth
+ Aprende cómo mantener activo Radar COVID
+ Versión de la app Radar COVID
+ Última actualización
+ $D $M de $Y a las $H
+ Primera sincronización pendiente
+ Sistema operativo
+ Modelo
+ Consejos
+ Recuerda utilizar la aplicación de la forma adecuada:
+ Mantén el bluetooth activado,
+ desactiva el modo de ahorro de energía,
+ y recuerda abrir la aplicación frecuentemente y revisar las notificaciones.
+ Resuelve otras dudas:
+ Preguntas frecuentes Radar COVID Ayuda técnica
+ Si no has encontrado respuesta, puedes contactar por correo electrónico:
+ Si utilizas este medio, el equipo de soporte técnico podrá ver tu dirección de correo electrónico
+ soporte.radarcovid@economia.gob.es
+ Describe aquí tus dudas o problemas de funcionamiento con Radar COVID.
+ hace %@ días
+ hace 1 día
+
+ Cómo mantener activo Radar COVID
+ Te explicamos qué elementos debes mantener siempre activados para que Radar COVID funcione correctamente.
+ (A modo de ejemplo, te describimos los pasos para la versión Android 10 y dispositivo Samsung A7 , ten en cuenta para otras versiones y marcas los pasos pueden cambiar)
+ Bluetooth
+ Bluetooth activado
+ Comprueba que siempre esté activado
+ Radar COVID “activo”
+ Al acceder a la aplicación de Radar COVID, comprueba que está activo
+ Notificaciones de exposición
+ Usar notificaciones de exposición activadas
+ Sigue los siguientes pasos para comprobar que están activas:
+ 1. Accede a los ajustes del dispositivo
+ 2. Selecciona la opción Google
+ 3. Comprueba el estado de “Notificaciones de exposición”
+ 4. Si están desactivadas, entra en “Notificaciones de exposición” para activarlas.
+
+
+ Compartir Radar COVID
+ Comparte Radar COVID app
+ Ayúdanos a frenar juntos la pandemia
+ Invita a tus familiares y amigos a descargar la aplicación
+ Cuantas más personas utilicemos Radar
+ Compartir enlace descarg
+ Ayúdanos a frenar juntos la pandemia.\nCuantas más personas utilicemos Radar COVID, antes podremos romper la cadena de contagios.\n\nDescárgate Radar COVID:\nDispositivos iOS:\nhttp://apple.co/3bZvdxK \n\nDispositivos Android:\n http://bit.ly/32typyT \n\nMás información en:\n radarcovid.gob.es
+
+ /********** Venue Record ************/
+
+ Registro de lugares mediante QR
+ Registra los lugares que visitas capturando sus códigos QR.\n\nRecibe notificaciones en caso de coincidir con personas posteriormente diagnosticadas de COVID-19.\n\nTu privacidad está protegida en todo momento.
+ Capturar Código QR
+ Ver listado de sitios
+ Cancelar registro
+ ¿Estás seguro que deseas cancelar el registro de este lugar?
+ Continuar registro
+
+ Escanea el código QR
+ Escanea el código QR para realizar el registro de entrada
+
+ Código capturado
+ Confirmando tu entrada y salida del lugar visitado, podremos notificarte si coincides en el lugar con personas diagnosticadas posteriormente como positivo COVID-19.
+ Confirmar entrada
+
+ Código no reconocido
+ Puede que estés intentando escanear un código no oficial de Radar COVID o que el código esté dañado.
+ El código QR escaneado todavía no es válido
+ El código QR escaneado ya no es válido
+
+ Registro iniciado
+ Tiempo transcurrido
+ Confirmar salida
+
+ Acceso a Radar COVID
+ Recuerda que el tiempo en el establecimiento seguirá contando hasta que no confirmes la salida.\n\n Podrás volver al registro desde el icono “QR” del menú de navegación
+ Acceder a Radar COVID
+
+ Confirmación de salida
+ Fecha y hora de entrada
+ SALGO AHORA
+ ¿Cuánto tiempo has estado?
+ Finalizar registro
+ Salgo ahora
+ 30\'
+ 1h
+ 2h
+ 4h
+ +5h
+ 30 minutos
+ 1 hora
+ 2 horas
+ 4 horas
+ mas de 5 horas
+ Hoy, %@
+ Ayer, %@
+ %@ h
+ $1 de $2
+
+ Se ha registrado la visita con éxito
+ Registrado con éxito
+ El registro se guardará de forma encriptada localmente en tu dispositivo móvil, de forma anónima, durante 14 días.\n\nRecuerda que recibirás una notificación si has tenido contacto en el lugar y horas registradas con personas diagnosticadas posteriormente como positivo COVID-19.
+
+ Recordatorio de registro en marcha
+ ¿Deseas confirmar la salida el lugar visitado?
+ Se ha detectado un contagio masivo de COVID-19 en un lugar que has visitado
+ Registro de visita a establecimiento finalizado
+ Registro de visita a establecimiento finalizado
+
+ Se ha detectado un contagio masivo de COVID-19 en un lugar que has visitado.\nDebes realizar cuarentena domiciliaria. .
+ Hace %1$s días registraste tu visita a un lugar donde también estuvo alguien diagnosticado de COVID-19 (actualizado %2$s)
+
+ Autenticación
+ Por favor identifícate para acceder
+
+ LUGARES VISITADOS
+ Diario
+ Lugares archivados (%@)
+ OCULTOS
+ VISIBLES
+ HORA ENTRADA Y TIEMPO
+ Ocultar elementos archivados
+ Mostrar todos los elementos
+ Ocultar elemento
+ Mostrar elemento
+ Aún no has registrado ningún lugar visitado
+ Mostrar lugares archivados
+ Lugar oculto
+ mostrar
+ Lugar visible
+ ocultar
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9c753222..5abfc1d9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -11,21 +11,22 @@
-
-
-
@@ -59,20 +61,46 @@
- 20sp
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -145,22 +212,22 @@
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/test/java/es/gob/radarcovid/datamanager/usecase/ReportInfectedUseCaseTest.kt b/app/src/test/java/es/gob/radarcovid/datamanager/usecase/ReportInfectedUseCaseTest.kt
index dc78310d..d0f7d7f6 100644
--- a/app/src/test/java/es/gob/radarcovid/datamanager/usecase/ReportInfectedUseCaseTest.kt
+++ b/app/src/test/java/es/gob/radarcovid/datamanager/usecase/ReportInfectedUseCaseTest.kt
@@ -31,7 +31,7 @@ class ReportInfectedUseCaseTest {
}
private val preferencesRepository: PreferencesRepository = mock()
private val apiRepository: ApiRepository = mock {
- on { verifyCode(any()) } doReturn Either.right(ResponseToken(""))
+ on { verifyCode(any(), any()) } doReturn Either.right(ResponseToken(""))
}
private val jwtTokenUtils: JwtTokenUtils = mock {
on { getOnset(any()) } doReturn Date()
@@ -51,26 +51,26 @@ class ReportInfectedUseCaseTest {
@Test
fun assertReportUpstreamCompletedNormally() {
- reportInfectedUseCase.reportInfected("").test()
+ reportInfectedUseCase.reportInfected("", null, 0).test()
.assertResult()
}
@Test
fun onReportInfectedThenVerifyCode() {
- reportInfectedUseCase.reportInfected("").subscribe()
+ reportInfectedUseCase.reportInfected("", null, 0).subscribe()
- verify(apiRepository).verifyCode(any())
+ verify(apiRepository).verifyCode(any(), any())
}
@Test
fun onCodeVerifiedThenGenerateOnsetDate() {
- reportInfectedUseCase.reportInfected("").subscribe()
+ reportInfectedUseCase.reportInfected("", null, 0).subscribe()
inOrder(apiRepository, jwtTokenUtils).apply {
- verify(apiRepository).verifyCode(any())
+ verify(apiRepository).verifyCode(any(), any())
verify(jwtTokenUtils).getOnset(any())
}
@@ -79,7 +79,7 @@ class ReportInfectedUseCaseTest {
@Test
fun onReportInfectedThenNotifyInfected() {
- reportInfectedUseCase.reportInfected("").subscribe()
+ reportInfectedUseCase.reportInfected("", null, 0).subscribe()
verify(contactTracingRepository).notifyInfected(any(), any())
@@ -88,7 +88,7 @@ class ReportInfectedUseCaseTest {
@Test
fun onNotifyInfectedThenSaveTheInfectionReportDate() {
- reportInfectedUseCase.reportInfected("").subscribe()
+ reportInfectedUseCase.reportInfected("", null, 0).subscribe()
inOrder(contactTracingRepository, preferencesRepository).apply {
verify(contactTracingRepository).notifyInfected(any(), any())
diff --git a/app/src/test/java/es/gob/radarcovid/features/covidreport/form/presenter/CovidReportPresenterUnitTest.kt b/app/src/test/java/es/gob/radarcovid/features/covidreport/form/presenter/CovidReportPresenterUnitTest.kt
index 84e552e2..8d09bf5f 100644
--- a/app/src/test/java/es/gob/radarcovid/features/covidreport/form/presenter/CovidReportPresenterUnitTest.kt
+++ b/app/src/test/java/es/gob/radarcovid/features/covidreport/form/presenter/CovidReportPresenterUnitTest.kt
@@ -15,9 +15,10 @@ import com.nhaarman.mockitokotlin2.mock
import com.nhaarman.mockitokotlin2.verify
import com.nhaarman.mockitokotlin2.whenever
import es.gob.radarcovid.datamanager.usecase.ReportInfectedUseCase
-import es.gob.radarcovid.features.covidreport.form.protocols.CovidReportPresenter
-import es.gob.radarcovid.features.covidreport.form.protocols.CovidReportRouter
-import es.gob.radarcovid.features.covidreport.form.protocols.CovidReportView
+import es.gob.radarcovid.features.covidreport.form.pages.step2.presenter.Step2MyHealthPresenterImp
+import es.gob.radarcovid.features.covidreport.form.pages.step2.protocols.Step2MyHealthPresenter
+import es.gob.radarcovid.features.covidreport.form.pages.step2.protocols.Step2MyHealthRouter
+import es.gob.radarcovid.features.covidreport.form.pages.step2.protocols.Step2MyHealthView
import es.gob.radarcovid.models.exception.NetworkUnavailableException
import io.reactivex.rxjava3.android.plugins.RxAndroidPlugins
import io.reactivex.rxjava3.core.Completable
@@ -29,13 +30,13 @@ import org.junit.Test
class CovidReportPresenterUnitTest {
- private val view: CovidReportView = mock {
+ private val view: Step2MyHealthView = mock {
on { getReportCode() } doReturn ""
}
- private val router: CovidReportRouter = mock()
+ private val router: Step2MyHealthRouter = mock()
private val reportInfectedUseCase: ReportInfectedUseCase = mock()
- private val presenter: CovidReportPresenter =
- CovidReportPresenterImpl(view, router, reportInfectedUseCase)
+ private val presenter: Step2MyHealthPresenter =
+ Step2MyHealthPresenterImp(view, router, reportInfectedUseCase)
@Before
fun init() {
@@ -46,7 +47,13 @@ class CovidReportPresenterUnitTest {
@Test
fun onReportSuccessTest() {
- whenever(reportInfectedUseCase.reportInfected("")).thenReturn(Completable.complete())
+ whenever(
+ reportInfectedUseCase.reportInfected(
+ "",
+ null,
+ 0
+ )
+ ).thenReturn(Completable.complete())
presenter.onSendButtonClick()
verify(view).getReportCode()
@@ -58,7 +65,7 @@ class CovidReportPresenterUnitTest {
@Test
fun onReportDefaultErrorTest() {
- whenever(reportInfectedUseCase.reportInfected(""))
+ whenever(reportInfectedUseCase.reportInfected("", null, 0))
.thenReturn(Completable.error(Exception()))
presenter.onSendButtonClick()
@@ -67,7 +74,7 @@ class CovidReportPresenterUnitTest {
@Test
fun onReportNetworkErrorTest() {
- whenever(reportInfectedUseCase.reportInfected(""))
+ whenever(reportInfectedUseCase.reportInfected("", null, 0))
.thenReturn(Completable.error(NetworkUnavailableException()))
presenter.onSendButtonClick()
diff --git a/app/src/test/java/es/gob/radarcovid/features/home/presenter/HomePresenterUnitTest.kt b/app/src/test/java/es/gob/radarcovid/features/home/presenter/HomePresenterUnitTest.kt
index a0557198..a56c2f3f 100644
--- a/app/src/test/java/es/gob/radarcovid/features/home/presenter/HomePresenterUnitTest.kt
+++ b/app/src/test/java/es/gob/radarcovid/features/home/presenter/HomePresenterUnitTest.kt
@@ -11,15 +11,17 @@
package es.gob.radarcovid.features.home.presenter
import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.never
import com.nhaarman.mockitokotlin2.verify
import com.nhaarman.mockitokotlin2.whenever
-import es.gob.radarcovid.datamanager.usecase.ExposureInfoUseCase
-import es.gob.radarcovid.datamanager.usecase.ExposureRadarUseCase
-import es.gob.radarcovid.datamanager.usecase.OnboardingCompletedUseCase
+import es.gob.radarcovid.datamanager.repository.PreferencesRepository
+import es.gob.radarcovid.datamanager.usecase.*
import es.gob.radarcovid.features.home.protocols.HomePresenter
import es.gob.radarcovid.features.home.protocols.HomeRouter
import es.gob.radarcovid.features.home.protocols.HomeView
+import es.gob.radarcovid.models.domain.Environment
import es.gob.radarcovid.models.domain.ExposureInfo
+import es.gob.radarcovid.models.domain.HealingTime
import org.junit.Assert.assertFalse
import org.junit.Test
@@ -29,6 +31,11 @@ class HomePresenterUnitTest {
private val onboardingCompletedUseCase: OnboardingCompletedUseCase = mock()
private val exposureRadarUseCase: ExposureRadarUseCase = mock()
private val exposureInfoUseCase: ExposureInfoUseCase = mock()
+ private val fakeExposureInfoUseCase: FakeExposureInfoUseCase = mock()
+ private val legalTermsUseCase: LegalTermsUseCase = mock()
+ private val getHealingTimeUseCase: GetHealingTimeUseCase = mock()
+ private val venueMatcherUseCase: VenueMatcherUseCase = mock()
+ private val preferencesRepository: PreferencesRepository = mock()
private val presenter: HomePresenter = HomePresenterImpl(
view,
@@ -36,9 +43,32 @@ class HomePresenterUnitTest {
onboardingCompletedUseCase,
exposureRadarUseCase,
exposureInfoUseCase,
- mock()
+ fakeExposureInfoUseCase,
+ legalTermsUseCase,
+ getHealingTimeUseCase,
+ venueMatcherUseCase,
+ preferencesRepository
)
+ @Test
+ fun whenEnvironmentIsProNeverInitializeFakeExposureButton() {
+ whenever(fakeExposureInfoUseCase.getEnvironment()).thenReturn(Environment.PRO)
+
+ presenter.viewReady(false)
+ presenter.viewReady(true)
+
+ verify(view, never()).setFakeExposureButton()
+ }
+
+ @Test
+ fun whenEnvironmentIsProNeverFakeExposure() {
+ whenever(fakeExposureInfoUseCase.getEnvironment()).thenReturn(Environment.PRO)
+
+ presenter.onFakeExposureButtonClick()
+
+ verify(fakeExposureInfoUseCase, never()).addFakeExposureDay()
+ }
+
@Test
fun whenIsInfectedShowBackgroundEnabled() {
whenever(exposureInfoUseCase.getExposureInfo()).thenReturn(ExposureInfo().apply {
@@ -100,6 +130,8 @@ class HomePresenterUnitTest {
level = ExposureInfo.Level.HIGH
})
+ whenever (getHealingTimeUseCase.getHealingTime()).thenReturn(HealingTime())
+
presenter.onResume()
verify(view).setRadarBlockEnabled(true)
@@ -111,6 +143,8 @@ class HomePresenterUnitTest {
level = ExposureInfo.Level.HIGH
})
+ whenever (getHealingTimeUseCase.getHealingTime()).thenReturn(HealingTime())
+
presenter.onResume()
verify(view).showReportButton()
@@ -122,9 +156,11 @@ class HomePresenterUnitTest {
level = ExposureInfo.Level.HIGH
})
+ whenever (getHealingTimeUseCase.getHealingTime()).thenReturn(HealingTime())
+
presenter.onResume()
- verify(view).showExposureBlockHigh()
+ verify(view).showExposureBlockHigh(14, true)
}
@Test
diff --git a/build.gradle b/build.gradle
index c1a44804..bce963a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,6 +20,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:3.6.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+ classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12'
}
}
@@ -27,7 +28,9 @@ allprojects {
repositories {
google()
jcenter()
-
+ maven {
+ url "https://dl.bintray.com/terl/lazysodium-maven"
+ }
}
}
- 
+