Skip to content

Commit

Permalink
Added per key toggles for displaying the Title & Audibly speaking the…
Browse files Browse the repository at this point in the history 
… shorcut name. General clean up, too!
  • Loading branch information
@SENTINELITE
SENTINELITE committed Jul 29, 2023
1 parent b5e86cc commit 9a9a4cd
Show file tree
Hide file tree
Showing 8 changed files with 183 additions and 153 deletions.
95 changes: 53 additions & 42 deletions PropertyInspectorViews/main_pi.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ filteredFolder: Symbol("filteredFolder")
listOfCuts = ['Placeholder', '2'];
var listOfShortcutsVersionTwo = {};

// function ClearTempData() {
// console.log('clearing temp data')
// listOfCuts.length = 0;
// listOfShortcutsVersionTwo.length = 0;
// }

function connectElgatoStreamDeckSocket(inPort, inUUID, inRegisterEvent, inInfo, inActionInfo) {
uuid = inUUID;

Expand Down Expand Up @@ -60,6 +54,8 @@ function connectElgatoStreamDeckSocket(inPort, inUUID, inRegisterEvent, inInfo,
var totalListOfShortcuts = payload.totalListOfShortcuts
var totalFolders = payload.totalFolders
var processShortcutsSwift = payload.processShortcutsSwift
var isForcedTitle = payload.isForcedTitle
var isAccessibility = payload.isAccessibility

let payloadSize = logSizeInKilobytes('initPayload', payload)
console.log("📦🚀 payload Size", payloadSize)
Expand All @@ -72,6 +68,7 @@ function connectElgatoStreamDeckSocket(inPort, inUUID, inRegisterEvent, inInfo,
console.log("XYZ: ", shortcutsFolder)
initPayload(sentAt, processShortcutsSwift, payloadSize, totalShortcuts, totalFolders)
refreshListOfShortcutsFolders()
setToggleStateNew(isForcedTitle, isAccessibility)
break;
case "filteredFolder": //This needs to get removed
console.log("📦 filteredFolder")
Expand Down Expand Up @@ -131,46 +128,34 @@ function connectElgatoStreamDeckSocket(inPort, inUUID, inRegisterEvent, inInfo,
console.log("ZYX Payload 1222 -> ", payload)
}
}
// console.log("Payload recieved, we've sent to the PI!!!!!");

// if (payload.error) {
// Sentry.captureException(payload.error);
// // printToConsole('Error: ' + payload.error);
// return;
// }
//
// // const errorText2 = document.getElementById('errorPatch');
// // errorText2.value = "Looking for error...";
// debugText(`Looking for error...`, true);
//
// console.log("Payload: ", payload);
//
// usersSelectedShortcut = payload.shortcutName;
//
// const el = document.querySelector('.sdpi-wrapper');
//
// // mappedDataFromBackend = outNewTest;
//
// refreshListOfShortcutsFolders();
//
// if (usersSelectedShortcut.value == "undefined") {
// shortcutName.value = "";
// shortcut_list.value = "";
// }
// else {
// // shortcut_list.value = shortcutName.value;
// }
//
// // el && el.classList.remove('hidden');
// }

console.log('THE EVENTS!, ', evt);

// console.log(greet('Alice'))
};

}

document.addEventListener('DOMContentLoaded', (event) => {
const shortcutsFolderList = document.querySelector("#shortcuts_folder_list");
const shortcutsList = document.querySelector("#shortcuts_list");
const displayTitleToggle = document.querySelector("#display_title_toggle");
const accessToggle = document.querySelector("#accessibility_toggle"); // Assuming "toggle" is the correct ID

shortcutsFolderList.addEventListener('valuechange', function(ev) {
selectedNewIndex(ev.target.value, 'shortcutFolder');
});

shortcutsList.addEventListener('valuechange', function(ev) {
selectedNewIndex(ev.target.value, 'shortcutSelected');
});

displayTitleToggle.addEventListener('valuechange', function(ev) {
toggleSetting(ev.target.value);
});

accessToggle.addEventListener('valuechange', function(ev) {
toggleSetting(ev.target.value);
});
});


