Include tab count and move btn to center

zio/stable
Paul Frazee 2022-11-17 10:37:30 -06:00
parent b390101106
commit 6b715224f2
2 changed files with 30 additions and 26 deletions

View File

@ -179,6 +179,10 @@ export class NavigationModel {
return this.tabs[this.tabIndex] return this.tabs[this.tabIndex]
} }
get tabCount() {
return this.tabs.length
}
isCurrentScreen(tabId: number, index: number) { isCurrentScreen(tabId: number, index: number) {
return this.tab.id === tabId && this.tab.index === index return this.tab.id === tabId && this.tab.index === index
} }

View File

@ -51,8 +51,8 @@ const SWIPE_GESTURE_VEL_TRIGGER = 2500
const Btn = ({ const Btn = ({
icon, icon,
inactive,
notificationCount, notificationCount,
tabCount,
onPress, onPress,
onLongPress, onLongPress,
}: { }: {
@ -66,8 +66,8 @@ const Btn = ({
| 'bell-solid' | 'bell-solid'
| 'search' | 'search'
| 'search-solid' | 'search-solid'
inactive?: boolean
notificationCount?: number notificationCount?: number
tabCount?: number
onPress?: (event: GestureResponderEvent) => void onPress?: (event: GestureResponderEvent) => void
onLongPress?: (event: GestureResponderEvent) => void onLongPress?: (event: GestureResponderEvent) => void
}) => { }) => {
@ -104,22 +104,6 @@ const Btn = ({
IconEl = FontAwesomeIcon IconEl = FontAwesomeIcon
} }
if (inactive) {
return (
<View style={styles.ctrl}>
{notificationCount ? (
<View style={styles.ctrlCount}>
<Text style={styles.ctrlCountLabel}>{notificationCount}</Text>
</View>
) : undefined}
<IconEl
size={size}
style={[styles.ctrlIcon, styles.inactive, addedStyles]}
icon={icon}
/>
</View>
)
}
return ( return (
<TouchableOpacity <TouchableOpacity
style={styles.ctrl} style={styles.ctrl}
@ -127,8 +111,13 @@ const Btn = ({
onPressIn={onLongPress ? undefined : onPress} onPressIn={onLongPress ? undefined : onPress}
onLongPress={onLongPress}> onLongPress={onLongPress}>
{notificationCount ? ( {notificationCount ? (
<View style={styles.ctrlCount}> <View style={styles.notificationCount}>
<Text style={styles.ctrlCountLabel}>{notificationCount}</Text> <Text style={styles.notificationCountLabel}>{notificationCount}</Text>
</View>
) : undefined}
{tabCount > 1 ? (
<View style={styles.tabCount}>
<Text style={styles.tabCountLabel}>{tabCount}</Text>
</View> </View>
) : undefined} ) : undefined}
<IconEl size={size} style={[styles.ctrlIcon, addedStyles]} icon={icon} /> <IconEl size={size} style={[styles.ctrlIcon, addedStyles]} icon={icon} />
@ -299,8 +288,9 @@ export const MobileShell: React.FC = observer(() => {
onPress={onPressSearch} onPress={onPressSearch}
/> />
<Btn <Btn
icon={isMainMenuActive ? 'menu-solid' : 'menu'} icon={isTabsSelectorActive ? 'clone' : ['far', 'clone']}
onPress={onPressMenu} onPress={onPressTabs}
tabCount={store.nav.tabCount}
/> />
<Btn <Btn
icon={isAtNotifications ? 'bell-solid' : 'bell'} icon={isAtNotifications ? 'bell-solid' : 'bell'}
@ -308,8 +298,8 @@ export const MobileShell: React.FC = observer(() => {
notificationCount={store.me.notificationCount} notificationCount={store.me.notificationCount}
/> />
<Btn <Btn
icon={isTabsSelectorActive ? 'clone' : ['far', 'clone']} icon={isMainMenuActive ? 'menu-solid' : 'menu'}
onPress={onPressTabs} onPress={onPressMenu}
/> />
</SafeAreaView> </SafeAreaView>
<MainMenu <MainMenu
@ -457,7 +447,7 @@ const styles = StyleSheet.create({
paddingTop: 15, paddingTop: 15,
paddingBottom: 15, paddingBottom: 15,
}, },
ctrlCount: { notificationCount: {
position: 'absolute', position: 'absolute',
left: 46, left: 46,
top: 10, top: 10,
@ -466,11 +456,21 @@ const styles = StyleSheet.create({
paddingBottom: 1, paddingBottom: 1,
borderRadius: 8, borderRadius: 8,
}, },
ctrlCountLabel: { notificationCountLabel: {
fontSize: 12, fontSize: 12,
fontWeight: 'bold', fontWeight: 'bold',
color: colors.white, color: colors.white,
}, },
tabCount: {
position: 'absolute',
left: 46,
top: 30,
},
tabCountLabel: {
fontSize: 12,
fontWeight: 'bold',
color: colors.black,
},
ctrlIcon: { ctrlIcon: {
color: colors.black, color: colors.black,
marginLeft: 'auto', marginLeft: 'auto',