Skip to content

GitLab

Commit b604aaaf authored by Clouard Regis's avatar Clouard Regis
Browse files

Fixed bug on infobox pages

parent 76ac657d
Hide whitespace changes
Inline Side-by-side
android/app/src/main/AndroidManifest.xml
View file @ b604aaaf
......@@ -29,7 +29,7 @@
android:name="io.flutter.app.FlutterApplication"
android:label="Vikazimut"
android:icon="@mipmap/ic_launcher"
android:usesCleartextTraffic="false">
android:usesCleartextTraffic="true">
<activity
android:name="fr.ensicaen.vikazimut.MainActivity"
android:launchMode="singleTop"
......
i18n/fr.json
View file @ b604aaaf
......@@ -151,7 +151,7 @@
"walk_started": "Et c'est parti !",
"developer_mode": "Mode développeur",
"confirm_gps_title": "Fonction GPS",
"confirm_gps_message": "Vikazimut nécessite la location de votre appareil y compris en arrière plan pour fonctionner. La position GPS est utilisée pour gérer le parcours, dessiner la trace et afficher des statistiques sur le parcours. Aucune donnée n'est exportée de l'appareil sans votre accord et la trace est intemporalisée.",
"confirm_gps_message": "Vikazimut nécessite la localisation de votre appareil y compris en arrière plan pour fonctionner. La position GPS est utilisée pour gérer le parcours, dessiner la trace et afficher des statistiques sur le parcours. Aucune donnée n'est exportée de l'appareil sans votre accord et la trace est intemporalisée.",
"result_table_distance_column_tooltip": "La longueur du trajet effectué entre les deux postes en mètres\n(La distance à vol d'oiseau entre les deux postes en mètres)\nLe surcoût de distance en pourcentage",
"result_table_pace_column_tooltip": "La réduction kilométrique en min/km\n(La vitesse en km/h)",
"website_worldmap_page": "worldmap",
......
lib/map_choice/map_choice_view.dart
View file @ b604aaaf
......@@ -25,7 +25,7 @@ class MapChoiceViewState extends State<MapChoiceView> {
bool _isSearching = false;
String searchQuery = "";
MapChoiceViewState(CourseMode mode): _presenter = MapChoicePresenter(mode);
MapChoiceViewState(CourseMode mode) : _presenter = MapChoicePresenter(mode);
@override
Widget build(BuildContext context) {
......@@ -57,7 +57,10 @@ class MapChoiceViewState extends State<MapChoiceView> {
})),
),
),
body: MapListView(searchQuery: searchQuery, presenter: _presenter),
body: Semantics(
label: "Liste des cartes disponibles",
child: MapListView(searchQuery: searchQuery, presenter: _presenter),
),
),
);
}
......
lib/map_choice/map_list_view.dart
View file @ b604aaaf
......@@ -60,7 +60,8 @@ class _MapListViewState extends State<MapListView> {
ScaffoldMessenger.of(context).showSnackBar(snackBar);
}
});
return MapProxyListView(presenter: widget.presenter, mapProxies: snapshot.data!, searchQuery: widget.searchQuery);
// TODO
return Semantics(label: "Liste des cartes disponibles", child: MapProxyListView(presenter: widget.presenter, mapProxies: snapshot.data!, searchQuery: widget.searchQuery),);
} else {
return _WaitingWidget();
}
......
lib/splash_screen.dart
View file @ b604aaaf
......@@ -54,13 +54,16 @@ class _SplashScreenState extends State<SplashScreen> with TickerProviderStateMix
@override
Widget build(BuildContext context) {
return Center(
child: Transform.scale(
scale: _scale,
child: Image.asset(
'assets/images/splash.webp',
isAntiAlias: true,
scale: 2.5,
return Semantics(
label: "Powered by ENSICAEN", // TODO
child: Center(
child: Transform.scale(
scale: _scale,
child: Image.asset(
'assets/images/splash.webp',
isAntiAlias: true,
scale: 2.5,
),
),
),
);
......
lib/utils/alert_dialog.dart
View file @ b604aaaf
......@@ -131,122 +131,130 @@ Future<void> _buildAndShowDialog({
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16.0)),
elevation: 0.0,
backgroundColor: Colors.transparent,
child: Stack(
children: <Widget>[
Container(
width: screenWidth >= 600 ? 500 : screenWidth,
padding: const EdgeInsets.only(
top: 45.0 + 16.0,
bottom: 16.0,
left: 16.0,
right: 16.0,
),
margin: const EdgeInsets.only(top: 55.0),
decoration: BoxDecoration(
color: Theme.of(context).dialogBackgroundColor,
shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(16.0),
boxShadow: [
const BoxShadow(
color: Colors.black26,
blurRadius: 10.0,
offset: const Offset(0.0, 10.0),
),
],
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
if (title.isNotEmpty)
Text(
title,
style: TextStyle(
color: color,
fontSize: 20.0,
fontWeight: FontWeight.w700,
),
child: Semantics(
scopesRoute: true,
explicitChildNodes: true,
namesRoute: true,
label: '$title: $message',
child: Stack(
children: <Widget>[
Container(
width: screenWidth >= 600 ? 500 : screenWidth,
padding: const EdgeInsets.only(
top: 45.0 + 16.0,
bottom: 16.0,
left: 16.0,
right: 16.0,
),
margin: const EdgeInsets.only(top: 55.0),
decoration: BoxDecoration(
color: Theme.of(context).dialogBackgroundColor,
shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(16.0),
boxShadow: [
const BoxShadow(
color: Colors.black26,
blurRadius: 10.0,
offset: const Offset(0.0, 10.0),
),
const SizedBox(height: 16.0),
Flexible(
fit: FlexFit.loose,
child: SingleChildScrollView(
child: Text(
message,
textAlign: TextAlign.center,
style: const TextStyle(
fontSize: 16.0,
],
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
if (title.isNotEmpty)
Text(
title,
style: TextStyle(
color: color,
fontSize: 20.0,
fontWeight: FontWeight.w700,
),
),
const SizedBox(height: 16.0),
Flexible(
fit: FlexFit.loose,
child: SingleChildScrollView(
child: Text(
message,
textAlign: TextAlign.center,
style: const TextStyle(
fontSize: 16.0,
),
),
),
),
),
if (usePattern)
PatternLock(
secretCode: [0, 1, 2, 3],
onSuccess: () {
Navigator.of(context).pop();
if (positiveButtonAction != null) {
positiveButtonAction();
}
},
),
const SizedBox(height: 16.0),
if (checkboxMessage != null && checkboxMessage.isNotEmpty)
CheckBoxContainer(
checkboxValue: remember,
checkboxMessage: checkboxMessage,
color: color,
),
Align(
alignment: Alignment.bottomRight,
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
if (!usePattern)
TextButton(
child: Text(
positiveButtonText,
style: TextStyle(color: color),
if (usePattern)
PatternLock(
secretCode: [0, 1, 2, 3],
onSuccess: () {
Navigator.of(context).pop();
if (positiveButtonAction != null) {
positiveButtonAction();
}
},
),
const SizedBox(height: 16.0),
if (checkboxMessage != null && checkboxMessage.isNotEmpty)
CheckBoxContainer(
checkboxValue: remember,
checkboxMessage: checkboxMessage,
color: color,
),
Align(
alignment: Alignment.bottomRight,
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
if (!usePattern)
TextButton(
child: Text(
positiveButtonText,
style: TextStyle(color: color),
),
onPressed: () {
if (remember[0] && checkboxAction != null) {
checkboxAction();
}
Navigator.of(context).pop();
if (positiveButtonAction != null) {
positiveButtonAction();
}
},
),
onPressed: () {
if (remember[0] && checkboxAction != null) {
checkboxAction();
}
Navigator.of(context).pop();
if (positiveButtonAction != null) {
positiveButtonAction();
}
},
const SizedBox(
width: 40.0,
),
const SizedBox(width: 40.0,),
if (negativeButtonText != null)
TextButton(
child: Text(
negativeButtonText,
style: TextStyle(color: color),
if (negativeButtonText != null)
TextButton(
child: Text(
negativeButtonText,
style: TextStyle(color: color),
),
onPressed: () {
Navigator.of(context).pop();
if (negativeButtonAction != null) {
negativeButtonAction();
}
},
),
onPressed: () {
Navigator.of(context).pop();
if (negativeButtonAction != null) {
negativeButtonAction();
}
},
),
],
],
),
),
),
],
],
),
),
),
Positioned(
left: 16.0,
right: 16.0,
child: CircleAvatar(
backgroundColor: color,
radius: 45.0,
child: dialogIcon,
Positioned(
left: 16.0,
right: 16.0,
child: CircleAvatar(
backgroundColor: color,
radius: 45.0,
child: dialogIcon,
),
),
),
],
],
),
),
);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment