formatting

duckduckgo · Dec 17, 2024 · 72f177a · 72f177a
1 parent 845126b
commit 72f177a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/...on-api/src/main/java/com/duckduckgo/networkprotection/api/NetworkProtectionAccessState.kt b/...on-api/src/main/java/com/duckduckgo/networkprotection/api/NetworkProtectionAccessState.kt
@@ -71,6 +71,6 @@ interface NetworkProtectionAccessState {
             data object Expired : Visible
             data object Activating : Visible
         }
-        data object Hidden: NetPVisibilityState
+        data object Hidden : NetPVisibilityState
     }
 }
diff --git a/...otection-api/src/main/java/com/duckduckgo/networkprotection/api/NetworkProtectionState.kt b/...otection-api/src/main/java/com/duckduckgo/networkprotection/api/NetworkProtectionState.kt
@@ -90,7 +90,8 @@ interface NetworkProtectionState {
     enum class ConnectionState {
         CONNECTED,
         CONNECTING,
-        DISCONNECTED;
+        DISCONNECTED,
+        ;
 
         fun isConnected(): Boolean = this == CONNECTED
     }

diff --git a/...c/main/java/com/duckduckgo/networkprotection/impl/subscription/NetpSubscriptionManager.kt b/...c/main/java/com/duckduckgo/networkprotection/impl/subscription/NetpSubscriptionManager.kt
@@ -19,7 +19,6 @@ package com.duckduckgo.networkprotection.impl.subscription
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.networkprotection.impl.subscription.NetpSubscriptionManager.VpnStatus
-import com.duckduckgo.networkprotection.impl.subscription.settings.ProSettingNetPViewModel.NetPEntryState.Hidden
 import com.duckduckgo.settings.api.NewSettingsFeature
 import com.duckduckgo.subscriptions.api.Product.NetP
 import com.duckduckgo.subscriptions.api.SubscriptionStatus

diff --git a/.../duckduckgo/networkprotection/impl/subscription/settings/LegacyProSettingNetPViewModel.kt b/.../duckduckgo/networkprotection/impl/subscription/settings/LegacyProSettingNetPViewModel.kt
@@ -86,7 +86,10 @@ class LegacyProSettingNetPViewModel(
         super.onStart(owner)
 
         viewModelScope.launch {
-            combine(networkProtectionAccessState.getLegacyStateFlow(), networkProtectionState.getConnectionStateFlow()) { accessState, connectionState ->
+            combine(
+                    networkProtectionAccessState.getLegacyStateFlow(),
+                    networkProtectionState.getConnectionStateFlow(),
+            ) { accessState, connectionState ->
                 _viewState.emit(
                     viewState.value.copy(
                         networkProtectionEntryState = getNetworkProtectionEntryState(accessState, connectionState),

diff --git a/...in/java/com/duckduckgo/networkprotection/impl/subscription/settings/ProSettingNetPView.kt b/...in/java/com/duckduckgo/networkprotection/impl/subscription/settings/ProSettingNetPView.kt
@@ -31,7 +31,6 @@ import com.duckduckgo.di.scopes.ViewScope
 import com.duckduckgo.navigation.api.GlobalActivityStarter
 import com.duckduckgo.networkprotection.impl.R
 import com.duckduckgo.networkprotection.impl.databinding.ViewSettingsNetpBinding
-import com.duckduckgo.networkprotection.impl.subscription.settings.LegacyProSettingNetPViewModel.NetPEntryState.Pending
 import com.duckduckgo.networkprotection.impl.subscription.settings.ProSettingNetPViewModel.Command
 import com.duckduckgo.networkprotection.impl.subscription.settings.ProSettingNetPViewModel.Command.OpenNetPScreen
 import com.duckduckgo.networkprotection.impl.subscription.settings.ProSettingNetPViewModel.Factory
@@ -93,7 +92,8 @@ class ProSettingNetPView @JvmOverloads constructor(
             when (networkProtectionEntryState) {
                 Hidden -> isGone = true
                 Activating,
-                Expired -> {
+                Expired,
+                -> {
                     isVisible = true
                     isClickable = false
                     setLeadingIconResource(R.drawable.ic_vpn_grayscale_color_24)

diff --git a/...va/com/duckduckgo/networkprotection/impl/subscription/settings/ProSettingNetPViewModel.kt b/...va/com/duckduckgo/networkprotection/impl/subscription/settings/ProSettingNetPViewModel.kt
@@ -27,10 +27,10 @@ import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.navigation.api.GlobalActivityStarter.ActivityParams
 import com.duckduckgo.networkprotection.api.NetworkProtectionAccessState
 import com.duckduckgo.networkprotection.api.NetworkProtectionAccessState.NetPVisibilityState
+import com.duckduckgo.networkprotection.api.NetworkProtectionAccessState.NetPVisibilityState.Hidden
 import com.duckduckgo.networkprotection.api.NetworkProtectionAccessState.NetPVisibilityState.Visible.Activating
 import com.duckduckgo.networkprotection.api.NetworkProtectionAccessState.NetPVisibilityState.Visible.Expired
 import com.duckduckgo.networkprotection.api.NetworkProtectionAccessState.NetPVisibilityState.Visible.Subscribed
-import com.duckduckgo.networkprotection.api.NetworkProtectionAccessState.NetPVisibilityState.Hidden
 import com.duckduckgo.networkprotection.api.NetworkProtectionState
 import com.duckduckgo.networkprotection.api.NetworkProtectionState.ConnectionState
 import com.duckduckgo.networkprotection.impl.pixels.NetworkProtectionPixelNames.NETP_SETTINGS_PRESSED

diff --git a/...in/java/com/duckduckgo/networkprotection/impl/subscription/settings/SubsSettingsPlugin.kt b/...in/java/com/duckduckgo/networkprotection/impl/subscription/settings/SubsSettingsPlugin.kt
@@ -29,7 +29,7 @@ import javax.inject.Inject
 @PriorityKey(200)
 class ProSettingsNetP @Inject constructor(private val newSettingsFeature: NewSettingsFeature) : ProSettingsPlugin {
     override fun getView(context: Context): View {
-        return if(newSettingsFeature.self().isEnabled()) {
+        return if (newSettingsFeature.self().isEnabled()) {
             ProSettingNetPView(context)
         } else {
             return LegacyProSettingNetPView(context)