diff --git a/lib/episodes/episodedetail.dart b/lib/episodes/episodedetail.dart index 9c1f30b..e8aa7e7 100644 --- a/lib/episodes/episodedetail.dart +++ b/lib/episodes/episodedetail.dart @@ -15,7 +15,6 @@ import 'package:google_fonts/google_fonts.dart'; import '../state/audiostate.dart'; import '../type/episodebrief.dart'; import '../local_storage/sqflite_localpodcast.dart'; -import '../local_storage/key_value_storage.dart'; import '../util/context_extension.dart'; import '../util/custompaint.dart'; import 'episodedownload.dart'; diff --git a/lib/home/about.dart b/lib/home/about.dart index 177bdd9..7f40eff 100644 --- a/lib/home/about.dart +++ b/lib/home/about.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:google_fonts/google_fonts.dart'; import 'package:tsacdop/util/custompaint.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:line_icons/line_icons.dart'; @@ -103,7 +102,7 @@ class AboutApp extends StatelessWidget { Padding( padding: const EdgeInsets.all(20), child: Text( - 'Tsacdop is a podcast player developed in flutter, a clean, simply beautiful and friendly app.', + 'Tsacdop is a podcast player built with flutter, a clean, simply beautiful and friendly app.', textAlign: TextAlign.center, ), ), @@ -148,14 +147,15 @@ class AboutApp extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ Padding( - padding: EdgeInsets.symmetric(horizontal: 20.0), + padding: EdgeInsets.only(left: 20.0), child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ Text( 'Developer', style: TextStyle( - color: Theme.of(context).accentColor, fontWeight: FontWeight.bold), + color: Theme.of(context).accentColor, + fontWeight: FontWeight.bold), ), Spacer(), InkWell( @@ -171,9 +171,10 @@ class AboutApp extends StatelessWidget { MainAxisAlignment.center, mainAxisSize: MainAxisSize.min, children: [ - Text('Buy a coffee', + Text('Buy me a coffee', style: TextStyle( - color: context.accentColor)), + color: context.accentColor, + fontWeight: FontWeight.bold)), SizedBox(width: 10), Image( image: AssetImage( diff --git a/lib/home/audioplayer.dart b/lib/home/audioplayer.dart index 5d04f8d..290f2b6 100644 --- a/lib/home/audioplayer.dart +++ b/lib/home/audioplayer.dart @@ -310,7 +310,7 @@ class _PlayerWidgetState extends State { Widget _expandedPanel(BuildContext context) { return DefaultTabController( initialIndex: 1, - length: 4, + length: 3, child: Stack( children: [ TabBarView( @@ -318,7 +318,7 @@ class _PlayerWidgetState extends State { SleepMode(), ControlPanel(), _playlist(context), - ShareClip(), + // ShareClip(), ], ), Positioned( @@ -370,16 +370,16 @@ class _PlayerWidgetState extends State { color: Theme.of(context).accentColor, width: 2.0)), ), - Container( - height: 8.0, - width: 8.0, - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.transparent, - border: Border.all( - color: Theme.of(context).accentColor, - width: 2.0)), - ), + // Container( + // height: 8.0, + // width: 8.0, + // decoration: BoxDecoration( + // shape: BoxShape.circle, + // color: Colors.transparent, + // border: Border.all( + // color: Theme.of(context).accentColor, + // width: 2.0)), + // ), ]), ), ), diff --git a/lib/podcasts/podcastdetail.dart b/lib/podcasts/podcastdetail.dart index d99b3a7..06f1192 100644 --- a/lib/podcasts/podcastdetail.dart +++ b/lib/podcasts/podcastdetail.dart @@ -139,7 +139,7 @@ class _PodcastDetailState extends State { Widget podcastInfo(BuildContext context) { return Container( height: 170, - padding: EdgeInsets.only(top: 40, left: 80, right: 120), + padding: EdgeInsets.only(top: 40, left: 80, right: 130), alignment: Alignment.topLeft, child: Container( padding: EdgeInsets.symmetric(vertical: 10), diff --git a/lib/settings/downloads_manage.dart b/lib/settings/downloads_manage.dart index 9c386c2..26c8196 100644 --- a/lib/settings/downloads_manage.dart +++ b/lib/settings/downloads_manage.dart @@ -43,6 +43,7 @@ class _DownloadsManageState extends State { _size = 0; _fileNum = 0; var dir = await getExternalStorageDirectory(); + print(dir.path); dir.list().forEach((d) { var fileDir = Directory(d.path); fileDir.list().forEach((file) async { @@ -159,9 +160,8 @@ class _DownloadsManageState extends State { )), ), TextSpan( - text: (_size ~/ 1000000) < 1000 - ? 'Mb' - : 'Gb', + text: + (_size ~/ 1000000) < 1000 ? 'Mb' : 'Gb', style: TextStyle( color: Theme.of(context).accentColor, fontSize: 20, diff --git a/lib/settings/theme.dart b/lib/settings/theme.dart index f46a35e..f3c8af0 100644 --- a/lib/settings/theme.dart +++ b/lib/settings/theme.dart @@ -137,7 +137,6 @@ class ThemeSetting extends StatelessWidget { ), ), ), - Divider(height: 2), ListTile( onTap: () => generalDialog( context, @@ -220,7 +219,7 @@ class _ColorPickerState extends State @override Widget build(BuildContext context) { return Container( - width: 200, + width: 400, height: 400, child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -256,6 +255,7 @@ class _ColorPickerState extends State ), Expanded( child: TabBarView( + physics: const ClampingScrollPhysics(), key: UniqueKey(), controller: _controller, children: Colors.primaries diff --git a/lib/state/audiostate.dart b/lib/state/audiostate.dart index 67b9efa..2e60ed8 100644 --- a/lib/state/audiostate.dart +++ b/lib/state/audiostate.dart @@ -299,6 +299,7 @@ class AudioPlayerNotifier extends ChangeNotifier { enableQueue: true, androidStopOnRemoveTask: true, androidStopForegroundOnPause: true); + //Check autoplay setting await _getAutoPlay(); if (_autoPlay) { await Future.forEach(_queue.playlist, (episode) async { @@ -307,6 +308,7 @@ class AudioPlayerNotifier extends ChangeNotifier { } else { await AudioService.addQueueItem(_queue.playlist.first.toMediaItem()); } + //Check auto sleep timer setting await _getAutoSleepTimer(); if (_autoSleepTimer) { int startTime =