6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 8e30f94c
Changed files
comwell_key_app/lib/check_in/check_in_page.dart | 127 +++++++++++++++--------- 1 file changed, 80 insertions(+), 47 deletions(-)
Diff
diff --git a/comwell_key_app/lib/check_in/check_in_page.dart b/comwell_key_app/lib/check_in/check_in_page.dart
index dfc448e1..bc845ed5 100644
--- a/comwell_key_app/lib/check_in/check_in_page.dart
+++ b/comwell_key_app/lib/check_in/check_in_page.dart
@@ -121,9 +121,6 @@ class _CheckInPageState extends State<CheckInPage>
}
}, builder: (context, state) {
return Scaffold(
- appBar: AppBar(
- automaticallyImplyLeading: true,
- ),
body: SafeArea(
child: Builder(builder: (context) {
final position = getCardPosition(context);
@@ -197,54 +194,90 @@ class _CheckInPageState extends State<CheckInPage>
],
),
),
+ if (state.checkInStatus is CheckInStatusError)
+ Align(
+ alignment: Alignment.bottomCenter,
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ const Divider(
+ color: Colors.black12,
+ height: 0,
+ ),
+ Row(
+ children: [
+ Expanded(
+ child: Padding(
+ padding: const EdgeInsets.all(16.0),
+ child: ElevatedButton(
+ onPressed: () {
+ context.pop();
+ },
+ style: const ButtonStyle(
+ backgroundColor: WidgetStatePropertyAll(
+ Color(0xffAA8D65)),
+ foregroundColor:
+ WidgetStatePropertyAll(Colors.white)),
+ child: Padding(
+ padding: const EdgeInsets.symmetric(
+ vertical: 16.0),
+ child: Text("generic_continue".tr()),
+ ),
+ ),
+ ),
+ ),
+ ],
+ ),
+ ],
+ ),
+ ),
if (state.checkInStatus is CheckInStatusYourDigitalCard)
Align(
- alignment: Alignment.bottomCenter,
- child: Column(
- mainAxisSize: MainAxisSize.min,
- children: [
- Padding(
- padding:
- const EdgeInsets.symmetric(horizontal: 16.0),
- child: Text("check_in_your_digital_card_nb".tr(),
- textAlign: TextAlign.center,
- style: Theme.of(context)
- .textTheme
- .bodySmall
- ?.copyWith(color: Colors.black45)),
- ),
- const SizedBox(height: 30),
- const Divider(
- color: Colors.black12,
- height: 0,
- ),
- Row(
- children: [
- Expanded(
- child: Padding(
- padding: const EdgeInsets.all(16.0),
- child: ElevatedButton(
- onPressed: () {
- context.pop();
- },
- style: const ButtonStyle(
- backgroundColor:
- WidgetStatePropertyAll(
- Color(0xffAA8D65)),
- foregroundColor:
- WidgetStatePropertyAll(
- Colors.white)),
- child: Padding(
- padding: const EdgeInsets.symmetric(
- vertical: 16.0),
- child: Text("generic_done".tr()),
- )),
+ alignment: Alignment.bottomCenter,
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 16.0),
+ child: Text("check_in_your_digital_card_nb".tr(),
+ textAlign: TextAlign.center,
+ style: Theme.of(context)
+ .textTheme
+ .bodySmall
+ ?.copyWith(color: Colors.black45)),
+ ),
+ const SizedBox(height: 30),
+ const Divider(
+ color: Colors.black12,
+ height: 0,
+ ),
+ Row(
+ children: [
+ Expanded(
+ child: Padding(
+ padding: const EdgeInsets.all(16.0),
+ child: ElevatedButton(
+ onPressed: () {
+ context.pop();
+ },
+ style: const ButtonStyle(
+ backgroundColor: WidgetStatePropertyAll(
+ Color(0xffAA8D65)),
+ foregroundColor:
+ WidgetStatePropertyAll(Colors.white)),
+ child: Padding(
+ padding: const EdgeInsets.symmetric(
+ vertical: 16.0),
+ child: Text("generic_done".tr()),
+ ),
),
),
- ],
- ),
- ],
- ))
+ ),
+ ],
+ ),
+ ],
+ ),
+ )
],
);
}),