|
@ -19,6 +19,7 @@ import android.support.v7.app.AlertDialog; |
|
|
import android.text.Html; |
|
|
import android.text.Html; |
|
|
import android.view.Gravity; |
|
|
import android.view.Gravity; |
|
|
import android.view.View; |
|
|
import android.view.View; |
|
|
|
|
|
import android.view.ViewGroup; |
|
|
import android.view.ViewGroupOverlay; |
|
|
import android.view.ViewGroupOverlay; |
|
|
import android.widget.ImageView; |
|
|
import android.widget.ImageView; |
|
|
import android.widget.TextView; |
|
|
import android.widget.TextView; |
|
@ -84,6 +85,9 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra |
|
|
@BindView(R.id.iv_close) |
|
|
@BindView(R.id.iv_close) |
|
|
ImageView iv_close; |
|
|
ImageView iv_close; |
|
|
|
|
|
|
|
|
|
|
|
@BindView(R.id.content_view) |
|
|
|
|
|
ViewGroup content_view; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@BindView(R.id.notificationCounterTxtView) |
|
|
@BindView(R.id.notificationCounterTxtView) |
|
|
TextView notificationCounterTxtView; |
|
|
TextView notificationCounterTxtView; |
|
@ -182,14 +186,11 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra |
|
|
|
|
|
|
|
|
@OnClick(R.id.iv_close) |
|
|
@OnClick(R.id.iv_close) |
|
|
public void closeNavDrawer(View v) { |
|
|
public void closeNavDrawer(View v) { |
|
|
if (isNotificaitonViewActive()) |
|
|
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
showDrawer(false); |
|
|
showDrawer(false); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void showDrawer(Boolean show) { |
|
|
private void showDrawer(Boolean show) { |
|
|
if (isNotificaitonViewActive()) |
|
|
|
|
|
return; |
|
|
|
|
|
if (show) { |
|
|
if (show) { |
|
|
drawer_home.openDrawer(Gravity.START); |
|
|
drawer_home.openDrawer(Gravity.START); |
|
|
} else { |
|
|
} else { |
|
@ -393,26 +394,26 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra |
|
|
@Override |
|
|
@Override |
|
|
public void dimOutMenu(Rect notificationViewBoundry, boolean action) { |
|
|
public void dimOutMenu(Rect notificationViewBoundry, boolean action) { |
|
|
|
|
|
|
|
|
ViewGroupOverlay viewGroupOverlay = drawer_home.getOverlay(); |
|
|
|
|
|
|
|
|
ViewGroupOverlay viewGroupOverlay = content_view.getOverlay(); |
|
|
|
|
|
|
|
|
if (action && !isNotificaitonViewActive) { |
|
|
if (action && !isNotificaitonViewActive) { |
|
|
DimBackgroundView view = new DimBackgroundView(drawer_home.getContext()); |
|
|
|
|
|
|
|
|
DimBackgroundView view = new DimBackgroundView(content_view.getContext()); |
|
|
|
|
|
|
|
|
view.setLeft(0); |
|
|
view.setLeft(0); |
|
|
view.setTop((notificationViewBoundry.bottom - getStatusBarHeight())); |
|
|
view.setTop((notificationViewBoundry.bottom - getStatusBarHeight())); |
|
|
view.setRight(drawer_home.getWidth()); |
|
|
|
|
|
view.setBottom(drawer_home.getHeight()); |
|
|
|
|
|
|
|
|
view.setRight(content_view.getWidth()); |
|
|
|
|
|
view.setBottom(content_view.getHeight()); |
|
|
|
|
|
|
|
|
viewGroupOverlay.clear(); |
|
|
viewGroupOverlay.clear(); |
|
|
viewGroupOverlay.add(view); |
|
|
viewGroupOverlay.add(view); |
|
|
|
|
|
|
|
|
view.animate().alpha(.6f).setDuration(100).start(); |
|
|
view.animate().alpha(.6f).setDuration(100).start(); |
|
|
drawer_home.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED); |
|
|
|
|
|
|
|
|
// drawer_home.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (!action) { |
|
|
if (!action) { |
|
|
drawer_home.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED); |
|
|
|
|
|
|
|
|
// drawer_home.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED); |
|
|
|
|
|
|
|
|
viewGroupOverlay.clear(); |
|
|
viewGroupOverlay.clear(); |
|
|
} |
|
|
} |
|
|