Merge pull request #84 from tooot-app/main

Nightly 210323

src/Screens.tsx

@@ -119,6 +119,8 @@ const Screens: React.FC<Props> = ({ localCorrupt }) => {
     routeRef.current = {
       name: currentRoute?.name,
       params: currentRoute?.params
+        ? JSON.stringify(currentRoute.params)
+        : undefined
     }
   }, [])
   const navigationContainerOnStateChange = useCallback(() => {
@@ -144,7 +146,10 @@ const Screens: React.FC<Props> = ({ localCorrupt }) => {
 
   return (
     <>
-      <StatusBar barStyle={barStyle[mode]} backgroundColor={theme.backgroundDefault} />
+      <StatusBar
+        barStyle={barStyle[mode]}
+        backgroundColor={theme.backgroundDefault}
+      />
       <NavigationContainer
         ref={navigationRef}
         theme={themes[mode]}

src/components/Header/Right.tsx

@@ -86,7 +86,7 @@ const HeaderRight: React.FC<Props> = ({
             : undefined,
           minHeight: 44,
           minWidth: 44,
-          marginLeft: native
+          marginRight: native
             ? -StyleConstants.Spacing.S
             : StyleConstants.Spacing.S,
           ...(type === 'icon' && {

src/components/Timeline/Shared/Attachment/Audio.tsx

@@ -95,6 +95,7 @@ const AttachmentAudio: React.FC<Props> = ({
           </>
         )}
       </View>
+      {audio.meta.original.duration ? (
         <View
           style={{
             alignSelf: 'flex-end',
@@ -124,6 +125,7 @@ const AttachmentAudio: React.FC<Props> = ({
             thumbTintColor={theme.primaryOverlay}
           />
         </View>
+      ) : null}
     </View>
   )
 }

src/screens/ImagesViewer.tsx

@@ -23,6 +23,19 @@ import ImageViewer from './ImageViewer/Root'
 const saveImage = async (
   image: Nav.RootStackParamList['Screen-ImagesViewer']['imageUrls'][0]
 ) => {
+  if (Platform.OS === 'ios') {
+    CameraRoll.save(image.url)
+      .then(() => haptics('Success'))
+      .catch(() => {
+        if (image.remote_url) {
+          CameraRoll.save(image.remote_url)
+            .then(() => haptics('Success'))
+            .catch(() => haptics('Error'))
+        } else {
+          haptics('Error')
+        }
+      })
+  } else if (Platform.OS === 'android') {
     const hasAndroidPermission = async () => {
       const permission = PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE
 
@@ -35,20 +48,10 @@ const saveImage = async (
       return status === 'granted'
     }
 
-  if (Platform.OS === 'android' && !(await hasAndroidPermission())) {
+    if (!(await hasAndroidPermission())) {
       return
     }
-  CameraRoll.save(image.url)
-    .then(() => haptics('Success'))
-    .catch(() => {
-      if (image.remote_url) {
-        CameraRoll.save(image.remote_url)
-          .then(() => haptics('Success'))
-          .catch(() => haptics('Error'))
-      } else {
-        haptics('Error')
   }
-    })
 }
 
 const HeaderComponent = React.memo(
@@ -109,6 +112,7 @@ const HeaderComponent = React.memo(
         <HeaderLeft
           content='X'
           native={false}
+          background
           onPress={() => navigation.goBack()}
         />
         <HeaderCenter
@@ -118,6 +122,7 @@ const HeaderComponent = React.memo(
         <HeaderRight
           content='MoreHorizontal'
           native={false}
+          background
           onPress={onPress}
         />
       </View>

src/screens/Tabs/Me/Push.tsx

@@ -2,7 +2,7 @@ import { MenuContainer, MenuRow } from '@components/Menu'
 import { updateInstancePush } from '@utils/slices/instances/updatePush'
 import { updateInstancePushAlert } from '@utils/slices/instances/updatePushAlert'
 import { updateInstancePushDecode } from '@utils/slices/instances/updatePushDecode'
-import { getInstancePush } from '@utils/slices/instancesSlice'
+import { clearPushLoading, getInstancePush } from '@utils/slices/instancesSlice'
 import * as WebBrowser from 'expo-web-browser'
 import * as Notifications from 'expo-notifications'
 import React, { useEffect, useMemo, useState } from 'react'
@@ -36,6 +36,10 @@ const ScreenMeSettingsPush: React.FC = () => {
     }
   }, [])
 
+  useEffect(() => {
+    dispatch(clearPushLoading())
+  }, [])
+
   const isLoading = instancePush?.global.loading || instancePush?.decode.loading
 
   const alerts = useMemo(() => {

src/utils/slices/instancesSlice.ts

@@ -164,6 +164,16 @@ const instancesSlice = createSlice({
         draft => draft.timestamp !== action.payload
       )
     },
+    clearPushLoading: ({ instances }) => {
+      const activeIndex = findInstanceActive(instances)
+      instances[activeIndex].push.global.loading = false
+      instances[activeIndex].push.decode.loading = false
+      instances[activeIndex].push.alerts.favourite.loading = false
+      instances[activeIndex].push.alerts.follow.loading = false
+      instances[activeIndex].push.alerts.mention.loading = false
+      instances[activeIndex].push.alerts.poll.loading = false
+      instances[activeIndex].push.alerts.reblog.loading = false
+    },
     disableAllPushes: ({ instances }) => {
       instances = instances.map(instance => {
         let newInstance = instance
@@ -352,6 +362,7 @@ export const {
   updateInstanceNotificationsFilter,
   updateInstanceDraft,
   removeInstanceDraft,
+  clearPushLoading,
   disableAllPushes
 } = instancesSlice.actions