Funkwhale
/
tsacdop-podcast-app-android
mirror of https://github.com/stonega/tsacdop
1
0
Fork 0
Code Issues Releases Wiki Activity

Minor change.

This commit is contained in:
stonega 2020-10-30 20:35:02 +08:00
parent fe36c06a38
commit e2aa75ee02
43 changed files with 234 additions and 494 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -1,7 +1,6 @@
[![Tsacdop Banner][]][google play] [![Tsacdop Banner][]][google play]
[![github action][]][github action link] [![github action][]][github action link]
[![Build Status - Cirrus][]][build status]
[![GitHub Release][]][github release - recent] [![GitHub Release][]][github release - recent]
[![Github Downloads][]][github release - recent] [![Github Downloads][]][github release - recent]
[![Localizely][]][localizely - website] [![Localizely][]][localizely - website]

3
android/app/build.gradle
View File

@ -45,9 +45,8 @@ android {
} }
defaultConfig { defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.stonegate.tsacdop" applicationId "com.stonegate.tsacdop"
minSdkVersion 19 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName

4
lib/episodes/episode_detail.dart
View File

@ -16,8 +16,8 @@ import '../state/audio_state.dart';
import '../state/setting_state.dart'; import '../state/setting_state.dart';
import '../type/episodebrief.dart'; import '../type/episodebrief.dart';
import '../type/play_histroy.dart'; import '../type/play_histroy.dart';
import '../util/audiopanel.dart'; import '../widgets/audiopanel.dart';
import '../util/custom_widget.dart'; import '../widgets/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import 'episode_download.dart'; import 'episode_download.dart';

6
lib/episodes/episode_download.dart
View File

@ -8,15 +8,15 @@ import 'package:flutter_downloader/flutter_downloader.dart';
import 'package:fluttertoast/fluttertoast.dart'; import 'package:fluttertoast/fluttertoast.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../local_storage/key_value_storage.dart';
import '../local_storage/key_value_storage.dart';
import '../state/audio_state.dart'; import '../state/audio_state.dart';
import '../state/download_state.dart'; import '../state/download_state.dart';
import '../type/episode_task.dart'; import '../type/episode_task.dart';
import '../type/episodebrief.dart'; import '../type/episodebrief.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../util/general_dialog.dart'; import '../widgets/custom_widget.dart';
import '../widgets/general_dialog.dart';
class DownloadButton extends StatefulWidget { class DownloadButton extends StatefulWidget {
final EpisodeBrief episode; final EpisodeBrief episode;

2
lib/home/about.dart
View File

@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:line_icons/line_icons.dart'; import 'package:line_icons/line_icons.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../widgets/custom_widget.dart';
const String version = '0.5.0'; const String version = '0.5.0';

6
lib/home/audioplayer.dart
View File

@ -15,11 +15,11 @@ import '../local_storage/sqflite_localpodcast.dart';
import '../state/audio_state.dart'; import '../state/audio_state.dart';
import '../type/episodebrief.dart'; import '../type/episodebrief.dart';
import '../type/play_histroy.dart'; import '../type/play_histroy.dart';
import '../util/audiopanel.dart';
import '../util/custom_slider.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../util/pageroute.dart'; import '../util/pageroute.dart';
import '../widgets/audiopanel.dart';
import '../widgets/custom_slider.dart';
import '../widgets/custom_widget.dart';
import 'playlist.dart'; import 'playlist.dart';
final List<BoxShadow> _customShadow = [ final List<BoxShadow> _customShadow = [

318
lib/home/home.dart
View File

@ -4,12 +4,11 @@ import 'dart:io';
import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'; import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart';
import 'package:feature_discovery/feature_discovery.dart'; import 'package:feature_discovery/feature_discovery.dart';
import 'package:flutter/material.dart' hide NestedScrollView; import 'package:flutter/material.dart' hide NestedScrollView;
import 'package:flutter/scheduler.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:fluttertoast/fluttertoast.dart'; import 'package:fluttertoast/fluttertoast.dart';
import 'package:line_icons/line_icons.dart'; import 'package:line_icons/line_icons.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:tsacdop/podcasts/podcast_detail.dart';
import 'package:tsacdop/util/pageroute.dart';
import 'package:tuple/tuple.dart'; import 'package:tuple/tuple.dart';
import '../local_storage/key_value_storage.dart'; import '../local_storage/key_value_storage.dart';
@ -21,12 +20,13 @@ import '../state/refresh_podcast.dart';
import '../state/setting_state.dart'; import '../state/setting_state.dart';
import '../type/episodebrief.dart'; import '../type/episodebrief.dart';
import '../type/playlist.dart'; import '../type/playlist.dart';
import '../util/audiopanel.dart';
import '../util/custom_popupmenu.dart';
import '../util/custom_widget.dart';
import '../util/episodegrid.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../util/muiliselect_bar.dart'; import '../widgets/audiopanel.dart';
import '../widgets/custom_popupmenu.dart';
import '../widgets/custom_widget.dart';
import '../widgets/episodegrid.dart';
import '../widgets/feature_discovery.dart';
import '../widgets/muiliselect_bar.dart';
import 'audioplayer.dart'; import 'audioplayer.dart';
import 'download_list.dart'; import 'download_list.dart';
import 'home_groups.dart'; import 'home_groups.dart';
@ -35,13 +35,6 @@ import 'import_ompl.dart';
import 'playlist.dart'; import 'playlist.dart';
import 'search_podcast.dart'; import 'search_podcast.dart';
const String addFeature = 'addFeature';
const String menuFeature = 'menuFeature';
const String playlistFeature = 'playlistFeature';
const String longTapFeature = 'longTapFeature';
const String groupsFeature = 'groupsFeature';
const String podcastFeature = 'podcastFeature';
class Home extends StatefulWidget { class Home extends StatefulWidget {
@override @override
_HomeState createState() => _HomeState(); _HomeState createState() => _HomeState();
@ -67,24 +60,24 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
@override @override
void initState() { void initState() {
super.initState();
_controller = TabController(length: 3, vsync: this); _controller = TabController(length: 3, vsync: this);
FeatureDiscovery.isDisplayed(context, addFeature).then((value) { // FeatureDiscovery.hasPreviouslyCompleted(context, addFeature).then((value) {
if (!value) { // if (!value) {
WidgetsBinding.instance.addPostFrameCallback((_) { SchedulerBinding.instance.addPostFrameCallback((_) {
FeatureDiscovery.discoverFeatures( FeatureDiscovery.discoverFeatures(
context, context,
const <String>{ const <String>{
addFeature, addFeature,
menuFeature, menuFeature,
playlistFeature, playlistFeature,
groupsFeature, //groupsFeature,
podcastFeature, //podcastFeature,
}, },
); );
});
}
}); });
// }
// });
super.initState();
} }
@override @override
@ -144,58 +137,21 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceBetween, MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
DescribedFeatureOverlay( featureDiscoveryOverlay(
context,
featureId: addFeature, featureId: addFeature,
tapTarget: tapTarget:
Icon(Icons.add_circle_outline), Icon(Icons.add_circle_outline),
title: Text(s.featureDiscoverySearch), title: s.featureDiscoverySearch,
backgroundColor: Colors.cyan[600], backgroundColor: Colors.cyan[600],
overflowMode: feature1OverflowMode, buttonColor: Colors.cyan[500],
onDismiss: () { description:
return Future.value(true); s.featureDiscoverySearchDes,
},
description: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
Text(s.featureDiscoverySearchDes),
FlatButton(
color: Colors.cyan[500],
padding:
const EdgeInsets.all(0),
child: Text(s.understood,
style: context
.textTheme.button
.copyWith(
color:
Colors.white)),
onPressed: () async =>
FeatureDiscovery
.completeCurrentStep(
context),
),
FlatButton(
color: Colors.cyan[500],
padding:
const EdgeInsets.all(0),
child: Text(s.dismiss,
style: Theme.of(context)
.textTheme
.button
.copyWith(
color:
Colors.white)),
onPressed: () =>
FeatureDiscovery.dismissAll(
context),
),
],
),
child: IconButton( child: IconButton(
tooltip: s.add, tooltip: s.add,
splashRadius: 25, splashRadius: 25,
icon: const Icon( icon:
Icons.add_circle_outline), Icon(Icons.add_circle_outline),
onPressed: () async { onPressed: () async {
await showSearch<int>( await showSearch<int>(
context: context, context: context,
@ -225,49 +181,14 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
height: 30, height: 30,
), ),
), ),
DescribedFeatureOverlay( featureDiscoveryOverlay(context,
featureId: menuFeature, featureId: menuFeature,
tapTarget: Icon(Icons.more_vert), tapTarget: Icon(Icons.more_vert),
backgroundColor: Colors.cyan[500], backgroundColor: Colors.cyan[500],
onDismiss: () => Future.value(true), buttonColor: Colors.cyan[600],
title: Text(s.featureDiscoveryOMPL), title: s.featureDiscoveryOMPL,
description: Column( description:
crossAxisAlignment: s.featureDiscoveryOMPLDes,
CrossAxisAlignment.end,
children: <Widget>[
Text(s.featureDiscoveryOMPLDes),
FlatButton(
color: Colors.cyan[600],
padding: EdgeInsets.zero,
child: Text(s.understood,
style: Theme.of(context)
.textTheme
.button
.copyWith(
color: Colors
.white)),
onPressed: () async =>
FeatureDiscovery
.completeCurrentStep(
context),
),
FlatButton(
color: Colors.cyan[600],
padding:
const EdgeInsets.all(0),
child: Text(s.dismiss,
style: Theme.of(context)
.textTheme
.button
.copyWith(
color: Colors
.white)),
onPressed: () =>
FeatureDiscovery
.dismissAll(context),
),
],
),
child: PopupMenu()), child: PopupMenu()),
], ],
), ),
@ -276,68 +197,11 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
], ],
), ),
), ),
SliverList( SliverToBoxAdapter(
delegate: SliverChildBuilderDelegate( child: SizedBox(
(context, index) { height: height,
return DescribedFeatureOverlay( width: width,
featureId: groupsFeature, child: ScrollPodcasts(),
tapTarget: Center(
child: Text(
s.featureDiscoveryPodcast,
textAlign: TextAlign.center,
)),
backgroundColor: Colors.cyan[500],
enablePulsingAnimation: false,
onDismiss: () => Future.value(true),
title: Text(s.featureDiscoveryPodcastTitle),
description: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
Text(s.featureDiscoveryPodcastDes),
Row(
children: [
FlatButton(
color: Colors.cyan[600],
padding: const EdgeInsets.all(0),
child: Text(s.understood,
style: Theme.of(context)
.textTheme
.button
.copyWith(
color: Colors.white)),
onPressed: () async =>
FeatureDiscovery
.completeCurrentStep(
context),
),
Padding(
padding: EdgeInsets.symmetric(
horizontal: 5)),
FlatButton(
color: Colors.cyan[600],
padding: const EdgeInsets.all(0),
child: Text(s.dismiss,
style: context
.textTheme.button
.copyWith(
color: Colors.white)),
onPressed: () =>
FeatureDiscovery.dismissAll(
context),
),
],
),
],
),
child: SizedBox(
height: height,
width: width,
child: ScrollPodcasts(),
),
);
},
childCount: 1,
), ),
), ),
SliverPersistentHeader( SliverPersistentHeader(
@ -368,57 +232,7 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
controller: _controller, controller: _controller,
children: <Widget>[ children: <Widget>[
NestedScrollViewInnerScrollPositionKeyWidget( NestedScrollViewInnerScrollPositionKeyWidget(
Key('tab0'), Key('tab0'), _RecentUpdate()),
DescribedFeatureOverlay(
featureId: podcastFeature,
tapTarget: Text(s.featureDiscoveryEpisode,
textAlign: TextAlign.center),
backgroundColor: Colors.cyan[500],
enablePulsingAnimation: false,
onDismiss: () => Future.value(true),
title: Text(s.featureDiscoveryEpisodeTitle),
description: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
Text(s.featureDiscoveryEpisodeDes),
Row(
children: [
FlatButton(
color: Colors.cyan[600],
padding: const EdgeInsets.all(0),
child: Text(s.understood,
style: Theme.of(context)
.textTheme
.button
.copyWith(
color: Colors.white)),
onPressed: () async =>
FeatureDiscovery
.completeCurrentStep(
context),
),
Padding(
padding: EdgeInsets.symmetric(
horizontal: 5)),
FlatButton(
color: Colors.cyan[600],
padding: const EdgeInsets.all(0),
child: Text(s.dismiss,
style: Theme.of(context)
.textTheme
.button
.copyWith(
color: Colors.white)),
onPressed: () =>
FeatureDiscovery.dismissAll(
context),
),
],
),
],
),
child: _RecentUpdate())),
NestedScrollViewInnerScrollPositionKeyWidget( NestedScrollViewInnerScrollPositionKeyWidget(
Key('tab1'), _MyFavorite()), Key('tab1'), _MyFavorite()),
NestedScrollViewInnerScrollPositionKeyWidget( NestedScrollViewInnerScrollPositionKeyWidget(
@ -469,39 +283,13 @@ class _SliverAppBarDelegate extends SliverPersistentHeaderDelegate {
children: <Widget>[ children: <Widget>[
_tabBar, _tabBar,
Spacer(), Spacer(),
DescribedFeatureOverlay( featureDiscoveryOverlay(context,
featureId: playlistFeature, featureId: playlistFeature,
tapTarget: Icon(Icons.playlist_play), tapTarget: Icon(Icons.playlist_play),
backgroundColor: Colors.cyan[500], backgroundColor: Colors.cyan[500],
title: Text(s.featureDiscoveryPlaylist), title: s.featureDiscoveryPlaylist,
onDismiss: () => Future.value(true), description: s.featureDiscoveryPlaylistDes,
description: Column( buttonColor: Colors.cyan[600],
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(s.featureDiscoveryPlaylistDes),
FlatButton(
color: Colors.cyan[600],
padding: const EdgeInsets.all(0),
child: Text(s.understood,
style: Theme.of(context)
.textTheme
.button
.copyWith(color: Colors.white)),
onPressed: () async =>
FeatureDiscovery.completeCurrentStep(context),
),
FlatButton(
color: Colors.cyan[600],
padding: const EdgeInsets.all(0),
child: Text(s.dismiss,
style: Theme.of(context)
.textTheme
.button
.copyWith(color: Colors.white)),
onPressed: () => FeatureDiscovery.dismissAll(context),
),
],
),
child: _PlaylistButton()), child: _PlaylistButton()),
], ],
), ),
@ -895,20 +683,6 @@ class _RecentUpdateState extends State<_RecentUpdate>
}), }),
) )
: Center(); : Center();
// Material(
// color: Colors.transparent,
// child: IconButton(
// tooltip: s.addNewEpisodeTooltip,
// icon: SizedBox(
// height: 15,
// width: 20,
// child: CustomPaint(
// painter: AddToPlaylistPainter(
// context.textColor,
// context.textColor,
// ))),
// onPressed: () {}),
// );
}); });
} }

