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

AP-357 Implement design changes on dashboard #140

Merged
merged 3 commits into from
Jul 4, 2019
Merged

AP-357 Implement design changes on dashboard #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c8c192
AP-360 Implement design changes on subscription screen
jayeshsolanki93 Jul 1, 2019
ce502ae
AP-357 Implement design changes on dashboard
jayeshsolanki93 Jul 2, 2019
699bf17
Remove ControlCenterDialog abstract class
jayeshsolanki93 Jul 4, 2019
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
15 changes: 4 additions & 11 deletions app/src/lumen/java/com/cliqz/browser/controlcenter/BaseControlCenterPagerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.cliqz.browser.controlcenter;

import android.content.Context;

import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
Expand All @@ -16,14 +14,13 @@
*/
public abstract class BaseControlCenterPagerAdapter extends FragmentPagerAdapter {

private Context mContext;
final List<ControlCenterFragment> mFragmentList = new ArrayList<>();
final List<DashboardFragment> mFragmentList = new ArrayList<>();

BaseControlCenterPagerAdapter(FragmentManager fm, Context context) {
BaseControlCenterPagerAdapter(FragmentManager fm) {
super(fm);
mContext = context;
}

@Override
public Fragment getItem(int position) {
return mFragmentList.get(position);
}
Expand All @@ -33,11 +30,7 @@ public int getCount() {
}

public CharSequence getPageTitle(int position) {
return mFragmentList.get(position).getTitle(mContext, position);
}

void updateCurrentView(int position) {
mFragmentList.get(position).refreshUI();
return mFragmentList.get(position).getTitle();
}

void updateViewComponent(int position, boolean optionValue) {
Expand Down
36 changes: 27 additions & 9 deletions app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.cliqz.browser.controlcenter;

import android.app.Activity;
import android.content.Context;
import android.content.res.Configuration;
import android.os.Bundle;
import android.util.Log;
Expand All @@ -14,6 +15,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.SwitchCompat;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentManager;

Expand Down Expand Up @@ -67,9 +69,6 @@ public class ControlCenterDialog extends DialogFragment {
@BindView(R.id.subscribe_ultimate_protection_btn)
Button subscribeUltimateProtectionBtn;

@BindView(R.id.dashboard_disable_overlay)
View dashboardDisableOverlay;

@Inject
AntiTracking antiTracking;

Expand Down Expand Up @@ -136,11 +135,12 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
final View view = LayoutInflater.from(getContext()).inflate(R.layout.control_center_layout,
final Context context = getContext();
final View view = LayoutInflater.from(context).inflate(R.layout.control_center_layout,
container, false);
ButterKnife.bind(this, view);

mControlCenterPagerAdapter = new ControlCenterPagerAdapter(getChildFragmentManager(), getContext());
mControlCenterPagerAdapter = new ControlCenterPagerAdapter(getChildFragmentManager());
mControlCenterPagerAdapter.init();
controlCenterPager.setAdapter(mControlCenterPagerAdapter);
controlCenterTabLayout.setupWithViewPager(controlCenterPager);
Expand All @@ -150,9 +150,10 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
ultimateProtectionSwitch.setOnCheckedChangeListener((compoundButton, isChecked) -> {
mControlCenterPagerAdapter.updateViewComponent(0, isChecked);
mControlCenterPagerAdapter.updateViewComponent(1, isChecked);
toggleTabLayout(isChecked);
try {
adblocker.setEnabled(isChecked);
antiTracking.setEnabled(isChecked);;
antiTracking.setEnabled(isChecked);
preferenceManager.setAttrackEnabled(isChecked);
preferenceManager.setAdBlockEnabled(isChecked);
bus.post(new Messages.onDashboardStateChange());
Expand All @@ -174,7 +175,7 @@ void clearDashboardData(Messages.ClearDashboardData clearDashboardData) {

@Subscribe
void onPurchaseCompleted(Messages.PurchaseCompleted purchaseCompleted) {
hideSubscribeButton(purchasesManager.getPurchase().isDashboardEnabled());
hideSubscribeButton(purchasesManager.isDashboardEnabled());
}

@Override
Expand All @@ -188,10 +189,11 @@ public void onConfigurationChanged(Configuration newConfig) {
}

private void hideSubscribeButton(boolean isDashboardEnabled) {
toggleTabLayout(isDashboardEnabled);
ultimateProtectionSwitch.setChecked(preferenceManager.isAttrackEnabled() &&
preferenceManager.getAdBlockEnabled());
subscribeUltimateProtectionView.setVisibility(isDashboardEnabled ? View.GONE : View.VISIBLE);
dashboardDisableOverlay.setVisibility(isDashboardEnabled ? View.GONE : View.VISIBLE);
ultimateProtectionContainer.setVisibility(isDashboardEnabled ? View.VISIBLE : View.GONE);
ViewExtensionsKt.enableViewHierarchy(ultimateProtectionContainer, isDashboardEnabled);
ViewExtensionsKt.enableViewHierarchy(controlCenterTabLayout, isDashboardEnabled);
controlCenterPager.isPagingEnabled = isDashboardEnabled;
Expand All @@ -202,9 +204,25 @@ private void hideSubscribeButton(boolean isDashboardEnabled) {
}
}

private void toggleTabLayout(boolean isEnabled) {
final Context context = getContext();
if (isEnabled) {
controlCenterTabLayout.setSelectedTabIndicatorColor(
ContextCompat.getColor(context,R.color.bond_general_color_blue));
controlCenterTabLayout.setTabTextColors(
ContextCompat.getColor(context, R.color.bond_disabled_text_color),
ContextCompat.getColor(context, R.color.bond_general_color_blue));
} else {
controlCenterTabLayout.setSelectedTabIndicatorColor(
ContextCompat.getColor(context,R.color.lumen_color_grey_text));
controlCenterTabLayout.setTabTextColors(
ContextCompat.getColor(context, R.color.lumen_color_grey_text),
ContextCompat.getColor(context, R.color.lumen_color_grey_text));
}
}

private void updateUI() {
for (ControlCenterFragment fragment : mControlCenterPagerAdapter.mFragmentList) {
for (DashboardFragment fragment : mControlCenterPagerAdapter.mFragmentList) {
fragment.updateUI();
}
}
Expand Down
19 changes: 0 additions & 19 deletions app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterFragment.java
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterPagerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.cliqz.browser.controlcenter;

import android.content.Context;
import android.os.Bundle;

import androidx.fragment.app.FragmentManager;
Expand All @@ -12,8 +11,8 @@ public class ControlCenterPagerAdapter extends BaseControlCenterPagerAdapter {

static final String IS_TODAY = "is_daily";

ControlCenterPagerAdapter(FragmentManager fm, Context context) {
super(fm, context);
ControlCenterPagerAdapter(FragmentManager fm) {
super(fm);
}

public void init() {
Expand Down
22 changes: 0 additions & 22 deletions app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterTabs.java
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterViewPager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,6 @@ class ControlCenterViewPager @JvmOverloads constructor(
@JvmField
internal var isPagingEnabled = true

init {
addOnPageChangeListener(object : OnPageChangeListener {
override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
// Do nothing
}

override fun onPageSelected(position: Int) {
if (adapter != null) {
(adapter as ControlCenterPagerAdapter).updateCurrentView(position)
}
}

override fun onPageScrollStateChanged(state: Int) {
// Do nothing
}
})
}

@SuppressLint("ClickableViewAccessibility")
override fun onTouchEvent(event: MotionEvent): Boolean {
return this.isPagingEnabled && super.onTouchEvent(event)
Expand Down
Loading