diff --git a/lib/common/widgets/dialog/export_import.dart b/lib/common/widgets/dialog/export_import.dart index 1228a628a..1c72d9e00 100644 --- a/lib/common/widgets/dialog/export_import.dart +++ b/lib/common/widgets/dialog/export_import.dart @@ -218,7 +218,7 @@ Future showImportExportDialog( }) => showDialog( context: context, builder: (context) { - const style = TextStyle(fontSize: 14); + const style = TextStyle(fontSize: 15); return SimpleDialog( clipBehavior: Clip.hardEdge, title: Text('导入/导出$title'), diff --git a/lib/pages/about/view.dart b/lib/pages/about/view.dart index 267a8a3e8..cd874986d 100644 --- a/lib/pages/about/view.dart +++ b/lib/pages/about/view.dart @@ -80,7 +80,7 @@ class _AboutPageState extends State { @override Widget build(BuildContext context) { final theme = Theme.of(context); - const style = TextStyle(fontSize: 14); + const style = TextStyle(fontSize: 15); final outline = theme.colorScheme.outline; final subTitleStyle = TextStyle(fontSize: 13, color: outline); final showAppBar = widget.showAppBar; @@ -266,8 +266,7 @@ Commit Hash: ${BuildConfig.commitHash}''', onTap: () => showImportExportDialog>( context, title: '设置', - localFileName: () => - 'setting_${context.isTablet ? 'pad' : 'phone'}', + localFileName: () => 'setting_${context.platformName}', label: GStorage.setting.name, onExport: GStorage.exportAllSettings, onImport: GStorage.importAllJsonSettings, diff --git a/lib/pages/webdav/webdav.dart b/lib/pages/webdav/webdav.dart index c9bc1eed9..4a5e6aada 100644 --- a/lib/pages/webdav/webdav.dart +++ b/lib/pages/webdav/webdav.dart @@ -3,11 +3,11 @@ import 'dart:convert'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/pair.dart'; import 'package:PiliPlus/utils/extension/context_ext.dart'; -import 'package:PiliPlus/utils/platform_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/storage_pref.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import 'package:get/get.dart'; +import 'package:get/get_core/src/get_main.dart'; +import 'package:get/get_navigation/src/extension_navigation.dart'; import 'package:webdav_client/webdav_client.dart' as webdav; class WebDav { @@ -53,12 +53,7 @@ class WebDav { } String _getFileName() { - final type = PlatformUtils.isDesktop - ? 'desktop' - : Get.context!.isTablet - ? 'pad' - : 'phone'; - return 'piliplus_settings_$type.json'; + return 'piliplus_settings_${Get.context!.platformName}.json'; } Future backup() async { diff --git a/lib/utils/extension/context_ext.dart b/lib/utils/extension/context_ext.dart index a566a3216..dfdb01917 100644 --- a/lib/utils/extension/context_ext.dart +++ b/lib/utils/extension/context_ext.dart @@ -1,3 +1,4 @@ +import 'package:PiliPlus/utils/platform_utils.dart'; import 'package:flutter/material.dart'; /// from Getx @@ -71,4 +72,10 @@ extension ContextExtensions on BuildContext { /// True if the current device is Tablet bool get isTablet => isSmallTablet || isLargeTablet; + + String get platformName => PlatformUtils.isDesktop + ? 'desktop' + : isTablet + ? 'pad' + : 'phone'; }