From ad8c531dd4d48cc4f1ec68785ef509b8bd24ff4a Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Tue, 19 Dec 2023 20:53:23 +0100 Subject: [PATCH] Clean code and regenerate screenshots --- main.c | 32 ------------------------- screenshots/breezy-dark-1024x768.png | Bin 15983 -> 15983 bytes screenshots/breezy-dark-1280x800.png | Bin 16704 -> 16704 bytes screenshots/breezy-dark-1440x720.png | Bin 16661 -> 16661 bytes screenshots/breezy-dark-1920x1080.png | Bin 22304 -> 22304 bytes screenshots/breezy-dark-480x800.png | Bin 11799 -> 11799 bytes screenshots/breezy-dark-540x960.png | Bin 13278 -> 13278 bytes screenshots/breezy-dark-768x1024.png | Bin 15207 -> 15207 bytes screenshots/breezy-dark-800x480.png | Bin 12489 -> 12489 bytes screenshots/breezy-dark-960x540.png | Bin 13357 -> 13357 bytes screenshots/breezy-light-1024x768.png | Bin 15756 -> 15756 bytes screenshots/breezy-light-1280x800.png | Bin 16399 -> 16399 bytes screenshots/breezy-light-1440x720.png | Bin 16316 -> 16316 bytes screenshots/breezy-light-1920x1080.png | Bin 21887 -> 21887 bytes screenshots/breezy-light-480x800.png | Bin 11633 -> 11633 bytes screenshots/breezy-light-540x960.png | Bin 12965 -> 12965 bytes screenshots/breezy-light-768x1024.png | Bin 14806 -> 14806 bytes screenshots/breezy-light-800x480.png | Bin 12399 -> 12399 bytes screenshots/breezy-light-960x540.png | Bin 13207 -> 13207 bytes screenshots/pmos-dark-1024x768.png | Bin 15283 -> 15283 bytes screenshots/pmos-dark-1280x800.png | Bin 15901 -> 15901 bytes screenshots/pmos-dark-1440x720.png | Bin 16063 -> 16063 bytes screenshots/pmos-dark-1920x1080.png | Bin 21224 -> 21224 bytes screenshots/pmos-dark-480x800.png | Bin 11043 -> 11043 bytes screenshots/pmos-dark-540x960.png | Bin 12061 -> 12061 bytes screenshots/pmos-dark-768x1024.png | Bin 13888 -> 13888 bytes screenshots/pmos-dark-800x480.png | Bin 11991 -> 11991 bytes screenshots/pmos-dark-960x540.png | Bin 12837 -> 12837 bytes screenshots/pmos-light-1024x768.png | Bin 15239 -> 15239 bytes screenshots/pmos-light-1280x800.png | Bin 15859 -> 15859 bytes screenshots/pmos-light-1440x720.png | Bin 16020 -> 16020 bytes screenshots/pmos-light-1920x1080.png | Bin 21170 -> 21170 bytes screenshots/pmos-light-480x800.png | Bin 11022 -> 11022 bytes screenshots/pmos-light-540x960.png | Bin 12031 -> 12031 bytes screenshots/pmos-light-768x1024.png | Bin 13845 -> 13845 bytes screenshots/pmos-light-800x480.png | Bin 11958 -> 11958 bytes screenshots/pmos-light-960x540.png | Bin 12798 -> 12798 bytes 37 files changed, 32 deletions(-) diff --git a/main.c b/main.c index a16aa63..efaa242 100644 --- a/main.c +++ b/main.c @@ -475,7 +475,6 @@ int main(int argc, char *argv[]) { const int base_keyboard_height = ver_res > hor_res ? ver_res / 3 : ver_res / 2; /* Height for 4 rows */ const int keyboard_height = base_keyboard_height * 1.25; /* Add space for an extra top row */ const int padding = keyboard_height / 10; - // const int label_width = hor_res - 2 * padding; const int textarea_container_max_width = LV_MIN(hor_res, ver_res); /* Main flexbox */ @@ -533,32 +532,6 @@ int main(int argc, char *argv[]) { lv_obj_set_size(flexible_spacer, LV_PCT(100), 0); lv_obj_set_flex_grow(flexible_spacer, 1); - /* Label container */ - // lv_obj_t *label_container = lv_obj_create(container); - // lv_obj_set_size(label_container, label_width, LV_PCT(100)); - // lv_obj_set_flex_grow(label_container, 1); - - // /* Label */ - // lv_obj_t *spangroup = lv_spangroup_create(label_container); - // lv_spangroup_set_align(spangroup, LV_TEXT_ALIGN_CENTER); - // lv_spangroup_set_mode(spangroup, LV_SPAN_MODE_BREAK); - // lv_spangroup_set_overflow(spangroup, LV_SPAN_OVERFLOW_ELLIPSIS); - // lv_span_t *span1 = lv_spangroup_new_span(spangroup); - - // /* Label text */ - // const char *crypttab_tried = getenv("CRYPTTAB_TRIED"); - // if (crypttab_tried && atoi(crypttab_tried) > 0) { - // lv_span_set_text(span1, "Password incorrect"); - // } else { - // lv_span_set_text(span1, "Password required for booting"); - // } - - // /* Size label to content */ - // const lv_coord_t label_height = lv_spangroup_get_expand_height(spangroup, label_width); - // lv_obj_set_style_max_height(spangroup, LV_PCT(100), LV_PART_MAIN); - // lv_obj_set_size(spangroup, label_width, label_height); - // lv_obj_set_align(spangroup, LV_ALIGN_BOTTOM_MID); - /* Textarea flexbox */ lv_obj_t *textarea_container = lv_obj_create(container); lv_obj_set_size(textarea_container, LV_PCT(100), LV_SIZE_CONTENT); @@ -600,11 +573,6 @@ int main(int argc, char *argv[]) { lv_obj_t *fixed_spacer = lv_obj_create(container); lv_obj_set_size(fixed_spacer, LV_PCT(100), padding); - // /* Hide label if it clips veritcally */ - // if (label_height > lv_obj_get_height(label_container)) { - // lv_obj_set_height(spangroup, 0); - // } - /* Keyboard (after textarea / label so that key popovers are not drawn over) */ keyboard = lv_keyboard_create(lv_scr_act()); lv_keyboard_set_mode(keyboard, LV_KEYBOARD_MODE_TEXT_LOWER); diff --git a/screenshots/breezy-dark-1024x768.png b/screenshots/breezy-dark-1024x768.png index 7252ba7169e95fb5d395ed186e71c69d1846823c..1ee0303a523882f57bb8a76a7f8b44bcb79042fd 100644 GIT binary patch delta 22 dcmaD~^S)+-0V5}mu&^=563LW diff --git a/screenshots/breezy-dark-1280x800.png b/screenshots/breezy-dark-1280x800.png index e7997e004195f309f73d510f9ea89e18dd1e9603..8ed2d72846e3795e9243164706111941cf671030 100644 GIT binary patch delta 24 gcmX@m#CV{Iaf1OPCy%hOG0){#tjCHoIJw9#-hjNIV3h)GCmIl0A7#>G5`Po delta 24 gcmZ3mj&Z>{#tjCHoLmyZQrc3LKYnhuWPBb90A~*fumAu6 diff --git a/screenshots/breezy-dark-480x800.png b/screenshots/breezy-dark-480x800.png index d50a8587f01ea30c28ee687b919af1910a0da0bd..5b438281bf0bd637507df0a77ab9bd583a052e76 100644 GIT binary patch delta 22 ecmbOpGd*U56C)>&u&|NARED>5o4py&=l}pw{09yI delta 22 ecmbOpGd*U56C)>=gs>D>n81tWo4py&=l}pv`3EQf diff --git a/screenshots/breezy-dark-540x960.png b/screenshots/breezy-dark-540x960.png index d4f754a295b26a570753bcd04b92e179bd232820..2064d9349930b96b2c13d121b9853153e2c62f4d 100644 GIT binary patch delta 22 ecmcbYelLB40V5}mu&|NE?Axh2n=Kia8UX-dk_X%X delta 22 dcmcbYelLB40V5}ugs_y5YfZt&&6bQyjR0OC2fP3P diff --git a/screenshots/breezy-dark-768x1024.png b/screenshots/breezy-dark-768x1024.png index 2e54e5c6da242f5d5e26e631cfcc72dc2631385b..0fce9ccde421ab88aa7db2e8bebe44db3ac99bbf 100644 GIT binary patch delta 22 ecmaD}_PlI^0V5}mu&^=9+VvW*Hd`|4SpfiKj0e#G delta 22 dcmaD}_PlI^0V5}ugs_yf&4Lr5n=KjjtN>v32VDRF diff --git a/screenshots/breezy-dark-800x480.png b/screenshots/breezy-dark-800x480.png index a76c18ca3b6d44ea69214a416d64729d234930f5..656f8e4787eb083e87b288ce1ef6a916af1f480d 100644 GIT binary patch delta 22 dcmX?^crtN=0V5}mu&|NIq+Ct*&6bQ4^Z{0w2C@JE delta 22 dcmX?^crtN=0V5}ugs>D}V6D!+&6bQ4^Z{1S2LJ#7 diff --git a/screenshots/breezy-dark-960x540.png b/screenshots/breezy-dark-960x540.png index 943e6dd3841b55c22ed9afa7ea0f19cb1b6d00f9..29d1cce5353c47fc0310c136d73a7e21e070ed2c 100644 GIT binary patch delta 22 ecmZ3Ru{L9a0V5}mu&^=1szYx+Z?;j9USkL; diff --git a/screenshots/breezy-light-1440x720.png b/screenshots/breezy-light-1440x720.png index cd2b4b68ad2a52406e5ee201aaf860427cc52497..cf2e9dd6795323d9c12fb1f7d577d3347d89792a 100644 GIT binary patch delta 22 dcmdl}zo&kKF(W6Bu&|N3*yW6yn{5~y>;PU%2gd*a delta 22 dcmdl}zo&kKF(W6Jgs>D-#OZ{on{5~y>;POi2YUbj diff --git a/screenshots/breezy-light-1920x1080.png b/screenshots/breezy-light-1920x1080.png index 1d20a17ff2e671889502ffc33412457a0e13a51e..964d4a99be18c6d5f6f91d8f3c80f9097248feb6 100644 GIT binary patch delta 24 gcmeyrit+y{#tp`doIJw9M%wbJDxWsnFgk|-0C0u}@&Et; delta 24 gcmeyrit+y{#tp`doLmyZQf%?dmh^14VRQ}w0CSZHQvd(} diff --git a/screenshots/breezy-light-480x800.png b/screenshots/breezy-light-480x800.png index 95547afc224ed1634da0f3f8799d6b135a791a8d..ad107f6da53153398609033eae7d04cbc73bfebd 100644 GIT binary patch delta 22 dcmewu^)YHgEF&k6u&@zVFptTa&1sC>IsjYz2CM)8 delta 22 dcmewu^)YHgEF&kEgs`OI#YQKU&1sC>Isjoj2POaj diff --git a/screenshots/breezy-light-540x960.png b/screenshots/breezy-light-540x960.png index d1e1df40111c63f66060e32bbd69ec4dc24875aa..39b2788dee0aa0fd38bd040bf0f3437cff58acac 100644 GIT binary patch delta 22 dcmZ3Qx-@lzF(W6Bu&|M^dHS53%{Gjgh5%9-2B`o5 delta 22 dcmZ3Qx-@lzF(W6Jgs`OM{isu7n{5~~4FOig2OIzZ diff --git a/screenshots/breezy-light-768x1024.png b/screenshots/breezy-light-768x1024.png index 8629eacbe1d06e5882bb35c8492cf657ef3b9e42..0bd78c657ed8e07d0d47fb0bd9b00f9e8b2c2476 100644 GIT binary patch delta 22 dcmcase64tcF(W6Bu&|M|8&#?Hit8w(F6ck76-Hd diff --git a/screenshots/pmos-dark-540x960.png b/screenshots/pmos-dark-540x960.png index a09a7eff5dcc3e0c06c0909ceb2ed426414bedba..1e92f02fce084410b466728a54c89cac0587d60b 100644 GIT binary patch delta 22 ecmbOmH#csB0V5}mu&@btQQ+b|n=Kii=mG#!o(FOO delta 22 dcmbOmH#csB0V5}ugs`+y)xJWR&6bQ$bOBN*2NnPT diff --git a/screenshots/pmos-dark-768x1024.png b/screenshots/pmos-dark-768x1024.png index 3949fff959cee6c25d4bf84bd4068709ba547df7..a58cb6d7d88592208e1911d9e4afd01f7bbdec9a 100644 GIT binary patch delta 22 dcmX?*b0BAf0V5}mu&{~9|HyTon=KjHO#xj52Q>fy delta 22 dcmX?*b0BAf0V5}ugs`+$N$O9%&6bSprT|&m2Ic?& diff --git a/screenshots/pmos-dark-800x480.png b/screenshots/pmos-dark-800x480.png index 9f9340d390709502230b9ef681c5a2e4673e6c17..925dc4f4579b0f291d9497827ff0119df5b76421 100644 GIT binary patch delta 22 ecmcZ}dp&l80V5}mu&@bx_4D`BH(N5!(**!xeF$Ix delta 22 ecmcZ}dp&l80V5}ugs`;inHw>Rn=KjV=>h;=0|%J^ diff --git a/screenshots/pmos-dark-960x540.png b/screenshots/pmos-dark-960x540.png index 9965433d5df5f652a7034a6e4cba73e0dc2baeb5..395c205ba08cac677353834723690f9366d19d9f 100644 GIT binary patch delta 22 dcmZ3QvNUCb0V5}mu&@b#sZILQ&6bRB3;2ju_& delta 22 dcmexd{keLBE+Z$Ggs?R4#e5&v&1Q^yZ2)8j2h{)o diff --git a/screenshots/pmos-light-1440x720.png b/screenshots/pmos-light-1440x720.png index 99ea6a234ea0c9415287db55afd0a6aa9948b160..fc53b5b076ffc84f56ddbff294af873d66765b1a 100644 GIT binary patch delta 22 dcmbPIJEeAmE+Z$8u&}XNYDHz%W;4b(TL4uR2I>F+ delta 22 dcmbPIJEeAmE+Z$Ggs`;W(L4dJ&1Q^owg6DE20Z`( diff --git a/screenshots/pmos-light-1920x1080.png b/screenshots/pmos-light-1920x1080.png index 48d38c68bba08a56aeadc84f9b37a6f4502cae36..5c692ef81c9239740010ae0af47dc65a687f2480 100644 GIT binary patch delta 24 gcmdnAlyTEi#tpiRoIJw9#@5m&S+8$4W2^}T0Axc4uK)l5 delta 24 gcmdnAlyTEi#tpiRoLmyZ(xQi$uLy58W2^}T0Ai#EU;qFB diff --git a/screenshots/pmos-light-480x800.png b/screenshots/pmos-light-480x800.png index 7179e10533e8d378107a0a0e594804c4fffbccfd..a73cfabf8e2593b19f80334b51010cc352db8ea7 100644 GIT binary patch delta 22 dcmeAR>kHf9&B)0kENm=!Zl#Oy<`BkRngCLD2PFUi delta 22 dcmeAR>kHf9&B)0mAuOdYD`N9ta|q)uO#n++27~|r diff --git a/screenshots/pmos-light-540x960.png b/screenshots/pmos-light-540x960.png index abecdb6b925727eb7a1669cd3a47303957b0489d..5851701d3ae9c12059b4ce7c513abc5337288d83 100644 GIT binary patch delta 22 ecmew#`#*MrE+Z$8u&}Y>v(1QZvp^Y69{Vn diff --git a/screenshots/pmos-light-800x480.png b/screenshots/pmos-light-800x480.png index 3f6be13adc2ca9feec2eb6eb56e5ee10e23b5ed7..3f21396a612524453d857fa9084a360d0b392fc8 100644 GIT binary patch delta 22 dcmdlMyDfHuE+Z$8u&}Z0$s-L~o6Q&-bOBj-2VMXG delta 22 dcmdlMyDfHuE+Z$Ggs_y!^un(^o6Q&-bOBeD2QdHu diff --git a/screenshots/pmos-light-960x540.png b/screenshots/pmos-light-960x540.png index e32aac571a0061eb5d3235280a0acd0d16f3fcb7..20de34ae30e1c29d989b668798b109aa2a4a36ac 100644 GIT binary patch delta 22 dcmeyD{4aTfE+Z$8u&}XO#raIW&1Q@z3;<(W2h{)o delta 22 ecmeyD{4aTfE+Z$Ggs?Qj`g;aHHk&b?FaQ8&PzaF#