[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Onboarding per-screen backgrounds follow-up.
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/373707 ) Change subject: Onboarding per-screen backgrounds follow-up. .. Onboarding per-screen backgrounds follow-up. Change-Id: I1c33b18f94bb3aecbef41d4fc1549cf503e3b554 --- M app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialFragment.java M app/src/main/res/layout/inflate_description_edit_tutorial_page_one.xml M app/src/main/res/layout/inflate_description_edit_tutorial_page_two.xml M app/src/main/res/layout/inflate_initial_onboarding_page_one.xml M app/src/main/res/layout/inflate_initial_onboarding_page_three.xml M app/src/main/res/layout/inflate_initial_onboarding_page_two.xml 6 files changed, 10 insertions(+), 17 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialFragment.java b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialFragment.java index 62dfb59..cdc8b60 100644 --- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialFragment.java +++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialFragment.java @@ -1,12 +1,7 @@ package org.wikipedia.descriptions; -import android.os.Bundle; import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; import android.support.v4.view.PagerAdapter; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; import org.wikipedia.R; import org.wikipedia.onboarding.OnboardingFragment; @@ -15,13 +10,6 @@ @NonNull public static DescriptionEditTutorialFragment newInstance() { return new DescriptionEditTutorialFragment(); -} - -@Override -public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { -View view = super.onCreateView(inflater, container, savedInstanceState); -view.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.onboarding_gradient_background_90)); -return view; } @Override diff --git a/app/src/main/res/layout/inflate_description_edit_tutorial_page_one.xml b/app/src/main/res/layout/inflate_description_edit_tutorial_page_one.xml index 2125d85..99e41c7 100644 --- a/app/src/main/res/layout/inflate_description_edit_tutorial_page_one.xml +++ b/app/src/main/res/layout/inflate_description_edit_tutorial_page_one.xml @@ -7,4 +7,5 @@ app:centeredImage="@drawable/illustration_description_onboard_1" app:imageSize="260dp" app:primaryText="@string/description_edit_tutorial_title_descriptions" - app:secondaryText="@string/description_edit_tutorial_title_descriptions_summary" /> \ No newline at end of file + app:secondaryText="@string/description_edit_tutorial_title_descriptions_summary" +app:background="@drawable/onboarding_gradient_background_90"/> \ No newline at end of file diff --git a/app/src/main/res/layout/inflate_description_edit_tutorial_page_two.xml b/app/src/main/res/layout/inflate_description_edit_tutorial_page_two.xml index 9ae200d..3d264e7 100644 --- a/app/src/main/res/layout/inflate_description_edit_tutorial_page_two.xml +++ b/app/src/main/res/layout/inflate_description_edit_tutorial_page_two.xml @@ -8,4 +8,5 @@ app:imageSize="260dp" app:primaryText="@string/description_edit_tutorial_keep_it_short" app:secondaryText="@string/description_edit_tutorial_keep_it_short_instructions" -app:tertiaryText="@string/description_edit_tutorial_promise" /> \ No newline at end of file +app:tertiaryText="@string/description_edit_tutorial_promise" +app:background="@drawable/onboarding_gradient_background_90"/> \ No newline at end of file diff --git a/app/src/main/res/layout/inflate_initial_onboarding_page_one.xml b/app/src/main/res/layout/inflate_initial_onboarding_page_one.xml index be998d3..44818a6 100644 --- a/app/src/main/res/layout/inflate_initial_onboarding_page_one.xml +++ b/app/src/main/res/layout/inflate_initial_onboarding_page_one.xml @@ -8,4 +8,5 @@ app:centeredImage="@drawable/illustration_onboarding_explore" app:imageSize="160dp" app:primaryText="@string/onboarding_explore_title" -app:secondaryText="@string/onboarding_explore_text" /> \ No newline at end of file +app:secondaryText="@string/onboarding_explore_text" +app:background="@drawable/onboarding_gradient_background_135"/> \ No newline at end of file diff --git a/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml b/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml index 3cdef26..343dfdf 100644 --- a/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml +++ b/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml @@ -9,4 +9,5 @@ app:imageSize="160dp" app:primaryText="@string/onboarding_analytics_title"
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Onboarding per-screen backgrounds follow-up.
Dbrant has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/373707 ) Change subject: Onboarding per-screen backgrounds follow-up. .. Onboarding per-screen backgrounds follow-up. Change-Id: I1c33b18f94bb3aecbef41d4fc1549cf503e3b554 --- M app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialFragment.java M app/src/main/res/layout/inflate_description_edit_tutorial_page_one.xml M app/src/main/res/layout/inflate_description_edit_tutorial_page_two.xml M app/src/main/res/layout/inflate_initial_onboarding_page_one.xml M app/src/main/res/layout/inflate_initial_onboarding_page_three.xml M app/src/main/res/layout/inflate_initial_onboarding_page_two.xml 6 files changed, 10 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/07/373707/1 diff --git a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialFragment.java b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialFragment.java index 62dfb59..cdc8b60 100644 --- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialFragment.java +++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialFragment.java @@ -1,12 +1,7 @@ package org.wikipedia.descriptions; -import android.os.Bundle; import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; import android.support.v4.view.PagerAdapter; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; import org.wikipedia.R; import org.wikipedia.onboarding.OnboardingFragment; @@ -15,13 +10,6 @@ @NonNull public static DescriptionEditTutorialFragment newInstance() { return new DescriptionEditTutorialFragment(); -} - -@Override -public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { -View view = super.onCreateView(inflater, container, savedInstanceState); -view.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.onboarding_gradient_background_90)); -return view; } @Override diff --git a/app/src/main/res/layout/inflate_description_edit_tutorial_page_one.xml b/app/src/main/res/layout/inflate_description_edit_tutorial_page_one.xml index 2125d85..99e41c7 100644 --- a/app/src/main/res/layout/inflate_description_edit_tutorial_page_one.xml +++ b/app/src/main/res/layout/inflate_description_edit_tutorial_page_one.xml @@ -7,4 +7,5 @@ app:centeredImage="@drawable/illustration_description_onboard_1" app:imageSize="260dp" app:primaryText="@string/description_edit_tutorial_title_descriptions" - app:secondaryText="@string/description_edit_tutorial_title_descriptions_summary" /> \ No newline at end of file + app:secondaryText="@string/description_edit_tutorial_title_descriptions_summary" +app:background="@drawable/onboarding_gradient_background_90"/> \ No newline at end of file diff --git a/app/src/main/res/layout/inflate_description_edit_tutorial_page_two.xml b/app/src/main/res/layout/inflate_description_edit_tutorial_page_two.xml index 9ae200d..3d264e7 100644 --- a/app/src/main/res/layout/inflate_description_edit_tutorial_page_two.xml +++ b/app/src/main/res/layout/inflate_description_edit_tutorial_page_two.xml @@ -8,4 +8,5 @@ app:imageSize="260dp" app:primaryText="@string/description_edit_tutorial_keep_it_short" app:secondaryText="@string/description_edit_tutorial_keep_it_short_instructions" -app:tertiaryText="@string/description_edit_tutorial_promise" /> \ No newline at end of file +app:tertiaryText="@string/description_edit_tutorial_promise" +app:background="@drawable/onboarding_gradient_background_90"/> \ No newline at end of file diff --git a/app/src/main/res/layout/inflate_initial_onboarding_page_one.xml b/app/src/main/res/layout/inflate_initial_onboarding_page_one.xml index be998d3..44818a6 100644 --- a/app/src/main/res/layout/inflate_initial_onboarding_page_one.xml +++ b/app/src/main/res/layout/inflate_initial_onboarding_page_one.xml @@ -8,4 +8,5 @@ app:centeredImage="@drawable/illustration_onboarding_explore" app:imageSize="160dp" app:primaryText="@string/onboarding_explore_title" -app:secondaryText="@string/onboarding_explore_text" /> \ No newline at end of file +app:secondaryText="@string/onboarding_explore_text" +app:background="@drawable/onboarding_gradient_background_135"/> \ No newline at end of file diff --git a/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml b/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml index 3cdef26..343dfdf 100644 --- a/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml +++ b/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml @@ -9,4 +9,5 @@ app:imageSize="160dp"