diff --git a/lib/Components/ScannerBouton.dart b/lib/Components/ScannerBouton.dart index f58c1ca..dee65ff 100644 --- a/lib/Components/ScannerBouton.dart +++ b/lib/Components/ScannerBouton.dart @@ -28,12 +28,12 @@ class _ScannerBoutonState extends State { child: Container( decoration: BoxDecoration( shape: BoxShape.circle, - color: kMainColor1.withValues(alpha: 0.7), - boxShadow: const [ + color: kMainColor1.withValues(alpha: 0.6), + boxShadow: [ BoxShadow( - offset: Offset(0, 1.5), + offset: const Offset(0, 1.5), blurRadius: 3.5, - color: kConfigurationColor, // Black color with 12% opacity + color: kConfigurationColor.withValues(alpha: 0.6), // Black color with 12% opacity ) ], ), diff --git a/lib/Components/ScannerDialog.dart b/lib/Components/ScannerDialog.dart index 18ed74e..16b1626 100644 --- a/lib/Components/ScannerDialog.dart +++ b/lib/Components/ScannerDialog.dart @@ -8,7 +8,6 @@ import 'package:mymuseum_visitapp/Models/visitContext.dart'; import 'package:mymuseum_visitapp/Screens/section_page.dart'; import 'package:mymuseum_visitapp/app_context.dart'; import 'package:mymuseum_visitapp/constants.dart'; -import 'package:permission_handler/permission_handler.dart'; import 'package:mobile_scanner/mobile_scanner.dart'; class ScannerDialog extends StatefulWidget { @@ -100,8 +99,8 @@ class _ScannerDialogState extends State { if (barcode.format == BarcodeFormat.qrCode && code.isNotEmpty) { isProcessing = true; - RegExp regExp = RegExp(r'^(?:https:\/\/web\.myinfomate\.be\/([^\/]+)\/([^\/]+)\/([^\/]+)|([^\/]+))$'); // myinfomate - RegExp regExp2 = RegExp(r'^(?:https:\/\/web\.mymuseum\.be\/([^\/]+)\/([^\/]+)\/([^\/]+)|([^\/]+))$'); // myinfomate + RegExp regExp = RegExp(r'^(?:https:\/\/web\.myinfomate\.be\/([^\/]+)\/([^\/]+)\/([^\/]+)|([^\/]+))$'); + RegExp regExp2 = RegExp(r'^(?:https:\/\/web\.mymuseum\.be\/([^\/]+)\/([^\/]+)\/([^\/]+)|([^\/]+))$'); var match = regExp.firstMatch(code); var match2 = regExp2.firstMatch(code); String? instanceId; diff --git a/lib/Screens/Visit/beaconArticleFound.dart b/lib/Screens/ConfigurationPage/beaconArticleFound.dart similarity index 100% rename from lib/Screens/Visit/beaconArticleFound.dart rename to lib/Screens/ConfigurationPage/beaconArticleFound.dart diff --git a/lib/Screens/Visit/components/body.dart b/lib/Screens/ConfigurationPage/components/body.dart similarity index 100% rename from lib/Screens/Visit/components/body.dart rename to lib/Screens/ConfigurationPage/components/body.dart diff --git a/lib/Screens/Visit/components/section_card.dart b/lib/Screens/ConfigurationPage/components/section_card.dart similarity index 100% rename from lib/Screens/Visit/components/section_card.dart rename to lib/Screens/ConfigurationPage/components/section_card.dart diff --git a/lib/Screens/Visit/visit.dart b/lib/Screens/ConfigurationPage/configuration_page.dart similarity index 98% rename from lib/Screens/Visit/visit.dart rename to lib/Screens/ConfigurationPage/configuration_page.dart index a50eb72..1e1d4ce 100644 --- a/lib/Screens/Visit/visit.dart +++ b/lib/Screens/ConfigurationPage/configuration_page.dart @@ -13,9 +13,9 @@ import 'package:mymuseum_visitapp/Helpers/requirement_state_controller.dart'; import 'package:mymuseum_visitapp/Helpers/translationHelper.dart'; import 'package:mymuseum_visitapp/Models/beaconSection.dart'; import 'package:mymuseum_visitapp/Models/visitContext.dart'; +import 'package:mymuseum_visitapp/Screens/ConfigurationPage/beaconArticleFound.dart'; import 'package:mymuseum_visitapp/Screens/Sections/Article/article_page.dart'; import 'package:mymuseum_visitapp/Screens/Sections/Quiz/quizz_page.dart'; -import 'package:mymuseum_visitapp/Screens/Visit/beaconArticleFound.dart'; import 'package:mymuseum_visitapp/Screens/section_page.dart'; import 'package:mymuseum_visitapp/app_context.dart'; import 'package:mymuseum_visitapp/constants.dart'; @@ -24,17 +24,17 @@ import 'package:provider/provider.dart'; import 'components/body.dart'; -class VisitPage extends StatefulWidget { - const VisitPage({Key? key,required this.configuration, required this.isAlreadyAllowed}) : super(key: key); +class ConfigurationPage extends StatefulWidget { + const ConfigurationPage({Key? key,required this.configuration, required this.isAlreadyAllowed}) : super(key: key); final ConfigurationDTO configuration; final bool isAlreadyAllowed; @override - State createState() => _VisitPageState(); + State createState() => _ConfigurationPageState(); } -class _VisitPageState extends State with WidgetsBindingObserver { +class _ConfigurationPageState extends State with WidgetsBindingObserver { //ConfigurationDTO? configuration; int timeBetweenBeaconPopUp = 20000; // 20 sec diff --git a/lib/Screens/Home/configurations_list.dart b/lib/Screens/Home/configurations_list.dart index 76a31ef..8c97cc0 100644 --- a/lib/Screens/Home/configurations_list.dart +++ b/lib/Screens/Home/configurations_list.dart @@ -8,7 +8,7 @@ import 'package:mymuseum_visitapp/Components/LanguageSelection.dart'; import 'package:mymuseum_visitapp/Components/loading_common.dart'; import 'package:mymuseum_visitapp/Helpers/translationHelper.dart'; import 'package:mymuseum_visitapp/Models/visitContext.dart'; -import 'package:mymuseum_visitapp/Screens/Visit/visit.dart'; +import 'package:mymuseum_visitapp/Screens/ConfigurationPage/configuration_page.dart'; import 'package:mymuseum_visitapp/Services/apiService.dart'; import 'package:mymuseum_visitapp/Services/downloadConfiguration.dart'; import 'package:mymuseum_visitapp/app_context.dart'; @@ -79,7 +79,7 @@ class _ConfigurationsListState extends State { Navigator.of(context).pushReplacement(MaterialPageRoute( builder: (context) => - VisitPage(configuration: configurations[index], isAlreadyAllowed: visitAppContext.isScanBeaconAlreadyAllowed), + ConfigurationPage(configuration: configurations[index], isAlreadyAllowed: visitAppContext.isScanBeaconAlreadyAllowed), )); } @@ -110,7 +110,7 @@ class _ConfigurationsListState extends State { Navigator.of(context).pushReplacement(MaterialPageRoute( builder: (context) => - VisitPage(configuration: configurations[index], isAlreadyAllowed: visitAppContext.isScanBeaconAlreadyAllowed), + ConfigurationPage(configuration: configurations[index], isAlreadyAllowed: visitAppContext.isScanBeaconAlreadyAllowed), )); } } diff --git a/lib/Screens/Home/home_3.0.dart b/lib/Screens/Home/home_3.0.dart index b24452b..f9af7ab 100644 --- a/lib/Screens/Home/home_3.0.dart +++ b/lib/Screens/Home/home_3.0.dart @@ -18,7 +18,7 @@ import 'package:mymuseum_visitapp/Helpers/requirement_state_controller.dart'; import 'package:mymuseum_visitapp/Helpers/translationHelper.dart'; import 'package:mymuseum_visitapp/Models/beaconSection.dart'; import 'package:mymuseum_visitapp/Models/visitContext.dart'; -import 'package:mymuseum_visitapp/Screens/Visit/visit.dart'; +import 'package:mymuseum_visitapp/Screens/ConfigurationPage/configuration_page.dart'; import 'package:mymuseum_visitapp/Services/apiService.dart'; import 'package:mymuseum_visitapp/Services/downloadConfiguration.dart'; import 'package:mymuseum_visitapp/app_context.dart'; @@ -186,7 +186,7 @@ class _HomePage3State extends State with WidgetsBindingObserver { onTap: () { Navigator.of(context).push(MaterialPageRoute( builder: (context) => - VisitPage(configuration: configurations[index], isAlreadyAllowed: visitAppContext.isScanBeaconAlreadyAllowed), + ConfigurationPage(configuration: configurations[index], isAlreadyAllowed: visitAppContext.isScanBeaconAlreadyAllowed), )); }, child: Hero( diff --git a/lib/Screens/Sections/Puzzle/message_dialog.dart b/lib/Screens/Sections/Puzzle/message_dialog.dart index 5317aac..1ba157c 100644 --- a/lib/Screens/Sections/Puzzle/message_dialog.dart +++ b/lib/Screens/Sections/Puzzle/message_dialog.dart @@ -24,6 +24,7 @@ void showMessage(TranslationAndResourceDTO translationAndResourceDTO, AppContext children: [ if(translationAndResourceDTO.resourceId != null) Container( + constraints: BoxConstraints(maxHeight: 250), //color: Colors.cyan, height: size.height *0.45, width: size.width *0.5, @@ -38,6 +39,7 @@ void showMessage(TranslationAndResourceDTO translationAndResourceDTO, AppContext ), ), Container( + constraints: BoxConstraints(maxHeight: 350), //color: Colors.green, height: size.height *0.3, width: size.width *0.5, diff --git a/lib/Screens/Sections/Puzzle/puzzle_page.dart b/lib/Screens/Sections/Puzzle/puzzle_page.dart index 3808885..9c650db 100644 --- a/lib/Screens/Sections/Puzzle/puzzle_page.dart +++ b/lib/Screens/Sections/Puzzle/puzzle_page.dart @@ -324,7 +324,7 @@ class _PuzzlePage extends State { child: Center( //color: Colors.green, child: Container( - color: Colors.green, + //color: Colors.green, child: Padding( key: _widgetKey, padding: const EdgeInsets.all(0.0),