-
Notifications
You must be signed in to change notification settings - Fork 929
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
Onboarding Customisation Experiment #3003
Merged
Merged
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
3098a3c
Experiment variants added
nalcalag e3aa230
Lock welcome screen for experiment variant to portrait for mobile dev…
nalcalag 693bcb6
Multiselect view created
nalcalag 1e8c7ee
Set Multiselect Cta dialog for experiment variant after welcome cta
nalcalag 2d7174c
Logic to select, skip and continue implemented
nalcalag a6bcd2d
Pixels added
nalcalag c76667a
Launch default browser dialog after feature options selection
nalcalag 6b9a113
Cleanup and fixes
nalcalag e2d0cac
start animation for multiselect dialog set
nalcalag fdd0920
Added support for landscape mode in tablets
nalcalag 1d6d42d
Change order of showing onboarding dialogs
nalcalag f3110af
Added tests
nalcalag f0e7ac4
fixed error after rebase
nalcalag 9b66066
Move attributes and styles for new multiselect custom view away from …
nalcalag 450079f
Changes after technical review
nalcalag 6a7c383
Set variants to 0 until release
nalcalag 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
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
26 changes: 26 additions & 0 deletions
26
...va/com/duckduckgo/app/onboarding/ui/customisationexperiment/DDGFeatureOnboardingOption.kt
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,26 @@ | ||
/* | ||
* 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. | ||
*/ | ||
|
||
package com.duckduckgo.app.onboarding.ui.customisationexperiment | ||
|
||
enum class DDGFeatureOnboardingOption { | ||
PRIVATE_SEARCH, | ||
TRACKER_BLOCKING, | ||
SMALLER_DIGITAL_FOOTPRINT, | ||
FASTER_PAGE_LOADS, | ||
FEWER_ADS, | ||
ONE_CLICK_DATA_CLEARING, | ||
} |
95 changes: 95 additions & 0 deletions
95
...main/java/com/duckduckgo/app/onboarding/ui/customisationexperiment/MultiselectListItem.kt
nalcalag marked this conversation as resolved.
Show resolved
Hide resolved
|
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,95 @@ | ||
/* | ||
* 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. | ||
*/ | ||
|
||
package com.duckduckgo.app.onboarding.ui.customisationexperiment | ||
|
||
import android.content.Context | ||
import android.util.AttributeSet | ||
import androidx.annotation.StringRes | ||
import androidx.constraintlayout.widget.ConstraintLayout | ||
import com.duckduckgo.app.browser.R | ||
import com.duckduckgo.app.browser.databinding.ViewMultiselectListItemBinding | ||
import com.duckduckgo.mobile.android.ui.viewbinding.viewBinding | ||
|
||
class MultiselectListItem @JvmOverloads constructor( | ||
context: Context, | ||
attrs: AttributeSet? = null, | ||
defStyleAttr: Int = R.attr.multiselectListItemStyle, | ||
) : ConstraintLayout(context, attrs, defStyleAttr) { | ||
|
||
private val binding: ViewMultiselectListItemBinding by viewBinding() | ||
|
||
var primaryText: String = "" | ||
private set | ||
var trailingEmoji: String = "" | ||
private set | ||
var isItemSelected: Boolean = false | ||
set(value) { | ||
when (value) { | ||
true -> binding.itemContainer.setBackgroundResource(R.drawable.background_multiselect_list_item_selected) | ||
false -> binding.itemContainer.setBackgroundResource(R.drawable.background_multiselect_list_item) | ||
} | ||
field = value | ||
} | ||
|
||
init { | ||
context.obtainStyledAttributes( | ||
attrs, | ||
R.styleable.MultiselectListItem, | ||
0, | ||
R.style.Widget_DuckDuckGo_MultiselectListItem, | ||
).apply { | ||
|
||
setPrimaryText(getString(R.styleable.MultiselectListItem_primaryText)) | ||
setTrailingEmoji(getString(R.styleable.MultiselectListItem_trailingEmoji)) | ||
isItemSelected = getBoolean(R.styleable.MultiselectListItem_selected, false) | ||
|
||
recycle() | ||
} | ||
binding.itemContainer.setOnClickListener { isItemSelected = !isItemSelected } | ||
} | ||
|
||
/** Sets the item title */ | ||
fun setPrimaryText(title: String?) { | ||
primaryText = title.orEmpty() | ||
binding.primaryText.text = primaryText | ||
} | ||
|
||
/** Sets the item title */ | ||
fun setPrimaryText(@StringRes title: Int) { | ||
primaryText = context.getString(title) | ||
binding.primaryText.text = primaryText | ||
} | ||
|
||
/** Sets the item trailing emoji */ | ||
fun setTrailingEmoji(emojiText: String?) { | ||
trailingEmoji = emojiText.orEmpty() | ||
binding.emojiText.text = emojiText | ||
} | ||
|
||
/** Sets the item trailing emoji */ | ||
fun setTrailingEmoji(@StringRes emojiTextRes: Int) { | ||
trailingEmoji = context.getString(emojiTextRes) | ||
binding.emojiText.text = trailingEmoji | ||
} | ||
|
||
fun setOnClickListener(onClick: () -> Unit) { | ||
binding.itemContainer.setOnClickListener { | ||
isItemSelected = !isItemSelected | ||
onClick.invoke() | ||
} | ||
} | ||
} |
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
Oops, something went wrong.
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.
include one test for this?
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.
I will 👌