Skip to content

Commit

Permalink
[*] update version
Browse files Browse the repository at this point in the history
  • Loading branch information
heng30 committed Apr 29, 2024
2 parents 405ad94 + fe7b2ed commit e58a499
Show file tree
Hide file tree
Showing 31 changed files with 243 additions and 196 deletions.
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<div style="display: flex, margin: 8px">
<img src="./screenshot/rssbox-en.png" width="100"/>
<img src="./screenshot/rssbox2-en.png" width="100"/>
<img src="./screenshot/rssbox-show-rss-list.png" width="100"/>
<img src="./screenshot/1.png" width="100"/>
<img src="./screenshot/2.png" width="100"/>
<img src="./screenshot/3.png" width="100"/>
<img src="./screenshot/4.png" width="100"/>
<img src="./screenshot/5.png" width="100"/>
<img src="./screenshot/6.png" width="100"/>
<img src="./screenshot/7.png" width="100"/>
</div>

[中文文档](./README.zh-CN.md)
Expand Down
10 changes: 7 additions & 3 deletions README.zh-CN.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<div style="display: flex, margin: 8px">
<img src="./screenshot/rssbox-cn.png" width="100"/>
<img src="./screenshot/rssbox2-cn.png" width="100"/>
<img src="./screenshot/rssbox-show-rss-list.png" width="100"/>
<img src="./screenshot/1.png" width="100"/>
<img src="./screenshot/2.png" width="100"/>
<img src="./screenshot/3.png" width="100"/>
<img src="./screenshot/4.png" width="100"/>
<img src="./screenshot/5.png" width="100"/>
<img src="./screenshot/6.png" width="100"/>
<img src="./screenshot/7.png" width="100"/>
</div>

