diff --git a/lib/pages/dynamics/tab/view.dart b/lib/pages/dynamics/tab/view.dart index 9fe2438d..23f88223 100644 --- a/lib/pages/dynamics/tab/view.dart +++ b/lib/pages/dynamics/tab/view.dart @@ -41,7 +41,7 @@ class _DynamicsTabPageState extends State @override void initState() { super.initState(); - dynamicsController = Get.find(); + dynamicsController = Get.put(DynamicsController()); _dynamicsTabController = Get.put( DynamicsTabController(dynamicsType: widget.dynamicsType) ..mid = dynamicsController.mid.value, diff --git a/lib/pages/main/controller.dart b/lib/pages/main/controller.dart index 9c3f4577..69a37ee9 100644 --- a/lib/pages/main/controller.dart +++ b/lib/pages/main/controller.dart @@ -109,9 +109,9 @@ class MainController extends GetxController { selectedIndex = defaultIndex != -1 ? defaultIndex : 0; pages = navigationBars .map((e) => switch (e['id']) { - 0 => HomePage(), - 1 => DynamicsPage(), - 2 => MediaPage(), + 0 => const HomePage(), + 1 => const DynamicsPage(), + 2 => const MediaPage(), _ => throw UnimplementedError(), }) .toList(); diff --git a/lib/pages/setting/pages/color_select.dart b/lib/pages/setting/pages/color_select.dart index 8b7dfd33..1ec18d3d 100644 --- a/lib/pages/setting/pages/color_select.dart +++ b/lib/pages/setting/pages/color_select.dart @@ -1,3 +1,8 @@ +import 'package:PiliPalaX/models/common/nav_bar_config.dart'; +import 'package:PiliPalaX/models/common/theme_type.dart'; +import 'package:PiliPalaX/pages/home/index.dart'; +import 'package:PiliPalaX/pages/setting/controller.dart'; +import 'package:PiliPalaX/pages/setting/widgets/select_dialog.dart'; import 'package:flex_seed_scheme/flex_seed_scheme.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -60,9 +65,15 @@ List generateItems(int count) { } class _ColorSelectPageState extends State { + final SettingController settingController = Get.put(SettingController()); final ColorSelectController ctr = Get.put(ColorSelectController()); FlexSchemeVariant _dynamicSchemeVariant = FlexSchemeVariant.values[GStorage.schemeVariant]; + TextStyle get titleStyle => Theme.of(context).textTheme.titleMedium!; + TextStyle get subTitleStyle => Theme.of(context) + .textTheme + .labelMedium! + .copyWith(color: Theme.of(context).colorScheme.outline); @override Widget build(BuildContext context) { @@ -70,53 +81,84 @@ class _ColorSelectPageState extends State { appBar: AppBar(title: const Text('选择应用主题')), body: ListView( children: [ - Builder( - builder: (context) => ListTile( - title: const Text('调色板风格'), - leading: Container( - width: 40, - alignment: Alignment.center, - child: Icon(Icons.palette_outlined), - ), - subtitle: Text( - _dynamicSchemeVariant.description, - style: TextStyle(fontSize: 12), - ), - trailing: PopupMenuButton( - initialValue: _dynamicSchemeVariant, - onSelected: (item) async { - _dynamicSchemeVariant = item; - await GStorage.setting - .put(SettingBoxKey.schemeVariant, item.index); - (context as Element).markNeedsBuild(); - Get.forceAppUpdate(); + ListTile( + onTap: () async { + ThemeType? result = await showDialog( + context: context, + builder: (context) { + return SelectDialog( + title: '主题模式', + value: settingController.themeType.value, + values: ThemeType.values.map((e) { + return {'title': e.description, 'value': e}; + }).toList()); }, - itemBuilder: (context) => FlexSchemeVariant.values - .map((item) => PopupMenuItem( - value: item, - child: Text(item.variantName), - )) - .toList(), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - _dynamicSchemeVariant.variantName, - style: TextStyle( - height: 1, - fontSize: 13, - color: Theme.of(context).colorScheme.primary, + ); + if (result != null) { + settingController.themeType.value = result; + GStorage.setting.put(SettingBoxKey.themeMode, result.index); + Get.forceAppUpdate(); + } + }, + leading: Container( + width: 40, + alignment: Alignment.center, + child: const Icon(Icons.flashlight_on_outlined), + ), + title: Text('主题模式', style: titleStyle), + subtitle: Obx(() => Text( + '当前模式：${settingController.themeType.value.description}', + style: subTitleStyle)), + ), + ListTile( + title: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Text('调色板风格'), + PopupMenuButton( + initialValue: _dynamicSchemeVariant, + onSelected: (item) async { + _dynamicSchemeVariant = item; + await GStorage.setting + .put(SettingBoxKey.schemeVariant, item.index); + Get.forceAppUpdate(); + }, + itemBuilder: (context) => FlexSchemeVariant.values + .map((item) => PopupMenuItem( + value: item, + child: Text(item.variantName), + )) + .toList(), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + _dynamicSchemeVariant.variantName, + style: TextStyle( + height: 1, + fontSize: 13, + color: Theme.of(context).colorScheme.primary, + ), + strutStyle: StrutStyle(leading: 0, height: 1), ), - strutStyle: StrutStyle(leading: 0, height: 1), - ), - Icon( - size: 20, - Icons.keyboard_arrow_right, - color: Theme.of(context).colorScheme.primary, - ) - ], + Icon( + size: 20, + Icons.keyboard_arrow_right, + color: Theme.of(context).colorScheme.primary, + ) + ], + ), ), - ), + ], + ), + leading: Container( + width: 40, + alignment: Alignment.center, + child: Icon(Icons.palette_outlined), + ), + subtitle: Text( + _dynamicSchemeVariant.description, + style: TextStyle(fontSize: 12), ), ), Obx( @@ -143,12 +185,13 @@ class _ColorSelectPageState extends State { }, ), ), - Obx( - () { - int type = ctr.type.value; - return AnimatedOpacity( - opacity: type == 1 ? 1 : 0, - duration: const Duration(milliseconds: 200), + AnimatedSize( + curve: Curves.easeInOut, + alignment: Alignment.topCenter, + duration: const Duration(milliseconds: 200), + child: Obx( + () => SizedBox( + height: ctr.type.value == 0 ? 0 : null, child: Padding( padding: const EdgeInsets.only(top: 12, left: 12, right: 12), child: Wrap( @@ -209,9 +252,30 @@ class _ColorSelectPageState extends State { ], ), ), - ); - }, + ), + ), ), + ...[ + IgnorePointer( + child: SizedBox( + height: Get.height / 2, + width: Get.width, + child: const HomePage(), + ), + ), + IgnorePointer( + child: NavigationBar( + destinations: defaultNavigationBars + .map( + (item) => NavigationDestination( + icon: item['icon'], + label: item['label'], + ), + ) + .toList(), + ), + ), + ], ], ), ); diff --git a/lib/pages/setting/style_setting.dart b/lib/pages/setting/style_setting.dart index 3261ac02..6c7455b3 100644 --- a/lib/pages/setting/style_setting.dart +++ b/lib/pages/setting/style_setting.dart @@ -31,7 +31,6 @@ class _StyleSettingState extends State { final ColorSelectController colorSelectController = Get.put(ColorSelectController()); - late ThemeType _tempThemeValue; late double maxRowWidth; late UpPanelPosition upPanelPosition; @@ -40,7 +39,6 @@ class _StyleSettingState extends State { @override void initState() { super.initState(); - _tempThemeValue = settingController.themeType.value; maxRowWidth = setting.get(SettingBoxKey.maxRowWidth, defaultValue: 240.0) as double; upPanelPosition = UpPanelPosition.values[setting.get( @@ -299,14 +297,13 @@ class _StyleSettingState extends State { builder: (context) { return SelectDialog( title: '主题模式', - value: _tempThemeValue, + value: settingController.themeType.value, values: ThemeType.values.map((e) { return {'title': e.description, 'value': e}; }).toList()); }, ); if (result != null) { - _tempThemeValue = result; settingController.themeType.value = result; setting.put(SettingBoxKey.themeMode, result.index); Get.forceAppUpdate();