From cac048f0a1c1fc3ce443bfc64ee7e2c365329a4d Mon Sep 17 00:00:00 2001 From: Fabian DEVEL Date: Wed, 19 Feb 2025 13:28:33 +0100 Subject: [PATCH] chore(DynamicDashboard): Clean code --- .../java/com/infomaniak/core/myksuite/ui/data/MyKSuiteData.kt | 2 +- .../java/com/infomaniak/core/myksuite/ui/network/ApiRoutes.kt | 1 - .../core/myksuite/ui/screens/MyKSuiteDashboardScreen.kt | 2 +- .../core/myksuite/ui/views/MyKSuiteDashboardFragment.kt | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/data/MyKSuiteData.kt b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/data/MyKSuiteData.kt index 64faf244..0b7dd26f 100644 --- a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/data/MyKSuiteData.kt +++ b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/data/MyKSuiteData.kt @@ -64,5 +64,5 @@ data class MyKSuiteData( get() = kSuitePack.type == KSuitePack.KSuitePackType.MY_KSUITE_PLUS || kSuitePack.type == KSuitePack.KSuitePackType.MY_KSUITE_PLUS_DRIVE_SOLO - inline val trialExpiryDate get() = trialExpiryAt?.let { Date(it * 1000) } + inline val trialExpiryDate get() = trialExpiryAt?.let { Date(it * 1_000) } } diff --git a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/network/ApiRoutes.kt b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/network/ApiRoutes.kt index f2881b92..e311bf53 100644 --- a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/network/ApiRoutes.kt +++ b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/network/ApiRoutes.kt @@ -21,7 +21,6 @@ object ApiRoutes { const val MANAGER_URL = "https://manager.infomaniak.com/v3/ng/home" - private const val PREPROD_BASE_URL = "https://api.staging-myksuite.dev.infomaniak.ch" private const val BASE_URL = "https://api.infomaniak.com" fun myKSuiteData() = "$BASE_URL/1/my_ksuite/current?with=drive,mail,pack,can_trial,has_auto_renew" diff --git a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/MyKSuiteDashboardScreen.kt b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/MyKSuiteDashboardScreen.kt index 26588389..686d6d14 100644 --- a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/MyKSuiteDashboardScreen.kt +++ b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/screens/MyKSuiteDashboardScreen.kt @@ -170,7 +170,7 @@ private fun SubscriptionInfoCard( value = stringResource(R.string.myKSuiteDashboardUntil, expiryDate.format(FORMAT_DATE_SIMPLE)), ) } - Spacer(Modifier.height(Margin.Medium)) + Spacer(Modifier.height(Margin.Large)) InformationBlock( modifier = paddedModifier, text = stringResource(R.string.myKSuiteManageSubscriptionDescription), diff --git a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/views/MyKSuiteDashboardFragment.kt b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/views/MyKSuiteDashboardFragment.kt index f790a30f..ffcb9e59 100644 --- a/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/views/MyKSuiteDashboardFragment.kt +++ b/MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/views/MyKSuiteDashboardFragment.kt @@ -32,7 +32,7 @@ import com.infomaniak.core.myksuite.ui.screens.MyKSuiteDashboardScreenData open class MyKSuiteDashboardFragment : Fragment() { private val navigationArgs: MyKSuiteDashboardFragmentArgs by navArgs() - private lateinit var composeView: ComposeView + private var composeView: ComposeView? = null private val onClose: () -> Unit by lazy { { this@MyKSuiteDashboardFragment.findNavController().popBackStack() } } @@ -47,6 +47,6 @@ open class MyKSuiteDashboardFragment : Fragment() { } protected fun resetContent(dashboardData: MyKSuiteDashboardScreenData) { - composeView.setContent { MyKSuiteDashboardScreen(dashboardScreenData = { dashboardData }, onClose = onClose) } + composeView?.setContent { MyKSuiteDashboardScreen(dashboardScreenData = { dashboardData }, onClose = onClose) } } }