diff --git a/package-lock.json b/package-lock.json index 9d118be..9326926 100644 --- a/package-lock.json +++ b/package-lock.json @@ -272,6 +272,37 @@ "@material/feature-targeting": "^3.1.0" } }, + "@material/snackbar": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@material/snackbar/-/snackbar-3.2.0.tgz", + "integrity": "sha512-WVA+dJYbzDMlPpXCdkGEQqi1+tHqV8a9tKBYlr4Vy+3UUaEl6gIomRiWNnagoodhOwGQhyugCeLKHtmVn72IZA==", + "dev": true, + "requires": { + "@material/animation": "^3.1.0", + "@material/base": "^3.1.0", + "@material/button": "^3.2.0", + "@material/dom": "^3.1.0", + "@material/feature-targeting": "^3.1.0", + "@material/icon-button": "^3.2.0", + "@material/ripple": "^3.2.0", + "@material/rtl": "^3.2.0", + "@material/shape": "^3.1.0", + "@material/theme": "^3.1.0", + "@material/typography": "^3.1.0", + "tslib": "^1.9.3" + }, + "dependencies": { + "@material/typography": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@material/typography/-/typography-3.1.0.tgz", + "integrity": "sha512-aSNBQvVxIH1kORSYdLGuSTivx6oJ1MSOSTUAsUwhXPQLQlvbdFeZaqUp7xgn+EvRsHGRFhWk5YGuiBds9+7zQg==", + "dev": true, + "requires": { + "@material/feature-targeting": "^3.1.0" + } + } + } + }, "@material/tab": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/@material/tab/-/tab-3.2.0.tgz", @@ -522,6 +553,19 @@ "@material/ripple": "^3.2.0" } }, + "@smui/snackbar": { + "version": "1.0.0-beta.19", + "resolved": "https://registry.npmjs.org/@smui/snackbar/-/snackbar-1.0.0-beta.19.tgz", + "integrity": "sha512-DpIdxi24VEiaEU952OMEobSu4u1PmrIKTfnb/edOXmIcZP6+kgGYxCCJTPTZpwQy4ur8KCXQf3YzqNkeGKiz5Q==", + "dev": true, + "requires": { + "@material/feature-targeting": "^3.1.0", + "@material/snackbar": "^3.2.0", + "@smui/button": "^1.0.0-beta.19", + "@smui/common": "^1.0.0-beta.19", + "@smui/icon-button": "^1.0.0-beta.19" + } + }, "@smui/tab": { "version": "1.0.0-beta.19", "resolved": "https://registry.npmjs.org/@smui/tab/-/tab-1.0.0-beta.19.tgz", diff --git a/package.json b/package.json index 5b4326d..3b496c3 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "@smui/checkbox": "^1.0.0-beta.19", "@smui/form-field": "^1.0.0-beta.19", "@smui/list": "^1.0.0-beta.19", + "@smui/snackbar": "^1.0.0-beta.19", "@smui/tab": "^1.0.0-beta.19", "@smui/tab-bar": "^1.0.0-beta.19", "@smui/textfield": "^1.0.0-beta.19", diff --git a/src/img/brand.png b/src/img/brand.png deleted file mode 100755 index 69b3f8d..0000000 Binary files a/src/img/brand.png and /dev/null differ diff --git a/src/img/microphone_guide.png b/src/img/microphone_guide.png index 6f696c8..159a3d6 100644 Binary files a/src/img/microphone_guide.png and b/src/img/microphone_guide.png differ diff --git a/src/js/plugins/query.js b/src/js/plugins/query.js index 08e3413..e322c77 100644 --- a/src/js/plugins/query.js +++ b/src/js/plugins/query.js @@ -32,9 +32,7 @@ async function loadAndParsePage(url) { } async function generateGoogleLuckyUrl(query) { - const parsedResponse = await loadAndParsePage( - "https://www.google.com/" - ); + const parsedResponse = await loadAndParsePage("https://www.google.com/"); const sxsrf = parsedResponse("input[name='sxsrf']").attr("value"); const ei = parsedResponse("input[name='ei']").attr("value"); const iflsig = parsedResponse("input[name='iflsig']").attr("value"); @@ -359,18 +357,30 @@ plugins.push({ "*query at *site" ], callback: async (query, site) => { - commander.openTabWithUrl(await generateGoogleLuckyUrl(query + " on " + site)); + commander.openTabWithUrl( + await generateGoogleLuckyUrl(query + " on " + site) + ); }, priority: 0.3 }, { commands: ["search for *query", "google *query", "*query"], callback: query => { - commander.openTabWithUrl( - "https://www.google.com/search?gs_ivs=1&q=" + - encodeURIComponent(query) - ); - commander.clearNotifications(); + chrome.storage.local.get(["tts"], result => { + // If TTS is enabled, we need to clear notifications to avoid the TTS to feedback into the command. + if (result.tts) { + commander.openTabWithUrl( + "https://www.google.com/search?gs_ivs=1&q=" + + encodeURIComponent(query) + ); + commander.clearNotifications(); + } else { + commander.openTabWithUrl( + "https://www.google.com/search?q=" + + encodeURIComponent(query) + ); + } + }); }, priority: 0.2 } diff --git a/src/manifest.json b/src/manifest.json index c15cde9..df973d6 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -45,7 +45,8 @@ "storage" ], "web_accessible_resources": [ - "notification_ui.html" + "notification_ui.html", + "img/*" ], "optional_permissions": ["bookmarks"], "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'" diff --git a/src/svelte/OptionCard.svelte b/src/svelte/OptionCard.svelte index 80fe6e7..dc2a7ba 100644 --- a/src/svelte/OptionCard.svelte +++ b/src/svelte/OptionCard.svelte @@ -17,7 +17,10 @@ - + {#if option.enabled} diff --git a/src/svelte/OptionPlugin.svelte b/src/svelte/OptionPlugin.svelte index 5f97ee1..9775f76 100644 --- a/src/svelte/OptionPlugin.svelte +++ b/src/svelte/OptionPlugin.svelte @@ -8,6 +8,8 @@