Fix navigationcontroller attaching the view even when not pushing

multisite
Floens 10 years ago
parent b2176d537b
commit 4ddba4aa4c
  1. 4
      Clover/app/src/main/java/org/floens/chan/controller/Controller.java
  2. 2
      Clover/app/src/main/java/org/floens/chan/controller/NavigationController.java
  3. 6
      Clover/app/src/main/java/org/floens/chan/controller/ui/NavigationControllerContainerLayout.java
  4. 2
      Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java
  5. 2
      Clover/app/src/main/java/org/floens/chan/ui/controller/PopupController.java
  6. 4
      Clover/app/src/main/java/org/floens/chan/ui/controller/SplitNavigationController.java

@ -136,7 +136,7 @@ public abstract class Controller {
return childControllers.remove(controller);
}
public void attachToParentView(ViewGroup parentView, boolean over) {
public void attachToParentView(ViewGroup parentView) {
if (view.getParent() != null) {
if (LOG_STATES) {
Logger.test(getClass().getSimpleName() + " view removed");
@ -148,7 +148,7 @@ public abstract class Controller {
if (LOG_STATES) {
Logger.test(getClass().getSimpleName() + " view attached");
}
attachToView(parentView, over);
attachToView(parentView, true);
}
}

@ -122,10 +122,10 @@ public abstract class NavigationController extends Controller {
if (pushing && to != null) {
addChildController(to);
to.attachToParentView(container);
}
if (to != null) {
to.attachToParentView(container, pushing);
to.onShow();
}

@ -33,8 +33,6 @@ import android.widget.Scroller;
import org.floens.chan.controller.Controller;
import org.floens.chan.controller.NavigationController;
import org.floens.chan.utils.Logger;
import org.floens.chan.utils.Time;
import static org.floens.chan.utils.AndroidUtils.dp;
@ -285,11 +283,11 @@ public class NavigationControllerContainerLayout extends FrameLayout {
velocityTracker = VelocityTracker.obtain();
velocityTracker.addMovement(startEvent);
long start = Time.startTiming();
// long start = Time.startTiming();
navigationController.beginSwipeTransition(trackingController, behindTrackingController);
Time.endTiming("attach", start);
// Time.endTiming("attach", start);
// Logger.test("Start tracking " + trackingController.getClass().getSimpleName());
}

@ -115,7 +115,7 @@ public class DrawerController extends Controller implements PinAdapter.Callback,
public void setChildController(Controller childController) {
addChildController(childController);
childController.attachToParentView(container, true);
childController.attachToParentView(container);
childController.onShow();
}

@ -45,7 +45,7 @@ public class PopupController extends Controller implements View.OnClickListener
public void setChildController(NavigationController childController) {
addChildController(childController);
childController.attachToParentView(container, true);
childController.attachToParentView(container);
childController.onShow();
}

@ -89,7 +89,7 @@ public class SplitNavigationController extends Controller implements AndroidUtil
if (leftController != null) {
addChildController(leftController);
leftController.attachToParentView(leftControllerView, true);
leftController.attachToParentView(leftControllerView);
leftController.onShow();
}
}
@ -106,7 +106,7 @@ public class SplitNavigationController extends Controller implements AndroidUtil
if (rightController != null) {
addChildController(rightController);
rightController.attachToParentView(rightControllerView, true);
rightController.attachToParentView(rightControllerView);
rightController.onShow();
} else {
rightControllerView.addView(emptyView);

Loading…
Cancel
Save