add global gallery / all-media view

deltachat · Sep 14, 2023 · 66d5331 · 66d5331
1 parent 8a601a0
commit 66d5331
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 9 deletions.
diff --git a/src/renderer/components/Gallery.tsx b/src/renderer/components/Gallery.tsx
@@ -31,7 +31,7 @@ const MediaTabs: Readonly<
   },
 }
 
-type mediaProps = { chatId: number }
+type mediaProps = { chatId: number | 'all' }
 
 export default class Gallery extends Component<
   mediaProps,
@@ -67,16 +67,11 @@ export default class Gallery extends Component<
       throw new Error('chat id missing')
     }
     const msgTypes = MediaTabs[id].values
-
     const accountId = selectedAccountId()
+    const chatId = this.props.chatId !== 'all' ? this.props.chatId : null
+
     BackendRemote.rpc
-      .getChatMedia(
-        accountId,
-        this.props.chatId,
-        msgTypes[0],
-        msgTypes[1],
-        null
-      )
+      .getChatMedia(accountId, chatId, msgTypes[0], msgTypes[1], null)
       .then(async media_ids => {
         // throws if some media is not found
         const all_media_fetch_results = await BackendRemote.rpc.getMessages(

diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
@@ -102,6 +102,11 @@ const Sidebar = React.memo(
       ActionEmitter.emitAction(KeybindAction.ChatList_SwitchToArchiveView)
     }
 
+    const onOpenGlobalGallery = () => {
+      setSidebarState('invisible')
+      ActionEmitter.emitAction(KeybindAction.GlobalGallery_Open)
+    }
+
     useEffect(() => {
       window.addEventListener('keyup', onEscapeKeyUp)
       return () => {
@@ -172,6 +177,13 @@ const Sidebar = React.memo(
           >
             {tx('chat_archived_chats_title')}
           </div>
+          <div
+            key='global_gallery'
+            className='sidebar-item'
+            onClick={onOpenGlobalGallery}
+          >
+            {tx('menu_all_media')}
+          </div>
           <div key='settings' className='sidebar-item' onClick={onOpenSettings}>
             {tx('menu_settings')}
           </div>

diff --git a/src/renderer/components/screens/MainScreen.tsx b/src/renderer/components/screens/MainScreen.tsx
@@ -18,6 +18,7 @@ import {
   openViewProfileDialog,
   selectChat,
   setChatView,
+  unselectChat,
 } from '../helpers/ChatMethods'
 
 import {
@@ -62,6 +63,19 @@ export default function MainScreen() {
   const screenContext = useContext(ScreenContext)
   const selectedChat = useChatStore()
 
+  const [alternativeView, setAlternativeView] = useState<
+    null | 'global-gallery'
+  >(null)
+  useEffect(() => {
+    if (selectedChat.chat?.id) {
+      setAlternativeView(null)
+    }
+  }, [selectedChat.chat?.id])
+  useKeyBindingAction(KeybindAction.GlobalGallery_Open, () => {
+    unselectChat()
+    setAlternativeView('global-gallery')
+  })
+
   const onChatClick = (chatId: number) => {
     if (chatId === C.DC_CHAT_ID_ARCHIVED_LINK) return setShowArchivedChats(true)
 
@@ -168,6 +182,8 @@ export default function MainScreen() {
           </RecoverableCrashScreen>
         )
     }
+  } else if (alternativeView === 'global-gallery') {
+    MessageListView = <Gallery chatId={'all'} />
   } else {
     const style: React.CSSProperties = settingsStore
       ? getBackgroundImageStyle(settingsStore.desktopSettings)
@@ -231,6 +247,19 @@ export default function MainScreen() {
             )}
           </NavbarGroup>
           <NavbarGroup align={Alignment.RIGHT}>
+            {alternativeView === 'global-gallery' && (
+              <NavbarHeading
+                style={{
+                  cursor: 'pointer',
+                  display: 'flex',
+                  alignItems: 'center',
+                  width: '100%',
+                }}
+                onClick={onTitleClick}
+              >
+                {tx('menu_all_media')}
+              </NavbarHeading>
+            )}
             {selectedChat.chat && (
               <NavbarHeading
                 style={{

diff --git a/src/renderer/keybindings.ts b/src/renderer/keybindings.ts
@@ -18,6 +18,7 @@ export enum KeybindAction {
   KeybindingCheatSheet_Open = 'keybindinginfo:open',
   MessageList_PageUp = 'msglist:pageup',
   MessageList_PageDown = 'msglist:pagedown',
+  GlobalGallery_Open = 'globalgallery:open',
 
   // Actions that are not necessarily triggered by keybindings
   ChatList_SwitchToArchiveView = 'chatlist:switch-to-archive-view',