Skip to content

Commit 56835b3

Browse files
committed
[Android] fix: screen height wrong. Not catering correctly for action bar. Height was wrong after pushing and popping screens with different combinations of bar being shown/hidden
1 parent b88aaad commit 56835b3

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

flow/ui/android/navigation.rb

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@ def hide_bar
3131
if bar.isShowing
3232
bar.hide
3333
Task.after 0.05 do
34-
screen = @current_screens.last
3534
bar_height = bar.height>0 ? bar.height : self.class.bar_height
36-
screen.view.height += (bar_height / UI.density)
37-
screen.view.update_layout
35+
@current_screens.each do |e|
36+
e.view.height += (bar_height / UI.density)
37+
e.view.update_layout
38+
end
3839
end
3940
end
4041
end
@@ -44,10 +45,11 @@ def show_bar
4445
if !bar.isShowing
4546
bar.show
4647
Task.after 0.05 do
47-
screen = @current_screens.last
4848
bar_height = bar.height>0 ? bar.height : self.class.bar_height
49-
screen.view.height -= (bar_height / UI.density)
50-
screen.view.update_layout
49+
@current_screens.each do |e|
50+
e.view.height -= (bar_height / UI.density)
51+
e.view.update_layout
52+
end
5153
end
5254
end
5355
end

0 commit comments

Comments
 (0)