Theme + localize

.gitignore

@@ -265,3 +265,4 @@ __pycache__/
 /Ignore
 /AideDeJeu/AideDeJeuWeb/Properties/PublishProfiles/AideDeJeuWeb - Web Deploy.pubxml
 *.lock
+*.lock

aidedejeu_flutter/lib/main.dart

@@ -1,3 +1,4 @@
+import 'package:aidedejeu_flutter/theme.dart';
 import 'package:aidedejeu_flutter/widgets/homepage.dart';
 import 'package:flutter/material.dart';
 
@@ -8,24 +9,7 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       title: 'Haches & Dés',
-      theme: ThemeData(
+      theme: mainTheme(),
-        primarySwatch: Colors.deepOrange,
-        appBarTheme: AppBarTheme(
-          color: Colors.white,
-          iconTheme: IconThemeData(color: Colors.black),
-          textTheme: TextTheme(
-              headline6: TextStyle(fontSize: 28.0, color: Colors.black, fontWeight: FontWeight.bold, fontFamily: 'Cinzel')),
-        ),
-        brightness: Brightness.light,
-        primaryColor: Colors.lightBlue[800],
-        accentColor: Colors.cyan[600],
-        fontFamily: 'LinuxLibertine',
-        textTheme: TextTheme(
-          headline5: TextStyle(fontSize: 28.0, fontWeight: FontWeight.bold, fontFamily: 'Cinzel'),
-          headline6: TextStyle(fontSize: 22.0, fontStyle: FontStyle.normal),
-          bodyText2: TextStyle(fontSize: 16.0),
-        ),
-      ),
       home: HomePage(),
     );
   }

aidedejeu_flutter/lib/theme.dart

@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_markdown/flutter_markdown.dart';
+
+ThemeData mainTheme() {
+  return ThemeData(
+    primarySwatch: Colors.deepOrange,
+    appBarTheme: AppBarTheme(
+      color: Colors.white,
+      iconTheme: IconThemeData(color: Colors.black),
+      textTheme: TextTheme(
+          headline6: TextStyle(fontSize: 28.0, color: Colors.black, fontWeight: FontWeight.bold, fontFamily: 'Cinzel')),
+    ),
+    brightness: Brightness.light,
+    primaryColor: Colors.lightBlue[800],
+    accentColor: Colors.cyan[600],
+    fontFamily: 'LinuxLibertine',
+    textTheme: TextTheme(
+      headline5: TextStyle(fontSize: 28.0, fontWeight: FontWeight.bold, fontFamily: 'Cinzel'),
+      headline6: TextStyle(fontSize: 22.0, fontStyle: FontStyle.normal),
+      bodyText2: TextStyle(fontSize: 16.0),
+    ),
+  );
+}
+
+MarkdownStyleSheet mainMarkdownStyleSheet(BuildContext context) {
+  return MarkdownStyleSheet.fromTheme(Theme.of(context)).copyWith(
+    tableColumnWidth: IntrinsicColumnWidth(),
+    tableCellsPadding: EdgeInsets.all(0.2),
+  );
+}

aidedejeu_flutter/lib/widgets/library.dart

