Skip to content

Commit

Permalink
Develop (#428)
Browse files Browse the repository at this point in the history
* SelfExamination Skin done.

Adding new Self Examination Skin.
Adding new content pauldrons.
Adding new texts.

* Changing Flutter version of backend-tests.yaml etc.

* Ordering selfExaminations.

* BE Integration test fixed.

Adding test for self examination skin.
Fixing lint.
Fixing FE self examination category.

* Fixing lint.

* Fixing github test

* Changing layout of settings, adding setting account.

User form edited,
ExpanseTile for user data and notifications added.
Donate buton working.
TODO:
 1) Create notification screen
 2) Create notification shedule tasks
 3) Create notification switch in notification settings.

* Fix merge

* Delete ._Runner.xcodeproj

* Adding new screen donate page

TODO: Change placeholder image.
Edited notification switch for turning on/off donate notification.
Donate notification is turned for device not for user.

* Fixing Tests.

* Fixing lints. Adding functionality for opening settings.

* Donate Ilustration image is added to donate page.

Creating donate utils to handle function for showing donatepage.

* fix analyzer.

* Fixing PR.

* Fixing analyzer.

* Renaming file.

* fix/badge_brzy_vyprsi_rozbita_obrazovka (#364)
oprava zobrazovani 2 textu pred vyprsenim badge, oprava zobrazovani stavu vyprseni a ziskani u badge.
(https://github.com/Loono-cz/loono-tasks/issues/6)

* Adding new form for custom examinations.

Adding new form for custom examinations.
Adding new screens.
Adding new widget for customTextInput.
TODO: FE with BE.
TODO: controll inputs.

* Adding error to custom_text_field.

* Addint error messaage into others text input fields

* Adding Translate.

* Adding prepossition Dativ translations.

Adding preposition Dativ translations.
Adding input validation.
Removing TOKS and VENERAL_SISEASES

* Adding function for transform year to month

* Editing examination detail for once examinaiton.

* Edditing examination detail for periodical Custom Examination.

* Fix: Logging with google account.

* fixing stuff for creating custom examinations.

* Přidaní překladů nových prohlídek - nomativ, genitiv, dativ

* Some fixes.

TODO: Control task and figma.

* Fixing bugs.

* Fixing date validation.

* fixing but with date interval instead of month was year.

* Fixing nonperiodic exam has order button not add to calendar.

* Fixing buttons not showing.

* Changing card layouts

TODO: Sorting.

* Fixing lint

* Fixing lint

* feat: examination action menu

* Fixing tests.

* Fixing test.

* feat: examination edit flow wip

* FIX: Show month right now.

FIX: creating exams ?
FIX: Show month right now.

TODO: Razeni vlastnich prohlidek...

* Fixing desc. of award in custom exam detail.

* lint and format fix.

* analyze test fix.

* Fixing lateinit examinaitonActionTypeUnion.

* Fixing creating examination.

* Fix: Disposable Exam now showing add to calendar button.

* Adding modal for disposable examination Delete Exam.

TODO: Connect with BE api.

* Adding streambuilder of calendar.

* Adding flow for editing frequency of exam and last visit date.

TODO: Je to spravne ?

* feat: examination edit flow UI wip

* Fixing when to show last examination picker.

* Fixing some task in comment on Github.

* Fix note is enabled when nevim is checked

Poznámka k návšteve - pri zaškrtnutí checkboxu "Zatím nevím" by malo byť pole pre poznámku disabled. V pripade, že som najprv vyplnila dátum a následne zaškrtla "Zatím nevím" pole pre poznámku ostalo aktívne.

* Fixing Functional stuff.

* fixing selectbox visual

Select boxy - upravit ikonu - namiesto šipky by mal byť chevron + ikona select boxu, ktorý bol rozkliknutý ako posledný má inú farbu/je zvýraznená - mala by mať default farbu ako ostatné neaktívne select boxy.

* Adding Divider.

* Fixing visual task from Github.

* Fixing functional stuff.

 Na kartách povinných prohlídek je uvedený nesprávny typ vyšetření - malo by tam byť "Preventivní prohlídka".

* Adding placeholder into sheet overlay exam.

Fixing bugs from comment section.

* Adding text for exams count.

* Geting new loono api

* Edit term of regularly examination.

* Edit date of exam is added to default and custom exams.

* TODO Unset comment after BE delete exam working.

* merge

* Fix intervals in default examinatoins.

* Done

* Removing old code.

* Detail done.

* fix merge.

* Examination sorting on main screen is done.

* Padding of text in specialist listview builder.

* Refactor function in examinations service.

* add interval check condition

* Fix for choosing date by interval.

* fix: no internet connection flushBar fix by [email protected] (#374)

* fix: no internet connection flushBar fix by [email protected]

* feat: Connectivity result condition opt

* Fixing lint

* fix analyze.

* fix merge.

* Fixing analyze

Co-authored-by: Petr Noga <[email protected]>

* Fixing new date in future.

* Fixing showing bad date in detail and examination card.

* Fix/nelze potvrdit absolovane samovysetreni#361 (#376)

* fix/nelze_potvrdit_absolovane_samovysetreni (#361)
tlacitko "Vysetril jsem se" je kliknutelne

* Fixing format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/feedback_button_zakryva_jmeno_na_homescreen (#359) (#377)

posunuti jmena a bodu dolu, aby se nekrylo s tlacitkem

Co-authored-by: Brambora0 <[email protected]>

* Fixing bugs.

zmizelo někam "mám/nemám lékaře" v defaultních prohlídkách - při rozkliku nesplněných prohlídek, když se chci objednat, správně by se mě aplikace měla zeptat, zda mám či nemám lékaře - pokud nemám, měla by mě odkázat na Najít lékaře s vyhledáním konkrétní specializace

při úpravě naplánovaného termínu ( i když je pozdější než ten původně plánovaný) mi píše aplikace "ještě není čas se objednat"

nedá se přidat ani upravit poznámka
nelze upravovat termín první prohlídky

na main screen porhlídky mají napsané, že jsou Preventivní, v detailu ale pak Vyšetření, což je trochu matoucí - neměly by to být i v detailu Preventivní prohlídky?

* Examination type duplicity remove (#380)

* Fix.

- nefunguje přidání druhé vlastní prohlídky u Zubaře - píše, že se "něco nepovedlo".
- v rozkliku detailu prohlídky se nezobrazuje uvedená poznámka:Při přidání poznámky k vlastní prohlídce se objeví chybová hláška, že není připojení k internetu (viz klip)/
- pokud zadam datum na formulari a pak zaskrtnu nevim, datum se nesmaze, ani nelze manuane smazat
- v typu vyšetření je zvláštní čára dole viz screenshot

* Merge fix.

* removing second break; merge fix.

* fix: unused variable

* Done bug fixing. (#385)

* Refactor loono strings.

* Fix: Vlastní prohlídky - Přidat prohlídku - FE#353

* Feat/souhlas gdpr and newsletters#379 (#383)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* #379 newsletter option is saving in account

* Fixing format and analyze tests.

* Fix formater

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/357 main screen (#384)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* #379 newsletter option is saving in account

* listener to true = now writen logic for disable add button works

* sort update for null values

* git tests fix

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Format.

* Fix/353 vlastni prohlidky pridat prohlidku (#389)

* Develop (#386)

* SelfExamination Skin done.

Adding new Self Examination Skin.
Adding new content pauldrons.
Adding new texts.

* Changing Flutter version of backend-tests.yaml etc.

* Ordering selfExaminations.

* BE Integration test fixed.

Adding test for self examination skin.
Fixing lint.
Fixing FE self examination category.

* Fixing lint.

* Fixing github test

* Changing layout of settings, adding setting account.

User form edited,
ExpanseTile for user data and notifications added.
Donate buton working.
TODO:
 1) Create notification screen
 2) Create notification shedule tasks
 3) Create notification switch in notification settings.

* Fix merge

* Delete ._Runner.xcodeproj

* Adding new screen donate page

TODO: Change placeholder image.
Edited notification switch for turning on/off donate notification.
Donate notification is turned for device not for user.

* Fixing Tests.

* Fixing lints. Adding functionality for opening settings.

* Donate Ilustration image is added to donate page.

Creating donate utils to handle function for showing donatepage.

* fix analyzer.

* Fixing PR.

* Fixing analyzer.

* Renaming file.

* fix/badge_brzy_vyprsi_rozbita_obrazovka (#364)
oprava zobrazovani 2 textu pred vyprsenim badge, oprava zobrazovani stavu vyprseni a ziskani u badge.
(https://github.com/Loono-cz/loono-tasks/issues/6)

* Adding new form for custom examinations.

Adding new form for custom examinations.
Adding new screens.
Adding new widget for customTextInput.
TODO: FE with BE.
TODO: controll inputs.

* Adding error to custom_text_field.

* Addint error messaage into others text input fields

* Adding Translate.

* Adding prepossition Dativ translations.

Adding preposition Dativ translations.
Adding input validation.
Removing TOKS and VENERAL_SISEASES

* Adding function for transform year to month

* Editing examination detail for once examinaiton.

* Edditing examination detail for periodical Custom Examination.

* Fix: Logging with google account.

* fixing stuff for creating custom examinations.

* Přidaní překladů nových prohlídek - nomativ, genitiv, dativ

* Some fixes.

TODO: Control task and figma.

* Fixing bugs.

* Fixing date validation.

* fixing but with date interval instead of month was year.

* Fixing nonperiodic exam has order button not add to calendar.

* Fixing buttons not showing.

* Changing card layouts

TODO: Sorting.

* Fixing lint

* Fixing lint

* feat: examination action menu

* Fixing tests.

* Fixing test.

* feat: examination edit flow wip

* FIX: Show month right now.

FIX: creating exams ?
FIX: Show month right now.

TODO: Razeni vlastnich prohlidek...

* Fixing desc. of award in custom exam detail.

* lint and format fix.

* analyze test fix.

* Fixing lateinit examinaitonActionTypeUnion.

* Fixing creating examination.

* Fix: Disposable Exam now showing add to calendar button.

* Adding modal for disposable examination Delete Exam.

TODO: Connect with BE api.

* Adding streambuilder of calendar.

* Adding flow for editing frequency of exam and last visit date.

TODO: Je to spravne ?

* feat: examination edit flow UI wip

* Fixing when to show last examination picker.

* Fixing some task in comment on Github.

* Fix note is enabled when nevim is checked

Poznámka k návšteve - pri zaškrtnutí checkboxu "Zatím nevím" by malo byť pole pre poznámku disabled. V pripade, že som najprv vyplnila dátum a následne zaškrtla "Zatím nevím" pole pre poznámku ostalo aktívne.

* Fixing Functional stuff.

* fixing selectbox visual

Select boxy - upravit ikonu - namiesto šipky by mal byť chevron + ikona select boxu, ktorý bol rozkliknutý ako posledný má inú farbu/je zvýraznená - mala by mať default farbu ako ostatné neaktívne select boxy.

* Adding Divider.

* Fixing visual task from Github.

* Fixing functional stuff.

 Na kartách povinných prohlídek je uvedený nesprávny typ vyšetření - malo by tam byť "Preventivní prohlídka".

* Adding placeholder into sheet overlay exam.

Fixing bugs from comment section.

* Adding text for exams count.

* Geting new loono api

* Edit term of regularly examination.

* Edit date of exam is added to default and custom exams.

* TODO Unset comment after BE delete exam working.

* merge

* Fix intervals in default examinatoins.

* Done

* Removing old code.

* Detail done.

* fix merge.

* Examination sorting on main screen is done.

* Padding of text in specialist listview builder.

* Refactor function in examinations service.

* add interval check condition

* Fix for choosing date by interval.

* fix: no internet connection flushBar fix by [email protected] (#374)

* fix: no internet connection flushBar fix by [email protected]

* feat: Connectivity result condition opt

* Fixing lint

* fix analyze.

* fix merge.

* Fixing analyze

Co-authored-by: Petr Noga <[email protected]>

* Fixing new date in future.

* Fixing showing bad date in detail and examination card.

* Fix/nelze potvrdit absolovane samovysetreni#361 (#376)

* fix/nelze_potvrdit_absolovane_samovysetreni (#361)
tlacitko "Vysetril jsem se" je kliknutelne

* Fixing format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/feedback_button_zakryva_jmeno_na_homescreen (#359) (#377)

posunuti jmena a bodu dolu, aby se nekrylo s tlacitkem

Co-authored-by: Brambora0 <[email protected]>

* Fixing bugs.

zmizelo někam "mám/nemám lékaře" v defaultních prohlídkách - při rozkliku nesplněných prohlídek, když se chci objednat, správně by se mě aplikace měla zeptat, zda mám či nemám lékaře - pokud nemám, měla by mě odkázat na Najít lékaře s vyhledáním konkrétní specializace

při úpravě naplánovaného termínu ( i když je pozdější než ten původně plánovaný) mi píše aplikace "ještě není čas se objednat"

nedá se přidat ani upravit poznámka
nelze upravovat termín první prohlídky

na main screen porhlídky mají napsané, že jsou Preventivní, v detailu ale pak Vyšetření, což je trochu matoucí - neměly by to být i v detailu Preventivní prohlídky?

* Examination type duplicity remove (#380)

* Fix.

- nefunguje přidání druhé vlastní prohlídky u Zubaře - píše, že se "něco nepovedlo".
- v rozkliku detailu prohlídky se nezobrazuje uvedená poznámka:Při přidání poznámky k vlastní prohlídce se objeví chybová hláška, že není připojení k internetu (viz klip)/
- pokud zadam datum na formulari a pak zaskrtnu nevim, datum se nesmaze, ani nelze manuane smazat
- v typu vyšetření je zvláštní čára dole viz screenshot

* Merge fix.

* removing second break; merge fix.

* fix: unused variable

* Done bug fixing. (#385)

* Refactor loono strings.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>

* Fix: Vlastní prohlídky - Přidat prohlídku - FE#353

* Format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>

* Fix for title of custom badges.

* Feat/356 update (#392)

* feat: post examination note update wip

* fix: date/time picker validation w/[email protected]

* fix: time validation fix

* feat: edit examination note final

* feat: edit exam note icon

* fix: format

* fix: datepicker validation fix

* Fix/#355 vlastni prohlidky upravit prohlidku (#393)

* Fix

Fix:
divna hlaska neni mozne zadat prohlidku
 v detailu prohlídky se ukládá jiné datum, než požadované (zadávám 8.12.2022 a aplikace si ukládá 7.12.2022) - prohlídka se následně ani neuloží (viz druhý klip)
nelze upravit termín první prohlídky, přijde hláška, že se "neco nepovedlo" a prohlídka se neuloží

* Fix Done.

* Feat/pridani loga cgi #372 (#390)

* feat/pridani_loga_cgi (#372)
přidáno logo na welcomescreen (first time use splashscreen ve figmě)
TODO: přidání na splashscreen

* feat/pridani_loga_cgi (#372)
přidáno logo na welcomescreen (first time use splashscreen ve figmě)
přidání loga na splashscreen
oprava testů

* fix: logos to assets

* fix: analyze, format

Co-authored-by: Jakub Smolík <[email protected]>

* Fixing update examinations.

* Edit for PR. (#395)

* Edit for PR.

* fix: problems

* fix merge.

Co-authored-by: Jakub Smolík <[email protected]>

* Update examination_detail.dart (#396)

* Update examination_detail.dart

* fix: format

Co-authored-by: Jakub Smolík <[email protected]>

* fix: delete examination; fix: flushbar memory leak (#397)

* fix: last doxtor visit datepicker title and validation (#400)

* Fix/souhlas gdpr and newsletters#379 (#401)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* feat/souhlas_GDPR_and_Newsletters (#379)
oprava překlepu v textaci
(https://github.com/Loono-cz/loono-tasks/issues/94)

* Oprava zobrazování success ikony (https://github.com/Loono-cz/loono-tasks/issues/23) (#387)

Co-authored-by: Jakub Smolík <[email protected]>

* Update notification_service.dart (#402)

* fix/pri_vyhledani_lekare_uvedena_spatna_specializace (#365) (#388)

* fix/pri_vyhledani_lekare_uvedena_spatna_specializace (#365)
opraveno po kliknutí na "Nemám lékaře" při objednávání se na prohlídku se otevře mapa s lékaři se specializací na prohlídku.
(https://github.com/Loono-cz/loono-tasks/issues/79)

* fix: typo

* fox: format

* fix: format

Co-authored-by: Jakub Smolík <[email protected]>

* Fix/#355 vlastni prohlidky upravit prohlidku (#399)

* Fix

Fix:
divna hlaska neni mozne zadat prohlidku
 v detailu prohlídky se ukládá jiné datum, než požadované (zadávám 8.12.2022 a aplikace si ukládá 7.12.2022) - prohlídka se následně ani neuloží (viz druhý klip)
nelze upravit termín první prohlídky, přijde hláška, že se "neco nepovedlo" a prohlídka se neuloží

* Fix Done.

* Keyboard handling.

Handling keyboard on examiantion detail, create new exam, custom_exam_form

* Adding controller into examiantion_detail.dart

* Edit Exam term. Fix faq and badges not showing.

* Adding categorizedExam into edit examination modal.

* removing print.

* fix bug.

nefunguje zmena intervalu u vlastnich prohlidek

* Fixing edit frequency of exam.

* Fix note.

* Fixing PR comments.

* fix: no connecttion flushbar fix (#403)

* Fixing routing, onboarding route. (#406)

* Fixing routing, onboarding route.

* Fix analyze.

* fix: donate notification state was not remembered after log out/delete acc (#405)

* Fix/najit lékare search by address does not search#368 (#375)

* fix/najit_lékare_search_by_address_does_not_search_when_cislo_popisne_filled_in (#368)
oprava vyhledávání pomocí čísla popisného
(https://github.com/Loono-cz/loono-tasks/issues/15)

* fix: analyze

Co-authored-by: Brambora0 <[email protected]>

* Fixing 354 time is in past missing validation. (#407)

* Fixing 354 time must be in past.

* TODO Unwrap

* dead cat fix (#414)

* Fix/hide donation ios (#413)

* Develop (#408)

* SelfExamination Skin done.

Adding new Self Examination Skin.
Adding new content pauldrons.
Adding new texts.

* Changing Flutter version of backend-tests.yaml etc.

* Ordering selfExaminations.

* BE Integration test fixed.

Adding test for self examination skin.
Fixing lint.
Fixing FE self examination category.

* Fixing lint.

* Fixing github test

* Changing layout of settings, adding setting account.

User form edited,
ExpanseTile for user data and notifications added.
Donate buton working.
TODO:
 1) Create notification screen
 2) Create notification shedule tasks
 3) Create notification switch in notification settings.

* Fix merge

* Delete ._Runner.xcodeproj

* Adding new screen donate page

TODO: Change placeholder image.
Edited notification switch for turning on/off donate notification.
Donate notification is turned for device not for user.

* Fixing Tests.

* Fixing lints. Adding functionality for opening settings.

* Donate Ilustration image is added to donate page.

Creating donate utils to handle function for showing donatepage.

* fix analyzer.

* Fixing PR.

* Fixing analyzer.

* Renaming file.

* fix/badge_brzy_vyprsi_rozbita_obrazovka (#364)
oprava zobrazovani 2 textu pred vyprsenim badge, oprava zobrazovani stavu vyprseni a ziskani u badge.
(https://github.com/Loono-cz/loono-tasks/issues/6)

* Adding new form for custom examinations.

Adding new form for custom examinations.
Adding new screens.
Adding new widget for customTextInput.
TODO: FE with BE.
TODO: controll inputs.

* Adding error to custom_text_field.

* Addint error messaage into others text input fields

* Adding Translate.

* Adding prepossition Dativ translations.

Adding preposition Dativ translations.
Adding input validation.
Removing TOKS and VENERAL_SISEASES

* Adding function for transform year to month

* Editing examination detail for once examinaiton.

* Edditing examination detail for periodical Custom Examination.

* Fix: Logging with google account.

* fixing stuff for creating custom examinations.

* Přidaní překladů nových prohlídek - nomativ, genitiv, dativ

* Some fixes.

TODO: Control task and figma.

* Fixing bugs.

* Fixing date validation.

* fixing but with date interval instead of month was year.

* Fixing nonperiodic exam has order button not add to calendar.

* Fixing buttons not showing.

* Changing card layouts

TODO: Sorting.

* Fixing lint

* Fixing lint

* feat: examination action menu

* Fixing tests.

* Fixing test.

* feat: examination edit flow wip

* FIX: Show month right now.

FIX: creating exams ?
FIX: Show month right now.

TODO: Razeni vlastnich prohlidek...

* Fixing desc. of award in custom exam detail.

* lint and format fix.

* analyze test fix.

* Fixing lateinit examinaitonActionTypeUnion.

* Fixing creating examination.

* Fix: Disposable Exam now showing add to calendar button.

* Adding modal for disposable examination Delete Exam.

TODO: Connect with BE api.

* Adding streambuilder of calendar.

* Adding flow for editing frequency of exam and last visit date.

TODO: Je to spravne ?

* feat: examination edit flow UI wip

* Fixing when to show last examination picker.

* Fixing some task in comment on Github.

* Fix note is enabled when nevim is checked

Poznámka k návšteve - pri zaškrtnutí checkboxu "Zatím nevím" by malo byť pole pre poznámku disabled. V pripade, že som najprv vyplnila dátum a následne zaškrtla "Zatím nevím" pole pre poznámku ostalo aktívne.

* Fixing Functional stuff.

* fixing selectbox visual

Select boxy - upravit ikonu - namiesto šipky by mal byť chevron + ikona select boxu, ktorý bol rozkliknutý ako posledný má inú farbu/je zvýraznená - mala by mať default farbu ako ostatné neaktívne select boxy.

* Adding Divider.

* Fixing visual task from Github.

* Fixing functional stuff.

 Na kartách povinných prohlídek je uvedený nesprávny typ vyšetření - malo by tam byť "Preventivní prohlídka".

* Adding placeholder into sheet overlay exam.

Fixing bugs from comment section.

* Adding text for exams count.

* Geting new loono api

* Edit term of regularly examination.

* Edit date of exam is added to default and custom exams.

* TODO Unset comment after BE delete exam working.

* merge

* Fix intervals in default examinatoins.

* Done

* Removing old code.

* Detail done.

* fix merge.

* Examination sorting on main screen is done.

* Padding of text in specialist listview builder.

* Refactor function in examinations service.

* add interval check condition

* Fix for choosing date by interval.

* fix: no internet connection flushBar fix by [email protected] (#374)

* fix: no internet connection flushBar fix by [email protected]

* feat: Connectivity result condition opt

* Fixing lint

* fix analyze.

* fix merge.

* Fixing analyze

Co-authored-by: Petr Noga <[email protected]>

* Fixing new date in future.

* Fixing showing bad date in detail and examination card.

* Fix/nelze potvrdit absolovane samovysetreni#361 (#376)

* fix/nelze_potvrdit_absolovane_samovysetreni (#361)
tlacitko "Vysetril jsem se" je kliknutelne

* Fixing format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/feedback_button_zakryva_jmeno_na_homescreen (#359) (#377)

posunuti jmena a bodu dolu, aby se nekrylo s tlacitkem

Co-authored-by: Brambora0 <[email protected]>

* Fixing bugs.

zmizelo někam "mám/nemám lékaře" v defaultních prohlídkách - při rozkliku nesplněných prohlídek, když se chci objednat, správně by se mě aplikace měla zeptat, zda mám či nemám lékaře - pokud nemám, měla by mě odkázat na Najít lékaře s vyhledáním konkrétní specializace

při úpravě naplánovaného termínu ( i když je pozdější než ten původně plánovaný) mi píše aplikace "ještě není čas se objednat"

nedá se přidat ani upravit poznámka
nelze upravovat termín první prohlídky

na main screen porhlídky mají napsané, že jsou Preventivní, v detailu ale pak Vyšetření, což je trochu matoucí - neměly by to být i v detailu Preventivní prohlídky?

* Examination type duplicity remove (#380)

* Fix.

- nefunguje přidání druhé vlastní prohlídky u Zubaře - píše, že se "něco nepovedlo".
- v rozkliku detailu prohlídky se nezobrazuje uvedená poznámka:Při přidání poznámky k vlastní prohlídce se objeví chybová hláška, že není připojení k internetu (viz klip)/
- pokud zadam datum na formulari a pak zaskrtnu nevim, datum se nesmaze, ani nelze manuane smazat
- v typu vyšetření je zvláštní čára dole viz screenshot

* Merge fix.

* removing second break; merge fix.

* fix: unused variable

* Done bug fixing. (#385)

* Refactor loono strings.

* Fix: Vlastní prohlídky - Přidat prohlídku - FE#353

* Feat/souhlas gdpr and newsletters#379 (#383)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* #379 newsletter option is saving in account

* Fixing format and analyze tests.

* Fix formater

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/357 main screen (#384)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* #379 newsletter option is saving in account

* listener to true = now writen logic for disable add button works

* sort update for null values

* git tests fix

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Format.

* Fix/353 vlastni prohlidky pridat prohlidku (#389)

* Develop (#386)

* SelfExamination Skin done.

Adding new Self Examination Skin.
Adding new content pauldrons.
Adding new texts.

* Changing Flutter version of backend-tests.yaml etc.

* Ordering selfExaminations.

* BE Integration test fixed.

Adding test for self examination skin.
Fixing lint.
Fixing FE self examination category.

* Fixing lint.

* Fixing github test

* Changing layout of settings, adding setting account.

User form edited,
ExpanseTile for user data and notifications added.
Donate buton working.
TODO:
 1) Create notification screen
 2) Create notification shedule tasks
 3) Create notification switch in notification settings.

* Fix merge

* Delete ._Runner.xcodeproj

* Adding new screen donate page

TODO: Change placeholder image.
Edited notification switch for turning on/off donate notification.
Donate notification is turned for device not for user.

* Fixing Tests.

* Fixing lints. Adding functionality for opening settings.

* Donate Ilustration image is added to donate page.

Creating donate utils to handle function for showing donatepage.

* fix analyzer.

* Fixing PR.

* Fixing analyzer.

* Renaming file.

* fix/badge_brzy_vyprsi_rozbita_obrazovka (#364)
oprava zobrazovani 2 textu pred vyprsenim badge, oprava zobrazovani stavu vyprseni a ziskani u badge.
(https://github.com/Loono-cz/loono-tasks/issues/6)

* Adding new form for custom examinations.

Adding new form for custom examinations.
Adding new screens.
Adding new widget for customTextInput.
TODO: FE with BE.
TODO: controll inputs.

* Adding error to custom_text_field.

* Addint error messaage into others text input fields

* Adding Translate.

* Adding prepossition Dativ translations.

Adding preposition Dativ translations.
Adding input validation.
Removing TOKS and VENERAL_SISEASES

* Adding function for transform year to month

* Editing examination detail for once examinaiton.

* Edditing examination detail for periodical Custom Examination.

* Fix: Logging with google account.

* fixing stuff for creating custom examinations.

* Přidaní překladů nových prohlídek - nomativ, genitiv, dativ

* Some fixes.

TODO: Control task and figma.

* Fixing bugs.

* Fixing date validation.

* fixing but with date interval instead of month was year.

* Fixing nonperiodic exam has order button not add to calendar.

* Fixing buttons not showing.

* Changing card layouts

TODO: Sorting.

* Fixing lint

* Fixing lint

* feat: examination action menu

* Fixing tests.

* Fixing test.

* feat: examination edit flow wip

* FIX: Show month right now.

FIX: creating exams ?
FIX: Show month right now.

TODO: Razeni vlastnich prohlidek...

* Fixing desc. of award in custom exam detail.

* lint and format fix.

* analyze test fix.

* Fixing lateinit examinaitonActionTypeUnion.

* Fixing creating examination.

* Fix: Disposable Exam now showing add to calendar button.

* Adding modal for disposable examination Delete Exam.

TODO: Connect with BE api.

* Adding streambuilder of calendar.

* Adding flow for editing frequency of exam and last visit date.

TODO: Je to spravne ?

* feat: examination edit flow UI wip

* Fixing when to show last examination picker.

* Fixing some task in comment on Github.

* Fix note is enabled when nevim is checked

Poznámka k návšteve - pri zaškrtnutí checkboxu "Zatím nevím" by malo byť pole pre poznámku disabled. V pripade, že som najprv vyplnila dátum a následne zaškrtla "Zatím nevím" pole pre poznámku ostalo aktívne.

* Fixing Functional stuff.

* fixing selectbox visual

Select boxy - upravit ikonu - namiesto šipky by mal byť chevron + ikona select boxu, ktorý bol rozkliknutý ako posledný má inú farbu/je zvýraznená - mala by mať default farbu ako ostatné neaktívne select boxy.

* Adding Divider.

* Fixing visual task from Github.

* Fixing functional stuff.

 Na kartách povinných prohlídek je uvedený nesprávny typ vyšetření - malo by tam byť "Preventivní prohlídka".

* Adding placeholder into sheet overlay exam.

Fixing bugs from comment section.

* Adding text for exams count.

* Geting new loono api

* Edit term of regularly examination.

* Edit date of exam is added to default and custom exams.

* TODO Unset comment after BE delete exam working.

* merge

* Fix intervals in default examinatoins.

* Done

* Removing old code.

* Detail done.

* fix merge.

* Examination sorting on main screen is done.

* Padding of text in specialist listview builder.

* Refactor function in examinations service.

* add interval check condition

* Fix for choosing date by interval.

* fix: no internet connection flushBar fix by [email protected] (#374)

* fix: no internet connection flushBar fix by [email protected]

* feat: Connectivity result condition opt

* Fixing lint

* fix analyze.

* fix merge.

* Fixing analyze

Co-authored-by: Petr Noga <[email protected]>

* Fixing new date in future.

* Fixing showing bad date in detail and examination card.

* Fix/nelze potvrdit absolovane samovysetreni#361 (#376)

* fix/nelze_potvrdit_absolovane_samovysetreni (#361)
tlacitko "Vysetril jsem se" je kliknutelne

* Fixing format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/feedback_button_zakryva_jmeno_na_homescreen (#359) (#377)

posunuti jmena a bodu dolu, aby se nekrylo s tlacitkem

Co-authored-by: Brambora0 <[email protected]>

* Fixing bugs.

zmizelo někam "mám/nemám lékaře" v defaultních prohlídkách - při rozkliku nesplněných prohlídek, když se chci objednat, správně by se mě aplikace měla zeptat, zda mám či nemám lékaře - pokud nemám, měla by mě odkázat na Najít lékaře s vyhledáním konkrétní specializace

při úpravě naplánovaného termínu ( i když je pozdější než ten původně plánovaný) mi píše aplikace "ještě není čas se objednat"

nedá se přidat ani upravit poznámka
nelze upravovat termín první prohlídky

na main screen porhlídky mají napsané, že jsou Preventivní, v detailu ale pak Vyšetření, což je trochu matoucí - neměly by to být i v detailu Preventivní prohlídky?

* Examination type duplicity remove (#380)

* Fix.

- nefunguje přidání druhé vlastní prohlídky u Zubaře - píše, že se "něco nepovedlo".
- v rozkliku detailu prohlídky se nezobrazuje uvedená poznámka:Při přidání poznámky k vlastní prohlídce se objeví chybová hláška, že není připojení k internetu (viz klip)/
- pokud zadam datum na formulari a pak zaskrtnu nevim, datum se nesmaze, ani nelze manuane smazat
- v typu vyšetření je zvláštní čára dole viz screenshot

* Merge fix.

* removing second break; merge fix.

* fix: unused variable

* Done bug fixing. (#385)

* Refactor loono strings.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>

* Fix: Vlastní prohlídky - Přidat prohlídku - FE#353

* Format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>

* Fix for title of custom badges.

* Feat/356 update (#392)

* feat: post examination note update wip

* fix: date/time picker validation w/[email protected]

* fix: time validation fix

* feat: edit examination note final

* feat: edit exam note icon

* fix: format

* fix: datepicker validation fix

* Fix/#355 vlastni prohlidky upravit prohlidku (#393)

* Fix

Fix:
divna hlaska neni mozne zadat prohlidku
 v detailu prohlídky se ukládá jiné datum, než požadované (zadávám 8.12.2022 a aplikace si ukládá 7.12.2022) - prohlídka se následně ani neuloží (viz druhý klip)
nelze upravit termín první prohlídky, přijde hláška, že se "neco nepovedlo" a prohlídka se neuloží

* Fix Done.

* Feat/pridani loga cgi #372 (#390)

* feat/pridani_loga_cgi (#372)
přidáno logo na welcomescreen (first time use splashscreen ve figmě)
TODO: přidání na splashscreen

* feat/pridani_loga_cgi (#372)
přidáno logo na welcomescreen (first time use splashscreen ve figmě)
přidání loga na splashscreen
oprava testů

* fix: logos to assets

* fix: analyze, format

Co-authored-by: Jakub Smolík <[email protected]>

* Fixing update examinations.

* Edit for PR. (#395)

* Edit for PR.

* fix: problems

* fix merge.

Co-authored-by: Jakub Smolík <[email protected]>

* Update examination_detail.dart (#396)

* Update examination_detail.dart

* fix: format

Co-authored-by: Jakub Smolík <[email protected]>

* fix: delete examination; fix: flushbar memory leak (#397)

* fix: last doxtor visit datepicker title and validation (#400)

* Fix/souhlas gdpr and newsletters#379 (#401)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* feat/souhlas_GDPR_and_Newsletters (#379)
oprava překlepu v textaci
(https://github.com/Loono-cz/loono-tasks/issues/94)

* Oprava zobrazování success ikony (https://github.com/Loono-cz/loono-tasks/issues/23) (#387)

Co-authored-by: Jakub Smolík <[email protected]>

* Update notification_service.dart (#402)

* fix/pri_vyhledani_lekare_uvedena_spatna_specializace (#365) (#388)

* fix/pri_vyhledani_lekare_uvedena_spatna_specializace (#365)
opraveno po kliknutí na "Nemám lékaře" při objednávání se na prohlídku se otevře mapa s lékaři se specializací na prohlídku.
(https://github.com/Loono-cz/loono-tasks/issues/79)

* fix: typo

* fox: format

* fix: format

Co-authored-by: Jakub Smolík <[email protected]>

* Fix/#355 vlastni prohlidky upravit prohlidku (#399)

* Fix

Fix:
divna hlaska neni mozne zadat prohlidku
 v detailu prohlídky se ukládá jiné datum, než požadované (zadávám 8.12.2022 a aplikace si ukládá 7.12.2022) - prohlídka se následně ani neuloží (viz druhý klip)
nelze upravit termín první prohlídky, přijde hláška, že se "neco nepovedlo" a prohlídka se neuloží

* Fix Done.

* Keyboard handling.

Handling keyboard on examiantion detail, create new exam, custom_exam_form

* Adding controller into examiantion_detail.dart

* Edit Exam term. Fix faq and badges not showing.

* Adding categorizedExam into edit examination modal.

* removing print.

* fix bug.

nefunguje zmena intervalu u vlastnich prohlidek

* Fixing edit frequency of exam.

* Fix note.

* Fixing PR comments.

* fix: no connecttion flushbar fix (#403)

* Fixing routing, onboarding route. (#406)

* Fixing routing, onboarding route.

* Fix analyze.

* fix: donate notification state was not remembered after log out/delete acc (#405)

* Fix/najit lékare search by address does not search#368 (#375)

* fix/najit_lékare_search_by_address_does_not_search_when_cislo_popisne_filled_in (#368)
oprava vyhledávání pomocí čísla popisného
(https://github.com/Loono-cz/loono-tasks/issues/15)

* fix: analyze

Co-authored-by: Brambora0 <[email protected]>

* Fixing 354 time is in past missing validation. (#407)

* Fixing 354 time must be in past.

* TODO Unwrap

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>
Co-authored-by: Marek Škořepa <[email protected]>

* Hiding donation feature for ios.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>
Co-authored-by: Marek Škořepa <[email protected]>

* Feat/firebase configuration be server (#415)

* Develop (#408)

* SelfExamination Skin done.

Adding new Self Examination Skin.
Adding new content pauldrons.
Adding new texts.

* Changing Flutter version of backend-tests.yaml etc.

* Ordering selfExaminations.

* BE Integration test fixed.

Adding test for self examination skin.
Fixing lint.
Fixing FE self examination category.

* Fixing lint.

* Fixing github test

* Changing layout of settings, adding setting account.

User form edited,
ExpanseTile for user data and notifications added.
Donate buton working.
TODO:
 1) Create notification screen
 2) Create notification shedule tasks
 3) Create notification switch in notification settings.

* Fix merge

* Delete ._Runner.xcodeproj

* Adding new screen donate page

TODO: Change placeholder image.
Edited notification switch for turning on/off donate notification.
Donate notification is turned for device not for user.

* Fixing Tests.

* Fixing lints. Adding functionality for opening settings.

* Donate Ilustration image is added to donate page.

Creating donate utils to handle function for showing donatepage.

* fix analyzer.

* Fixing PR.

* Fixing analyzer.

* Renaming file.

* fix/badge_brzy_vyprsi_rozbita_obrazovka (#364)
oprava zobrazovani 2 textu pred vyprsenim badge, oprava zobrazovani stavu vyprseni a ziskani u badge.
(https://github.com/Loono-cz/loono-tasks/issues/6)

* Adding new form for custom examinations.

Adding new form for custom examinations.
Adding new screens.
Adding new widget for customTextInput.
TODO: FE with BE.
TODO: controll inputs.

* Adding error to custom_text_field.

* Addint error messaage into others text input fields

* Adding Translate.

* Adding prepossition Dativ translations.

Adding preposition Dativ translations.
Adding input validation.
Removing TOKS and VENERAL_SISEASES

* Adding function for transform year to month

* Editing examination detail for once examinaiton.

* Edditing examination detail for periodical Custom Examination.

* Fix: Logging with google account.

* fixing stuff for creating custom examinations.

* Přidaní překladů nových prohlídek - nomativ, genitiv, dativ

* Some fixes.

TODO: Control task and figma.

* Fixing bugs.

* Fixing date validation.

* fixing but with date interval instead of month was year.

* Fixing nonperiodic exam has order button not add to calendar.

* Fixing buttons not showing.

* Changing card layouts

TODO: Sorting.

* Fixing lint

* Fixing lint

* feat: examination action menu

* Fixing tests.

* Fixing test.

* feat: examination edit flow wip

* FIX: Show month right now.

FIX: creating exams ?
FIX: Show month right now.

TODO: Razeni vlastnich prohlidek...

* Fixing desc. of award in custom exam detail.

* lint and format fix.

* analyze test fix.

* Fixing lateinit examinaitonActionTypeUnion.

* Fixing creating examination.

* Fix: Disposable Exam now showing add to calendar button.

* Adding modal for disposable examination Delete Exam.

TODO: Connect with BE api.

* Adding streambuilder of calendar.

* Adding flow for editing frequency of exam and last visit date.

TODO: Je to spravne ?

* feat: examination edit flow UI wip

* Fixing when to show last examination picker.

* Fixing some task in comment on Github.

* Fix note is enabled when nevim is checked

Poznámka k návšteve - pri zaškrtnutí checkboxu "Zatím nevím" by malo byť pole pre poznámku disabled. V pripade, že som najprv vyplnila dátum a následne zaškrtla "Zatím nevím" pole pre poznámku ostalo aktívne.

* Fixing Functional stuff.

* fixing selectbox visual

Select boxy - upravit ikonu - namiesto šipky by mal byť chevron + ikona select boxu, ktorý bol rozkliknutý ako posledný má inú farbu/je zvýraznená - mala by mať default farbu ako ostatné neaktívne select boxy.

* Adding Divider.

* Fixing visual task from Github.

* Fixing functional stuff.

 Na kartách povinných prohlídek je uvedený nesprávny typ vyšetření - malo by tam byť "Preventivní prohlídka".

* Adding placeholder into sheet overlay exam.

Fixing bugs from comment section.

* Adding text for exams count.

* Geting new loono api

* Edit term of regularly examination.

* Edit date of exam is added to default and custom exams.

* TODO Unset comment after BE delete exam working.

* merge

* Fix intervals in default examinatoins.

* Done

* Removing old code.

* Detail done.

* fix merge.

* Examination sorting on main screen is done.

* Padding of text in specialist listview builder.

* Refactor function in examinations service.

* add interval check condition

* Fix for choosing date by interval.

* fix: no internet connection flushBar fix by [email protected] (#374)

* fix: no internet connection flushBar fix by [email protected]

* feat: Connectivity result condition opt

* Fixing lint

* fix analyze.

* fix merge.

* Fixing analyze

Co-authored-by: Petr Noga <[email protected]>

* Fixing new date in future.

* Fixing showing bad date in detail and examination card.

* Fix/nelze potvrdit absolovane samovysetreni#361 (#376)

* fix/nelze_potvrdit_absolovane_samovysetreni (#361)
tlacitko "Vysetril jsem se" je kliknutelne

* Fixing format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/feedback_button_zakryva_jmeno_na_homescreen (#359) (#377)

posunuti jmena a bodu dolu, aby se nekrylo s tlacitkem

Co-authored-by: Brambora0 <[email protected]>

* Fixing bugs.

zmizelo někam "mám/nemám lékaře" v defaultních prohlídkách - při rozkliku nesplněných prohlídek, když se chci objednat, správně by se mě aplikace měla zeptat, zda mám či nemám lékaře - pokud nemám, měla by mě odkázat na Najít lékaře s vyhledáním konkrétní specializace

při úpravě naplánovaného termínu ( i když je pozdější než ten původně plánovaný) mi píše aplikace "ještě není čas se objednat"

nedá se přidat ani upravit poznámka
nelze upravovat termín první prohlídky

na main screen porhlídky mají napsané, že jsou Preventivní, v detailu ale pak Vyšetření, což je trochu matoucí - neměly by to být i v detailu Preventivní prohlídky?

* Examination type duplicity remove (#380)

* Fix.

- nefunguje přidání druhé vlastní prohlídky u Zubaře - píše, že se "něco nepovedlo".
- v rozkliku detailu prohlídky se nezobrazuje uvedená poznámka:Při přidání poznámky k vlastní prohlídce se objeví chybová hláška, že není připojení k internetu (viz klip)/
- pokud zadam datum na formulari a pak zaskrtnu nevim, datum se nesmaze, ani nelze manuane smazat
- v typu vyšetření je zvláštní čára dole viz screenshot

* Merge fix.

* removing second break; merge fix.

* fix: unused variable

* Done bug fixing. (#385)

* Refactor loono strings.

* Fix: Vlastní prohlídky - Přidat prohlídku - FE#353

* Feat/souhlas gdpr and newsletters#379 (#383)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* #379 newsletter option is saving in account

* Fixing format and analyze tests.

* Fix formater

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/357 main screen (#384)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* #379 newsletter option is saving in account

* listener to true = now writen logic for disable add button works

* sort update for null values

* git tests fix

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Format.

* Fix/353 vlastni prohlidky pridat prohlidku (#389)

* Develop (#386)

* SelfExamination Skin done.

Adding new Self Examination Skin.
Adding new content pauldrons.
Adding new texts.

* Changing Flutter version of backend-tests.yaml etc.

* Ordering selfExaminations.

* BE Integration test fixed.

Adding test for self examination skin.
Fixing lint.
Fixing FE self examination category.

* Fixing lint.

* Fixing github test

* Changing layout of settings, adding setting account.

User form edited,
ExpanseTile for user data and notifications added.
Donate buton working.
TODO:
 1) Create notification screen
 2) Create notification shedule tasks
 3) Create notification switch in notification settings.

* Fix merge

* Delete ._Runner.xcodeproj

* Adding new screen donate page

TODO: Change placeholder image.
Edited notification switch for turning on/off donate notification.
Donate notification is turned for device not for user.

* Fixing Tests.

* Fixing lints. Adding functionality for opening settings.

* Donate Ilustration image is added to donate page.

Creating donate utils to handle function for showing donatepage.

* fix analyzer.

* Fixing PR.

* Fixing analyzer.

* Renaming file.

* fix/badge_brzy_vyprsi_rozbita_obrazovka (#364)
oprava zobrazovani 2 textu pred vyprsenim badge, oprava zobrazovani stavu vyprseni a ziskani u badge.
(https://github.com/Loono-cz/loono-tasks/issues/6)

* Adding new form for custom examinations.

Adding new form for custom examinations.
Adding new screens.
Adding new widget for customTextInput.
TODO: FE with BE.
TODO: controll inputs.

* Adding error to custom_text_field.

* Addint error messaage into others text input fields

* Adding Translate.

* Adding prepossition Dativ translations.

Adding preposition Dativ translations.
Adding input validation.
Removing TOKS and VENERAL_SISEASES

* Adding function for transform year to month

* Editing examination detail for once examinaiton.

* Edditing examination detail for periodical Custom Examination.

* Fix: Logging with google account.

* fixing stuff for creating custom examinations.

* Přidaní překladů nových prohlídek - nomativ, genitiv, dativ

* Some fixes.

TODO: Control task and figma.

* Fixing bugs.

* Fixing date validation.

* fixing but with date interval instead of month was year.

* Fixing nonperiodic exam has order button not add to calendar.

* Fixing buttons not showing.

* Changing card layouts

TODO: Sorting.

* Fixing lint

* Fixing lint

* feat: examination action menu

* Fixing tests.

* Fixing test.

* feat: examination edit flow wip

* FIX: Show month right now.

FIX: creating exams ?
FIX: Show month right now.

TODO: Razeni vlastnich prohlidek...

* Fixing desc. of award in custom exam detail.

* lint and format fix.

* analyze test fix.

* Fixing lateinit examinaitonActionTypeUnion.

* Fixing creating examination.

* Fix: Disposable Exam now showing add to calendar button.

* Adding modal for disposable examination Delete Exam.

TODO: Connect with BE api.

* Adding streambuilder of calendar.

* Adding flow for editing frequency of exam and last visit date.

TODO: Je to spravne ?

* feat: examination edit flow UI wip

* Fixing when to show last examination picker.

* Fixing some task in comment on Github.

* Fix note is enabled when nevim is checked

Poznámka k návšteve - pri zaškrtnutí checkboxu "Zatím nevím" by malo byť pole pre poznámku disabled. V pripade, že som najprv vyplnila dátum a následne zaškrtla "Zatím nevím" pole pre poznámku ostalo aktívne.

* Fixing Functional stuff.

* fixing selectbox visual

Select boxy - upravit ikonu - namiesto šipky by mal byť chevron + ikona select boxu, ktorý bol rozkliknutý ako posledný má inú farbu/je zvýraznená - mala by mať default farbu ako ostatné neaktívne select boxy.

* Adding Divider.

* Fixing visual task from Github.

* Fixing functional stuff.

 Na kartách povinných prohlídek je uvedený nesprávny typ vyšetření - malo by tam byť "Preventivní prohlídka".

* Adding placeholder into sheet overlay exam.

Fixing bugs from comment section.

* Adding text for exams count.

* Geting new loono api

* Edit term of regularly examination.

* Edit date of exam is added to default and custom exams.

* TODO Unset comment after BE delete exam working.

* merge

* Fix intervals in default examinatoins.

* Done

* Removing old code.

* Detail done.

* fix merge.

* Examination sorting on main screen is done.

* Padding of text in specialist listview builder.

* Refactor function in examinations service.

* add interval check condition

* Fix for choosing date by interval.

* fix: no internet connection flushBar fix by [email protected] (#374)

* fix: no internet connection flushBar fix by [email protected]

* feat: Connectivity result condition opt

* Fixing lint

* fix analyze.

* fix merge.

* Fixing analyze

Co-authored-by: Petr Noga <[email protected]>

* Fixing new date in future.

* Fixing showing bad date in detail and examination card.

* Fix/nelze potvrdit absolovane samovysetreni#361 (#376)

* fix/nelze_potvrdit_absolovane_samovysetreni (#361)
tlacitko "Vysetril jsem se" je kliknutelne

* Fixing format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/feedback_button_zakryva_jmeno_na_homescreen (#359) (#377)

posunuti jmena a bodu dolu, aby se nekrylo s tlacitkem

Co-authored-by: Brambora0 <[email protected]>

* Fixing bugs.

zmizelo někam "mám/nemám lékaře" v defaultních prohlídkách - při rozkliku nesplněných prohlídek, když se chci objednat, správně by se mě aplikace měla zeptat, zda mám či nemám lékaře - pokud nemám, měla by mě odkázat na Najít lékaře s vyhledáním konkrétní specializace

při úpravě naplánovaného termínu ( i když je pozdější než ten původně plánovaný) mi píše aplikace "ještě není čas se objednat"

nedá se přidat ani upravit poznámka
nelze upravovat termín první prohlídky

na main screen porhlídky mají napsané, že jsou Preventivní, v detailu ale pak Vyšetření, což je trochu matoucí - neměly by to být i v detailu Preventivní prohlídky?

* Examination type duplicity remove (#380)

* Fix.

- nefunguje přidání druhé vlastní prohlídky u Zubaře - píše, že se "něco nepovedlo".
- v rozkliku detailu prohlídky se nezobrazuje uvedená poznámka:Při přidání poznámky k vlastní prohlídce se objeví chybová hláška, že není připojení k internetu (viz klip)/
- pokud zadam datum na formulari a pak zaskrtnu nevim, datum se nesmaze, ani nelze manuane smazat
- v typu vyšetření je zvláštní čára dole viz screenshot

* Merge fix.

* removing second break; merge fix.

* fix: unused variable

* Done bug fixing. (#385)

* Refactor loono strings.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>

* Fix: Vlastní prohlídky - Přidat prohlídku - FE#353

* Format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>

* Fix for title of custom badges.

* Feat/356 update (#392)

* feat: post examination note update wip

* fix: date/time picker validation w/[email protected]

* fix: time validation fix

* feat: edit examination note final

* feat: edit exam note icon

* fix: format

* fix: datepicker validation fix

* Fix/#355 vlastni prohlidky upravit prohlidku (#393)

* Fix

Fix:
divna hlaska neni mozne zadat prohlidku
 v detailu prohlídky se ukládá jiné datum, než požadované (zadávám 8.12.2022 a aplikace si ukládá 7.12.2022) - prohlídka se následně ani neuloží (viz druhý klip)
nelze upravit termín první prohlídky, přijde hláška, že se "neco nepovedlo" a prohlídka se neuloží

* Fix Done.

* Feat/pridani loga cgi #372 (#390)

* feat/pridani_loga_cgi (#372)
přidáno logo na welcomescreen (first time use splashscreen ve figmě)
TODO: přidání na splashscreen

* feat/pridani_loga_cgi (#372)
přidáno logo na welcomescreen (first time use splashscreen ve figmě)
přidání loga na splashscreen
oprava testů

* fix: logos to assets

* fix: analyze, format

Co-authored-by: Jakub Smolík <[email protected]>

* Fixing update examinations.

* Edit for PR. (#395)

* Edit for PR.

* fix: problems

* fix merge.

Co-authored-by: Jakub Smolík <[email protected]>

* Update examination_detail.dart (#396)

* Update examination_detail.dart

* fix: format

Co-authored-by: Jakub Smolík <[email protected]>

* fix: delete examination; fix: flushbar memory leak (#397)

* fix: last doxtor visit datepicker title and validation (#400)

* Fix/souhlas gdpr and newsletters#379 (#401)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* feat/souhlas_GDPR_and_Newsletters (#379)
oprava překlepu v textaci
(https://github.com/Loono-cz/loono-tasks/issues/94)

* Oprava zobrazování success ikony (https://github.com/Loono-cz/loono-tasks/issues/23) (#387)

Co-authored-by: Jakub Smolík <[email protected]>

* Update notification_service.dart (#402)

* fix/pri_vyhledani_lekare_uvedena_spatna_specializace (#365) (#388)

* fix/pri_vyhledani_lekare_uvedena_spatna_specializace (#365)
opraveno po kliknutí na "Nemám lékaře" při objednávání se na prohlídku se otevře mapa s lékaři se specializací na prohlídku.
(https://github.com/Loono-cz/loono-tasks/issues/79)

* fix: typo

* fox: format

* fix: format

Co-authored-by: Jakub Smolík <[email protected]>

* Fix/#355 vlastni prohlidky upravit prohlidku (#399)

* Fix

Fix:
divna hlaska neni mozne zadat prohlidku
 v detailu prohlídky se ukládá jiné datum, než požadované (zadávám 8.12.2022 a aplikace si ukládá 7.12.2022) - prohlídka se následně ani neuloží (viz druhý klip)
nelze upravit termín první prohlídky, přijde hláška, že se "neco nepovedlo" a prohlídka se neuloží

* Fix Done.

* Keyboard handling.

Handling keyboard on examiantion detail, create new exam, custom_exam_form

* Adding controller into examiantion_detail.dart

* Edit Exam term. Fix faq and badges not showing.

* Adding categorizedExam into edit examination modal.

* removing print.

* fix bug.

nefunguje zmena intervalu u vlastnich prohlidek

* Fixing edit frequency of exam.

* Fix note.

* Fixing PR comments.

* fix: no connecttion flushbar fix (#403)

* Fixing routing, onboarding route. (#406)

* Fixing routing, onboarding route.

* Fix analyze.

* fix: donate notification state was not remembered after log out/delete acc (#405)

* Fix/najit lékare search by address does not search#368 (#375)

* fix/najit_lékare_search_by_address_does_not_search_when_cislo_popisne_filled_in (#368)
oprava vyhledávání pomocí čísla popisného
(https://github.com/Loono-cz/loono-tasks/issues/15)

* fix: analyze

Co-authored-by: Brambora0 <[email protected]>

* Fixing 354 time is in past missing validation. (#407)

* Fixing 354 time must be in past.

* TODO Unwrap

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>
Co-authored-by: Marek Škořepa <[email protected]>

* Adding firebase remote config.

Switch for using BE PROD = true DEV= false

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>
Co-authored-by: Marek Škořepa <[email protected]>

* Fix/vlastni prohlidka upravit prohlidku#355 (#412)

* Develop (#408)

* SelfExamination Skin done.

Adding new Self Examination Skin.
Adding new content pauldrons.
Adding new texts.

* Changing Flutter version of backend-tests.yaml etc.

* Ordering selfExaminations.

* BE Integration test fixed.

Adding test for self examination skin.
Fixing lint.
Fixing FE self examination category.

* Fixing lint.

* Fixing github test

* Changing layout of settings, adding setting account.

User form edited,
ExpanseTile for user data and notifications added.
Donate buton working.
TODO:
 1) Create notification screen
 2) Create notification shedule tasks
 3) Create notification switch in notification settings.

* Fix merge

* Delete ._Runner.xcodeproj

* Adding new screen donate page

TODO: Change placeholder image.
Edited notification switch for turning on/off donate notification.
Donate notification is turned for device not for user.

* Fixing Tests.

* Fixing lints. Adding functionality for opening settings.

* Donate Ilustration image is added to donate page.

Creating donate utils to handle function for showing donatepage.

* fix analyzer.

* Fixing PR.

* Fixing analyzer.

* Renaming file.

* fix/badge_brzy_vyprsi_rozbita_obrazovka (#364)
oprava zobrazovani 2 textu pred vyprsenim badge, oprava zobrazovani stavu vyprseni a ziskani u badge.
(https://github.com/Loono-cz/loono-tasks/issues/6)

* Adding new form for custom examinations.

Adding new form for custom examinations.
Adding new screens.
Adding new widget for customTextInput.
TODO: FE with BE.
TODO: controll inputs.

* Adding error to custom_text_field.

* Addint error messaage into others text input fields

* Adding Translate.

* Adding prepossition Dativ translations.

Adding preposition Dativ translations.
Adding input validation.
Removing TOKS and VENERAL_SISEASES

* Adding function for transform year to month

* Editing examination detail for once examinaiton.

* Edditing examination detail for periodical Custom Examination.

* Fix: Logging with google account.

* fixing stuff for creating custom examinations.

* Přidaní překladů nových prohlídek - nomativ, genitiv, dativ

* Some fixes.

TODO: Control task and figma.

* Fixing bugs.

* Fixing date validation.

* fixing but with date interval instead of month was year.

* Fixing nonperiodic exam has order button not add to calendar.

* Fixing buttons not showing.

* Changing card layouts

TODO: Sorting.

* Fixing lint

* Fixing lint

* feat: examination action menu

* Fixing tests.

* Fixing test.

* feat: examination edit flow wip

* FIX: Show month right now.

FIX: creating exams ?
FIX: Show month right now.

TODO: Razeni vlastnich prohlidek...

* Fixing desc. of award in custom exam detail.

* lint and format fix.

* analyze test fix.

* Fixing lateinit examinaitonActionTypeUnion.

* Fixing creating examination.

* Fix: Disposable Exam now showing add to calendar button.

* Adding modal for disposable examination Delete Exam.

TODO: Connect with BE api.

* Adding streambuilder of calendar.

* Adding flow for editing frequency of exam and last visit date.

TODO: Je to spravne ?

* feat: examination edit flow UI wip

* Fixing when to show last examination picker.

* Fixing some task in comment on Github.

* Fix note is enabled when nevim is checked

Poznámka k návšteve - pri zaškrtnutí checkboxu "Zatím nevím" by malo byť pole pre poznámku disabled. V pripade, že som najprv vyplnila dátum a následne zaškrtla "Zatím nevím" pole pre poznámku ostalo aktívne.

* Fixing Functional stuff.

* fixing selectbox visual

Select boxy - upravit ikonu - namiesto šipky by…
  • Loading branch information
9 people authored Oct 14, 2022
1 parent 6941e72 commit a80d74a
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 49 deletions.
1 change: 1 addition & 0 deletions lib/models/apple_account_info.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class AppleAccountInfo with _$AppleAccountInfo {
required String email,
required String? givenName,
required String? familyName,
required String? identifierToken,
}) = _AppleAccountInfo;

factory AppleAccountInfo.fromJson(Map<String, dynamic> json) => _$AppleAccountInfoFromJson(json);
Expand Down
57 changes: 35 additions & 22 deletions lib/models/apple_account_info.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,27 @@ mixin _$AppleAccountInfo {
String get email => throw _privateConstructorUsedError;
String? get givenName => throw _privateConstructorUsedError;
String? get familyName => throw _privateConstructorUsedError;
String? get identifierToken => throw _privateConstructorUsedError;

Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$AppleAccountInfoCopyWith<AppleAccountInfo> get copyWith =>
throw _privateConstructorUsedError;
$AppleAccountInfoCopyWith<AppleAccountInfo> get copyWith => throw _privateConstructorUsedError;
}

/// @nodoc
abstract class $AppleAccountInfoCopyWith<$Res> {
factory $AppleAccountInfoCopyWith(
AppleAccountInfo value, $Res Function(AppleAccountInfo) then) =
factory $AppleAccountInfoCopyWith(AppleAccountInfo value, $Res Function(AppleAccountInfo) then) =
_$AppleAccountInfoCopyWithImpl<$Res>;
$Res call(
{String userIdentifier,
String email,
String? givenName,
String? familyName});
String? familyName,
String? identifierToken});
}

/// @nodoc
class _$AppleAccountInfoCopyWithImpl<$Res>
implements $AppleAccountInfoCopyWith<$Res> {
class _$AppleAccountInfoCopyWithImpl<$Res> implements $AppleAccountInfoCopyWith<$Res> {
_$AppleAccountInfoCopyWithImpl(this._value, this._then);

final AppleAccountInfo _value;
Expand All @@ -58,6 +57,7 @@ class _$AppleAccountInfoCopyWithImpl<$Res>
Object? email = freezed,
Object? givenName = freezed,
Object? familyName = freezed,
Object? identifierToken = freezed,
}) {
return _then(_value.copyWith(
userIdentifier: userIdentifier == freezed
Expand All @@ -76,13 +76,16 @@ class _$AppleAccountInfoCopyWithImpl<$Res>
? _value.familyName
: familyName // ignore: cast_nullable_to_non_nullable
as String?,
identifierToken: identifierToken == freezed
? _value.identifierToken
: identifierToken // ignore: cast_nullable_to_non_nullable
as String?,
));
}
}

/// @nodoc
abstract class _$$_AppleAccountInfoCopyWith<$Res>
implements $AppleAccountInfoCopyWith<$Res> {
abstract class _$$_AppleAccountInfoCopyWith<$Res> implements $AppleAccountInfoCopyWith<$Res> {
factory _$$_AppleAccountInfoCopyWith(
_$_AppleAccountInfo value, $Res Function(_$_AppleAccountInfo) then) =
__$$_AppleAccountInfoCopyWithImpl<$Res>;
Expand All @@ -91,12 +94,12 @@ abstract class _$$_AppleAccountInfoCopyWith<$Res>
{String userIdentifier,
String email,
String? givenName,
String? familyName});
String? familyName,
String? identifierToken});
}

/// @nodoc
class __$$_AppleAccountInfoCopyWithImpl<$Res>
extends _$AppleAccountInfoCopyWithImpl<$Res>
class __$$_AppleAccountInfoCopyWithImpl<$Res> extends _$AppleAccountInfoCopyWithImpl<$Res>
implements _$$_AppleAccountInfoCopyWith<$Res> {
__$$_AppleAccountInfoCopyWithImpl(
_$_AppleAccountInfo _value, $Res Function(_$_AppleAccountInfo) _then)
Expand All @@ -111,6 +114,7 @@ class __$$_AppleAccountInfoCopyWithImpl<$Res>
Object? email = freezed,
Object? givenName = freezed,
Object? familyName = freezed,
Object? identifierToken = freezed,
}) {
return _then(_$_AppleAccountInfo(
userIdentifier: userIdentifier == freezed
Expand All @@ -129,6 +133,10 @@ class __$$_AppleAccountInfoCopyWithImpl<$Res>
? _value.familyName
: familyName // ignore: cast_nullable_to_non_nullable
as String?,
identifierToken: identifierToken == freezed
? _value.identifierToken
: identifierToken // ignore: cast_nullable_to_non_nullable
as String?,
));
}
}
Expand All @@ -140,7 +148,8 @@ class _$_AppleAccountInfo implements _AppleAccountInfo {
{required this.userIdentifier,
required this.email,
required this.givenName,
required this.familyName});
required this.familyName,
required this.identifierToken});

factory _$_AppleAccountInfo.fromJson(Map<String, dynamic> json) =>
_$$_AppleAccountInfoFromJson(json);
Expand All @@ -153,23 +162,24 @@ class _$_AppleAccountInfo implements _AppleAccountInfo {
final String? givenName;
@override
final String? familyName;
@override
final String? identifierToken;

@override
String toString() {
return 'AppleAccountInfo(userIdentifier: $userIdentifier, email: $email, givenName: $givenName, familyName: $familyName)';
return 'AppleAccountInfo(userIdentifier: $userIdentifier, email: $email, givenName: $givenName, familyName: $familyName, identifierToken: $identifierToken)';
}

@override
bool operator ==(dynamic other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$_AppleAccountInfo &&
const DeepCollectionEquality()
.equals(other.userIdentifier, userIdentifier) &&
const DeepCollectionEquality().equals(other.userIdentifier, userIdentifier) &&
const DeepCollectionEquality().equals(other.email, email) &&
const DeepCollectionEquality().equals(other.givenName, givenName) &&
const DeepCollectionEquality()
.equals(other.familyName, familyName));
const DeepCollectionEquality().equals(other.familyName, familyName) &&
const DeepCollectionEquality().equals(other.identifierToken, identifierToken));
}

@JsonKey(ignore: true)
Expand All @@ -179,7 +189,8 @@ class _$_AppleAccountInfo implements _AppleAccountInfo {
const DeepCollectionEquality().hash(userIdentifier),
const DeepCollectionEquality().hash(email),
const DeepCollectionEquality().hash(givenName),
const DeepCollectionEquality().hash(familyName));
const DeepCollectionEquality().hash(familyName),
const DeepCollectionEquality().hash(identifierToken));

@JsonKey(ignore: true)
@override
Expand All @@ -199,10 +210,10 @@ abstract class _AppleAccountInfo implements AppleAccountInfo {
{required final String userIdentifier,
required final String email,
required final String? givenName,
required final String? familyName}) = _$_AppleAccountInfo;
required final String? familyName,
required final String? identifierToken}) = _$_AppleAccountInfo;

factory _AppleAccountInfo.fromJson(Map<String, dynamic> json) =
_$_AppleAccountInfo.fromJson;
factory _AppleAccountInfo.fromJson(Map<String, dynamic> json) = _$_AppleAccountInfo.fromJson;

@override
String get userIdentifier;
Expand All @@ -213,6 +224,8 @@ abstract class _AppleAccountInfo implements AppleAccountInfo {
@override
String? get familyName;
@override
String? get identifierToken;
@override
@JsonKey(ignore: true)
_$$_AppleAccountInfoCopyWith<_$_AppleAccountInfo> get copyWith =>
throw _privateConstructorUsedError;
Expand Down
8 changes: 4 additions & 4 deletions lib/models/apple_account_info.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 13 additions & 23 deletions lib/services/auth/auth_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:google_sign_in/google_sign_in.dart';
import 'package:jwt_decoder/jwt_decoder.dart';
import 'package:loono/models/apple_account_info.dart';
import 'package:loono/models/firebase_user.dart';
import 'package:loono/models/social_login_account.dart';
Expand Down Expand Up @@ -110,29 +111,17 @@ class AuthService {
if (appleUserId == null) return const Left(AuthFailure.unknown(null, '0x92'));

final AppleAccountInfo appleAccountInfo;
final appleUserEmail = appleCredential.email;
if (appleUserEmail == null) {
// try to obtain the account from the secure storage
final savedAccountInfo = await _secureStorage.getAppleAccountInfoById(appleUserId);
if (savedAccountInfo == null) {
return Left(
AuthFailure.accountNotExists(SocialLoginAccount.apple(appleCredential, cryptoNonce)),
);
} else {
appleAccountInfo = savedAccountInfo;
}
} else {
// we got the email and other user details, save it so we can get it later
// we get these details only during first authorization
appleAccountInfo = AppleAccountInfo(
userIdentifier: appleUserId,
email: appleUserEmail,
givenName: appleCredential.givenName,
familyName: appleCredential.familyName,
);
await _secureStorage.saveAppleAccountInfo(appleAccountInfo);
}

final decodedToken = JwtDecoder.decode(appleCredential.identityToken ?? '');
final appleUserEmail = appleCredential.email ?? decodedToken['email'].toString();
final savedAccountInfo = await _secureStorage.getAppleAccountInfoById(appleUserId);
appleAccountInfo = AppleAccountInfo(
userIdentifier: appleUserId,
email: appleUserEmail,
givenName: appleCredential.givenName ?? savedAccountInfo?.givenName.toString(),
familyName: appleCredential.familyName ?? savedAccountInfo?.familyName.toString(),
identifierToken: appleCredential.identityToken,
);
await _secureStorage.saveAppleAccountInfo(appleAccountInfo);
final signInMethods = await _auth.fetchSignInMethodsForEmail(appleAccountInfo.email);
if (signInMethods.isEmpty) {
return Left(
Expand Down Expand Up @@ -244,6 +233,7 @@ class AuthService {
],
nonce: cryptoNonce.nonce,
);

return appleCredential;
}

Expand Down
1 change: 1 addition & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ dependencies:

intl: ^0.17.0
json_annotation: ^4.0.1
jwt_decoder: ^2.0.1
loono_api:
git:
url: https://github.com/Loono-cz/loono-api.git
Expand Down

0 comments on commit a80d74a

Please sign in to comment.