From d617764bb7942a54dbcb4d6412e95b1b1b0a8bc4 Mon Sep 17 00:00:00 2001
From: David Peer <david.peer@outlook.com>
Date: Sun, 13 Feb 2022 16:28:50 +0100
Subject: [PATCH] Improved non-fullscreen design.

---
 apps/lcars/bg_left_small.png  | Bin 0 -> 772 bytes
 apps/lcars/bg_right_small.png | Bin 0 -> 769 bytes
 apps/lcars/lcars.app.js       |  57 +++++++++++++++++++++++++---------
 apps/lcars/screenshot_3.png   | Bin 4941 -> 4733 bytes
 4 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 apps/lcars/bg_left_small.png
 create mode 100644 apps/lcars/bg_right_small.png

diff --git a/apps/lcars/bg_left_small.png b/apps/lcars/bg_left_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfdb110d972360313d426b22ac78a7ee9a82b403
GIT binary patch
literal 772
zcmV+f1N;1mP)<h;3K|Lk000e1NJLTq000{R005W>1^@s674VWH00004b3#c}2nYxW
zd<bNS0008JNkl<Zc%1FqUr1AN6bJD0TO++JQ_>OiP_0cN8)Um%OM2;H5eOAQ356ie
zyf-x;e2riP67(p=WOt^~qbu;C5L(bnl(~OBh{2f5-U3V12Bnt29%?bS-Rsh`HQ{{U
zwsSe3{qFsZoy%nmHc8U+s?uaU^KG-^3JFsy%-jvuHtuzO#z0iD5BJ8ajv6j5V<PG3
zGG8PHp4*EB0c5Of))PEvHo86*3jzSp0{|oko;8_jTrsSsGs`dQ8gHHblKnoL_KfYe
z8n3KiLGk&C>V`Wlc`pTn2b^O;$;F9g)9sc?wK^&WH<{{J2_S1X7CVFyMi^m)5k^=!
zV-$*J7>5MfkjlV9Ln>i}5k?qcgq1BeILIrs>ZoG@fc9vhdo*emFfr{90sy62oldK`
z)o@7gp;3OAbH1T3%RUGb%}&mWiV5ayeFhd57&Gfjf&l=uwz8iLENs|suEoR(-WVPa
z*BxkpeVBMr^Uqs8+R<TL6NFtw!QQvE8CC_M*<tqww*nM|z3uGWf9mAJPum4Dld~H+
z0GsOSx_}J<WUVYLNp+&A%wr=tSiG;VqTYJ{J67XJM7m^Gl<^$wwcA~F+Bt&ukdDdu
z_rmX=7$4x>SF1n(0J@0VeFzJRgsz|0s_SgdkvS}^a%t&>R-KjV6awtzQI0Ue2qTOz
z!u}IRp=gGMWceymuQi9y_e2w;xsfo!2qTOz!U!X5r(*g@L^_AkX?^_%z%WWHO8JDn
z>+MB(AZOrw#p?B@G%>odAdE1=2qTOz!v0|4sC*5pSy+;snwYS#@DvLZMP+ijr)Q5U
zW(@>ZL$Mn+Eb!QI@7Gv+driLD-)Sf;NlsBzRR33tkqx8QRCo6gN7K-3NiYC_uq0KB
zqOw>LES;z<*PpQY;w8b-dDGu7=u@f74!i&HcClY%5W35joUtAN0000<MNUMnLSTX@
C4_rO~

literal 0
HcmV?d00001

diff --git a/apps/lcars/bg_right_small.png b/apps/lcars/bg_right_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..df9d32b3853d8b2cabc83ef116f4179bfd5a48b0
GIT binary patch
literal 769
zcmV+c1OEJpP)<h;3K|Lk000e1NJLTq000{R005W>1^@s674VWH00004b3#c}2nYxW
zd<bNS0008GNkl<Zc%1Fq&r6eW90&0CS2P{1F|dKBYD|PQu;!Q+9g6H=^y?5FIwY8T
zR)hY7Kn5ao5^*R#wXK6)T2U80<fTja<JqGghJjgjib9c0WEI)B(_-ec=dt#AhQ{Z8
zdw9NkUVNVCyY2J*5{O9&f-Eh+ba<m@znYCHqksUw>p7D}Ov?G*@oL+#T<Tq|D~L(?
z`rh*cwqv;*-GAlFV$W!xBp3kHx-V#NyT=dZmW9!v`QGvBdROZT6}t3!^n~~B#W_O^
z02aE(Ty>tdH7YQ(oT@B{0l-qvSc}))HbDiNVgNw(Jp^o?AdE4_7-Nhv#@JrMI2_Yh
zHmMSe+@vzb7-Nhv#@MdJ`uk-iC1%<dP__g>33ubeq|Z^XGU}=XYQ>hyq?BSPDUa9z
z0f3<1a3Kh=`IzNHwqdEqzVbgIa_qr<U$sE3Xm1yrM(f4!BYChG;KKq|qfzm*m~Ge+
zF%^l_{L2R`ve`|4GP(R$m>fpYQ(sGm&hN`+CytMdY}k(FXL9;x&B=KDlhHczsoxTe
zf1D15E=z+SdGgBgqw9(%psK%bAZ^prigLB7Nqt5IzRBFFsv8*iW{BlNS@El>PS@!~
zV%_}DlMobP2-69oYh9P9Fuk+$uqjrxw)TPw^EW5nTVI+W+?Bhhm1B%C#u#Iau|0xu
zIHs{|<+O148i0zDVB9w{#u#IaF~%5UjO|ve+-iWXb)7?5ndLan{~60(KNE>KH-sR$
zInE~*j4{R-V~jDz*iNvtqBK)M>6!5Lf}L(A5^**(4o*^Gj@8wthLz2BbhsND2iK_}
zZT6P`SSt11)`w33K-ZO)fT~UbJ2<f@CfeL>Ur-%-ms_?C({;riREM^_B27N^XJ^87
zA`B5w)ot%$lT@aqLpOdnolj2n^<{zKg5!PxC40_mtXBDF00000NkvXXu0mjfJ_~X1

literal 0
HcmV?d00001

diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 2d2239396..7d5da2d8e 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -37,18 +37,33 @@ var plotMonth = false;
  */
 
 
-var bgLeft =  {
+var bgLeftFullscreen =  {
   width : 27, height : 176, bpp : 3,
   transparent : 0,
   buffer : require("heatshrink").decompress(atob("AAUM2XLlgCCwAJBBAuy4EAmQIF5cggAIGlmwgYIG2XIF42wF4ImGF4ImHJoQmGJoQdJhZNHNY47CgRNGBIJZHHgRiGBIRQ/KH5QCAFCh/eX5Q/KAwdCAGVbtu27YCCoAJBkuWrNlAQRGCiwRDAQPQBIMJCIYCBsAJBgomEtu0WoQmEy1YBIMBHYttIwQ7FyxQ/KHFlFAQ7F2weCHYplKChRTCCg5TCHw5TMAD0GzVp0wCCBBGaBIMaBAtpwECBA2mwEJBAugDgMmCIwJBF5EABAtoeQQvGCYQdPJoI7LMQzTCLJKAGzAJBO4xQ/KGQA8UP7y/KH5QnAHih/eX5Q/GQ4JCGRJlKCgxTDBAwgCCg5TCHwxTCNA4A=="))
 };
 
-var bgRight =  {
+var bgLeftNotFullscreen = {
+  width : 27, height : 152, bpp : 3,
+  transparent : 0,
+  buffer : require("heatshrink").decompress(atob("AAUM2XLlgCCwAJBBAuy4EAmQIF5cggAIGlmwgYIG2XIF42wF4ImGF4ImHJoQmGJoQdJhZNHNY47CgRNGBIJZHHgRiGBIRQ/KH5QCAGVbtu27YCCoAJBkuWrNlAQRkCiwRDAQPQBIMJCIYCBsAJBgomEtu0WoQmEy1YBIMBHYttIwQ7FyxQ/KHFlFAQ7F2weCHYplKChRTCCg5TCHw5TMAD0GzVp0wCCBBGaBIMaBAtpwECBA2mwEJBAugDgMmCIwJBF5EABAtoeQQvGCYQdPJoI7LMQzTCLJKAGzAJBO4xQ/KGQA8UP7y/KH5QnAHih/eX5Q/GQ4JCGRJlKCgxTDBAwgCCg5TCHwxTCNA4A="))
+};
+
+var bgRightFullscreen =  {
   width : 27, height : 176, bpp : 3,
   transparent : 0,
   buffer : require("heatshrink").decompress(atob("lmy5YCDBIUyBAmy5AJBhYUG2EAhgIFAQMAgQIGCgQABCg4ABEAwUNFI2AKZHAKZEgGRZTGOIUDQxJxGKH5Q/agwAnUP7y/KH4yGeVYAJrdt23bAQVABIMly1ZsoCCMgUWCIYCB6AJBhIRDAQNgBIMFEwlt2i1CEwmWrAJBgI7FtpGCHYuWKH5QxEwpQDlo7F0A7IqBZBEwo7BCIwCBJo53CJoxiCJpIAdgOmzVpAQR/CgAIEAQJ2CBAoCBBIMmCg1oD4QLGFQUCCjQ+CKYw+CKY4JCKYwoCGRMaGREJDoroCgwdFzBlLKH5QvAHih/eX5Q/KE4A8UP7y/KH5QGDpg7HJoxZCCIx3CJowmCF4yACJox/CgAA="))
 };
 
+var bgRightNotFullscreen =  {
+  width : 27, height : 152, bpp : 3,
+  transparent : 0,
+  buffer : require("heatshrink").decompress(atob("lmy5YCDBIUyBAmy5AJBhYUG2EAhgIFAQMAgQIGCgQABCg4ABEAwUNFI2AKZHAKZEgGRZTGOIUDQxJxGKH5Q/agwAxrdt23bAQVABIMly1ZsoCCMgUWCIYCB6AJBhIRDAQNgBIMFEwlt2i1CEwmWrAJBgI7FtpGCHYuWKH5QxEwpQDlo7F0A7IqBZBEwo7BCIwCBJo53CJoxiCJpIAdgOmzVpAQR/CgAIEAQJ2CBAoCBBIMmCg1oD4QLGFQUCCjQ+CKYw+CKY4JCKYwoCGRMaGREJDoroCgwdFzBlLKH5QvAHih/eX5Q/KE4A8UP7y/KH5QGDpg7HJoxZCCIx3CJowmCF4yACJox/CgA="))
+};
+
+var bgLeft = settings.fullscreen ? bgLeftFullscreen : bgLeftNotFullscreen;
+var bgRight= settings.fullscreen ? bgRightFullscreen : bgRightNotFullscreen;
+
 var iconEarth = {
   width : 50, height : 50, bpp : 3,
   buffer : require("heatshrink").decompress(atob("AFtx48ECBsDwU5k/yhARLjgjBjlzAQMQEZcIkOP/fn31IEZgCBnlz58cEpM4geugEgwU/8+WNZJHDuHHvgmBCQ8goEOnVgJoMnyV58mACItHI4X8uAFBuVHnnz4BuGxk4////Egz3IkmWvPgNw8f/prB//BghTC+AjE7848eMjNnzySBwUJkmf/BuGuPDAQIjBiPHhhTCSQnjMo0ITANJn44Dg8MuFBggCCiFBcAJ0Bv5xEh+ITo2OhHkyf/OIQdBWwVHhgjBNwUE+fP/5EEgePMoYLBhMgyVJk/+BQQdC688I4XxOIc8v//NAvr+QEBj/5NwKVBy1/QYUciPBhk1EAJrC+KeC489QYaMBgU/8BNB9+ChEjz1Jkn/QYMBDQIgCcYTCCiP/nlzJQmenMAgV4//uy/9wRaB/1J8iVCcAfHjt9TYYICnhKCgRKBw159/v//r927OIeeoASBDQccvv3791KYVDBYPLJQeCnPnz//AAP6ocEjEkXgMgJQtz79fLAP8KYkccAcJ8Gf/f/xu/cAMQ4eP5MlyQRCMolx40YsOGBAPfnnzU4KVDpKMBvz8Dh0/8me7IICgkxJQXPIgZTD58sEgcJk+eNoONnFBhk4/5uB/pcDg5KD+4mEv4CBXISVDhEn31/8/+mH7x//JQK5CAAMB4JBCnnxJQf/+fJEgkAa4L+CAQOOjMn/1bXIRxDJQXx58f//Hhlz/88EgsChMgz/Zs/+nfkyV/8huDOI6SD498NwoACi1Z8+S/Plz17/+QCI7jC+ZxBmfPnojIAAMDcYWSp//2wRJEwq2GABECjMgNYwAmA="))
@@ -278,9 +293,10 @@ function drawState(){
 
 function drawPosition0(){
   // Draw background image
-  g.drawImage(bgLeft, 0, 0);
-  drawHorizontalBgLine(cBlue, 25, 120, 0, 4);
-  drawHorizontalBgLine(cBlue, 130, 176, 0, 4);
+  var offset = settings.fullscreen ? 0 : 24;
+  g.drawImage(bgLeft, 0, offset);
+  drawHorizontalBgLine(cBlue, 25, 120, offset, 4);
+  drawHorizontalBgLine(cBlue, 130, 176, offset, 4);
   drawHorizontalBgLine(cPurple, 20, 70, 80, 4);
   drawHorizontalBgLine(cPurple, 80, 176, 80, 4);
   drawHorizontalBgLine(cOrange, 35, 110, 87, 4);
@@ -309,7 +325,7 @@ function drawPosition0(){
   if(settings.fullscreen){
     g.drawString(timeStr, 27, 10);
   } else {
-    g.drawString(timeStr, 27, 30);
+    g.drawString(timeStr, 27, 33);
   }
 
   // Write date
@@ -323,8 +339,8 @@ function drawPosition0(){
   } else {
     var dayStr = locale.dow(currentDate, true).toUpperCase();
     var date = currentDate.getDate();
-    g.drawString(dayStr, 128, 33);
-    g.drawString(date, 128, 53);
+    g.drawString(dayStr, 128, 35);
+    g.drawString(date, 128, 55);
   }
 
   // Draw data
@@ -340,8 +356,11 @@ function drawPosition0(){
 
 function drawPosition1(){
   // Draw background image
-  g.drawImage(bgRight, 149, 0);
-  drawHorizontalBgLine(cBlue, 0, 140, 0, 4);
+  var offset = settings.fullscreen ? 0 : 24;
+  g.drawImage(bgRight, 149, offset);
+  if(settings.fullscreen){
+    drawHorizontalBgLine(cBlue, 0, 140, offset, 4);
+  }
   drawHorizontalBgLine(cPurple, 0, 80, 80, 4);
   drawHorizontalBgLine(cPurple, 90, 150, 80, 4);
   drawHorizontalBgLine(cOrange, 0, 50, 87, 4);
@@ -401,8 +420,13 @@ function drawPosition1(){
     g.setFontAlign(1, 1, 0);
     g.setFontAntonioMedium();
     g.setColor(cWhite);
-    g.drawString("M-HRM", 154, 27);
-    g.drawString("M-STEPS [K]", 154, 115);
+
+    if(settings.fullscreen){
+      g.drawString("M-HRM", 154, 27);
+      g.drawString("M-STEPS [K]", 154, 115);
+    } else {
+      g.drawString("MONTH", 154, 115);
+    }
 
   // Plot day
   } else {
@@ -442,8 +466,13 @@ function drawPosition1(){
     g.setFontAlign(1, 1, 0);
     g.setFontAntonioMedium();
     g.setColor(cWhite);
-    g.drawString("D-HRM", 154, 27);
-    g.drawString("D-STEPS", 154, 115);
+
+    if(settings.fullscreen){
+      g.drawString("D-HRM", 154, 27);
+      g.drawString("D-STEPS", 154, 115);
+    } else {
+      g.drawString("DAY", 154, 115);
+    }
   }
 }
 
diff --git a/apps/lcars/screenshot_3.png b/apps/lcars/screenshot_3.png
index c18b807bc17926a82731c1315c9081ff276ed24d..931ea15dec0e37f851ebf7fabaaf490954c013a2 100644
GIT binary patch
delta 4728
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
GLSTZ!6XZMq

delta 4938
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
IM6N<$f?-EBGynhq