From 7b2f61c7d665488d1d20ca08db2fa475226c0ad5 Mon Sep 17 00:00:00 2001
From: Stephan Toggweiler <stephan.toggweiler@me.com>
Date: Fri, 17 May 2013 11:11:43 +0200
Subject: [PATCH 1/3] tabbar title and icon for SplitScreen

---
 lib/ProMotion/screen_helpers/split_screen.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/ProMotion/screen_helpers/split_screen.rb b/lib/ProMotion/screen_helpers/split_screen.rb
index 44b67a3..bb19df0 100644
--- a/lib/ProMotion/screen_helpers/split_screen.rb
+++ b/lib/ProMotion/screen_helpers/split_screen.rb
@@ -19,7 +19,11 @@ module ProMotion
 
       [ master, detail ].map { |s| s.on_load if s.respond_to?(:on_load) }
 
-      split_screen_controller master, detail
+      split = split_screen_controller master, detail
+      if args.has_key?(:icon) or args.has_key?(:title)
+        split.tabBarItem = create_tab_bar_item(args)
+      end
+      split
     end
 
     def open_split_screen(master, detail, args={})
@@ -39,4 +43,4 @@ module ProMotion
       svc.detail_screen.navigationItem.leftBarButtonItem = nil
     end
   end
-end
\ No newline at end of file
+end

From 272dcb20578ae598dc59886e8794c282a3fa710e Mon Sep 17 00:00:00 2001
From: Stephan Toggweiler <stephan.toggweiler@me.com>
Date: Fri, 17 May 2013 17:53:30 +0200
Subject: [PATCH 2/3] add some specs for split screen tab bar icon/title

---
 spec/split_screen_in_tab_bar_spec.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/spec/split_screen_in_tab_bar_spec.rb b/spec/split_screen_in_tab_bar_spec.rb
index 2661351..dddd662 100644
--- a/spec/split_screen_in_tab_bar_spec.rb
+++ b/spec/split_screen_in_tab_bar_spec.rb
@@ -6,7 +6,7 @@ describe "split screen in tab bar functionality" do
     @master_screen = HomeScreen.new nav_bar: true
     @detail_screen = BasicScreen.new nav_bar: true
 
-    @split_screen = @app.create_split_screen @master_screen, @detail_screen
+    @split_screen = @app.create_split_screen @master_screen, @detail_screen, icon: "list", title: "Spec"
     @tab = @app.open_tab_bar @split_screen, HomeScreen, BasicScreen
   end
 
@@ -45,5 +45,18 @@ describe "split screen in tab bar functionality" do
   it "should set the tab bar first viewController to the split screen" do
     @tab.viewControllers.first.should == @split_screen
   end
+  
+  it "should set the bar bar item for the split screen" do
+    @split_screen.tabBarItem.is_a?(UITabBarItem).should == true
+  end
+  
+  it "should set the tab bar icon of the split screen" do
+    @split_screen.tabBarItem.image.is_a?(UIImage).should == true
+  end
+  
+  it "should set the tab bar title of the split screen" do
+    @split_screen.tabBarItem.title.is_a?(String).should == true
+    @split_screen.tabBarItem.title.should == "Spec"
+  end
 
 end
\ No newline at end of file

From d47eccb2dbdc69b9d43e3a68ea6c8f684aa4d08a Mon Sep 17 00:00:00 2001
From: Stephan Toggweiler <stephan.toggweiler@me.com>
Date: Fri, 17 May 2013 17:53:55 +0200
Subject: [PATCH 3/3] add image from master for spec tests

---
 resources/list.png | Bin 0 -> 104 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 resources/list.png

diff --git a/resources/list.png b/resources/list.png
new file mode 100644
index 0000000000000000000000000000000000000000..263cffd387c6486ab1a0d8969b304754bc3277eb
GIT binary patch
literal 104
zcmeAS@N?(olHy`uVBq!ia0vp^;y^6S!3HF&cTd{}r1U*q978H@y}f8C$iTpH_<)xa
z(?4HEWwuRA%OiK!<ne||7QC^PtkPStpovTCMLuKsnyXd;wdtpTS{XcD{an^LB{Ts5
DR%0IC

literal 0
HcmV?d00001