mirror of
https://github.com/ragestudio/comty.git
synced 2025-06-10 02:54:15 +00:00
added UI effects
This commit is contained in:
parent
16becabc23
commit
4434e8c1d0
@ -1,6 +1,7 @@
|
||||
{
|
||||
"themeVariant": "dark",
|
||||
"forceMobileMode": false,
|
||||
"ui.effects": true,
|
||||
"ui.general_volume": 50,
|
||||
"notifications_sound": true,
|
||||
"notifications_vibrate": true,
|
||||
"notifications_sound_volume": 50,
|
||||
@ -10,11 +11,8 @@
|
||||
"haptic_feedback": false,
|
||||
"collapseOnLooseFocus": true,
|
||||
"style.auto_darkMode": true,
|
||||
"compactWidth": false,
|
||||
"postCard_carrusel_auto": true,
|
||||
"postCard_expansible_actions": true,
|
||||
"feed_max_fetch": 20,
|
||||
"style.compactMode": false,
|
||||
"sidebar.floating": true,
|
||||
"sidebar.floating": false,
|
||||
"language": "en"
|
||||
}
|
||||
@ -1,5 +1,11 @@
|
||||
{
|
||||
"id": "default",
|
||||
"name": "Default Soundpack",
|
||||
"author": "RageStudio",
|
||||
"version": "1.0.0",
|
||||
"sounds": {
|
||||
"crash": "/sounds/crash.wav",
|
||||
"error": "/sounds/error.wav",
|
||||
"notification": "/sounds/notification.wav"
|
||||
}
|
||||
}
|
||||
@ -74,6 +74,33 @@ export default {
|
||||
"description": "Enable low performance mode to reduce the memory usage and improve the performance in low-end devices. This will disable some animations and other decorative features.",
|
||||
"emitEvent": "app.lowPerformanceMode"
|
||||
},
|
||||
{
|
||||
id: "ui.effects",
|
||||
storaged: true,
|
||||
group: "ui_sounds",
|
||||
component: "Switch",
|
||||
icon: "MdVolumeUp",
|
||||
title: "UI effects",
|
||||
description: "Enable the UI effects.",
|
||||
},
|
||||
{
|
||||
id: "ui.general_volume",
|
||||
storaged: true,
|
||||
group: "ui_sounds",
|
||||
component: "Slider",
|
||||
icon: "MdVolumeUp",
|
||||
title: "UI volume",
|
||||
description: "Set the volume of the app sounds.",
|
||||
props: {
|
||||
tipFormatter: (value) => {
|
||||
return `${value}%`
|
||||
},
|
||||
min: 0,
|
||||
max: 100,
|
||||
step: 10,
|
||||
},
|
||||
emitEvent: "change:app.general_ui_volume"
|
||||
},
|
||||
{
|
||||
"id": "notifications_sound",
|
||||
"storaged": true,
|
||||
|
||||
@ -202,6 +202,8 @@ class ComtyApp extends React.Component {
|
||||
})
|
||||
},
|
||||
openSearcher: (options) => {
|
||||
app.cores.sound.useUIAudio("navigation.search")
|
||||
|
||||
window.app.ModalController.open((props) => <Searcher {...props} />)
|
||||
},
|
||||
openNavigationMenu: () => window.app.DrawerController.open("navigation", Navigation),
|
||||
@ -252,6 +254,8 @@ class ComtyApp extends React.Component {
|
||||
return app.setLocation(config.app.mainPath ?? "/home")
|
||||
},
|
||||
goToSettings: (setting_id) => {
|
||||
app.cores.sound.useUIAudio("navigation.settings")
|
||||
|
||||
return app.setLocation(`/settings`, {
|
||||
query: {
|
||||
setting: setting_id
|
||||
@ -484,6 +488,8 @@ class ComtyApp extends React.Component {
|
||||
})
|
||||
}
|
||||
|
||||
//app.cores.sound.useUIAudio("splash_out")
|
||||
|
||||
app.eventBus.emit("app.initialization.start")
|
||||
|
||||
await this.initialization()
|
||||
|
||||
@ -274,6 +274,8 @@ export default class Sidebar extends React.Component {
|
||||
return onClickHandlers[e.key](e)
|
||||
}
|
||||
|
||||
window.app.cores.sound.useUIAudio("sidebar.switch_tab")
|
||||
|
||||
if (typeof this.state.pathResolvers === "object") {
|
||||
if (typeof this.state.pathResolvers[e.key] !== "undefined") {
|
||||
return window.app.setLocation(`/${this.state.pathResolvers[e.key]}`, 150)
|
||||
|
||||
@ -153,8 +153,12 @@ export default class SidedrawerController extends React.Component {
|
||||
const drawerClasses = drawer.classList
|
||||
|
||||
if (to) {
|
||||
app.cores.sound.useUIAudio("sidebar.expand")
|
||||
|
||||
drawerClasses.remove("hided")
|
||||
} else {
|
||||
app.cores.sound.useUIAudio("sidebar.collapse")
|
||||
|
||||
drawerClasses.add("hided")
|
||||
}
|
||||
}
|
||||
|
||||
@ -117,8 +117,8 @@ export default class NotificationCore extends Core {
|
||||
const soundVolume = options.soundVolume ? options.soundVolume / 100 : this.getSoundVolume()
|
||||
|
||||
if (soundEnabled) {
|
||||
if (typeof window.app.sound?.play === "function") {
|
||||
window.app.sound.play("notification", {
|
||||
if (typeof window.app.cores.sound?.play === "function") {
|
||||
window.app.cores.sound.play("notification", {
|
||||
volume: soundVolume,
|
||||
})
|
||||
}
|
||||
|
||||
@ -12,14 +12,32 @@ export default class SoundCore extends Core {
|
||||
soundsPool = {}
|
||||
|
||||
public = {
|
||||
play: this.play,
|
||||
getSounds: this.getSounds,
|
||||
play: this.play.bind(this),
|
||||
loadSoundpack: this.loadSoundpack.bind(this),
|
||||
useUIAudio: function (audio_id) {
|
||||
try {
|
||||
if (window.app.cores.settings.is("ui.effects", true)) {
|
||||
this.play(audio_id)
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(error)
|
||||
}
|
||||
}.bind(this)
|
||||
}
|
||||
|
||||
async initialize() {
|
||||
listenEvents = {
|
||||
"change:app.general_ui_volume": (volume) => {
|
||||
// play a sound to test volume
|
||||
this.play("test", {
|
||||
volume: volume / 100,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
async loadSoundpack(manifest) {
|
||||
let soundpack = config.defaultSoundPack ?? {}
|
||||
|
||||
const storedCustomSoundpack = store.get("soundpack_manifest")
|
||||
const storedCustomSoundpack = manifest ?? store.get("soundpack_manifest")
|
||||
|
||||
if (storedCustomSoundpack) {
|
||||
// check if is valid url with regex
|
||||
@ -36,26 +54,66 @@ export default class SoundCore extends Core {
|
||||
}
|
||||
}
|
||||
|
||||
for (const [name, path] of Object.entries(soundpack)) {
|
||||
if (typeof soundpack.sounds !== "object") {
|
||||
console.error(`Soundpack [${soundpack.id}] is not a valid soundpack.`)
|
||||
return false
|
||||
}
|
||||
|
||||
console.log(`Loading soundpack [${soundpack.id} | ${soundpack.name}] by ${soundpack.author} (${soundpack.version})`)
|
||||
|
||||
for (const [name, path] of Object.entries(soundpack.sounds)) {
|
||||
this.soundsPool[name] = new Howl({
|
||||
volume: window.app.cores.settings.get("generalAudioVolume") ?? 0.5,
|
||||
volume: 0.5,
|
||||
src: [path],
|
||||
})
|
||||
}
|
||||
|
||||
console.log(this.soundsPool)
|
||||
}
|
||||
|
||||
async play(name, options) {
|
||||
if (this.soundsPool[name]) {
|
||||
return new Howl({
|
||||
volume: window.app.cores.settings.get("generalAudioVolume") ?? 0.5,
|
||||
...options,
|
||||
src: [soundPack[name]],
|
||||
}).play()
|
||||
} else {
|
||||
async injectUseUIAudio() {
|
||||
const injectOnButtons = (event) => {
|
||||
// search for closest button
|
||||
const button = event.target.closest("button")
|
||||
|
||||
// if button exist and has aria-checked attribute then play switch_on or switch_off
|
||||
if (button) {
|
||||
if (button.hasAttribute("aria-checked")) {
|
||||
return this.public.useUIAudio(button.getAttribute("aria-checked") === "true" ? "component.slider_down" : "component.slider_up")
|
||||
}
|
||||
|
||||
return this.public.useUIAudio("generic_click")
|
||||
}
|
||||
}
|
||||
|
||||
document.addEventListener("click", (event) => {
|
||||
injectOnButtons(event)
|
||||
}, true)
|
||||
}
|
||||
|
||||
async play(name, options = {}) {
|
||||
const audioInstance = this.soundsPool[name]
|
||||
|
||||
if (!audioInstance) {
|
||||
console.error(`Sound [${name}] not found or is not available.`)
|
||||
return false
|
||||
}
|
||||
|
||||
if (typeof options.volume !== "undefined") {
|
||||
audioInstance.volume(options.volume)
|
||||
} else {
|
||||
audioInstance.volume((window.app.cores.settings.get("ui.general_volume") ?? 0) / 100)
|
||||
}
|
||||
|
||||
audioInstance.play()
|
||||
}
|
||||
|
||||
async onInitialize() {
|
||||
await this.loadSoundpack()
|
||||
|
||||
// listen eventBus
|
||||
for (const [eventName, callback] of Object.entries(this.listenEvents)) {
|
||||
window.app.eventBus.on(eventName, callback)
|
||||
}
|
||||
|
||||
this.injectUseUIAudio()
|
||||
}
|
||||
}
|
||||
@ -551,6 +551,8 @@ export default () => {
|
||||
return menuEvents[event.key]()
|
||||
}
|
||||
|
||||
app.cores.sound.useUIAudio("navigation")
|
||||
|
||||
setActiveKey(event.key)
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user