Browse Source

Update to latest support library, improve drawer closing experience

master
Anthony Restaino 9 years ago
parent
commit
14f08a8fef
  1. 10
      app/build.gradle
  2. 78
      app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java

10
app/build.gradle

@ -69,11 +69,11 @@ dexcount { @@ -69,11 +69,11 @@ dexcount {
dependencies {
// support libraries
compile 'com.android.support:palette-v7:23.1.1'
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:design:23.1.1'
compile 'com.android.support:recyclerview-v7:23.1.1'
compile 'com.android.support:support-v4:23.1.1'
compile 'com.android.support:palette-v7:23.2.1'
compile 'com.android.support:appcompat-v7:23.2.1'
compile 'com.android.support:design:23.2.1'
compile 'com.android.support:recyclerview-v7:23.2.1'
compile 'com.android.support:support-v4:23.2.1'
// html parsing fo reading mode
compile 'org.jsoup:jsoup:1.8.3'

78
app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java

@ -278,28 +278,27 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements @@ -278,28 +278,27 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
mDrawerLeft.setLayerType(View.LAYER_TYPE_NONE, null);
mDrawerRight.setLayerType(View.LAYER_TYPE_NONE, null);
//TODO restore when upgrading support library
// mDrawerLayout.addDrawerListener(new DrawerListener() {
// @Override
// public void onDrawerSlide(View drawerView, float slideOffset) {}
//
// @Override
// public void onDrawerOpened(View drawerView) {}
//
// @Override
// public void onDrawerClosed(View drawerView) {}
//
// @Override
// public void onDrawerStateChanged(int newState) {
// if (newState == DrawerLayout.STATE_DRAGGING) {
// mDrawerLeft.setLayerType(View.LAYER_TYPE_HARDWARE, null);
// mDrawerRight.setLayerType(View.LAYER_TYPE_HARDWARE, null);
// } else if (newState == DrawerLayout.STATE_IDLE) {
// mDrawerLeft.setLayerType(View.LAYER_TYPE_NONE, null);
// mDrawerRight.setLayerType(View.LAYER_TYPE_NONE, null);
// }
// }
// });
mDrawerLayout.addDrawerListener(new DrawerListener() {
@Override
public void onDrawerSlide(View drawerView, float slideOffset) {}
@Override
public void onDrawerOpened(View drawerView) {}
@Override
public void onDrawerClosed(View drawerView) {}
@Override
public void onDrawerStateChanged(int newState) {
if (newState == DrawerLayout.STATE_DRAGGING) {
mDrawerLeft.setLayerType(View.LAYER_TYPE_HARDWARE, null);
mDrawerRight.setLayerType(View.LAYER_TYPE_HARDWARE, null);
} else if (newState == DrawerLayout.STATE_IDLE) {
mDrawerLeft.setLayerType(View.LAYER_TYPE_NONE, null);
mDrawerRight.setLayerType(View.LAYER_TYPE_NONE, null);
}
}
});
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && !mShowTabsInDrawer) {
getWindow().setStatusBarColor(Color.BLACK);
@ -1410,29 +1409,24 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements @@ -1410,29 +1409,24 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
}
mDrawerLayout.closeDrawers();
// TODO restore after updating to latest support lib
// delete this code after restoring
mDrawerLayout.addDrawerListener(new DrawerListener() {
@Override
public void onDrawerSlide(View drawerView, float slideOffset) {}
@Override
public void onDrawerOpened(View drawerView) {}
@Override
public void onDrawerClosed(View drawerView) {
if (runnable != null) {
runnable.run();
}
// mDrawerLayout.addDrawerListener(new DrawerListener() {
// @Override
// public void onDrawerSlide(View drawerView, float slideOffset) {}
//
// @Override
// public void onDrawerOpened(View drawerView) {}
//
// @Override
// public void onDrawerClosed(View drawerView) {
// if (runnable != null) {
// runnable.run();
// }
// mDrawerLayout.removeDrawerListener(this);
// }
//
// @Override
// public void onDrawerStateChanged(int newState) {}
// });
mDrawerLayout.removeDrawerListener(this);
}
@Override
public void onDrawerStateChanged(int newState) {}
});
}
@Override

Loading…
Cancel
Save