beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-25 09:00:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hook up update observables

Browse source
This commit is contained in:
crschnick 2024-05-30 07:50:21 +00:00
parent ba7c83a1e8
commit ae02fb3791
4 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/io/xpipe/app/comp/store/StoreSection.java
View file

@ -100,7 +100,8 @@ public class StoreSection {
return comp.compare(o1, o2);
}
},
mappedSortMode);
mappedSortMode,
StoreViewState.get().getEntriesOrderChangeObservable());
}
public static StoreSection createTopLevel(
@ -111,7 +112,8 @@ public class StoreSection {
var topLevel = all.filtered(section -> {
return DataStorage.get().isRootEntry(section.getEntry());
},
category);
category,
StoreViewState.get().getEntriesListChangeObservable());
var cached = topLevel.mapped(
storeEntryWrapper -> create(storeEntryWrapper, 1, all, entryFilter, filterString, category));
var ordered = sorted(cached, category);
@ -154,7 +156,7 @@ public class StoreSection {
var showProvider = other.getEntry().getProvider() == null ||
other.getEntry().getProvider().shouldShow(other);
return isChildren && showProvider;
}, e.getPersistentState(), e.getCache());
}, e.getPersistentState(), e.getCache(), StoreViewState.get().getEntriesListChangeObservable());
var cached = allChildren.mapped(
entry1 -> create(entry1, depth + 1, all, entryFilter, filterString, category));
var ordered = sorted(cached, category);

21
app/src/main/java/io/xpipe/app/comp/store/StoreViewState.java
View file

@ -10,7 +10,6 @@ import io.xpipe.app.storage.DataStoreEntry;
import io.xpipe.app.storage.StorageListener;
import javafx.application.Platform;
import javafx.beans.property.*;
import javafx.beans.value.ObservableIntegerValue;
import javafx.collections.FXCollections;
import lombok.Getter;
@ -31,7 +30,11 @@ public class StoreViewState {
private final DerivedObservableList<StoreCategoryWrapper> categories =
new DerivedObservableList<>(FXCollections.observableList(new CopyOnWriteArrayList<>()), true);
private final ObservableIntegerValue updateObservable = new SimpleIntegerProperty();
@Getter
private final IntegerProperty entriesOrderChangeObservable = new SimpleIntegerProperty();
@Getter
private final IntegerProperty entriesListChangeObservable = new SimpleIntegerProperty();
@Getter
private final Property<StoreCategoryWrapper> activeCategory = new SimpleObjectProperty<>();
@ -130,6 +133,20 @@ public class StoreViewState {
// Watch out for synchronizing all calls to the entries and categories list!
DataStorage.get().addListener(new StorageListener() {
@Override
public void onStoreOrderUpdate() {
Platform.runLater(() -> {
entriesOrderChangeObservable.set(entriesOrderChangeObservable.get() + 1);
});
}
@Override
public void onStoreListUpdate() {
Platform.runLater(() -> {
entriesListChangeObservable.set(entriesListChangeObservable.get() + 1);
});
}
@Override
public void onStoreAdd(DataStoreEntry... entry) {
var l = Arrays.stream(entry)

10
app/src/main/java/io/xpipe/app/storage/DataStorage.java
View file

@ -328,20 +328,16 @@ public abstract class DataStorage {
return;
}
var children = getDeepStoreChildren(entry);
entry.setCategoryUuid(newCategory.getUuid());
var children = getDeepStoreChildren(entry);
children.forEach(child -> child.setCategoryUuid(newCategory.getUuid()));
listeners.forEach(storageListener -> storageListener.onStoreListUpdate());
saveAsync();
}
public void orderBefore(DataStoreEntry entry, DataStoreEntry reference) {
var children = getDeepStoreChildren(entry);
var arr = Stream.concat(Stream.of(entry), children.stream()).toArray(DataStoreEntry[]::new);
listeners.forEach(storageListener -> storageListener.onStoreRemove(arr));
entry.setOrderBefore(reference != null ? reference.getUuid() : null);
listeners.forEach(storageListener -> storageListener.onStoreAdd(arr));
listeners.forEach(storageListener -> storageListener.onStoreOrderUpdate());
}
public boolean refreshChildren(DataStoreEntry e) {

4
app/src/main/java/io/xpipe/app/storage/StorageListener.java
View file

@ -2,6 +2,10 @@ package io.xpipe.app.storage;
public interface StorageListener {
void onStoreOrderUpdate();
void onStoreListUpdate();
void onStoreAdd(DataStoreEntry... entry);
void onStoreRemove(DataStoreEntry... entry);