function initPayload(sentAt, swift, payloadSize, shortcuts, folders) {
console.log("👋👋👋🏼sentAT: ", sentAt)
let beDate = new Date(sentAt + "-00:00");
Expand All @@ -184,6 +169,31 @@ function initPayload(sentAt, swift, payloadSize, shortcuts, folders) {
select.innerHTML = `Payload: ${diff}ms<br>Process Shortcuts: ${swift}s<br>Payload Size ${payloadSize} kb<br>Folders: #${folders}<br>Shortcuts: #${shortcuts}`
}

function toggleSetting(v) {
const displayToggle = document.getElementById("display_title_toggle"); // Assuming "toggle" is the correct ID
const accessToggle = document.getElementById("accessibility_toggle"); // Assuming "toggle" is the correct ID
console.log('🚨 Toggled Settings', v)

const payloadToSend = {
isForcedTitle: displayToggle.value,
isAcces: accessToggle.value
};

const jsonStringPayload = JSON.stringify(payloadToSend);
//Ideally we're doing payloadToSend.isForcedTitle = displayToggle.value.toString()

sendNewPayload(SdsEventSend.globalSettingsUpdated, jsonStringPayload)
}

function setToggleStateNew(isForcedTitle, isAccessbility) {
console.log('🚀 👋🏼Setting State', isForcedTitle, isAccessbility)

const displayToggle = document.getElementById("display_title_toggle"); // Assuming "toggle" is the correct ID
const accessToggle = document.getElementById("accessibility_toggle"); // Assuming "toggle" is the correct ID
displayToggle.value = isForcedTitle
accessToggle.value = isAccessbility
}

function refreshListOfShortcutsFolders() {
let start = new Date();
// debugText("", false);
Expand Down Expand Up @@ -502,6 +512,7 @@ function checkIfShortcutExists(shortcutToVerify) {
const SdsEventSend = {
newFolderSelected: "newFolderSelected",
newShortcutSelected: "newShortcutSelected",
globalSettingsUpdated: "globalSettingsUpdated",
voiceHover: "voiceHover"
};

Expand Down
31 changes: 8 additions & 23 deletions PropertyInspectorViews/main_pi_two.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@
</sdpi-select>
</div>
</sdpi-item>

<sdpi-item label="Display Title">
<sdpi-checkbox id="display_title_toggle" setting="is_okay" label=""></sdpi-checkbox>
</sdpi-item>

<sdpi-item label="Accessibility">
<sdpi-checkbox id="accessibility_toggle" setting="is_okay" label=""></sdpi-checkbox>
</sdpi-item>

<sdpi-item>
<sdpi-button onclick="openPage('sentinelite.com/discord-shortcuts-support')">
Expand All @@ -47,29 +55,6 @@
<sdpi-item>
<p id="initPayloadText">Payload: 1,337ms <br>ProcessShortcuts: 1.337s<br>Payload Size: 0.00 kbs<br>Folders: #0<br>Shortcuts: #0</p>
</sdpi-item>

<script type="text/javascript">
document.querySelector("#shortcuts_folder_list").addEventListener('valuechange', function(ev) {
selectedNewIndex(ev.target.value, 'shortcutFolder');
});
</script>

<script type="text/javascript">
document.querySelector("#shortcuts_list").addEventListener('valuechange', function(ev) {
selectedNewIndex(ev.target.value, 'shortcutSelected');
});
</script>



<!-- Disabled script
<script>
const myCustomInput = document.getElementById('shortcuts_folder_list');
myCustomInput.addEventListener('change', function() {
console.log('🚀 Changed Val');
// Code to execute when the input value changes
});
</script> -->
</body>

</html>
Binary file modified ...deproj/project.xcworkspace/xcuserdata/kirkland.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions ...ck-Shortcuts.xcodeproj/xcuserdata/kirkland.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<key>StreamDeck-Shortcuts-AppIntents.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>2</integer>
</dict>
<key>StreamDeck-Shortcuts.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
<integer>0</integer>
</dict>
<key>StreamDeckShortcuts-Bundled.xcscheme_^#shared#^_</key>
<dict>
Expand Down
Loading

0 comments on commit 9a9a4cd

Please sign in to comment.