Merge pull request #1171 from tonymushah/1148-notify-when-the-toast-is-not-visible

1148 notify when the toast is not visible

Author: tonymushah

Cargo.lock

@@ -94,6 +94,7 @@
 		"@tauri-apps/api": "^2.9.0",
 		"@tauri-apps/plugin-clipboard-manager": "^2.3.2",
 		"@tauri-apps/plugin-dialog": "^2.4.2",
+		"@tauri-apps/plugin-notification": "^2.3.3",
 		"@tauri-apps/plugin-opener": "^2.5.2",
 		"@urql/svelte": "^5.0.0",
 		"core-js": "^3.46.0",

package.json

@@ -1,6 +1,6 @@
 [package]
 name = "special-eureka"
-version = "0.2.2-1"
+version = "0.2.2-2"
 description = "a manga reader desktop app build with tauri"
 authors = ["tonymushah"]
 license = ""

pnpm-lock.yaml

@@ -31,6 +31,9 @@
 		"core:webview:allow-create-webview-window",
 		"dialog:allow-open",
 		"dialog:allow-save",
-		"opener:allow-reveal-item-in-dir"
+		"opener:allow-reveal-item-in-dir",
+		"notification:allow-notify",
+		"notification:allow-is-permission-granted",
+		"notification:deny-request-permission"
 	]
 }

src-tauri/core/Cargo.toml

@@ -31,13 +31,13 @@ use crate::{
                     MangaDexTheme,
                     profiles::{ThemeProfileDefaultKey, ThemeProfileEntry, ThemeProfiles},
                 },
+                toast_notify::ToastNotifyStore,
             },
         },
     },
     utils::{get_app_handle_from_async_graphql, traits_utils::MangadexAsyncGraphQLContextExt},
 };
 use async_graphql::{Context, Object};
-use mangadex_api_types_rust::Language;
 
 use crate::{
     store::types::{
@@ -49,7 +49,6 @@ use crate::{
             manga_list_style::{MangaListStyle, MangaListStyleStore},
             reading_mode::{ReadingMode, ReadingModeStore},
         },
-        structs::chapter_language::ChapterLanguagesStore,
     },
     utils::{get_store, get_watches_from_graphql_context, watch::SendData},
 };
@@ -99,19 +98,6 @@ impl UserOptionMutations {
         watches.sidebar_direction.send_data(inner)?;
         Ok(SidebarDirectionStore::extract_from_store(&store_write)?.into())
     }
-    pub async fn set_chapter_languages(
-        &self,
-        ctx: &Context<'_>,
-        languages: Vec<Language>,
-    ) -> Result<Vec<Language>> {
-        let store = get_store::<tauri::Wry>(ctx)?;
-        let store_write = store.write().await;
-        let watches = get_watches_from_graphql_context::<tauri::Wry>(ctx)?;
-        let inner = ChapterLanguagesStore::from(languages);
-        inner.insert_and_save(&store_write)?;
-        watches.chapter_languages.send_data(inner)?;
-        Ok(ChapterLanguagesStore::extract_from_store(&store_write)?.into())
-    }
     pub async fn set_image_fit(&self, ctx: &Context<'_>, image_fit: ImageFit) -> Result<ImageFit> {
         let store = get_store::<tauri::Wry>(ctx)?;
         let store_write = store.write().await;
@@ -444,4 +430,17 @@ impl UserOptionMutations {
         watches.content_profile_warning.send_data(*store)?;
         Ok(*store)
     }
+    pub async fn set_toast_notify(
+        &self,
+        ctx: &Context<'_>,
+        notify: bool,
+    ) -> crate::Result<bool, crate::error::ErrorWrapper> {
+        let app = ctx.get_app_handle::<tauri::Wry>()?;
+        let watches = get_watches_from_graphql_context::<tauri::Wry>(ctx)?;
+        let mut store = app.extract::<ToastNotifyStore>().await?;
+        *store = notify;
+        app.insert_and_save(&store).await?;
+        watches.toast_notify.send_data(*store)?;
+        Ok(*store)
+    }
 }

src-tauri/core/capabilities/mains.json

@@ -15,7 +15,6 @@ use crate::{
             reading_mode::ReadingModeStore,
         },
         structs::{
-            chapter_language::ChapterLanguagesStore,
             chapter_layout::ChapterLayoutStore,
             client_info::ClientInfoStore,
             content::profiles::{ContentProfileDefaultKey, ContentProfiles},
@@ -24,6 +23,7 @@ use crate::{
             longstrip_image_width::LongstripImageWidthStore,
             page_limit::PageLimitStore,
             theme::profiles::{ThemeProfileDefaultKey, ThemeProfiles},
+            toast_notify::ToastNotifyStore,
         },
     },
     utils::watch::{SendData, Watches},