@@ -7,6 +7,8 @@ import 'package:flutter/services.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 
+import '../theme.dart';
+
 class LibraryPage extends StatefulWidget {
   LibraryPage({Key key, @required this.id}) : super(key: key);
 
@@ -48,10 +50,8 @@ class _LibraryPageState extends State<LibraryPage> {
   @protected
   @mustCallSuper
   void didChangeDependencies() {
-    styleSheet = MarkdownStyleSheet.fromTheme(Theme.of(context)).copyWith(
+    super.didChangeDependencies();
-      tableColumnWidth: IntrinsicColumnWidth(),
+    styleSheet = mainMarkdownStyleSheet(context);
-      tableCellsPadding: EdgeInsets.all(0.2),
-    );
   }
 
   Future<Item> _loadItem() async {

aidedejeu_flutter/lib/widgets/pceditor.dart

@@ -81,68 +81,77 @@ class _PCEditorPageState extends State<PCEditorPage> {
   }
 
   Widget _loadRaceSubRaceWidget() {
-    return _race != null ? Column(
+    return _race != null
-      children: [
+        ? Column(
-        Text("Augmentation de caractéristiques"),
+            children: [
-        MarkdownBody(
+              Text("Augmentation de caractéristiques"),
-          data: (_race?.abilityScoreIncrease ?? "") +
+              MarkdownBody(
-              "\n\n" +
+                data: (_race?.abilityScoreIncrease ?? "") +
-              (_subRace?.abilityScoreIncrease ?? ""),
+                    "\n\n" +
-          onTapLink: (link) => Navigator.push(
+                    (_subRace?.abilityScoreIncrease ?? ""),
-            context,
+                onTapLink: (link) => Navigator.push(
-            MaterialPageRoute(builder: (context) => LibraryPage(id: link)),
+                  context,
-          ),
+                  MaterialPageRoute(
-        ),
+                      builder: (context) => LibraryPage(id: link)),
-        Text("Âge"),
+                ),
-        MarkdownBody(
+              ),
-          data: _race?.age ?? "",
+              Text("Âge"),
-          onTapLink: (link) => Navigator.push(
+              MarkdownBody(
-            context,
+                data: _race?.age ?? "",
-            MaterialPageRoute(builder: (context) => LibraryPage(id: link)),
+                onTapLink: (link) => Navigator.push(
-          ),
+                  context,
-        ),
+                  MaterialPageRoute(
-        Text("Alignement"),
+                      builder: (context) => LibraryPage(id: link)),
-        MarkdownBody(
+                ),
-          data: _race?.alignment ?? "",
+              ),
-          onTapLink: (link) => Navigator.push(
+              Text("Alignement"),
-            context,
+              MarkdownBody(
-            MaterialPageRoute(builder: (context) => LibraryPage(id: link)),
+                data: _race?.alignment ?? "",
-          ),
+                onTapLink: (link) => Navigator.push(
-        ),
+                  context,
-        Text("Taille"),
+                  MaterialPageRoute(
-        MarkdownBody(
+                      builder: (context) => LibraryPage(id: link)),
-          data: _race?.size ?? "",
+                ),
-          onTapLink: (link) => Navigator.push(
+              ),
-            context,
+              Text("Taille"),
-            MaterialPageRoute(builder: (context) => LibraryPage(id: link)),
+              MarkdownBody(
-          ),
+                data: _race?.size ?? "",
-        ),
+                onTapLink: (link) => Navigator.push(
-        Text("Vitesse"),
+                  context,
-        MarkdownBody(
+                  MaterialPageRoute(
-          data: _race?.speed ?? "",
+                      builder: (context) => LibraryPage(id: link)),
-          onTapLink: (link) => Navigator.push(
+                ),
-            context,
+              ),
-            MaterialPageRoute(builder: (context) => LibraryPage(id: link)),
+              Text("Vitesse"),
-          ),
+              MarkdownBody(
-        ),
+                data: _race?.speed ?? "",
-        Text("Vision dans le noir"),
+                onTapLink: (link) => Navigator.push(
-        MarkdownBody(
+                  context,
-          data: _race?.darkvision ?? "",
+                  MaterialPageRoute(
-          onTapLink: (link) => Navigator.push(
+                      builder: (context) => LibraryPage(id: link)),
-            context,
+                ),
-            MaterialPageRoute(builder: (context) => LibraryPage(id: link)),
+              ),
-          ),
+              Text("Vision dans le noir"),
-        ),
+              MarkdownBody(
-        Text("Langues"),
+                data: _race?.darkvision ?? "",
-        MarkdownBody(
+                onTapLink: (link) => Navigator.push(
-          data: _race?.languages ?? "",
+                  context,
-          onTapLink: (link) => Navigator.push(
+                  MaterialPageRoute(
-            context,
+                      builder: (context) => LibraryPage(id: link)),
-            MaterialPageRoute(builder: (context) => LibraryPage(id: link)),
+                ),
-          ),
+              ),
-        ),
+              Text("Langues"),
-      ],
+              MarkdownBody(
-    ): SizedBox.shrink();
+                data: _race?.languages ?? "",
+                onTapLink: (link) => Navigator.push(
+                  context,
+                  MaterialPageRoute(
+                      builder: (context) => LibraryPage(id: link)),
+                ),
+              ),
+            ],
+          )
+        : SizedBox.shrink();
   }
 
   Widget _loadSubRacesWidget() {
@@ -167,18 +176,42 @@ class _PCEditorPageState extends State<PCEditorPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return DefaultTabController(
-      appBar: AppBar(
+      length: 3,
-        title: Text("Personnage"),
+      child: Scaffold(
+        appBar: AppBar(
+          title: Text("Personnage"),
+          bottom: TabBar(
+            tabs: <Widget>[
+              Text(
+                "Race",
+                style: TextStyle(color: Colors.black),
+              ),
+              Text(
+                "Historique",
+                style: TextStyle(color: Colors.black),
+              ),
+              Text(
+                "Classe",
+                style: TextStyle(color: Colors.black),
+              ),
+            ],
+          ),
+        ),
+        body: TabBarView(
+          children: [
+            ListView(
+              children: <Widget>[
+                _loadRacesWidget(),
+                _loadSubRacesWidget(),
+                _loadRaceSubRaceWidget(),
+              ],
+            ),
+            Text(""),
+            Text(""),
+          ],
+        ),
       ),
-      body: ListView(
-        children: <Widget>[
-          _loadRacesWidget(),
-          _loadSubRacesWidget(),
-          _loadRaceSubRaceWidget()
-        ],
-      ),
-
     );
   }
 }

aidedejeu_flutter/pubspec.lock

@@ -1,6 +1,20 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.3"
+  analyzer:
+    dependency: transitive
+    description:
+      name: analyzer
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.39.4"
   archive:
     dependency: transitive
     description:
@@ -64,6 +78,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.3"
+  csslib:
+    dependency: transitive
+    description:
+      name: csslib
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.16.1"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -71,6 +92,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.3"
+  dart_style:
+    dependency: transitive
+    description:
+      name: dart_style
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.3"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -83,6 +111,11 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.2.0"
+  flutter_localizations:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_markdown:
     dependency: "direct main"
     description:
@@ -102,6 +135,20 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.0"
+  html:
+    dependency: transitive
+    description:
+      name: html
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.14.0+3"
   image:
     dependency: transitive
     description:
@@ -109,6 +156,27 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.4"
+  intl:
+    dependency: transitive
+    description:
+      name: intl
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.16.1"
+  intl_translation:
+    dependency: "direct dev"
+    description:
+      name: intl_translation
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.17.9"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.1+1"
   markdown:
     dependency: transitive
     description:
@@ -137,6 +205,27 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.0.4"
+  node_interop:
+    dependency: transitive
+    description:
+      name: node_interop
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.3"
+  node_io:
+    dependency: transitive
+    description:
+      name: node_io
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1+2"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.9.1"
   path:
     dependency: "direct main"
     description:
@@ -179,6 +268,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.4"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.4.3"
   quiver:
     dependency: transitive
     description:
@@ -268,6 +364,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.8"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.9.7+13"
   xml:
     dependency: transitive
     description:
@@ -275,6 +378,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.5.0"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.0"
 sdks:
-  dart: ">=2.6.0 <3.0.0"
+  dart: ">=2.7.0 <3.0.0"
   flutter: ">=1.12.1 <2.0.0"

aidedejeu_flutter/pubspec.yaml

@@ -19,6 +19,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  flutter_localizations:
+    sdk: flutter
   flutter_markdown: ^0.3.3
   sqflite:
   path:
@@ -32,6 +34,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  intl_translation:
 
 
 # For information on the generic Dart part of this file, see the