From 5f75ace725681eb650a4fb39deb6f5d3e68f9fb7 Mon Sep 17 00:00:00 2001 From: stonegate Date: Thu, 7 May 2020 00:50:32 +0800 Subject: [PATCH] Change files layout --- .circleci/config.yml | 3 --- lib/episodes/episodedetail.dart | 10 +++++----- lib/episodes/episodedownload.dart | 9 +++++---- lib/home/{appbar => }/about.dart | 0 lib/home/{appbar => }/addpodcast.dart | 10 +++++----- lib/home/audioplayer.dart | 21 ++++++++++----------- lib/home/download_list.dart | 7 ++++--- lib/home/home.dart | 19 +++++++++---------- lib/home/home_groups.dart | 16 ++++++++-------- lib/home/{appbar => }/importompl.dart | 8 ++++---- lib/home/playlist.dart | 4 ++-- lib/home/{appbar => }/popupmenu.dart | 7 ++++--- lib/intro_slider/app_intro.dart | 6 +++--- lib/local_storage/key_value_storage.dart | 3 ++- lib/local_storage/sqflite_localpodcast.dart | 10 +++++----- lib/main.dart | 12 ++++++------ lib/podcasts/podcastdetail.dart | 10 +++++----- lib/podcasts/podcastgroup.dart | 4 ++-- lib/podcasts/podcastlist.dart | 10 +++++----- lib/podcasts/podcastmanage.dart | 11 ++++++----- lib/settings/downloads_manage.dart | 5 +++-- lib/settings/history.dart | 7 ++++--- lib/settings/play_setting.dart | 2 +- lib/settings/settting.dart | 10 +++++----- lib/settings/storage.dart | 5 +++-- lib/settings/syncing.dart | 3 ++- lib/settings/theme.dart | 5 +++-- lib/{class => state}/audiostate.dart | 6 +++--- lib/{class => state}/download_state.dart | 2 +- lib/{class => state}/importompl.dart | 0 lib/{class => state}/podcast_group.dart | 3 ++- lib/{class => state}/refresh_podcast.dart | 2 +- lib/{class => state}/settingstate.dart | 6 +++--- lib/{class => state}/subscribe_podcast.dart | 4 ++-- lib/{class => type}/episodebrief.dart | 0 lib/{class => type}/fireside_data.dart | 0 lib/{class => type}/podcastlocal.dart | 0 lib/{class => type}/searchpodcast.dart | 0 lib/{class => type}/searchpodcast.g.dart | 0 lib/{class => type}/sub_history.dart | 0 lib/util/episodegrid.dart | 14 +++++++------- lib/util/ompl_build.dart | 2 +- pubspec.yaml | 2 +- 43 files changed, 132 insertions(+), 126 deletions(-) rename lib/home/{appbar => }/about.dart (100%) rename lib/home/{appbar => }/addpodcast.dart (98%) rename lib/home/{appbar => }/importompl.dart (93%) rename lib/home/{appbar => }/popupmenu.dart (97%) rename lib/{class => state}/audiostate.dart (99%) rename lib/{class => state}/download_state.dart (99%) rename lib/{class => state}/importompl.dart (100%) rename lib/{class => state}/podcast_group.dart (99%) rename lib/{class => state}/refresh_podcast.dart (98%) rename lib/{class => state}/settingstate.dart (97%) rename lib/{class => state}/subscribe_podcast.dart (99%) rename lib/{class => type}/episodebrief.dart (100%) rename lib/{class => type}/fireside_data.dart (100%) rename lib/{class => type}/podcastlocal.dart (100%) rename lib/{class => type}/searchpodcast.dart (100%) rename lib/{class => type}/searchpodcast.g.dart (100%) rename lib/{class => type}/sub_history.dart (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index d60b2d5..a7972a2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,9 +16,6 @@ jobs: - run: echo $ENCODED_KEYSTORE | base64 -di > ${HOME}/keystore.jks - run: echo 'export KEYSTORE=${HOME}/keystore.jks' >> $BASH_ENV - run: dart tool/env.dart - - run: - name: Build the Android bundle - command: flutter build appbundle --no-shrink - run: name: Build the Android version command: flutter build apk --split-per-abi --no-shrink diff --git a/lib/episodes/episodedetail.dart b/lib/episodes/episodedetail.dart index 3241d7a..a94e1a4 100644 --- a/lib/episodes/episodedetail.dart +++ b/lib/episodes/episodedetail.dart @@ -12,11 +12,11 @@ import 'package:tuple/tuple.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:tsacdop/class/audiostate.dart'; -import 'package:tsacdop/class/episodebrief.dart'; -import 'package:tsacdop/local_storage/sqflite_localpodcast.dart'; -import 'package:tsacdop/util/context_extension.dart'; -import 'package:tsacdop/util/custompaint.dart'; +import '../state/audiostate.dart'; +import '../type/episodebrief.dart'; +import '../local_storage/sqflite_localpodcast.dart'; +import '../util/context_extension.dart'; +import '../util/custompaint.dart'; import 'episodedownload.dart'; class EpisodeDetail extends StatefulWidget { diff --git a/lib/episodes/episodedownload.dart b/lib/episodes/episodedownload.dart index 79c6b18..c93477e 100644 --- a/lib/episodes/episodedownload.dart +++ b/lib/episodes/episodedownload.dart @@ -8,10 +8,11 @@ import 'package:flutter_downloader/flutter_downloader.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:connectivity/connectivity.dart'; -import 'package:tsacdop/class/download_state.dart'; -import 'package:tsacdop/class/episodebrief.dart'; -import 'package:tsacdop/class/audiostate.dart'; -import 'package:tsacdop/class/settingstate.dart'; + +import '../state/download_state.dart'; +import '../state/audiostate.dart'; +import '../state/settingstate.dart'; +import '../type/episodebrief.dart'; class DownloadButton extends StatefulWidget { final EpisodeBrief episode; diff --git a/lib/home/appbar/about.dart b/lib/home/about.dart similarity index 100% rename from lib/home/appbar/about.dart rename to lib/home/about.dart diff --git a/lib/home/appbar/addpodcast.dart b/lib/home/addpodcast.dart similarity index 98% rename from lib/home/appbar/addpodcast.dart rename to lib/home/addpodcast.dart index 0d9b71a..a00f83a 100644 --- a/lib/home/appbar/addpodcast.dart +++ b/lib/home/addpodcast.dart @@ -10,11 +10,11 @@ import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'package:fluttertoast/fluttertoast.dart'; -import '../../class/searchpodcast.dart'; -import '../../class/subscribe_podcast.dart'; -import '../../util/context_extension.dart'; -import '../../webfeed/webfeed.dart'; -import '../../.env.dart'; +import '../type/searchpodcast.dart'; +import '../state/subscribe_podcast.dart'; +import '../util/context_extension.dart'; +import '../webfeed/webfeed.dart'; +import '../.env.dart'; class MyHomePageDelegate extends SearchDelegate { final String searchFieldLabel; diff --git a/lib/home/audioplayer.dart b/lib/home/audioplayer.dart index f4cdbbb..9061190 100644 --- a/lib/home/audioplayer.dart +++ b/lib/home/audioplayer.dart @@ -4,22 +4,21 @@ import 'dart:math' as math; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:marquee/marquee.dart'; -import 'package:tsacdop/home/playlist.dart'; -import 'package:tsacdop/local_storage/sqflite_localpodcast.dart'; import 'package:tuple/tuple.dart'; import 'package:audio_service/audio_service.dart'; import 'package:line_icons/line_icons.dart'; -import 'package:tsacdop/class/episodebrief.dart'; -import 'package:tsacdop/class/audiostate.dart'; -import 'package:tsacdop/episodes/episodedetail.dart'; -import 'package:tsacdop/home/audiopanel.dart'; -import 'package:tsacdop/util/pageroute.dart'; -import 'package:tsacdop/util/colorize.dart'; -import 'package:tsacdop/util/context_extension.dart'; -import 'package:tsacdop/util/custompaint.dart'; +import '../type/episodebrief.dart'; +import '../state/audiostate.dart'; +import '../local_storage/sqflite_localpodcast.dart'; +import '../util/pageroute.dart'; +import '../util/colorize.dart'; +import '../util/context_extension.dart'; +import '../util/custompaint.dart'; import '../util/customslider.dart'; - +import '../episodes/episodedetail.dart'; +import 'playlist.dart'; +import 'audiopanel.dart'; final List _customShadow = [ BoxShadow(blurRadius: 26, offset: Offset(-6, -6), color: Colors.white), diff --git a/lib/home/download_list.dart b/lib/home/download_list.dart index ea8495f..a135df1 100644 --- a/lib/home/download_list.dart +++ b/lib/home/download_list.dart @@ -1,9 +1,10 @@ import 'dart:io'; import 'package:provider/provider.dart'; import 'package:flutter/material.dart'; -import 'package:tsacdop/class/download_state.dart'; -import 'package:tsacdop/episodes/episodedetail.dart'; -import 'package:tsacdop/util/pageroute.dart'; + +import '../state/download_state.dart'; +import '../episodes/episodedetail.dart'; +import '../util/pageroute.dart'; class DownloadList extends StatefulWidget { DownloadList({Key key}) : super(key: key); diff --git a/lib/home/home.dart b/lib/home/home.dart index 5917f9b..10caf49 100644 --- a/lib/home/home.dart +++ b/lib/home/home.dart @@ -4,26 +4,25 @@ import 'dart:io'; import 'package:flutter/material.dart' hide NestedScrollView; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; -import 'package:tsacdop/class/download_state.dart'; -import 'package:tsacdop/class/podcast_group.dart'; -import 'package:tsacdop/home/playlist.dart'; import 'package:tuple/tuple.dart'; import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'; import 'package:line_icons/line_icons.dart'; import 'package:fluttertoast/fluttertoast.dart'; -import '../class/audiostate.dart'; -import '../class/episodebrief.dart'; +import '../state/audiostate.dart'; +import '../type/episodebrief.dart'; import '../local_storage/sqflite_localpodcast.dart'; import '../util/episodegrid.dart'; import '../util/mypopupmenu.dart'; import '../util/context_extension.dart'; import '../util/custompaint.dart'; - -import '../home/appbar/importompl.dart'; -import '../home/audioplayer.dart'; -import 'appbar/addpodcast.dart'; -import 'appbar/popupmenu.dart'; +import '../state/download_state.dart'; +import '../state/podcast_group.dart'; +import 'playlist.dart'; +import 'importompl.dart'; +import 'audioplayer.dart'; +import 'addpodcast.dart'; +import 'popupmenu.dart'; import 'home_groups.dart'; import 'download_list.dart'; diff --git a/lib/home/home_groups.dart b/lib/home/home_groups.dart index ea2a65f..8cae580 100644 --- a/lib/home/home_groups.dart +++ b/lib/home/home_groups.dart @@ -5,21 +5,21 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:fluttertoast/fluttertoast.dart'; -import 'package:tsacdop/class/audiostate.dart'; -import 'package:tsacdop/util/custompaint.dart'; import 'package:tuple/tuple.dart'; import 'package:line_icons/line_icons.dart'; -import '../class/episodebrief.dart'; -import '../class/podcast_group.dart'; -import '../class/podcastlocal.dart'; +import '../type/episodebrief.dart'; +import '../state/podcast_group.dart'; +import '../type/podcastlocal.dart'; +import '../state/audiostate.dart'; +import '../util/custompaint.dart'; +import '../util/pageroute.dart'; +import '../util/colorize.dart'; +import '../util/context_extension.dart'; import '../local_storage/sqflite_localpodcast.dart'; import '../episodes/episodedetail.dart'; import '../podcasts/podcastdetail.dart'; import '../podcasts/podcastmanage.dart'; -import '../util/pageroute.dart'; -import '../util/colorize.dart'; -import '../util/context_extension.dart'; class ScrollPodcasts extends StatefulWidget { @override diff --git a/lib/home/appbar/importompl.dart b/lib/home/importompl.dart similarity index 93% rename from lib/home/appbar/importompl.dart rename to lib/home/importompl.dart index b50e1c2..e08eb1a 100644 --- a/lib/home/appbar/importompl.dart +++ b/lib/home/importompl.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../../class/podcast_group.dart'; -import '../../class/subscribe_podcast.dart'; -import '../../class/refresh_podcast.dart'; -import '../../util/context_extension.dart'; +import '../state/podcast_group.dart'; +import '../state/subscribe_podcast.dart'; +import '../state/refresh_podcast.dart'; +import '../util/context_extension.dart'; class Import extends StatelessWidget { Widget importColumn(String text, BuildContext context) { diff --git a/lib/home/playlist.dart b/lib/home/playlist.dart index b0929de..79e4430 100644 --- a/lib/home/playlist.dart +++ b/lib/home/playlist.dart @@ -8,8 +8,8 @@ import 'package:tuple/tuple.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:line_icons/line_icons.dart'; -import '../class/audiostate.dart'; -import '../class/episodebrief.dart'; +import '../state/audiostate.dart'; +import '../type/episodebrief.dart'; import '../util/context_extension.dart'; import '../util/custompaint.dart'; diff --git a/lib/home/appbar/popupmenu.dart b/lib/home/popupmenu.dart similarity index 97% rename from lib/home/appbar/popupmenu.dart rename to lib/home/popupmenu.dart index 3d2945e..0937ec3 100644 --- a/lib/home/appbar/popupmenu.dart +++ b/lib/home/popupmenu.dart @@ -3,8 +3,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:tsacdop/class/refresh_podcast.dart'; -import 'package:tsacdop/class/subscribe_podcast.dart'; + import 'package:tsacdop/local_storage/key_value_storage.dart'; import 'package:xml/xml.dart' as xml; import 'package:file_picker/file_picker.dart'; @@ -13,7 +12,9 @@ import 'package:fluttertoast/fluttertoast.dart'; import 'package:line_icons/line_icons.dart'; import 'package:intl/intl.dart'; -import 'package:tsacdop/settings/settting.dart'; +import '../settings/settting.dart'; +import '../state/refresh_podcast.dart'; +import '../state/subscribe_podcast.dart'; import 'about.dart'; class OmplOutline { diff --git a/lib/intro_slider/app_intro.dart b/lib/intro_slider/app_intro.dart index e951a6a..9492484 100644 --- a/lib/intro_slider/app_intro.dart +++ b/lib/intro_slider/app_intro.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; -import 'package:tsacdop/class/settingstate.dart'; -import 'package:tsacdop/home/home.dart'; -import 'package:tsacdop/util/pageroute.dart'; +import '../state/settingstate.dart'; +import '../home/home.dart'; +import '../util/pageroute.dart'; import 'fourthpage.dart'; import 'secondpage.dart'; import 'thirdpage.dart'; diff --git a/lib/local_storage/key_value_storage.dart b/lib/local_storage/key_value_storage.dart index efbc68c..2c9cb76 100644 --- a/lib/local_storage/key_value_storage.dart +++ b/lib/local_storage/key_value_storage.dart @@ -1,7 +1,8 @@ import 'dart:async'; import 'dart:convert'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:tsacdop/class/podcast_group.dart'; + +import '../state/podcast_group.dart'; const String autoPlayKey = 'autoPlay'; const String autoAddKey = 'autoAdd'; diff --git a/lib/local_storage/sqflite_localpodcast.dart b/lib/local_storage/sqflite_localpodcast.dart index 74da6b5..cfc8e3e 100644 --- a/lib/local_storage/sqflite_localpodcast.dart +++ b/lib/local_storage/sqflite_localpodcast.dart @@ -4,11 +4,11 @@ import 'package:path/path.dart'; import 'package:intl/intl.dart'; import 'package:flutter_downloader/flutter_downloader.dart'; import 'package:dio/dio.dart'; -import 'package:tsacdop/class/podcastlocal.dart'; -import 'package:tsacdop/class/audiostate.dart'; -import 'package:tsacdop/class/episodebrief.dart'; -import 'package:tsacdop/webfeed/webfeed.dart'; -import 'package:tsacdop/class/sub_history.dart'; +import '../type/podcastlocal.dart'; +import '../state/audiostate.dart'; +import '../type/episodebrief.dart'; +import '../webfeed/webfeed.dart'; +import '../type/sub_history.dart'; class DBHelper { static Database _db; diff --git a/lib/main.dart b/lib/main.dart index 1277c04..43a405e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -3,12 +3,12 @@ import 'package:provider/provider.dart'; import 'package:flutter/services.dart'; import 'package:flutter_downloader/flutter_downloader.dart'; -import 'class/podcast_group.dart'; -import 'class/audiostate.dart'; -import 'class/settingstate.dart'; -import 'class/download_state.dart'; -import 'class/refresh_podcast.dart'; -import 'class/subscribe_podcast.dart'; +import 'state/podcast_group.dart'; +import 'state/audiostate.dart'; +import 'state/settingstate.dart'; +import 'state/download_state.dart'; +import 'state/refresh_podcast.dart'; +import 'state/subscribe_podcast.dart'; import 'home/home.dart'; import 'intro_slider/app_intro.dart'; diff --git a/lib/podcasts/podcastdetail.dart b/lib/podcasts/podcastdetail.dart index 560f675..6a56e86 100644 --- a/lib/podcasts/podcastdetail.dart +++ b/lib/podcasts/podcastdetail.dart @@ -5,8 +5,6 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:html/parser.dart'; -import 'package:tsacdop/class/audiostate.dart'; -import 'package:tsacdop/class/podcast_group.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; @@ -14,15 +12,17 @@ import 'package:provider/provider.dart'; import 'package:line_icons/line_icons.dart'; import 'package:cached_network_image/cached_network_image.dart'; -import '../class/podcastlocal.dart'; -import '../class/episodebrief.dart'; +import '../type/podcastlocal.dart'; +import '../type/episodebrief.dart'; import '../local_storage/sqflite_localpodcast.dart'; import '../util/episodegrid.dart'; import '../home/audioplayer.dart'; -import '../class/fireside_data.dart'; +import '../type/fireside_data.dart'; import '../util/colorize.dart'; import '../util/context_extension.dart'; import '../util/custompaint.dart'; +import '../state/audiostate.dart'; +import '../state/podcast_group.dart'; class PodcastDetail extends StatefulWidget { PodcastDetail({Key key, this.podcastLocal}) : super(key: key); diff --git a/lib/podcasts/podcastgroup.dart b/lib/podcasts/podcastgroup.dart index 24ff809..a0d9e6a 100644 --- a/lib/podcasts/podcastgroup.dart +++ b/lib/podcasts/podcastgroup.dart @@ -7,8 +7,8 @@ import 'package:flutter/services.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:provider/provider.dart'; -import '../class/podcast_group.dart'; -import '../class/podcastlocal.dart'; +import '../state/podcast_group.dart'; +import '../type/podcastlocal.dart'; import '../local_storage/sqflite_localpodcast.dart'; import '../podcasts/podcastdetail.dart'; import '../util/pageroute.dart'; diff --git a/lib/podcasts/podcastlist.dart b/lib/podcasts/podcastlist.dart index 0330e7d..17071c8 100644 --- a/lib/podcasts/podcastlist.dart +++ b/lib/podcasts/podcastlist.dart @@ -7,12 +7,12 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:provider/provider.dart'; -import 'package:tsacdop/class/podcast_group.dart'; -import 'package:tsacdop/class/podcastlocal.dart'; -import 'package:tsacdop/local_storage/sqflite_localpodcast.dart'; -import 'package:tsacdop/podcasts/podcastdetail.dart'; -import 'package:tsacdop/util/pageroute.dart'; +import '../state/podcast_group.dart'; +import '../type/podcastlocal.dart'; +import '../local_storage/sqflite_localpodcast.dart'; +import '../podcasts/podcastdetail.dart'; +import '../util/pageroute.dart'; class AboutPodcast extends StatefulWidget { final PodcastLocal podcastLocal; diff --git a/lib/podcasts/podcastmanage.dart b/lib/podcasts/podcastmanage.dart index 6f58031..878afef 100644 --- a/lib/podcasts/podcastmanage.dart +++ b/lib/podcasts/podcastmanage.dart @@ -6,11 +6,12 @@ import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'package:line_icons/line_icons.dart'; import 'package:fluttertoast/fluttertoast.dart'; -import 'package:tsacdop/class/podcast_group.dart'; -import 'package:tsacdop/podcasts/podcastgroup.dart'; -import 'package:tsacdop/podcasts/podcastlist.dart'; -import 'package:tsacdop/util/pageroute.dart'; -import 'package:tsacdop/util/context_extension.dart'; + +import '../state/podcast_group.dart'; +import '../podcasts/podcastgroup.dart'; +import '../podcasts/podcastlist.dart'; +import '../util/pageroute.dart'; +import '../util/context_extension.dart'; import 'custom_tabview.dart'; class PodcastManage extends StatefulWidget { diff --git a/lib/settings/downloads_manage.dart b/lib/settings/downloads_manage.dart index d3911f4..4b36eb5 100644 --- a/lib/settings/downloads_manage.dart +++ b/lib/settings/downloads_manage.dart @@ -6,8 +6,9 @@ import 'package:flutter_downloader/flutter_downloader.dart'; import 'package:path_provider/path_provider.dart'; import 'package:line_icons/line_icons.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:tsacdop/class/episodebrief.dart'; -import 'package:tsacdop/local_storage/sqflite_localpodcast.dart'; + +import '../type/episodebrief.dart'; +import '../local_storage/sqflite_localpodcast.dart'; class DownloadsManage extends StatefulWidget { @override diff --git a/lib/settings/history.dart b/lib/settings/history.dart index 162257d..e4d2f0e 100644 --- a/lib/settings/history.dart +++ b/lib/settings/history.dart @@ -2,9 +2,10 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:fl_chart/fl_chart.dart'; import 'package:intl/intl.dart'; -import 'package:tsacdop/local_storage/sqflite_localpodcast.dart'; -import 'package:tsacdop/class/audiostate.dart'; -import 'package:tsacdop/class/sub_history.dart'; + +import '../local_storage/sqflite_localpodcast.dart'; +import '../state/audiostate.dart'; +import '../type/sub_history.dart'; class PlayedHistory extends StatefulWidget { @override diff --git a/lib/settings/play_setting.dart b/lib/settings/play_setting.dart index b4e8593..8f491ba 100644 --- a/lib/settings/play_setting.dart +++ b/lib/settings/play_setting.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; -import '../class/audiostate.dart'; +import '../state/audiostate.dart'; class PlaySetting extends StatelessWidget { @override diff --git a/lib/settings/settting.dart b/lib/settings/settting.dart index 2d0aea0..2a80a4b 100644 --- a/lib/settings/settting.dart +++ b/lib/settings/settting.dart @@ -5,15 +5,15 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:path/path.dart'; import 'package:line_icons/line_icons.dart'; -import 'package:tsacdop/class/podcastlocal.dart'; -import 'package:tsacdop/local_storage/sqflite_localpodcast.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:path_provider/path_provider.dart'; import 'package:flutter_file_dialog/flutter_file_dialog.dart'; -import 'package:tsacdop/util/ompl_build.dart'; -import 'package:tsacdop/util/context_extension.dart'; -import 'package:tsacdop/intro_slider/app_intro.dart'; +import '../util/ompl_build.dart'; +import '../util/context_extension.dart'; +import '../intro_slider/app_intro.dart'; +import '../type/podcastlocal.dart'; +import '../local_storage/sqflite_localpodcast.dart'; import 'theme.dart'; import 'storage.dart'; import 'history.dart'; diff --git a/lib/settings/storage.dart b/lib/settings/storage.dart index 5d21b36..31f8091 100644 --- a/lib/settings/storage.dart +++ b/lib/settings/storage.dart @@ -2,8 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:tsacdop/settings/downloads_manage.dart'; -import 'package:tsacdop/class/settingstate.dart'; + +import '../settings/downloads_manage.dart'; +import '../state/settingstate.dart'; import '../local_storage/key_value_storage.dart'; import '../util/context_extension.dart'; diff --git a/lib/settings/syncing.dart b/lib/settings/syncing.dart index cba076b..aaf3485 100644 --- a/lib/settings/syncing.dart +++ b/lib/settings/syncing.dart @@ -2,7 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'package:tuple/tuple.dart'; -import 'package:tsacdop/class/settingstate.dart'; + +import '../state/settingstate.dart'; class SyncingSetting extends StatelessWidget { @override diff --git a/lib/settings/theme.dart b/lib/settings/theme.dart index c7dcad2..4a08987 100644 --- a/lib/settings/theme.dart +++ b/lib/settings/theme.dart @@ -2,8 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'package:flutter_colorpicker/flutter_colorpicker.dart'; -import 'package:tsacdop/class/settingstate.dart'; -import 'package:tsacdop/util/context_extension.dart'; + +import '../state/settingstate.dart'; +import '../util/context_extension.dart'; class ThemeSetting extends StatelessWidget { @override diff --git a/lib/class/audiostate.dart b/lib/state/audiostate.dart similarity index 99% rename from lib/class/audiostate.dart rename to lib/state/audiostate.dart index 15b699d..b492e87 100644 --- a/lib/class/audiostate.dart +++ b/lib/state/audiostate.dart @@ -4,9 +4,9 @@ import 'package:flutter/foundation.dart'; import 'package:audio_service/audio_service.dart'; import 'package:just_audio/just_audio.dart'; import 'package:rxdart/rxdart.dart'; -import 'package:tsacdop/class/episodebrief.dart'; -import 'package:tsacdop/local_storage/key_value_storage.dart'; -import 'package:tsacdop/local_storage/sqflite_localpodcast.dart'; +import '../type/episodebrief.dart'; +import '../local_storage/key_value_storage.dart'; +import '../local_storage/sqflite_localpodcast.dart'; MediaControl playControl = MediaControl( androidIcon: 'drawable/ic_stat_play_circle_filled', diff --git a/lib/class/download_state.dart b/lib/state/download_state.dart similarity index 99% rename from lib/class/download_state.dart rename to lib/state/download_state.dart index ec60c6f..766f56d 100644 --- a/lib/class/download_state.dart +++ b/lib/state/download_state.dart @@ -9,7 +9,7 @@ import 'package:path_provider/path_provider.dart'; import 'package:path/path.dart' as path; import 'package:tsacdop/local_storage/sqflite_localpodcast.dart'; -import 'episodebrief.dart'; +import '../type/episodebrief.dart'; class EpisodeTask { final String taskId; diff --git a/lib/class/importompl.dart b/lib/state/importompl.dart similarity index 100% rename from lib/class/importompl.dart rename to lib/state/importompl.dart diff --git a/lib/class/podcast_group.dart b/lib/state/podcast_group.dart similarity index 99% rename from lib/class/podcast_group.dart rename to lib/state/podcast_group.dart index 76200c6..2bdf935 100644 --- a/lib/class/podcast_group.dart +++ b/lib/state/podcast_group.dart @@ -5,7 +5,8 @@ import 'package:flutter/material.dart'; import 'package:tsacdop/local_storage/key_value_storage.dart'; import 'package:tsacdop/local_storage/sqflite_localpodcast.dart'; import 'package:uuid/uuid.dart'; -import 'package:tsacdop/class/podcastlocal.dart'; + +import '../type/podcastlocal.dart'; class GroupEntity { final String name; diff --git a/lib/class/refresh_podcast.dart b/lib/state/refresh_podcast.dart similarity index 98% rename from lib/class/refresh_podcast.dart rename to lib/state/refresh_podcast.dart index baf22bc..6fecf2e 100644 --- a/lib/class/refresh_podcast.dart +++ b/lib/state/refresh_podcast.dart @@ -5,7 +5,7 @@ import 'package:flutter_isolate/flutter_isolate.dart'; import 'package:tsacdop/local_storage/key_value_storage.dart'; import 'package:tsacdop/local_storage/sqflite_localpodcast.dart'; -import 'podcastlocal.dart'; +import '../type/podcastlocal.dart'; enum RefreshState { none, fetch, error } diff --git a/lib/class/settingstate.dart b/lib/state/settingstate.dart similarity index 97% rename from lib/class/settingstate.dart rename to lib/state/settingstate.dart index 74cd578..8284fb3 100644 --- a/lib/class/settingstate.dart +++ b/lib/state/settingstate.dart @@ -1,10 +1,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:tsacdop/class/podcastlocal.dart'; import 'package:workmanager/workmanager.dart'; -import 'package:tsacdop/local_storage/sqflite_localpodcast.dart'; -import 'package:tsacdop/local_storage/key_value_storage.dart'; +import '../local_storage/sqflite_localpodcast.dart'; +import '../local_storage/key_value_storage.dart'; +import '../type/podcastlocal.dart'; void callbackDispatcher() { Workmanager.executeTask((task, inputData) async { diff --git a/lib/class/subscribe_podcast.dart b/lib/state/subscribe_podcast.dart similarity index 99% rename from lib/class/subscribe_podcast.dart rename to lib/state/subscribe_podcast.dart index 7a3b076..da4eadb 100644 --- a/lib/class/subscribe_podcast.dart +++ b/lib/state/subscribe_podcast.dart @@ -11,8 +11,8 @@ import 'package:flutter_isolate/flutter_isolate.dart'; import '../webfeed/webfeed.dart'; import '../local_storage/sqflite_localpodcast.dart'; -import 'fireside_data.dart'; -import 'podcastlocal.dart'; +import '../type/fireside_data.dart'; +import '../type/podcastlocal.dart'; enum SubscribeState { none, start, subscribe, fetch, stop, exist, error } diff --git a/lib/class/episodebrief.dart b/lib/type/episodebrief.dart similarity index 100% rename from lib/class/episodebrief.dart rename to lib/type/episodebrief.dart diff --git a/lib/class/fireside_data.dart b/lib/type/fireside_data.dart similarity index 100% rename from lib/class/fireside_data.dart rename to lib/type/fireside_data.dart diff --git a/lib/class/podcastlocal.dart b/lib/type/podcastlocal.dart similarity index 100% rename from lib/class/podcastlocal.dart rename to lib/type/podcastlocal.dart diff --git a/lib/class/searchpodcast.dart b/lib/type/searchpodcast.dart similarity index 100% rename from lib/class/searchpodcast.dart rename to lib/type/searchpodcast.dart diff --git a/lib/class/searchpodcast.g.dart b/lib/type/searchpodcast.g.dart similarity index 100% rename from lib/class/searchpodcast.g.dart rename to lib/type/searchpodcast.g.dart diff --git a/lib/class/sub_history.dart b/lib/type/sub_history.dart similarity index 100% rename from lib/class/sub_history.dart rename to lib/type/sub_history.dart diff --git a/lib/util/episodegrid.dart b/lib/util/episodegrid.dart index 822eaf1..94e1094 100644 --- a/lib/util/episodegrid.dart +++ b/lib/util/episodegrid.dart @@ -10,13 +10,13 @@ import 'package:fluttertoast/fluttertoast.dart'; import 'package:auto_animated/auto_animated.dart'; import 'open_container.dart'; -import 'package:tsacdop/class/audiostate.dart'; -import 'package:tsacdop/class/episodebrief.dart'; -import 'package:tsacdop/episodes/episodedetail.dart'; -import 'package:tsacdop/util/colorize.dart'; -import 'package:tsacdop/util/context_extension.dart'; -import 'package:tsacdop/util/custompaint.dart'; -import 'package:tsacdop/local_storage/sqflite_localpodcast.dart'; +import '../state/audiostate.dart'; +import '../type/episodebrief.dart'; +import '../episodes/episodedetail.dart'; +import '../local_storage/sqflite_localpodcast.dart'; +import 'colorize.dart'; +import 'context_extension.dart'; +import 'custompaint.dart'; enum Layout { two, three } diff --git a/lib/util/ompl_build.dart b/lib/util/ompl_build.dart index 93c2de8..7071b69 100644 --- a/lib/util/ompl_build.dart +++ b/lib/util/ompl_build.dart @@ -1,5 +1,5 @@ -import 'package:tsacdop/class/podcastlocal.dart'; import 'package:xml/xml.dart' as xml; +import '../type/podcastlocal.dart'; omplBuilder(List podcasts) { var builder = xml.XmlBuilder(); diff --git a/pubspec.yaml b/pubspec.yaml index 2dee292..1f04f91 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: tsacdop description: An easy-use podacasts player. -version: 0.2.1 +version: 0.2.2 environment: sdk: ">=2.6.0 <3.0.0"