Merge branch 'master' of https://github.com/justkowal/FGCompanion

justkowal · Oct 27, 2021 · 7750ac7 · 7750ac7
2 parents 86942e0 + 2974c38
commit 7750ac7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/index.html b/index.html
@@ -24,8 +24,15 @@
         </ul>
       </div>
       <div id="tab1" class="col s12">
-        <div class="center">
-          <h3>Nothing is there yet.</h3>
+        <h5>General Settings</h5>
+        <label for="showRepoButton">Show repo ads (tysm for turning on)</label>
+        <div class="switch">
+          <label>
+            Off
+            <input id="showRepoButton" type="checkbox">
+            <span class="lever"></span>
+            On
+          </label>
         </div>
       </div>
       <div id="tab2" class="col s12">
@@ -113,6 +120,7 @@ <h3>Nothing is there yet.</h3>
           document.getElementById('statePatternRoute').value = settings.statePatternRoute
           document.getElementById('detailsPatternRoute').value = settings.detailsPatternRoute
           document.getElementById('rpcautooff').checked = settings.autoOffRPC
+          document.getElementById('showRepoButton').checked = settings.showRepoButton
       })
       api.recieve('save-settings-reply',(arg)=>{
           if(arg == "ok"){
@@ -127,7 +135,8 @@ <h3>Nothing is there yet.</h3>
           detailsPattern: document.getElementById('detailsPattern').value,
           statePatternRoute: document.getElementById('statePatternRoute').value,
           detailsPatternRoute: document.getElementById('detailsPatternRoute').value,
-          autoOffRPC: document.getElementById('rpcautooff').checked
+          autoOffRPC: document.getElementById('rpcautooff').checked,
+          showRepoButton: document.getElementById('showRepoButton').checked
         })
 
       }

diff --git a/index.js b/index.js
@@ -131,7 +131,7 @@ app.whenReady().then(() => {
               smallImageKey: "paint",
               smallImageText: info.paintjobtext,
               buttons : [
-                {label : "🐱‍💻Github Repo" , url : "https://github.com/justkowal/FGCompanion"},
+                (settings.properties.showRepoButton) ? {label : "🐱‍💻Github Repo" , url : "https://github.com/justkowal/FGCompanion"} : undefined ,
               ],
               instance: true,
             })
@@ -146,7 +146,7 @@ app.whenReady().then(() => {
               smallImageKey: "paint",
               smallImageText: info.paintjobtext,
               buttons : [
-                {label : "🐱‍💻Github Repo" , url : "https://github.com/justkowal/FGCompanion"},
+                (settings.properties.showRepoButton) ? {label : "🐱‍💻Github Repo" , url : "https://github.com/justkowal/FGCompanion"} : undefined ,
               ],
               instance: true,
             })

diff --git a/package-lock.json b/package-lock.json
diff --git a/settings.json b/settings.json
@@ -1 +1 @@
-{"statePattern":"SPD: {airspeed} kt | ALT: {alt} ft","detailsPattern":"Flying over {airspace} {emoji}","statePatternRoute":"SPD: {airspeed} kt | ALT: {alt} ft","detailsPatternRoute":"Flying from {depicao} to {desticao}","autoOffRPC":true}
+{"statePattern":"SPD: {airspeed} kt | ALT: {alt} ft","detailsPattern":"Flying over {airspace} {emoji}","statePatternRoute":"SPD: {airspeed} kt | ALT: {alt} ft","detailsPatternRoute":"Flying from {depicao} to {desticao}","autoOffRPC":true,"showRepoButton":false}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"statePattern":"SPD: {airspeed} kt \| ALT: {alt} ft","detailsPattern":"Flying over {airspace} {emoji}","statePatternRoute":"SPD: {airspeed} kt \| ALT: {alt} ft","detailsPatternRoute":"Flying from {depicao} to {desticao}","autoOffRPC":true}
		{"statePattern":"SPD: {airspeed} kt \| ALT: {alt} ft","detailsPattern":"Flying over {airspace} {emoji}","statePatternRoute":"SPD: {airspeed} kt \| ALT: {alt} ft","detailsPatternRoute":"Flying from {depicao} to {desticao}","autoOffRPC":true,"showRepoButton":false}