dart format
This commit is contained in:
@@ -27,7 +27,11 @@ class SettingsCubit extends HydratedCubit<Settings> {
|
||||
_emitFreshInstance();
|
||||
});
|
||||
}
|
||||
Debouncer.debounce(_debounceTag, const Duration(milliseconds: 500), _emitFreshInstance);
|
||||
Debouncer.debounce(
|
||||
_debounceTag,
|
||||
const Duration(milliseconds: 500),
|
||||
_emitFreshInstance,
|
||||
);
|
||||
}
|
||||
return state;
|
||||
}
|
||||
@@ -50,7 +54,11 @@ class SettingsCubit extends HydratedCubit<Settings> {
|
||||
return _appendNewModules(Settings.fromJson(json));
|
||||
} catch (_) {
|
||||
try {
|
||||
return _appendNewModules(Settings.fromJson(_mergeSettings(json, DefaultSettings.get().toJson())));
|
||||
return _appendNewModules(
|
||||
Settings.fromJson(
|
||||
_mergeSettings(json, DefaultSettings.get().toJson()),
|
||||
),
|
||||
);
|
||||
} catch (_) {
|
||||
return DefaultSettings.get();
|
||||
}
|
||||
@@ -63,7 +71,9 @@ class SettingsCubit extends HydratedCubit<Settings> {
|
||||
Settings _appendNewModules(Settings s) {
|
||||
final order = s.modulesSettings.moduleOrder;
|
||||
final hidden = s.modulesSettings.hiddenModules;
|
||||
final missing = Modules.values.where((m) => !order.contains(m) && !hidden.contains(m));
|
||||
final missing = Modules.values.where(
|
||||
(m) => !order.contains(m) && !hidden.contains(m),
|
||||
);
|
||||
if (missing.isEmpty) return s;
|
||||
s.modulesSettings.moduleOrder = [...order, ...missing];
|
||||
return s;
|
||||
@@ -72,12 +82,19 @@ class SettingsCubit extends HydratedCubit<Settings> {
|
||||
@override
|
||||
Map<String, dynamic>? toJson(Settings state) => state.toJson();
|
||||
|
||||
Map<String, dynamic> _mergeSettings(Map<String, dynamic> oldMap, Map<String, dynamic> newMap) {
|
||||
Map<String, dynamic> _mergeSettings(
|
||||
Map<String, dynamic> oldMap,
|
||||
Map<String, dynamic> newMap,
|
||||
) {
|
||||
final merged = Map<String, dynamic>.from(newMap);
|
||||
oldMap.forEach((key, value) {
|
||||
if (merged.containsKey(key)) {
|
||||
if (value is Map<String, dynamic> && merged[key] is Map<String, dynamic>) {
|
||||
merged[key] = _mergeSettings(value, merged[key] as Map<String, dynamic>);
|
||||
if (value is Map<String, dynamic> &&
|
||||
merged[key] is Map<String, dynamic>) {
|
||||
merged[key] = _mergeSettings(
|
||||
value,
|
||||
merged[key] as Map<String, dynamic>,
|
||||
);
|
||||
} else {
|
||||
merged[key] = value;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user