mod: 最热合并到首页

This commit is contained in:
guozhigq
2023-07-11 13:01:51 +08:00
parent bc3ac3c9f6
commit e5a05c22ea
16 changed files with 405 additions and 272 deletions

View File

@ -13,7 +13,7 @@ import 'package:pilipala/utils/storage.dart';
class MainController extends GetxController {
List<Widget> pages = <Widget>[
const HomePage(),
const HotPage(),
// const HotPage(),
const DynamicsPage(),
const MediaPage(),
];
@ -25,13 +25,13 @@ class MainController extends GetxController {
),
'label': "推荐",
},
{
'icon': const Icon(
Icons.eco,
size: 20,
),
'label': "热门",
},
// {
// 'icon': const Icon(
// Icons.eco,
// size: 20,
// ),
// 'label': "热门",
// },
{
'icon': const Icon(
Icons.bolt,

View File

@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:pilipala/pages/dynamics/index.dart';
import 'package:pilipala/pages/home/index.dart';
import 'package:pilipala/pages/hot/index.dart';
import './controller.dart';
class MainApp extends StatefulWidget {
@ -15,7 +14,6 @@ class MainApp extends StatefulWidget {
class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
final MainController _mainController = Get.put(MainController());
final HomeController _homeController = Get.put(HomeController());
final HotController _hotController = Get.put(HotController());
final DynamicsController _dynamicController = Get.put(DynamicsController());
PageController? _pageController;
@ -70,22 +68,6 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
_homeController.flag = false;
}
if (currentPage is HotPage) {
if (_hotController.flag) {
// 单击返回顶部 双击并刷新
if (DateTime.now().millisecondsSinceEpoch - _lastSelectTime! < 500) {
_hotController.onRefresh();
} else {
await Future.delayed(const Duration(microseconds: 300));
_hotController.animateToTop();
}
_lastSelectTime = DateTime.now().millisecondsSinceEpoch;
}
_hotController.flag = true;
} else {
_hotController.flag = false;
}
if (currentPage is DynamicsPage) {
if (_dynamicController.flag) {
// 单击返回顶部 双击并刷新
@ -131,7 +113,7 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
),
bottomNavigationBar: BottomNavigationBar(
currentIndex: selectedIndex,
type: BottomNavigationBarType.shifting,
// type: BottomNavigationBarType.shifting,
selectedItemColor: Theme.of(context).colorScheme.primary,
unselectedItemColor: Theme.of(context).colorScheme.onSurfaceVariant,
selectedFontSize: 12.4,