Skip to content

Commit

Permalink
formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
mikescamell committed Nov 29, 2024
1 parent f475c87 commit d8f02fd
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
4 changes: 2 additions & 2 deletions common/common-ui/src/main/res/drawable/ic_sync_color_24.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<aapt:attr name="android:fillColor">
<gradient
<gradient
android:centerX="17.81"
android:centerY="7.34"
android:gradientRadius="14.523"
Expand All @@ -22,7 +22,7 @@
android:pathData="M20.667,12.91A8.715,8.715 0,0 1,3.89 15.196h3.83a6.974,6.974 0,0 0,12.187 -2.588l0.76,0.303Z"
android:fillType="evenOdd">
<aapt:attr name="android:fillColor">
<gradient
<gradient
android:centerX="6.19"
android:centerY="16.066"
android:gradientRadius="12.199"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<path
android:pathData="M2.667,7.58A3.733,3.733 0,0 1,6.4 3.847h11.2a3.733,3.733 0,0 1,3.733 3.733v8.712a3.733,3.733 0,0 1,-3.733 3.733H6.4a3.733,3.733 0,0 1,-3.734 -3.733V7.58Z">
<aapt:attr name="android:fillColor">
<gradient
<gradient
android:startX="12"
android:startY="3.847"
android:endX="12"
Expand All @@ -21,7 +21,7 @@
<path
android:pathData="M21.333,12.87v3.73a3.733,3.733 0,0 1,-3.733 3.733H6.4A3.733,3.733 0,0 1,2.666 16.6v-3.73h0.623v0.31a2.489,2.489 0,0 0,2.489 2.49h12.444a2.489,2.489 0,0 0,2.489 -2.49v-0.31h0.622Z">
<aapt:attr name="android:fillColor">
<gradient
<gradient
android:startX="19.576"
android:startY="16.291"
android:endX="5.152"
Expand All @@ -36,7 +36,7 @@
android:pathData="M2,7.083A4.083,4.083 0,0 1,6.083 3h11.834A4.083,4.083 0,0 1,22 7.083v9.834A4.083,4.083 0,0 1,17.917 21H6.083A4.083,4.083 0,0 1,2 16.917zM6.083,4.5A2.583,2.583 0,0 0,3.5 7.083v9.834A2.583,2.583 0,0 0,6.083 19.5h11.834a2.583,2.583 0,0 0,2.583 -2.583V7.083A2.583,2.583 0,0 0,17.917 4.5z"
android:fillType="evenOdd">
<aapt:attr name="android:fillColor">
<gradient
<gradient
android:startX="12"
android:startY="3.75"
android:endX="12"
Expand Down

0 comments on commit d8f02fd

Please sign in to comment.