6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 00bc5c30

AuthorEdmir Suljic<esu@dwarf.dk>
Date2025-05-19 09:00:48 +0200
Fixed alignment and size bug on contact icons in booking details page

Changed files

comwell_key_app/assets/icons/ic_bed.svg            |  4 +-
 comwell_key_app/assets/icons/ic_bed_old.svg        |  3 ++
 comwell_key_app/assets/icons/ic_telephone.svg      |  4 +-
 comwell_key_app/assets/icons/ic_telephone_old.svg  |  3 ++
 .../components/practical_information_button.dart   | 53 ++++++++++++----------
 5 files changed, 40 insertions(+), 27 deletions(-)

Diff

diff --git a/comwell_key_app/assets/icons/ic_bed.svg b/comwell_key_app/assets/icons/ic_bed.svg
index 340d8d62..83b26a5f 100644
--- a/comwell_key_app/assets/icons/ic_bed.svg
+++ b/comwell_key_app/assets/icons/ic_bed.svg
@@ -1,3 +1,3 @@
-<svg width="22" height="17" viewBox="0 0 22 17" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.25 10H10.75V9.5V5.00057C10.7503 4.7353 10.8558 4.48098 11.0434 4.2934C11.2309 4.10586 11.4852 4.00036 11.7504 4C11.7504 4 11.7505 4 11.7506 4H17.7494C17.7495 4 17.7495 4 17.7496 4C18.6113 4.00107 19.4375 4.34386 20.0468 4.9532C20.6562 5.56258 20.999 6.38879 21 7.25059V16.5H20.5V11V10.5H20H2H1.5V11V16.5H1V0.5H1.5V9.5V10H2H10.25ZM20 10H20.5V9.5V7.25V7.24945C20.4992 6.5205 20.2093 5.82163 19.6938 5.30618C19.1784 4.79073 18.4795 4.5008 17.7505 4.5H17.75H11.75H11.25V5V9.5V10H11.75H20ZM6.125 3.75L6.12443 3.75C5.69376 3.75049 5.28086 3.92179 4.97632 4.22632C4.67179 4.53086 4.50049 4.94376 4.5 5.37443V5.375C4.5 5.69639 4.5953 6.01057 4.77386 6.2778C4.95242 6.54503 5.20621 6.75331 5.50314 6.8763C5.80007 6.9993 6.1268 7.03148 6.44202 6.96878C6.75724 6.90608 7.04679 6.75131 7.27405 6.52405C7.50131 6.29679 7.65608 6.00724 7.71878 5.69202C7.78148 5.3768 7.7493 5.05007 7.6263 4.75314C7.50331 4.45621 7.29503 4.20242 7.0278 4.02386C6.76057 3.84531 6.44639 3.75 6.125 3.75ZM4.94441 3.60813C5.29387 3.37463 5.70471 3.25 6.125 3.25C6.68858 3.25 7.22909 3.47388 7.6276 3.8724C8.02612 4.27091 8.25 4.81142 8.25 5.375C8.25 5.79529 8.12537 6.20613 7.89187 6.55559C7.65837 6.90504 7.3265 7.17741 6.9382 7.33824C6.54991 7.49908 6.12264 7.54116 5.71043 7.45917C5.29822 7.37718 4.91959 7.17479 4.6224 6.8776C4.32521 6.58042 4.12283 6.20178 4.04083 5.78957C3.95884 5.37736 4.00092 4.95009 4.16176 4.5618C4.32259 4.17351 4.59496 3.84163 4.94441 3.60813Z" fill="black" stroke="black"/>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.5 4.5V14H11.75V9.00098C11.7503 8.7357 11.8554 8.48055 12.043 8.29297C12.207 8.12892 12.4225 8.02791 12.6514 8.00488L12.751 8H18.749L18.9102 8.00391C19.7134 8.04455 20.4755 8.38173 21.0469 8.95312C21.6183 9.52452 21.9555 10.2866 21.9961 11.0898L22 11.251V20.5H21.5V14.5H2.5V20.5H2V4.5H2.5ZM7.125 7.25C7.68859 7.25 8.22942 7.47356 8.62793 7.87207C9.02644 8.27058 9.25 8.81141 9.25 9.375C9.25 9.79529 9.1251 10.2062 8.8916 10.5557C8.65818 10.9049 8.32655 11.1771 7.93848 11.3379C7.59861 11.4787 7.22858 11.5291 6.86523 11.4844L6.70996 11.459C6.29794 11.3769 5.91914 11.175 5.62207 10.8779C5.325 10.5809 5.12307 10.2021 5.04102 9.79004C4.96925 9.42927 4.99267 9.0566 5.10742 8.70898L5.16211 8.56152C5.30289 8.22183 5.52894 7.92539 5.81738 7.7002L5.94434 7.6084C6.29379 7.3749 6.70471 7.25 7.125 7.25ZM7.12402 7.75C6.69349 7.7506 6.281 7.92213 5.97656 8.22656C5.7101 8.49302 5.5451 8.84217 5.50781 9.21387L5.5 9.37402V9.375C5.5 9.69619 5.5951 10.0102 5.77344 10.2773C5.95194 10.5445 6.20613 10.753 6.50293 10.876C6.76269 10.9836 7.04552 11.0224 7.32324 10.9883L7.44238 10.9688C7.75747 10.906 8.04724 10.7516 8.27441 10.5244C8.50159 10.2972 8.656 10.0075 8.71875 9.69238C8.78145 9.37716 8.74897 9.04986 8.62598 8.75293C8.50297 8.45613 8.29448 8.20194 8.02734 8.02344C7.76023 7.8451 7.44619 7.75 7.125 7.75H7.12402ZM21.5 11.249C21.4991 10.5202 21.2087 9.82199 20.6934 9.30664C20.2424 8.85568 19.6515 8.5768 19.0225 8.51367L18.751 8.5H12.25V14H21.5V11.249Z" fill="black" stroke="black"/>
</svg>
diff --git a/comwell_key_app/assets/icons/ic_bed_old.svg b/comwell_key_app/assets/icons/ic_bed_old.svg
new file mode 100644
index 00000000..340d8d62
--- /dev/null
+++ b/comwell_key_app/assets/icons/ic_bed_old.svg
@@ -0,0 +1,3 @@
+<svg width="22" height="17" viewBox="0 0 22 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.25 10H10.75V9.5V5.00057C10.7503 4.7353 10.8558 4.48098 11.0434 4.2934C11.2309 4.10586 11.4852 4.00036 11.7504 4C11.7504 4 11.7505 4 11.7506 4H17.7494C17.7495 4 17.7495 4 17.7496 4C18.6113 4.00107 19.4375 4.34386 20.0468 4.9532C20.6562 5.56258 20.999 6.38879 21 7.25059V16.5H20.5V11V10.5H20H2H1.5V11V16.5H1V0.5H1.5V9.5V10H2H10.25ZM20 10H20.5V9.5V7.25V7.24945C20.4992 6.5205 20.2093 5.82163 19.6938 5.30618C19.1784 4.79073 18.4795 4.5008 17.7505 4.5H17.75H11.75H11.25V5V9.5V10H11.75H20ZM6.125 3.75L6.12443 3.75C5.69376 3.75049 5.28086 3.92179 4.97632 4.22632C4.67179 4.53086 4.50049 4.94376 4.5 5.37443V5.375C4.5 5.69639 4.5953 6.01057 4.77386 6.2778C4.95242 6.54503 5.20621 6.75331 5.50314 6.8763C5.80007 6.9993 6.1268 7.03148 6.44202 6.96878C6.75724 6.90608 7.04679 6.75131 7.27405 6.52405C7.50131 6.29679 7.65608 6.00724 7.71878 5.69202C7.78148 5.3768 7.7493 5.05007 7.6263 4.75314C7.50331 4.45621 7.29503 4.20242 7.0278 4.02386C6.76057 3.84531 6.44639 3.75 6.125 3.75ZM4.94441 3.60813C5.29387 3.37463 5.70471 3.25 6.125 3.25C6.68858 3.25 7.22909 3.47388 7.6276 3.8724C8.02612 4.27091 8.25 4.81142 8.25 5.375C8.25 5.79529 8.12537 6.20613 7.89187 6.55559C7.65837 6.90504 7.3265 7.17741 6.9382 7.33824C6.54991 7.49908 6.12264 7.54116 5.71043 7.45917C5.29822 7.37718 4.91959 7.17479 4.6224 6.8776C4.32521 6.58042 4.12283 6.20178 4.04083 5.78957C3.95884 5.37736 4.00092 4.95009 4.16176 4.5618C4.32259 4.17351 4.59496 3.84163 4.94441 3.60813Z" fill="black" stroke="black"/>
+</svg>
diff --git a/comwell_key_app/assets/icons/ic_telephone.svg b/comwell_key_app/assets/icons/ic_telephone.svg
index 80da7e33..a44db2ae 100644
--- a/comwell_key_app/assets/icons/ic_telephone.svg
+++ b/comwell_key_app/assets/icons/ic_telephone.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path d="M2.31933 0.25H6.45183M2.31933 0.25C2.0242 0.272741 1.73646 0.353493 1.47259 0.48763C1.20872 0.621766 0.973912 0.80665 0.781619 1.03169C0.589326 1.25673 0.443327 1.5175 0.351987 1.79906C0.260648 2.08062 0.225763 2.37744 0.249331 2.6725L6.45183 0.25M2.31933 0.25V0.750001H2.33977M2.31933 0.25L2.35774 0.748523C2.35175 0.748985 2.34576 0.749477 2.33977 0.750001M6.45183 0.25C6.75225 0.24971 7.04583 0.339633 7.29456 0.508122C7.54328 0.676611 7.73568 0.915903 7.84683 1.195L8.98683 4L6.45183 0.25ZM2.33977 0.750001L6.45183 0.750001L6.45232 0.75C6.65259 0.749807 6.84832 0.809755 7.01413 0.922081C7.17995 1.03441 7.30821 1.19394 7.38232 1.38L7.3823 1.38001L7.38363 1.38326L8.523 4.18672C8.5231 4.18695 8.52319 4.18717 8.52328 4.1874C8.59622 4.36899 8.61429 4.568 8.57523 4.75977C8.53611 4.95177 8.44145 5.12806 8.303 5.26672L8.30163 5.2681L6.70413 6.8806L6.52206 7.06438L6.5669 7.31916C6.83419 8.83811 7.56161 10.2383 8.65073 11.3303C9.73986 12.4223 11.1381 13.1534 12.6564 13.4247L12.9119 13.4704L13.0962 13.2877L14.7219 11.677C14.8625 11.5408 15.0398 11.4489 15.2321 11.4126C15.4251 11.3761 15.6245 11.3973 15.8055 11.4734L15.8055 11.4735L15.8134 11.4767L18.6373 12.6077C18.8193 12.6843 18.9745 12.8131 19.0835 12.9778C19.193 13.1434 19.2507 13.3379 19.2493 13.5365V13.54V17.5C19.2493 17.9641 19.065 18.4092 18.7368 18.7374C18.4086 19.0656 17.9635 19.25 17.4993 19.25H17.3863C10.1914 18.8323 6.12983 15.6026 3.81272 12.0438C1.47659 8.45566 0.891239 4.49443 0.747853 2.63408L0.747854 2.63408L0.747744 2.63269C0.729413 2.40319 0.756545 2.17234 0.827587 1.95335C0.898629 1.73435 1.01218 1.53153 1.16175 1.3565C1.31131 1.18147 1.49394 1.03767 1.69917 0.933345C1.89904 0.831741 2.11652 0.769518 2.33977 0.750001ZM1.24933 2.56V2.5794L17.4543 18.25L17.4235 18.749C17.4239 18.7491 17.4243 18.7491 17.4247 18.7491C17.5885 18.7591 17.7527 18.7367 17.9079 18.6832C18.0634 18.6296 18.2069 18.5458 18.33 18.4367L17.9982 18.0626L18.33 18.4367C18.4531 18.3275 18.5534 18.1951 18.6252 18.0471L18.1754 17.8288L18.6252 18.0471C18.697 17.8991 18.7389 17.7383 18.7485 17.574L18.7493 17.5595V17.545V13.54V13.2016L18.4352 13.0758L15.6077 11.9433L15.3027 11.8212L15.0695 12.0527L13.0898 14.0187L12.9715 14.0039C9.89664 13.6186 8.16486 11.9006 7.1871 10.258C6.69536 9.43192 6.39582 8.62559 6.21956 8.02132C6.13162 7.71981 6.07494 7.47059 6.04057 7.29708C6.02338 7.21032 6.01188 7.14304 6.00487 7.0982C6.00246 7.08273 6.00064 7.07031 5.99933 7.06098V7.05887L5.99547 7.02798L5.9806 6.90902L7.93974 4.92919L8.16986 4.69664L8.04891 4.39266L6.92391 1.56516L6.79852 1.25H6.45933H2.49933C2.16781 1.25 1.84987 1.3817 1.61545 1.61612C1.38103 1.85054 1.24933 2.16848 1.24933 2.5V2.56ZM5.99641 7.03789C5.99646 7.03812 5.99675 7.04046 5.99713 7.04438C5.99654 7.03962 5.99635 7.03765 5.99641 7.03789Z" fill="black" stroke="black"/>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.45215 2.75C8.6024 2.74985 8.75035 2.78338 8.88477 2.84766L9.01367 2.92188C9.13805 3.00613 9.24129 3.11744 9.31641 3.24609L9.38184 3.37988L9.38379 3.38281L10.5234 6.18848V6.1875C10.5781 6.32374 10.6018 6.46981 10.5938 6.61523L10.5752 6.75977C10.5458 6.90383 10.4854 7.03914 10.3984 7.15625L10.3027 7.2666L10.3018 7.26855L8.7041 8.88086L8.52246 9.06445L8.56738 9.31934C8.81802 10.7434 9.4728 12.0629 10.4512 13.1221L10.6504 13.3301C11.7395 14.4221 13.138 15.1535 14.6562 15.4248L14.9121 15.4707L15.0967 15.2881L16.7197 13.6777L16.7207 13.6787C16.8263 13.576 16.9527 13.498 17.0908 13.4502L17.2324 13.4121C17.3771 13.3848 17.5255 13.3904 17.667 13.4268L17.8057 13.4736L17.8135 13.4766L20.6406 14.6094C20.7755 14.6667 20.8959 14.7523 20.9932 14.8604L21.083 14.9775C21.1651 15.1017 21.2185 15.2425 21.2393 15.3887L21.249 15.5361V19.5L21.2412 19.6729C21.2015 20.0735 21.0235 20.4501 20.7363 20.7373C20.4082 21.0654 19.9631 21.25 19.499 21.25H19.3867C12.1916 20.8324 8.12966 17.6029 5.8125 14.0439C3.62235 10.6801 2.97128 6.98803 2.78027 5.00684L2.74805 4.63379V4.63281L2.74219 4.46094C2.74432 4.34599 2.75765 4.23145 2.78223 4.11914L2.82715 3.95312C2.88041 3.78896 2.95834 3.63426 3.05664 3.49316L3.16211 3.35645C3.27431 3.22519 3.40483 3.1112 3.5498 3.01855L3.69922 2.93359C3.89998 2.83154 4.11848 2.76922 4.34277 2.75H8.45215ZM20.749 15.2012L20.4355 15.0762L17.6074 13.9434L17.3027 13.8213L17.0693 14.0527L15.0898 16.0186L14.9717 16.0039L14.6875 15.9639C11.7893 15.5114 10.1348 13.8491 9.1875 12.2578C8.69582 11.4318 8.39599 10.6257 8.21973 10.0215C8.13178 9.71997 8.07539 9.47038 8.04102 9.29688C8.02389 9.21044 8.01189 9.14345 8.00488 9.09863L7.99805 9.0498L7.99512 9.02832L7.97949 8.90918L9.93945 6.92871L10.1699 6.69629L10.0488 6.39258L8.92383 3.56543L8.79883 3.25H4.49902C4.16761 3.25008 3.84958 3.38186 3.61523 3.61621C3.38091 3.85062 3.24902 4.16855 3.24902 4.5V4.5791L3.25098 4.59863C3.4266 6.85888 4.07837 10.6943 6.38867 14.0713C8.71638 17.4735 12.6981 20.3638 19.4238 20.748V20.749C19.547 20.7566 19.6704 20.7462 19.79 20.7178L19.9082 20.6836C20.0249 20.6434 20.1348 20.5859 20.2344 20.5137L20.3301 20.4365C20.4223 20.3547 20.5021 20.26 20.5664 20.1553L20.625 20.0469C20.6968 19.8989 20.7385 19.7384 20.748 19.5742L20.749 19.5596V15.2012Z" fill="black" stroke="black"/>
</svg>
diff --git a/comwell_key_app/assets/icons/ic_telephone_old.svg b/comwell_key_app/assets/icons/ic_telephone_old.svg
new file mode 100644
index 00000000..80da7e33
--- /dev/null
+++ b/comwell_key_app/assets/icons/ic_telephone_old.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <path d="M2.31933 0.25H6.45183M2.31933 0.25C2.0242 0.272741 1.73646 0.353493 1.47259 0.48763C1.20872 0.621766 0.973912 0.80665 0.781619 1.03169C0.589326 1.25673 0.443327 1.5175 0.351987 1.79906C0.260648 2.08062 0.225763 2.37744 0.249331 2.6725L6.45183 0.25M2.31933 0.25V0.750001H2.33977M2.31933 0.25L2.35774 0.748523C2.35175 0.748985 2.34576 0.749477 2.33977 0.750001M6.45183 0.25C6.75225 0.24971 7.04583 0.339633 7.29456 0.508122C7.54328 0.676611 7.73568 0.915903 7.84683 1.195L8.98683 4L6.45183 0.25ZM2.33977 0.750001L6.45183 0.750001L6.45232 0.75C6.65259 0.749807 6.84832 0.809755 7.01413 0.922081C7.17995 1.03441 7.30821 1.19394 7.38232 1.38L7.3823 1.38001L7.38363 1.38326L8.523 4.18672C8.5231 4.18695 8.52319 4.18717 8.52328 4.1874C8.59622 4.36899 8.61429 4.568 8.57523 4.75977C8.53611 4.95177 8.44145 5.12806 8.303 5.26672L8.30163 5.2681L6.70413 6.8806L6.52206 7.06438L6.5669 7.31916C6.83419 8.83811 7.56161 10.2383 8.65073 11.3303C9.73986 12.4223 11.1381 13.1534 12.6564 13.4247L12.9119 13.4704L13.0962 13.2877L14.7219 11.677C14.8625 11.5408 15.0398 11.4489 15.2321 11.4126C15.4251 11.3761 15.6245 11.3973 15.8055 11.4734L15.8055 11.4735L15.8134 11.4767L18.6373 12.6077C18.8193 12.6843 18.9745 12.8131 19.0835 12.9778C19.193 13.1434 19.2507 13.3379 19.2493 13.5365V13.54V17.5C19.2493 17.9641 19.065 18.4092 18.7368 18.7374C18.4086 19.0656 17.9635 19.25 17.4993 19.25H17.3863C10.1914 18.8323 6.12983 15.6026 3.81272 12.0438C1.47659 8.45566 0.891239 4.49443 0.747853 2.63408L0.747854 2.63408L0.747744 2.63269C0.729413 2.40319 0.756545 2.17234 0.827587 1.95335C0.898629 1.73435 1.01218 1.53153 1.16175 1.3565C1.31131 1.18147 1.49394 1.03767 1.69917 0.933345C1.89904 0.831741 2.11652 0.769518 2.33977 0.750001ZM1.24933 2.56V2.5794L17.4543 18.25L17.4235 18.749C17.4239 18.7491 17.4243 18.7491 17.4247 18.7491C17.5885 18.7591 17.7527 18.7367 17.9079 18.6832C18.0634 18.6296 18.2069 18.5458 18.33 18.4367L17.9982 18.0626L18.33 18.4367C18.4531 18.3275 18.5534 18.1951 18.6252 18.0471L18.1754 17.8288L18.6252 18.0471C18.697 17.8991 18.7389 17.7383 18.7485 17.574L18.7493 17.5595V17.545V13.54V13.2016L18.4352 13.0758L15.6077 11.9433L15.3027 11.8212L15.0695 12.0527L13.0898 14.0187L12.9715 14.0039C9.89664 13.6186 8.16486 11.9006 7.1871 10.258C6.69536 9.43192 6.39582 8.62559 6.21956 8.02132C6.13162 7.71981 6.07494 7.47059 6.04057 7.29708C6.02338 7.21032 6.01188 7.14304 6.00487 7.0982C6.00246 7.08273 6.00064 7.07031 5.99933 7.06098V7.05887L5.99547 7.02798L5.9806 6.90902L7.93974 4.92919L8.16986 4.69664L8.04891 4.39266L6.92391 1.56516L6.79852 1.25H6.45933H2.49933C2.16781 1.25 1.84987 1.3817 1.61545 1.61612C1.38103 1.85054 1.24933 2.16848 1.24933 2.5V2.56ZM5.99641 7.03789C5.99646 7.03812 5.99675 7.04046 5.99713 7.04438C5.99654 7.03962 5.99635 7.03765 5.99641 7.03789Z" fill="black" stroke="black"/>
+</svg>
diff --git a/comwell_key_app/lib/booking_details/components/practical_information_button.dart b/comwell_key_app/lib/booking_details/components/practical_information_button.dart
index c6ce2c13..84471a75 100644
--- a/comwell_key_app/lib/booking_details/components/practical_information_button.dart
+++ b/comwell_key_app/lib/booking_details/components/practical_information_button.dart
@@ -27,33 +27,40 @@ class PracticalInformationButton extends StatelessWidget {
color: sandColor[10],
),
child: Padding(
- padding: const EdgeInsets.all(16),
+ padding: const EdgeInsets.all(12),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
- Expanded(
- child: Container(
- decoration: BoxDecoration(
- shape: BoxShape.circle,
- color: sandColor[40],
- ),
- child: Padding(
- padding: const EdgeInsets.all(8.0),
- child: SvgPicture.asset(iconPath,
- colorFilter: const ColorFilter.mode(
- Colors.black,
- BlendMode.dst,
- )),
- )),
+ Container(
+ decoration: BoxDecoration(
+ shape: BoxShape.circle,
+ color: sandColor[40],
+ ),
+ child: Padding(
+ padding: const EdgeInsets.all(12.0),
+ child: SvgPicture.asset(iconPath,
+ width: 24,
+ height: 24,
+ colorFilter: const ColorFilter.mode(
+ Colors.black,
+ BlendMode.dst,
+ )),
+ ),
),
- const Spacer(),
- Text(title),
- Text(
- subtitle,
- style: Theme.of(context)
- .textTheme
- .bodySmall
- ?.copyWith(color: Colors.grey),
+ const SizedBox(height: 12),
+ Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(title),
+ Text(
+ subtitle,
+ style: Theme.of(context)
+ .textTheme
+ .bodySmall
+ ?.copyWith(color: Colors.grey),
+ ),
+ ],
),
],
),