diff --git a/Makefile b/Makefile index 6e60835..ea0bcce 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ #!/bin/bash -build-evn=SLINT_STYLE=material +pwd=${shell pwd} +build-evn=SLINT_STYLE=material RUSTFLAGS="--remap-path-prefix $(HOME)=/home --remap-path-prefix $(pwd)=/build" run-evn=RUST_LOG=error,warn,info,debug,sqlx=off,reqwest=off,html2text=off version=`git describe --tags --abbrev=0` @@ -13,6 +14,10 @@ build-release: $(build-evn) cargo apk build --lib --release cp -f target/release/apk/rssbox.apk target/rssbox-${version}.apk +build-release-mold: + $(build-evn) mold --run cargo apk build --lib --release + cp -f target/release/apk/rssbox.apk target/rssbox-${version}.apk + # not work well xbuild: $(build-evn) x build --debug --platform android --format apk --arch arm64 @@ -27,12 +32,18 @@ run: run-release: RUST_BACKTRACE=1 $(run-evn) cargo apk run --lib --release +run-release-mold: + RUST_BACKTRACE=1 $(run-evn) mold --run cargo apk run --lib --release + install: $(build-evn) $(run-evn) cargo apk run --lib --release debug: $(build-evn) $(run-evn) cargo run --bin rssbox-desktop --features=desktop +debug-mold: + $(build-evn) $(run-evn) mold --run cargo run --bin rssbox-desktop --features=desktop + debug-local: $(run-evn) ./target/debug/rssbox-desktop @@ -70,6 +81,9 @@ clean-incremental: rm -rf ./target/debug/incremental/* rm -rf ./target/aarch64-linux-android/debug/incremental +clean-unused-dependences: + cargo machete + clean: cargo clean diff --git a/src/logic/rss.rs b/src/logic/rss.rs index f259efa..818af83 100644 --- a/src/logic/rss.rs +++ b/src/logic/rss.rs @@ -803,10 +803,10 @@ async fn sync_rss(ui: Weak, items: Vec) -> Vec { let _ = slint::invoke_from_event_loop(move || { let ui = ui.unwrap(); super::entry::update_new_entrys(&ui, suuid.as_str(), entrys); - ui.global::().invoke_refresh_current_tab(); if suuid.as_str() == ui.global::().get_current_rss_uuid().as_str() { notify_ui_update_unread_counts(&ui); + ui.global::().invoke_refresh_current_tab(); } }); } diff --git a/src/version.rs b/src/version.rs index 84012e8..8f0f17e 100644 --- a/src/version.rs +++ b/src/version.rs @@ -1 +1 @@ -pub static VERSION: &str = "v0.9.5"; \ No newline at end of file +pub static VERSION: &str = "v0.9.6"; \ No newline at end of file diff --git a/ui/appwindow.slint b/ui/appwindow.slint index 2a48dbc..fe92156 100644 --- a/ui/appwindow.slint +++ b/ui/appwindow.slint @@ -5,8 +5,6 @@ import { Util } from "./util.slint"; import { Panel } from "./panel/panel.slint"; import { Toast, IconsDialog, IconsDialogSetting, OkCancelDialogV2, Blanket, LanguageDialog, InputBar, OkCancelDialogSetting, LandingPage } from "./base/widgets.slint"; -// import { Drawer, DrawerPosition, TextBtn } from "./base/widgets.slint"; - export component AppWindow inherits Window { default-font-size: Theme.default-font-size; default-font-family: Theme.default-font-family; @@ -69,11 +67,6 @@ export component AppWindow inherits Window { Store.is-show-landing-page = false; } } - - // Rectangle { - // visible: false; - // background: red; - // } } export { Util, Logic, Store, Theme } diff --git a/ui/logic.slint b/ui/logic.slint index 89bdf2e..5d54031 100644 --- a/ui/logic.slint +++ b/ui/logic.slint @@ -40,7 +40,7 @@ export global Logic { callback update-cache-size(); callback remove-all-cache(); - callback add-to_find-blacklist(string); // rss-entry-url + callback add-to-find-blacklist(string); // rss-entry-url callback recover-from-find-blacklist(int, string); // index, find-item-url callback copy-to-clipboard(string); // msg