get rid of navigation/presentation hacks and deep levels of abstraction

joenoon · joenoon · commit f8862164bec6 · 2014-10-09T13:48:37.000-07:00
diff --git a/lib/motion/RMXEventManager.rb b/lib/motion/RMXEventManager.rb
@@ -214,11 +214,12 @@ def newCalendarChooser
     .take(1)
     .mapReplace(controller)
     .subscribeNext(->(c) {
-      RMXViewControllerPresentation.dismiss({
-        :view_controller => c,
-        :animated => (opts[:animated] || false),
-        :completion => nil
-      })
+      anim = (opts[:animated] || false)
+      if c.presentingViewController
+        c.dismissViewControllerAnimated(anim, completion:nil)
+      elsif c.navigationController
+        c.navigationController.popViewControllerAnimated(anim)
+      end
     })
 
     controller
diff --git a/lib/motion/RMXNavigationBar.rb b/lib/motion/RMXNavigationBar.rb
diff --git a/lib/motion/RMXNavigationController.rb b/lib/motion/RMXNavigationController.rb
@@ -3,98 +3,32 @@ class RMXNavigationController < UINavigationController
   include RMXCommonMethods
   include RMXViewControllerPresentation
 
-  attr_accessor :transitionSignal, :transitionSubject, :transitioning, :rootViewControllerOnLoad
-
-  def navigationController(navigationController, willShowViewController:view_controller, animated:animated)
-    @transitioning = true
-    navigationController.transitionSubject.sendNext(true)
-  end
-
-  def navigationController(navigationController, didShowViewController:view_controller, animated:animated)
-    @transitioning = false
-    @queued_ops.each do |item|
-      send(*item)
-    end
-    @queued_ops.clear
-    navigationController.transitionSubject.sendNext(false)
-  end
-
-  def pushViewController(view_controller, animated:animated)
-    if !@transitioning
-      super
-    else
-      @queued_ops << [ 'pushViewController:animated:', view_controller, false ]
-    end
-    nil
-  end
-
-  def popViewControllerAnimated(animated)
-    if !@transitioning
-      super
-    else
-      @queued_ops << [ 'popViewControllerAnimated:', false ]
-    end
-    nil
-  end
-
-  def popToRootViewControllerAnimated(animated)
-    if !@transitioning
-      super
-    else
-      @queued_ops << [ 'popToRootViewControllerAnimated:', false ]
-    end
+  def rmx_init
+    RMX.log_dealloc(self)
+    viewStateSignal
+    self.delegate = self
     nil
   end
 
-  def popToViewController(view_controller, animated:animated)
-    if !@transitioning
-      if viewControllers.include?(view_controller)
-        super
-      end
-    else
-      @queued_ops << [ 'popToViewController:animated:', view_controller, false ]
-    end
-    nil
+  def initWithNibName(name, bundle:bundle)
+    s = super
+    rmx_init
+    s
   end
 
-  def setViewControllers(controllers, animated:animated)
-    if !@transitioning
-      super
-    else
-      @queued_ops << [ 'setViewControllers:animated:', controllers, false ]
-    end
-    nil
+  def initWithCoder(decoder)
+    s = super
+    rmx_init
+    s
   end
 
   def didReceiveMemoryWarning
     p "didReceiveMemoryWarning"
     super
   end
 
-  def viewDidLoad
-    RMX.log_dealloc(self)
-
-    @queued_ops = []
-    @transitionSubject = RACReplaySubject.replaySubjectWithCapacity(1)
-    @transitionSignal = @transitionSubject.subscribeOn(RACScheduler.mainThreadScheduler)
-
-    viewStateSignal
-
-    rac_signalForSelector('viewDidDisappear:').subscribeNext(->(tuple) { RMX.resignApplicationFirstResponder }.weak!)
-
-    self.delegate = self
-
-    pushViewController(rootViewControllerOnLoad, animated: false) if rootViewControllerOnLoad
-
-    self.rootViewControllerOnLoad = nil
-
-  end
-
-  def self.create(rootViewController, navBarHack=true)
-    v = alloc.initWithNavigationBarClass(RMXNavigationBar, toolbarClass:nil)
-    v.rootViewControllerOnLoad = rootViewController
-    v.navigationBar.shouldOnlyReceiveTouchEventsInsideNavigationBar = navBarHack
-    v
+  def self.create(rootViewController)
+    alloc.initWithRootViewController(rootViewController)
   end
   
 end
