From 512adf99d8fb76588c13073f9050e8ab49a163bf Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Wed, 4 Mar 2020 23:19:51 +0100 Subject: [PATCH] Ajustements --- aidedejeu_flutter/lib/widgets/pceditor.dart | 134 +++++++++++++------- aidedejeu_flutter/pubspec.lock | 2 +- 2 files changed, 88 insertions(+), 48 deletions(-) diff --git a/aidedejeu_flutter/lib/widgets/pceditor.dart b/aidedejeu_flutter/lib/widgets/pceditor.dart index 2d5f0871..e8236c8c 100644 --- a/aidedejeu_flutter/lib/widgets/pceditor.dart +++ b/aidedejeu_flutter/lib/widgets/pceditor.dart @@ -96,9 +96,10 @@ class _PCEditorPageState extends State { // widgets generics - Widget _loadMarkdown(String markdown) { + Widget _buildMarkdown(String markdown) { return MarkdownBody( data: markdown ?? "", + styleSheet: mainMarkdownStyleSheet(context), onTapLink: (link) => Navigator.push( context, MaterialPageRoute(builder: (context) => LibraryPage(id: link)), @@ -106,7 +107,15 @@ class _PCEditorPageState extends State { ); } - Widget _loadItemsWidget( + Widget _buildSubTitle(String title) { + return Text(title, + style: TextStyle( + fontSize: 16, + fontFamily: "Cinzel", + )); + } + + Widget _buildItemsWidget( {String hintText, List items, T selectedItem, @@ -130,8 +139,8 @@ class _PCEditorPageState extends State { // widgets specifics - Widget _loadRacesWidget() { - return _loadItemsWidget( + Widget _buildRacesWidget() { + return _buildItemsWidget( hintText: "Race", items: _races, selectedItem: _race, @@ -141,9 +150,9 @@ class _PCEditorPageState extends State { ); } - Widget _loadSubRacesWidget() { + Widget _buildSubRacesWidget() { return _subRaces != null - ? _loadItemsWidget( + ? _buildItemsWidget( hintText: "Variante", items: _subRaces, selectedItem: _subRace, @@ -154,39 +163,39 @@ class _PCEditorPageState extends State { : SizedBox.shrink(); } - Widget _loadRaceDetailsWidget() { + Widget _buildRaceDetailsWidget() { return _race != null ? Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text("Augmentation de caractéristiques", style: TextStyle(fontSize: 16, fontFamily: "Cinzel",)), - _loadMarkdown(_race?.abilityScoreIncrease), - _loadMarkdown(_subRace?.abilityScoreIncrease), + _buildSubTitle("Augmentation de caractéristiques"), + _buildMarkdown(_race?.abilityScoreIncrease), + _buildMarkdown(_subRace?.abilityScoreIncrease), Text(""), - Text("Âge"), - _loadMarkdown(_race?.age), + _buildSubTitle("Âge"), + _buildMarkdown(_race?.age), Text(""), - Text("Alignement"), - _loadMarkdown(_race?.alignment), + _buildSubTitle("Alignement"), + _buildMarkdown(_race?.alignment), Text(""), - Text("Taille"), - _loadMarkdown(_race?.size), + _buildSubTitle("Taille"), + _buildMarkdown(_race?.size), Text(""), - Text("Vitesse"), - _loadMarkdown(_race?.speed), + _buildSubTitle("Vitesse"), + _buildMarkdown(_race?.speed), Text(""), - Text("Vision dans le noir"), - _loadMarkdown(_race?.darkvision), + _buildSubTitle("Vision dans le noir"), + _buildMarkdown(_race?.darkvision), Text(""), - Text("Langues"), - _loadMarkdown(_race?.languages), + _buildSubTitle("Langues"), + _buildMarkdown(_race?.languages), ], ) : SizedBox.shrink(); } - Widget _loadBackgroundsWidget() { - return _loadItemsWidget( + Widget _buildBackgroundsWidget() { + return _buildItemsWidget( hintText: "Historique", items: _backgrounds, selectedItem: _background, @@ -196,9 +205,9 @@ class _PCEditorPageState extends State { ); } - Widget _loadSubBackgroundsWidget() { + Widget _buildSubBackgroundsWidget() { return _subBackgrounds != null - ? _loadItemsWidget( + ? _buildItemsWidget( hintText: "Variante", items: _subBackgrounds, selectedItem: _subBackground, @@ -219,50 +228,81 @@ class _PCEditorPageState extends State { bottom: TabBar( labelColor: Colors.black, isScrollable: true, - indicatorColor: Theme.of(context).accentColor, // Colors.red, + indicatorColor: Theme.of(context).accentColor, + // Colors.red, indicatorSize: TabBarIndicatorSize.label, tabs: [ Text( AppLocalizations.of(context).raceTitle, - style: TextStyle(fontSize: 25, fontFamily: "Cinzel",), + style: TextStyle( + fontSize: 25, + fontFamily: "Cinzel", + ), ), Text( AppLocalizations.of(context).backgroundTitle, - style: TextStyle(fontSize: 25, fontFamily: "Cinzel",), + style: TextStyle( + fontSize: 25, + fontFamily: "Cinzel", + ), ), Text( AppLocalizations.of(context).classTitle, - style: TextStyle(fontSize: 25, fontFamily: "Cinzel",), + style: TextStyle( + fontSize: 25, + fontFamily: "Cinzel", + ), ), Text( AppLocalizations.of(context).abilitiesTitle, - style: TextStyle(fontSize: 25, fontFamily: "Cinzel",), + style: TextStyle( + fontSize: 25, + fontFamily: "Cinzel", + ), ), Text( AppLocalizations.of(context).othersTitle, - style: TextStyle(fontSize: 25, fontFamily: "Cinzel",), + style: TextStyle( + fontSize: 25, + fontFamily: "Cinzel", + ), ), ], ), ), body: TabBarView( children: [ - ListView( - children: [ - _loadRacesWidget(), - _loadSubRacesWidget(), - _loadRaceDetailsWidget(), - ], + Container( + margin: EdgeInsets.all(10.0), + child: ListView( + children: [ + _buildRacesWidget(), + _buildSubRacesWidget(), + _buildRaceDetailsWidget(), + ], + ), ), - ListView( - children: [ - _loadBackgroundsWidget(), - _loadSubBackgroundsWidget(), - ], + Container( + margin: EdgeInsets.all(10.0), + child: ListView( + children: [ + _buildBackgroundsWidget(), + _buildSubBackgroundsWidget(), + ], + ), + ), + Container( + margin: EdgeInsets.all(10.0), + child: Text(AppLocalizations.of(context).classTitle), + ), + Container( + margin: EdgeInsets.all(10.0), + child: Text(AppLocalizations.of(context).abilitiesTitle), + ), + Container( + margin: EdgeInsets.all(10.0), + child: Text(AppLocalizations.of(context).othersTitle), ), - Text(AppLocalizations.of(context).classTitle), - Text(AppLocalizations.of(context).abilitiesTitle), - Text(AppLocalizations.of(context).othersTitle), ], ), ), diff --git a/aidedejeu_flutter/pubspec.lock b/aidedejeu_flutter/pubspec.lock index 4927dd75..110e5852 100644 --- a/aidedejeu_flutter/pubspec.lock +++ b/aidedejeu_flutter/pubspec.lock @@ -162,7 +162,7 @@ packages: name: intl url: "https://pub.dartlang.org" source: hosted - version: "0.16.0" + version: "0.16.1" intl_translation: dependency: "direct main" description: