aljaz/flutter_server_box
1
1
Fork 0
mirror of https://github.com/lollipopkit/flutter_server_box.git synced 2025-12-17 07:14:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

opt.: store

Browse Source
This commit is contained in:
lollipopkit
2023-08-28 18:07:22 +08:00
parent e20f2d32e8
commit 11c3bf795b
20 changed files with 193 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/app.dart
View File

@@ -18,8 +18,8 @@ class MyApp extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
setTransparentNavigationBar(context); setTransparentNavigationBar(context);
primaryColor = Color(_setting.primaryColor.fetch()!); primaryColor = Color(_setting.primaryColor.fetch());
final fullScreen = _setting.fullScreen.fetch()!; final fullScreen = _setting.fullScreen.fetch();
return ValueListenableBuilder<int>( return ValueListenableBuilder<int>(
valueListenable: _setting.themeMode.listenable(), valueListenable: _setting.themeMode.listenable(),
@@ -28,7 +28,7 @@ class MyApp extends StatelessWidget {
// Issue #57 // Issue #57
// if not [ok] -> [AMOLED] mode, use [ThemeMode.dark] // if not [ok] -> [AMOLED] mode, use [ThemeMode.dark]
final themeMode = isAMOLED ? ThemeMode.values[tMode] : ThemeMode.dark; final themeMode = isAMOLED ? ThemeMode.values[tMode] : ThemeMode.dark;
final locale = _setting.locale.fetch()?.toLocale; final locale = _setting.locale.fetch().toLocale;
final darkTheme = ThemeData( final darkTheme = ThemeData(
useMaterial3: true, useMaterial3: true,
brightness: Brightness.dark, brightness: Brightness.dark,

4
lib/core/extension/order.dart
View File

@@ -7,7 +7,7 @@ extension OrderX<T> on Order<T> {
void move( void move(
int oldIndex, int oldIndex,
int newIndex, { int newIndex, {
StoreProperty<List<T>>? property, StorePropertyBase<List<T>>? property,
_OnMove<T>? onMove, _OnMove<T>? onMove,
}) { }) {
if (oldIndex == newIndex) return; if (oldIndex == newIndex) return;
@@ -35,7 +35,7 @@ extension OrderX<T> on Order<T> {
List<T> items, List<T> items,
int o, int o,
int n, { int n, {
StoreProperty<List<T>>? property, StorePropertyBase<List<T>>? property,
_OnMove<T>? onMove, _OnMove<T>? onMove,
}) { }) {
if (o == n) return; if (o == n) return;

61
lib/core/persistant_store.dart
View File

@@ -10,35 +10,72 @@ class PersistentStore<E> {
box = await Hive.openBox(boxName); box = await Hive.openBox(boxName);
return this; return this;
} }
StoreProperty<T> property<T>(String key, {T? defaultValue}) {
return StoreProperty<T>(box, key, defaultValue);
}
} }
class StoreProperty<T> { abstract class StorePropertyBase<T> {
ValueListenable<T> listenable();
T fetch();
Future<void> put(T value);
Future<void> delete();
}
class StoreProperty<T> implements StorePropertyBase<T> {
StoreProperty(this._box, this._key, this.defaultValue); StoreProperty(this._box, this._key, this.defaultValue);
final Box _box; final Box _box;
final String _key; final String _key;
T? defaultValue; T defaultValue;
@override
ValueListenable<T> listenable() { ValueListenable<T> listenable() {
return PropertyListenable<T>(_box, _key, defaultValue); return PropertyListenable<T>(_box, _key, defaultValue);
} }
T? fetch() { @override
return _box.get(_key, defaultValue: defaultValue); T fetch() {
} return _box.get(_key, defaultValue: defaultValue)!;
dynamic fetchRaw() {
return _box.get(_key, defaultValue: defaultValue);
} }
@override
Future<void> put(T value) { Future<void> put(T value) {
return _box.put(_key, value); return _box.put(_key, value);
} }
@override
Future<void> delete() {
return _box.delete(_key);
}
}
class StoreListProperty<T> implements StorePropertyBase<List<T>> {
StoreListProperty(this._box, this._key, this.defaultValue);
final Box _box;
final String _key;
List<T> defaultValue;
@override
ValueListenable<List<T>> listenable() {
return PropertyListenable<List<T>>(_box, _key, defaultValue);
}
@override
List<T> fetch() {
final val = _box.get(_key, defaultValue: defaultValue)!;
if (val is! List) {
throw Exception('StoreListProperty("$_key") is: ${val.runtimeType}');
}
return List<T>.from(val);
}
@override
Future<void> put(List<T> value) {
return _box.put(_key, value);
}
@override
Future<void> delete() { Future<void> delete() {
return _box.delete(_key); return _box.delete(_key);
} }

6
lib/core/utils/ui.dart
View File

@@ -76,7 +76,7 @@ void showLoadingDialog(BuildContext context, {bool barrierDismiss = false}) {
Widget buildSwitch( Widget buildSwitch(
BuildContext context, BuildContext context,
StoreProperty<bool> prop, { StorePropertyBase<bool> prop, {
void Function(bool)? func, void Function(bool)? func,
}) { }) {
return ValueListenableBuilder( return ValueListenableBuilder(
@@ -115,8 +115,8 @@ String tabTitleName(BuildContext context, AppTab tab) {
} }
} }
Future<void> loadFontFile(String? localPath) async { Future<void> loadFontFile(String localPath) async {
if (localPath == null) return; if (localPath.isEmpty) return;
final name = getFileName(localPath); final name = getFileName(localPath);
if (name == null) return; if (name == null) return;
var fontLoader = FontLoader(name); var fontLoader = FontLoader(name);

2
lib/data/model/server/try_limiter.dart
View File

@@ -5,7 +5,7 @@ class TryLimiter {
final Map<String, int> _triedTimes = {}; final Map<String, int> _triedTimes = {};
bool canTry(String id) { bool canTry(String id) {
final maxCount = locator<SettingStore>().maxRetryCount.fetch()!; final maxCount = locator<SettingStore>().maxRetryCount.fetch();
if (maxCount <= 0) { if (maxCount <= 0) {
return true; return true;
} }

4
lib/data/provider/server.dart
View File

@@ -49,7 +49,7 @@ class ServerProvider extends ChangeNotifier {
_servers[spi.id] = genServer(spi); _servers[spi.id] = genServer(spi);
} }
final serverOrder_ = _settingStore.serverOrder.fetch(); final serverOrder_ = _settingStore.serverOrder.fetch();
if (serverOrder_ != null) { if (serverOrder_.isNotEmpty) {
spis.reorder( spis.reorder(
order: serverOrder_, order: serverOrder_,
finder: (n, id) => n.id == id, finder: (n, id) => n.id == id,
@@ -112,7 +112,7 @@ class ServerProvider extends ChangeNotifier {
} }
Future<void> startAutoRefresh() async { Future<void> startAutoRefresh() async {
final duration = _settingStore.serverStatusUpdateInterval.fetch()!; final duration = _settingStore.serverStatusUpdateInterval.fetch();
stopAutoRefresh(); stopAutoRefresh();
if (duration == 0) return; if (duration == 0) return;
_timer = Timer.periodic(Duration(seconds: duration), (_) async { _timer = Timer.periodic(Duration(seconds: duration), (_) async {

2
lib/data/provider/snippet.dart
View File

@@ -21,7 +21,7 @@ class SnippetProvider extends ChangeNotifier {
void loadData() { void loadData() {
_snippets = _store.fetch(); _snippets = _store.fetch();
final order = _setting.snippetOrder.fetch(); final order = _setting.snippetOrder.fetch();
if (order != null) { if (order.isNotEmpty) {
final surplus = _snippets.reorder( final surplus = _snippets.reorder(
order: order, order: order,
finder: (n, name) => n.name == name, finder: (n, name) => n.name == name,

2
lib/data/provider/virtual_keyboard.dart
View File

@@ -42,7 +42,7 @@ class VirtualKeyboard extends TerminalInputHandler with ChangeNotifier {
ctrl: event.ctrl || ctrl, ctrl: event.ctrl || ctrl,
alt: event.alt || alt, alt: event.alt || alt,
); );
if (_setting.sshVirtualKeyAutoOff.fetch()!) { if (_setting.sshVirtualKeyAutoOff.fetch()) {
reset(e); reset(e);
} }
return defaultInputHandler.call(e); return defaultInputHandler.call(e);

2
lib/data/res/color.dart
View File

@@ -4,7 +4,7 @@ import 'package:toolbox/locator.dart';
import '../model/app/dynamic_color.dart'; import '../model/app/dynamic_color.dart';
Color primaryColor = Color(locator<SettingStore>().primaryColor.fetch()!); Color primaryColor = Color(locator<SettingStore>().primaryColor.fetch());
final contentColor = DynamicColor(Colors.black87, Colors.white70); final contentColor = DynamicColor(Colors.black87, Colors.white70);
final bgColor = DynamicColor(Colors.white, Colors.black); final bgColor = DynamicColor(Colors.white, Colors.black);

143
lib/data/store/setting.dart
View File

@@ -1,7 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:toolbox/core/persistant_store.dart'; import 'package:toolbox/core/persistant_store.dart';
import 'package:toolbox/core/utils/platform.dart'; import 'package:toolbox/core/utils/platform.dart';
import 'package:toolbox/data/model/ssh/virtual_key.dart';
import '../model/app/net_view.dart'; import '../model/app/net_view.dart';
import '../res/default.dart'; import '../res/default.dart';
@@ -9,112 +8,142 @@ import '../res/default.dart';
class SettingStore extends PersistentStore { class SettingStore extends PersistentStore {
Map<String, dynamic> toJson() => {for (var e in box.keys) e: box.get(e)}; Map<String, dynamic> toJson() => {for (var e in box.keys) e: box.get(e)};
StoreProperty<int> get primaryColor => property<int>( late final primaryColor = StoreProperty(
box,
'primaryColor', 'primaryColor',
defaultValue: 4287106639, 4287106639,
); );
StoreProperty<int> get serverStatusUpdateInterval => property( late final serverStatusUpdateInterval = StoreProperty(
box,
'serverStatusUpdateInterval', 'serverStatusUpdateInterval',
defaultValue: defaultUpdateInterval, defaultUpdateInterval,
); );
// Lanch page idx // Lanch page idx
StoreProperty<int> get launchPage => property( late final launchPage = StoreProperty(
box,
'launchPage', 'launchPage',
defaultValue: defaultLaunchPageIdx, defaultLaunchPageIdx,
); );
// Version of store db // Version of store db
StoreProperty<int> get storeVersion => late final storeVersion = StoreProperty(box, 'storeVersion', 0);
property('storeVersion', defaultValue: 0);
StoreProperty<int> get termColorIdx => late final termColorIdx = StoreProperty(box, 'termColorIdx', 0);
property('termColorIdx', defaultValue: 0);
// Max retry count when connect to server // Max retry count when connect to server
StoreProperty<int> get maxRetryCount => late final maxRetryCount = StoreProperty(box, 'maxRetryCount', 2);
property('maxRetryCount', defaultValue: 2);
// Night mode: 0 -> auto, 1 -> light, 2 -> dark // Night mode: 0 -> auto, 1 -> light, 2 -> dark
StoreProperty<int> get themeMode => property('themeMode', defaultValue: 0); late final themeMode = StoreProperty(box, 'themeMode', 0);
// Font file path // Font file path
StoreProperty<String> get fontPath => property('fontPath'); late final fontPath = StoreProperty(box, 'fontPath', '');
// Backgroud running (Android) // Backgroud running (Android)
StoreProperty<bool> get bgRun => property('bgRun', defaultValue: isAndroid); late final bgRun = StoreProperty(box, 'bgRun', isAndroid);
// Server order // Server order
StoreProperty<List<String>> get serverOrder => late final serverOrder = StoreListProperty<String>(box, 'serverOrder', []);
property('serverOrder', defaultValue: null);
StoreProperty<List<String>> get snippetOrder => property( late final snippetOrder = StoreListProperty<String>(box, 'snippetOrder', []);
'snippetOrder',
defaultValue: null,
);
// Server details page cards order // Server details page cards order
StoreProperty<List<String>> get detailCardOrder => late final detailCardOrder =
property('detailCardPrder', defaultValue: defaultDetailCardOrder); StoreListProperty(box, 'detailCardPrder', defaultDetailCardOrder);
// SSH term font size // SSH term font size
StoreProperty<double> get termFontSize => late final termFontSize = StoreProperty(box, 'termFontSize', 13.0);
property('termFontSize', defaultValue: 13);
// Server detail disk ignore path // Server detail disk ignore path
StoreProperty<List<String>> get diskIgnorePath => late final diskIgnorePath =
property('diskIgnorePath', defaultValue: defaultDiskIgnorePath); StoreListProperty(box, 'diskIgnorePath', defaultDiskIgnorePath);
// Locale // Locale
StoreProperty<String> get locale => property('locale', defaultValue: null); late final locale = StoreProperty<String>(box, 'locale', '');
// SSH virtual key (ctrl | alt) auto turn off // SSH virtual key (ctrl | alt) auto turn off
StoreProperty<bool> get sshVirtualKeyAutoOff => late final sshVirtualKeyAutoOff =
property('sshVirtualKeyAutoOff', defaultValue: true); StoreProperty(box, 'sshVirtualKeyAutoOff', true);
StoreProperty<double> get editorFontSize => late final editorFontSize = StoreProperty(box, 'editorFontSize', 13.0);
property('editorFontSize', defaultValue: 13);
// Editor theme // Editor theme
StoreProperty<String> get editorTheme => late final editorTheme = StoreProperty(
property('editorTheme', defaultValue: defaultEditorTheme); box,
'editorTheme',
defaultEditorTheme,
);
StoreProperty<String> get editorDarkTheme => late final editorDarkTheme = StoreProperty(
property('editorDarkTheme', defaultValue: defaultEditorDarkTheme); box,
'editorDarkTheme',
defaultEditorDarkTheme,
);
StoreProperty<bool> get fullScreen => late final fullScreen = StoreProperty(
property('fullScreen', defaultValue: false); box,
'fullScreen',
false,
);
StoreProperty<bool> get fullScreenJitter => late final fullScreenJitter = StoreProperty(
property('fullScreenJitter', defaultValue: true); box,
'fullScreenJitter',
true,
);
StoreProperty<int> get fullScreenRotateQuarter => late final fullScreenRotateQuarter = StoreProperty(
property('fullScreenRotateQuarter', defaultValue: 1); box,
'fullScreenRotateQuarter',
1,
);
StoreProperty<int> get keyboardType => late final keyboardType = StoreProperty(
property('keyboardType', defaultValue: TextInputType.text.index); box,
'keyboardType',
TextInputType.text.index,
);
StoreProperty<List<VirtKey>> get sshVirtKeys => late final sshVirtKeys = StoreListProperty(
property('sshVirtKeys', defaultValue: defaultSSHVirtKeys); box,
'sshVirtKeys',
defaultSSHVirtKeys,
);
StoreProperty<NetViewType> get netViewType => late final netViewType = StoreProperty(
property('netViewType', defaultValue: NetViewType.speed); box,
'netViewType',
NetViewType.speed,
);
// Only valid on iOS // Only valid on iOS
StoreProperty<bool> get autoUpdateHomeWidget => late final autoUpdateHomeWidget = StoreProperty(
property('autoUpdateHomeWidget', defaultValue: isIOS); box,
'autoUpdateHomeWidget',
isIOS,
);
StoreProperty<bool> get autoCheckAppUpdate => late final autoCheckAppUpdate = StoreProperty(
property('autoCheckAppUpdate', defaultValue: true); box,
'autoCheckAppUpdate',
true,
);
/// Display server tab function buttons on the bottom of each server card if [true] /// Display server tab function buttons on the bottom of each server card if [true]
/// ///
/// Otherwise, display them on the top of server detail page /// Otherwise, display them on the top of server detail page
StoreProperty<bool> get moveOutServerTabFuncBtns => late final moveOutServerTabFuncBtns = StoreProperty(
property('moveOutServerTabFuncBtns', defaultValue: true); box,
'moveOutServerTabFuncBtns',
true,
);
/// Whether use `rm -rf` to delete directory on SFTP /// Whether use `rm -rf` to delete directory on SFTP
StoreProperty<bool> get sftpRmrfDir => late final sftpRmrfDir = StoreProperty(
property('sftpRmrfDir', defaultValue: true); box,
'sftpRmrfDir',
true,
);
} }

2
lib/main.dart
View File

@@ -96,7 +96,7 @@ Future<void> initApp() async {
// Android only // Android only
if (!isAndroid) return; if (!isAndroid) return;
// Only start service when [bgRun] is true. // Only start service when [bgRun] is true.
if (locator<SettingStore>().bgRun.fetch() ?? false) { if (locator<SettingStore>().bgRun.fetch()) {
bgRunChannel.invokeMethod('startService'); bgRunChannel.invokeMethod('startService');
} }
// SharedPreferences is only used on Android for saving home widgets settings. // SharedPreferences is only used on Android for saving home widgets settings.

4
lib/view/page/full_screen.dart
View File

@@ -45,7 +45,7 @@ class _FullScreenPageState extends State<FullScreenPage> with AfterLayoutMixin {
void initState() { void initState() {
super.initState(); super.initState();
switchStatusBar(hide: true); switchStatusBar(hide: true);
_rotateQuarter = _setting.fullScreenRotateQuarter.fetch()!; _rotateQuarter = _setting.fullScreenRotateQuarter.fetch();
_timer = Timer.periodic(const Duration(minutes: 1), (_) { _timer = Timer.periodic(const Duration(minutes: 1), (_) {
if (mounted) { if (mounted) {
setState(() {}); setState(() {});
@@ -362,7 +362,7 @@ class _FullScreenPageState extends State<FullScreenPage> with AfterLayoutMixin {
@override @override
Future<void> afterFirstLayout(BuildContext context) async { Future<void> afterFirstLayout(BuildContext context) async {
if (_setting.autoCheckAppUpdate.fetch()!) { if (_setting.autoCheckAppUpdate.fetch()) {
doUpdate(context); doUpdate(context);
} }
await GetIt.I.allReady(); await GetIt.I.allReady();

8
lib/view/page/home.dart
View File

@@ -54,7 +54,7 @@ class _HomePageState extends State<HomePage>
super.initState(); super.initState();
switchStatusBar(hide: false); switchStatusBar(hide: false);
WidgetsBinding.instance.addObserver(this); WidgetsBinding.instance.addObserver(this);
_selectIndex.value = _setting.launchPage.fetch()!; _selectIndex.value = _setting.launchPage.fetch();
// avoid index out of range // avoid index out of range
if (_selectIndex.value >= AppTab.values.length || _selectIndex.value < 0) { if (_selectIndex.value >= AppTab.values.length || _selectIndex.value < 0) {
_selectIndex.value = 0; _selectIndex.value = 0;
@@ -90,7 +90,7 @@ class _HomePageState extends State<HomePage>
break; break;
case AppLifecycleState.paused: case AppLifecycleState.paused:
// Keep running in background on Android device // Keep running in background on Android device
if (isAndroid && _setting.bgRun.fetch()!) { if (isAndroid && _setting.bgRun.fetch()) {
if (_app.moveBg) { if (_app.moveBg) {
bgRunChannel.invokeMethod('sendToBackground'); bgRunChannel.invokeMethod('sendToBackground');
} }
@@ -366,7 +366,7 @@ class _HomePageState extends State<HomePage>
@override @override
Future<void> afterFirstLayout(BuildContext context) async { Future<void> afterFirstLayout(BuildContext context) async {
if (_setting.autoCheckAppUpdate.fetch()!) { if (_setting.autoCheckAppUpdate.fetch()) {
doUpdate(context); doUpdate(context);
} }
updateHomeWidget(); updateHomeWidget();
@@ -379,7 +379,7 @@ class _HomePageState extends State<HomePage>
} }
void updateHomeWidget() { void updateHomeWidget() {
if (_setting.autoUpdateHomeWidget.fetch()!) { if (_setting.autoUpdateHomeWidget.fetch()) {
homeWidgetChannel.invokeMethod('update'); homeWidgetChannel.invokeMethod('update');
} }
} }

6
lib/view/page/server/detail.dart
View File

@@ -61,7 +61,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_cardsOrder.addAll(_setting.detailCardOrder.fetch()!); _cardsOrder.addAll(_setting.detailCardOrder.fetch());
} }
@override @override
@@ -80,7 +80,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
} }
Widget _buildMainPage(Server si) { Widget _buildMainPage(Server si) {
final buildFuncs = !_setting.moveOutServerTabFuncBtns.fetch()!; final buildFuncs = !_setting.moveOutServerTabFuncBtns.fetch();
return Scaffold( return Scaffold(
appBar: CustomAppBar( appBar: CustomAppBar(
title: Text(si.spi.name, style: textSize18), title: Text(si.spi.name, style: textSize18),
@@ -299,7 +299,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
Widget _buildDiskView(ServerStatus ss) { Widget _buildDiskView(ServerStatus ss) {
final disk = ss.disk; final disk = ss.disk;
disk.removeWhere((e) { disk.removeWhere((e) {
for (final ingorePath in _setting.diskIgnorePath.fetch()!) { for (final ingorePath in _setting.diskIgnorePath.fetch()) {
if (e.path.startsWith(ingorePath)) return true; if (e.path.startsWith(ingorePath)) return true;
} }
return false; return false;

4
lib/view/page/server/tab.dart
View File

@@ -238,7 +238,7 @@ class _ServerPageState extends State<ServerPage>
), ),
), ),
height13, height13,
if (_settingStore.moveOutServerTabFuncBtns.fetch()!) if (_settingStore.moveOutServerTabFuncBtns.fetch())
SizedBox( SizedBox(
height: 27, height: 27,
child: ServerFuncBtns(spi: spi, s: _s), child: ServerFuncBtns(spi: spi, s: _s),
@@ -446,7 +446,7 @@ class _ServerPageState extends State<ServerPage>
if (cs != ServerState.finished) { if (cs != ServerState.finished) {
return 23.0; return 23.0;
} }
if (_settingStore.moveOutServerTabFuncBtns.fetch()!) { if (_settingStore.moveOutServerTabFuncBtns.fetch()) {
return 132; return 132;
} }
return 107; return 107;

35
lib/view/page/setting/entry.dart
View File

@@ -77,7 +77,12 @@ class _SettingPageState extends State<SettingPage> {
void didChangeDependencies() { void didChangeDependencies() {
super.didChangeDependencies(); super.didChangeDependencies();
_s = S.of(context)!; _s = S.of(context)!;
_localeCode.value = _setting.locale.fetch() ?? _s.localeName; final localeSettingVal = _setting.locale.fetch();
if (localeSettingVal.isEmpty) {
_localeCode.value = _s.localeName;
} else {
_localeCode.value = localeSettingVal;
}
} }
@override @override
@@ -85,18 +90,18 @@ class _SettingPageState extends State<SettingPage> {
super.initState(); super.initState();
_serverProvider = locator<ServerProvider>(); _serverProvider = locator<ServerProvider>();
_setting = locator<SettingStore>(); _setting = locator<SettingStore>();
_launchPageIdx.value = _setting.launchPage.fetch()!; _launchPageIdx.value = _setting.launchPage.fetch();
_nightMode.value = _setting.themeMode.fetch()!; _nightMode.value = _setting.themeMode.fetch();
_updateInterval.value = _setting.serverStatusUpdateInterval.fetch()!; _updateInterval.value = _setting.serverStatusUpdateInterval.fetch();
_maxRetryCount.value = _setting.maxRetryCount.fetch()!; _maxRetryCount.value = _setting.maxRetryCount.fetch();
_selectedColorValue.value = _setting.primaryColor.fetch()!; _selectedColorValue.value = _setting.primaryColor.fetch();
_termFontSize.value = _setting.termFontSize.fetch()!; _termFontSize.value = _setting.termFontSize.fetch();
_editorFontSize.value = _setting.editorFontSize.fetch()!; _editorFontSize.value = _setting.editorFontSize.fetch();
_editorTheme.value = _setting.editorTheme.fetch()!; _editorTheme.value = _setting.editorTheme.fetch();
_editorDarkTheme.value = _setting.editorDarkTheme.fetch()!; _editorDarkTheme.value = _setting.editorDarkTheme.fetch();
_keyboardType.value = _setting.keyboardType.fetch()!; _keyboardType.value = _setting.keyboardType.fetch();
_rotateQuarter.value = _setting.fullScreenRotateQuarter.fetch()!; _rotateQuarter.value = _setting.fullScreenRotateQuarter.fetch();
_netViewType.value = _setting.netViewType.fetch()!; _netViewType.value = _setting.netViewType.fetch();
SharedPreferences.getInstance().then((value) => _sp = value); SharedPreferences.getInstance().then((value) => _sp = value);
} }
@@ -563,7 +568,7 @@ class _SettingPageState extends State<SettingPage> {
} }
Widget _buildDiskIgnorePath() { Widget _buildDiskIgnorePath() {
final paths = _setting.diskIgnorePath.fetch()!; final paths = _setting.diskIgnorePath.fetch();
return ListTile( return ListTile(
title: Text(_s.diskIgnorePath), title: Text(_s.diskIgnorePath),
trailing: Text(_s.edit, style: textSize15), trailing: Text(_s.edit, style: textSize15),
@@ -987,7 +992,7 @@ class _SettingPageState extends State<SettingPage> {
void _showFontSizeDialog( void _showFontSizeDialog(
ValueNotifier<double> notifier, ValueNotifier<double> notifier,
StoreProperty property, StorePropertyBase<double> property,
) { ) {
final ctrller = TextEditingController(text: notifier.value.toString()); final ctrller = TextEditingController(text: notifier.value.toString());
void onSave() { void onSave() {

2
lib/view/page/setting/srv_detail_seq.dart
View File

@@ -30,7 +30,7 @@ class _ServerDetailOrderPageState extends State<ServerDetailOrderPage> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_cardsOrder.addAll(_store.detailCardOrder.fetch()!); _cardsOrder.addAll(_store.detailCardOrder.fetch());
} }
@override @override

2
lib/view/page/setting/virt_key.dart
View File

@@ -39,7 +39,7 @@ class _SSHVirtKeySettingPageState extends State<SSHVirtKeySettingPage> {
} }
Widget _buildBody() { Widget _buildBody() {
final keys_ = _setting.sshVirtKeys.fetchRaw()!; final keys_ = _setting.sshVirtKeys.fetch();
final keys = <VirtKey>[]; final keys = <VirtKey>[];
for (final key in keys_) { for (final key in keys_) {
keys.add(key); keys.add(key);

6
lib/view/page/ssh_term.dart
View File

@@ -61,10 +61,10 @@ class _SSHPageState extends State<SSHPage> {
final fontFamilly = getFileName(_setting.fontPath.fetch()); final fontFamilly = getFileName(_setting.fontPath.fetch());
final textStyle = TextStyle( final textStyle = TextStyle(
fontFamily: fontFamilly, fontFamily: fontFamilly,
fontSize: _setting.termFontSize.fetch()!, fontSize: _setting.termFontSize.fetch(),
); );
_terminalStyle = TerminalStyle.fromTextStyle(textStyle); _terminalStyle = TerminalStyle.fromTextStyle(textStyle);
_keyboardType = TextInputType.values[_setting.keyboardType.fetch()!]; _keyboardType = TextInputType.values[_setting.keyboardType.fetch()];
_initTerminal(); _initTerminal();
_initVirtKeys(); _initVirtKeys();
} }
@@ -299,7 +299,7 @@ class _SSHPageState extends State<SSHPage> {
} }
void _initVirtKeys() { void _initVirtKeys() {
final virtKeys = List<VirtKey>.from(_setting.sshVirtKeys.fetchRaw()); final virtKeys = List<VirtKey>.from(_setting.sshVirtKeys.fetch());
for (int len = 0; len < virtKeys.length; len += 7) { for (int len = 0; len < virtKeys.length; len += 7) {
if (len + 7 > virtKeys.length) { if (len + 7 > virtKeys.length) {

2
lib/view/page/storage/sftp.dart
View File

@@ -430,7 +430,7 @@ class _SftpPageState extends State<SftpPage> with AfterLayoutMixin {
void _delete(BuildContext context, SftpName file) { void _delete(BuildContext context, SftpName file) {
context.pop(); context.pop();
final isDir = file.attr.isDirectory; final isDir = file.attr.isDirectory;
final useRmrf = _setting.sftpRmrfDir.fetch()!; final useRmrf = _setting.sftpRmrfDir.fetch();
final dirText = (isDir && !useRmrf) ? '\n${_s.sureDirEmpty}' : ''; final dirText = (isDir && !useRmrf) ? '\n${_s.sureDirEmpty}' : '';
final text = '${_s.sureDelete(file.filename)}$dirText'; final text = '${_s.sureDelete(file.filename)}$dirText';
final child = Text(text); final child = Text(text);