diff --git a/lib/components/kanji/kanji__search_page/kanji_search_page.dart b/lib/components/kanji/kanji__search_page/kanji_search_page.dart index 7ca4080..8bf98e1 100644 --- a/lib/components/kanji/kanji__search_page/kanji_search_page.dart +++ b/lib/components/kanji/kanji__search_page/kanji_search_page.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:jisho_study_tool/components/kanji/kanji__search_page/kunyomi.dart'; import 'package:unofficial_jisho_api/api.dart' as jisho; @@ -8,6 +9,8 @@ import './jlpt_level.dart'; import './radical.dart'; import './rank.dart'; import './stroke_order_gif.dart'; +import './onyomi.dart'; +import './kunyomi.dart'; class KanjiResultCard extends StatelessWidget { final jisho.KanjiResult _result; @@ -41,6 +44,8 @@ class KanjiResultCard extends StatelessWidget { ], ), ), + _result.onyomi.length != 0 ? Onyomi(_result.onyomi) : SizedBox.shrink(), + _result.kunyomi.length != 0 ? Kunyomi(_result.kunyomi) : SizedBox.shrink(), IntrinsicHeight( child: Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, diff --git a/lib/components/kanji/kanji__search_page/kunyomi.dart b/lib/components/kanji/kanji__search_page/kunyomi.dart index 39e490c..146b10c 100644 --- a/lib/components/kanji/kanji__search_page/kunyomi.dart +++ b/lib/components/kanji/kanji__search_page/kunyomi.dart @@ -1,10 +1,41 @@ import 'package:flutter/material.dart'; class Kunyomi extends StatelessWidget { + final List _kunyomi; + @override Widget build(BuildContext context) { return Container( - + child: Container( + margin: EdgeInsets.symmetric( + horizontal: 10.0, + vertical: 5.0, + ), + child: Row( + children: _kunyomi.map((onyomi) { + return Container( + margin: EdgeInsets.symmetric(horizontal: 10.0), + padding: EdgeInsets.symmetric( + vertical: 10.0, + horizontal: 10.0, + ), + child: Text( + onyomi, + style: TextStyle( + fontSize: 20.0, + color: Colors.white, + ), + ), + decoration: BoxDecoration( + color: Colors.lightBlue, + borderRadius: BorderRadius.circular(10.0), + ), + ); + }).toList(), + ), + ), ); } -} \ No newline at end of file + + Kunyomi(this._kunyomi); +} diff --git a/lib/components/kanji/kanji__search_page/onyomi.dart b/lib/components/kanji/kanji__search_page/onyomi.dart index 4878814..77c37d9 100644 --- a/lib/components/kanji/kanji__search_page/onyomi.dart +++ b/lib/components/kanji/kanji__search_page/onyomi.dart @@ -1,10 +1,39 @@ import 'package:flutter/material.dart'; class Onyomi extends StatelessWidget { + final List _onyomi; + @override Widget build(BuildContext context) { return Container( - + margin: EdgeInsets.symmetric( + horizontal: 10.0, + vertical: 5.0, + ), + child: Row( + children: _onyomi.map((onyomi) { + return Container( + margin: EdgeInsets.symmetric(horizontal: 10.0), + padding: EdgeInsets.symmetric( + vertical: 10.0, + horizontal: 10.0, + ), + child: Text( + onyomi, + style: TextStyle( + fontSize: 20.0, + color: Colors.white, + ), + ), + decoration: BoxDecoration( + color: Colors.orange, + borderRadius: BorderRadius.circular(10.0), + ), + ); + }).toList(), + ), ); } -} \ No newline at end of file + + Onyomi(this._onyomi); +}