4
lib/home/home_groups.dart
View File

@ -24,10 +24,10 @@ import '../state/podcast_group.dart';
import '../type/episodebrief.dart'; import '../type/episodebrief.dart';
import '../type/play_histroy.dart'; import '../type/play_histroy.dart';
import '../type/podcastlocal.dart'; import '../type/podcastlocal.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../util/general_dialog.dart';
import '../util/pageroute.dart'; import '../util/pageroute.dart';
import '../widgets/custom_widget.dart';
import '../widgets/general_dialog.dart';
class ScrollPodcasts extends StatefulWidget { class ScrollPodcasts extends StatefulWidget {
@override @override

2
lib/home/playlist.dart
View File

@ -11,8 +11,8 @@ import '../state/audio_state.dart';
import '../type/episodebrief.dart'; import '../type/episodebrief.dart';
import '../type/play_histroy.dart'; import '../type/play_histroy.dart';
import '../type/playlist.dart'; import '../type/playlist.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../widgets/custom_widget.dart';
enum InitPage { playlist, history } enum InitPage { playlist, history }

2
lib/home/pocast_discovery.dart
View File

@ -7,8 +7,8 @@ import '../service/search_api.dart';
import '../state/search_state.dart'; import '../state/search_state.dart';
import '../type/search_api/search_genre.dart'; import '../type/search_api/search_genre.dart';
import '../type/search_api/searchpodcast.dart'; import '../type/search_api/searchpodcast.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../widgets/custom_widget.dart';
import 'search_podcast.dart'; import 'search_podcast.dart';
class DiscoveryPage extends StatefulWidget { class DiscoveryPage extends StatefulWidget {

2
lib/home/search_podcast.dart
View File

@ -16,8 +16,8 @@ import '../state/podcast_group.dart';
import '../state/search_state.dart'; import '../state/search_state.dart';
import '../type/search_api/searchepisodes.dart'; import '../type/search_api/searchepisodes.dart';
import '../type/search_api/searchpodcast.dart'; import '../type/search_api/searchpodcast.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../widgets/custom_widget.dart';
import 'pocast_discovery.dart'; import 'pocast_discovery.dart';
class MyHomePageDelegate extends SearchDelegate<int> { class MyHomePageDelegate extends SearchDelegate<int> {

2
lib/local_storage/sqflite_localpodcast.dart
View File

@ -91,7 +91,7 @@ class DBHelper {
list = await dbClient.rawQuery( list = await dbClient.rawQuery(
"""SELECT id, title, imageUrl, rssUrl, primaryColor, author, imagePath , provider, """SELECT id, title, imageUrl, rssUrl, primaryColor, author, imagePath , provider,
link ,update_count, episode_count FROM PodcastLocal WHERE id = ? AND link ,update_count, episode_count FROM PodcastLocal WHERE id = ? AND
never_update = 1""", [s]); never_update = 0""", [s]);
} else { } else {
list = await dbClient.rawQuery( list = await dbClient.rawQuery(
"""SELECT id, title, imageUrl, rssUrl, primaryColor, author, imagePath , provider, """SELECT id, title, imageUrl, rssUrl, primaryColor, author, imagePath , provider,

4
lib/main.dart
View File

@ -67,7 +67,9 @@ class MyApp extends StatelessWidget {
GlobalCupertinoLocalizations.delegate, GlobalCupertinoLocalizations.delegate,
], ],
supportedLocales: S.delegate.supportedLocales, supportedLocales: S.delegate.supportedLocales,
home: setting.showIntro ? SlideIntro(goto: Goto.home) : Home(), home: setting.showIntro
? SlideIntro(goto: Goto.home)
: FeatureDiscovery(child: Home()),
), ),
); );
}, },

14
lib/podcasts/podcast_detail.dart
View File

@ -22,12 +22,12 @@ import '../state/download_state.dart';
import '../type/episodebrief.dart'; import '../type/episodebrief.dart';
import '../type/fireside_data.dart'; import '../type/fireside_data.dart';
import '../type/podcastlocal.dart'; import '../type/podcastlocal.dart';
import '../util/audiopanel.dart';
import '../util/custom_widget.dart';
import '../util/episodegrid.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../util/general_dialog.dart'; import '../widgets/audiopanel.dart';
import '../util/muiliselect_bar.dart'; import '../widgets/custom_widget.dart';
import '../widgets/episodegrid.dart';
import '../widgets/general_dialog.dart';
import '../widgets/muiliselect_bar.dart';
import 'podcast_settings.dart'; import 'podcast_settings.dart';
class PodcastDetail extends StatefulWidget { class PodcastDetail extends StatefulWidget {
@ -363,8 +363,8 @@ class _PodcastDetailState extends State<PodcastDetail> {
width: 30, width: 30,
height: 30, height: 30,
decoration: BoxDecoration( decoration: BoxDecoration(
color: widget.podcastLocal color: widget.podcastLocal.primaryColor
.backgroudColor(context) .colorizedark()
.withOpacity(0.6), .withOpacity(0.6),
shape: BoxShape.circle, shape: BoxShape.circle,
), ),

4
lib/podcasts/podcast_group.dart
View File

@ -11,9 +11,9 @@ import 'package:provider/provider.dart';
import '../local_storage/sqflite_localpodcast.dart'; import '../local_storage/sqflite_localpodcast.dart';
import '../state/podcast_group.dart'; import '../state/podcast_group.dart';
import '../type/podcastlocal.dart'; import '../type/podcastlocal.dart';
import '../util/duraiton_picker.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../util/general_dialog.dart'; import '../widgets/duraiton_picker.dart';
import '../widgets/general_dialog.dart';
class PodcastGroupList extends StatefulWidget { class PodcastGroupList extends StatefulWidget {
final PodcastGroup group; final PodcastGroup group;

162
lib/podcasts/podcast_manage.dart
View File

@ -9,18 +9,15 @@ import 'package:line_icons/line_icons.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../state/podcast_group.dart'; import '../state/podcast_group.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../util/general_dialog.dart';
import '../util/pageroute.dart'; import '../util/pageroute.dart';
import '../widgets/custom_widget.dart';
import '../widgets/feature_discovery.dart';
import '../widgets/general_dialog.dart';
import 'custom_tabview.dart'; import 'custom_tabview.dart';
import 'podcast_group.dart'; import 'podcast_group.dart';
import 'podcastlist.dart'; import 'podcastlist.dart';
const String addGroupFeature = 'addGroupFeature';
const String configureGroup = 'configureFeature';
const String configurePodcast = 'configurePodcast';
class PodcastManage extends StatefulWidget { class PodcastManage extends StatefulWidget {
@override @override
_PodcastManageState createState() => _PodcastManageState(); _PodcastManageState createState() => _PodcastManageState();
@ -67,16 +64,9 @@ class _PodcastManageState extends State<PodcastManage>
_controller.stop(); _controller.stop();
} }
}); });
FeatureDiscovery.isDisplayed(context, addGroupFeature).then((value) { WidgetsBinding.instance.addPostFrameCallback((_) {
if (!value) { FeatureDiscovery.discoverFeatures(context,
WidgetsBinding.instance.addPostFrameCallback((_) { const <String>{addGroupFeature, configureGroup, configurePodcast});
FeatureDiscovery.discoverFeatures(context, const <String>{
addGroupFeature,
configureGroup,
configurePodcast
});
});
}
}); });
} }
@ -96,46 +86,19 @@ class _PodcastManageState extends State<PodcastManage>
} else if (_fraction > 0) { } else if (_fraction > 0) {
_controller.reverse(); _controller.reverse();
} }
return DescribedFeatureOverlay( return featureDiscoveryOverlay(
context,
featureId: configureGroup, featureId: configureGroup,
tapTarget: Icon(Icons.menu), tapTarget: Icon(Icons.menu),
title: Padding( title: s.featureDiscoveryEditGroup,
padding: const EdgeInsets.only(top: 20.0),
child: Text(s.featureDiscoveryEditGroup),
),
overflowMode: OverflowMode.clipContent,
backgroundColor: Colors.cyan[600], backgroundColor: Colors.cyan[600],
onDismiss: () => Future.value(true), description: s.featureDiscoveryEditGroupDes,
description: Column( buttonColor: Colors.cyan[500],
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(s.featureDiscoveryEditGroupDes),
FlatButton(
color: Colors.cyan[500],
padding: const EdgeInsets.all(0),
child: Text(s.understood,
style: Theme.of(context)
.textTheme
.button
.copyWith(color: Colors.white)),
onPressed: () async =>
FeatureDiscovery.completeCurrentStep(context),
),
FlatButton(
color: Colors.cyan[500],
padding: const EdgeInsets.all(0),
child: Text(s.dismiss,
style: Theme.of(context)
.textTheme
.button
.copyWith(color: Colors.white)),
onPressed: () => FeatureDiscovery.dismissAll(context),
),
],
),
child: Transform( child: Transform(
alignment: FractionalOffset(0.5, 0.5), alignment: FractionalOffset.center,
transform: Matrix4.rotationY(math.pi * _fraction), transform: Matrix4.identity()
..setEntry(3, 2, 0.001)
..rotateY(math.pi * _fraction),
child: InkWell( child: InkWell(
onTap: () async { onTap: () async {
if (_fraction == 0) { if (_fraction == 0) {
@ -206,41 +169,16 @@ class _PodcastManageState extends State<PodcastManage>
title: Text(context.s.groups(2)), title: Text(context.s.groups(2)),
leading: CustomBackButton(), leading: CustomBackButton(),
actions: <Widget>[ actions: <Widget>[
DescribedFeatureOverlay( featureDiscoveryOverlay(
context,
featureId: addGroupFeature, featureId: addGroupFeature,
tapTarget: Icon(Icons.add), tapTarget: Icon(Icons.add),
title: Text(s.featureDiscoveryGroup), title: s.featureDiscoveryGroup,
overflowMode: OverflowMode.clipContent,
backgroundColor: Colors.cyan[600], backgroundColor: Colors.cyan[600],
onDismiss: () => Future.value(true), description: s.featureDiscoveryGroupDes,
description: Column( buttonColor: Colors.cyan[500],
crossAxisAlignment: CrossAxisAlignment.end,
children: <Widget>[
Text(s.featureDiscoveryGroupDes),
FlatButton(
color: Colors.cyan[500],
padding: const EdgeInsets.all(0),
child: Text(context.s.understood,
style: Theme.of(context)
.textTheme
.button
.copyWith(color: Colors.white)),
onPressed: () async =>
FeatureDiscovery.completeCurrentStep(context),
),
FlatButton(
color: Colors.cyan[500],
padding: const EdgeInsets.all(0),
child: Text(context.s.dismiss,
style: Theme.of(context)
.textTheme
.button
.copyWith(color: Colors.white)),
onPressed: () => FeatureDiscovery.dismissAll(context),
),
],
),
child: IconButton( child: IconButton(
splashRadius: 25,
onPressed: () => showGeneralDialog( onPressed: () => showGeneralDialog(
context: context, context: context,
barrierDismissible: true, barrierDismissible: true,
@ -288,39 +226,14 @@ class _PodcastManageState extends State<PodcastManage>
)), )),
), ),
pageBuilder: (context, index) => pageBuilder: (context, index) =>
DescribedFeatureOverlay( featureDiscoveryOverlay(
context,
featureId: configurePodcast, featureId: configurePodcast,
tapTarget: Text(s.podcast(1)), tapTarget: Text(s.podcast(1)),
title: Text(s.featureDiscoveryGroupPodcast), title: s.featureDiscoveryGroupPodcast,
overflowMode: OverflowMode.clipContent,
onDismiss: () => Future.value(true),
enablePulsingAnimation: false,
backgroundColor: Colors.cyan[600], backgroundColor: Colors.cyan[600],
description: Column( buttonColor: Colors.cyan[500],
crossAxisAlignment: CrossAxisAlignment.end, description: s.featureDiscoveryGroupPodcastDes,
children: <Widget>[
Text(s.featureDiscoveryGroupPodcastDes),
FlatButton(
color: Colors.cyan[500],
padding: const EdgeInsets.all(0),
child: Text(context.s.understood,
style: context.textTheme.button
.copyWith(color: Colors.white)),
onPressed: () async =>
FeatureDiscovery.completeCurrentStep(
context),
),
FlatButton(
color: Colors.cyan[500],
padding: const EdgeInsets.all(0),
child: Text(context.s.dismiss,
style: context.textTheme.button
.copyWith(color: Colors.white)),
onPressed: () =>
FeatureDiscovery.dismissAll(context),
),
],
),
child: Container( child: Container(
key: ValueKey<String>(_groups[index].name), key: ValueKey<String>(_groups[index].name),
child: child:
@ -525,9 +438,8 @@ class _OrderMenu extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final s = context.s; final s = context.s;
return PopupMenuButton( return PopupMenuButton(
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
borderRadius: BorderRadius.all(Radius.circular(10))), elevation: 1,
elevation: 2,
tooltip: s.menu, tooltip: s.menu,
itemBuilder: (context) => [ itemBuilder: (context) => [
PopupMenuItem( PopupMenuItem(
@ -589,13 +501,11 @@ class _AddGroupState extends State<AddGroup> {
: Color.fromRGBO(5, 5, 5, 1), : Color.fromRGBO(5, 5, 5, 1),
), ),
child: AlertDialog( child: AlertDialog(
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
borderRadius: BorderRadius.all(Radius.circular(10))),
elevation: 1, elevation: 1,
contentPadding: const EdgeInsets.symmetric(horizontal: 20), contentPadding: EdgeInsets.symmetric(horizontal: 20),
titlePadding: titlePadding: EdgeInsets.all(20),
const EdgeInsets.only(top: 20, left: 20, right: 20, bottom: 20), actionsPadding: EdgeInsets.zero,
actionsPadding: EdgeInsets.all(0),
actions: <Widget>[ actions: <Widget>[
FlatButton( FlatButton(
splashColor: context.accentColor.withAlpha(70), splashColor: context.accentColor.withAlpha(70),
@ -630,12 +540,12 @@ class _AddGroupState extends State<AddGroup> {
hintStyle: TextStyle(fontSize: 18), hintStyle: TextStyle(fontSize: 18),
filled: true, filled: true,
focusedBorder: UnderlineInputBorder( focusedBorder: UnderlineInputBorder(
borderSide: BorderSide( borderSide:
color: Theme.of(context).accentColor, width: 2.0), BorderSide(color: context.accentColor, width: 2.0),
), ),
enabledBorder: UnderlineInputBorder( enabledBorder: UnderlineInputBorder(
borderSide: BorderSide( borderSide:
color: Theme.of(context).accentColor, width: 2.0), BorderSide(color: context.accentColor, width: 2.0),
), ),
), ),
cursorRadius: Radius.circular(2), cursorRadius: Radius.circular(2),

4
lib/podcasts/podcast_settings.dart
View File

@ -13,9 +13,9 @@ import '../local_storage/sqflite_localpodcast.dart';
import '../state/podcast_group.dart'; import '../state/podcast_group.dart';
import '../type/play_histroy.dart'; import '../type/play_histroy.dart';
import '../type/podcastlocal.dart'; import '../type/podcastlocal.dart';
import '../util/custom_widget.dart';
import '../util/duraiton_picker.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../widgets/custom_widget.dart';
import '../widgets/duraiton_picker.dart';
enum MarkStatus { start, complete, none } enum MarkStatus { start, complete, none }
enum RefreshCoverStatus { start, complete, error, none } enum RefreshCoverStatus { start, complete, error, none }

4
lib/podcasts/podcastlist.dart
View File

@ -11,10 +11,10 @@ import 'package:provider/provider.dart';
import '../local_storage/sqflite_localpodcast.dart'; import '../local_storage/sqflite_localpodcast.dart';
import '../state/podcast_group.dart'; import '../state/podcast_group.dart';
import '../type/podcastlocal.dart'; import '../type/podcastlocal.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../util/general_dialog.dart';
import '../util/pageroute.dart'; import '../util/pageroute.dart';
import '../widgets/custom_widget.dart';
import '../widgets/general_dialog.dart';
import 'podcast_detail.dart'; import 'podcast_detail.dart';
import 'podcast_settings.dart'; import 'podcast_settings.dart';

4
lib/settings/data_backup.dart
View File

@ -2,6 +2,7 @@ import 'dart:convert';
import 'dart:developer' as developer; import 'dart:developer' as developer;
import 'dart:io'; import 'dart:io';
import 'package:confetti/confetti.dart';
import 'package:device_info/device_info.dart'; import 'package:device_info/device_info.dart';
import 'package:file_picker/file_picker.dart'; import 'package:file_picker/file_picker.dart';
import 'package:flutter/gestures.dart'; import 'package:flutter/gestures.dart';
@ -10,7 +11,6 @@ import 'package:flutter/services.dart';
import 'package:flutter_file_dialog/flutter_file_dialog.dart'; import 'package:flutter_file_dialog/flutter_file_dialog.dart';
import 'package:fluttertoast/fluttertoast.dart'; import 'package:fluttertoast/fluttertoast.dart';
import 'package:line_icons/line_icons.dart'; import 'package:line_icons/line_icons.dart';
import 'package:confetti/confetti.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -23,8 +23,8 @@ import '../service/opml_build.dart';
import '../state/podcast_group.dart'; import '../state/podcast_group.dart';
import '../state/setting_state.dart'; import '../state/setting_state.dart';
import '../type/settings_backup.dart'; import '../type/settings_backup.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../widgets/custom_widget.dart';
class DataBackup extends StatefulWidget { class DataBackup extends StatefulWidget {
@override @override

2
lib/settings/downloads_manage.dart
View File

@ -11,8 +11,8 @@ import 'package:provider/provider.dart';
import '../local_storage/sqflite_localpodcast.dart'; import '../local_storage/sqflite_localpodcast.dart';
import '../state/download_state.dart'; import '../state/download_state.dart';
import '../type/episodebrief.dart'; import '../type/episodebrief.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../widgets/custom_widget.dart';
class DownloadsManage extends StatefulWidget { class DownloadsManage extends StatefulWidget {
@override @override

2
lib/settings/history.dart
View File

@ -15,8 +15,8 @@ import '../state/podcast_group.dart';
import '../type/play_histroy.dart'; import '../type/play_histroy.dart';
import '../type/search_api/searchpodcast.dart'; import '../type/search_api/searchpodcast.dart';
import '../type/sub_history.dart'; import '../type/sub_history.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../widgets/custom_widget.dart';
class PlayedHistory extends StatefulWidget { class PlayedHistory extends StatefulWidget {
@override @override

6
lib/settings/layouts.dart
View File

@ -5,10 +5,10 @@ import 'package:provider/provider.dart';
import '../local_storage/key_value_storage.dart'; import '../local_storage/key_value_storage.dart';
import '../service/search_api.dart'; import '../service/search_api.dart';
import '../state/audio_state.dart'; import '../state/audio_state.dart';
import '../util/custom_dropdown.dart';
import '../util/custom_widget.dart';
import '../util/episodegrid.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../widgets/custom_dropdown.dart';
import '../widgets/custom_widget.dart';
import '../widgets/episodegrid.dart';
import 'popup_menu.dart'; import 'popup_menu.dart';
class LayoutSetting extends StatefulWidget { class LayoutSetting extends StatefulWidget {

2
lib/settings/libries.dart
View File

@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../widgets/custom_widget.dart';
import 'licenses.dart'; import 'licenses.dart';
class Libries extends StatelessWidget { class Libries extends StatelessWidget {

6
lib/settings/play_setting.dart
View File

@ -10,10 +10,10 @@ import '../home/audioplayer.dart';
import '../local_storage/key_value_storage.dart'; import '../local_storage/key_value_storage.dart';
import '../state/audio_state.dart'; import '../state/audio_state.dart';
import '../state/setting_state.dart'; import '../state/setting_state.dart';
import '../util/custom_dropdown.dart';
import '../util/custom_time_picker.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../widgets/custom_dropdown.dart';
import '../widgets/custom_time_picker.dart';
import '../widgets/custom_widget.dart';
const List kSecondsToSelect = [5, 10, 15, 20, 25, 30, 45, 60]; const List kSecondsToSelect = [5, 10, 15, 20, 25, 30, 45, 60];
const List<double> kSpeedToSelect = [ const List<double> kSpeedToSelect = [

2
lib/settings/popup_menu.dart
View File

@ -4,8 +4,8 @@ import 'package:flutter/services.dart';
import 'package:line_icons/line_icons.dart'; import 'package:line_icons/line_icons.dart';
import '../local_storage/key_value_storage.dart'; import '../local_storage/key_value_storage.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../widgets/custom_widget.dart';
class PopupMenuSetting extends StatefulWidget { class PopupMenuSetting extends StatefulWidget {
const PopupMenuSetting({Key key}) : super(key: key); const PopupMenuSetting({Key key}) : super(key: key);

9
lib/settings/settting.dart
View File

@ -4,12 +4,11 @@ import 'package:flutter/services.dart';
import 'package:fluttertoast/fluttertoast.dart'; import 'package:fluttertoast/fluttertoast.dart';
import 'package:line_icons/line_icons.dart'; import 'package:line_icons/line_icons.dart';
import '../home/home.dart';
import '../intro_slider/app_intro.dart'; import '../intro_slider/app_intro.dart';
import '../podcasts/podcast_manage.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../util/general_dialog.dart'; import '../widgets/custom_widget.dart';
import '../widgets/feature_discovery.dart';
import '../widgets/general_dialog.dart';
import 'data_backup.dart'; import 'data_backup.dart';
import 'history.dart'; import 'history.dart';
import 'languages.dart'; import 'languages.dart';
@ -219,7 +218,7 @@ class _SettingsState extends State<Settings> {
), ),
ListTile( ListTile(
onTap: () { onTap: () {
FeatureDiscovery.clearPreferences(context, const <String>{ FeatureDiscovery.clearPreferences(context, <String>{
addFeature, addFeature,
menuFeature, menuFeature,
playlistFeature, playlistFeature,

6
lib/settings/storage.dart
View File

@ -7,10 +7,10 @@ import 'package:provider/provider.dart';
import '../local_storage/key_value_storage.dart'; import '../local_storage/key_value_storage.dart';
import '../settings/downloads_manage.dart'; import '../settings/downloads_manage.dart';
import '../state/setting_state.dart'; import '../state/setting_state.dart';
import '../util/custom_dropdown.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../util/general_dialog.dart'; import '../widgets/custom_dropdown.dart';
import '../widgets/custom_widget.dart';
import '../widgets/general_dialog.dart';
class StorageSetting extends StatefulWidget { class StorageSetting extends StatefulWidget {
@override @override

4
lib/settings/syncing.dart
View File

@ -4,9 +4,9 @@ import 'package:provider/provider.dart';
import 'package:tuple/tuple.dart'; import 'package:tuple/tuple.dart';
import '../state/setting_state.dart'; import '../state/setting_state.dart';
import '../util/custom_dropdown.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../widgets/custom_dropdown.dart';
import '../widgets/custom_widget.dart';
class SyncingSetting extends StatelessWidget { class SyncingSetting extends StatelessWidget {
@override @override

4
lib/settings/theme.dart
View File

@ -3,9 +3,9 @@ import 'package:flutter/services.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../state/setting_state.dart'; import '../state/setting_state.dart';
import '../util/custom_widget.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../util/general_dialog.dart'; import '../widgets/custom_widget.dart';
import '../widgets/general_dialog.dart';
class ThemeSetting extends StatelessWidget { class ThemeSetting extends StatelessWidget {
@override @override

46
lib/state/setting_state.dart
View File

@ -21,7 +21,7 @@ void callbackDispatcher() {
if (Platform.isAndroid) { if (Platform.isAndroid) {
Workmanager.executeTask((task, inputData) async { Workmanager.executeTask((task, inputData) async {
var dbHelper = DBHelper(); var dbHelper = DBHelper();
var podcastList = await dbHelper.getPodcastLocalAll(updateOnly: false); var podcastList = await dbHelper.getPodcastLocalAll(updateOnly: true);
//lastWork is a indicator for if the app was opened since last backgroundwork //lastWork is a indicator for if the app was opened since last backgroundwork
//if the app wes opend,then the old marked new episode would be marked not new. //if the app wes opend,then the old marked new episode would be marked not new.
var lastWorkStorage = KeyValueStorage(lastWorkKey); var lastWorkStorage = KeyValueStorage(lastWorkKey);
@ -107,6 +107,26 @@ class SettingState extends ChangeNotifier {
await _getRealDark(); await _getRealDark();
} }
@override
void addListener(VoidCallback listener) {
super.addListener(listener);
_getLocale();
_getAutoUpdate();
_getDownloadUsingData();
_getSleepTimerData();
_getPlayerSeconds();
_getShowNotesFonts();
_getUpdateInterval().then((value) async {
if (_initUpdateTag == 0) {
setWorkManager(24);
} else if (_autoUpdate && _initialShowIntor < 3) {
await cancelWork();
setWorkManager(_initUpdateTag);
await saveShowIntro(3);
}
});
}
Locale _locale; Locale _locale;
/// Load locale. /// Load locale.
@ -301,26 +321,6 @@ class SettingState extends ChangeNotifier {
_saveShowNotesFonts(); _saveShowNotesFonts();
} }
@override
void addListener(VoidCallback listener) {
super.addListener(listener);
_getLocale();
_getAutoUpdate();
_getDownloadUsingData();
_getSleepTimerData();
_getPlayerSeconds();
_getShowNotesFonts();
_getUpdateInterval().then((value) async {
if (_initUpdateTag == 0) {
setWorkManager(24);
} else if (_autoUpdate && _initialShowIntor == 1) {
await cancelWork();
setWorkManager(_initUpdateTag);
await saveShowIntro(2);
}
});
}
Future _getTheme() async { Future _getTheme() async {
var mode = await themeStorage.getInt(); var mode = await themeStorage.getInt();
_theme = ThemeMode.values[mode]; _theme = ThemeMode.values[mode];
@ -358,7 +358,7 @@ class SettingState extends ChangeNotifier {
Future _getShowIntro() async { Future _getShowIntro() async {
_initialShowIntor = await introStorage.getInt(); _initialShowIntor = await introStorage.getInt();
_showIntro = _initialShowIntor == 0 ? true : false; _showIntro = _initialShowIntor == 0;
} }
Future _getRealDark() async { Future _getRealDark() async {
@ -616,7 +616,7 @@ class SettingState extends ChangeNotifier {
if (_autoUpdate) { if (_autoUpdate) {
await cancelWork(); await cancelWork();
setWorkManager(_initUpdateTag); setWorkManager(_initUpdateTag);
await saveShowIntro(2); await saveShowIntro(3);
} }
}); });
} }

2
lib/util/audiopanel.dart → lib/widgets/audiopanel.dart
View File

@ -2,7 +2,7 @@ import 'dart:math' as math;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'extension_helper.dart'; import '../util/extension_helper.dart';
enum SlideDirection { up, down } enum SlideDirection { up, down }

0
lib/util/custom_dropdown.dart → lib/widgets/custom_dropdown.dart
View File

0
lib/util/custom_popupmenu.dart → lib/widgets/custom_popupmenu.dart
View File

0
lib/util/custom_slider.dart → lib/widgets/custom_slider.dart
View File

0
lib/util/custom_time_picker.dart → lib/widgets/custom_time_picker.dart
View File

2
lib/util/custom_widget.dart → lib/widgets/custom_widget.dart
View File

@ -3,8 +3,8 @@ import 'dart:math' as math;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../type/episodebrief.dart'; import '../type/episodebrief.dart';
import '../util/extension_helper.dart';
import 'episodegrid.dart'; import 'episodegrid.dart';
import 'extension_helper.dart';
const kTwoPi = math.pi * 2; const kTwoPi = math.pi * 2;
const kPi = math.pi; const kPi = math.pi;

0
lib/util/duraiton_picker.dart → lib/widgets/duraiton_picker.dart
View File

6
lib/util/episodegrid.dart → lib/widgets/episodegrid.dart
View File

@ -22,11 +22,11 @@ import '../state/download_state.dart';
import '../type/episodebrief.dart'; import '../type/episodebrief.dart';
import '../type/play_histroy.dart'; import '../type/play_histroy.dart';
import '../type/podcastlocal.dart'; import '../type/podcastlocal.dart';
import '../util/extension_helper.dart';
import '../util/open_container.dart';
import '../util/pageroute.dart';
import 'custom_widget.dart'; import 'custom_widget.dart';
import 'extension_helper.dart';
import 'general_dialog.dart'; import 'general_dialog.dart';
import 'open_container.dart';
import 'pageroute.dart';
enum Layout { three, two, one } enum Layout { three, two, one }

57
lib/widgets/feature_discovery.dart Normal file
View File

@ -0,0 +1,57 @@
import 'package:feature_discovery/feature_discovery.dart';
import 'package:flutter/material.dart';
import '../util/extension_helper.dart';
const String addFeature = 'addFeature';
const String menuFeature = 'menuFeature';
const String playlistFeature = 'playlistFeature';
const String longTapFeature = 'longTapFeature';
const String groupsFeature = 'groupsFeature';
const String podcastFeature = 'podcastFeature';
const String addGroupFeature = 'addGroupFeature';
const String configureGroup = 'configureFeature';
const String configurePodcast = 'configurePodcast';
Widget featureDiscoveryOverlay(BuildContext context,
{String featureId,
Color buttonColor,
Color backgroundColor,
Widget child,
Widget tapTarget,
String title,
String description}) {
final s = context.s;
return DescribedFeatureOverlay(
featureId: featureId,
tapTarget: tapTarget,
title: Text(title),
backgroundColor: backgroundColor,
overflowMode: OverflowMode.clipContent,
onDismiss: () {
return Future.value(true);
},
description: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(description),
FlatButton(
color: buttonColor,
padding: EdgeInsets.zero,
child: Text(s.understood,
style: context.textTheme.button.copyWith(color: Colors.white)),
onPressed: () async =>
FeatureDiscovery.completeCurrentStep(context),
),
FlatButton(
color: buttonColor,
padding: EdgeInsets.zero,
child: Text(s.dismiss,
style: context.textTheme.button.copyWith(color: Colors.white)),
onPressed: () => FeatureDiscovery.dismissAll(context),
),
],
),
child: child);
}

2
lib/util/general_dialog.dart → lib/widgets/general_dialog.dart
View File

@ -1,7 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'extension_helper.dart'; import '../util/extension_helper.dart';
Future generalDialog(BuildContext context, Future generalDialog(BuildContext context,
{Widget title, Widget content, List<Widget> actions}) async => {Widget title, Widget content, List<Widget> actions}) async =>

2
lib/util/muiliselect_bar.dart → lib/widgets/muiliselect_bar.dart
View File

@ -10,8 +10,8 @@ import '../state/audio_state.dart';
import '../state/download_state.dart'; import '../state/download_state.dart';
import '../type/episodebrief.dart'; import '../type/episodebrief.dart';
import '../type/play_histroy.dart'; import '../type/play_histroy.dart';
import '../util/extension_helper.dart';
import 'custom_widget.dart'; import 'custom_widget.dart';
import 'extension_helper.dart';
import 'general_dialog.dart'; import 'general_dialog.dart';
class MultiSelectMenuBar extends StatefulWidget { class MultiSelectMenuBar extends StatefulWidget {

0
lib/util/settings_sheet.dart → lib/widgets/settings_sheet.dart
View File

20
pubspec.yaml
View File

@ -12,8 +12,8 @@ dependencies:
flutter_localizations: flutter_localizations:
sdk: flutter sdk: flutter
auto_animated: ^2.1.0 auto_animated: ^2.1.0
audio_session: ^0.0.8 audio_session: ^0.0.9
cached_network_image: ^2.3.2+1 cached_network_image: ^2.3.3
color_thief_flutter: ^1.0.2 color_thief_flutter: ^1.0.2
confetti: ^0.5.4+1 confetti: ^0.5.4+1
cookie_jar: ^1.0.1 cookie_jar: ^1.0.1
@ -27,10 +27,10 @@ dependencies:
extended_nested_scroll_view: ^1.0.1 extended_nested_scroll_view: ^1.0.1
effective_dart: ^1.2.4 effective_dart: ^1.2.4
equatable: ^1.2.5 equatable: ^1.2.5
feature_discovery: ^0.10.0 feature_discovery: ^0.12.1
file_picker: ^2.0.7 file_picker: ^2.0.11
flutter_html: ^0.11.1 flutter_html: ^0.11.1
flutter_downloader: ^1.5.1 flutter_downloader: ^1.5.2
fluttertoast: ^4.0.0 fluttertoast: ^4.0.0
flutter_isolate: ^1.0.0+14 flutter_isolate: ^1.0.0+14
flutter_linkify: ^3.1.3 flutter_linkify: ^3.1.3
@ -38,24 +38,24 @@ dependencies:
flare_flutter: ^2.0.6 flare_flutter: ^2.0.6
fl_chart: ^0.12.0 fl_chart: ^0.12.0
marquee: ^1.6.1 marquee: ^1.6.1
google_fonts: ^1.1.0 google_fonts: ^1.1.1
image: ^2.1.18 image: ^2.1.18
intl: ^0.16.1 intl: ^0.16.1
json_serializable: ^3.5.0 json_serializable: ^3.5.0
json_annotation: ^3.1.0 json_annotation: ^3.1.0
path_provider: ^1.6.18 path_provider: ^1.6.22
permission_handler: ^5.0.1 permission_handler: ^5.0.1
provider: ^4.3.2 provider: ^4.3.2
rxdart: ^0.24.1 rxdart: ^0.24.1
sqflite: ^1.3.1+1 sqflite: ^1.3.2+1
shared_preferences: ^0.5.12 shared_preferences: ^0.5.12
tuple: ^1.0.3 tuple: ^1.0.3
url_launcher: ^5.7.2 url_launcher: ^5.7.8
uuid: ^2.2.2 uuid: ^2.2.2
xml: ^4.2.0 xml: ^4.2.0
workmanager: ^0.2.3 workmanager: ^0.2.3
wc_flutter_share: ^0.2.2 wc_flutter_share: ^0.2.2
audio_service: ^0.15.1 audio_service: ^0.15.2
just_audio: just_audio:
git: git:
url: https://github.com/stonega/just_audio.git url: https://github.com/stonega/just_audio.git