From f752f10a37d92c4a6471e28b2d8cbe69f901a60a Mon Sep 17 00:00:00 2001 From: stonega Date: Sat, 30 Jan 2021 17:21:04 +0800 Subject: [PATCH] Minor change. --- android/app/build.gradle | 14 +++++++------- lib/home/audioplayer.dart | 7 ++++--- lib/home/home_groups.dart | 2 +- lib/playlists/playlist_home.dart | 1 - lib/podcasts/podcast_detail.dart | 2 -- lib/state/podcast_group.dart | 1 - lib/util/hide_player_route.dart | 10 +++++----- tool/env.dart | 2 -- 8 files changed, 17 insertions(+), 22 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index ea6ebde..27e4418 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -85,13 +85,13 @@ android { } } - // android.applicationVariants.all { variant -> - // if (variant.flavorName == "fdroid") { - // variant.outputs.all { output -> - // output.outputFileName = "app-fdroid-release.apk" - // } - // } - // } + android.applicationVariants.all { variant -> + if (variant.flavorName == "play") { + variant.outputs.all { output -> + output.outputFileName = "app-release.apk" + } + } + } } flutter { diff --git a/lib/home/audioplayer.dart b/lib/home/audioplayer.dart index ed14314..b01f01b 100644 --- a/lib/home/audioplayer.dart +++ b/lib/home/audioplayer.dart @@ -7,12 +7,12 @@ import 'package:google_fonts/google_fonts.dart'; import 'package:line_icons/line_icons.dart'; import 'package:marquee/marquee.dart'; import 'package:provider/provider.dart'; -import 'package:tsacdop/playlists/playlist_home.dart'; import 'package:tuple/tuple.dart'; import '../episodes/episode_detail.dart'; import '../local_storage/key_value_storage.dart'; import '../local_storage/sqflite_localpodcast.dart'; +import '../playlists/playlist_home.dart'; import '../state/audio_state.dart'; import '../type/episodebrief.dart'; import '../type/play_histroy.dart'; @@ -554,12 +554,13 @@ class _PlaylistWidgetState extends State { return InkWell( onTap: () async { if (!isPlaying) { - if (data.item1.name == 'Queue') + if (data.item1.name == 'Queue') { audio.episodeLoad(episodes[index]); - else + } else { await context .read() .loadEpisodeFromPlaylist(episodes[index]); + } } }, child: Container( diff --git a/lib/home/home_groups.dart b/lib/home/home_groups.dart index 6f6b480..e611882 100644 --- a/lib/home/home_groups.dart +++ b/lib/home/home_groups.dart @@ -10,7 +10,6 @@ import 'package:focused_menu/modals.dart'; import 'package:line_icons/line_icons.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:provider/provider.dart'; -import 'package:tsacdop/state/setting_state.dart'; import 'package:tuple/tuple.dart' as tuple; import '../episodes/episode_detail.dart'; @@ -23,6 +22,7 @@ import '../state/audio_state.dart'; import '../state/download_state.dart'; import '../state/podcast_group.dart'; import '../state/refresh_podcast.dart'; +import '../state/setting_state.dart'; import '../type/episodebrief.dart'; import '../type/play_histroy.dart'; import '../type/podcastlocal.dart'; diff --git a/lib/playlists/playlist_home.dart b/lib/playlists/playlist_home.dart index 00865a9..25417a6 100644 --- a/lib/playlists/playlist_home.dart +++ b/lib/playlists/playlist_home.dart @@ -523,7 +523,6 @@ class __HistoryState extends State<_History> { @override Widget build(BuildContext context) { - final s = context.s; final audio = context.watch(); return FutureBuilder>( future: _getData, diff --git a/lib/podcasts/podcast_detail.dart b/lib/podcasts/podcast_detail.dart index 710243d..2bf2167 100644 --- a/lib/podcasts/podcast_detail.dart +++ b/lib/podcasts/podcast_detail.dart @@ -1012,7 +1012,6 @@ class AboutPodcast extends StatefulWidget { class _AboutPodcastState extends State { String _description; bool _load; - bool _expand; void getDescription(String id) async { var dbHelper = DBHelper(); var description = await dbHelper.getFeedDescription(id); @@ -1029,7 +1028,6 @@ class _AboutPodcastState extends State { void initState() { super.initState(); _load = false; - _expand = false; getDescription(widget.podcastLocal.id); } diff --git a/lib/state/podcast_group.dart b/lib/state/podcast_group.dart index d372abc..9de64d6 100644 --- a/lib/state/podcast_group.dart +++ b/lib/state/podcast_group.dart @@ -16,7 +16,6 @@ import 'package:path_provider/path_provider.dart'; import 'package:uuid/uuid.dart'; import 'package:webfeed/webfeed.dart'; import 'package:workmanager/workmanager.dart'; -import 'package:path/path.dart' as path; import '../local_storage/key_value_storage.dart'; import '../local_storage/sqflite_localpodcast.dart'; diff --git a/lib/util/hide_player_route.dart b/lib/util/hide_player_route.dart index e4f1d25..d5ccdae 100644 --- a/lib/util/hide_player_route.dart +++ b/lib/util/hide_player_route.dart @@ -35,11 +35,11 @@ class HidePlayerRoute extends ModalRoute { ), ); } - final Animation curvedAnimation = CurvedAnimation( - parent: animation, - curve: Curves.fastOutSlowIn, - reverseCurve: Curves.fastOutSlowIn.flipped, - ); + // final Animation curvedAnimation = CurvedAnimation( + // parent: animation, + // curve: Curves.fastOutSlowIn, + // reverseCurve: Curves.fastOutSlowIn.flipped, + // ); final playerHeight = kMinPlayerHeight[data.item2.index]; final playerRunning = data.item1; return SizedBox.expand( diff --git a/tool/env.dart b/tool/env.dart index 47686f3..aeb8198 100644 --- a/tool/env.dart +++ b/tool/env.dart @@ -4,8 +4,6 @@ import 'dart:io'; Future main() async { final config = { 'apiKey': Platform.environment['API_KEY'], - 'podcastIndexApiKey': Platform.environment['PI_API_KEY'], - 'podcastIndexApiSecret': Platform.environment['PI_API_SECRET'] }; final filename = 'lib/.env.dart';