diff --git a/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/screens/settings/account/AccountScreen.kt b/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/screens/settings/account/AccountScreen.kt index aef935ec9f..aa5755fa05 100644 --- a/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/screens/settings/account/AccountScreen.kt +++ b/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/screens/settings/account/AccountScreen.kt @@ -41,6 +41,7 @@ import net.nymtech.nymvpn.ui.common.buttons.surface.SelectionItem import net.nymtech.nymvpn.ui.common.buttons.surface.SurfaceSelectionGroupButton import net.nymtech.nymvpn.ui.common.labels.GroupLabel import net.nymtech.nymvpn.ui.theme.CustomTypography +import net.nymtech.nymvpn.util.Constants import net.nymtech.nymvpn.util.durationFromNow import net.nymtech.nymvpn.util.scaledHeight import net.nymtech.nymvpn.util.scaledWidth @@ -99,8 +100,7 @@ fun AccountScreen(appViewModel: AppViewModel, appUiState: AppUiState, navControl Modifier .fillMaxWidth(), progress = { - // TODO need to think about this more, setting to full for now - 1f + days.toFloat() / Constants.FREE_PASS_CRED_DURATION }, ) } diff --git a/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/util/Constants.kt b/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/util/Constants.kt index a5525fa1d4..dfc1a7c462 100644 --- a/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/util/Constants.kt +++ b/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/util/Constants.kt @@ -21,4 +21,6 @@ object Constants { const val DISCONNECT_TEST_TAG = "disconnectTag" const val VPN_SETTINGS_PACKAGE = "android.net.vpn.SETTINGS" + + const val FREE_PASS_CRED_DURATION = 30f } diff --git a/nym-vpn-android/gradle/libs.versions.toml b/nym-vpn-android/gradle/libs.versions.toml index 589124352b..8180f1798f 100644 --- a/nym-vpn-android/gradle/libs.versions.toml +++ b/nym-vpn-android/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] accompanist = "0.34.0" -agp = "8.5.0-rc02" +agp = "8.5.0" coreSplashscreen = "1.0.1" detektRulesCompose = "1.3.0" javaClient = "9.2.2" @@ -11,13 +11,13 @@ coreKtx = "1.13.1" junit = "4.13.2" junitVersion = "1.1.5" espressoCore = "3.5.1" -materialIconsExtended = "1.6.7" +materialIconsExtended = "1.6.8" navigationCompose = "2.7.7" hiltNavigationCompose = "1.2.0" lifecycleRuntimeKtx = "2.7.0" lifecycle-runtime-compose = "2.7.0" activityCompose = "1.9.0" -composeBom = "2024.05.00" +composeBom = "2024.06.00" datastorePreferences = "1.1.1" securityCrypto = "1.1.0-alpha06" timber = "5.0.1" @@ -25,8 +25,8 @@ hiltAndroid = "2.51.1" kotlinx-serialization-json = "1.6.3" kotlinxCoroutinesCore = "1.8.0" uiautomator = "2.3.0" -window = "1.2.0" -windowCoreAndroid = "1.3.0-rc01" +window = "1.3.0" +windowCoreAndroid = "1.3.0" desugar = "2.0.4" moshi = "1.15.1" moshiKotlin = "1.15.1" @@ -39,7 +39,7 @@ gradlePlugins-licensee = "1.7.0" gradlePlugins-detekt = "1.23.6" gradlePlugins-gross = "0.1.0" gradlePlugins-sentry = "4.5.1" -appcompat = "1.6.1" +appcompat = "1.7.0" material = "1.12.0" gradlePlugins-ktlint="12.1.0"