[English Documentation](./README.md)
Expand Down
Binary file added screenshot/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshot/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshot/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshot/4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshot/5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshot/6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshot/7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed screenshot/rssbox-cn.png
Binary file not shown.
Binary file removed screenshot/rssbox-en.png
Binary file not shown.
Binary file removed screenshot/rssbox-show-rss-list.png
Binary file not shown.
Binary file removed screenshot/rssbox2-cn.png
Binary file not shown.
Binary file removed screenshot/rssbox2-en.png
Binary file not shown.
2 changes: 1 addition & 1 deletion src/version.rs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pub static VERSION: &str = "v0.7.7";
pub static VERSION: &str = "v1.0.0";
11 changes: 10 additions & 1 deletion ui/appwindow.slint
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,24 @@ export component AppWindow inherits Window {

Panel { }

if IconsDialogSetting.show || OkCancelDialogSetting.body-text != "" || Store.is-first-run: Blanket { }
if IconsDialogSetting.show || OkCancelDialogSetting.body-text != "" || Store.is-first-run: Blanket {
TouchArea {
clicked => {
IconsDialogSetting.show = false;
OkCancelDialogSetting.body-text = "";
}
}
}

if IconsDialogSetting.show: IconsDialog {
is-prevent-event-forward: true;
select-index(index) => {
Store.icon-index = index;
}
}

if OkCancelDialogSetting.body-text != "": OkCancelDialogV2 {
is-prevent-event-forward: true;
width: Math.min(root.width * 0.9, 380px);
}

Expand Down
3 changes: 3 additions & 0 deletions ui/base/dialog.slint
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export component Dialog inherits Rectangle {
in-out property <color> title-bg: Theme.secondary-brand-color;
in-out property <bool> is-hide-btns: false;
in-out property <bool> is-hide-close-btns: false;
in-out property <bool> is-prevent-event-forward: false;

callback cancel-clicked();
callback ok-clicked();
Expand All @@ -18,6 +19,8 @@ export component Dialog inherits Rectangle {
height: vbox.preferred-height;
background: Theme.base-background-light;

if is-prevent-event-forward : TouchArea {}

vbox := VerticalLayout {
alignment: space-between;

Expand Down
20 changes: 20 additions & 0 deletions ui/base/float-btn.slint
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { Theme } from "../theme.slint";
import { IconBtn } from "icon-btn.slint";


export component ElevatedBtn inherits Rectangle {
width: 45px;
height: self.width;
border-radius: root.width / 2;
background: Theme.dark-fill-color;
drop-shadow-blur: Theme.padding;
drop-shadow-color: Theme.dark-border-color;

in-out property icon <=> btn.icon;

callback clicked <=> btn.clicked;

btn := IconBtn {
icon-width: root.width * 0.65;
}
}
12 changes: 10 additions & 2 deletions ui/base/head.slint
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import { Theme, Icons } from "../theme.slint";
import { IconBtn } from "./icon-btn.slint";
import { Divider } from "./divider.slint";

export component Head inherits Rectangle {
height: Theme.header-height;
background: Theme.base-background-light;

in-out property<string> title;
in-out property <bool> is-show-divider;
in-out property <string> title;
in-out property icon <=> ic.icon;
in-out property icon-width <=> ic.icon-width;
in-out property<LayoutAlignment> hbox-alignment: LayoutAlignment.stretch;
in-out property <LayoutAlignment> hbox-alignment: LayoutAlignment.stretch;

callback clicked <=> ic.clicked;

Expand All @@ -26,4 +29,9 @@ export component Head inherits Rectangle {
@children
}

if is-show-divider : Divider {
x: 0;
y: root.height - self.height;
background: Theme.lighter-border-color;
}
}
1 change: 1 addition & 0 deletions ui/base/ok-cancel.slint
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export component OkCancelDialogV2 inherits Rectangle {
height: vbox.preferred-height;
background: Theme.lighter-fill-color;

in-out property <bool> is-prevent-event-forward: false;
in-out property <string> title: OkCancelDialogSetting.title-text;

vbox := VerticalLayout {
Expand Down
3 changes: 1 addition & 2 deletions ui/base/setting-detail.slint
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ export component SettingDetail inherits Rectangle {
in-out property title <=> head.title;

VerticalLayout {

head := Head {
hbox-alignment: LayoutAlignment.start;
}
Expand All @@ -19,7 +18,7 @@ export component SettingDetail inherits Rectangle {
}

export component SettingDetailInner inherits Flickable {
in-out property<LayoutAlignment> vbox-alignment: LayoutAlignment.start;
in-out property <LayoutAlignment> vbox-alignment: LayoutAlignment.start;

VerticalLayout {
alignment: root.vbox-alignment;
Expand Down
4 changes: 2 additions & 2 deletions ui/base/setting-entry.slint
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ export component SettingEntry inherits Rectangle {
in-out property attach-text <=> eib.text;

background: Theme.info-color.brighter(60%);
border-radius: Theme.border-radius;

callback clicked <=> ta.clicked;

HorizontalLayout {
padding: Theme.padding * 2;
alignment: space-between;


sib := IconBtn {
background: Colors.transparent;
}
Expand All @@ -32,5 +32,5 @@ export component SettingEntry inherits Rectangle {
}
}

ta := TouchArea {}
ta := TouchArea { }
}
2 changes: 2 additions & 0 deletions ui/base/widgets.slint
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ import { TxtEdit } from "./txtedit.slint";
import { LanguageDialog } from "./language-dialog.slint";
import { RadioBtn } from "./radio-btn.slint";
import { InputBar } from "./input-bar.slint";
import { ElevatedBtn } from "./float-btn.slint";

export {
Toast,
TabBtn,
IconBtn,
ElevatedBtn,
Label,
CenterLayout,
Tag,
Expand Down
1 change: 1 addition & 0 deletions ui/images/menu.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions ui/panel/bodyer/add.slint
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ component RssList inherits Rectangle {
height: root.item-height;

background: data.uuid == root.current-uuid ? root.selected-item-color : Colors.transparent;
border-radius: Theme.border-radius;

touch := TouchArea {
clicked => {
Expand Down
9 changes: 7 additions & 2 deletions ui/panel/bodyer/favorite.slint
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { Theme } from "../../theme.slint";
component FHead inherits Head {
callback scroll-to-top <=> ta.clicked;

is-show-divider: true;
icon: Icons.favorite-fill;
title: Logic.tr(Store.is-cn, "收藏夹");

Expand Down Expand Up @@ -45,18 +46,22 @@ export component Entry inherits Rectangle {
VerticalLayout {
padding: Theme.padding * 2;
spacing: Theme.spacing * 2;
alignment: space-between;

title-txt := Link {
wrap: no-wrap;
overflow: elide;

clicked => {
Util.open-url(root.url);
}
}

if root.summary != "": Text {
Text {
font-size: Theme.default-font-size - 1px;
color: Theme.regular-text-color;
wrap: word-wrap;
text: root.summary;
overflow: elide;
}

HorizontalLayout {
Expand Down
43 changes: 18 additions & 25 deletions ui/panel/bodyer/find.slint
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Theme, Icons } from "../../theme.slint";
import { Store, FindEntry } from "../../store.slint";
import { Logic } from "../../logic.slint";
import { Util } from "../../util.slint";
import { IconBtn, Head, Label, Tag, Link, Label, NoDataImg, NoMessageImg, IconsDialogSetting, CenterLayout, InputBar } from "../../base/widgets.slint";
import { IconBtn, ElevatedBtn, Head, Label, Tag, Link, Label, NoDataImg, NoMessageImg, IconsDialogSetting, CenterLayout, InputBar } from "../../base/widgets.slint";

component FHead inherits Head {
in-out property <bool> is-search;
Expand Down Expand Up @@ -42,30 +42,13 @@ component FHead inherits Head {
}
}

HorizontalLayout {
spacing: Theme.padding * 3;
padding-left: Theme.padding * 2;

CenterLayout {
IconBtn {
icon: root.is-search ? Icons.hide : Icons.search;
clicked => {
root.is-search = !root.is-search;
if (root.is-search) {
search-lineedit.text = "";
search-lineedit.focus();
}
}
}
}

if !root.is-search: CenterLayout {
refresh-icon := IconBtn {
icon: Icons.refresh;
icon-width: Theme.icon-size * 1.2;
clicked => {
Logic.fetch-all-find-entrys();
}
IconBtn {
icon: root.is-search ? Icons.hide : Icons.search;
clicked => {
root.is-search = !root.is-search;
if (root.is-search) {
search-lineedit.text = "";
search-lineedit.focus();
}
}
}
Expand Down Expand Up @@ -144,6 +127,16 @@ component Body inherits Rectangle {
width: root.width * 0.6;
text: Logic.tr(Store.is-cn, "没有消息");
}

ElevatedBtn {
x: root.width - self.width - Theme.padding * 4;
y: root.height - self.height - Theme.padding * 4;
icon: Icons.refresh;

clicked => {
Logic.fetch-all-find-entrys();
}
}
}

export component Find inherits VerticalLayout {
Expand Down
Loading

0 comments on commit e58a499

Please sign in to comment.