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

AuthorMikkel Thygesen<mth@dwarf.dk>

Date2025-01-22 11:48:49 +0100

546: PR amendments

Changed files

comwell_key_app/assets/translations/en-US.json       | 20 ++++++++++----------
 .../lib/home/components/housekeeping_button.dart     |  3 ++-
 .../housekeeping/components/selectable_service.dart  |  3 ++-
 3 files changed, 14 insertions(+), 12 deletions(-)

Diff

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

index a1c0fbbf..874cf473 100644

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

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

@@ -111,14 +111,14 @@

"preregistration_confirmation_extras_card_title_plural": "{} extra purchases",

"preregistration_confirmation_extras_card_subtitle": "Will be added to your bill",

"housekeeping_page_title": "Housekeeping",

- "housekeeping_page_subtitle": "Ønsker du ekstra rengøring eller opfyldning på værelset, kan du altid bestille det her - uden omkostninger",

- "housekeeping_page_button": "Bestil housekeeping",

- "housekeeping_page_service_title_cleaning": "Rengøring af værelse",

- "housekeeping_page_service_title_towels": "Sæbe/shampoo",

- "housekeeping_page_service_title_refill": "Genopfyldning af kaffe og te",

- "housekeeping_page_service_title_trash": "Friske håndklæder",

- "housekeeping_page_service_title_soap": "Afhentning af skrald",

- "housekeeping_page_service_cleaning_subtitle": "Der bliver gjort rent mellem 11 og 14",

- "housekeeping_page_supplies": "Forsyninger",

- "housekeeping_page_cleaning": "Rengøring"

+ "housekeeping_page_subtitle": "If you wish for housekeeping, you can order it here",

+ "housekeeping_page_button": "Order housekeeping",

+ "housekeeping_page_service_title_cleaning": "Cleaning of the room",

+ "housekeeping_page_service_title_towels": "Soap and shampoo",

+ "housekeeping_page_service_title_refill": "Refill coffee and tea",

+ "housekeeping_page_service_title_trash": "Fresh towels",

+ "housekeeping_page_service_title_soap": "Trash removal",

+ "housekeeping_page_service_cleaning_subtitle": "Cleaning is between 11 and 14",

+ "housekeeping_page_supplies": "Supplies",

+ "housekeeping_page_cleaning": "Cleaning"

}

\ No newline at end of file

diff --git a/comwell_key_app/lib/home/components/housekeeping_button.dart b/comwell_key_app/lib/home/components/housekeeping_button.dart

index f2df1599..956713bc 100644

--- a/comwell_key_app/lib/home/components/housekeeping_button.dart

+++ b/comwell_key_app/lib/home/components/housekeeping_button.dart

@@ -4,6 +4,7 @@ import 'package:flutter_svg/svg.dart';

import 'package:go_router/go_router.dart';

import '../../routing/app_routes.dart';

+import '../../themes/dark_theme.dart';

class HousekeepingButton extends StatelessWidget {

const HousekeepingButton({super.key});

@@ -30,7 +31,7 @@ class HousekeepingButton extends StatelessWidget {

height: 36,

width: 36,

decoration: const BoxDecoration(

- color: Color(0xffF0EAE2),

+ color: colorSecondary,

shape: BoxShape.circle,

child: Padding(

diff --git a/comwell_key_app/lib/housekeeping/components/selectable_service.dart b/comwell_key_app/lib/housekeeping/components/selectable_service.dart

index d750d4e9..8df10a12 100644

--- a/comwell_key_app/lib/housekeeping/components/selectable_service.dart

+++ b/comwell_key_app/lib/housekeeping/components/selectable_service.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';

import 'package:flutter_bloc/flutter_bloc.dart';

import 'package:flutter_svg/svg.dart';