From b5e063132147c14f6dacde4f871af40aa68151d7 Mon Sep 17 00:00:00 2001 From: Alireza Fatehi Date: Fri, 16 Aug 2024 14:07:27 +0200 Subject: [PATCH 1/6] production release --- androidApp/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 38c58e0e..e1a4e528 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -13,8 +13,8 @@ android { applicationId = "ac.at.lbg.dhp.more" minSdk = 29 targetSdk = 34 - versionCode = 12 - versionName = "4.0.14" + versionCode = 16 + versionName = "4.0.16" } buildFeatures { compose = true From 1a1bbc972e6458152a2bd107d016f36be6d2a843 Mon Sep 17 00:00:00 2001 From: Alireza Fatehi Date: Fri, 16 Aug 2024 14:10:47 +0200 Subject: [PATCH 2/6] update data gateway endpoint --- .../more_app_mutliplatform/services/store/EndpointRepository.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/src/commonMain/kotlin/io/redlink/more/more_app_mutliplatform/services/store/EndpointRepository.kt b/shared/src/commonMain/kotlin/io/redlink/more/more_app_mutliplatform/services/store/EndpointRepository.kt index fc93b22b..b20edc91 100644 --- a/shared/src/commonMain/kotlin/io/redlink/more/more_app_mutliplatform/services/store/EndpointRepository.kt +++ b/shared/src/commonMain/kotlin/io/redlink/more/more_app_mutliplatform/services/store/EndpointRepository.kt @@ -36,6 +36,6 @@ class EndpointRepository(private val sharedStorageRepository: SharedStorageRepos companion object { private const val ENDPOINT_KEY = "sharedStorageEndpointKey" private const val DATA_BASE_PATH_ENDPOINT: String = - "https://data.dev.more-health.at/api/v1" + "https://data.more-health.at/api/v1" } } \ No newline at end of file From 3a0a9cb1b3530818a23195cd9ab2b25eae658d14 Mon Sep 17 00:00:00 2001 From: Alireza Fatehi Date: Fri, 16 Aug 2024 14:12:58 +0200 Subject: [PATCH 3/6] production release 4.0.17 --- androidApp/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index e1a4e528..f2632301 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -13,8 +13,8 @@ android { applicationId = "ac.at.lbg.dhp.more" minSdk = 29 targetSdk = 34 - versionCode = 16 - versionName = "4.0.16" + versionCode = 17 + versionName = "4.0.17" } buildFeatures { compose = true From 42eb772c2fa77904d625491e8b5e057ba41e7433 Mon Sep 17 00:00:00 2001 From: Jan Cortiel Date: Thu, 31 Oct 2024 10:07:59 +0100 Subject: [PATCH 4/6] Fixed a bug on Android where deeplinks would not work, if the app is freshly opened --- .../more/app/android/activities/ContentActivity.kt | 2 +- .../more/app/android/activities/ContentViewModel.kt | 8 +++++--- .../more/app/android/activities/NavigationScreen.kt | 5 ++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/androidApp/src/main/java/io/redlink/more/app/android/activities/ContentActivity.kt b/androidApp/src/main/java/io/redlink/more/app/android/activities/ContentActivity.kt index 51590a12..02b338bd 100644 --- a/androidApp/src/main/java/io/redlink/more/app/android/activities/ContentActivity.kt +++ b/androidApp/src/main/java/io/redlink/more/app/android/activities/ContentActivity.kt @@ -58,7 +58,7 @@ fun ContentView(viewModel: ContentViewModel) { viewModel.openMainActivity(LocalContext.current) } else { MoreBackground(showBackButton = false, alertDialogModel = viewModel.alertDialogOpen.value) { - if (viewModel.loginViewScreenNr.value == 0) { + if (viewModel.loginViewScreenNr.intValue == 0) { LoginView(model = viewModel.loginViewModel) AppVersion() } else { diff --git a/androidApp/src/main/java/io/redlink/more/app/android/activities/ContentViewModel.kt b/androidApp/src/main/java/io/redlink/more/app/android/activities/ContentViewModel.kt index 4dcfa131..954daf8e 100644 --- a/androidApp/src/main/java/io/redlink/more/app/android/activities/ContentViewModel.kt +++ b/androidApp/src/main/java/io/redlink/more/app/android/activities/ContentViewModel.kt @@ -13,6 +13,7 @@ package io.redlink.more.app.android.activities import android.app.Activity import android.content.Context import android.net.Uri +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -54,11 +55,12 @@ class ContentViewModel : ViewModel(), LoginViewModelListener, ConsentViewModelLi val hasCredentials = mutableStateOf(MoreApplication.shared!!.credentialRepository.hasCredentials()) - val loginViewScreenNr = mutableStateOf(0) + val loginViewScreenNr = mutableIntStateOf(0) val alertDialogOpen = mutableStateOf(null) init { + NavigationScreen.createDeepLinksForAllRoutes() viewModelScope.launch(Dispatchers.IO) { AlertController.alertDialogModel.collect { withContext(Dispatchers.Main) { @@ -134,14 +136,14 @@ class ContentViewModel : ViewModel(), LoginViewModelListener, ConsentViewModelLi private fun showLoginView() { viewModelScope.launch(Dispatchers.Main) { - loginViewScreenNr.value = 0 + loginViewScreenNr.intValue = 0 registrationService.reset() } } private fun showConsentView() { viewModelScope.launch(Dispatchers.Main) { - loginViewScreenNr.value = 1 + loginViewScreenNr.intValue = 1 } } diff --git a/androidApp/src/main/java/io/redlink/more/app/android/activities/NavigationScreen.kt b/androidApp/src/main/java/io/redlink/more/app/android/activities/NavigationScreen.kt index 6d289bea..51c49a38 100644 --- a/androidApp/src/main/java/io/redlink/more/app/android/activities/NavigationScreen.kt +++ b/androidApp/src/main/java/io/redlink/more/app/android/activities/NavigationScreen.kt @@ -139,7 +139,6 @@ enum class NavigationScreen( return fullRoute } - fun createListOfNavArguments(): List { if (cachedNavArguments == null) { cachedNavArguments = allParam().map { @@ -176,5 +175,9 @@ enum class NavigationScreen( fun allDeepLinks(deepLinkHost: String) = entries.flatMap { it.createDeepLinkRoute(deepLinkHost).mapNotNull { it.uriPattern } } .toSet() + + fun createDeepLinksForAllRoutes() { + entries.forEach { it.createDeepLinkRoute() } + } } } \ No newline at end of file From ad9953ae68cf4ae24f212358f5c1974c8ce52258 Mon Sep 17 00:00:00 2001 From: Jan Cortiel Date: Thu, 31 Oct 2024 10:09:12 +0100 Subject: [PATCH 5/6] Android Version update to 4.0.18 --- androidApp/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index f2632301..958e56eb 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -14,7 +14,7 @@ android { minSdk = 29 targetSdk = 34 versionCode = 17 - versionName = "4.0.17" + versionName = "4.0.18" } buildFeatures { compose = true From 9ca3924addd294d9b0746e7e2476b9d5ad561e69 Mon Sep 17 00:00:00 2001 From: Jan Cortiel Date: Thu, 31 Oct 2024 10:19:05 +0100 Subject: [PATCH 6/6] Android Version update to 4.0.18 --- androidApp/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 958e56eb..b4f1ad76 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -13,7 +13,7 @@ android { applicationId = "ac.at.lbg.dhp.more" minSdk = 29 targetSdk = 34 - versionCode = 17 + versionCode = 18 versionName = "4.0.18" } buildFeatures {