Change download position.

lib/local_storage/key_value_storage.dart

@@ -56,6 +56,7 @@ const String gpodderRemoteRemoveKey = 'gpodderRemoteRemoveKey';
 const String hidePodcastDiscoveryKey = 'hidePodcastDiscoveryKey';
 const String searchEngineKey = 'searchEngineKey';
 const String markListenedAfterSkipKey = 'markListenedAfterSkipKey';
+const String downloadPositionKey = 'downloadPositionKey';
 
 class KeyValueStorage {
   final String key;

lib/settings/storage.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'package:path_provider/path_provider.dart';
 import 'package:provider/provider.dart';
+import 'package:tsacdop/util/general_dialog.dart';
 
 import '../local_storage/key_value_storage.dart';
 import '../settings/downloads_manage.dart';
@@ -20,7 +22,8 @@ class _StorageSettingState extends State<StorageSetting>
   final KeyValueStorage cacheStorage = KeyValueStorage(cacheMaxKey);
   AnimationController _controller;
   Animation<double> _animation;
-  _getCacheMax() async {
+  List<String> _dirs;
+  Future<void> _getCacheMax() async {
     var cache =
         await cacheStorage.getInt(defaultValue: (200 * 1024 * 1024).toInt());
     if (cache == 0) {
@@ -56,17 +59,30 @@ class _StorageSettingState extends State<StorageSetting>
     return days;
   }
 
-  _setAutoDeleteDays(int days) async {
+  Future<int> _getDownloadPasition() async {
+    final storage = KeyValueStorage(downloadPositionKey);
+    final index = await storage.getInt();
+    final externalDirs = await getExternalStorageDirectories();
+    _dirs = [for (var dir in externalDirs) dir.path];
+    return index;
+  }
+
+  Future<void> _setAutoDeleteDays(int days) async {
     var storage = KeyValueStorage(autoDeleteKey);
     await storage.saveInt(days);
     setState(() {});
   }
 
-  _setAudtDownloadNetwork(bool boo) async {
+  Future<void> _setAudtDownloadNetwork(bool boo) async {
     var storage = KeyValueStorage(autoDownloadNetworkKey);
     await storage.saveBool(boo);
   }
 
+  Future<void> _setDownloadPosition(int index) async {
+    final storage = KeyValueStorage(downloadPositionKey);
+    await storage.saveInt(index);
+  }
+
   double _value;
 
   @override
@@ -102,10 +118,6 @@ class _StorageSettingState extends State<StorageSetting>
         ),
         body: SafeArea(
           child: Column(
-            mainAxisAlignment: MainAxisAlignment.start,
-            mainAxisSize: MainAxisSize.min,
-            children: <Widget>[
-              Column(
             mainAxisAlignment: MainAxisAlignment.start,
             mainAxisSize: MainAxisSize.min,
             children: <Widget>[
@@ -117,16 +129,9 @@ class _StorageSettingState extends State<StorageSetting>
                 padding: EdgeInsets.symmetric(horizontal: 70),
                 alignment: Alignment.centerLeft,
                 child: Text(s.network,
-                          style: Theme.of(context)
+                    style: context.textTheme.bodyText1
-                              .textTheme
+                        .copyWith(color: context.accentColor)),
-                              .bodyText1
-                              .copyWith(color: Theme.of(context).accentColor)),
               ),
-                    ListView(
-                      physics: const BouncingScrollPhysics(),
-                      shrinkWrap: true,
-                      scrollDirection: Axis.vertical,
-                      children: <Widget>[
               Selector<SettingState, bool>(
                 selector: (_, settings) => settings.downloadUsingData,
                 builder: (_, data, __) {
@@ -147,7 +152,6 @@ class _StorageSettingState extends State<StorageSetting>
                   );
                 },
               ),
-                        Divider(height: 1),
               FutureBuilder<bool>(
                   future: _getAutoDownloadNetwork(),
                   initialData: false,
@@ -160,8 +164,7 @@ class _StorageSettingState extends State<StorageSetting>
                       contentPadding: EdgeInsets.only(
                           left: 70.0, right: 25, bottom: 10, top: 10),
                       title: Text(s.settingsNetworkCellularAuto),
-                                subtitle:
+                      subtitle: Text(s.settingsNetworkCellularAutoDes),
-                                    Text(s.settingsNetworkCellularAutoDes),
                       trailing: Transform.scale(
                         scale: 0.9,
                         child: Switch(
@@ -175,13 +178,6 @@ class _StorageSettingState extends State<StorageSetting>
                     );
                   }),
               Divider(height: 1),
-                      ],
-                    ),
-                  ]),
-              Column(
-                mainAxisAlignment: MainAxisAlignment.start,
-                mainAxisSize: MainAxisSize.min,
-                children: <Widget>[
               Padding(
                 padding: EdgeInsets.all(10.0),
               ),
@@ -190,33 +186,55 @@ class _StorageSettingState extends State<StorageSetting>
                 padding: EdgeInsets.symmetric(horizontal: 70),
                 alignment: Alignment.centerLeft,
                 child: Text(s.settingStorage,
-                        style: Theme.of(context)
+                    style: context.textTheme.bodyText1
-                            .textTheme
+                        .copyWith(color: context.accentColor)),
-                            .bodyText1
-                            .copyWith(color: Theme.of(context).accentColor)),
               ),
-                  ListView(
-                    physics: const BouncingScrollPhysics(),
-                    shrinkWrap: true,
-                    scrollDirection: Axis.vertical,
-                    children: <Widget>[
               ListTile(
-                        onTap: () => Navigator.push(
+                onTap: () => Navigator.push(context,
-                            context,
+                    MaterialPageRoute(builder: (context) => DownloadsManage())),
-                            MaterialPageRoute(
-                                builder: (context) => DownloadsManage())),
                 contentPadding: EdgeInsets.symmetric(horizontal: 70.0),
                 title: Text(s.download),
                 subtitle: Text(s.settingsManageDownloadDes),
               ),
-                      Divider(height: 1),
+              FutureBuilder<int>(
+                  future: _getDownloadPasition(),
+                  initialData: 0,
+                  builder: (context, snapshot) {
+                    return ListTile(
+                      contentPadding: EdgeInsets.only(left: 70.0, right: 20),
+                      title: Text('Donwload position'),
+                      subtitle: Text(_dirs == null ? '' : _dirs[snapshot.data],
+                          maxLines: 2, overflow: TextOverflow.ellipsis),
+                      onTap: () => generalSheet(
+                        context,
+                        title: 'Download position',
+                        child: Column(children: [
+                          SizedBox(
+                            height: 10,
+                          ),
+                          for (var dir in _dirs)
+                            ListTile(
+                              title: Text(dir),
+                              onTap: () =>
+                                  _setDownloadPosition(_dirs.indexOf(dir)),
+                              trailing: Radio<int>(
+                                  value: _dirs.indexOf(dir),
+                                  groupValue: snapshot.data,
+                                  onChanged: _setDownloadPosition),
+                            ),
+                          SizedBox(
+                            height: 30,
+                          )
+                        ]),
+                      ),
+                    );
+                  }),
               FutureBuilder<int>(
                 future: _getAutoDeleteDays(),
                 initialData: 30,
                 builder: (context, snapshot) {
                   return ListTile(
-                            contentPadding:
+                    contentPadding: EdgeInsets.only(left: 70.0, right: 20),
-                                EdgeInsets.only(left: 70.0, right: 20),
                     title: Text(s.settingsAutoDelete),
                     subtitle: Text(s.settingsAutoDeleteDes),
                     trailing: MyDropdownButton(
@@ -240,7 +258,6 @@ class _StorageSettingState extends State<StorageSetting>
                   );
                 },
               ),
-                      Divider(height: 1),
               ListTile(
                 contentPadding: EdgeInsets.only(left: 70.0, right: 25),
                 //  leading: Icon(Icons.colorize),
@@ -252,20 +269,16 @@ class _StorageSettingState extends State<StorageSetting>
                         textStyle: context.textTheme.headline6
                             .copyWith(color: context.accentColor)),
                     children: [
-                              TextSpan(
+                      TextSpan(text: ' Mb', style: context.textTheme.subtitle2),
-                                  text: ' Mb',
-                                  style: context.textTheme.subtitle2),
                     ])),
               ),
               Padding(
-                        padding: EdgeInsets.only(
+                padding: EdgeInsets.only(left: 50.0, right: 20.0, bottom: 10.0),
-                            left: 50.0, right: 20.0, bottom: 10.0),
                 child: SliderTheme(
                   data: Theme.of(context).sliderTheme.copyWith(
                       showValueIndicator: ShowValueIndicator.always,
                       trackHeight: 2,
-                              thumbShape:
+                      thumbShape: RoundSliderThumbShape(enabledThumbRadius: 6)),
-                                  RoundSliderThumbShape(enabledThumbRadius: 6)),
                   child: Slider(
                       label: '${_value ~/ 100 * 100} Mb',
                       activeColor: context.accentColor,
@@ -278,20 +291,31 @@ class _StorageSettingState extends State<StorageSetting>
                         setState(() {
                           _value = val;
                         });
-                                cacheStorage
+                        cacheStorage.saveInt((val * 1024 * 1024).toInt());
-                                    .saveInt((val * 1024 * 1024).toInt());
                       }),
                 ),
               ),
               Divider(height: 1),
             ],
           ),
