[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update Offline Library tutorial to have per-screen backgrounds
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/373693 ) Change subject: Update Offline Library tutorial to have per-screen backgrounds .. Update Offline Library tutorial to have per-screen backgrounds Updates the generic onboarding activity components as needed to implement the current design. Adds an optional styleable declaration for an onboarding screen background drawable. Adds per-screen background gradients as specified on the ticket. Bug: T172185 Change-Id: I5aa8e76b0884f0e7a9a25376ac93e1283b580116 --- M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_TWO.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light-PAGE_ONE.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light-PAGE_TWO.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light-PAGE_ONE.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light-PAGE_TWO.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-light-PAGE_ONE.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-light-PAGE_TWO.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.0x-light-PAGE_ONE.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.0x-light-PAGE_TWO.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.5x-light-PAGE_ONE.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.5x-light-PAGE_TWO.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.0x-light-PAGE_ONE.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.0x-light-PAGE_TWO.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.5x-light-PAGE_ONE.png M app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.5x-light-PAGE_TWO.png M app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java M app/src/main/java/org/wikipedia/offline/OfflineTutorialFragment.java M app/src/main/java/org/wikipedia/onboarding/OnboardingPageView.java A app/src/main/res/drawable/onboarding_gradient_background_offline_one.xml A app/src/main/res/drawable/onboarding_gradient_background_offline_three.xml A app/src/main/res/drawable/onboarding_gradient_background_offline_two.xml M app/src/main/res/layout/fragment_onboarding_pager.xml M app/src/main/res/layout/inflate_offline_tutorial_page_one.xml M app/src/main/res/layout/inflate_offline_tutorial_page_three.xml M app/src/main/res/layout/inflate_offline_tutorial_page_two.xml M app/src/main/res/layout/view_onboarding_page.xml M app/src/main/res/values/attrs.xml 32 files changed, 102 insertions(+), 65 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png index bf7cf48..1b81a91 100644 --- a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png +++ b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.descriptions.Descriptio
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update Offline Library tutorial to have per-screen backgrounds
Mholloway has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/373693 ) Change subject: Update Offline Library tutorial to have per-screen backgrounds .. Update Offline Library tutorial to have per-screen backgrounds Updates the generic onboarding activity components as needed to implement the current design. Adds an optional styleable declaration for an onboarding screen background drawable. Adds per-screen background gradients as specified on the ticket. Bug: T172185 Change-Id: I5aa8e76b0884f0e7a9a25376ac93e1283b580116 --- M app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java M app/src/main/java/org/wikipedia/offline/OfflineTutorialFragment.java M app/src/main/java/org/wikipedia/onboarding/OnboardingPageView.java A app/src/main/res/drawable/onboarding_gradient_background_offline_one.xml A app/src/main/res/drawable/onboarding_gradient_background_offline_three.xml A app/src/main/res/drawable/onboarding_gradient_background_offline_two.xml M app/src/main/res/layout/fragment_onboarding_pager.xml M app/src/main/res/layout/inflate_offline_tutorial_page_one.xml M app/src/main/res/layout/inflate_offline_tutorial_page_three.xml M app/src/main/res/layout/inflate_offline_tutorial_page_two.xml M app/src/main/res/layout/view_onboarding_page.xml M app/src/main/res/values/attrs.xml 12 files changed, 102 insertions(+), 65 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/93/373693/1 diff --git a/app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java b/app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java index d531b87..6033b7d 100644 --- a/app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java +++ b/app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java @@ -2,10 +2,11 @@ import android.content.Context; import android.content.Intent; +import android.os.Build; import android.os.Bundle; import android.support.annotation.NonNull; +import android.view.WindowManager; -import org.wikipedia.R; import org.wikipedia.activity.SingleFragmentActivity; import org.wikipedia.onboarding.OnboardingFragment; @@ -18,7 +19,9 @@ @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); -setStatusBarColor(R.color.green30); +if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); +} } @Override diff --git a/app/src/main/java/org/wikipedia/offline/OfflineTutorialFragment.java b/app/src/main/java/org/wikipedia/offline/OfflineTutorialFragment.java index d51fcfc..6d689d1 100644 --- a/app/src/main/java/org/wikipedia/offline/OfflineTutorialFragment.java +++ b/app/src/main/java/org/wikipedia/offline/OfflineTutorialFragment.java @@ -1,12 +1,7 @@ package org.wikipedia.offline; -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 OfflineTutorialFragment newInstance() { return new OfflineTutorialFragment(); -} - -@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/java/org/wikipedia/onboarding/OnboardingPageView.java b/app/src/main/java/org/wikipedia/onboarding/OnboardingPageView.java index d7060ac..57347fa 100644 --- a/app/src/main/java/org/wikipedia/onboarding/OnboardingPageView.java +++ b/app/src/main/java/org/wikipedia/onboarding/OnboardingPageView.java @@ -99,7 +99,11 @@ String tertiaryText = array.getString(R.styleable.OnboardingPageView_tertiaryText); String switchText = array.getString(R.styleable.OnboardingPageView_switchText); int imageSize = array.getDimensionPixelSize(R.styleable.OnboardingPageView_imageSize, 0); +Drawable background = array.getDrawable(R.styleable.OnboardingPageView_background); +if (background != null) { +setBackground(background); +} FrameLayout.LayoutParams imageParams = (FrameLayout.LayoutParams) imageViewCentered.getLayoutParams(); imageParams.width = imageSize; imageParams.height = imageSize; diff --git a/app/src/main/res/drawable/onboarding_gradient_background_offline_one.xml b/app/src/main/r