FreshRSS/FluentReader
1
0
Fork 0
mirror of https://github.com/yang991178/fluent-reader.git synced 2025-04-13 18:02:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

improve fonts and menu focus

Browse Source
This commit is contained in:
刘浩远 2020-06-19 16:25:27 +08:00
parent 6a751be533
commit 76a97852a1
7 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/article.tsx
View File

@ -109,6 +109,7 @@ class Article extends React.Component<ArticleProps, ArticleState> {
webview.addEventListener("new-window", this.popUpHandler)
webview.addEventListener("will-navigate", this.navigationHandler)
this.webview = webview
webview.focus()
}
}
componentDidUpdate = (prevProps: ArticleProps) => {

56
src/components/menu.tsx
View File

@ -5,7 +5,7 @@ import { Nav, INavLink, INavLinkGroup } from "office-ui-fabric-react/lib/Nav"
import { SourceGroup } from "../scripts/models/group"
import { SourceState, RSSSource } from "../scripts/models/source"
import { ALL } from "../scripts/models/feed"
import { AnimationClassNames, Stack } from "@fluentui/react"
import { AnimationClassNames, Stack, FocusZone, FocusZoneDirection } from "@fluentui/react"
export type MenuProps = {
status: boolean,
@ -26,7 +26,7 @@ export type MenuProps = {
export class Menu extends React.Component<MenuProps> {
countOverflow = (count: number) => count >= 1000 ? "999+" : String(count)
getItems = (): INavLinkGroup[] => [
getLinkGroups = (): INavLinkGroup[] => [
{
links: [
{
@ -46,28 +46,28 @@ export class Menu extends React.Component<MenuProps> {
url: null
}
]
},
{
name: intl.get("menu.subscriptions"),
links: this.props.groups.filter(g => g.sids.length > 0).map((g, i) => {
if (g.isMultiple) {
let sources = g.sids.map(sid => this.props.sources[sid])
return {
name: g.name,
ariaLabel: this.countOverflow(sources.map(s => s.unreadCount).reduce((a, b) => a + b, 0)),
key: "g-" + i,
url: null,
isExpanded: g.expanded,
onClick: () => this.props.selectSourceGroup(g, "g-" + i),
links: sources.map(this.getSource)
}
} else {
return this.getSource(this.props.sources[g.sids[0]])
}
})
}
]
getGroups = (): INavLinkGroup[] => [{
links: this.props.groups.filter(g => g.sids.length > 0).map((g, i) => {
if (g.isMultiple) {
let sources = g.sids.map(sid => this.props.sources[sid])
return {
name: g.name,
ariaLabel: this.countOverflow(sources.map(s => s.unreadCount).reduce((a, b) => a + b, 0)),
key: "g-" + i,
url: null,
isExpanded: g.expanded,
onClick: () => this.props.selectSourceGroup(g, "g-" + i),
links: sources.map(this.getSource)
}
} else {
return this.getSource(this.props.sources[g.sids[0]])
}
}
)}]
getSource = (s: RSSSource): INavLink => ({
name: s.name,
ariaLabel: this.countOverflow(s.unreadCount),
@ -106,6 +106,10 @@ export class Menu extends React.Component<MenuProps> {
)
};
_onRenderGroupHeader = (group: INavLinkGroup): JSX.Element => {
return <p className={"subs-header " + AnimationClassNames.slideDownIn10}>{group.name}</p>;
}
render() {
return this.props.status && (
<div className="menu-container" onClick={this.props.toggleMenu} style={{display: this.props.display ? "block" : "none"}}>
@ -116,15 +120,11 @@ export class Menu extends React.Component<MenuProps> {
</div>
<div className="nav-wrapper">
<Nav
onRenderGroupHeader={this._onRenderGroupHeader}
onRenderLink={this._onRenderLink}
groups={this.getItems()}
selectedKey={this.props.selected} />
<p className={"subs-header " + AnimationClassNames.slideDownIn10}>{intl.get("menu.subscriptions")}</p>
<Nav
groups={this.getLinkGroups()}
selectedKey={this.props.selected}
onRenderLink={this._onRenderLink}
onLinkExpandClick={(event, item) => this.props.updateGroupExpansion(event, item.key, this.props.selected)}
groups={this.getGroups()} />
onLinkExpandClick={(event, item) => this.props.updateGroupExpansion(event, item.key, this.props.selected)} />
</div>
</div>
</div>

2
src/scripts/i18n/zh-CN.json
View File

@ -56,7 +56,7 @@
"copyTitle": "复制标题",
"copyURL": "复制链接",
"copy": "复制",
"search": "使用Google搜索“{text}”",
"search": "使用 Google 搜索“{text}”",
"view": "视图",
"cardView": "卡片视图",
"listView": "列表视图",

4
src/scripts/models/item.ts
View File

@ -1,6 +1,6 @@
import * as db from "../db"
import intl = require("react-intl-universal")
import { rssParser, domParser, htmlDecode, ActionStatus, AppThunk } from "../utils"
import { domParser, htmlDecode, ActionStatus, AppThunk } from "../utils"
import { RSSSource } from "./source"
import { FeedActionTypes, INIT_FEED, LOAD_MORE } from "./feed"
import Parser = require("@yang991178/rss-parser")
@ -152,7 +152,7 @@ export function fetchItems(): AppThunk<Promise<void>> {
((s.lastFetched ? s.lastFetched.getTime() : 0) + (s.fetchFrequency || 0) * 60000) <= timenow
)
for (let source of sources) {
let promise = RSSSource.fetchItems(source, rssParser)
let promise = RSSSource.fetchItems(source)
promise.finally(() => dispatch(fetchItemsIntermediate()))
promises.push(promise)
}

20
src/scripts/models/source.ts
View File

@ -1,7 +1,7 @@
import Parser = require("@yang991178/rss-parser")
import intl = require("react-intl-universal")
import * as db from "../db"
import { rssParser, fetchFavicon, ActionStatus, AppThunk, parseRSS } from "../utils"
import { fetchFavicon, ActionStatus, AppThunk, parseRSS } from "../utils"
import { RSSItem, insertItems, ItemActionTypes, FETCH_ITEMS, MARK_READ, MARK_UNREAD, MARK_ALL_READ } from "./item"
import { SourceGroup } from "./group"
import { saveSettings } from "./app"
@ -28,16 +28,16 @@ export class RSSSource {
this.lastFetched = new Date()
}
async fetchMetaData(parser: Parser) {
let feed = await parseRSS(this.url)
if (!this.name) {
if (feed.title) this.name = feed.title.trim()
this.name = this.name || intl.get("sources.untitled")
static async fetchMetaData(source: RSSSource) {
let feed = await parseRSS(source.url)
if (!source.name) {
if (feed.title) source.name = feed.title.trim()
source.name = source.name || intl.get("sources.untitled")
}
let domain = this.url.split("/").slice(0, 3).join("/")
let domain = source.url.split("/").slice(0, 3).join("/")
try {
let f = await fetchFavicon(domain)
if (f !== null) this.iconurl = f
if (f !== null) source.iconurl = f
} finally {
return feed
}
@ -75,7 +75,7 @@ export class RSSSource {
})
}
static async fetchItems(source: RSSSource, parser: Parser) {
static async fetchItems(source: RSSSource) {
let feed = await parseRSS(source.url)
db.sdb.update({ sid: source.sid }, { $set: { lastFetched: new Date() } })
return await this.checkItems(source, feed.items)
@ -236,7 +236,7 @@ export function addSource(url: string, name: string = null, batch = false): AppT
if (app.sourceInit) {
dispatch(addSourceRequest(batch))
let source = new RSSSource(url, name)
return source.fetchMetaData(rssParser)
return RSSSource.fetchMetaData(source)
.then(feed => {
return dispatch(insertSource(source))
.then(inserted => {

4
src/scripts/settings.ts
View File

@ -1,6 +1,6 @@
import { remote, ipcRenderer } from "electron"
import { ViewType } from "./models/page"
import { IPartialTheme, loadTheme, values } from "@fluentui/react"
import { IPartialTheme, loadTheme } from "@fluentui/react"
import locales from "./i18n/_locales"
import Store = require("electron-store")
import { schemaTypes } from "./config-schema"
@ -51,7 +51,7 @@ export const setDefaultView = (viewType: ViewType) => {
}
const lightTheme: IPartialTheme = {
defaultFontStyle: { fontFamily: '"Source Han Sans SC Regular", "Microsoft YaHei", sans-serif' }
defaultFontStyle: { fontFamily: '"Segoe UI", "Source Han Sans SC Regular", "Microsoft YaHei", sans-serif' }
}
const darkTheme: IPartialTheme = {
...lightTheme,

2
src/scripts/utils.ts
View File

@ -17,7 +17,7 @@ export type AppThunk<ReturnType = void> = ThunkAction<
export type AppDispatch = ThunkDispatch<RootState, undefined, AnyAction>
import Parser = require("@yang991178/rss-parser")
export const rssParser = new Parser({
const rssParser = new Parser({
customFields: {
item: ["thumb", "image", ["content:encoded", "fullContent"]] as Parser.CustomFieldItem[]
}