Merge branch 'release/12.4.2'

HedvigInsurance · Jan 30, 2024 · 8c0fd9e · 8c0fd9e
2 parents d754882 + 6e854a4
commit 8c0fd9e
Show file tree

Hide file tree

Showing 71 changed files with 1,013 additions and 259 deletions.
diff --git a/app/apollo/apollo-octopus-public/build.gradle.kts b/app/apollo/apollo-octopus-public/build.gradle.kts
@@ -39,7 +39,6 @@ apollo { // Octopus client
     mapScalar("Date", "kotlinx.datetime.LocalDate", "com.apollographql.apollo3.adapter.KotlinxLocalDateAdapter")
     mapScalar("DateTime", "kotlinx.datetime.LocalDate", "com.apollographql.apollo3.adapter.KotlinxLocalDateTimeAdapter")
     mapScalar("Instant", "kotlinx.datetime.Instant", "com.apollographql.apollo3.adapter.KotlinxInstantAdapter")
-    mapScalarToUpload("Upload")
     mapScalarToKotlinString("UUID")
     mapScalarToKotlinString("Url")
     mapScalarToKotlinString("FlowContext")

diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts
@@ -25,7 +25,7 @@ android {
     applicationId = "com.hedvig"
 
     versionCode = 43
-    versionName = "12.4.0"
+    versionName = "12.4.2"
 
     vectorDrawables.useSupportLibrary = true
 
@@ -178,6 +178,7 @@ dependencies {
   implementation(projects.dataSettingsDatastorePublic)
   implementation(projects.dataTravelCertificatePublic)
   implementation(projects.datadogCore)
+  implementation(projects.dataContractPublic)
   implementation(projects.datadogDemoTracking)
   implementation(projects.featureChangeaddress)
   implementation(projects.featureChat)
@@ -188,6 +189,7 @@ dependencies {
   implementation(projects.featureEditCoinsured)
   implementation(projects.featureForever)
   implementation(projects.featureHelpCenter)
+  implementation(projects.featureFlagsPublic)
   implementation(projects.featureHome)
   implementation(projects.featureInsurances)
   implementation(projects.featureLogin)
@@ -196,13 +198,14 @@ dependencies {
   implementation(projects.featureProfile)
   implementation(projects.featureTerminateInsurance)
   implementation(projects.featureTravelCertificate)
-  implementation(projects.featureFlagsPublic)
   implementation(projects.initializable)
   implementation(projects.languageCore)
   implementation(projects.languageData)
+  implementation(projects.languageMigration)
   implementation(projects.loggingAndroid)
   implementation(projects.loggingPublic)
   implementation(projects.marketCore)
+  implementation(projects.marketSet)
   implementation(projects.memberRemindersPublic)
   implementation(projects.navigationActivity)
   implementation(projects.navigationCore)

diff --git a/app/app/src/main/AndroidManifest.xml b/app/app/src/main/AndroidManifest.xml
@@ -66,7 +66,7 @@
       android:windowSoftInputMode="adjustResize" />
     <activity
       android:name=".feature.marketing.MarketingActivity"
-      android:configChanges="keyboard|keyboardHidden|orientation|screenSize|locale|layoutDirection"
+      android:configChanges="keyboard|keyboardHidden|orientation|screenSize|layoutDirection"
       android:theme="@style/Hedvig.Theme"
       android:windowSoftInputMode="adjustResize" />
 

diff --git a/app/app/src/main/kotlin/com/hedvig/android/app/navigation/HedvigNavHost.kt b/app/app/src/main/kotlin/com/hedvig/android/app/navigation/HedvigNavHost.kt
@@ -34,6 +34,7 @@ import com.hedvig.android.feature.forever.navigation.foreverGraph
 import com.hedvig.android.feature.help.center.helpCenterGraph
 import com.hedvig.android.feature.help.center.navigation.HelpCenterDestination
 import com.hedvig.android.feature.home.home.navigation.homeGraph
+import com.hedvig.android.feature.insurances.data.CancelInsuranceData
 import com.hedvig.android.feature.insurances.insurance.insuranceGraph
 import com.hedvig.android.feature.odyssey.navigation.claimFlowGraph
 import com.hedvig.android.feature.odyssey.navigation.navigateToClaimFlowDestination
@@ -107,7 +108,7 @@ internal fun HedvigNavHost(
       hedvigDeepLinkContainer = hedvigDeepLinkContainer,
       onStartChat = { backStackEntry ->
         with(navigator) {
-          backStackEntry.navigate(AppDestination.Chat)
+          backStackEntry.navigate(AppDestination.Chat())
         }
       },
       onStartClaim = { backStackEntry ->
@@ -132,9 +133,10 @@ internal fun HedvigNavHost(
           windowSizeClass = hedvigAppState.windowSizeClass,
           navigator = navigator,
           navController = hedvigAppState.navController,
+          imageLoader = imageLoader,
           openChat = { backStackEntry ->
             with(navigator) {
-              backStackEntry.navigate(AppDestination.Chat)
+              backStackEntry.navigate(AppDestination.Chat())
             }
           },
           openPlayStore = { activityNavigator.tryOpenPlayStore(context) },
@@ -149,29 +151,35 @@ internal fun HedvigNavHost(
       },
       openChat = { backStackEntry ->
         with(navigator) {
-          backStackEntry.navigate(AppDestination.Chat)
+          backStackEntry.navigate(AppDestination.Chat())
         }
       },
       startMovingFlow = { backStackEntry ->
         with(navigator) {
           backStackEntry.navigate(AppDestination.ChangeAddress)
         }
       },
-      startTerminationFlow = { backStackEntry: NavBackStackEntry, insuranceId: String, insuranceDisplayName: String ->
+      startTerminationFlow = { backStackEntry: NavBackStackEntry, data: CancelInsuranceData ->
         with(navigator) {
-          backStackEntry.navigate(AppDestination.TerminateInsurance(insuranceId, insuranceDisplayName))
+          val destination = AppDestination.TerminateInsurance(
+            contractId = data.contractId,
+            insuranceDisplayName = data.contractDisplayName,
+            exposureName = data.contractExposure,
+            contractGroup = data.contractGroup,
+          )
+          backStackEntry.navigate(destination)
         }
       },
       hedvigDeepLinkContainer = hedvigDeepLinkContainer,
       imageLoader = imageLoader,
       startEditCoInsured = { backStackEntry: NavBackStackEntry, contractId: String ->
         with(navigator) {
-          backStackEntry.navigate(AppDestination.CoInsuredAddInfo(contractId))
+          backStackEntry.navigate(AppDestination.CoInsuredAddOrRemove(contractId))
         }
       },
       startEditCoInsuredAddMissingInfo = { backStackEntry: NavBackStackEntry, contractId: String ->
         with(navigator) {
-          backStackEntry.navigate(AppDestination.CoInsuredAddOrRemove(contractId))
+          backStackEntry.navigate(AppDestination.CoInsuredAddInfo(contractId))
         }
       },
     )
@@ -231,10 +239,11 @@ internal fun HedvigNavHost(
     )
     connectAdyenPaymentGraph(navigator)
     helpCenterGraph(
+      hedvigDeepLinkContainer = hedvigDeepLinkContainer,
       navigator = navigator,
-    ) { backStackEntry ->
+    ) { backStackEntry, chatContext ->
       with(navigator) {
-        backStackEntry.navigate(AppDestination.Chat)
+        backStackEntry.navigate(AppDestination.Chat(chatContext))
       }
     }
   }
@@ -259,15 +268,15 @@ private fun NavGraphBuilder.nestedHomeGraphs(
     appPackageId = hedvigBuildConstants.appId,
     openChat = { backStackEntry ->
       with(navigator) {
-        backStackEntry.navigate(AppDestination.Chat)
+        backStackEntry.navigate(AppDestination.Chat())
       }
     },
   )
   changeAddressGraph(
     navController = hedvigAppState.navController,
     openChat = { backStackEntry ->
       with(navigator) {
-        backStackEntry.navigate(AppDestination.Chat)
+        backStackEntry.navigate(AppDestination.Chat())
       }
     },
     openUrl = { activityNavigator.openWebsite(context, Uri.parse(it)) },
@@ -304,7 +313,7 @@ private fun NavGraphBuilder.nestedHomeGraphs(
     openUrl = { activityNavigator.openWebsite(context, Uri.parse(it)) },
     openChat = { backStackEntry ->
       with(navigator) {
-        backStackEntry.navigate(AppDestination.Chat)
+        backStackEntry.navigate(AppDestination.Chat())
       }
     },
     imageLoader = imageLoader,
@@ -318,7 +327,7 @@ private fun NavGraphBuilder.nestedHomeGraphs(
     },
     openChat = { backStackEntry ->
       with(navigator) {
-        backStackEntry.navigate(destination = AppDestination.Chat) {
+        backStackEntry.navigate(destination = AppDestination.Chat()) {
           popUpTo<AppDestination.TopLevelDestination.Home>()
         }
       }

diff --git a/app/app/src/main/kotlin/com/hedvig/app/ApplicationModule.kt b/app/app/src/main/kotlin/com/hedvig/app/ApplicationModule.kt
@@ -64,8 +64,10 @@ import com.hedvig.android.feature.terminateinsurance.di.terminateInsuranceModule
 import com.hedvig.android.feature.travelcertificate.di.travelCertificateModule
 import com.hedvig.android.featureflags.di.featureManagerModule
 import com.hedvig.android.language.LanguageService
+import com.hedvig.android.language.di.languageMigrationModule
 import com.hedvig.android.language.di.languageModule
 import com.hedvig.android.market.di.marketManagerModule
+import com.hedvig.android.market.di.setMarketModule
 import com.hedvig.android.memberreminders.di.memberRemindersModule
 import com.hedvig.android.navigation.activity.ActivityNavigator
 import com.hedvig.android.navigation.core.HedvigDeepLinkContainer
@@ -89,7 +91,6 @@ import com.hedvig.app.util.apollo.DeviceIdInterceptor
 import com.hedvig.app.util.apollo.NetworkCacheManagerImpl
 import com.hedvig.app.util.apollo.SunsettingInterceptor
 import java.io.File
-import java.util.Locale
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import org.koin.androidx.viewmodel.dsl.viewModel
@@ -112,9 +113,9 @@ private val networkModule = module {
           chain
             .request()
             .newBuilder()
-            .header("User-Agent", makeUserAgent(languageService.getLocale()))
-            .header("Accept-Language", languageService.getLocale().toLanguageTag())
-            .header("hedvig-language", languageService.getLocale().toLanguageTag())
+            .header("User-Agent", makeUserAgent(languageService.getLanguage().toBcp47Format()))
+            .header("Accept-Language", languageService.getLanguage().toBcp47Format())
+            .header("hedvig-language", languageService.getLanguage().toBcp47Format())
             .header("apollographql-client-name", BuildConfig.APPLICATION_ID)
             .header("apollographql-client-version", BuildConfig.VERSION_NAME)
             .header("X-Build-Version", BuildConfig.VERSION_CODE.toString())
@@ -161,7 +162,7 @@ private val networkModule = module {
   }
 }
 
-fun makeUserAgent(locale: Locale): String = buildString {
+fun makeUserAgent(languageBCP47: String): String = buildString {
   append(BuildConfig.APPLICATION_ID)
   append(" ")
   append(BuildConfig.VERSION_NAME)
@@ -176,7 +177,7 @@ fun makeUserAgent(locale: Locale): String = buildString {
   append("; ")
   append(Build.DEVICE)
   append("; ")
-  append(locale.language)
+  append(languageBCP47)
   append(")")
 }
 
@@ -346,6 +347,7 @@ val applicationModule = module {
       homeModule,
       insurancesModule,
       languageAuthListenersModule,
+      languageMigrationModule,
       languageModule,
       loginModule,
       marketManagerModule,
@@ -356,6 +358,7 @@ val applicationModule = module {
       odysseyModule,
       paymentsModule,
       profileModule,
+      setMarketModule,
       settingsDatastoreModule,
       sharedPreferencesModule,
       terminateInsuranceModule,

diff --git a/app/app/src/main/kotlin/com/hedvig/app/HedvigApplication.kt b/app/app/src/main/kotlin/com/hedvig/app/HedvigApplication.kt
@@ -3,19 +3,23 @@ package com.hedvig.app
 import android.app.Application
 import androidx.appcompat.app.AppCompatDelegate
 import com.hedvig.android.app.AppInitializers
-import com.hedvig.android.language.LanguageService
+import com.hedvig.android.language.LanguageAndMarketLaunchCheckUseCase
 import com.hedvig.app.feature.tracking.ActivityChangeTracker
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
 
 open class HedvigApplication : Application() {
-  private val languageService: LanguageService by inject()
+  private val languageAndMarketLaunchCheckUseCase: LanguageAndMarketLaunchCheckUseCase by inject()
   private val appInitializers: AppInitializers by inject()
 
   override fun onCreate() {
     super.onCreate()
     registerActivityLifecycleCallbacks(ActivityChangeTracker())
     AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
-    languageService.performOnLaunchLanguageCheck()
     appInitializers.initialize()
+    MainScope().launch {
+      languageAndMarketLaunchCheckUseCase.invoke()
+    }
   }
 }
diff --git a/app/app/src/main/kotlin/com/hedvig/app/feature/chat/service/ReplyWorker.kt b/app/app/src/main/kotlin/com/hedvig/app/feature/chat/service/ReplyWorker.kt
@@ -18,7 +18,10 @@ class ReplyWorker(
 ) : CoroutineWorker(context, params) {
   override suspend fun doWork(): Result {
     val replyText = inputData.getString(ChatMessageNotificationReceiver.REPLY_TEXT) ?: return Result.failure()
-    val sendChatMessageResponse = chatRepository.sendMessage(replyText)
+    val sendChatMessageResponse = chatRepository.sendMessage(
+      text = replyText,
+      context = null,
+    )
 
     when (sendChatMessageResponse) {
       is Either.Left -> {

diff --git a/...ain/kotlin/com/hedvig/android/core/designsystem/component/button/HedvigContainedButton.kt b/...ain/kotlin/com/hedvig/android/core/designsystem/component/button/HedvigContainedButton.kt
@@ -101,7 +101,7 @@ fun HedvigContainedButton(
         onClick()
       }
     },
-    enabled = enabled,
+    enabled = enabled || isLoading,
     modifier = modifier,
     contentPadding = contentPadding,
     colors = colors,

diff --git a/...edvig/app/util/compose/LogCompositions.kt → ...ndroid/core/ui/compose/LogCompositions.kt b/...edvig/app/util/compose/LogCompositions.kt → ...ndroid/core/ui/compose/LogCompositions.kt
@@ -1,10 +1,9 @@
-package com.hedvig.app.util.compose
+package com.hedvig.android.core.ui.compose
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.remember
 import com.hedvig.android.logger.logcat
-import com.hedvig.app.BuildConfig
 
 /**
  * Only for use with [LogCompositions], not defined as private because inline [LogCompositions] doesn't allow it.
@@ -19,9 +18,7 @@ class Ref(var value: Int)
 @Suppress("NOTHING_TO_INLINE")
 @Composable
 inline fun LogCompositions(message: String) {
-  if (BuildConfig.DEBUG) {
-    val ref = remember { Ref(0) }
-    SideEffect { ref.value++ }
-    logcat { "Debug Log Compositions: $message ${ref.value}" }
-  }
+  val ref = remember { Ref(0) }
+  SideEffect { ref.value++ }
+  logcat { "Debug Log Compositions: $message ${ref.value}" }
 }
diff --git a/...act/data-contract-public/src/main/kotlin/com/hedvig/android/data/contract/ContractType.kt b/...act/data-contract-public/src/main/kotlin/com/hedvig/android/data/contract/ContractType.kt
@@ -142,6 +142,7 @@ fun ContractType.isTrialContract() = when (this) {
 fun ContractType.supportsTravelCertificate(): Boolean = when (this) {
   SE_HOUSE,
   SE_APARTMENT_BRF,
+  SE_APARTMENT_RENT,
   SE_APARTMENT_STUDENT_BRF,
   SE_APARTMENT_STUDENT_RENT,
   -> true

diff --git a/app/feature/feature-chat/build.gradle.kts b/app/feature/feature-chat/build.gradle.kts
@@ -31,6 +31,8 @@ dependencies {
   implementation(libs.kotlinx.serialization.json)
   implementation(libs.retrofit)
   implementation(libs.retrofitArrow)
+  implementation(libs.compose.richtext)
+  implementation(libs.compose.richtextUi)
   implementation(libs.retrofitKotlinxSerializationConverter)
   implementation(projects.apolloCore)
   implementation(projects.apolloOctopusPublic)