git ssb

1+

Daan Patchwork / manyverse



Commit 760ce0c9e076b31973d43d98ea099f59c6a99685

dx: fix Central bottom tabs on iOS

Andre Staltz committed on 2/4/2020, 1:06:21 PM
Parent: 70352bc9550436f3d4a20bfe52d1f2cff6843546

Files changed

src/frontend/screens/central/styles.tschanged
src/frontend/screens/central/view.tschanged
src/frontend/screens/central/styles.tsView
@@ -6,14 +6,15 @@
66
77 import {StyleSheet, ViewStyle} from 'react-native';
88 import {Palette} from '../../global-styles/palette';
99 import {Dimensions} from '../../global-styles/dimens';
10+import {getStatusBarHeight} from 'react-native-status-bar-height';
1011
1112 const page: ViewStyle = {
1213 position: 'absolute',
1314 top: 0,
1415 left: 0,
15- bottom: Dimensions.toolbarHeight,
16+ bottom: Dimensions.toolbarHeight - getStatusBarHeight(true),
1617 right: 0,
1718 backgroundColor: Palette.backgroundVoid,
1819 justifyContent: 'center',
1920 alignItems: 'center',
@@ -34,9 +35,9 @@
3435 position: 'absolute',
3536 left: 0,
3637 bottom: 0,
3738 right: 0,
38- height: Dimensions.toolbarHeight,
39+ height: Dimensions.toolbarHeight - getStatusBarHeight(true),
3940 borderTopColor: Palette.textLine,
4041 borderTopWidth: StyleSheet.hairlineWidth,
4142 backgroundColor: Palette.backgroundText,
4243 flexDirection: 'row',
src/frontend/screens/central/view.tsView
@@ -37,8 +37,9 @@
3737 Touchable,
3838 {
3939 ...touchableProps,
4040 sel: 'public-tab-button',
41+ style: styles.tabButton, // iOS needs this
4142 accessible: true,
4243 accessibilityLabel: 'Public Tab Button',
4344 },
4445 [
@@ -72,8 +73,9 @@
7273 Touchable,
7374 {
7475 ...touchableProps,
7576 sel: 'private-tab-button',
77+ style: styles.tabButton, // iOS needs this
7678 accessible: true,
7779 accessibilityLabel: 'Private Tab Button',
7880 },
7981 [
@@ -105,8 +107,9 @@
105107 Touchable,
106108 {
107109 ...touchableProps,
108110 sel: 'connections-tab-button',
111+ style: styles.tabButton, // iOS needs this
109112 accessible: true,
110113 accessibilityLabel: 'Connections Tab Button',
111114 },
112115 [

Built with git-ssb-web