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

Update Settings: Update sub-screens #5334

Merged
merged 18 commits into from
Dec 12, 2024
Merged

Update Settings: Update sub-screens #5334

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
454d439
update autoconsent layout with new header views
mikescamell Nov 28, 2024
a4e8c81
update autoconsent to handle on/off
mikescamell Nov 28, 2024
9740734
update StatusIndicator to take a Status enum instead of a boolean
mikescamell Nov 28, 2024
e5afe69
update other areas to new Status enum
mikescamell Nov 28, 2024
61b9c08
update private search layout
mikescamell Nov 28, 2024
76760fd
update WebTrackingProtection
mikescamell Nov 28, 2024
747add1
update sync and backup screen
mikescamell Nov 28, 2024
17f3534
fix top padding for accessibility
mikescamell Nov 28, 2024
9e73ea2
update passwords toolbar title
mikescamell Nov 28, 2024
ba15b26
update data clearing screen
mikescamell Nov 28, 2024
554828f
update about screen
mikescamell Nov 28, 2024
6ac7d40
fix icon margin in appearance
mikescamell Nov 29, 2024
df9f96f
fix navigation transition to sub-screens
mikescamell Nov 29, 2024
ba611b0
formatting
mikescamell Nov 29, 2024
db4e35e
fix: add translatable false to new strings
mikescamell Dec 9, 2024
96985e7
switch to accent blue
mikescamell Dec 9, 2024
2b6d905
rename to StatusIndicatorView to follow conventions
mikescamell Dec 9, 2024
203d7c1
formatting
mikescamell Dec 12, 2024
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
Prev Previous commit
Next Next commit
rename to StatusIndicatorView to follow conventions
  • Loading branch information
@mikescamell
mikescamell committed Dec 12, 2024
commit 2b6d90544cb5b5b1e4b4bb00e0dab6569586dd92
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_private_search.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
app:typography="h2"
tools:visibility="visible" />

<com.duckduckgo.common.ui.view.StatusIndicator
<com.duckduckgo.common.ui.view.StatusIndicatorView
android:id="@+id/statusIndicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_web_tracking_protection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
app:typography="h2"
tools:visibility="visible" />

<com.duckduckgo.common.ui.view.StatusIndicator
<com.duckduckgo.common.ui.view.StatusIndicatorView
android:id="@+id/statusIndicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion autoconsent/autoconsent-impl/src/main/res/layout/activity_autoconsent_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
app:typography="h2"
tools:visibility="visible" />

<com.duckduckgo.common.ui.view.StatusIndicator
<com.duckduckgo.common.ui.view.StatusIndicatorView
android:id="@+id/autoconsentStatusIndicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion ...kduckgo/common/ui/view/StatusIndicator.kt → ...kgo/common/ui/view/StatusIndicatorView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import com.duckduckgo.common.ui.viewbinding.viewBinding
import com.duckduckgo.mobile.android.R
import com.duckduckgo.mobile.android.databinding.ViewStatusIndicatorBinding

class StatusIndicator @JvmOverloads constructor(
class StatusIndicatorView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0,
Expand Down
6 changes: 3 additions & 3 deletions common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/SettingsListItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import android.util.AttributeSet
import android.widget.ImageView
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.view.isVisible
import com.duckduckgo.common.ui.view.StatusIndicator
import com.duckduckgo.common.ui.view.StatusIndicator.Status
import com.duckduckgo.common.ui.view.StatusIndicatorView
import com.duckduckgo.common.ui.view.StatusIndicatorView.Status
import com.duckduckgo.common.ui.view.gone
import com.duckduckgo.common.ui.view.show
import com.duckduckgo.common.ui.view.text.DaxTextView
Expand All @@ -44,7 +44,7 @@ class SettingsListItem @JvmOverloads constructor(
get() = binding.leadingIcon
val betaPill: ImageView
get() = binding.betaPill
val statusIndicator: StatusIndicator
val statusIndicator: StatusIndicatorView
get() = binding.statusIndicator

init {
Expand Down
2 changes: 1 addition & 1 deletion common/common-ui/src/main/res/layout/view_settings_list_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
app:layout_constraintTop_toTopOf="@id/primaryText"
tools:visibility="visible" />

<com.duckduckgo.common.ui.view.StatusIndicator
<com.duckduckgo.common.ui.view.StatusIndicatorView
android:id="@+id/statusIndicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down