Skip to content

Commit

Permalink
Update about, settings window, and add airpods max
Browse files Browse the repository at this point in the history
  • Loading branch information
Jason Rappaport committed May 29, 2021
1 parent 8e8a422 commit 78e3bc9
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 15 deletions.
6 changes: 3 additions & 3 deletions about.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>About GoldenChaos-BTT 3.562</title>
<title>About GoldenChaos-BTT 3.563</title>
<style>
body {
color: #fff;
Expand Down Expand Up @@ -287,9 +287,9 @@
<div></div>
<img src="https://raw.githubusercontent.com/GoldenChaos/GoldenChaos-BTT/master/cool-photo.jpg" alt="">
</div>
<h2 style="margin-bottom:8px;">GoldenChaos-BTT 3.562</h2>
<h2 style="margin-bottom:8px;">GoldenChaos-BTT 3.563</h2>
<h3 style="text-align:center;">
Stable Release &bull; May 4, 2021 &bull;
Stable Release &bull; May 29, 2021 &bull;
<a onClick="trigger_named_async_without_response('Show About GC-BTT')">
<span onClick="trigger_named_async_without_response('View Latest Release Notes')">
Release Notes <img src="https://raw.githubusercontent.com/GoldenChaos/GoldenChaos-BTT/master/external-link-blue.svg" alt="">
Expand Down
32 changes: 20 additions & 12 deletions gc-btt-settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@
.tablink:last-of-type {
position: fixed;
bottom: 10px;
border-radius: 6px;
}

.tablink.end::after,
Expand Down Expand Up @@ -965,18 +964,18 @@

function checkVersion() {
window.BTT.callHandler('get_string_variable', {variableName: 'gc_version'}, function callback(currentVariableValue) {
if(currentVariableValue === '3.562') {
if(currentVariableValue === '3.563') {
getAllVariablesAndUpdateClasses();
} else {
triggerNamedActionWithoutResponse('btt_preset_imported_GoldenChaos-BTT 3.562');
triggerNamedActionWithoutResponse('btt_preset_imported_GoldenChaos-BTT 3.563');
checkIfFinished();
}
});
}

function checkIfFinished() {
window.BTT.callHandler('get_string_variable', {variableName: 'gc_version'}, function callback(currentVariableValue) {
if(currentVariableValue === '3.562') {
if(currentVariableValue === '3.563') {
getAllVariablesAndUpdateClasses();
} else {
setTimeout(() => { checkIfFinished() }, 500)
Expand Down Expand Up @@ -1021,7 +1020,7 @@ <h1 class="BTTDraggable">GC-BTT Settings</h1>
<img src="https://raw.githubusercontent.com/GoldenChaos/GoldenChaos-BTT/master/watchos-icons/notifications.png" alt="">
Dock Badges
</li>
<li id="about-tab" class="tablink" onClick="triggerNamedActionWithoutResponse('Show About GC-BTT')">
<li id="about-tab" class="tablink start end" onClick="triggerNamedActionWithoutResponse('Show About GC-BTT')">
<img src="https://raw.githubusercontent.com/GoldenChaos/GoldenChaos-BTT/master/avatar-round.png" alt="">
About GoldenChaos-BTT
</li>
Expand Down Expand Up @@ -1098,7 +1097,7 @@ <h3>Active Preset</h3>
<span>Reset Preset</span>
</span>

<span class="button yellow selected default_edited minimalist_edited gcs-daily-driver_edited" onClick="applyPreset('Save Custom Settings')">
<span class="button yellow selected default_edited minimalist_edited gcs-daily-driver_edited" onClick="applyPreset('Replace Custom Settings')">
<span>
<img class="invert" src="https://raw.githubusercontent.com/GoldenChaos/GoldenChaos-BTT/master/touchbar-icons/new-tab.png" alt="">
</span>
Expand Down Expand Up @@ -1240,14 +1239,14 @@ <h3>Extras</h3>
</div>
<div id="presets" class="tabcontent">
<header class="BTTDraggable">Presets</header>
<small>Quickly customize your Touch Bar UI. Does not affect dock badges.</small>
<small>Quickly customize your Touch Bar UI. These don't affect your Dock Badge selections.</small>
<section>
<ul>
<li class="form-switch radio-switch">
<label id="activePreset">
<span class="description">
Custom Settings
<small>Stores your Dock Badge selections.</small>
<small>Your previous settings before applying any presets.</small>
</span>
<input type="radio" name="preset" onClick="checkAndApplyPreset('custom','Restore Custom Settings')">
<span class="radio custom"></span>
Expand Down Expand Up @@ -1318,7 +1317,7 @@ <h3>Reset</h3>
<span id="factory-reset" style="display:flex;width:100%;">
<span class="description">
<span style="display:block;">Full Reset</span>
<small style="display:block;">Restores all settings to their defaults, including Dock Badges.<br>Does not affect saved Custom Settings.</small>
<small style="display:block;">Sets the Default preset <b>and restores the default dock badges</b>.<br>Does not erase Custom Settings.</small>
</span>
<span style="display:block;margin-top:14.5px;text-align:center;margin-right:4px;width:80px;" class="button red selected" onClick="showFactoryResetConfirmation()">
Full Reset
Expand All @@ -1329,7 +1328,7 @@ <h3>Reset</h3>
<span style="display:block;margin-top:9px;">
Are you sure?
</span>
<small style="display:block;">Your current Dock Badge selection will remain in Custom Settings.</small>
<small style="display:block;">Your will lose your current Dock Badge selections.</small>
</span>
<span style="display:block;margin-right:0;width:80px;text-align:center;margin-top:14.5px;" class="button red selected" onClick="applyPreset('Factory Reset')">
Full Reset
Expand Down Expand Up @@ -1596,8 +1595,8 @@ <h3>Primary Menu Bar Widgets</h3>
</span>
</label>
</li>
<li class="form-switch">
<label id="showBatteryPercentage" onClick="toggleVariable(this.id,'Refresh Battery Widget',true,event)">
<li class="form-switch">
<label id="showBatteryPercentage" onClick="toggleVariable(this.id,'Refresh Battery Widget',event,true)">
<span class="tbicon">
<span style="font-size:12px;display:inline-block;width:100%;text-align:center;">100%</span>
</span>
Expand Down Expand Up @@ -1774,6 +1773,15 @@ <h3>Bluetooth Quick-Connect Keys</h3>
<input type="checkbox"><i></i>
</label>
</li>
<li class="form-switch">
<label id="showConnectAirPodsMax" onClick="toggleVariable(this.id,'Refresh Connect to AirPods Max Key',event,true)">
<span class="tbicon">
<img class="invert" src="https://raw.githubusercontent.com/GoldenChaos/GoldenChaos-BTT/master/touchbar-icons/airpods-max.png" alt="">
</span>
Connect to AirPods Max
<input type="checkbox"><i></i>
</label>
</li>
<li class="form-switch">
<label id="showConnectBeats" onClick="toggleVariable(this.id,'Refresh Connect to Beats Key',event,true)">
<span class="tbicon">
Expand Down
Binary file added touchbar-icons/airpods-max.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 78e3bc9

Please sign in to comment.