From a10042c8f0591e118979d12e8fee91dc875ee8a9 Mon Sep 17 00:00:00 2001 From: Jing <42014615+jing332@users.noreply.github.com> Date: Fri, 19 Jan 2024 11:10:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=88=87=E6=8D=A2=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/generated/intl/messages_zh.dart | 2 +- lib/l10n/intl_zh.arb | 2 +- lib/main.dart | 8 +++----- lib/pages/settings/settings.dart | 5 ----- pubspec.lock | 8 ++++++++ pubspec.yaml | 1 + 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/lib/generated/intl/messages_zh.dart b/lib/generated/intl/messages_zh.dart index 503d327..c763c08 100644 --- a/lib/generated/intl/messages_zh.dart +++ b/lib/generated/intl/messages_zh.dart @@ -62,7 +62,7 @@ class MessageLookup extends MessageLookupByLibrary { "selectAppToOpen": MessageLookupByLibrary.simpleMessage("选择应用打开"), "setAdminPassword": MessageLookupByLibrary.simpleMessage("设置admin密码"), "setDefaultDirectory": - MessageLookupByLibrary.simpleMessage("是否设为默认目录？"), + MessageLookupByLibrary.simpleMessage("是否设为默认初始目录？"), "settings": MessageLookupByLibrary.simpleMessage("设置"), "wakeLock": MessageLookupByLibrary.simpleMessage("唤醒锁"), "wakeLockDesc": MessageLookupByLibrary.simpleMessage( diff --git a/lib/l10n/intl_zh.arb b/lib/l10n/intl_zh.arb index 4943460..38840a9 100644 --- a/lib/l10n/intl_zh.arb +++ b/lib/l10n/intl_zh.arb @@ -34,5 +34,5 @@ "autoStartWebPage": "将网页设置为打开首页", "autoStartWebPageDesc": "打开主界面时的首页", "dataDirectory": "data 文件夹路径", - "setDefaultDirectory": "是否设为默认目录？" + "setDefaultDirectory": "是否设为初始目录？" } \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 5f02f48..c1f8dc9 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,4 @@ import 'dart:developer'; -import 'dart:ffi'; import 'package:alist_flutter/generated/l10n.dart'; import 'package:alist_flutter/generated_api.dart'; @@ -7,14 +6,13 @@ import 'package:alist_flutter/pages/alist/alist.dart'; import 'package:alist_flutter/pages/app_update_dialog.dart'; import 'package:alist_flutter/pages/settings/settings.dart'; import 'package:alist_flutter/pages/web/web.dart'; -import 'package:animations/animations.dart'; +import 'package:fade_indexed_stack/fade_indexed_stack.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_svg/svg.dart'; import 'package:get/get.dart'; -import 'package:lazy_load_indexed_stack/lazy_load_indexed_stack.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); @@ -77,7 +75,8 @@ class MyHomePage extends StatelessWidget { return Scaffold( body: Obx( - () => LazyLoadIndexedStack( + () => FadeIndexedStack( + lazy: true, index: controller.selectedIndex.value, children: [ WebScreen(key: webGlobalKey), @@ -108,7 +107,6 @@ class MyHomePage extends StatelessWidget { ], selectedIndex: controller.selectedIndex.value, onDestinationSelected: (int index) { - log(index.toString()); // Web if (controller.selectedIndex.value == webPageIndex && controller.selectedIndex.value == webPageIndex) { diff --git a/lib/pages/settings/settings.dart b/lib/pages/settings/settings.dart index 0c7f447..89e5e68 100644 --- a/lib/pages/settings/settings.dart +++ b/lib/pages/settings/settings.dart @@ -25,7 +25,6 @@ class _SettingsScreenState extends State { void initState() { _lifecycleListener = AppLifecycleListener( onResume: () async { - log("onResume"); final controller = Get.put(_SettingsController()); controller.updateData(); }, @@ -194,7 +193,6 @@ class _SettingsController extends GetxController { @override void onInit() async { - log("onInit"); updateData(); super.onInit(); @@ -214,9 +212,6 @@ class _SettingsController extends GetxController { if (sdk >= 30) { _managerStorageGranted.value = await Permission.manageExternalStorage.isGranted; - - Permission.manageExternalStorage.status - .then((value) => log(value.toString())); } else { _managerStorageGranted.value = true; _storageGranted.value = await Permission.storage.isGranted; diff --git a/pubspec.lock b/pubspec.lock index f590d77..2aafd51 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -105,6 +105,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.6" + fade_indexed_stack: + dependency: "direct main" + description: + name: fade_indexed_stack + sha256: "0d625709d0bf6d0fa275cfa4eba84695fdea93d672c47413cdb49bcbe758a9f3" + url: "https://pub.dev" + source: hosted + version: "0.2.2" fake_async: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 5310d95..9fc393d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -46,6 +46,7 @@ dependencies: lazy_load_indexed_stack: ^1.1.0 animations: ^2.0.11 file_picker: ^6.1.1 + fade_indexed_stack: ^0.2.2 dev_dependencies: