Skip to content
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

Jump to bottom

Onboarding v2 dp 1.13.x (uplift to 1.13.x) #6263

Merged
merged 29 commits into from
Aug 25, 2020
Merged

Onboarding v2 dp 1.13.x (uplift to 1.13.x) #6263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2b8e1d6
Add UI for onboardingv2
deeppandya May 26, 2020
5198b8a
Add onboarding images
deeppandya Jun 1, 2020
253d048
Add resources in .gni
deeppandya Jun 1, 2020
63c1fe1
Update code with androidx library
deeppandya Jun 1, 2020
95e5724
Add Lottie library for animations
deeppandya Jun 15, 2020
e78ea91
Add animations
deeppandya Jun 15, 2020
6f8a590
Update newtabpage animation on page selection
deeppandya Jun 15, 2020
3a25a1e
Add data table for brave stats
deeppandya Jun 20, 2020
b151e82
Update view pager indicators
deeppandya Jun 23, 2020
5c15e17
Update view pager with dark/light mode
deeppandya Jun 24, 2020
1858ae0
Update brave stats for animation
deeppandya Jun 24, 2020
d81a885
Add stats icon
deeppandya Jun 26, 2020
7cb81f0
Update NTP for stats icon
deeppandya Jun 26, 2020
4d132ea
Update brave stats model code
deeppandya Jul 1, 2020
0101114
Add Brave stats UI
deeppandya Jul 4, 2020
b914fe9
Upfdate code for saved bandwidth
deeppandya Jul 6, 2020
d4621e5
Update Bravestats UI for onboarding v2
deeppandya Jul 9, 2020
37601f5
Add highlighted view
deeppandya Jul 13, 2020
788e629
Open fragment in portrait
deeppandya Jul 13, 2020
1c79ec2
Add resources for existing onboarding
deeppandya Jul 13, 2020
e445e6e
Update shields tooltip
deeppandya Jul 13, 2020
b595c92
Update UI with highlight view
deeppandya Jul 16, 2020
29d5270
Update brave stats db code
deeppandya Jul 20, 2020
b415d4d
Update layout for brave stats warning page
deeppandya Jul 23, 2020
e36872c
Enable search onboarding
deeppandya Jul 28, 2020
0aea225
Fix lint error
deeppandya Jul 28, 2020
dc01c7c
Update code to fix tests
deeppandya Jul 30, 2020
a3f2b77
Fix desktop build failure due to wrong use of Android-specific code
deeppandya Jul 30, 2020
dbccc5f
Fix CI error with CR85
deeppandya Aug 24, 2020
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
6 changes: 6 additions & 0 deletions BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,12 @@ if (is_android) {
"$root_build_dir/brave_resources.pak",
"$root_build_dir/brave_100_percent.pak",
"//brave/LICENSE.html",
"//brave/android/java/org/chromium/chrome/browser/onboarding/animations/onboarding_ads.json",
"//brave/android/java/org/chromium/chrome/browser/onboarding/animations/privacy_protection.json",
"//brave/android/java/org/chromium/chrome/browser/onboarding/animations/save_data_and_battery.json",
"//brave/android/java/org/chromium/chrome/browser/onboarding/animations/website_loads_faster.json",
"//brave/android/java/org/chromium/chrome/browser/onboarding/animations/onboarding_ads_notification.json",
"//brave/android/java/org/chromium/chrome/browser/onboarding/animations/onboarding_rewards.json",
]
deps = [
"//brave:browser_dependencies",
Expand Down
36 changes: 15 additions & 21 deletions android/brave_java_resources.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,16 @@ brave_java_resources = [
"java/res/drawable/shields_tooltip_background.xml",
"java/res/drawable/ic_yahoo.xml",
"java/res/drawable/sync_icon.xml",
"java/res/drawable/selected_indicator.xml",
"java/res/drawable/default_indicator.xml",
"java/res/drawable/indicator_selector.xml",
"java/res/drawable/ic_stats_icon.xml",
"java/res/drawable/brave_stats_rounded_bg.xml",
"java/res/drawable/brave_stats_radio_button_selector.xml",
"java/res/drawable/brave_stats_radio_button_normal.xml",
"java/res/drawable/brave_stats_radio_button_selected.xml",
"java/res/drawable/brave_stats_radio_group_bg.xml",
"java/res/drawable/ic_phone.xml",
"java/res/drawable-hdpi/check.png",
"java/res/drawable-hdpi/btn_bookmark.png",
"java/res/drawable-hdpi/arrow_forward.png",
Expand All @@ -91,7 +101,6 @@ brave_java_resources = [
"java/res/drawable-hdpi/location_bar_incognito_badge.png",
"java/res/drawable-hdpi/up_icon.png",
"java/res/drawable-hdpi/checkbox.png",
"java/res/drawable-hdpi/android_onboarding_4.png",
"java/res/drawable-hdpi/icon_error_notification.png",
"java/res/drawable-hdpi/ic_delete_white_24dp.png",
"java/res/drawable-hdpi/checkbox_checked.png",
Expand Down Expand Up @@ -128,7 +137,6 @@ brave_java_resources = [
"java/res/drawable-hdpi/incognito_splash.png",
"java/res/drawable-hdpi/btn_left.png",
"java/res/drawable-hdpi/brave_sync_btn_mobile.png",
"java/res/drawable-hdpi/android_onboarding_2.png",
"java/res/drawable-hdpi/wallet_withdraw.png",
"java/res/drawable-hdpi/btn_bat.png",
"java/res/drawable-hdpi/duckduckgo.png",
Expand All @@ -150,14 +158,11 @@ brave_java_resources = [
"java/res/drawable-hdpi/search_engine_startpage.png",
"java/res/drawable-hdpi/btn_brave_off.png",
"java/res/drawable-hdpi/qrcode_dark.png",
"java/res/drawable-hdpi/android_br_on.png",
"java/res/drawable-hdpi/coin_stack.png",
"java/res/drawable-hdpi/android_onboarding_3.png",
"java/res/drawable-hdpi/btn_tabswitcher_modern.png",
"java/res/drawable-hdpi/qrcode_light.png",
"java/res/drawable-hdpi/down_arrow.png",
"java/res/drawable-hdpi/icn_youtube.png",
"java/res/drawable-hdpi/android_onboarding_1.png",
"java/res/drawable-hdpi/bat_verified.png",
"java/res/drawable-hdpi/ic_expand_more_black_24dp.png",
"java/res/drawable-hdpi/omnibox_info_red.png",
Expand Down Expand Up @@ -200,7 +205,6 @@ brave_java_resources = [
"java/res/drawable-mdpi/location_bar_incognito_badge.png",
"java/res/drawable-mdpi/up_icon.png",
"java/res/drawable-mdpi/checkbox.png",
"java/res/drawable-mdpi/android_onboarding_4.png",
"java/res/drawable-mdpi/icon_error_notification.png",
"java/res/drawable-mdpi/ic_delete_white_24dp.png",
"java/res/drawable-mdpi/checkbox_checked.png",
Expand Down Expand Up @@ -237,7 +241,6 @@ brave_java_resources = [
"java/res/drawable-mdpi/incognito_splash.png",
"java/res/drawable-mdpi/btn_left.png",
"java/res/drawable-mdpi/brave_sync_btn_mobile.png",
"java/res/drawable-mdpi/android_onboarding_2.png",
"java/res/drawable-mdpi/wallet_withdraw.png",
"java/res/drawable-mdpi/btn_bat.png",
"java/res/drawable-mdpi/duckduckgo.png",
Expand All @@ -258,13 +261,10 @@ brave_java_resources = [
"java/res/drawable-mdpi/btn_brave.png",
"java/res/drawable-mdpi/search_engine_startpage.png",
"java/res/drawable-mdpi/btn_brave_off.png",
"java/res/drawable-mdpi/android_br_on.png",
"java/res/drawable-mdpi/coin_stack.png",
"java/res/drawable-mdpi/android_onboarding_3.png",
"java/res/drawable-mdpi/btn_tabswitcher_modern.png",
"java/res/drawable-mdpi/down_arrow.png",
"java/res/drawable-mdpi/icn_youtube.png",
"java/res/drawable-mdpi/android_onboarding_1.png",
"java/res/drawable-mdpi/bat_verified.png",
"java/res/drawable-mdpi/ic_expand_more_black_24dp.png",
"java/res/drawable-mdpi/omnibox_info_red.png",
Expand Down Expand Up @@ -352,7 +352,6 @@ brave_java_resources = [
"java/res/drawable-xhdpi/location_bar_incognito_badge.png",
"java/res/drawable-xhdpi/up_icon.png",
"java/res/drawable-xhdpi/checkbox.png",
"java/res/drawable-xhdpi/android_onboarding_4.png",
"java/res/drawable-xhdpi/icon_error_notification.png",
"java/res/drawable-xhdpi/ic_delete_white_24dp.png",
"java/res/drawable-xhdpi/checkbox_checked.png",
Expand Down Expand Up @@ -389,7 +388,6 @@ brave_java_resources = [
"java/res/drawable-xhdpi/incognito_splash.png",
"java/res/drawable-xhdpi/btn_left.png",
"java/res/drawable-xhdpi/brave_sync_btn_mobile.png",
"java/res/drawable-xhdpi/android_onboarding_2.png",
"java/res/drawable-xhdpi/wallet_withdraw.png",
"java/res/drawable-xhdpi/btn_bat.png",
"java/res/drawable-xhdpi/duckduckgo.png",
Expand All @@ -410,13 +408,10 @@ brave_java_resources = [
"java/res/drawable-xhdpi/btn_brave.png",
"java/res/drawable-xhdpi/search_engine_startpage.png",
"java/res/drawable-xhdpi/btn_brave_off.png",
"java/res/drawable-xhdpi/android_br_on.png",
"java/res/drawable-xhdpi/coin_stack.png",
"java/res/drawable-xhdpi/android_onboarding_3.png",
"java/res/drawable-xhdpi/btn_tabswitcher_modern.png",
"java/res/drawable-xhdpi/down_arrow.png",
"java/res/drawable-xhdpi/icn_youtube.png",
"java/res/drawable-xhdpi/android_onboarding_1.png",
"java/res/drawable-xhdpi/bat_verified.png",
"java/res/drawable-xhdpi/ic_expand_more_black_24dp.png",
"java/res/drawable-xhdpi/omnibox_info_red.png",
Expand Down Expand Up @@ -459,7 +454,6 @@ brave_java_resources = [
"java/res/drawable-xxhdpi/location_bar_incognito_badge.png",
"java/res/drawable-xxhdpi/up_icon.png",
"java/res/drawable-xxhdpi/checkbox.png",
"java/res/drawable-xxhdpi/android_onboarding_4.png",
"java/res/drawable-xxhdpi/icon_error_notification.png",
"java/res/drawable-xxhdpi/ic_delete_white_24dp.png",
"java/res/drawable-xxhdpi/checkbox_checked.png",
Expand Down Expand Up @@ -496,7 +490,6 @@ brave_java_resources = [
"java/res/drawable-xxhdpi/incognito_splash.png",
"java/res/drawable-xxhdpi/btn_left.png",
"java/res/drawable-xxhdpi/brave_sync_btn_mobile.png",
"java/res/drawable-xxhdpi/android_onboarding_2.png",
"java/res/drawable-xxhdpi/wallet_withdraw.png",
"java/res/drawable-xxhdpi/btn_bat.png",
"java/res/drawable-xxhdpi/duckduckgo.png",
Expand All @@ -518,13 +511,10 @@ brave_java_resources = [
"java/res/drawable-xxhdpi/search_engine_startpage.png",
"java/res/drawable-xxhdpi/btn_brave_off.png",
"java/res/drawable-xxhdpi/qrcode_dark.png",
"java/res/drawable-xxhdpi/android_br_on.png",
"java/res/drawable-xxhdpi/coin_stack.png",
"java/res/drawable-xxhdpi/android_onboarding_3.png",
"java/res/drawable-xxhdpi/btn_tabswitcher_modern.png",
"java/res/drawable-xxhdpi/qrcode_light.png",
"java/res/drawable-xxhdpi/icn_youtube.png",
"java/res/drawable-xxhdpi/android_onboarding_1.png",
"java/res/drawable-xxhdpi/bat_verified.png",
"java/res/drawable-xxhdpi/ic_expand_more_black_24dp.png",
"java/res/drawable-xxhdpi/omnibox_info_red.png",
Expand Down Expand Up @@ -647,13 +637,16 @@ brave_java_resources = [
"java/res/layout/new_tab_page_incognito.xml",
"java/res/layout/fragment_super_referral_share.xml",
"java/res/layout/activity_onboarding.xml",
"java/res/layout/fragment_onboarding_v2.xml",
"java/res/layout/brave_stats_pager_layout.xml",
"java/res/layout/brave_stats_bottom_sheet.xml",
"java/res/layout/brave_stats_layout.xml",
"java/res/layout/highlight_layout.xml",
"java/res/layout/brave_shields_secondary_layout.xml",
"java/res/layout/report_broken_site_layout.xml",
"java/res/layout/brave_shields_3rd_party_cookies_blocked_switcher.xml",
"java/res/layout/brave_set_default_browser_dialog.xml",
"java/res/layout/brave_rewards_spinnner_item.xml",
"java/res/layout/fragment_brave_shields_onboarding.xml",
"java/res/layout/brave_ads_existing_user_dialog_layout.xml",
"java/res/layout/brave_rewards_panel.xml",
"java/res/layout/brave_rewards_site_banner.xml",
Expand Down Expand Up @@ -697,6 +690,7 @@ brave_java_resources = [
"java/res/layout/brave_rewards_panel_grant.xml",
"java/res/layout/brave_sync_add_laptop.xml",
"java/res/layout/fragment_cross_promotional_modal_dialog.xml",
"java/res/layout/tracker_item_layout.xml",
"java/res/layout-land/brave_rewards_site_banner.xml",
"java/res/layout-land/verify_wallet_activity.xml",
"java/res/menu/new_tab_menu.xml",
Expand Down
10 changes: 9 additions & 1 deletion android/brave_java_sources.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ brave_java_sources = [
"../../brave/android/java/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java",
"../../brave/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsOnboardingFragment.java",
"../../brave/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsService.java",
"../../brave/android/java/org/chromium/chrome/browser/onboarding/BraveShieldsOnboardingFragment.java",
"../../brave/android/java/org/chromium/chrome/browser/onboarding/NonSwipeableViewPager.java",
"../../brave/android/java/org/chromium/chrome/browser/onboarding/OnboardingActivity.java",
"../../brave/android/java/org/chromium/chrome/browser/onboarding/OnboardingPrefManager.java",
Expand All @@ -78,6 +77,13 @@ brave_java_sources = [
"../../brave/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java",
"../../brave/android/java/org/chromium/chrome/browser/onboarding/TroubleshootingOnboardingFragment.java",
"../../brave/android/java/org/chromium/chrome/browser/onboarding/SearchActivity.java",
"../../brave/android/java/org/chromium/chrome/browser/onboarding/v2/HighlightItem.java",
"../../brave/android/java/org/chromium/chrome/browser/onboarding/v2/HighlightDialogFragment.java",
"../../brave/android/java/org/chromium/chrome/browser/onboarding/v2/HighlightView.java",
"../../brave/android/java/org/chromium/chrome/browser/onboarding/v2/OnboardingV2PagerAdapter.java",
"../../brave/android/java/org/chromium/chrome/browser/onboarding/v2/OnboardingV2Fragment.java",
"../../brave/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java",
"../../brave/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsUtil.java",
"../../brave/android/java/org/chromium/chrome/browser/partnercustomizations/BravePartnerBrowserCustomizations.java",
"../../brave/android/java/org/chromium/chrome/browser/partnercustomizations/CloseBraveManager.java",
"../../brave/android/java/org/chromium/chrome/browser/preferences/BravePreferenceKeys.java",
Expand Down Expand Up @@ -138,6 +144,8 @@ brave_java_sources = [
"../../brave/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java",
"../../brave/android/java/org/chromium/chrome/browser/local_database/DatabaseHelper.java",
"../../brave/android/java/org/chromium/chrome/browser/local_database/TopSiteTable.java",
"../../brave/android/java/org/chromium/chrome/browser/local_database/BraveStatsTable.java",
"../../brave/android/java/org/chromium/chrome/browser/local_database/SavedBandwidthTable.java",
"../../brave/android/java/org/chromium/chrome/browser/rate/RateDialogFragment.java",
"../../brave/android/java/org/chromium/chrome/browser/rate/RateUtils.java",
"../../brave/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java",
Expand Down
25 changes: 21 additions & 4 deletions android/java/org/chromium/chrome/browser/BraveActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;

import org.chromium.base.ApplicationStatus;
import org.chromium.base.CommandLine;
Expand Down Expand Up @@ -67,12 +69,11 @@
import org.chromium.chrome.browser.onboarding.OnboardingPrefManager;
import org.chromium.chrome.browser.onboarding.OnboardingActivity;
import org.chromium.chrome.browser.CrossPromotionalModalDialogFragment;
import org.chromium.chrome.browser.onboarding.v2.HighlightDialogFragment;

import java.util.Calendar;
import java.util.Date;

import java.util.Calendar;

/**
* Brave's extension for ChromeActivity
*/
Expand Down Expand Up @@ -258,6 +259,22 @@ public void finishNativeInitialization() {
BraveSyncReflectionUtils.showInformers();
}

public void showOnboarding() {
OnboardingPrefManager.getInstance().setNewOnboardingShown(true);
FragmentManager fm = getSupportFragmentManager();
HighlightDialogFragment fragment = (HighlightDialogFragment) fm
.findFragmentByTag(HighlightDialogFragment.TAG_FRAGMENT);
FragmentTransaction transaction = fm.beginTransaction();

if (fragment != null) {
transaction.remove(fragment);
}

fragment = new HighlightDialogFragment();
transaction.add(fragment, HighlightDialogFragment.TAG_FRAGMENT);
transaction.commit();
}

private void createNotificationChannel() {
Context context = ContextUtils.getApplicationContext();
// Create the NotificationChannel, but only on API 26+ because
Expand Down Expand Up @@ -499,9 +516,9 @@ public void performPreInflationStartup() {

@Override
protected @LaunchIntentDispatcher.Action int maybeDispatchLaunchIntent(
Intent intent, Bundle savedInstanceState) {
Intent intent, Bundle savedInstanceState) {
boolean notificationUpdate = IntentUtils.safeGetBooleanExtra(
intent, BravePreferenceKeys.BRAVE_UPDATE_EXTRA_PARAM, false);
intent, BravePreferenceKeys.BRAVE_UPDATE_EXTRA_PARAM, false);
if (notificationUpdate) {
SetUpdatePreferences();
}
Expand Down
Loading