nprasad2077/gopeed
1
0 Fork 0
mirror of https://github.com/GopeedLab/gopeed.git synced 2026-11-10 02:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: task view ui

Browse Source
This commit is contained in:
liwei committed 2023-04-01 19:43:47 +08:00
1 parent 4128e718e9
commit 5558cac263
16 files changed
+149 -144
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ui/flutter/lib/app/modules/create/views/create_view.dart
+2 -2
View File
@@ -31,7 +31,7 @@ class CreateView extends GetView<CreateController> {
appBar: AppBar(
leading: IconButton(
icon: const Icon(Icons.arrow_back),
onPressed: () => Get.rootDelegate.offNamed(Routes.DOWNLOADING)),
onPressed: () => Get.rootDelegate.offNamed(Routes.TASK)),
// actions: [],
title: Text('create'.tr),
),
@@ -188,7 +188,7 @@ class CreateView extends GetView<CreateController> {
selectFiles: controller.selectedIndexes
.cast<int>())));
Get.back();
Get.rootDelegate.offNamed(Routes.DOWNLOADING);
Get.rootDelegate.offNamed(Routes.TASK);
}
} catch (e) {
showErrorMessage(e);
ui/flutter/lib/app/modules/downloaded/bindings/downloaded_binding.dart
-12
View File
@@ -1,12 +0,0 @@
import 'package:get/get.dart';
import '../controllers/downloaded_controller.dart';
class DownloadedBinding extends Bindings {
@override
void dependencies() {
Get.lazyPut<DownloadedController>(
() => DownloadedController(),
);
}
}
ui/flutter/lib/app/modules/downloaded/controllers/downloaded_controller.dart
-31
View File
@@ -1,31 +0,0 @@
import 'dart:async';
import 'package:get/get.dart';
import '../../../../api/api.dart';
import '../../../../api/model/task.dart';
class DownloadedController extends GetxController {
final tasks = <Task>[].obs;
late final Timer _timer;
@override
void onInit() async {
super.onInit();
await getTasksState();
_timer = Timer.periodic(const Duration(milliseconds: 1000), (timer) async {
// debugPrint('timer${DateTime.now()}');
await getTasksState();
});
}
@override
void onClose() {
super.onClose();
_timer.cancel();
}
getTasksState() async {
tasks.value = await getTasks([Status.done]);
}
}
ui/flutter/lib/app/modules/downloading/bindings/downloading_binding.dart
-12
View File
@@ -1,12 +0,0 @@
import 'package:get/get.dart';
import '../controllers/downloading_controller.dart';
class DownloadingBinding extends Bindings {
@override
void dependencies() {
Get.lazyPut<DownloadingController>(
() => DownloadingController(),
);
}
}
ui/flutter/lib/app/modules/home/views/home_view.dart
+6 -23
View File
@@ -12,7 +12,7 @@ class HomeView extends GetView<HomeController> {
Widget build(BuildContext context) {
return GetRouterOutlet.builder(builder: (context, delegate, currentRoute) {
return Scaffold(
extendBody: true,
// extendBody: true,
body: Row(
// crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -26,29 +26,20 @@ class HomeView extends GetView<HomeController> {
onDestinationSelected: (int index) {
switch (index) {
case 0:
delegate.toNamed(Routes.DOWNLOADING);
controller.currentIndex.value = 0;
delegate.toNamed(Routes.TASK);
break;
case 1:
delegate.toNamed(Routes.DOWNLOADED);
controller.currentIndex.value = 1;
break;
case 2:
delegate.toNamed(Routes.SETTING);
controller.currentIndex.value = 2;
break;
}
},
destinations: [
NavigationRailDestination(
icon: const Icon(Icons.file_download),
selectedIcon: const Icon(Icons.file_download),
label: Text('downloading'.tr),
),
NavigationRailDestination(
icon: const Icon(Icons.done),
selectedIcon: const Icon(Icons.done),
label: Text('downloaded'.tr),
label: Text('task'.tr),
),
NavigationRailDestination(
icon: const Icon(Icons.settings),
@@ -63,7 +54,7 @@ class HomeView extends GetView<HomeController> {
: const SizedBox.shrink(),
Expanded(
child: GetRouterOutlet(
initialRoute: Routes.DOWNLOADING,
initialRoute: Routes.TASK,
// anchorRoute: '/',
// filterPages: (afterAnchor) {
// logger.w(afterAnchor);
@@ -75,13 +66,9 @@ class HomeView extends GetView<HomeController> {
bottomNavigationBar: ResponsiveBuilder.isNarrow(context)
? BottomNavigationBar(
items: <BottomNavigationBarItem>[
BottomNavigationBarItem(
icon: const Icon(Icons.file_download),
label: 'downloading'.tr,
),
BottomNavigationBarItem(
icon: const Icon(Icons.done),
label: 'downloaded'.tr,
label: 'task'.tr,
),
BottomNavigationBarItem(
icon: const Icon(Icons.settings),
@@ -93,16 +80,12 @@ class HomeView extends GetView<HomeController> {
onTap: (index) {
switch (index) {
case 0:
delegate.toNamed(Routes.DOWNLOADING);
controller.currentIndex.value = 0;
delegate.toNamed(Routes.TASK);
break;
case 1:
delegate.toNamed(Routes.DOWNLOADED);
controller.currentIndex.value = 1;
break;
case 2:
delegate.toNamed(Routes.SETTING);
controller.currentIndex.value = 2;
break;
}
},
ui/flutter/lib/app/modules/task/bindings/task_binding.dart
+20
View File
@@ -0,0 +1,20 @@
import 'package:get/get.dart';
import '../controllers/task_controller.dart';
import '../controllers/task_downloaded_controller.dart';
import '../controllers/task_downloading_controller.dart';
class TaskBinding extends Bindings {
@override
void dependencies() {
Get.lazyPut<TaskController>(
() => TaskController(),
);
Get.lazyPut<TaskDownloadingController>(
() => TaskDownloadingController(),
);
Get.lazyPut<TaskDownloadedController>(
() => TaskDownloadedController(),
);
}
}
ui/flutter/lib/app/modules/task/controllers/task_controller.dart
+5
View File
@@ -0,0 +1,5 @@
import 'package:get/get.dart';
class TaskController extends GetxController {
final tabIndex = 0.obs;
}
ui/flutter/lib/app/modules/task/controllers/task_downloaded_controller.dart
+9
View File
@@ -0,0 +1,9 @@
import 'dart:async';
import 'package:gopeed/app/modules/task/controllers/task_list_controller.dart';
import '../../../../api/model/task.dart';
class TaskDownloadedController extends TaskListController {
TaskDownloadedController() : super([Status.done]);
}
ui/flutter/lib/app/modules/task/controllers/task_downloading_controller.dart
+7
View File
@@ -0,0 +1,7 @@
import '../../../../api/model/task.dart';
import 'task_list_controller.dart';
class TaskDownloadingController extends TaskListController {
TaskDownloadingController()
: super([Status.ready, Status.running, Status.pause, Status.error]);
}
ui/flutter/lib/app/modules/downloading/controllers/downloading_controller.dart → ui/flutter/lib/app/modules/task/controllers/task_list_controller.dart
+21 -6
View File
@@ -5,18 +5,25 @@ import 'package:get/get.dart';
import '../../../../api/api.dart';
import '../../../../api/model/task.dart';
class DownloadingController extends GetxController {
abstract class TaskListController extends GetxController {
List<Status> statuses;
TaskListController(this.statuses);
final tasks = <Task>[].obs;
final isRunning = false.obs;
late final Timer _timer;
@override
void onInit() async {
super.onInit();
await getTasksState();
start();
_timer = Timer.periodic(const Duration(milliseconds: 1000), (timer) async {
// debugPrint('timer${DateTime.now()}');
await getTasksState();
if (isRunning.value) {
await getTasksState();
}
});
}
@@ -26,8 +33,16 @@ class DownloadingController extends GetxController {
_timer.cancel();
}
void start() async {
await getTasksState();
isRunning.value = true;
}
void stop() {
isRunning.value = false;
}
getTasksState() async {
tasks.value = await getTasks(
[Status.ready, Status.running, Status.pause, Status.error]);
tasks.value = await getTasks(statuses);
}
}
ui/flutter/lib/app/modules/downloading/views/downloading_view.dart → ui/flutter/lib/app/modules/task/views/task_downloaded_view.dart
+3 -3
View File
@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../../../views/views/buid_task_list_view.dart';
import '../controllers/downloading_controller.dart';
import '../controllers/task_downloaded_controller.dart';
class DownloadingView extends GetView<DownloadingController> {
const DownloadingView({Key? key}) : super(key: key);
class TaskDownloadedView extends GetView<TaskDownloadedController> {
const TaskDownloadedView({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
ui/flutter/lib/app/modules/downloaded/views/downloaded_view.dart → ui/flutter/lib/app/modules/task/views/task_downloading_view.dart
+3 -3
View File
@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../../../views/views/buid_task_list_view.dart';
import '../controllers/downloaded_controller.dart';
import '../controllers/task_downloading_controller.dart';
class DownloadedView extends GetView<DownloadedController> {
const DownloadedView({Key? key}) : super(key: key);
class TaskDownloadingView extends GetView<TaskDownloadingController> {
const TaskDownloadingView({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
ui/flutter/lib/app/modules/task/views/task_view.dart
+60
View File
@@ -0,0 +1,60 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:gopeed/app/modules/task/controllers/task_downloading_controller.dart';
import '../controllers/task_downloaded_controller.dart';
import 'task_downloading_view.dart';
import 'task_downloaded_view.dart';
import '../controllers/task_controller.dart';
class TaskView extends GetView<TaskController> {
const TaskView({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
return DefaultTabController(
length: 2,
child: Scaffold(
appBar: PreferredSize(
preferredSize: const Size.fromHeight(56),
child: AppBar(
bottom: TabBar(
tabs: const [
Tab(
icon: Icon(Icons.file_download),
),
Tab(
icon: Icon(Icons.done),
),
],
onTap: (index) {
if (controller.tabIndex.value != index) {
controller.tabIndex.value = index;
final downloadingController =
Get.find<TaskDownloadingController>();
final downloadedController =
Get.find<TaskDownloadedController>();
switch (index) {
case 0:
downloadingController.start();
downloadedController.stop();
break;
case 1:
downloadingController.stop();
downloadedController.start();
break;
}
}
},
),
)),
body: const TabBarView(
children: [
TaskDownloadingView(),
TaskDownloadedView(),
],
),
),
);
}
}