@@ -43,7 +43,6 @@ macro_rules! setup_watch {
 
 setup_watch! {
     reading_mode <= ReadingModeStore,
-    chapter_languages <= ChapterLanguagesStore,
     page_direction <= ReadingDirectionStore,
     sidebar_direction <= SidebarDirectionStore,
     image_fit <= ImageFitStore,
@@ -62,6 +61,7 @@ setup_watch! {
     force_port_443 <= ForcePort443Store,
     content_profile_blur <= ContentProfileBlurStore,
     content_profile_warning <= ContentProfileWarningModeStore,
+    toast_notify <= ToastNotifyStore,
 }
 
 #[cfg_attr(feature = "hotpath", hotpath::measure)]

src-tauri/mangadex/src/mutation/user_option.rs

@@ -19,7 +19,7 @@ use crate::{
     utils::traits_utils::{MangadexAsyncGraphQLContextExt, MangadexTauriManagerExt},
 };
 use async_graphql::{Context, Object};
-use mangadex_api_types_rust::{Language, MangaDexDateTime};
+use mangadex_api_types_rust::MangaDexDateTime;
 use tokio_stream::StreamExt;
 
 use crate::{
@@ -31,7 +31,6 @@ use crate::{
             },
             reading_mode::{ReadingMode, ReadingModeStore},
         },
-        structs::chapter_language::ChapterLanguagesStore,
     },
     utils::{get_store, get_watches_from_graphql_context, watch::SendData},
 };
@@ -66,14 +65,6 @@ impl UserOptionQueries {
         let _ = watches.sidebar_direction.send_data(sds.clone());
         Ok(sds.into())
     }
-    pub async fn get_chapter_languages(&self, ctx: &Context<'_>) -> Result<Vec<Language>> {
-        let store = get_store::<tauri::Wry>(ctx)?;
-        let store_read = store.read().await;
-        let watches = get_watches_from_graphql_context::<tauri::Wry>(ctx)?;
-        let cls = ChapterLanguagesStore::extract_from_store(store_read.deref())?;
-        let _ = watches.chapter_languages.send_data(cls.clone());
-        Ok(cls.into())
-    }
     pub async fn get_default_content_profile(&self, ctx: &Context<'_>) -> Result<ContentProfile> {
         let stream = UserOptionSubscriptions
             .listen_to_content_profile_default(ctx)

src-tauri/mangadex/src/plugin_setup/init_watches_states.rs

@@ -32,9 +32,9 @@ use self::{
             reading_mode::ReadingModeStore,
         },
         structs::{
-            chapter_language::ChapterLanguagesStore, chapter_layout::ChapterLayoutStore,
-            client_info::ClientInfoStore, page_limit::PageLimitStore,
-            refresh_token::RefreshTokenStore,
+            chapter_layout::ChapterLayoutStore, client_info::ClientInfoStore,
+            page_limit::PageLimitStore, refresh_token::RefreshTokenStore,
+            toast_notify::ToastNotifyStore,
         },
     },
 };
@@ -62,7 +62,6 @@ get_store_builder! {
     ReadingDirectionStore,
     ReadingModeStore,
     SidebarDirectionStore,
-    ChapterLanguagesStore,
     ImageFitStore,
     LongstripImageWidthStore,
     MangaListStyleStore,
@@ -79,6 +78,7 @@ get_store_builder! {
     ForcePort443Store,
     ContentProfileBlurStore,
     ContentProfileWarningModeStore,
+    ToastNotifyStore,
 }
 
 // [x] refactor into a macro!

src-tauri/mangadex/src/query/user_option.rs

@@ -10,8 +10,6 @@ pub const SIDEBAR_DIRECTION: &str = "sidebar_direction";
 
 pub const READING_MODE: &str = "reading_mode";
 
-pub const CHAPTER_LANGUAGES: &str = "chapter_languages";
-
 pub const IMAGE_FIT: &str = "image_fit";
 
 pub const LONGSTRIP_IMAGE_WIDTH: &str = "longstrip_image_width";
@@ -43,3 +41,5 @@ pub const FORCE_443: &str = "force_443";
 pub const CONTENT_PROFILE_WARNING_MODE: &str = "content_profile_warning_mode";
 
 pub const CONTENT_PROFILE_BLUR: &str = "content_profile_blur";
+
+pub const TOAST_NOTIFY: &str = "toast_notify";