diff --git a/app/src/main/java/com/duckduckgo/app/settings/NewSettingsActivity.kt b/app/src/main/java/com/duckduckgo/app/settings/NewSettingsActivity.kt index ba87ade83387..5afdc8bc9a70 100644 --- a/app/src/main/java/com/duckduckgo/app/settings/NewSettingsActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/settings/NewSettingsActivity.kt @@ -64,11 +64,11 @@ import com.duckduckgo.settings.api.DuckPlayerSettingsPlugin import com.duckduckgo.settings.api.ProSettingsPlugin import com.duckduckgo.sync.api.SyncActivityWithEmptyParams import com.duckduckgo.windows.api.ui.WindowsScreenWithEmptyParams +import javax.inject.Inject import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import timber.log.Timber -import javax.inject.Inject @InjectWith(ActivityScope::class) class NewSettingsActivity : DuckDuckGoActivity() { diff --git a/app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt b/app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt index 9f62f331bffb..14d316c51289 100644 --- a/app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt @@ -72,6 +72,7 @@ import com.duckduckgo.duckplayer.api.DuckPlayer.DuckPlayerState.ENABLED import com.duckduckgo.mobile.android.app.tracking.AppTrackingProtection import com.duckduckgo.subscriptions.api.Subscriptions import com.duckduckgo.sync.api.DeviceSyncState +import javax.inject.Inject import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.delay @@ -81,7 +82,6 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.isActive import kotlinx.coroutines.launch -import javax.inject.Inject @SuppressLint("NoLifecycleObserver") @ContributesViewModel(ActivityScope::class) diff --git a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/StatusIndicator.kt b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/StatusIndicator.kt index 0a817ee9c0fa..48b4be2b75a0 100644 --- a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/StatusIndicator.kt +++ b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/StatusIndicator.kt @@ -31,13 +31,14 @@ class StatusIndicator @JvmOverloads constructor( private val binding: ViewStatusIndicatorBinding by viewBinding() fun setStatus(isOn: Boolean) { - if(isOn) { + if (isOn) { binding.icon.isEnabled = true // TODO copy changes binding.label.text = "On" } else { binding.icon.isEnabled = false // TODO copy changes - binding.label.text = "Off" } + binding.label.text = "Off" + } } } diff --git a/common/common-ui/src/main/res/drawable/ic_sync_color_24.xml b/common/common-ui/src/main/res/drawable/ic_sync_color_24.xml index 6dcb6d559970..2ec36b36353f 100644 --- a/common/common-ui/src/main/res/drawable/ic_sync_color_24.xml +++ b/common/common-ui/src/main/res/drawable/ic_sync_color_24.xml @@ -8,7 +8,7 @@ android:pathData="M4.094,11.393A6.974,6.974 0,0 1,16.28 8.805h3.829a8.717,8.717 0,0 0,-16.776 2.284l0.76,0.304Z" android:fillType="evenOdd"> - - - - -