Skip to content

Update "no trace" onboarding to cornflower blue design #303

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

Merged
merged 1 commit into from
Jul 6, 2018
Merged

Update "no trace" onboarding to cornflower blue design #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingPageFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ sealed class OnboardingPageFragment : Fragment() {

class NoTracePage : OnboardingPageFragment() {
override fun layoutResource(): Int = R.layout.content_onboarding_no_trace
override fun backgroundColor(): Int = R.color.powderBlue
override fun backgroundColor(): Int = R.color.cornflowerBlue
}

class DefaultBrowserPage : OnboardingPageFragment() {
Expand Down
Binary file modified app/src/main/res/drawable-hdpi/onboarding_image_no_trace.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-mdpi/onboarding_image_no_trace.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/onboarding_image_no_trace.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxhdpi/onboarding_image_no_trace.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxxhdpi/onboarding_image_no_trace.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions app/src/main/res/layout/content_onboarding_no_trace.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
android:paddingEnd="44dp"
android:paddingStart="44dp"
android:tag="onboardingNoTrace"
tools:background="@color/powderBlue"
tools:background="@color/cornflowerBlue"
tools:context="com.duckduckgo.app.onboarding.ui.OnboardingActivity">

<ImageView
Expand Down Expand Up @@ -54,7 +54,6 @@
style="@style/OnboardingTextTitle"
android:text="@string/onboardingNoTraceTitle" />


<TextView
style="@style/OnboardingTextSubtitle"
android:text="@string/onboardingNoTraceDescription1" />
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<color name="powderBlue">#50BFFF</color>
<color name="powderBlue2">#B2D6F3</color>
<color name="windowsBlue">#3c90c0</color>
<color name="denimBlue">#3d5599</color>
<color name="cornflowerBlue">#678FFF</color>

<color name="lightOliveGreen">#93c04d</color>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
</style>

<style name="OnboardingButtonNoTrace" parent="OnboardingButtonStyle">
<item name="colorAccent">@color/windowsBlue</item>
<item name="colorAccent">@color/denimBlue</item>
</style>

<style name="OnboardingButtonDefaultBrowser" parent="OnboardingButtonStyle">
Expand Down