diff --git a/lib/home/about.dart b/lib/home/about.dart index 1a1b944..7d23923 100644 --- a/lib/home/about.dart +++ b/lib/home/about.dart @@ -113,7 +113,7 @@ class AboutApp extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ Container( - height: 100.0, + height: 110.0, alignment: Alignment.center, child: Column( mainAxisAlignment: MainAxisAlignment.center, diff --git a/lib/home/home_groups.dart b/lib/home/home_groups.dart index 7e43bd6..551a473 100644 --- a/lib/home/home_groups.dart +++ b/lib/home/home_groups.dart @@ -878,18 +878,18 @@ class ShowEpisode extends StatelessWidget { Expanded( flex: 1, child: Row( + crossAxisAlignment: + CrossAxisAlignment.center, children: [ - Container( - alignment: Alignment.bottomLeft, - child: Text( - _dateToString(context, - pubDate: episodes[index] - .pubDate), - style: TextStyle( - fontSize: _width / 35, - color: _c, - fontStyle: FontStyle.italic, - ), + Text( + _dateToString(context, + pubDate: + episodes[index].pubDate), + overflow: TextOverflow.visible, + style: TextStyle( + fontSize: _width / 35, + color: _c, + fontStyle: FontStyle.italic, ), ), Spacer(), diff --git a/lib/util/episodegrid.dart b/lib/util/episodegrid.dart index 84455c1..c987b7c 100644 --- a/lib/util/episodegrid.dart +++ b/lib/util/episodegrid.dart @@ -187,6 +187,7 @@ class EpisodeGrid extends StatelessWidget { Widget _pubDate(BuildContext context, {EpisodeBrief episode, Color color}) => Text( episode.pubDate.toDate(context), + overflow: TextOverflow.visible, style: TextStyle( fontSize: context.width / 35, color: color, @@ -443,6 +444,8 @@ class EpisodeGrid extends StatelessWidget { child: Row( mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.center, children: [ layout != Layout.one ? _circleImage(context, @@ -490,77 +493,63 @@ class EpisodeGrid extends StatelessWidget { flex: 1, child: Row( crossAxisAlignment: - CrossAxisAlignment.center, + CrossAxisAlignment.start, + mainAxisAlignment: + MainAxisAlignment.start, children: [ if (layout != Layout.one) - Align( - alignment: Alignment.bottomLeft, - child: _pubDate(context, - episode: episodes[index], - color: _c), - ), + _pubDate(context, + episode: episodes[index], + color: _c), Spacer(), - layout != Layout.three && - episodes[index].duration != 0 - ? Container( - alignment: Alignment.center, - child: Text( - episodes[index] - .duration - .toTime, - style: TextStyle( - fontSize: _width / 35), - ), - ) - : Center(), - episodes[index].duration == 0 || - episodes[index] - .enclosureLength == - null || - episodes[index] - .enclosureLength == - 0 || - layout == Layout.three - ? Center() - : Text( - '|', - style: TextStyle( - fontSize: _width / 35, - // color: _c, - // fontStyle: FontStyle.italic, - ), - ), - layout != Layout.three && - episodes[index] - .enclosureLength != - null && - episodes[index] - .enclosureLength != - 0 - ? Container( - alignment: Alignment.center, - child: Text( - '${(episodes[index].enclosureLength) ~/ 1000000}MB', - style: TextStyle( - fontSize: _width / 35), - ), - ) - : Center(), + if (layout != Layout.three && + episodes[index].duration != 0) + Container( + alignment: Alignment.center, + child: Text( + episodes[index].duration.toTime, + style: TextStyle( + fontSize: _width / 35), + ), + ), + if (episodes[index].duration != 0 && + episodes[index].enclosureLength != + null && + episodes[index].enclosureLength != + 0 && + layout != Layout.three) + Text( + '|', + style: TextStyle( + fontSize: _width / 35, + // color: _c, + // fontStyle: FontStyle.italic, + ), + ), + if (layout != Layout.three && + episodes[index].enclosureLength != + null && + episodes[index].enclosureLength != + 0) + Container( + alignment: Alignment.center, + child: Text( + '${(episodes[index].enclosureLength) ~/ 1000000}MB', + style: TextStyle( + fontSize: _width / 35), + ), + ), Padding( padding: EdgeInsets.all(1), ), - showFavorite || layout != Layout.three - ? isLiked - ? IconTheme( - data: IconThemeData( - size: _width / 35), - child: Icon( - Icons.favorite, - color: Colors.red, - ), - ) - : Center() - : Center() + if ((showFavorite || + layout != Layout.three) && + isLiked) + Icon( + Icons.favorite, + color: Colors.red, + size: _width / 35, + ) ], ), ),