diff --git a/lib/home/home_groups.dart b/lib/home/home_groups.dart index 2f52ad5..2da800d 100644 --- a/lib/home/home_groups.dart +++ b/lib/home/home_groups.dart @@ -37,7 +37,8 @@ class _ScrollPodcastsState extends State TweenSequence _slideTween; _getSlideTween(double value) => TweenSequence([ TweenSequenceItem( - tween: Tween(begin: 0.0, end: value), weight: 4 / 5), + tween: Tween(begin: 0.0, end: value), weight: 3 / 5), + TweenSequenceItem(tween: ConstantTween(value), weight: 1 / 5), TweenSequenceItem( tween: Tween(begin: -value, end: 0), weight: 1 / 5) ]); @@ -134,10 +135,11 @@ class _ScrollPodcastsState extends State }, child: Column( children: [ - Container( + SizedBox( + height: 30, child: Row( children: [ - Container( + Padding( padding: EdgeInsets.symmetric( horizontal: 15.0), child: Text( @@ -147,11 +149,9 @@ class _ScrollPodcastsState extends State color: context.accentColor), )), Spacer(), - Container( - height: 30, + Padding( padding: EdgeInsets.symmetric( horizontal: 15), - alignment: Alignment.bottomRight, child: InkWell( onTap: () { if (!import) { @@ -162,9 +162,10 @@ class _ScrollPodcastsState extends State ); } }, - child: Container( - height: 30, - padding: EdgeInsets.all(5.0), + borderRadius: + BorderRadius.circular(5), + child: Padding( + padding: const EdgeInsets.all(5.0), child: Text( s.homeGroupsSeeAll, style: context.textTheme.bodyText1 @@ -251,7 +252,7 @@ class _ScrollPodcastsState extends State () => _slideTween = _getSlideTween(20)); _controller.forward(); await Future.delayed( - Duration(milliseconds: 100)); + Duration(milliseconds: 50)); if (mounted) { setState(() { (_groupIndex != 0) @@ -271,7 +272,7 @@ class _ScrollPodcastsState extends State setState( () => _slideTween = _getSlideTween(-20)); await Future.delayed( - Duration(milliseconds: 100)); + Duration(milliseconds: 50)); _controller.forward(); if (mounted) { setState(() { @@ -285,50 +286,49 @@ class _ScrollPodcastsState extends State }, child: Column( children: [ - Container( + SizedBox( + height: 30, child: Row( children: [ - Container( - padding: EdgeInsets.symmetric( + Padding( + padding: const EdgeInsets.symmetric( horizontal: 15.0), child: Text( groups[_groupIndex].name, style: context.textTheme.bodyText1 .copyWith( - color: Theme.of(context) - .accentColor), + color: context.accentColor), )), Spacer(), - Container( - height: 30.0, - padding: - EdgeInsets.symmetric(horizontal: 15), - alignment: Alignment.bottomRight, + Padding( + padding: const EdgeInsets.symmetric( + horizontal: 15), child: InkWell( - onTap: () { - if (!import) { - Navigator.push( - context, - SlideLeftRoute( - page: PodcastManage()), - ); - } - }, - child: Container( - height: 30, - padding: EdgeInsets.all(5.0), - child: Text( - s.homeGroupsSeeAll, - style: context.textTheme.bodyText1 - .copyWith( - color: import - ? context - .primaryColorDark - : context.accentColor), - ), - ), - ), - ), + onTap: () { + if (!import) { + Navigator.push( + context, + SlideLeftRoute( + page: PodcastManage()), + ); + } + }, + borderRadius: + BorderRadius.circular(5), + child: Padding( + padding: const EdgeInsets.all(5.0), + child: Text( + s.homeGroupsSeeAll, + style: context.textTheme.bodyText1 + .copyWith( + color: import + ? context + .primaryColorDark + : context + .accentColor), + ), + )), + ) ], ), ), diff --git a/lib/local_storage/sqflite_localpodcast.dart b/lib/local_storage/sqflite_localpodcast.dart index e985290..a185a1a 100644 --- a/lib/local_storage/sqflite_localpodcast.dart +++ b/lib/local_storage/sqflite_localpodcast.dart @@ -1,6 +1,5 @@ import 'dart:async'; import 'dart:developer' as developer; -import 'dart:io'; import 'package:dio/dio.dart'; import 'package:flutter_downloader/flutter_downloader.dart';