Merge pull request #247 from yang991178/1.0.1

Version 1.0.1

Author: yang991178

build/icon.icns

@@ -1,6 +1,6 @@
 {
   "name": "fluent-reader",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Modern desktop RSS reader",
   "main": "./dist/electron.js",
   "scripts": {

package-lock.json

@@ -133,7 +133,7 @@ class Article extends React.Component<ArticleProps, ArticleState> {
                     this.toggleFull()
                     break
                 case "H": case "h":
-                    this.props.toggleHidden(this.props.item)
+                    if (!input.meta) this.props.toggleHidden(this.props.item)
                     break
                 default:
                     const keyboardEvent = new KeyboardEvent("keydown", {

package.json

@@ -30,7 +30,7 @@ export type ContextMenuProps = ContextReduxProps & {
     setViewConfigs: (configs: ViewConfigs) => void
     switchFilter: (filter: FilterType) => void
     toggleFilter: (filter: FilterType) => void
-    markAllRead: (sids: number[], date?: Date, before?: boolean) => void
+    markAllRead: (sids?: number[], date?: Date, before?: boolean) => void
     fetchItems: (sids: number[]) => void
     settings: (sids: number[]) => void
     close: () => void
@@ -380,6 +380,50 @@ export class ContextMenu extends React.Component<ContextMenuProps> {
                     onClick: () => this.props.settings(this.props.sids)
                 }
             ]
+            case ContextMenuType.MarkRead: return [
+                {
+                    key: "section_1",
+                    itemType: ContextualMenuItemType.Section,
+                    sectionProps: {
+                        title: intl.get("nav.markAllRead"),
+                        items: [
+                            {
+                                key: "all",
+                                text: intl.get("allArticles"),
+                                iconProps: { iconName: "ReceiptCheck" },
+                                onClick: () => this.props.markAllRead()
+                            },
+                            {
+                                key: "1d",
+                                text: intl.get("app.daysAgo", { days: 1 }),
+                                onClick: () => {
+                                    let date = new Date()
+                                    date.setTime(date.getTime() - 86400000)
+                                    this.props.markAllRead(null, date)
+                                }
+                            },
+                            {
+                                key: "3d",
+                                text: intl.get("app.daysAgo", { days: 3 }),
+                                onClick: () => {
+                                    let date = new Date()
+                                    date.setTime(date.getTime() - 3 * 86400000)
+                                    this.props.markAllRead(null, date)
+                                }
+                            },
+                            {
+                                key: "7d",
+                                text: intl.get("app.daysAgo", { days: 7 }),
+                                onClick: () => {
+                                    let date = new Date()
+                                    date.setTime(date.getTime() - 7 * 86400000)
+                                    this.props.markAllRead(null, date)
+                                }
+                            }
+                        ]
+                    }
+                }
+            ]
             default: return []
         }
     }

src/components/article.tsx

@@ -139,9 +139,12 @@ class Nav extends React.Component<NavProps, NavState> {
                         title={intl.get("nav.refresh")}>
                         <Icon iconName="Refresh" />
                     </a>
-                    <a className="btn" 
+                    <a className="btn"
+                        id="mark-all-toggle"
                         onClick={this.props.markAllRead}
-                        title={intl.get("nav.markAllRead")}>
+                        title={intl.get("nav.markAllRead")}
+                        onMouseDown={e => {
+                            if (this.props.state.contextMenu.event === "#mark-all-toggle") e.stopPropagation()}}>
                         <Icon iconName="InboxCheck" />
                     </a>
                     <a className="btn" 

src/components/context-menu.tsx

@@ -48,6 +48,7 @@ class InoreaderConfigsTab extends React.Component<ServiceConfigsTabProps, GReade
         { key: 500, text: intl.get("service.fetchLimitNum", { count: 500 }) },
         { key: 750, text: intl.get("service.fetchLimitNum", { count: 750 }) },
         { key: 1000, text: intl.get("service.fetchLimitNum", { count: 1000 }) },
+        { key: Number.MAX_SAFE_INTEGER, text: intl.get("service.fetchUnlimited") },
     ]
     onFetchLimitOptionChange = (_, option: IDropdownOption) => {
         this.setState({ fetchLimit: option.key as number })

src/components/nav.tsx

@@ -45,6 +45,10 @@ const mapStateToProps = createSelector(
                 type: context.type,
                 position: context.position
             }
+            case ContextMenuType.MarkRead: return {
+                type: context.type,
+                event: context.event
+            }
             default: return { type: ContextMenuType.Hidden }
         }
     }
@@ -70,7 +74,7 @@ const mapDispatchToProps = dispatch => {
         setViewConfigs: (configs: ViewConfigs) => dispatch(setViewConfigs(configs)),
         switchFilter: (filter: FilterType) => dispatch(switchFilter(filter)),
         toggleFilter: (filter: FilterType) => dispatch(toggleFilter(filter)),
-        markAllRead: (sids: number[], date?: Date, before?: boolean) => {
+        markAllRead: (sids?: number[], date?: Date, before?: boolean) => {
             dispatch(markAllRead(sids, date, before))
         },
         fetchItems: (sids: number[]) => dispatch(fetchItems(false, sids)),

src/components/settings/services/inoreader.tsx

@@ -3,7 +3,7 @@ import { connect } from "react-redux"
 import { createSelector } from "reselect"
 import { RootState } from "../scripts/reducer"
 import { fetchItems, markAllRead } from "../scripts/models/item"
-import { toggleMenu, toggleLogMenu, toggleSettings, openViewMenu } from "../scripts/models/app"
+import { toggleMenu, toggleLogMenu, toggleSettings, openViewMenu, openMarkAllMenu } from "../scripts/models/app"
 import { toggleSearch } from "../scripts/models/page"
 import { ViewType } from "../schema-types"
 import Nav from "../components/nav"
@@ -26,17 +26,7 @@ const mapDispatchToProps = (dispatch) => ({
     views: () => dispatch(openViewMenu()),
     settings: () => dispatch(toggleSettings()),
     search: () => dispatch(toggleSearch()),
-    markAllRead: () => {
-        window.utils.showMessageBox(
-            intl.get("nav.markAllRead"),
-            intl.get("confirmMarkAll"),
-            intl.get("confirm"), intl.get("cancel")
-        ).then(response => {
-            if (response) {
-                dispatch(markAllRead())
-            }
-        })
-    }
+    markAllRead: () => dispatch(openMarkAllMenu())
 })
 
 const NavContainer = connect(mapStateToProps, mapDispatchToProps)(Nav)

src/containers/context-menu-container.tsx

@@ -28,6 +28,7 @@ if (process.platform === "darwin") {
         {
             label: "Application",
             submenu: [
+                { label: "Hide", accelerator:"Command+H", click: () => { app.hide() } },
                 { label: "Quit", accelerator: "Command+Q", click: () => { if (winManager.hasWindow) winManager.mainWindow.close() } }
             ]
         },