Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add free pass cred duration #506

Merged
merged 1 commit into from
Jun 26, 2024
Merged

add free pass cred duration #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...android/app/src/main/java/net/nymtech/nymvpn/ui/screens/settings/account/AccountScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
},
)
}
Expand Down
2 changes: 2 additions & 0 deletions nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/util/Constants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
12 changes: 6 additions & 6 deletions nym-vpn-android/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -11,22 +11,22 @@ 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"
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"
Expand All @@ -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"

Expand Down