-
Notifications
You must be signed in to change notification settings - Fork 937
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.
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
mikescamell
merged 18 commits into
develop
from
feature/mike/update-settings/update_subscreens
Dec 12, 2024
Merged
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 a4e8c81
update autoconsent to handle on/off
mikescamell 9740734
update StatusIndicator to take a Status enum instead of a boolean
mikescamell e5afe69
update other areas to new Status enum
mikescamell 61b9c08
update private search layout
mikescamell 76760fd
update WebTrackingProtection
mikescamell 747add1
update sync and backup screen
mikescamell 17f3534
fix top padding for accessibility
mikescamell 9e73ea2
update passwords toolbar title
mikescamell ba15b26
update data clearing screen
mikescamell 554828f
update about screen
mikescamell 6ac7d40
fix icon margin in appearance
mikescamell df9f96f
fix navigation transition to sub-screens
mikescamell ba611b0
formatting
mikescamell db4e35e
fix: add translatable false to new strings
mikescamell 96985e7
switch to accent blue
mikescamell 2b6d905
rename to StatusIndicatorView to follow conventions
mikescamell 203d7c1
formatting
mikescamell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
update StatusIndicator to take a Status enum instead of a boolean
We have one more state "Always On" which we need for a couple of sub screens. It makes more sense now to add this as an emum and allow setting from XML We can make a function that allows us to easily set on/off which we need in most cases that calls to the new setStatus function that takes a "Status"
- Loading branch information
commit 9740734532593e1deec417d154cf9ba1875c6dbd
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
common/common-ui/src/main/res/values/attrs-settings-status-indicator.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
<?xml version="1.0" encoding="utf-8"?><!-- | ||
~ Copyright (c) 2023 DuckDuckGo | ||
~ | ||
~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
~ you may not use this file except in compliance with the License. | ||
~ You may obtain a copy of the License at | ||
~ | ||
~ http://www.apache.org/licenses/LICENSE-2.0 | ||
~ | ||
~ Unless required by applicable law or agreed to in writing, software | ||
~ distributed under the License is distributed on an "AS IS" BASIS, | ||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
~ See the License for the specific language governing permissions and | ||
~ limitations under the License. | ||
--> | ||
|
||
<resources> | ||
<attr name="indicatorStatus"> | ||
<enum name="alwaysOn" value="0" /> | ||
<enum name="on" value="1" /> | ||
<enum name="off" value="2" /> | ||
</attr> | ||
<attr name="labelText" format="string" /> | ||
|
||
<declare-styleable name="StatusIndicator"> | ||
<attr name="indicatorStatus" /> | ||
<attr name="labelText" /> | ||
</declare-styleable> | ||
</resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you rename this to
StatusIndicatorView
instead? Just to follow other conventions.