From 9d1c366eda3f35c1d5ee2ab4b38e82f7d26c9e42 Mon Sep 17 00:00:00 2001
From: Zhiyuan Zheng <me@xmflsct.com>
Date: Fri, 25 Dec 2020 21:51:46 +0100
Subject: [PATCH] Hide header bottom shadow

---
 src/Index.tsx                                 | 9 +++++----
 src/components/Timelines.tsx                  | 2 +-
 src/components/Timelines/Timeline.tsx         | 4 ++--
 src/screens/Me.tsx                            | 2 +-
 src/screens/Notifications.tsx                 | 5 ++++-
 src/screens/Shared/Announcements.tsx          | 8 ++++++++
 src/screens/Shared/Compose/EditAttachment.tsx | 2 +-
 src/screens/Shared/ImagesViewer.tsx           | 2 +-
 src/utils/fetches/timelineFetch.ts            | 1 -
 9 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/Index.tsx b/src/Index.tsx
index 1eacc0b2..3bb22221 100644
--- a/src/Index.tsx
+++ b/src/Index.tsx
@@ -5,7 +5,7 @@ import {
   NavigationContainerRef
 } from '@react-navigation/native'
 
-import React, { useEffect, useMemo, useRef } from 'react'
+import React, { useEffect, useRef } from 'react'
 import { StatusBar } from 'react-native'
 import Toast from 'react-native-toast-message'
 import { Feather } from '@expo/vector-icons'
@@ -27,8 +27,7 @@ import {
   updateLocalAccountPreferences,
   updateNotification
 } from '@utils/slices/instancesSlice'
-import { useInfiniteQuery, useQuery } from 'react-query'
-import { announcementFetch } from './utils/fetches/announcementsFetch'
+import { useInfiniteQuery } from 'react-query'
 import client from './api/client'
 import { timelineFetch } from './utils/fetches/timelineFetch'
 
@@ -80,7 +79,9 @@ export const Index: React.FC<Props> = ({ localCorrupt }) => {
       })
         .then(({ body }: { body?: Mastodon.Announcement[] }) => {
           if (body?.filter(announcement => !announcement.read).length) {
-            navigationRef.current?.navigate('Screen-Shared-Announcements')
+            navigationRef.current?.navigate('Screen-Shared-Announcements', {
+              showAll: false
+            })
           }
         })
         .catch(() => {})
