added correct number format and date format

AURORA-H2020 · Nov 2, 2023 · 545eb25 · 545eb25
1 parent 42dbeb1
commit 545eb25
Show file tree

Hide file tree

Showing 36 changed files with 876 additions and 285 deletions.
diff --git a/app/src/main/java/eu/inscico/aurora_app/core/koin/servicesModule.kt b/app/src/main/java/eu/inscico/aurora_app/core/koin/servicesModule.kt
@@ -1,10 +1,10 @@
 package eu.inscico.aurora_app.core.koin
 
+import android.content.res.Configuration
 import com.google.firebase.FirebaseApp
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.functions.FirebaseFunctions
-import com.google.firebase.ktx.Firebase
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import eu.inscico.aurora_app.services.auth.AuthService
 import eu.inscico.aurora_app.services.firebase.*
@@ -15,6 +15,7 @@ import eu.inscico.aurora_app.services.notification.NotificationCreationService
 import eu.inscico.aurora_app.services.notification.NotificationService
 import eu.inscico.aurora_app.services.pvgis.PVGISAPIService
 import eu.inscico.aurora_app.services.shared.UserFeedbackService
+import eu.inscico.aurora_app.services.shared.UnitService
 import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module
 
@@ -112,4 +113,10 @@ val servicesModule = module {
         )
     }
 
+    single {
+        UnitService(
+            context = androidContext()
+        )
+    }
+
 }
diff --git a/app/src/main/java/eu/inscico/aurora_app/core/koin/viewModelModule.kt b/app/src/main/java/eu/inscico/aurora_app/core/koin/viewModelModule.kt
@@ -16,6 +16,7 @@ import eu.inscico.aurora_app.ui.screens.photovoltaic.PhotovoltaicCalculatorViewM
 import eu.inscico.aurora_app.ui.screens.settings.profile.EditProfileViewModel
 import eu.inscico.aurora_app.ui.screens.settings.SettingsViewModel
 import eu.inscico.aurora_app.ui.screens.settings.notifications.SettingsReminderViewModel
+import eu.inscico.aurora_app.ui.screens.settings.profile.SelectRegionViewModel
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 
@@ -57,6 +58,10 @@ val viewModelModule = module {
         )
     }
 
+    viewModel {
+        SelectRegionViewModel()
+    }
+
     viewModel {
         SettingsReminderViewModel(
             _notificationService = get()
@@ -78,7 +83,8 @@ val viewModelModule = module {
 
     viewModel {
         AllConsumptionsListViewModel(
-            _consumptionService = get()
+            _consumptionService = get(),
+            _unitService = get()
         )
     }
 

diff --git a/app/src/main/java/eu/inscico/aurora_app/model/user/RegionEnum.kt b/app/src/main/java/eu/inscico/aurora_app/model/user/RegionEnum.kt
@@ -0,0 +1,71 @@
+package eu.inscico.aurora_app.model.user
+
+import android.content.Context
+import eu.inscico.aurora_app.R
+import eu.inscico.aurora_app.model.consumptions.ElectricitySource
+
+enum class RegionEnum {
+    SYSTEM,
+    GERMANY,
+    PORTUGAL,
+    SLOVENIA,
+    DENMARK,
+    UNITED_KINGDOM,
+    USA;
+
+    companion object {
+        fun parseStringToRegion(regionString: String?): RegionEnum {
+            return when (regionString) {
+                "system" -> SYSTEM
+                "germany" -> GERMANY
+                "portugal" -> PORTUGAL
+                "slovenia" -> SLOVENIA
+                "denmark" -> DENMARK
+                "united_kingdom" -> UNITED_KINGDOM
+                "usa" -> USA
+                else -> SYSTEM
+            }
+        }
+
+        fun parseRegionToString(region: RegionEnum): String {
+            return when (region) {
+                SYSTEM -> "system"
+                GERMANY -> "germany"
+                PORTUGAL -> "portugal"
+                SLOVENIA -> "slovenia"
+                DENMARK -> "denmark"
+                UNITED_KINGDOM -> "united_kingdom"
+                USA -> "usa"
+            }
+        }
+
+        fun RegionEnum.getDisplayNameRes(): Int {
+            return when (this) {
+                SYSTEM -> R.string.settings_profile_select_region_system_title
+                GERMANY -> R.string.settings_profile_select_region_germany_title
+                PORTUGAL -> R.string.settings_profile_select_region_portugal_title
+                SLOVENIA -> R.string.settings_profile_select_region_slovenia_title
+                DENMARK -> R.string.settings_profile_select_region_denmark_title
+                UNITED_KINGDOM -> R.string.settings_profile_select_region_united_kingdom_title
+                USA -> R.string.settings_profile_select_region_usa_title
+            }
+        }
+
+        fun RegionEnum.getDisplayName(context: Context): String {
+            return context.getString(this.getDisplayNameRes())
+        }
+
+        fun getRegionsList(): List<RegionEnum> {
+            return listOf(
+                SYSTEM,
+                GERMANY,
+                PORTUGAL,
+                SLOVENIA,
+                DENMARK,
+                UNITED_KINGDOM,
+                USA
+            )
+        }
+
+    }
+}
diff --git a/app/src/main/java/eu/inscico/aurora_app/services/navigation/NavGraphDirections.kt b/app/src/main/java/eu/inscico/aurora_app/services/navigation/NavGraphDirections.kt
@@ -21,6 +21,7 @@ import eu.inscico.aurora_app.ui.screens.settings.featurePreview.FeaturePreviewSc
 import eu.inscico.aurora_app.ui.screens.settings.notifications.ElectricityBillNotificationScreen
 import eu.inscico.aurora_app.ui.screens.settings.notifications.HeatingBillNotificationScreen
 import eu.inscico.aurora_app.ui.screens.settings.notifications.MobilityNotificationScreen
+import eu.inscico.aurora_app.ui.screens.settings.profile.SelectRegionScreen
 import eu.inscico.aurora_app.ui.screens.settings.profile.UpdateEmailScreen
 import eu.inscico.aurora_app.ui.screens.settings.profile.UpdatePasswordScreen
 
@@ -247,6 +248,17 @@ sealed class NavGraphDirections(
         }
     }
 
+    object SelectRegion : NavGraphDirections(
+        route = "selectRegion",
+        content = {
+            SelectRegionScreen()
+        }
+    ) {
+        fun getNavRoute(): String {
+            return route
+        }
+    }
+
     object UpdateUserPassword : NavGraphDirections(
         route = "updateUserPassword",
         content = {

diff --git a/app/src/main/java/eu/inscico/aurora_app/services/navigation/NavigationService.kt b/app/src/main/java/eu/inscico/aurora_app/services/navigation/NavigationService.kt
@@ -89,6 +89,11 @@ class NavigationService {
         navControllerTabSettings?.navigate(navDirection)
     }
 
+    fun toSelectRegion() {
+        val navDirection = NavGraphDirections.SelectRegion.getNavRoute()
+        navControllerTabSettings?.navigate(navDirection)
+    }
+
     fun toUpdateUserPassword() {
         val navDirection = NavGraphDirections.UpdateUserPassword.getNavRoute()
         navControllerTabSettings?.navigate(navDirection)