diff --git a/lib/motion/RMXViewControllerPresentation.rb b/lib/motion/RMXViewControllerPresentation.rb
@@ -4,63 +4,6 @@ def self.included(klass)
     klass.send(:include, InstanceMethods)
   end
 
-  module FactoryMethods
-
-    # presentViewController should always be called on the next runloop to avoid quirks.
-    # this just wraps that behavior
-    def present(opts)
-      unless [ :origin, :view_controller, :animated, :completion ].all? { |x| opts.key?(x) }
-        raise "Missing RMXViewControllerPresentation.present opts: #{opts.inspect}"
-      end
-      RACScheduler.mainThreadScheduler.schedule(-> {
-        opts[:origin].presentViewController(opts[:view_controller], animated:opts[:animated], completion:opts[:completion])
-      })
-    end
-
-    # remove the controller from the display heirarchy, taking into account how it is
-    # currently presented.
-    def dismiss(opts)
-      unless [ :view_controller, :animated, :completion ].all? { |x| opts.key?(x) }
-        raise "Missing RMXViewControllerPresentation.dismiss opts: #{opts.inspect}"
-      end
-      animated = opts[:animated]
-      block = opts[:completion]
-      view_controller = opts[:view_controller]
-      navigationController = view_controller.navigationController
-
-
-      if view_controller.presentingViewController
-        RACScheduler.mainThreadScheduler.schedule(-> {
-          view_controller.dismissViewControllerAnimated(animated, completion:block)
-        })
-      elsif navigationController
-        if index = navigationController.viewControllers.index(view_controller)
-          before_index = index - 1
-          before_index = 0 if index < 0
-          pop_to_controller = navigationController.viewControllers[before_index]
-          if pop_to_controller && pop_to_controller != navigationController.viewControllers.last
-            # p "pop_to_controller", pop_to_controller
-            # p "navigationController.popToViewController(pop_to_controller, animated:animated)"
-            RACScheduler.mainThreadScheduler.schedule(-> {
-              if block
-                pop_to_controller.rac_signalForSelector('viewDidAppear:')
-                .timeout(2, onScheduler:RACScheduler.mainThreadScheduler)
-                .take(1)
-                .subscribeNext(->(args) {
-                  block.call
-                }, error:->(error) {
-                })
-              end
-              navigationController.popToViewController(pop_to_controller, animated:animated)
-            })
-          end
-        end
-      end
-    end
-
-  end
-  extend FactoryMethods
-
   module InstanceMethods
 
     def viewStateSignal
@@ -110,21 +53,5 @@ def disappearing(animated)
     def disappeared(animated)
     end
 
-    def present(vc, animated=false, &block)
-      RMXViewControllerPresentation.present({
-        :origin => self,
-        :view_controller => vc,
-        :animated => animated,
-        :completion => block
-      })
-    end
-    
-    def dismiss(animated=false, &block)
-      RMXViewControllerPresentation.dismiss({
-        :view_controller => self,
-        :animated => animated,
-        :completion => block
-      })
-    end
   end
 end
diff --git a/lib/rmx.rb b/lib/rmx.rb
@@ -31,7 +31,6 @@
     RMXViewControllerPresentation
     RMXKeyboardHelpers
     UIResponder+RMX
-    RMXNavigationBar
     RMXNavigationController
     RMXTableViewController
     RMXViewController