-                ],
-              ),
-            ],
-          ),
         ),
       ),
     );
   }
 }
+
+class _DownloadPosition extends StatefulWidget {
+  _DownloadPosition({Key key}) : super(key: key);
+
+  @override
+  __DownloadPositionState createState() => __DownloadPositionState();
+}
+
+class __DownloadPositionState extends State<_DownloadPosition> {
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [],
+    );
+  }
+}

lib/state/download_state.dart

@@ -73,6 +73,13 @@ class AutoDownloader {
     _completer?.complete();
   }
 
+  Future<Directory> _getDownloadDirectory() async {
+    final storage = KeyValueStorage(downloadPositionKey);
+    final index = await storage.getInt();
+    final externalDirs = await getExternalStorageDirectories();
+    return externalDirs[index];
+  }
+
   Future _saveMediaId(EpisodeTask episodeTask) async {
     final completeTask = await FlutterDownloader.loadTasksWithRawQuery(
         query: "SELECT * FROM task WHERE task_id = '${episodeTask.taskId}'");
@@ -91,7 +98,7 @@ class AutoDownloader {
   Future startTask(List<EpisodeBrief> episodes,
       {bool showNotification = false}) async {
     for (var episode in episodes) {
-      final dir = await getExternalStorageDirectory();
+      final dir = await _getDownloadDirectory();
       var localPath = path.join(dir.path, episode.feedTitle);
       final saveDir = Directory(localPath);
       var hasExisted = await saveDir.exists();
@@ -182,6 +189,13 @@ class DownloadState extends ChangeNotifier {
     notifyListeners();
   }
 
+  Future<Directory> _getDownloadDirectory() async {
+    final storage = KeyValueStorage(downloadPositionKey);
+    final index = await storage.getInt();
+    final externalDirs = await getExternalStorageDirectories();
+    return externalDirs[index];
+  }
+
   void _bindBackgroundIsolate() {
     var _port = ReceivePort();
     var isSuccess = IsolateNameServer.registerPortWithName(
@@ -256,7 +270,7 @@ class DownloadState extends ChangeNotifier {
     var dbHelper = DBHelper();
     var isDownloaded = await dbHelper.isDownloaded(episode.enclosureUrl);
     if (!isDownloaded) {
-      final dir = await getExternalStorageDirectory();
+      final dir = await _getDownloadDirectory();
       var localPath =
           path.join(dir.path, episode.feedTitle?.replaceAll('/', ''));
       final saveDir = Directory(localPath);