UNOV/mymuseum-visitapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates visit name to configuration + scan + misc

Browse Source
This commit is contained in:
Thomas Fransolet 2025-07-09 17:45:27 +02:00
parent 959b494b12
commit c6599e13c9
10 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Components/ScannerBouton.dart
View File

@ -28,12 +28,12 @@ class _ScannerBoutonState extends State<ScannerBouton> {
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
)
],
),

5
lib/Components/ScannerDialog.dart
View File

@ -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<ScannerDialog> {
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;

0
lib/Screens/Visit/beaconArticleFound.dart → lib/Screens/ConfigurationPage/beaconArticleFound.dart
View File

0
lib/Screens/Visit/components/body.dart → lib/Screens/ConfigurationPage/components/body.dart
View File

0
lib/Screens/Visit/components/section_card.dart → lib/Screens/ConfigurationPage/components/section_card.dart
View File

10
lib/Screens/Visit/visit.dart → lib/Screens/ConfigurationPage/configuration_page.dart
View File

@ -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<VisitPage> createState() => _VisitPageState();
State<ConfigurationPage> createState() => _ConfigurationPageState();
}
class _VisitPageState extends State<VisitPage> with WidgetsBindingObserver {
class _ConfigurationPageState extends State<ConfigurationPage> with WidgetsBindingObserver {
//ConfigurationDTO? configuration;
int timeBetweenBeaconPopUp = 20000; // 20 sec

6
lib/Screens/Home/configurations_list.dart
View File

@ -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<ConfigurationsList> {
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<ConfigurationsList> {
Navigator.of(context).pushReplacement(MaterialPageRoute(
builder: (context) =>
VisitPage(configuration: configurations[index], isAlreadyAllowed: visitAppContext.isScanBeaconAlreadyAllowed),
ConfigurationPage(configuration: configurations[index], isAlreadyAllowed: visitAppContext.isScanBeaconAlreadyAllowed),
));
}
}

4
lib/Screens/Home/home_3.0.dart
View File

@ -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<HomePage3> 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(

2
lib/Screens/Sections/Puzzle/message_dialog.dart
View File

@ -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,

2
lib/Screens/Sections/Puzzle/puzzle_page.dart
View File

@ -324,7 +324,7 @@ class _PuzzlePage extends State<PuzzlePage> {
child: Center(
//color: Colors.green,
child: Container(
color: Colors.green,
//color: Colors.green,
child: Padding(
key: _widgetKey,
padding: const EdgeInsets.all(0.0),