diff --git a/src/view/com/notifications/FeedItem.tsx b/src/view/com/notifications/FeedItem.tsx
index 86f43ba4..6eabee70 100644
--- a/src/view/com/notifications/FeedItem.tsx
+++ b/src/view/com/notifications/FeedItem.tsx
@@ -14,6 +14,7 @@ import {ErrorMessage} from '../util/error/ErrorMessage'
import {Post} from '../post/Post'
import {Link} from '../util/Link'
import {InviteAccepter} from './InviteAccepter'
+import {usePalette} from '../../lib/hooks/usePalette'
const MAX_AUTHORS = 8
@@ -22,6 +23,7 @@ export const FeedItem = observer(function FeedItem({
}: {
item: NotificationsViewItemModel
}) {
+ const pal = usePalette('default')
const itemHref = useMemo(() => {
if (item.isUpvote || item.isRepost || item.isTrend) {
const urip = new AtUri(item.subjectUri)
@@ -55,7 +57,14 @@ export const FeedItem = observer(function FeedItem({
)
@@ -117,7 +126,14 @@ export const FeedItem = observer(function FeedItem({
return (
@@ -150,36 +166,36 @@ export const FeedItem = observer(function FeedItem({
))}
{authors.length > MAX_AUTHORS ? (
-
+
+{authors.length - MAX_AUTHORS}
) : undefined}
{item.isTrend && (
- {action}
+ {action}
)}
-
+
{authors[0].displayName || authors[0].handle}
{authors.length > 1 ? (
<>
- and
-
+ and
+
{authors.length - 1} {pluralize(authors.length - 1, 'other')}
>
) : undefined}
{!item.isTrend && (
- {action}
+ {action}
)}
-
+
{ago(item.indexedAt)}
@@ -204,6 +220,7 @@ function AdditionalPostText({
}: {
additionalPost?: PostThreadViewModel
}) {
+ const pal = usePalette('default')
if (!additionalPost) {
return
}
@@ -211,20 +228,16 @@ function AdditionalPostText({
return
}
return (
- {additionalPost.thread?.post.record.text}
+ {additionalPost.thread?.post.record.text}
)
}
const styles = StyleSheet.create({
outer: {
- backgroundColor: colors.white,
padding: 10,
borderTopWidth: 1,
- borderTopColor: colors.gray2,
},
outerUnread: {
- backgroundColor: colors.unreadNotifBg,
- borderWidth: 1,
borderColor: colors.blue1,
},
layout: {
@@ -245,7 +258,6 @@ const styles = StyleSheet.create({
aviExtraCount: {
fontWeight: 'bold',
paddingLeft: 6,
- color: colors.gray5,
},
layoutContent: {
flex: 1,
@@ -258,7 +270,6 @@ const styles = StyleSheet.create({
},
metaItem: {
paddingRight: 3,
- color: colors.black,
},
postText: {
paddingBottom: 5,
diff --git a/src/view/com/post/Post.tsx b/src/view/com/post/Post.tsx
index 8f2781ac..43fbb9cc 100644
--- a/src/view/com/post/Post.tsx
+++ b/src/view/com/post/Post.tsx
@@ -23,6 +23,7 @@ import * as Toast from '../util/Toast'
import {UserAvatar} from '../util/UserAvatar'
import {useStores} from '../../../state'
import {s, colors} from '../../lib/styles'
+import {usePalette} from '../../lib/hooks/usePalette'
export const Post = observer(function Post({
uri,
@@ -35,6 +36,7 @@ export const Post = observer(function Post({
showReplyLine?: boolean
style?: StyleProp
}) {
+ const pal = usePalette('default')
const store = useStores()
const [view, setView] = useState(initView)
const [deleted, setDeleted] = useState(false)
@@ -58,7 +60,7 @@ export const Post = observer(function Post({
// =
if (!view || view.isLoading || view.params.uri !== uri) {
return (
-
+
)
@@ -68,7 +70,7 @@ export const Post = observer(function Post({
// =
if (view.hasError || !view.thread) {
return (
-
+
{view.error || 'Thread not found'}
)
@@ -134,7 +136,7 @@ export const Post = observer(function Post({
return (
@@ -164,12 +166,19 @@ export const Post = observer(function Post({
/>
{replyHref !== '' && (
-
- Reply to
+
+
+ Reply to
+
@@ -177,11 +186,7 @@ export const Post = observer(function Post({
)}
{record.text ? (
-
+
) : (
@@ -205,10 +210,8 @@ export const Post = observer(function Post({
const styles = StyleSheet.create({
outer: {
- backgroundColor: colors.white,
padding: 10,
borderTopWidth: 1,
- borderTopColor: colors.gray2,
},
layout: {
flexDirection: 'row',
@@ -225,12 +228,6 @@ const styles = StyleSheet.create({
flexWrap: 'wrap',
paddingBottom: 8,
},
- postText: {
- fontFamily: 'System',
- fontSize: 16,
- lineHeight: 20.8, // 1.3 of 16px
- color: colors.black,
- },
replyLine: {
position: 'absolute',
left: 36,
diff --git a/src/view/lib/themes.ts b/src/view/lib/themes.ts
index 2ad78c20..114d5cf9 100644
--- a/src/view/lib/themes.ts
+++ b/src/view/lib/themes.ts
@@ -18,6 +18,7 @@ export const defaultTheme: Theme = {
actionLabel: colors.gray4,
replyLine: colors.gray2,
replyLineDot: colors.gray3,
+ unreadNotifBg: '#ebf6ff',
},
primary: {
background: colors.blue3,
@@ -157,6 +158,7 @@ export const darkTheme: Theme = {
actionLabel: colors.gray3,
replyLine: colors.gray5,
replyLineDot: colors.gray6,
+ unreadNotifBg: colors.blue5,
},
primary: {
...defaultTheme.palette.primary,