Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update layout for brave stats warning page

Browse Source 
Refactor onboarding
This commit is contained in:
Deep
2020-07-30 03:28:22 -04:00
parent e3c7699eba
commit 26653c7b96
6 changed files with 13 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/BraveActivity.java
+2 -2
View File
@@ -260,11 +260,11 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
if (PackageUtils.isFirstInstall(ContextUtils.getApplicationContext())
&& !OnboardingPrefManager.getInstance().isNewOnboardingShown()) {
showOnboarding(OnboardingPrefManager.ONBOARDING_INVALID_OPTION, -1);
showOnboarding();
}
}
public void showOnboarding(int onboradingType, int index) {
public void showOnboarding() {
OnboardingPrefManager.getInstance().setNewOnboardingShown(true);
FragmentManager fm = getSupportFragmentManager();
HighlightDialogFragment fragment = (HighlightDialogFragment) fm
android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
+1 -25
View File
@@ -148,30 +148,6 @@ public class BraveNewTabPageLayout extends NewTabPageLayout {
mDataSavedTextView = (TextView) mBraveStatsView.findViewById(R.id.brave_stats_data_saved_text);
mEstTimeSavedTextView = (TextView) mBraveStatsView.findViewById(R.id.brave_stats_text_time);
LinearLayout mAdsLayout = mBraveStatsView.findViewById(R.id.brave_stats_ads);
mAdsLayout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// ((BraveActivity)mActivity).showOnboarding(OnboardingPrefManager.ONBOARDING_ADS, 0);
}
});
LinearLayout mDataSavedLayout = mBraveStatsView.findViewById(R.id.brave_stats_data_saved);
mDataSavedLayout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// ((BraveActivity)mActivity).showOnboarding(OnboardingPrefManager.ONBOARDING_DATA_SAVED, 0);
}
});
LinearLayout mEstTimeSavedLayout = mBraveStatsView.findViewById(R.id.brave_stats_time);
mEstTimeSavedLayout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// ((BraveActivity)mActivity).showOnboarding(OnboardingPrefManager.ONBOARDING_TIME, 0);
}
});
FrameLayout mBadgeLayout = findViewById(R.id.badge_layout);
ImageView mBadgeImageView = findViewById(R.id.badge_image_view);
mBadgeImageView.setOnClickListener(new View.OnClickListener() {
@@ -180,7 +156,7 @@ public class BraveNewTabPageLayout extends NewTabPageLayout {
if (OnboardingPrefManager.getInstance().isBraveStatsEnabled()) {
BraveStatsUtil.showBraveStats();
} else {
((BraveActivity)mActivity).showOnboarding(OnboardingPrefManager.ONBOARDING_INVALID_OPTION, 0);
((BraveActivity)mActivity).showOnboarding();
}
}
});
android/java/org/chromium/chrome/browser/onboarding/OnboardingPrefManager.java
-5
View File
@@ -50,11 +50,6 @@ public class OnboardingPrefManager {
public static final int EXISTING_USER_REWARDS_OFF_ONBOARDING = 1;
public static final int EXISTING_USER_REWARDS_ON_ONBOARDING = 2;
public static final int ONBOARDING_INVALID_OPTION = -1;
public static final int ONBOARDING_ADS = 1;
public static final int ONBOARDING_DATA_SAVED = 2;
public static final int ONBOARDING_TIME = 3;
private static boolean isOnboardingNotificationShown;
public static boolean isNotification;
android/java/org/chromium/chrome/browser/onboarding/v2/OnboardingV2Fragment.java
+9 -26
View File
@@ -18,9 +18,12 @@ import android.os.Handler;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.FrameLayout;
import android.widget.TextView;
import android.widget.Button;
import android.widget.ImageView;
import android.view.Gravity;
import com.airbnb.lottie.LottieAnimationView;
import org.chromium.base.ContextUtils;
@@ -59,7 +62,6 @@ public class OnboardingV2Fragment extends Fragment {
);
private int mPosition;
private int mOnboardingType;
private HighlightDialogListener highlightDialogListener;
private LottieAnimationView mAnimatedView;
@@ -105,28 +107,9 @@ public class OnboardingV2Fragment extends Fragment {
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
if (mOnboardingType == OnboardingPrefManager.ONBOARDING_ADS
|| mOnboardingType == OnboardingPrefManager.ONBOARDING_DATA_SAVED
|| mOnboardingType == OnboardingPrefManager.ONBOARDING_TIME) {
if (OnboardingPrefManager.getInstance().isBraveStatsEnabled()) {
view.findViewById(R.id.btn_turn_on_privacy_stats).setVisibility(View.GONE);
}
}
switch (mOnboardingType) {
case OnboardingPrefManager.ONBOARDING_ADS:
mPosition = 0;
break;
case OnboardingPrefManager.ONBOARDING_DATA_SAVED:
mPosition = 1;
break;
case OnboardingPrefManager.ONBOARDING_TIME:
mPosition = 2;
break;
case OnboardingPrefManager.ONBOARDING_INVALID_OPTION:
view.findViewById(R.id.indicator_layout).setVisibility(View.VISIBLE);
break;
}
LinearLayout mOnboardingLayout = view.findViewById(R.id.onboarding_layout);
view.findViewById(R.id.indicator_layout).setVisibility(View.VISIBLE);
TextView mHeader = view.findViewById(R.id.onboarding_header);
mHeader.setText(mHeaders.get(mPosition));
@@ -168,6 +151,10 @@ public class OnboardingV2Fragment extends Fragment {
break;
case 3:
mIndicator4.setBackground(mContext.getResources().getDrawable(R.drawable.selected_indicator));
FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT);
params.gravity = Gravity.CENTER;
mOnboardingLayout.setLayoutParams(params);
break;
}
}
@@ -176,10 +163,6 @@ public class OnboardingV2Fragment extends Fragment {
this.mPosition = position;
}
public void setOnboardingType(int onboardingType) {
this.mOnboardingType = onboardingType;
}
public void setHighlightListener(HighlightDialogListener highlightDialogListener) {
this.highlightDialogListener = highlightDialogListener;
}
android/java/org/chromium/chrome/browser/onboarding/v2/OnboardingV2PagerAdapter.java
-1
View File
@@ -26,7 +26,6 @@ public class OnboardingV2PagerAdapter extends FragmentPagerAdapter {
public Fragment getItem(int position) {
OnboardingV2Fragment onboardingV2Fragment = new OnboardingV2Fragment();
onboardingV2Fragment.setPosition(position);
onboardingV2Fragment.setOnboardingType(OnboardingPrefManager.ONBOARDING_INVALID_OPTION);
onboardingV2Fragment.setHighlightListener(highlightDialogListener);
return onboardingV2Fragment;
android/java/res/layout/fragment_onboarding_v2.xml
+1
View File
@@ -10,6 +10,7 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/onboarding_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/brave_stats_bg_color"