Merge pull request #1 from RemoCharles/dev

Merge dev with master
RemoCharles · Dec 6, 2021 · b114dc2 · b114dc2
2 parents 57bd460 + 46e0a99
commit b114dc2
Show file tree

Hide file tree

Showing 48 changed files with 403 additions and 169 deletions.
diff --git a/assets/images/headers/buchenwaelder.jpg b/assets/images/headers/buchenwaelder.jpg
diff --git a/assets/images/heritage/buchenwaelder1.jpg b/assets/images/heritage/buchenwaelder1.jpg
diff --git a/assets/images/heritage/buchenwaelder2.jpg b/assets/images/heritage/buchenwaelder2.jpg
diff --git a/assets/images/heritage/buchenwaelder3.jpg b/assets/images/heritage/buchenwaelder3.jpg
diff --git a/assets/images/icons/buchenwaelder.png b/assets/images/icons/buchenwaelder.png
diff --git a/assets/images/qr/buchenwaelder.png b/assets/images/qr/buchenwaelder.png
diff --git a/assets/images/video_placeholder.png b/assets/images/video_placeholder.png
diff --git a/assets/videos/heritage/de/aletsch.mp4 b/assets/videos/heritage/de/aletsch.mp4
diff --git a/assets/videos/heritage/de/arena.mp4 b/assets/videos/heritage/de/arena.mp4
diff --git a/assets/videos/heritage/de/bahn.mp4 b/assets/videos/heritage/de/bahn.mp4
diff --git a/assets/videos/heritage/de/lavaux.mp4 b/assets/videos/heritage/de/lavaux.mp4
diff --git a/assets/videos/heritage/de/st_gallen.mp4 b/assets/videos/heritage/de/st_gallen.mp4
diff --git a/assets/videos/heritage/en/aletsch.mp4 b/assets/videos/heritage/en/aletsch.mp4
diff --git a/assets/videos/heritage/en/arena.mp4 b/assets/videos/heritage/en/arena.mp4
diff --git a/assets/videos/heritage/en/bahn.mp4 b/assets/videos/heritage/en/bahn.mp4
diff --git a/assets/videos/heritage/en/lavaux.mp4 b/assets/videos/heritage/en/lavaux.mp4
diff --git a/assets/videos/heritage/en/st_gallen.mp4 b/assets/videos/heritage/en/st_gallen.mp4
diff --git a/assets/videos/heritage/fr/aletsch.mp4 b/assets/videos/heritage/fr/aletsch.mp4
diff --git a/assets/videos/heritage/fr/arena.mp4 b/assets/videos/heritage/fr/arena.mp4
diff --git a/assets/videos/heritage/fr/bahn.mp4 b/assets/videos/heritage/fr/bahn.mp4
diff --git a/assets/videos/heritage/fr/lavaux.mp4 b/assets/videos/heritage/fr/lavaux.mp4
diff --git a/assets/videos/heritage/fr/st_gallen.mp4 b/assets/videos/heritage/fr/st_gallen.mp4
diff --git a/assets/videos/heritage/it/aletsch.mp4 b/assets/videos/heritage/it/aletsch.mp4
diff --git a/assets/videos/heritage/it/arena.mp4 b/assets/videos/heritage/it/arena.mp4
diff --git a/assets/videos/heritage/it/bahn.mp4 b/assets/videos/heritage/it/bahn.mp4
diff --git a/assets/videos/heritage/it/lavaux.mp4 b/assets/videos/heritage/it/lavaux.mp4
diff --git a/assets/videos/heritage/it/st_gallen.mp4 b/assets/videos/heritage/it/st_gallen.mp4
diff --git a/assets/videos/unesco_de.mp4 b/assets/videos/unesco_de.mp4
diff --git a/assets/videos/unesco_video.mp4 → assets/videos/unesco_en.mp4 b/assets/videos/unesco_video.mp4 → assets/videos/unesco_en.mp4
diff --git a/assets/videos/unesco_fr.mp4 b/assets/videos/unesco_fr.mp4
diff --git a/assets/videos/unesco_it.mp4 b/assets/videos/unesco_it.mp4
diff --git a/lib/classes/heritage.dart b/lib/classes/heritage.dart
diff --git a/lib/classes/heritage_data.dart b/lib/classes/heritage_data.dart
diff --git a/lib/classes/video_items.dart b/lib/classes/video_items.dart
diff --git a/lib/lang/lang_de.json b/lib/lang/lang_de.json
diff --git a/lib/lang/lang_en.json b/lib/lang/lang_en.json
diff --git a/lib/lang/lang_fr.json b/lib/lang/lang_fr.json
diff --git a/lib/lang/lang_it.json b/lib/lang/lang_it.json
diff --git a/lib/main.dart b/lib/main.dart
diff --git a/lib/pages/heritage_detail_site.dart b/lib/pages/heritage_detail_site.dart
diff --git a/lib/pages/heritage_detail_video_site.dart b/lib/pages/heritage_detail_video_site.dart
diff --git a/lib/pages/index_site.dart b/lib/pages/index_site.dart
diff --git a/lib/pages/quiz_end_site.dart b/lib/pages/quiz_end_site.dart
diff --git a/lib/pages/quiz_site.dart b/lib/pages/quiz_site.dart
diff --git a/lib/pages/quiz_start_site.dart b/lib/pages/quiz_start_site.dart
diff --git a/lib/pages/video_site.dart b/lib/pages/video_site.dart
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml