6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit bb3c5399

AuthorEdmir Suljic<esu@dwarf.dk>

Date2025-05-13 10:05:35 +0200

Finished cleanup and graceful error handling

Changed files

comwell_key_app/assets/translations/da-DK.json     |   4 +-
 comwell_key_app/assets/translations/en-US.json     |   4 +-
 .../Pods-Runner/Pods-Runner-resources.sh           | 162 ---------------------
 .../ios/Runner.xcodeproj/project.pbxproj           |  97 +++++++++++-
 comwell_key_app/ios/Runner/Info.plist              |  14 +-
 .../manifest.json                                  |   1 -
 .../authentication/authentication_repository.dart  |   8 +-
 .../booking_details/bloc/booking_details_bloc.dart |   3 +-
 .../bloc/booking_details_state.dart                |   2 +-
 .../lib/booking_details/booking_details_page.dart  |   2 -
 .../booking_details_repository.dart                |   1 -
 .../booking_details/components/share_button.dart   |   1 -
 comwell_key_app/lib/check_in/check_in_page.dart    |   2 -
 .../lib/check_out/bloc/check_out_cubit.dart        |   4 +-
 .../check_out/pages/check_out_processing_page.dart |   3 +-
 .../common/components/comwell_card_component.dart  |   4 +-
 comwell_key_app/lib/comwell_app.dart               |   1 -
 comwell_key_app/lib/database/comwell_db.dart       |   2 -
 .../lib/database/daos/bookings_dao.dart            |   3 -
 .../lib/housekeeping/housekeeping_page.dart        |   4 +-
 .../lib/login/components/azure_b2c_widget.dart     |   1 -
 comwell_key_app/lib/login/login_page.dart          |  60 +++++++-
 comwell_key_app/lib/main.dart                      |   2 +-
 .../lib/my_booking/my_booking_page.dart            |   7 +-
 .../lib/my_booking/my_booking_repository.dart      |   2 -
 .../lib/notifications/notifications_page.dart      |   2 +-
 .../components/current_bookings_tab_view.dart      |   2 +-
 .../lib/overview/cubit/overview_cubit.dart         |   5 +-
 comwell_key_app/lib/overview/models/bookings.dart  |   2 -
 comwell_key_app/lib/overview/overview_page.dart    |   2 -
 .../past_cancelled_booking_detail_page.dart        |   2 -
 .../overview/repository/overview_repository.dart   |   1 -
 .../payment_cards/bloc/payment_cards_cubit.dart    |   3 +-
 .../payment_cards/components/edit_card_dialog.dart |   9 +-
 .../components/remove_card_button.dart             |   2 +-
 .../payment_cards/components/save_card_button.dart |   1 -
 .../lib/payment_cards/payment_cards_page.dart      |   1 -
 .../pregistration/bloc/preregistration_cubit.dart  |  15 +-
 .../pages/prereg_confirmation_page.dart            |   4 +-
 .../comwell_club_signup_bottom_sheet.dart          |  16 +-
 .../lib/profile/cubit/profile_cubit.dart           |   2 -
 comwell_key_app/lib/profile/profile_page.dart      |   3 -
 .../components/address_bottom_sheet.dart           |   3 -
 .../components/comwell_text_field.dart             |   3 -
 .../components/date_time_picker.dart               |   5 +-
 .../components/intl_phone_field.dart               |   1 -
 .../cubit/profile_settings_cubit.dart              |   5 +-
 .../lib/profile_settings/model/user.dart           |   1 -
 .../profile_settings/profile_settings_page.dart    |   2 +-
 .../repostiory/profile_settings_repository.dart    |   1 -
 .../redeem_debug/invitation_code_formatter.dart    |   4 +-
 comwell_key_app/lib/routing/app_router.dart        |   4 +-
 comwell_key_app/lib/services/api.dart              |   8 +-
 .../interceptors/response_handle_interceptor.dart  |   2 +-
 .../lib/tracking/trackers/firebase_tracker.dart    |   6 +-
 comwell_key_app/lib/utils/locator.dart             |   1 -
 .../lib/utils/stream_to_listenable.dart            |  11 +-
 .../booking_details_repository_test.dart           |   9 +-
 .../test/overview_test/overview_cubic_test.dart    |   1 -
 .../overview_test/overview_repository_test.dart    |   1 -
 comwell_key_app/test/widget_test.dart              |   2 +-
 61 files changed, 226 insertions(+), 310 deletions(-)

Diff

diff --git a/comwell_key_app/assets/translations/da-DK.json b/comwell_key_app/assets/translations/da-DK.json

index f504185e..f951cfd1 100644

--- a/comwell_key_app/assets/translations/da-DK.json

+++ b/comwell_key_app/assets/translations/da-DK.json

@@ -241,5 +241,7 @@

"total_charge_value": "{} kr.",

"generic_error_profile_page": "Der skete en fejl. Prøv igen senere. Eller log ud og prøv igen.",

"profile_error_name": "Fejl ved indlæsning af profiloplysninger",

- "error": "Fejl"

+ "error": "Fejl",

+ "error_logout": "Der skete en fejl",

+ "error_logout_subtitle": "Du har været logget ud. Log venligst ind igen."

}

\ No newline at end of file

diff --git a/comwell_key_app/assets/translations/en-US.json b/comwell_key_app/assets/translations/en-US.json

index 0e35b884..6241d1fb 100644

--- a/comwell_key_app/assets/translations/en-US.json

+++ b/comwell_key_app/assets/translations/en-US.json

@@ -241,5 +241,7 @@

"total_charge_value": "{} kr.",

"generic_error_profile_page": "An error occurred. Please try again later. Or logout and try again.",

"profile_error_name": "Failed to load profile information",

- "error": "Error"

+ "error": "Error",

+ "error_logout": "There has been an error",

+ "error_logout_subtitle": "Please log in again"

}

diff --git a/comwell_key_app/ios/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh b/comwell_key_app/ios/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh

deleted file mode 100755

index 8ad0afb6..00000000

--- a/comwell_key_app/ios/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh

+++ /dev/null

@@ -1,162 +0,0 @@

-#!/bin/sh

-set -e

-set -u

-set -o pipefail

-function on_error {

- echo "$(realpath -mq "${0}"):$1: error: Unexpected failure"

-trap 'on_error $LINENO' ERR

-if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then

- # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy

- # resources to, so exit 0 (signalling the script phase was successful).

- exit 0

-fi

-mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"

-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt

-> "$RESOURCES_TO_COPY"

-XCASSET_FILES=()

-# This protects against multiple targets copying the same framework dependency at the same time. The solution

-# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html

-RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")

-case "${TARGETED_DEVICE_FAMILY:-}" in

- 1,2)

- TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"

- ;;

- 1)

- TARGET_DEVICE_ARGS="--target-device iphone"

- ;;

- 2)

- TARGET_DEVICE_ARGS="--target-device ipad"

- ;;

- 3)

- TARGET_DEVICE_ARGS="--target-device tv"

- ;;

- 4)

- TARGET_DEVICE_ARGS="--target-device watch"

- ;;

- *)

- TARGET_DEVICE_ARGS="--target-device mac"

- ;;

-esac

-install_resource()

- if [[ "$1" = /* ]] ; then

- RESOURCE_PATH="$1"

- else

- RESOURCE_PATH="${PODS_ROOT}/$1"

- fi

- if [[ ! -e "$RESOURCE_PATH" ]] ; then

- cat << EOM

-error: Resource "$RESOURCE_PATH" not found. Run 'pod install' to update the copy resources script.

-EOM

- exit 1

- fi

- case $RESOURCE_PATH in

- *.storyboard)

- echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true

- ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}

- ;;

- *.xib)

- echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true

- ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}

- ;;

- *.framework)

- echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true

- mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"

- echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true

- rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"

- ;;

- *.xcdatamodel)

- echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" || true

- xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom"

- ;;

- *.xcdatamodeld)

- echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" || true

- xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd"

- ;;

- *.xcmappingmodel)

- echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" || true

- xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"

- ;;

- *.xcassets)

- ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH"

- XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")

- ;;

- *)

- echo "$RESOURCE_PATH" || true

- echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY"

- ;;

- esac

-if [[ "$CONFIGURATION" == "Debug" ]]; then