diff --git a/src/view/com/util/ViewHeader.tsx b/src/view/com/util/ViewHeader.tsx
index ad0a5a1d2f..816c835ccc 100644
--- a/src/view/com/util/ViewHeader.tsx
+++ b/src/view/com/util/ViewHeader.tsx
@@ -3,6 +3,7 @@ import {observer} from 'mobx-react-lite'
import {Animated, StyleSheet, TouchableOpacity, View} from 'react-native'
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
import {useNavigation} from '@react-navigation/native'
+import {CenteredView} from './Views'
import {UserAvatar} from './UserAvatar'
import {Text} from './text/Text'
import {useStores} from 'state/index'
@@ -18,10 +19,12 @@ export const ViewHeader = observer(function ({
title,
canGoBack,
hideOnScroll,
+ showOnDesktop,
}: {
title: string
canGoBack?: boolean
hideOnScroll?: boolean
+ showOnDesktop?: boolean
}) {
const pal = usePalette('default')
const store = useStores()
@@ -42,7 +45,10 @@ export const ViewHeader = observer(function ({
}, [track, store])
if (isDesktopWeb) {
- return <>>
+ if (showOnDesktop) {
+ return
+ }
+ return null
} else {
if (typeof canGoBack === 'undefined') {
canGoBack = navigation.canGoBack()
@@ -76,6 +82,19 @@ export const ViewHeader = observer(function ({
}
})
+function DesktopWebHeader({title}: {title: string}) {
+ const pal = usePalette('default')
+ return (
+
+
+
+ {title}
+
+
+
+ )
+}
+
const Container = observer(
({
children,
@@ -133,6 +152,10 @@ const styles = StyleSheet.create({
top: 0,
width: '100%',
},
+ desktopHeader: {
+ borderBottomWidth: 1,
+ paddingVertical: 12,
+ },
titleContainer: {
marginLeft: 'auto',
diff --git a/src/view/screens/AppPasswords.tsx b/src/view/screens/AppPasswords.tsx
index 311deb235e..1a8df41162 100644
--- a/src/view/screens/AppPasswords.tsx
+++ b/src/view/screens/AppPasswords.tsx
@@ -1,13 +1,13 @@
import React from 'react'
import {Alert, StyleSheet, TouchableOpacity, View} from 'react-native'
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
+import {ScrollView} from 'react-native-gesture-handler'
import {Text} from '../com/util/text/Text'
import {Button} from '../com/util/forms/Button'
import * as Toast from '../com/util/Toast'
import {useStores} from 'state/index'
import {usePalette} from 'lib/hooks/usePalette'
import {isDesktopWeb} from 'platform/detection'
-import {ScrollView} from 'react-native-gesture-handler'
import {withAuthRequired} from 'view/com/auth/withAuthRequired'
import {observer} from 'mobx-react-lite'
import {NativeStackScreenProps} from '@react-navigation/native-stack'
@@ -15,6 +15,7 @@ import {CommonNavigatorParams} from 'lib/routes/types'
import {useAnalytics} from 'lib/analytics'
import {useFocusEffect} from '@react-navigation/native'
import {ViewHeader} from '../com/util/ViewHeader'
+import {CenteredView} from 'view/com/util/Views'
type Props = NativeStackScreenProps
export const AppPasswords = withAuthRequired(
@@ -37,7 +38,9 @@ export const AppPasswords = withAuthRequired(
// no app passwords (empty) state
if (store.me.appPasswords.length === 0) {
return (
-
+
@@ -45,7 +48,7 @@ export const AppPasswords = withAuthRequired(
pressing the button below.
-
+ {!isDesktopWeb && }
-
+
)
}
// has app passwords
return (
-
+
-
+
{store.me.appPasswords.map((password, i) => (
))}
+ {isDesktopWeb && (
+
+
+
+ )}
-
-
-
-
+ {!isDesktopWeb && (
+
+
+
+ )}
+
)
}),
)
@@ -93,10 +117,16 @@ function AppPasswordsHeader() {
const pal = usePalette('default')
return (
<>
-
-
- These app passwords can be used to log onto Bluesky in other apps
- without giving them full access to your account or your password.
+
+
+ These passwords can be used to log onto Bluesky in other apps without
+ giving them full access to your account or your password.
>
)
@@ -140,10 +170,11 @@ function AppPassword({
testID={testID}
style={[styles.item, pal.border]}
onPress={onDelete}>
-
+
{name}
-
+
+
{new Date(createdAt).toDateString()}
@@ -166,9 +197,11 @@ const styles = StyleSheet.create({
paddingHorizontal: 20,
marginBottom: 14,
},
+ descriptionDesktop: {
+ marginTop: 14,
+ },
scrollContainer: {
- flex: 1,
borderTopWidth: 1,
marginTop: 4,
marginBottom: 16,
@@ -191,16 +224,21 @@ const styles = StyleSheet.create({
item: {
flexDirection: 'row',
alignItems: 'center',
- justifyContent: 'space-between',
borderBottomWidth: 1,
paddingHorizontal: 20,
paddingVertical: 14,
},
+ pr10: {
+ marginRight: 10,
+ },
btnContainer: {
flexDirection: 'row',
justifyContent: 'center',
},
+ btnContainerDesktop: {
+ marginTop: 14,
+ },
btn: {
flexDirection: 'row',
alignItems: 'center',
diff --git a/src/view/screens/PostLikedBy.tsx b/src/view/screens/PostLikedBy.tsx
index fb44f1f9be..2e162ef0f9 100644
--- a/src/view/screens/PostLikedBy.tsx
+++ b/src/view/screens/PostLikedBy.tsx
@@ -22,7 +22,7 @@ export const PostLikedByScreen = withAuthRequired(({route}: Props) => {
return (
-
+
)
diff --git a/src/view/screens/PostRepostedBy.tsx b/src/view/screens/PostRepostedBy.tsx
index 19f0af18b5..bfd827f678 100644
--- a/src/view/screens/PostRepostedBy.tsx
+++ b/src/view/screens/PostRepostedBy.tsx
@@ -22,7 +22,7 @@ export const PostRepostedByScreen = withAuthRequired(({route}: Props) => {
return (
-
+
)
diff --git a/src/view/screens/ProfileFollowers.tsx b/src/view/screens/ProfileFollowers.tsx
index e2f95fbe4f..d782cb696a 100644
--- a/src/view/screens/ProfileFollowers.tsx
+++ b/src/view/screens/ProfileFollowers.tsx
@@ -20,7 +20,7 @@ export const ProfileFollowersScreen = withAuthRequired(({route}: Props) => {
return (
-
+
)
diff --git a/src/view/screens/ProfileFollows.tsx b/src/view/screens/ProfileFollows.tsx
index f70944f557..9c15d1d928 100644
--- a/src/view/screens/ProfileFollows.tsx
+++ b/src/view/screens/ProfileFollows.tsx
@@ -20,7 +20,7 @@ export const ProfileFollowsScreen = withAuthRequired(({route}: Props) => {
return (
-
+
)
diff --git a/src/view/screens/Settings.tsx b/src/view/screens/Settings.tsx
index cd4f56da89..1a5fba0785 100644
--- a/src/view/screens/Settings.tsx
+++ b/src/view/screens/Settings.tsx
@@ -140,7 +140,7 @@ export const SettingsScreen = withAuthRequired(
return (
-
+