mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-16 21:33:41 +00:00
fix: style, performance ,loading bug (#90)
* refactor project in get-cli standard * use local trackers when github is not connectable upgrade stylish_bottom_bar to 1.0.0 responsive view for home_view treeview for file_list_vie fluent ui integrating * improve responsive view. treeView add light theme.fix overflow bugs * responsive view,treeView,file select downloaded and downloading pages file extension icons fix some minor bugs * use local trackers when github is not connectable upgrade stylish_bottom_bar to 1.0.0 responsive view for home_view treeview for file_list_vie fluent ui integrating * improve responsive view. treeView add light theme.fix overflow bugs * bottom bar index fix * refactor project in get-cli standard * fix:locale fix * fix: task list stack progress style fix: translation fix: tree view fix: confirm button loading remove: stylish_bottom_bar(dark mode not supported) * fix: task list stack progress style fix: translation fix: tree view fix: confirm button loading remove: stylish_bottom_bar(dark mode not supported) --------- Co-authored-by: wuke2022 <[email protected]>
This commit is contained in:
1 parent
dbc9c4c121
commit
5b69472ac8
20 files changed
+4390
-217
No files matched your search
Binary file not shown.
@@ -15,6 +15,7 @@
|
|||||||
"downloadLinkHit": "Please enter the download link, HTTP/HTTPS/MAGNET supported@append",
|
"downloadLinkHit": "Please enter the download link, HTTP/HTTPS/MAGNET supported@append",
|
||||||
"downloadLinkHitDesktop": ", or drag the torrent file here directly",
|
"downloadLinkHitDesktop": ", or drag the torrent file here directly",
|
||||||
"download": "Download",
|
"download": "Download",
|
||||||
|
"noFileSelected": "Please select at least one file to continue.",
|
||||||
"noStoragePermission": "Storage permission required",
|
"noStoragePermission": "Storage permission required",
|
||||||
"selectFile": "Select File",
|
"selectFile": "Select File",
|
||||||
"basic": "Basic",
|
"basic": "Basic",
|
||||||
|
|||||||
@@ -6,14 +6,10 @@
|
|||||||
"cancel": "انصراف",
|
"cancel": "انصراف",
|
||||||
"selectAll": "انتخاب همه",
|
"selectAll": "انتخاب همه",
|
||||||
"task": "کار",
|
"task": "کار",
|
||||||
"downloading": "downloading",
|
|
||||||
"downloaded": "downloaded",
|
|
||||||
"setting": "تنظیمات",
|
"setting": "تنظیمات",
|
||||||
"create": "ایجاد کار",
|
"create": "ایجاد کار",
|
||||||
"downloadLink": "لینک دانلود",
|
"downloadLink": "لینک دانلود",
|
||||||
"downloadLinkValid": "لطفا لینک دانلود را وارد کنید",
|
"downloadLinkValid": "لطفا لینک دانلود را وارد کنید",
|
||||||
"downloadLinkHit": "Please enter the download link, HTTP/HTTPS/MAGNET supported@append",
|
|
||||||
"downloadLinkHitDesktop": ", or drag the torrent file here directly",
|
|
||||||
"download": "دانلود",
|
"download": "دانلود",
|
||||||
"noStoragePermission": "مجوز ذخیره سازی مورد نیاز است",
|
"noStoragePermission": "مجوز ذخیره سازی مورد نیاز است",
|
||||||
"selectFile": "انتخاب فایل",
|
"selectFile": "انتخاب فایل",
|
||||||
|
|||||||
@@ -6,8 +6,6 @@
|
|||||||
"cancel": "Отмена",
|
"cancel": "Отмена",
|
||||||
"selectAll": "Выбрать все",
|
"selectAll": "Выбрать все",
|
||||||
"task": "Задачи",
|
"task": "Задачи",
|
||||||
"downloading": "downloading",
|
|
||||||
"downloaded": "downloaded",
|
|
||||||
"setting": "Настройки",
|
"setting": "Настройки",
|
||||||
"create": "Создать задачу",
|
"create": "Создать задачу",
|
||||||
"downloadLink": "Ссылка для скачивание",
|
"downloadLink": "Ссылка для скачивание",
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
"downloadLinkHit": "请输入下载链接,支持 HTTP/HTTPS/MAGNET@append",
|
"downloadLinkHit": "请输入下载链接,支持 HTTP/HTTPS/MAGNET@append",
|
||||||
"downloadLinkHitDesktop": ",也可以直接拖拽种子文件到此处",
|
"downloadLinkHitDesktop": ",也可以直接拖拽种子文件到此处",
|
||||||
"download": "下载",
|
"download": "下载",
|
||||||
|
"noFileSelected": "请至少选择一个文件下载",
|
||||||
"noStoragePermission": "需要开启存储权限",
|
"noStoragePermission": "需要开启存储权限",
|
||||||
"selectFile": "选择文件",
|
"selectFile": "选择文件",
|
||||||
"basic": "基础",
|
"basic": "基础",
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import '../../../../api/api.dart';
|
|||||||
import '../../../../api/model/downloader_config.dart';
|
import '../../../../api/model/downloader_config.dart';
|
||||||
import '../../../../core/common/start_config.dart';
|
import '../../../../core/common/start_config.dart';
|
||||||
import '../../../../generated/locales.g.dart';
|
import '../../../../generated/locales.g.dart';
|
||||||
import '../../../../i18n/localeManager.dart';
|
import '../../../../util/localeManager.dart';
|
||||||
import '../../../../util/log_util.dart';
|
import '../../../../util/log_util.dart';
|
||||||
import '../../../../util/util.dart';
|
import '../../../../util/util.dart';
|
||||||
|
|
||||||
|
|||||||
@@ -3,8 +3,8 @@ import 'package:flutter_localizations/flutter_localizations.dart';
|
|||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
|
||||||
import '../../../../generated/locales.g.dart';
|
import '../../../../generated/locales.g.dart';
|
||||||
import '../../../../i18n/localeManager.dart';
|
|
||||||
import '../../../../theme/theme.dart';
|
import '../../../../theme/theme.dart';
|
||||||
|
import '../../../../util/localeManager.dart';
|
||||||
import '../../../routes/app_pages.dart';
|
import '../../../routes/app_pages.dart';
|
||||||
import '../controllers/app_controller.dart';
|
import '../controllers/app_controller.dart';
|
||||||
|
|
||||||
|
|||||||
@@ -2,5 +2,5 @@ import 'package:get/get.dart';
|
|||||||
|
|
||||||
class CreateController extends GetxController {
|
class CreateController extends GetxController {
|
||||||
final files = [].obs;
|
final files = [].obs;
|
||||||
final RxList selectedIndexs = [].obs;
|
final RxList selectedIndexes = [].obs;
|
||||||
}
|
}
|
||||||
@@ -70,18 +70,18 @@ class CreateView extends GetView<CreateController> {
|
|||||||
child: RoundedLoadingButton(
|
child: RoundedLoadingButton(
|
||||||
color: Get.theme.colorScheme.secondary,
|
color: Get.theme.colorScheme.secondary,
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
if (_resolveFormKey.currentState!.validate()) {
|
try {
|
||||||
_confirmController.start();
|
_confirmController.start();
|
||||||
try {
|
if (_resolveFormKey.currentState!.validate()) {
|
||||||
final rr = await resolve(Request(
|
final rr = await resolve(Request(
|
||||||
url: _urlController.text,
|
url: _urlController.text,
|
||||||
));
|
));
|
||||||
await _showResolveDialog(rr);
|
await _showResolveDialog(rr);
|
||||||
} catch (e) {
|
|
||||||
Get.snackbar('error'.tr, e.toString());
|
|
||||||
} finally {
|
|
||||||
_confirmController.reset();
|
|
||||||
}
|
}
|
||||||
|
} catch (e) {
|
||||||
|
Get.snackbar('error'.tr, e.toString());
|
||||||
|
} finally {
|
||||||
|
_confirmController.reset();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
controller: _confirmController,
|
controller: _confirmController,
|
||||||
@@ -106,12 +106,11 @@ class CreateView extends GetView<CreateController> {
|
|||||||
Future<void> _showResolveDialog(ResolveResult rr) async {
|
Future<void> _showResolveDialog(ResolveResult rr) async {
|
||||||
controller.files.value = rr.res.files;
|
controller.files.value = rr.res.files;
|
||||||
final appController = Get.find<AppController>();
|
final appController = Get.find<AppController>();
|
||||||
final setting = appController.downloaderConfig.value;
|
|
||||||
|
|
||||||
final createFormKey = GlobalKey<FormState>();
|
final createFormKey = GlobalKey<FormState>();
|
||||||
final pathController = TextEditingController(text: setting.downloadDir);
|
final pathController = TextEditingController(
|
||||||
|
text: appController.downloaderConfig.value.downloadDir);
|
||||||
final downloadController = RoundedLoadingButtonController();
|
final downloadController = RoundedLoadingButtonController();
|
||||||
|
|
||||||
return showDialog<void>(
|
return showDialog<void>(
|
||||||
context: Get.context!,
|
context: Get.context!,
|
||||||
barrierDismissible: false,
|
barrierDismissible: false,
|
||||||
@@ -163,40 +162,47 @@ class CreateView extends GetView<CreateController> {
|
|||||||
height: Get.theme.buttonTheme.height,
|
height: Get.theme.buttonTheme.height,
|
||||||
),
|
),
|
||||||
child: RoundedLoadingButton(
|
child: RoundedLoadingButton(
|
||||||
color: Get.theme.colorScheme.secondary,
|
color: Get.theme.colorScheme.secondary,
|
||||||
onPressed: () async {
|
duration: const Duration(milliseconds: 100),
|
||||||
try {
|
onPressed: () async {
|
||||||
if (createFormKey.currentState!.validate()) {
|
try {
|
||||||
downloadController.start();
|
downloadController.start();
|
||||||
|
if (controller.selectedIndexes.isEmpty) {
|
||||||
|
Get.snackbar('tip'.tr, 'noFileSelected'.tr);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (createFormKey.currentState!.validate()) {
|
||||||
|
// if (Util.isAndroid()) {
|
||||||
|
// if (!await Permission.storage.request().isGranted) {
|
||||||
|
// Get.snackbar('error'.tr,
|
||||||
|
// 'noStoragePermission'.tr);
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
// if (Util.isAndroid()) {
|
await createTask(CreateTask(
|
||||||
// if (!await Permission.storage.request().isGranted) {
|
rid: rr.id,
|
||||||
// Get.snackbar('error'.tr,
|
opts: Options(
|
||||||
// 'noStoragePermission'.tr);
|
name: '',
|
||||||
// return;
|
path: pathController.text,
|
||||||
// }
|
selectFiles: controller.selectedIndexes
|
||||||
// }
|
.cast<int>())));
|
||||||
|
Get.rootDelegate.offNamed(Routes.DOWNLOADING);
|
||||||
await createTask(CreateTask(
|
}
|
||||||
rid: rr.id,
|
} catch (e) {
|
||||||
opts: Options(
|
Get.snackbar('error'.tr, e.toString());
|
||||||
name: '',
|
rethrow;
|
||||||
path: pathController.text,
|
} finally {
|
||||||
selectFiles:
|
downloadController.reset();
|
||||||
controller.selectedIndexs.cast<int>())));
|
|
||||||
Get.back();
|
|
||||||
Get.rootDelegate.offNamed(Routes.DOWNLOADING);
|
|
||||||
}
|
}
|
||||||
} catch (e) {
|
},
|
||||||
Get.snackbar('error'.tr, e.toString());
|
controller: downloadController,
|
||||||
rethrow;
|
child: Text(
|
||||||
} finally {
|
'download'.tr,
|
||||||
downloadController.reset();
|
// style: controller.selectedIndexes.isEmpty
|
||||||
}
|
// ? Get.textTheme.disabled
|
||||||
},
|
// : Get.textTheme.titleSmall
|
||||||
controller: downloadController,
|
)),
|
||||||
child: Text('download'.tr),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
));
|
));
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:stylish_bottom_bar/model/bar_items.dart';
|
|
||||||
import 'package:stylish_bottom_bar/stylish_bottom_bar.dart';
|
|
||||||
|
|
||||||
import '../../../routes/app_pages.dart';
|
import '../../../routes/app_pages.dart';
|
||||||
import '../../../views/views/responsive_builder.dart';
|
import '../../../views/views/responsive_builder.dart';
|
||||||
@@ -77,29 +75,23 @@ class HomeView extends GetView<HomeController> {
|
|||||||
))
|
))
|
||||||
]),
|
]),
|
||||||
bottomNavigationBar: ResponsiveBuilder.isNarrow(context)
|
bottomNavigationBar: ResponsiveBuilder.isNarrow(context)
|
||||||
? StylishBottomBar(
|
? BottomNavigationBar(
|
||||||
option: AnimatedBarOptions(
|
items: <BottomNavigationBarItem>[
|
||||||
iconSize: 32,
|
BottomNavigationBarItem(
|
||||||
barAnimation: BarAnimation.blink,
|
icon: const Icon(Icons.format_align_left_outlined),
|
||||||
iconStyle: IconStyle.Default,
|
label: 'downloading'.tr,
|
||||||
opacity: 0.3,
|
),
|
||||||
),
|
BottomNavigationBarItem(
|
||||||
items: [
|
icon: const Icon(Icons.format_align_justify_outlined),
|
||||||
BottomBarItem(
|
label: 'downloaded'.tr,
|
||||||
icon: const Icon(Icons.format_align_left_outlined),
|
),
|
||||||
selectedColor: Get.theme.primaryColor,
|
BottomNavigationBarItem(
|
||||||
title: Text('downloading'.tr)),
|
icon: const Icon(Icons.settings),
|
||||||
BottomBarItem(
|
label: 'setting'.tr,
|
||||||
icon: const Icon(Icons.format_align_justify_outlined),
|
),
|
||||||
selectedColor: Get.theme.primaryColor,
|
|
||||||
title: Text('downloaded'.tr)),
|
|
||||||
BottomBarItem(
|
|
||||||
icon: const Icon(Icons.settings),
|
|
||||||
selectedColor: Get.theme.primaryColor,
|
|
||||||
title: Text('setting'.tr)),
|
|
||||||
],
|
],
|
||||||
// hasNotch: true,
|
|
||||||
currentIndex: controller.currentIndex.value,
|
currentIndex: controller.currentIndex.value,
|
||||||
|
// selectedItemColor: Get.theme.highlightColor,
|
||||||
onTap: (index) {
|
onTap: (index) {
|
||||||
switch (index) {
|
switch (index) {
|
||||||
case 0:
|
case 0:
|
||||||
@@ -117,6 +109,46 @@ class HomeView extends GetView<HomeController> {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
// StylishBottomBar(
|
||||||
|
// option: AnimatedBarOptions(
|
||||||
|
// iconSize: 32,
|
||||||
|
// barAnimation: BarAnimation.blink,
|
||||||
|
// iconStyle: IconStyle.Default,
|
||||||
|
// opacity: 0.3,
|
||||||
|
// ),
|
||||||
|
// items: [
|
||||||
|
// BottomBarItem(
|
||||||
|
// icon: const Icon(Icons.format_align_left_outlined),
|
||||||
|
// selectedColor: Get.theme.primaryColor,
|
||||||
|
// title: Text('downloading'.tr)),
|
||||||
|
// BottomBarItem(
|
||||||
|
// icon: const Icon(Icons.format_align_justify_outlined),
|
||||||
|
// selectedColor: Get.theme.primaryColor,
|
||||||
|
// title: Text('downloaded'.tr)),
|
||||||
|
// BottomBarItem(
|
||||||
|
// icon: const Icon(Icons.settings),
|
||||||
|
// selectedColor: Get.theme.primaryColor,
|
||||||
|
// title: Text('setting'.tr)),
|
||||||
|
// ],
|
||||||
|
// // hasNotch: true,
|
||||||
|
// currentIndex: controller.currentIndex.value,
|
||||||
|
// onTap: (index) {
|
||||||
|
// switch (index) {
|
||||||
|
// case 0:
|
||||||
|
// delegate.toNamed(Routes.DOWNLOADING);
|
||||||
|
// controller.currentIndex.value = 0;
|
||||||
|
// break;
|
||||||
|
// case 1:
|
||||||
|
// delegate.toNamed(Routes.DOWNLOADED);
|
||||||
|
// controller.currentIndex.value = 1;
|
||||||
|
// break;
|
||||||
|
// case 2:
|
||||||
|
// delegate.toNamed(Routes.SETTING);
|
||||||
|
// controller.currentIndex.value = 2;
|
||||||
|
// break;
|
||||||
|
// }
|
||||||
|
// },
|
||||||
|
// )
|
||||||
: const SizedBox.shrink(),
|
: const SizedBox.shrink(),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import 'package:intl/intl.dart';
|
|||||||
import 'package:url_launcher/url_launcher.dart';
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
|
|
||||||
import '../../../../generated/locales.g.dart';
|
import '../../../../generated/locales.g.dart';
|
||||||
import '../../../../i18n/localeManager.dart';
|
import '../../../../util/localeManager.dart';
|
||||||
import '../../../../util/package_info.dart';
|
import '../../../../util/package_info.dart';
|
||||||
import '../../../../util/util.dart';
|
import '../../../../util/util.dart';
|
||||||
import '../../../views/views/check_list_view.dart';
|
import '../../../views/views/check_list_view.dart';
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ import 'package:url_launcher/url_launcher.dart';
|
|||||||
|
|
||||||
import '../../../api/api.dart';
|
import '../../../api/api.dart';
|
||||||
import '../../../api/model/task.dart';
|
import '../../../api/model/task.dart';
|
||||||
|
import '../../../util/file_icon.dart';
|
||||||
|
import '../../../util/icons.dart';
|
||||||
import '../../../util/util.dart';
|
import '../../../util/util.dart';
|
||||||
import '../../routes/app_pages.dart';
|
import '../../routes/app_pages.dart';
|
||||||
|
|
||||||
@@ -171,25 +173,36 @@ class BuildTaskListView extends GetView {
|
|||||||
child: Column(mainAxisSize: MainAxisSize.min, children: [
|
child: Column(mainAxisSize: MainAxisSize.min, children: [
|
||||||
Stack(children: [
|
Stack(children: [
|
||||||
!isDone()
|
!isDone()
|
||||||
? Opacity(
|
? Positioned(
|
||||||
opacity: 0.6,
|
left: 0,
|
||||||
child: LinearProgressIndicator(
|
right: 0,
|
||||||
backgroundColor: Colors.transparent,
|
top: 0,
|
||||||
color: pickColor(),
|
bottom: 0,
|
||||||
minHeight: 66,
|
child: Opacity(
|
||||||
value: getProgress(),
|
opacity: 0.6,
|
||||||
),
|
child: LinearProgressIndicator(
|
||||||
)
|
backgroundColor: Colors.transparent,
|
||||||
|
color: pickColor(),
|
||||||
|
// minHeight: 76,
|
||||||
|
value: getProgress(),
|
||||||
|
),
|
||||||
|
))
|
||||||
: const SizedBox.shrink(),
|
: const SizedBox.shrink(),
|
||||||
ListTile(
|
ListTile(
|
||||||
|
// isThreeLine: true,
|
||||||
title: Text(task.meta.res.name,
|
title: Text(task.meta.res.name,
|
||||||
maxLines: 2, overflow: TextOverflow.ellipsis),
|
maxLines: 2,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: Get.textTheme.titleSmall),
|
||||||
subtitle: Text(
|
subtitle: Text(
|
||||||
"${isDone() ? "" : "${Util.fmtByte(task.progress.downloaded)} / "}${Util.fmtByte(task.size)}",
|
"${isDone() ? "" : "${Util.fmtByte(task.progress.downloaded)} / "}${Util.fmtByte(task.size)}",
|
||||||
style: context.textTheme.bodyLarge
|
style: context.textTheme.bodyLarge
|
||||||
?.copyWith(color: Get.theme.disabledColor),
|
?.copyWith(color: Get.theme.disabledColor),
|
||||||
),
|
),
|
||||||
leading: const Icon(Icons.insert_drive_file),
|
leading: task.meta.res.name.lastIndexOf('.') == -1
|
||||||
|
? const Icon(FaIcons.file)
|
||||||
|
: Icon(FaIcons.allIcons[findIcon(task.meta.res.name)]),
|
||||||
|
|
||||||
trailing: SizedBox(
|
trailing: SizedBox(
|
||||||
width: 180,
|
width: 180,
|
||||||
child: Row(
|
child: Row(
|
||||||
@@ -203,7 +216,7 @@ class BuildTaskListView extends GetView {
|
|||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
),
|
||||||
])
|
])
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import 'package:get/get.dart';
|
|||||||
import 'package:path/path.dart' as path;
|
import 'package:path/path.dart' as path;
|
||||||
|
|
||||||
import '../../../util/file_icon.dart';
|
import '../../../util/file_icon.dart';
|
||||||
|
import '../../../util/icons.dart';
|
||||||
import '../../../util/util.dart';
|
import '../../../util/util.dart';
|
||||||
import '../../modules/app/controllers/app_controller.dart';
|
import '../../modules/app/controllers/app_controller.dart';
|
||||||
import '../../modules/create/controllers/create_controller.dart';
|
import '../../modules/create/controllers/create_controller.dart';
|
||||||
@@ -15,16 +16,50 @@ class FileListView extends GetView {
|
|||||||
final parentController = Get.find<CreateController>();
|
final parentController = Get.find<CreateController>();
|
||||||
final appController = Get.find<AppController>();
|
final appController = Get.find<AppController>();
|
||||||
|
|
||||||
|
late final List fileInfos;
|
||||||
|
|
||||||
|
List findChildFileIdsRecursive(children) {
|
||||||
|
List res = [];
|
||||||
|
for (var i in children) {
|
||||||
|
if (fileInfos[i]['type'] == 'folder') {
|
||||||
|
findChildFileIdsRecursive(fileInfos[i]['children']);
|
||||||
|
} else {
|
||||||
|
res.add(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
List<fluent.TreeViewItem> buildTreeViewItemsRecursive(
|
List<fluent.TreeViewItem> buildTreeViewItemsRecursive(
|
||||||
List fileInfos, int level, List<fluent.TreeViewItem> treeViewItems) {
|
int level, List<fluent.TreeViewItem> treeViewItems) {
|
||||||
List children = fileInfos.where((e) => e['level'] == level).toList();
|
List children = fileInfos.where((e) => e['level'] == level).toList();
|
||||||
for (int i = 0; i < children.length; i++) {
|
for (int i = 0; i < children.length; i++) {
|
||||||
Map fileInfo = children[i];
|
Map fileInfo = children[i];
|
||||||
if (fileInfo['size'] == null) {
|
if (fileInfo['type'] == 'folder') {
|
||||||
// folder
|
// folder
|
||||||
treeViewItems.add(fluent.TreeViewItem(
|
treeViewItems.add(fluent.TreeViewItem(
|
||||||
// expanded: false, bug on init
|
// expanded: false, bug on init
|
||||||
leading: const Icon(Icons.folder_open),
|
// value: fileInfo['id'],
|
||||||
|
onInvoked: (item, reason) async {
|
||||||
|
debugPrint('onItemInvoked(reason=$reason): $item');
|
||||||
|
if (reason.toString() ==
|
||||||
|
'TreeViewItemInvokeReason.selectionToggle') {
|
||||||
|
List childrenIds =
|
||||||
|
findChildFileIdsRecursive(fileInfo['children']);
|
||||||
|
if (item.selected == true) {
|
||||||
|
parentController.selectedIndexes
|
||||||
|
.addAll(findChildFileIdsRecursive(childrenIds));
|
||||||
|
} else {
|
||||||
|
parentController.selectedIndexes
|
||||||
|
.removeWhere((index) => childrenIds.contains(index));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
leading:
|
||||||
|
// parentController.openedFolders.contains(fileInfo['id'])
|
||||||
|
// ? const Icon(FaIcons.folder)
|
||||||
|
// : const Icon(FaIcons.folder_open),
|
||||||
|
const Icon(FaIcons.folder),
|
||||||
content: Row(mainAxisAlignment: MainAxisAlignment.end, children: [
|
content: Row(mainAxisAlignment: MainAxisAlignment.end, children: [
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Text(
|
child: Text(
|
||||||
@@ -33,26 +68,35 @@ class FileListView extends GetView {
|
|||||||
// style: context.textTheme.titleSmall,
|
// style: context.textTheme.titleSmall,
|
||||||
)),
|
)),
|
||||||
]),
|
]),
|
||||||
// onExpandToggle: (Fluent.TreeViewItem item, bool getsExpanded) {
|
// onExpandToggle: (fluent.TreeViewItem item, bool getExpanded) async {
|
||||||
//TODO
|
// getExpanded
|
||||||
// item.expanded = getsExpanded;
|
// ? parentController.openedFolders.add(item.value)
|
||||||
|
// : parentController.openedFolders.remove(item.value);
|
||||||
// },
|
// },
|
||||||
children: buildTreeViewItemsRecursive(
|
children: buildTreeViewItemsRecursive(
|
||||||
fileInfos.where((e) => e['level'] > level).toList(),
|
// fileInfos.where((e) => e['level'] > level).toList(),
|
||||||
level + 1, [])));
|
level + 1,
|
||||||
|
[])));
|
||||||
} else {
|
} else {
|
||||||
// file
|
// file
|
||||||
if (fileInfo['selected']) {
|
// if (fileInfo['selected']) {
|
||||||
parentController.selectedIndexs.add(fileInfo['fileId']);
|
// parentController.selectedIndexs.add(fileInfo['fileId']);
|
||||||
}
|
// }
|
||||||
treeViewItems.add(fluent.TreeViewItem(
|
treeViewItems.add(fluent.TreeViewItem(
|
||||||
value: fileInfo['fileId'],
|
value: fileInfo['fileId'],
|
||||||
selected: fileInfo['selected'],
|
selected: fileInfo['selected'],
|
||||||
|
onInvoked: (item, reason) async => {
|
||||||
|
debugPrint('onItemInvoked(reason=$reason): $item'),
|
||||||
|
reason.toString() == 'TreeViewItemInvokeReason.selectionToggle'
|
||||||
|
? item.selected == false
|
||||||
|
? parentController.selectedIndexes.remove(item.value)
|
||||||
|
: parentController.selectedIndexes.add(item.value)
|
||||||
|
: null
|
||||||
|
},
|
||||||
collapsable: false,
|
collapsable: false,
|
||||||
leading: fileInfo['name'].lastIndexOf('.') == -1
|
leading: fileInfo['name'].lastIndexOf('.') == -1
|
||||||
? const Icon(fluent.FluentIcons.document)
|
? const Icon(FaIcons.file)
|
||||||
: Icon(fluent.FluentIcons.allIcons[findIcon(fileInfo['name']
|
: Icon(FaIcons.allIcons[findIcon(fileInfo['name'])]),
|
||||||
.substring(fileInfo['name'].lastIndexOf('.') + 1))]),
|
|
||||||
content: Row(mainAxisAlignment: MainAxisAlignment.end, children: [
|
content: Row(mainAxisAlignment: MainAxisAlignment.end, children: [
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Text(
|
child: Text(
|
||||||
@@ -74,25 +118,27 @@ class FileListView extends GetView {
|
|||||||
return treeViewItems;
|
return treeViewItems;
|
||||||
}
|
}
|
||||||
|
|
||||||
List<fluent.TreeViewItem> get items {
|
List<fluent.TreeViewItem> items(files) {
|
||||||
List fileInfos = [];
|
List infos = [];
|
||||||
int idNext = 0;
|
int idNext = 0;
|
||||||
|
List selectedIndexs = [];
|
||||||
|
// List openedFolders = [];
|
||||||
//make fileInfos list
|
//make fileInfos list
|
||||||
for (var i = 0; i < parentController.files.length; i++) {
|
for (var i = 0; i < files.length; i++) {
|
||||||
//parentId -1 means path root
|
//parentId -1 means path root
|
||||||
int parentId = -1;
|
int parentId = -1;
|
||||||
List folders = path.split(parentController.files[i].path);
|
List folders = path.split(files[i].path);
|
||||||
for (var folder in folders) {
|
for (var folder in folders) {
|
||||||
int indexInfileInfos = fileInfos.lastIndexWhere((fileInfo) =>
|
int indexInfileInfos = infos.lastIndexWhere((fileInfo) =>
|
||||||
fileInfo['name'] == folder && fileInfo['parentId'] == parentId);
|
fileInfo['name'] == folder && fileInfo['parentId'] == parentId);
|
||||||
//TODO calculate folder size
|
//TODO calculate folder size
|
||||||
if (indexInfileInfos != -1) {
|
if (indexInfileInfos != -1) {
|
||||||
// folder exists
|
// folder exists
|
||||||
parentId = fileInfos[indexInfileInfos]['id'];
|
parentId = infos[indexInfileInfos]['id'];
|
||||||
} else {
|
} else {
|
||||||
// parent not exist
|
// parent not exist
|
||||||
// create one and add index to parent's children
|
// create one and add index to parent's children
|
||||||
fileInfos.add({
|
infos.add({
|
||||||
'id': idNext,
|
'id': idNext,
|
||||||
'type': 'folder',
|
'type': 'folder',
|
||||||
'name': folder,
|
'name': folder,
|
||||||
@@ -101,41 +147,47 @@ class FileListView extends GetView {
|
|||||||
'children': [],
|
'children': [],
|
||||||
});
|
});
|
||||||
if (parentId != -1) {
|
if (parentId != -1) {
|
||||||
fileInfos[parentId]['children'].add(idNext);
|
infos[parentId]['children'].add(idNext);
|
||||||
}
|
}
|
||||||
|
// openedFolders.add(idNext);
|
||||||
parentId = idNext;
|
parentId = idNext;
|
||||||
idNext++;
|
idNext++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//add one file, add index to parent
|
//add one file, add index to parent
|
||||||
fileInfos.add({
|
infos.add({
|
||||||
'id': idNext,
|
'id': idNext,
|
||||||
'type': 'file',
|
'type': 'file',
|
||||||
'fileId': i,
|
'fileId': i,
|
||||||
'level': folders.length,
|
'level': folders.length,
|
||||||
'name': parentController.files[i].name,
|
'name': files[i].name,
|
||||||
'size': parentController.files[i].size,
|
'size': files[i].size,
|
||||||
'parentId': parentId,
|
'parentId': parentId,
|
||||||
//TODO add unselected logic
|
//TODO add unselected logic
|
||||||
'selected': true
|
'selected': true
|
||||||
});
|
});
|
||||||
|
selectedIndexs.add(idNext);
|
||||||
if (parentId != -1) {
|
if (parentId != -1) {
|
||||||
fileInfos[parentId]['children'].add(idNext);
|
infos[parentId]['children'].add(idNext);
|
||||||
}
|
}
|
||||||
idNext++;
|
idNext++;
|
||||||
}
|
}
|
||||||
List<fluent.TreeViewItem> treeItems =
|
fileInfos = infos;
|
||||||
buildTreeViewItemsRecursive(fileInfos, 0, []);
|
parentController.selectedIndexes.value = selectedIndexs;
|
||||||
|
// parentController.openedFolders.value = openedFolders;
|
||||||
|
List<fluent.TreeViewItem> treeItems = buildTreeViewItemsRecursive(0, []);
|
||||||
return treeItems;
|
return treeItems;
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final appController = Get.find<AppController>();
|
final files = parentController.files;
|
||||||
return fluent.FluentTheme(
|
return fluent.FluentTheme(
|
||||||
data: appController.downloaderConfig.value.extra.themeMode == 'dark'
|
data:
|
||||||
? fluent.ThemeData(brightness: Brightness.dark)
|
Get.find<AppController>().downloaderConfig.value.extra.themeMode ==
|
||||||
: fluent.ThemeData(brightness: Brightness.light),
|
'dark'
|
||||||
|
? fluent.ThemeData(brightness: Brightness.dark)
|
||||||
|
: fluent.ThemeData(brightness: Brightness.light),
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
@@ -151,24 +203,19 @@ class FileListView extends GetView {
|
|||||||
border: Border.all(color: Colors.grey, width: 1),
|
border: Border.all(color: Colors.grey, width: 1),
|
||||||
borderRadius: BorderRadius.circular(5)),
|
borderRadius: BorderRadius.circular(5)),
|
||||||
child: fluent.TreeView(
|
child: fluent.TreeView(
|
||||||
//changes all when folder selector is changed
|
// shrinkWrap: false,
|
||||||
onSelectionChanged: (selectedItems) async => {
|
// addRepaintBoundaries: false,
|
||||||
parentController.selectedIndexs.value =
|
// usePrototypeItem: true,
|
||||||
selectedItems.map((j) => j.value).toList()
|
// onItemInvoked: (item, reason) async => {},
|
||||||
// for (var i = 0; i < parentController.files.length; i++)
|
onSecondaryTap: (item, details) async {
|
||||||
// {
|
debugPrint(
|
||||||
// selectedItems
|
'onSecondaryTap $item at ${details.globalPosition}');
|
||||||
// .map((j) => j.value)
|
},
|
||||||
// .toList()
|
// onSelectionChanged: (selectedItems) async => {},
|
||||||
// .contains(i)
|
|
||||||
// ? values[i] = true
|
|
||||||
// : values[i] = false
|
|
||||||
// }
|
|
||||||
},
|
|
||||||
narrowSpacing: true,
|
narrowSpacing: true,
|
||||||
scrollPrimary: true,
|
// scrollPrimary: true,
|
||||||
selectionMode: fluent.TreeViewSelectionMode.multiple,
|
selectionMode: fluent.TreeViewSelectionMode.multiple,
|
||||||
items: items))),
|
items: items(files)))),
|
||||||
],
|
],
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ class LocaleKeys {
|
|||||||
static const downloadLinkHit = 'downloadLinkHit';
|
static const downloadLinkHit = 'downloadLinkHit';
|
||||||
static const downloadLinkHitDesktop = 'downloadLinkHitDesktop';
|
static const downloadLinkHitDesktop = 'downloadLinkHitDesktop';
|
||||||
static const download = 'download';
|
static const download = 'download';
|
||||||
|
static const noFileSelected = 'noFileSelected';
|
||||||
static const noStoragePermission = 'noStoragePermission';
|
static const noStoragePermission = 'noStoragePermission';
|
||||||
static const selectFile = 'selectFile';
|
static const selectFile = 'selectFile';
|
||||||
static const basic = 'basic';
|
static const basic = 'basic';
|
||||||
@@ -63,7 +64,6 @@ class LocaleKeys {
|
|||||||
static const deleteTask = 'deleteTask';
|
static const deleteTask = 'deleteTask';
|
||||||
static const deleteTaskTip = 'deleteTaskTip';
|
static const deleteTaskTip = 'deleteTaskTip';
|
||||||
static const delete = 'delete';
|
static const delete = 'delete';
|
||||||
static const title = 'title';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class Locales {
|
class Locales {
|
||||||
@@ -85,6 +85,7 @@ class Locales {
|
|||||||
'Please enter the download link, HTTP/HTTPS/MAGNET supported@append',
|
'Please enter the download link, HTTP/HTTPS/MAGNET supported@append',
|
||||||
'downloadLinkHitDesktop': ', or drag the torrent file here directly',
|
'downloadLinkHitDesktop': ', or drag the torrent file here directly',
|
||||||
'download': 'Download',
|
'download': 'Download',
|
||||||
|
'noFileSelected': 'Please select at least one file to continue.',
|
||||||
'noStoragePermission': 'Storage permission required',
|
'noStoragePermission': 'Storage permission required',
|
||||||
'selectFile': 'Select File',
|
'selectFile': 'Select File',
|
||||||
'basic': 'Basic',
|
'basic': 'Basic',
|
||||||
@@ -129,15 +130,10 @@ class Locales {
|
|||||||
'cancel': 'انصراف',
|
'cancel': 'انصراف',
|
||||||
'selectAll': 'انتخاب همه',
|
'selectAll': 'انتخاب همه',
|
||||||
'task': 'کار',
|
'task': 'کار',
|
||||||
'downloading': 'downloading',
|
|
||||||
'downloaded': 'downloaded',
|
|
||||||
'setting': 'تنظیمات',
|
'setting': 'تنظیمات',
|
||||||
'title': 'ایجاد کار',
|
'create': 'ایجاد کار',
|
||||||
'downloadLink': 'لینک دانلود',
|
'downloadLink': 'لینک دانلود',
|
||||||
'downloadLinkValid': 'لطفا لینک دانلود را وارد کنید',
|
'downloadLinkValid': 'لطفا لینک دانلود را وارد کنید',
|
||||||
'downloadLinkHit':
|
|
||||||
'Please enter the download link, HTTP/HTTPS/MAGNET supported@append',
|
|
||||||
'downloadLinkHitDesktop': ', or drag the torrent file here directly',
|
|
||||||
'download': 'دانلود',
|
'download': 'دانلود',
|
||||||
'noStoragePermission': 'مجوز ذخیره سازی مورد نیاز است',
|
'noStoragePermission': 'مجوز ذخیره سازی مورد نیاز است',
|
||||||
'selectFile': 'انتخاب فایل',
|
'selectFile': 'انتخاب فایل',
|
||||||
@@ -183,10 +179,8 @@ class Locales {
|
|||||||
'cancel': 'Отмена',
|
'cancel': 'Отмена',
|
||||||
'selectAll': 'Выбрать все',
|
'selectAll': 'Выбрать все',
|
||||||
'task': 'Задачи',
|
'task': 'Задачи',
|
||||||
'downloading': 'downloading',
|
|
||||||
'downloaded': 'downloaded',
|
|
||||||
'setting': 'Настройки',
|
'setting': 'Настройки',
|
||||||
'title': 'Создать задачу',
|
'create': 'Создать задачу',
|
||||||
'downloadLink': 'Ссылка для скачивание',
|
'downloadLink': 'Ссылка для скачивание',
|
||||||
'downloadLinkValid': 'Пожалуйста, введите ссылку для скачивания',
|
'downloadLinkValid': 'Пожалуйста, введите ссылку для скачивания',
|
||||||
'downloadLinkHit':
|
'downloadLinkHit':
|
||||||
@@ -240,12 +234,13 @@ class Locales {
|
|||||||
'downloading': '下载中',
|
'downloading': '下载中',
|
||||||
'downloaded': '已完成',
|
'downloaded': '已完成',
|
||||||
'setting': '设置',
|
'setting': '设置',
|
||||||
'title': '创建任务',
|
'create': '创建任务',
|
||||||
'downloadLink': '下载链接',
|
'downloadLink': '下载链接',
|
||||||
'downloadLinkValid': '请输入下载链接',
|
'downloadLinkValid': '请输入下载链接',
|
||||||
'downloadLinkHit': '请输入下载链接,支持 HTTP/HTTPS/MAGNET@append',
|
'downloadLinkHit': '请输入下载链接,支持 HTTP/HTTPS/MAGNET@append',
|
||||||
'downloadLinkHitDesktop': ',也可以直接拖拽种子文件到此处',
|
'downloadLinkHitDesktop': ',也可以直接拖拽种子文件到此处',
|
||||||
'download': '下载',
|
'download': '下载',
|
||||||
|
'noFileSelected': '请至少选择一个文件下载',
|
||||||
'noStoragePermission': '需要开启存储权限',
|
'noStoragePermission': '需要开启存储权限',
|
||||||
'selectFile': '选择文件',
|
'selectFile': '选择文件',
|
||||||
'basic': '基础',
|
'basic': '基础',
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import 'app/modules/app/controllers/app_controller.dart';
|
|||||||
import 'app/modules/app/views/app_view.dart';
|
import 'app/modules/app/views/app_view.dart';
|
||||||
import 'core/libgopeed_boot.dart';
|
import 'core/libgopeed_boot.dart';
|
||||||
import 'generated/locales.g.dart';
|
import 'generated/locales.g.dart';
|
||||||
import 'i18n/localeManager.dart';
|
import 'util/localeManager.dart';
|
||||||
import 'util/log_util.dart';
|
import 'util/log_util.dart';
|
||||||
import 'util/mac_secure_util.dart';
|
import 'util/mac_secure_util.dart';
|
||||||
import 'util/package_info.dart';
|
import 'util/package_info.dart';
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
findIcon(String ext) {
|
findIcon(String filename) {
|
||||||
String res = 'document';
|
String res = 'file';
|
||||||
|
String ext = filename.substring(filename.lastIndexOf('.') + 1);
|
||||||
for (var iconMap in iconMaps) {
|
for (var iconMap in iconMaps) {
|
||||||
if (iconMap['extensions'].contains(ext)) {
|
if (iconMap['extensions'].contains(ext)) {
|
||||||
res = iconMap['thumbnail'];
|
res = iconMap['thumbnail'];
|
||||||
@@ -57,7 +58,7 @@ const List iconMaps = [
|
|||||||
'3gp'
|
'3gp'
|
||||||
],
|
],
|
||||||
'type': 'Video',
|
'type': 'Video',
|
||||||
'thumbnail': 'my_movies_t_v'
|
'thumbnail': 'file_video'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'extensions': [
|
'extensions': [
|
||||||
@@ -73,7 +74,7 @@ const List iconMaps = [
|
|||||||
'.wma'
|
'.wma'
|
||||||
],
|
],
|
||||||
'type': 'Audio',
|
'type': 'Audio',
|
||||||
'thumbnail': 'music_in_collection_fill'
|
'thumbnail': 'file_audio'
|
||||||
},
|
},
|
||||||
//compressed
|
//compressed
|
||||||
{
|
{
|
||||||
@@ -97,23 +98,29 @@ const List iconMaps = [
|
|||||||
'dockerignore'
|
'dockerignore'
|
||||||
],
|
],
|
||||||
'type': 'Archive',
|
'type': 'Archive',
|
||||||
'thumbnail': 'package'
|
'thumbnail': 'file_archive'
|
||||||
},
|
},
|
||||||
//office relative
|
//office relative
|
||||||
{
|
{
|
||||||
'extensions': ['pdf'],
|
'extensions': ['pdf'],
|
||||||
'type': 'Portable Document Format',
|
'type': 'Portable Document Format',
|
||||||
'thumbnail': 'pdf'
|
'thumbnail': 'file_pdf'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'extensions': ['txt', 'doc', 'docb', 'docm', 'dot', 'dotm', 'docx', 'rtf'],
|
'extensions': ['txt', 'docb', 'rtf'],
|
||||||
'type': 'Word Document',
|
'type': 'Document',
|
||||||
'thumbnail': 'text_document_edit'
|
'thumbnail': 'doc_text'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
'extensions': ['doc', 'docm', 'dot', 'dotm', 'docx'],
|
||||||
|
'type': 'Word Document',
|
||||||
|
'thumbnail': 'file_word'
|
||||||
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
'extensions': ['xlsx', 'xls', 'xlsb', 'xls', 'ods', 'fods', 'csv'],
|
'extensions': ['xlsx', 'xls', 'xlsb', 'xls', 'ods', 'fods', 'csv'],
|
||||||
'type': 'Excel Document',
|
'type': 'Excel Document',
|
||||||
'thumbnail': 'excel_document'
|
'thumbnail': 'file_excel'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'extensions': [
|
'extensions': [
|
||||||
@@ -129,13 +136,13 @@ const List iconMaps = [
|
|||||||
'pptx'
|
'pptx'
|
||||||
],
|
],
|
||||||
'type': 'Powerpoint Document',
|
'type': 'Powerpoint Document',
|
||||||
'thumbnail': 'power_point_document'
|
'thumbnail': 'file_powerpoint'
|
||||||
},
|
},
|
||||||
//other
|
//other
|
||||||
{
|
{
|
||||||
'extensions': ['lnk'],
|
'extensions': ['lnk'],
|
||||||
'type': 'Shortcut',
|
'type': 'Shortcut',
|
||||||
'thumbnail': 'file_symlink'
|
'thumbnail': 'link_ext'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'extensions': [
|
'extensions': [
|
||||||
@@ -155,12 +162,12 @@ const List iconMaps = [
|
|||||||
'cfg'
|
'cfg'
|
||||||
],
|
],
|
||||||
'type': 'Settings',
|
'type': 'Settings',
|
||||||
'thumbnail': 'text_document_settings'
|
'thumbnail': 'cog_alt'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'extensions': ['html', 'htm', 'xhtml', 'html_vm'],
|
'extensions': ['html', 'htm', 'xhtml', 'html_vm'],
|
||||||
'type': 'html',
|
'type': 'html',
|
||||||
'thumbnail': 'file_h_t_m_l'
|
'thumbnail': 'html5'
|
||||||
},
|
},
|
||||||
//code relative
|
//code relative
|
||||||
// {
|
// {
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
File renamed without changes.
@@ -1,50 +0,0 @@
|
|||||||
import 'package:flutter/material.dart';
|
|
||||||
|
|
||||||
class ResponsiveBuilder extends StatelessWidget {
|
|
||||||
const ResponsiveBuilder({
|
|
||||||
required this.narrowBuilder,
|
|
||||||
required this.mediumBuilder,
|
|
||||||
required this.wideBuilder,
|
|
||||||
Key? key,
|
|
||||||
}) : super(key: key);
|
|
||||||
|
|
||||||
final Widget Function(
|
|
||||||
BuildContext context,
|
|
||||||
BoxConstraints constraints,
|
|
||||||
) narrowBuilder;
|
|
||||||
|
|
||||||
final Widget Function(
|
|
||||||
BuildContext context,
|
|
||||||
BoxConstraints constraints,
|
|
||||||
) mediumBuilder;
|
|
||||||
|
|
||||||
final Widget Function(
|
|
||||||
BuildContext context,
|
|
||||||
BoxConstraints constraints,
|
|
||||||
) wideBuilder;
|
|
||||||
|
|
||||||
static bool isNarrow(BuildContext context) =>
|
|
||||||
MediaQuery.of(context).size.width < 768;
|
|
||||||
|
|
||||||
static bool isMedium(BuildContext context) =>
|
|
||||||
MediaQuery.of(context).size.width < 992 &&
|
|
||||||
MediaQuery.of(context).size.width >= 768;
|
|
||||||
|
|
||||||
static bool isWide(BuildContext context) =>
|
|
||||||
MediaQuery.of(context).size.width >= 992;
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return LayoutBuilder(
|
|
||||||
builder: (context, constraints) {
|
|
||||||
if (constraints.maxWidth >= 992) {
|
|
||||||
return wideBuilder(context, constraints);
|
|
||||||
} else if (constraints.maxWidth >= 768) {
|
|
||||||
return mediumBuilder(context, constraints);
|
|
||||||
} else {
|
|
||||||
return narrowBuilder(context, constraints);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -30,13 +30,12 @@ dependencies:
|
|||||||
flutter:
|
flutter:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
flutter_localizations:
|
flutter_localizations:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
|
|
||||||
# The following adds the Cupertino Icons font to your application.
|
# The following adds the Cupertino Icons font to your application.
|
||||||
# Use with the CupertinoIcons class for iOS style icons.
|
# Use with the CupertinoIcons class for iOS style icons.
|
||||||
cupertino_icons: ^1.0.2
|
cupertino_icons: ^1.0.2
|
||||||
get: ^4.6.5
|
get: ^4.6.5
|
||||||
stylish_bottom_bar: ^1.0.0
|
|
||||||
lottie: ^1.4.2
|
lottie: ^1.4.2
|
||||||
styled_widget: ^0.4.0+3
|
styled_widget: ^0.4.0+3
|
||||||
context_menus: ^1.0.2
|
context_menus: ^1.0.2
|
||||||
@@ -98,12 +97,10 @@ flutter:
|
|||||||
# "family" key with the font family name, and a "fonts" key with a
|
# "family" key with the font family name, and a "fonts" key with a
|
||||||
# list giving the asset and other descriptors for the font. For
|
# list giving the asset and other descriptors for the font. For
|
||||||
# example:
|
# example:
|
||||||
# fonts:
|
fonts:
|
||||||
# - family: Schyler
|
- family: FontAwesome
|
||||||
# fonts:
|
fonts:
|
||||||
# - asset: fonts/Schyler-Regular.ttf
|
- asset: assets/fonts/FontAwesome.ttf
|
||||||
# - asset: fonts/Schyler-Italic.ttf
|
|
||||||
# style: italic
|
|
||||||
# - family: Trajan Pro
|
# - family: Trajan Pro
|
||||||
# fonts:
|
# fonts:
|
||||||
# - asset: fonts/TrajanPro.ttf
|
# - asset: fonts/TrajanPro.ttf
|
||||||
|
|||||||
Reference in new issue
Block a user