Skip to content

Commit fba0506

Browse files
committed
fixing missing title in settings due to tablet refactor
1 parent dffcd76 commit fba0506

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

app/client/mobile/src/content/Content.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ export function Content({
731731
autoComplete="off"
732732
autoCorrect={false}
733733
mode="outlined"
734-
placeholder={layout === 'small' ? state.strings.searchTopics : state.strings.topics}
734+
placeholder={layout !== 'large' ? state.strings.searchTopics : state.strings.topics}
735735
left={<TextInput.Icon style={styles.icon} icon="search" />}
736736
value={state.filter}
737737
onChangeText={value => actions.setFilter(value)}
@@ -794,7 +794,7 @@ export function Content({
794794
</View>
795795
</View>
796796
</View>
797-
{ layout === 'small' && (
797+
{ layout !== 'large' && (
798798
<View style={styles.tabs}>
799799
<Pressable style={tab === 'all' ? styles.opaque : styles.opacity} onPress={() => setTab('all')}>
800800
<Surface style={styles.tab} elevation={tab === 'all' ? 10 : 2}>

app/client/mobile/src/conversation/Conversation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ export function Conversation({layout, close, openDetails}: {layotu: string; clos
238238
}
239239
});
240240

241-
const offset = state.keyboardOffset + keyboardHeight - (Platform.OS === 'ios' && layout === 'large' ? 8 : Platform.OS === 'ios' ? 96 : 80)
241+
const offset = state.keyboardOffset + keyboardHeight - (Platform.OS === 'ios' && layout === 'large' ? 0 : Platform.OS === 'ios' ? 96 : 80)
242242
const disableImage = !state.detailSet || !state.detail?.enableImage;
243243
const disableVideo = !state.detailSet || !state.detail?.enableVideo;
244244
const disableAudio = !state.detailSet || !state.detail?.enableAudio;

app/client/mobile/src/settings/Settings.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ export function Settings({layout, setupNav}: {layout: string, setupNav: {back: (
457457
return (
458458
<View>
459459
<View style={styles.settings}>
460-
{setupNav && layout === 'small' && (
460+
{setupNav && layout !== 'large' && (
461461
<Surface elevation={9} mode="flat" style={styles.navHeader}>
462462
<Pressable style={styles.navIcon} onPress={setupNav?.back}>
463463
<Icon size={32} source="left" color={'white'} />
@@ -466,12 +466,12 @@ export function Settings({layout, setupNav}: {layout: string, setupNav: {back: (
466466
<View style={styles.navIcon} />
467467
</Surface>
468468
)}
469-
{!setupNav && layout === 'small' && (
469+
{!setupNav && layout !== 'large' && (
470470
<Surface mode="flat" elevation={9} style={styles.navHeader}>
471471
<Text style={styles.smHeader}>{state.strings.settings}</Text>
472472
</Surface>
473473
)}
474-
<Animated.View style={[{...styles.navImage, top: layout === 'small' ? 72 : 0}, {opacity: profile}]}>
474+
<Animated.View style={[{...styles.navImage, top: layout !== 'large' ? 72 : 0}, {opacity: profile}]}>
475475
<Image style={styles.navLogo} resizeMode={'contain'} source={{uri: state.imageUrl}} />
476476
<Surface style={styles.overlap} elevation={2} mode="flat" />
477477
</Animated.View>
@@ -861,12 +861,12 @@ export function Settings({layout, setupNav}: {layout: string, setupNav: {back: (
861861
</Surface>
862862
</View>
863863
)}
864-
{!setupNav && layout === 'small' && (
864+
{!setupNav && Platform.OS !== 'ios' && (
865865
<Text variant="headlineSmall" style={styles.sectionLabel}>
866866
{state.strings.layout}
867867
</Text>
868868
)}
869-
{!setupNav && layout === 'small' && (
869+
{!setupNav && Platform.OS !== 'ios' && (
870870
<View style={styles.navWrapper}>
871871
<Surface elevation={0} mode="flat" style={styles.navData}>
872872
<View style={styles.navFont}>

0 commit comments

Comments
 (0)