[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Add Offline Library onboarding tutorial screens
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/373678 ) Change subject: Add Offline Library onboarding tutorial screens .. Add Offline Library onboarding tutorial screens TODO (separately): add per-screen background gradients Bug: T172185 Change-Id: Id12acd876b640cd28e85589ea61a3bae54931607 --- M app/src/main/AndroidManifest.xml M app/src/main/java/org/wikipedia/Constants.java M app/src/main/java/org/wikipedia/feed/FeedFragment.java A app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java A app/src/main/java/org/wikipedia/offline/OfflineTutorialFragment.java A app/src/main/java/org/wikipedia/offline/OfflineTutorialPage.java A app/src/main/java/org/wikipedia/offline/OfflineTutorialPagerAdapter.java M app/src/main/java/org/wikipedia/settings/Prefs.java A app/src/main/res/drawable/ic_illustration_offlinelib_useredu_1.xml A app/src/main/res/drawable/ic_illustration_offlinelib_useredu_2.xml A app/src/main/res/drawable/ic_illustration_offlinelib_useredu_3.xml A app/src/main/res/layout/inflate_offline_tutorial_page_one.xml A app/src/main/res/layout/inflate_offline_tutorial_page_three.xml A app/src/main/res/layout/inflate_offline_tutorial_page_two.xml M app/src/main/res/values-qq/strings.xml M app/src/main/res/values/strings.xml M app/src/main/res/xml/developer_preferences.xml 17 files changed, 627 insertions(+), 4 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8ca32f2..608ffba 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -199,10 +199,14 @@ android:name=".offline.CompilationDetailActivity" android:theme="@style/AppTheme"/> + + +android:authorities="${applicationId}" +android:name=".database.AppContentProvider" +android:exported="false" /> +implements OnboardingFragment.Callback { +@NonNull +public static Intent newIntent(@NonNull Context context) { +return new Intent(context, OfflineTutorialActivity.class); +} + +@Override public void onCreate(Bundle savedInstanceState) { +super.onCreate(savedInstanceState); +setStatusBarColor(R.color.green30); +} + +@Override +protected OfflineTutorialFragment createFragment() { +return OfflineTutorialFragment.newInstance(); +} + +@Override +public void onComplete() { +setResult(RESULT_OK); +finish(); +} +} diff --git a/app/src/main/java/org/wikipedia/offline/OfflineTutorialFragment.java b/app/src/main/java/org/wikipedia/offline/OfflineTutorialFragment.java new file mode 100644 index 000..d51fcfc --- /dev/null +++ b/app/src/main/java/org/wikipedia/offline/OfflineTutorialFragment.java @@ -0,0 +1,36 @@ +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; + +public class OfflineTutorialFragment extends OnboardingFragment { +@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 +protected PagerAdapter getAdapter() { +return new OfflineTutorialPagerAdapter(); +} + +@Override +protected int getDoneButtonText() { +return R.string.offline_library_onboarding_button_done; +} +} diff --git a/app/src/main/java/org/wikipedia/offline/OfflineTutorialPage.java b/app/src/main/java/org/wikipedia/offline/OfflineTutorialPage.java new file mode 100644 index 000..1745982 --- /dev/null +++ b/app/src/main/java/org/wikipedia/offline/OfflineTutorialPage.java @@ -0,0 +1,41 @@ +package org.wikipedia.offline; + +import android.support.annotation.LayoutRes; +import android.support.annotation.NonNull; + +import org.wikipedia.R; +import org.wikipedia.model.EnumCode; +import org.wikipedia.model.EnumCodeMap; + +enum OfflineTutorialPage implements EnumCode { +PAGE_BUILD_LIBRARY(R.layout.inflate_offline_tutorial_page_one), +PAGE_UNINTERRUPTED_READING(R.layout.inflate_offline_tutorial_page_two), +PAGE_STORE_KNOWLEDGE(R.layout.inflate_offline_tutorial_page_three); + +@LayoutRes private final int layout; + +
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Add Offline Library onboarding tutorial screens
Mholloway has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/373678 ) Change subject: Add Offline Library onboarding tutorial screens .. Add Offline Library onboarding tutorial screens TODO (separately): add per-screen background gradients Bug: T172185 Change-Id: Id12acd876b640cd28e85589ea61a3bae54931607 --- M app/src/main/AndroidManifest.xml M app/src/main/java/org/wikipedia/Constants.java M app/src/main/java/org/wikipedia/feed/FeedFragment.java A app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java A app/src/main/java/org/wikipedia/offline/OfflineTutorialFragment.java A app/src/main/java/org/wikipedia/offline/OfflineTutorialPage.java A app/src/main/java/org/wikipedia/offline/OfflineTutorialPagerAdapter.java M app/src/main/java/org/wikipedia/settings/Prefs.java A app/src/main/res/drawable/ic_illustration_offlinelib_useredu_1.xml A app/src/main/res/drawable/ic_illustration_offlinelib_useredu_2.xml A app/src/main/res/drawable/ic_illustration_offlinelib_useredu_3.xml A app/src/main/res/layout/inflate_offline_tutorial_page_one.xml A app/src/main/res/layout/inflate_offline_tutorial_page_three.xml A app/src/main/res/layout/inflate_offline_tutorial_page_two.xml M app/src/main/res/values-qq/strings.xml M app/src/main/res/values/strings.xml M app/src/main/res/xml/developer_preferences.xml 17 files changed, 627 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/78/373678/1 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8ca32f2..608ffba 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -199,10 +199,14 @@ android:name=".offline.CompilationDetailActivity" android:theme="@style/AppTheme"/> + + +android:authorities="${applicationId}" +android:name=".database.AppContentProvider" +android:exported="false" /> +implements OnboardingFragment.Callback { +@NonNull +public static Intent newIntent(@NonNull Context context) { +return new Intent(context, OfflineTutorialActivity.class); +} + +@Override public void onCreate(Bundle savedInstanceState) { +super.onCreate(savedInstanceState); +setStatusBarColor(R.color.green30); +} + +@Override +protected OfflineTutorialFragment createFragment() { +return OfflineTutorialFragment.newInstance(); +} + +@Override +public void onComplete() { +setResult(RESULT_OK); +finish(); +} +} diff --git a/app/src/main/java/org/wikipedia/offline/OfflineTutorialFragment.java b/app/src/main/java/org/wikipedia/offline/OfflineTutorialFragment.java new file mode 100644 index 000..d51fcfc --- /dev/null +++ b/app/src/main/java/org/wikipedia/offline/OfflineTutorialFragment.java @@ -0,0 +1,36 @@ +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; + +public class OfflineTutorialFragment extends OnboardingFragment { +@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 +protected PagerAdapter getAdapter() { +return new OfflineTutorialPagerAdapter(); +} + +@Override +protected int getDoneButtonText() { +return R.string.offline_library_onboarding_button_done; +} +} diff --git a/app/src/main/java/org/wikipedia/offline/OfflineTutorialPage.java b/app/src/main/java/org/wikipedia/offline/OfflineTutorialPage.java new file mode 100644 index 000..1745982 --- /dev/null +++ b/app/src/main/java/org/wikipedia/offline/OfflineTutorialPage.java @@ -0,0 +1,41 @@ +package org.wikipedia.offline; + +import android.support.annotation.LayoutRes; +import android.support.annotation.NonNull; + +import org.wikipedia.R; +import org.wikipedia.model.EnumCode; +import org.wikipedia.model.EnumCodeMap; + +enum OfflineTutorialPage implements EnumCode { +PAGE_BUILD_LIBRARY(R.layout.inflate_offline_tutorial_page_one), +PAGE_UNINTERRUPTED_READING(R.layout.inflate_offline_tutorial_page_two), +PAGE_STORE_KNOWLEDGE(R.layout.inflate_offline_tutorial_page_three); + +@LayoutRes private final int layout; + +