diff --git a/src/components/Timelines.tsx b/src/components/Timelines.tsx
index d963831a..5440d469 100644
--- a/src/components/Timelines.tsx
+++ b/src/components/Timelines.tsx
@@ -67,7 +67,7 @@ const Timelines: React.FC<Props> = ({ name, content }) => {
   )
 
   return (
-    <Stack.Navigator>
+    <Stack.Navigator screenOptions={{ headerHideShadow: true }}>
       <Stack.Screen
         name={name}
         options={{
diff --git a/src/components/Timelines/Timeline.tsx b/src/components/Timelines/Timeline.tsx
index 19dce30c..184cb05c 100644
--- a/src/components/Timelines/Timeline.tsx
+++ b/src/components/Timelines/Timeline.tsx
@@ -133,9 +133,9 @@ const Timeline: React.FC<Props> = ({
     () => <TimelineEmpty status={status} refetch={refetch} />,
     [status]
   )
-  const onEndReached = useCallback(() => fetchNextPage(), [])
+  const onEndReached = useCallback(() => !disableRefresh && fetchNextPage(), [])
   const ListFooterComponent = useCallback(
-    () => <TimelineEnd hasNextPage={hasNextPage} />,
+    () => <TimelineEnd hasNextPage={!disableRefresh ? hasNextPage : false} />,
     [hasNextPage]
   )
   const refreshControl = useMemo(
diff --git a/src/screens/Me.tsx b/src/screens/Me.tsx
index f275a8e7..b14a2f47 100644
--- a/src/screens/Me.tsx
+++ b/src/screens/Me.tsx
@@ -19,7 +19,7 @@ const ScreenMe: React.FC = () => {
   const { t } = useTranslation()
 
   return (
-    <Stack.Navigator>
+    <Stack.Navigator screenOptions={{ headerHideShadow: true }}>
       <Stack.Screen
         name='Screen-Me-Root'
         component={ScreenMeRoot}
diff --git a/src/screens/Notifications.tsx b/src/screens/Notifications.tsx
index faf63310..7c57b7ba 100644
--- a/src/screens/Notifications.tsx
+++ b/src/screens/Notifications.tsx
@@ -24,7 +24,10 @@ const ScreenNotifications: React.FC = () => {
 
   return (
     <Stack.Navigator
-      screenOptions={{ headerTitle: t('notifications:heading') }}
+      screenOptions={{
+        headerTitle: t('notifications:heading'),
+        headerHideShadow: true
+      }}
     >
       <Stack.Screen name='Screen-Notifications-Root'>
         {() => (localRegistered ? <Timeline page='Notifications' /> : null)}
diff --git a/src/screens/Shared/Announcements.tsx b/src/screens/Shared/Announcements.tsx
index 23cb5065..45b66a41 100644
--- a/src/screens/Shared/Announcements.tsx
+++ b/src/screens/Shared/Announcements.tsx
@@ -3,6 +3,7 @@ import client from '@root/api/client'
 import { ButtonRow } from '@root/components/Button'
 import ParseContent from '@root/components/ParseContent'
 import { announcementFetch } from '@root/utils/fetches/announcementsFetch'
+import relativeTime from '@root/utils/relativeTime'
 import { StyleConstants } from '@root/utils/styles/constants'
 import { useTheme } from '@root/utils/styles/ThemeManager'
 import React, { useCallback, useEffect, useState } from 'react'
@@ -90,6 +91,9 @@ const ScreenSharedAnnouncements: React.FC = ({
             }
           ]}
         >
+          <Text style={[styles.published, { color: theme.secondary }]}>
+            发布于{relativeTime(item.published_at)}
+          </Text>
           <ScrollView style={styles.scrollView} showsVerticalScrollIndicator>
             <ParseContent
               content={item.content}
@@ -220,6 +224,10 @@ const styles = StyleSheet.create({
     padding: StyleConstants.Spacing.Global.PagePadding,
     justifyContent: 'center'
   },
+  published: {
+    fontSize: StyleConstants.Font.Size.S,
+    marginBottom: StyleConstants.Spacing.S
+  },
   pressable: { ...StyleSheet.absoluteFillObject },
   announcement: {
     flexShrink: 1,
diff --git a/src/screens/Shared/Compose/EditAttachment.tsx b/src/screens/Shared/Compose/EditAttachment.tsx
index 0bfc0e71..224ab01f 100644
--- a/src/screens/Shared/Compose/EditAttachment.tsx
+++ b/src/screens/Shared/Compose/EditAttachment.tsx
@@ -224,7 +224,7 @@ const ComposeEditAttachment: React.FC<Props> = ({
   return (
     <KeyboardAvoidingView behavior='padding' style={{ flex: 1 }}>
       <SafeAreaView style={{ flex: 1 }} edges={['right', 'bottom', 'left']}>
-        <Stack.Navigator>
+        <Stack.Navigator screenOptions={{ headerHideShadow: true }}>
           <Stack.Screen
             name='Screen-Shared-Compose-EditAttachment-Root'
             options={{
diff --git a/src/screens/Shared/ImagesViewer.tsx b/src/screens/Shared/ImagesViewer.tsx
index e5c5172f..962d8074 100644
--- a/src/screens/Shared/ImagesViewer.tsx
+++ b/src/screens/Shared/ImagesViewer.tsx
@@ -85,7 +85,7 @@ const ScreenSharedImagesViewer: React.FC<Props> = ({
     []
   )
   return (
-    <Stack.Navigator>
+    <Stack.Navigator screenOptions={{ headerHideShadow: true }}>
       <Stack.Screen
         name='Screen-Shared-ImagesViewer-Root'
         component={component}
diff --git a/src/utils/fetches/timelineFetch.ts b/src/utils/fetches/timelineFetch.ts
index e6013f96..6fac7bf3 100644
--- a/src/utils/fetches/timelineFetch.ts
+++ b/src/utils/fetches/timelineFetch.ts
@@ -117,7 +117,6 @@ export const timelineFetch = async ({
         toots = uniqBy([...toots, ...res.body], 'id')
         return Promise.resolve({ toots: toots, pinnedLength })
       }
-      break
 
     case 'Account_All':
       res = await client({