Fix back button not working on not StyledToolbarNavigationControllers

multisite
Floens 10 years ago
parent 769f926f16
commit 64a77b601b
  1. 6
      Clover/app/src/main/java/org/floens/chan/ui/controller/StyledToolbarNavigationController.java
  2. 8
      Clover/app/src/main/java/org/floens/chan/ui/controller/ToolbarNavigationController.java
  3. 2
      Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java

@ -75,16 +75,12 @@ public class StyledToolbarNavigationController extends ToolbarNavigationControll
} }
@Override @Override
public void onMenuOrBackClicked(boolean isArrow) { public void onMenuClicked() {
if (isArrow) {
onBack();
} else {
DrawerController drawerController = getDrawerController(); DrawerController drawerController = getDrawerController();
if (drawerController != null) { if (drawerController != null) {
drawerController.onMenuClicked(); drawerController.onMenuClicked();
} }
} }
}
private DrawerController getDrawerController() { private DrawerController getDrawerController() {
if (parentController instanceof DrawerController) { if (parentController instanceof DrawerController) {

@ -53,6 +53,14 @@ public abstract class ToolbarNavigationController extends NavigationController i
@Override @Override
public void onMenuOrBackClicked(boolean isArrow) { public void onMenuOrBackClicked(boolean isArrow) {
if (isArrow) {
onBack();
} else {
onMenuClicked();
}
}
public void onMenuClicked() {
} }
@Override @Override

@ -18,7 +18,6 @@
package org.floens.chan.ui.layout; package org.floens.chan.ui.layout;
import android.content.Context; import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
@ -44,7 +43,6 @@ import org.floens.chan.ui.toolbar.Toolbar;
import org.floens.chan.ui.view.ThumbnailView; import org.floens.chan.ui.view.ThumbnailView;
import org.floens.chan.utils.AndroidUtils; import org.floens.chan.utils.AndroidUtils;
import org.floens.chan.utils.AnimationUtils; import org.floens.chan.utils.AnimationUtils;
import org.floens.chan.utils.Logger;
import java.util.List; import java.util.List;

Loading…
Cancel
Save