Updates visit name to configuration + scan + misc
This commit is contained in:
parent
959b494b12
commit
c6599e13c9
@ -28,12 +28,12 @@ class _ScannerBoutonState extends State<ScannerBouton> {
|
|||||||
child: Container(
|
child: Container(
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
shape: BoxShape.circle,
|
shape: BoxShape.circle,
|
||||||
color: kMainColor1.withValues(alpha: 0.7),
|
color: kMainColor1.withValues(alpha: 0.6),
|
||||||
boxShadow: const [
|
boxShadow: [
|
||||||
BoxShadow(
|
BoxShadow(
|
||||||
offset: Offset(0, 1.5),
|
offset: const Offset(0, 1.5),
|
||||||
blurRadius: 3.5,
|
blurRadius: 3.5,
|
||||||
color: kConfigurationColor, // Black color with 12% opacity
|
color: kConfigurationColor.withValues(alpha: 0.6), // Black color with 12% opacity
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|||||||
@ -8,7 +8,6 @@ import 'package:mymuseum_visitapp/Models/visitContext.dart';
|
|||||||
import 'package:mymuseum_visitapp/Screens/section_page.dart';
|
import 'package:mymuseum_visitapp/Screens/section_page.dart';
|
||||||
import 'package:mymuseum_visitapp/app_context.dart';
|
import 'package:mymuseum_visitapp/app_context.dart';
|
||||||
import 'package:mymuseum_visitapp/constants.dart';
|
import 'package:mymuseum_visitapp/constants.dart';
|
||||||
import 'package:permission_handler/permission_handler.dart';
|
|
||||||
import 'package:mobile_scanner/mobile_scanner.dart';
|
import 'package:mobile_scanner/mobile_scanner.dart';
|
||||||
|
|
||||||
class ScannerDialog extends StatefulWidget {
|
class ScannerDialog extends StatefulWidget {
|
||||||
@ -100,8 +99,8 @@ class _ScannerDialogState extends State<ScannerDialog> {
|
|||||||
if (barcode.format == BarcodeFormat.qrCode && code.isNotEmpty) {
|
if (barcode.format == BarcodeFormat.qrCode && code.isNotEmpty) {
|
||||||
isProcessing = true;
|
isProcessing = true;
|
||||||
|
|
||||||
RegExp regExp = RegExp(r'^(?:https:\/\/web\.myinfomate\.be\/([^\/]+)\/([^\/]+)\/([^\/]+)|([^\/]+))$'); // myinfomate
|
RegExp regExp = RegExp(r'^(?:https:\/\/web\.myinfomate\.be\/([^\/]+)\/([^\/]+)\/([^\/]+)|([^\/]+))$');
|
||||||
RegExp regExp2 = RegExp(r'^(?:https:\/\/web\.mymuseum\.be\/([^\/]+)\/([^\/]+)\/([^\/]+)|([^\/]+))$'); // myinfomate
|
RegExp regExp2 = RegExp(r'^(?:https:\/\/web\.mymuseum\.be\/([^\/]+)\/([^\/]+)\/([^\/]+)|([^\/]+))$');
|
||||||
var match = regExp.firstMatch(code);
|
var match = regExp.firstMatch(code);
|
||||||
var match2 = regExp2.firstMatch(code);
|
var match2 = regExp2.firstMatch(code);
|
||||||
String? instanceId;
|
String? instanceId;
|
||||||
|
|||||||
@ -13,9 +13,9 @@ import 'package:mymuseum_visitapp/Helpers/requirement_state_controller.dart';
|
|||||||
import 'package:mymuseum_visitapp/Helpers/translationHelper.dart';
|
import 'package:mymuseum_visitapp/Helpers/translationHelper.dart';
|
||||||
import 'package:mymuseum_visitapp/Models/beaconSection.dart';
|
import 'package:mymuseum_visitapp/Models/beaconSection.dart';
|
||||||
import 'package:mymuseum_visitapp/Models/visitContext.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/Article/article_page.dart';
|
||||||
import 'package:mymuseum_visitapp/Screens/Sections/Quiz/quizz_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/Screens/section_page.dart';
|
||||||
import 'package:mymuseum_visitapp/app_context.dart';
|
import 'package:mymuseum_visitapp/app_context.dart';
|
||||||
import 'package:mymuseum_visitapp/constants.dart';
|
import 'package:mymuseum_visitapp/constants.dart';
|
||||||
@ -24,17 +24,17 @@ import 'package:provider/provider.dart';
|
|||||||
|
|
||||||
import 'components/body.dart';
|
import 'components/body.dart';
|
||||||
|
|
||||||
class VisitPage extends StatefulWidget {
|
class ConfigurationPage extends StatefulWidget {
|
||||||
const VisitPage({Key? key,required this.configuration, required this.isAlreadyAllowed}) : super(key: key);
|
const ConfigurationPage({Key? key,required this.configuration, required this.isAlreadyAllowed}) : super(key: key);
|
||||||
|
|
||||||
final ConfigurationDTO configuration;
|
final ConfigurationDTO configuration;
|
||||||
final bool isAlreadyAllowed;
|
final bool isAlreadyAllowed;
|
||||||
|
|
||||||
@override
|
@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;
|
//ConfigurationDTO? configuration;
|
||||||
|
|
||||||
int timeBetweenBeaconPopUp = 20000; // 20 sec
|
int timeBetweenBeaconPopUp = 20000; // 20 sec
|
||||||
@ -8,7 +8,7 @@ import 'package:mymuseum_visitapp/Components/LanguageSelection.dart';
|
|||||||
import 'package:mymuseum_visitapp/Components/loading_common.dart';
|
import 'package:mymuseum_visitapp/Components/loading_common.dart';
|
||||||
import 'package:mymuseum_visitapp/Helpers/translationHelper.dart';
|
import 'package:mymuseum_visitapp/Helpers/translationHelper.dart';
|
||||||
import 'package:mymuseum_visitapp/Models/visitContext.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/apiService.dart';
|
||||||
import 'package:mymuseum_visitapp/Services/downloadConfiguration.dart';
|
import 'package:mymuseum_visitapp/Services/downloadConfiguration.dart';
|
||||||
import 'package:mymuseum_visitapp/app_context.dart';
|
import 'package:mymuseum_visitapp/app_context.dart';
|
||||||
@ -79,7 +79,7 @@ class _ConfigurationsListState extends State<ConfigurationsList> {
|
|||||||
|
|
||||||
Navigator.of(context).pushReplacement(MaterialPageRoute(
|
Navigator.of(context).pushReplacement(MaterialPageRoute(
|
||||||
builder: (context) =>
|
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(
|
Navigator.of(context).pushReplacement(MaterialPageRoute(
|
||||||
builder: (context) =>
|
builder: (context) =>
|
||||||
VisitPage(configuration: configurations[index], isAlreadyAllowed: visitAppContext.isScanBeaconAlreadyAllowed),
|
ConfigurationPage(configuration: configurations[index], isAlreadyAllowed: visitAppContext.isScanBeaconAlreadyAllowed),
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -18,7 +18,7 @@ import 'package:mymuseum_visitapp/Helpers/requirement_state_controller.dart';
|
|||||||
import 'package:mymuseum_visitapp/Helpers/translationHelper.dart';
|
import 'package:mymuseum_visitapp/Helpers/translationHelper.dart';
|
||||||
import 'package:mymuseum_visitapp/Models/beaconSection.dart';
|
import 'package:mymuseum_visitapp/Models/beaconSection.dart';
|
||||||
import 'package:mymuseum_visitapp/Models/visitContext.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/apiService.dart';
|
||||||
import 'package:mymuseum_visitapp/Services/downloadConfiguration.dart';
|
import 'package:mymuseum_visitapp/Services/downloadConfiguration.dart';
|
||||||
import 'package:mymuseum_visitapp/app_context.dart';
|
import 'package:mymuseum_visitapp/app_context.dart';
|
||||||
@ -186,7 +186,7 @@ class _HomePage3State extends State<HomePage3> with WidgetsBindingObserver {
|
|||||||
onTap: () {
|
onTap: () {
|
||||||
Navigator.of(context).push(MaterialPageRoute(
|
Navigator.of(context).push(MaterialPageRoute(
|
||||||
builder: (context) =>
|
builder: (context) =>
|
||||||
VisitPage(configuration: configurations[index], isAlreadyAllowed: visitAppContext.isScanBeaconAlreadyAllowed),
|
ConfigurationPage(configuration: configurations[index], isAlreadyAllowed: visitAppContext.isScanBeaconAlreadyAllowed),
|
||||||
));
|
));
|
||||||
},
|
},
|
||||||
child: Hero(
|
child: Hero(
|
||||||
|
|||||||
@ -24,6 +24,7 @@ void showMessage(TranslationAndResourceDTO translationAndResourceDTO, AppContext
|
|||||||
children: [
|
children: [
|
||||||
if(translationAndResourceDTO.resourceId != null)
|
if(translationAndResourceDTO.resourceId != null)
|
||||||
Container(
|
Container(
|
||||||
|
constraints: BoxConstraints(maxHeight: 250),
|
||||||
//color: Colors.cyan,
|
//color: Colors.cyan,
|
||||||
height: size.height *0.45,
|
height: size.height *0.45,
|
||||||
width: size.width *0.5,
|
width: size.width *0.5,
|
||||||
@ -38,6 +39,7 @@ void showMessage(TranslationAndResourceDTO translationAndResourceDTO, AppContext
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
Container(
|
Container(
|
||||||
|
constraints: BoxConstraints(maxHeight: 350),
|
||||||
//color: Colors.green,
|
//color: Colors.green,
|
||||||
height: size.height *0.3,
|
height: size.height *0.3,
|
||||||
width: size.width *0.5,
|
width: size.width *0.5,
|
||||||
|
|||||||
@ -324,7 +324,7 @@ class _PuzzlePage extends State<PuzzlePage> {
|
|||||||
child: Center(
|
child: Center(
|
||||||
//color: Colors.green,
|
//color: Colors.green,
|
||||||
child: Container(
|
child: Container(
|
||||||
color: Colors.green,
|
//color: Colors.green,
|
||||||
child: Padding(
|
child: Padding(
|
||||||
key: _widgetKey,
|
key: _widgetKey,
|
||||||
padding: const EdgeInsets.all(0.0),
|
padding: const EdgeInsets.all(0.0),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user