Refactor Hilt view model imports and update Firebase locale handling

maxschwinghammer · maxschwinghammer · commit 7cf2b1473e1d · 2025-11-07T08:12:48.000+01:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -87,7 +87,6 @@ android {
 kapt {
     arguments {
         arg("dagger.hilt.android.internal.disableAndroidSuperclassValidation", "true")
-        arg("dagger.hilt.internal.useAggregatingRootProcessor", "true")
         arg("dagger.fastInit", "ENABLED")
     }
 }
@@ -103,6 +102,7 @@ dependencies {
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.compose.material.icons.core)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.navigation.runtime.ktx)
     implementation(libs.androidx.runtime.livedata)
@@ -174,14 +174,6 @@ dependencies {
     androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(platform(libs.androidx.compose.bom))
-    debugImplementation(libs.androidx.ui.tooling)
-    debugImplementation(libs.androidx.ui.test.manifest)
     testImplementation(libs.junit)
     kapt(libs.hilt.compiler)
 }
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
diff --git a/app/src/main/java/com/freshkeeper/Activity.kt b/app/src/main/java/com/freshkeeper/Activity.kt
@@ -18,7 +18,7 @@ class Activity : ComponentActivity() {
     }
 
     private fun updateLocale(languageCode: String) {
-        val locale = Locale(languageCode)
+        val locale = Locale.forLanguageTag(languageCode)
         Locale.setDefault(locale)
         val config = resources.configuration
         config.setLocale(locale)
diff --git a/app/src/main/java/com/freshkeeper/MainActivity.kt b/app/src/main/java/com/freshkeeper/MainActivity.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.core.content.edit
 import androidx.core.view.WindowCompat
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.NavHostController
@@ -93,15 +94,14 @@ class MainActivity : FragmentActivity() {
     }
 
     private fun saveLanguageToPreferences(languageCode: String) {
-        with(sharedPreferences.edit()) {
+        sharedPreferences.edit {
             putString("language", languageCode)
-            apply()
         }
     }
 
     private fun updateLocale(languageCode: String) {
         val currentLocale = resources.configuration.locales[0]
-        val newLocale = Locale(languageCode)
+        val newLocale = Locale.forLanguageTag(languageCode)
 
         if (currentLocale.language != newLocale.language) {
             Locale.setDefault(newLocale)
diff --git a/app/src/main/java/com/freshkeeper/screens/aiChat/ChatScreen.kt b/app/src/main/java/com/freshkeeper/screens/aiChat/ChatScreen.kt
@@ -23,7 +23,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
diff --git a/app/src/main/java/com/freshkeeper/screens/authentication/signIn/EmailSignInScreen.kt b/app/src/main/java/com/freshkeeper/screens/authentication/signIn/EmailSignInScreen.kt
@@ -49,7 +49,7 @@ import androidx.credentials.GetPasswordOption
 import androidx.credentials.PendingGetCredentialRequest
 import androidx.credentials.pendingGetCredentialRequest
 import androidx.fragment.app.FragmentActivity
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.screens.authentication.viewmodel.SignInViewModel
diff --git a/app/src/main/java/com/freshkeeper/screens/authentication/signIn/ForgotPasswordScreen.kt b/app/src/main/java/com/freshkeeper/screens/authentication/signIn/ForgotPasswordScreen.kt
@@ -34,7 +34,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.screens.authentication.viewmodel.SignInViewModel
diff --git a/app/src/main/java/com/freshkeeper/screens/authentication/signIn/SignInScreen.kt b/app/src/main/java/com/freshkeeper/screens/authentication/signIn/SignInScreen.kt
@@ -31,7 +31,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.fragment.app.FragmentActivity
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.screens.authentication.AuthenticationButton
diff --git a/app/src/main/java/com/freshkeeper/screens/authentication/signUp/EmailSignUpScreen.kt b/app/src/main/java/com/freshkeeper/screens/authentication/signUp/EmailSignUpScreen.kt
@@ -38,7 +38,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.fragment.app.FragmentActivity
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.screens.authentication.viewmodel.SignUpViewModel
diff --git a/app/src/main/java/com/freshkeeper/screens/authentication/signUp/NameInputScreen.kt b/app/src/main/java/com/freshkeeper/screens/authentication/signUp/NameInputScreen.kt
@@ -30,7 +30,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.screens.profile.viewmodel.ProfileViewModel
diff --git a/app/src/main/java/com/freshkeeper/screens/authentication/signUp/SelectProfilePictureScreen.kt b/app/src/main/java/com/freshkeeper/screens/authentication/signUp/SelectProfilePictureScreen.kt
@@ -38,7 +38,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.canhub.cropper.CropImageOptions
 import com.canhub.cropper.CropImageView
diff --git a/app/src/main/java/com/freshkeeper/screens/authentication/signUp/SignUpScreen.kt b/app/src/main/java/com/freshkeeper/screens/authentication/signUp/SignUpScreen.kt
@@ -31,7 +31,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.fragment.app.FragmentActivity
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.screens.authentication.AuthenticationButton
diff --git a/app/src/main/java/com/freshkeeper/screens/contact/ContactScreen.kt b/app/src/main/java/com/freshkeeper/screens/contact/ContactScreen.kt
@@ -28,7 +28,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.navigation.BottomNavigationBar
diff --git a/app/src/main/java/com/freshkeeper/screens/help/HelpScreen.kt b/app/src/main/java/com/freshkeeper/screens/help/HelpScreen.kt
@@ -28,7 +28,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.navigation.BottomNavigationBar
diff --git a/app/src/main/java/com/freshkeeper/screens/home/HomeScreen.kt b/app/src/main/java/com/freshkeeper/screens/home/HomeScreen.kt
@@ -45,7 +45,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.model.FoodItem
diff --git a/app/src/main/java/com/freshkeeper/screens/home/tips/TipsScreen.kt b/app/src/main/java/com/freshkeeper/screens/home/tips/TipsScreen.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.navigation.BottomNavigationBar
diff --git a/app/src/main/java/com/freshkeeper/screens/household/ActivitiesSection.kt b/app/src/main/java/com/freshkeeper/screens/household/ActivitiesSection.kt
@@ -39,7 +39,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import com.freshkeeper.R
 import com.freshkeeper.screens.household.viewmodel.HouseholdViewModel
 import com.freshkeeper.service.activityTypeMap
diff --git a/app/src/main/java/com/freshkeeper/screens/household/HouseholdScreen.kt b/app/src/main/java/com/freshkeeper/screens/household/HouseholdScreen.kt
@@ -22,7 +22,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.model.Household
diff --git a/app/src/main/java/com/freshkeeper/screens/household/MembersSection.kt b/app/src/main/java/com/freshkeeper/screens/household/MembersSection.kt
@@ -50,7 +50,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavController
 import coil.ImageLoader
 import coil.compose.rememberAsyncImagePainter
diff --git a/app/src/main/java/com/freshkeeper/screens/household/StatisticsSection.kt b/app/src/main/java/com/freshkeeper/screens/household/StatisticsSection.kt
@@ -31,7 +31,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavController
 import com.freshkeeper.R
 import com.freshkeeper.screens.household.viewmodel.HouseholdViewModel
diff --git a/app/src/main/java/com/freshkeeper/screens/householdSettings/HouseholdSettingsScreen.kt b/app/src/main/java/com/freshkeeper/screens/householdSettings/HouseholdSettingsScreen.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.model.Household
diff --git a/app/src/main/java/com/freshkeeper/screens/inventory/CurrentInventoriesSection.kt b/app/src/main/java/com/freshkeeper/screens/inventory/CurrentInventoriesSection.kt
@@ -19,7 +19,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import com.freshkeeper.R
 import com.freshkeeper.model.Category
 import com.freshkeeper.model.FoodItem
diff --git a/app/src/main/java/com/freshkeeper/screens/inventory/InventoryScreen.kt b/app/src/main/java/com/freshkeeper/screens/inventory/InventoryScreen.kt
@@ -58,7 +58,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.model.Category
diff --git a/app/src/main/java/com/freshkeeper/screens/notificationSettings/NotificationSettingsScreen.kt b/app/src/main/java/com/freshkeeper/screens/notificationSettings/NotificationSettingsScreen.kt
@@ -28,7 +28,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.navigation.BottomNavigationBar
diff --git a/app/src/main/java/com/freshkeeper/screens/notifications/NotificationsScreen.kt b/app/src/main/java/com/freshkeeper/screens/notifications/NotificationsScreen.kt
@@ -37,7 +37,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.navigation.BottomNavigationBar
diff --git a/app/src/main/java/com/freshkeeper/screens/profile/ProfileCard.kt b/app/src/main/java/com/freshkeeper/screens/profile/ProfileCard.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import coil.compose.rememberAsyncImagePainter
 import com.freshkeeper.model.ImageType
 import com.freshkeeper.model.Picture
diff --git a/app/src/main/java/com/freshkeeper/screens/profile/ProfileScreen.kt b/app/src/main/java/com/freshkeeper/screens/profile/ProfileScreen.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.navigation.BottomNavigationBar
diff --git a/app/src/main/java/com/freshkeeper/screens/profileSettings/ProfileSettingsScreen.kt b/app/src/main/java/com/freshkeeper/screens/profileSettings/ProfileSettingsScreen.kt
@@ -29,7 +29,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.model.User
diff --git a/app/src/main/java/com/freshkeeper/screens/profileSettings/cards/BiometricSwitchCard.kt b/app/src/main/java/com/freshkeeper/screens/profileSettings/cards/BiometricSwitchCard.kt
@@ -21,7 +21,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.fragment.app.FragmentActivity
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import com.freshkeeper.R
 import com.freshkeeper.screens.profileSettings.viewmodel.ProfileSettingsViewModel
 import com.freshkeeper.ui.theme.AccentTurquoiseColor
diff --git a/app/src/main/java/com/freshkeeper/screens/profileSettings/viewmodel/ProfileSettingsViewModel.kt b/app/src/main/java/com/freshkeeper/screens/profileSettings/viewmodel/ProfileSettingsViewModel.kt
@@ -22,7 +22,7 @@ class ProfileSettingsViewModel
     @Inject
     constructor(
         private val accountService: AccountService,
-        @ApplicationContext private val context: Context,
+        @param:ApplicationContext private val context: Context,
     ) : AppViewModel() {
         private val _user = MutableStateFlow(User())
         val user: StateFlow<User> = _user.asStateFlow()
diff --git a/app/src/main/java/com/freshkeeper/screens/settings/SettingsScreen.kt b/app/src/main/java/com/freshkeeper/screens/settings/SettingsScreen.kt
@@ -35,7 +35,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.model.Language
diff --git a/app/src/main/java/com/freshkeeper/screens/settings/buttons/UpgradeToPremiumVersionButton.kt b/app/src/main/java/com/freshkeeper/screens/settings/buttons/UpgradeToPremiumVersionButton.kt
@@ -20,7 +20,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import com.android.billingclient.api.BillingClient
 import com.android.billingclient.api.BillingClientStateListener
 import com.android.billingclient.api.BillingResult
diff --git a/app/src/main/java/com/freshkeeper/screens/statistics/StatisticsScreen.kt b/app/src/main/java/com/freshkeeper/screens/statistics/StatisticsScreen.kt
@@ -27,7 +27,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.freshkeeper.R
 import com.freshkeeper.model.Category
diff --git a/app/src/main/java/com/freshkeeper/service/account/AccountServiceImpl.kt b/app/src/main/java/com/freshkeeper/service/account/AccountServiceImpl.kt
@@ -48,7 +48,7 @@ import javax.inject.Inject
 class AccountServiceImpl
     @Inject
     constructor(
-        @ApplicationContext private val context: Context,
+        @param:ApplicationContext private val context: Context,
     ) : AccountService {
         private val auth: FirebaseAuth = Firebase.auth
         private val firestore = Firebase.firestore
diff --git a/app/src/main/java/com/freshkeeper/service/googleAccount/GoogleAccountServiceImpl.kt b/app/src/main/java/com/freshkeeper/service/googleAccount/GoogleAccountServiceImpl.kt
@@ -30,7 +30,7 @@ import kotlin.coroutines.resume
 class GoogleAccountServiceImpl
     @Inject
     constructor(
-        @ApplicationContext private val context: Context,
+        @param:ApplicationContext private val context: Context,
         private val accountService: AccountService,
     ) : GoogleAccountService {
         private val firestore = FirebaseFirestore.getInstance()
@@ -174,7 +174,7 @@ class GoogleAccountServiceImpl
             onSuccess: () -> Unit,
             onError: (Int) -> Unit,
         ) {
-            val isBiometricEnabled = runBlocking { accountService.getBiometricEnabled() }
+            val isBiometricEnabled = accountService.getBiometricEnabled()
 
             if (isBiometricEnabled) {
                 if (authenticateBiometric(activity, credential)) {
diff --git a/app/src/main/java/com/freshkeeper/service/household/HouseholdServiceImpl.kt b/app/src/main/java/com/freshkeeper/service/household/HouseholdServiceImpl.kt
@@ -34,7 +34,7 @@ import javax.inject.Inject
 class HouseholdServiceImpl
     @Inject
     constructor(
-        @ApplicationContext private val context: Context,
+        @param:ApplicationContext private val context: Context,
         private val accountService: AccountService,
     ) : HouseholdService {
         private val firestore = FirebaseFirestore.getInstance()
@@ -360,8 +360,16 @@ class HouseholdServiceImpl
 
             return documents.mapNotNull { doc ->
                 doc.toObject(FoodItem::class.java).apply {
-                    val currentDate = Instant.ofEpochMilli(System.currentTimeMillis()).atZone(ZoneId.systemDefault()).toLocalDate()
-                    val expiryDate = Instant.ofEpochMilli(expiryTimestamp).atZone(ZoneId.systemDefault()).toLocalDate()
+                    val currentDate =
+                        Instant
+                            .ofEpochMilli(System.currentTimeMillis())
+                            .atZone(ZoneId.systemDefault())
+                            .toLocalDate()
+                    val expiryDate =
+                        Instant
+                            .ofEpochMilli(expiryTimestamp)
+                            .atZone(ZoneId.systemDefault())
+                            .toLocalDate()
                     daysDifference = ChronoUnit.DAYS.between(currentDate, expiryDate).toInt()
                 }
             }
diff --git a/app/src/main/java/com/freshkeeper/service/productDetails/ProductDetailsServiceImpl.kt b/app/src/main/java/com/freshkeeper/service/productDetails/ProductDetailsServiceImpl.kt
@@ -27,7 +27,7 @@ import javax.inject.Inject
 class ProductDetailsServiceImpl
     @Inject
     constructor(
-        @ApplicationContext private val context: Context,
+        @param:ApplicationContext private val context: Context,
     ) : ProductDetailsService {
         private val firestore = FirebaseFirestore.getInstance()
         private val client = OkHttpClient()
diff --git a/app/src/main/java/com/freshkeeper/service/profile/ProfileServiceImpl.kt b/app/src/main/java/com/freshkeeper/service/profile/ProfileServiceImpl.kt
@@ -8,7 +8,7 @@ import javax.inject.Inject
 class ProfileServiceImpl
     @Inject
     constructor(
-        @ApplicationContext private val context: Context,
+        @param:ApplicationContext private val context: Context,
     ) : ProfileService {
         override fun formatMemberSince(days: Long): String =
             when {
diff --git a/app/src/main/java/com/freshkeeper/service/share/ShareServiceImpl.kt b/app/src/main/java/com/freshkeeper/service/share/ShareServiceImpl.kt
diff --git a/app/src/main/java/com/freshkeeper/sheets/productDetails/ProductDetailsSheet.kt b/app/src/main/java/com/freshkeeper/sheets/productDetails/ProductDetailsSheet.kt
diff --git a/build.gradle.kts b/build.gradle.kts
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class Activity : ComponentActivity() {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`private fun updateLocale(languageCode: String) {`
`21`		`- val locale = Locale(languageCode)`
	`21`	`+ val locale = Locale.forLanguageTag(languageCode)`
`22`	`22`	`Locale.setDefault(locale)`
`23`	`23`	`val config = resources.configuration`
`24`	`24`	`config.setLocale(locale)`