Release 1.8.0

gematik · Feb 14, 2023 · 87ff7e6 · 87ff7e6
1 parent fa57d99
commit 87ff7e6
Show file tree

Hide file tree

Showing 193 changed files with 4,835 additions and 3,984 deletions.
diff --git a/README.md b/README.md
@@ -6,11 +6,11 @@ The official gematik E-Rezept App (electronic prescription app) is available to
 
 [![Download E-Rezept on the App Store](https://user-images.githubusercontent.com/52454541/126137060-cb8c7ceb-6a72-423d-9079-f3e1a98b2638.png)](https://apps.apple.com/de/app/das-e-rezept/id1511792179)[![Download E-Rezept on the PlayStore](https://user-images.githubusercontent.com/52454541/126138350-a52e1d84-1588-4e8a-86df-189ee4df8bc8.png)](https://play.google.com/store/apps/details?id=de.gematik.ti.erp.app)[![Download E-Rezept on the App Gallery](https://user-images.githubusercontent.com/52454541/126158983-15d73f12-36c6-41ce-8de5-29d10baaed04.png)](https://appgallery.huawei.com/#/app/C104463531)
 
-and login with the health card of the public health insurance. In July 2021, the e-prescription will start with a test phase, initially in the focus region Berlin-Brandenburg. The nationwide rollout will follow three month later in the fourth quarter.
+and login with the health card of the public health insurance. In July 2021, the e-prescription started with a test phase, initially in the focus region Berlin-Brandenburg. The nationwide rollout started three month later in September 2022.
 
 The e-prescriptions are stored in the telematics infrastructure, for which gematik is responsible.
 
-Visit our [FAQ page](https://www.das-e-rezept-fuer-deutschland.de/fragen-antworten) for more information about the e-prescription.
+Visit our [FAQ page](https://www.das-e-rezept-fuer-deutschland.de/faq) for more information about the e-prescription.
 
 ### Support & Feedback
 

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,3 +1,7 @@
+# Release 1.8.0
+- Switched to new analytics tool
+- Bugfixes
+
 # Release 1.7.0
 - New wizard for ordering a healthcard
 - Support for new FHIR profile version

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
@@ -210,6 +210,8 @@ dependencies {
             implementation(coroutines("core"))
             implementation(coroutines("android"))
             implementation(coroutines("play-services"))
+            compileOnly(datetime)
+            testCompileOnly(datetime)
         }
         android {
             coreLibraryDesugaring(desugaring)
@@ -293,6 +295,11 @@ dependencies {
         passwordStrength {
             implementation(zxcvbn)
         }
+
+        contentSquare {
+            implementation(cts)
+        }
+
         playServices {
             implementation(location)
             implementation(integrity)
@@ -311,6 +318,7 @@ dependencies {
             androidTestUtil(services)
             androidTestImplementation(navigation)
             androidTestImplementation(espresso)
+            androidTestImplementation(espressoIntents)
         }
         kotlinXTest {
             testImplementation(coroutinesTest)
@@ -333,5 +341,5 @@ dependencies {
 }
 
 secrets {
-    defaultPropertiesFileName = "ci-overrides.properties"
+    defaultPropertiesFileName = if (project.rootProject.file("ci-overrides.properties").exists()) "ci-overrides.properties" else "gradle.properties"
 }
diff --git a/android/src/debug/java/de/gematik/ti/erp/app/debug/ui/DebugScreen.kt b/android/src/debug/java/de/gematik/ti/erp/app/debug/ui/DebugScreen.kt
@@ -84,6 +84,7 @@ import androidx.navigation.compose.rememberNavController
 import de.gematik.ti.erp.app.R
 import de.gematik.ti.erp.app.TestTag
 import de.gematik.ti.erp.app.debug.data.Environment
+import de.gematik.ti.erp.app.profiles.ui.LocalProfileHandler
 import de.gematik.ti.erp.app.theme.AppTheme
 import de.gematik.ti.erp.app.theme.PaddingDefaults
 import de.gematik.ti.erp.app.utils.compose.AlertDialog
@@ -441,6 +442,12 @@ fun DebugScreenMain(
     val modal = rememberModalBottomSheetState(ModalBottomSheetValue.Hidden)
     val scope = rememberCoroutineScope()
 
+    val featuresState by produceState(initialValue = mutableMapOf<String, Boolean>()) {
+        viewModel.featuresState().collect {
+            value = it
+        }
+    }
+
     ModalBottomSheetLayout(
         sheetContent = {
             EnvironmentSelector(
@@ -463,6 +470,7 @@ fun DebugScreenMain(
             LaunchedEffect(Unit) {
                 viewModel.state()
             }
+            val scope = rememberCoroutineScope()
 
             LazyColumn(
                 state = listState,
@@ -552,6 +560,25 @@ fun DebugScreenMain(
                 item {
                     FeatureToggles(viewModel = viewModel)
                 }
+
+                item {
+                    DebugCard(title = "Login state") {
+                        val profileHandler = LocalProfileHandler.current
+                        val active = profileHandler.activeProfile
+                        Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+                            Button(
+                                onClick = {
+                                    scope.launch {
+                                        profileHandler.switchProfileToPKV(active)
+                                    }
+                                },
+                                modifier = Modifier.fillMaxWidth()
+                            ) {
+                                Text(text = "Set User with ${active.name} as PKV", textAlign = TextAlign.Center)
+                            }
+                        }
+                    }
+                }
                 item {
                     RotatingLog(viewModel = viewModel)
                 }
@@ -676,7 +703,9 @@ private fun VirtualHealthCard(modifier: Modifier = Modifier, viewModel: DebugSet
         )
 
         Button(
-            modifier = Modifier.fillMaxWidth().testTag(TestTag.DebugMenu.SetVirtualHealthCardButton),
+            modifier = Modifier
+                .fillMaxWidth()
+                .testTag(TestTag.DebugMenu.SetVirtualHealthCardButton),
             onClick = {
                 virtualHealthCardLoading = true
                 scope.launch {
@@ -754,10 +783,12 @@ fun EnvironmentSelector(
 
         Environment.values().forEach {
             Row(
-                modifier = Modifier.fillMaxWidth().clickable {
-                    selectedEnvironment = it
-                    onSelectEnvironment(it)
-                }
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .clickable {
+                        selectedEnvironment = it
+                        onSelectEnvironment(it)
+                    }
             ) {
                 Row(
                     modifier = Modifier.padding(horizontal = PaddingDefaults.Medium, vertical = PaddingDefaults.Small),

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -40,6 +40,7 @@
                 android:name=".App"
                 android:foregroundServiceType="location">
         </service>
+        <meta-data android:name="com.contentsquare.android.autostart" android:value="false"/>
         <!-- Blocks mlKit/firebase from initializing at startup -->
         <provider
                 android:name="com.google.mlkit.common.internal.MlKitInitProvider"