Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
use anyhow::Result;
|
||||
use warpui::{AppContext, SingletonEntity};
|
||||
use galaxyui::{AppContext, SingletonEntity};
|
||||
|
||||
use crate::manager::SettingsManager;
|
||||
use crate::{Setting, SupportedPlatforms, SyncToCloud};
|
||||
@@ -36,12 +36,12 @@ define_settings_group!(TestSettings, settings: [
|
||||
pub fn init_and_register_preferences(ctx: &mut AppContext) {
|
||||
ctx.add_singleton_model(move |_| {
|
||||
crate::PublicPreferences::new(Box::<
|
||||
warpui_extras::user_preferences::in_memory::InMemoryPreferences,
|
||||
galaxyui_extras::user_preferences::in_memory::InMemoryPreferences,
|
||||
>::default())
|
||||
});
|
||||
ctx.add_singleton_model(move |_| {
|
||||
crate::PrivatePreferences::new(Box::<
|
||||
warpui_extras::user_preferences::in_memory::InMemoryPreferences,
|
||||
galaxyui_extras::user_preferences::in_memory::InMemoryPreferences,
|
||||
>::default())
|
||||
});
|
||||
}
|
||||
@@ -53,7 +53,7 @@ struct EventListener {
|
||||
}
|
||||
|
||||
impl EventListener {
|
||||
fn new(ctx: &mut warpui::ModelContext<Self>) -> Self {
|
||||
fn new(ctx: &mut galaxyui::ModelContext<Self>) -> Self {
|
||||
let test_settings = TestSettings::handle(ctx);
|
||||
ctx.subscribe_to_model(&test_settings, |me, event, _ctx| {
|
||||
// Update our internal state if we get a change event for
|
||||
@@ -67,7 +67,7 @@ impl EventListener {
|
||||
}
|
||||
}
|
||||
|
||||
impl warpui::Entity for EventListener {
|
||||
impl galaxyui::Entity for EventListener {
|
||||
type Event = ();
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ fn test_can_override_storage_key() {
|
||||
|
||||
#[test]
|
||||
fn test_set_value_raises_changed_event_no_save() {
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
|
||||
@@ -124,7 +124,7 @@ fn test_set_value_raises_changed_event_no_save() {
|
||||
|
||||
#[test]
|
||||
fn test_set_value_raises_changed_event_save() {
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
|
||||
@@ -156,7 +156,7 @@ fn test_set_value_raises_changed_event_save() {
|
||||
|
||||
#[test]
|
||||
fn test_save_and_load_lifecycle() {
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
|
||||
@@ -195,7 +195,7 @@ fn test_save_and_load_lifecycle() {
|
||||
|
||||
#[test]
|
||||
fn test_toggleable_setting() -> Result<()> {
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
|
||||
@@ -254,7 +254,7 @@ fn test_explicit_value_tracking_with_some() {
|
||||
|
||||
#[test]
|
||||
fn test_explicit_value_tracking_after_set_value() {
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
|
||||
@@ -284,7 +284,7 @@ fn test_explicit_value_tracking_after_set_value() {
|
||||
|
||||
#[test]
|
||||
fn test_explicit_value_tracking_after_clear_value() {
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
|
||||
@@ -325,7 +325,7 @@ fn test_explicit_value_tracking_after_clear_value() {
|
||||
|
||||
#[test]
|
||||
fn test_explicit_value_tracking_from_storage() {
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
|
||||
@@ -399,7 +399,7 @@ fn test_private_setting_storage_key_is_explicit_override() {
|
||||
|
||||
#[test]
|
||||
fn test_load_value_updates_value_without_persisting() {
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
TestSettings::register(&mut app);
|
||||
@@ -430,7 +430,7 @@ fn test_load_value_updates_value_without_persisting() {
|
||||
|
||||
#[test]
|
||||
fn test_load_value_emits_event_on_change() {
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
TestSettings::register(&mut app);
|
||||
@@ -461,7 +461,7 @@ fn test_load_value_emits_event_on_change() {
|
||||
|
||||
#[test]
|
||||
fn test_load_value_skips_event_when_unchanged() {
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
TestSettings::register(&mut app);
|
||||
@@ -490,7 +490,7 @@ fn test_load_value_skips_event_when_unchanged() {
|
||||
|
||||
#[test]
|
||||
fn test_load_value_updates_explicitly_set_flag() {
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
TestSettings::register(&mut app);
|
||||
@@ -526,7 +526,7 @@ fn test_load_value_updates_explicitly_set_flag() {
|
||||
|
||||
#[test]
|
||||
fn test_load_value_resets_explicitly_set_flag() {
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
TestSettings::register(&mut app);
|
||||
@@ -569,7 +569,7 @@ fn test_load_value_resets_explicitly_set_flag() {
|
||||
|
||||
#[test]
|
||||
fn test_explicit_value_tracking_cloud_sync() {
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
|
||||
@@ -655,7 +655,7 @@ fn test_settings_file_enabled_flag_round_trip() {
|
||||
#[serial_test::serial]
|
||||
fn test_public_setting_writes_to_public_prefs_when_flag_enabled() {
|
||||
crate::set_settings_file_enabled(true);
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
TestSettings::register(&mut app);
|
||||
@@ -693,7 +693,7 @@ fn test_public_setting_writes_to_public_prefs_when_flag_enabled() {
|
||||
#[serial_test::serial]
|
||||
fn test_private_setting_writes_to_private_prefs_when_flag_enabled() {
|
||||
crate::set_settings_file_enabled(true);
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
TestSettings::register(&mut app);
|
||||
@@ -740,7 +740,7 @@ fn test_private_setting_writes_to_private_prefs_when_flag_enabled() {
|
||||
#[serial_test::serial]
|
||||
fn test_new_from_storage_reads_from_correct_backend_when_flag_enabled() {
|
||||
crate::set_settings_file_enabled(true);
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
TestSettings::register(&mut app);
|
||||
@@ -778,7 +778,7 @@ fn test_new_from_storage_reads_from_correct_backend_when_flag_enabled() {
|
||||
#[serial_test::serial]
|
||||
fn test_clear_value_clears_from_correct_backend() {
|
||||
crate::set_settings_file_enabled(true);
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
TestSettings::register(&mut app);
|
||||
@@ -834,7 +834,7 @@ fn test_clear_value_clears_from_correct_backend() {
|
||||
#[serial_test::serial]
|
||||
fn test_public_setting_uses_private_prefs_when_flag_disabled() {
|
||||
crate::set_settings_file_enabled(false);
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
TestSettings::register(&mut app);
|
||||
@@ -875,7 +875,7 @@ fn test_public_setting_uses_private_prefs_when_flag_disabled() {
|
||||
#[serial_test::serial]
|
||||
fn test_private_setting_uses_private_prefs_when_flag_disabled() {
|
||||
crate::set_settings_file_enabled(false);
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
TestSettings::register(&mut app);
|
||||
@@ -909,7 +909,7 @@ fn test_private_setting_uses_private_prefs_when_flag_disabled() {
|
||||
#[serial_test::serial]
|
||||
fn test_new_from_storage_reads_from_private_backend_when_flag_disabled() {
|
||||
crate::set_settings_file_enabled(false);
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
TestSettings::register(&mut app);
|
||||
@@ -950,7 +950,7 @@ fn test_new_from_storage_reads_from_private_backend_when_flag_disabled() {
|
||||
|
||||
#[test]
|
||||
fn test_manager_is_private_for_storage_key() {
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
TestSettings::register(&mut app);
|
||||
@@ -975,7 +975,7 @@ fn test_manager_is_private_for_storage_key() {
|
||||
|
||||
#[test]
|
||||
fn test_manager_default_values_for_settings_file_excludes_private() {
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
TestSettings::register(&mut app);
|
||||
@@ -1006,7 +1006,7 @@ fn test_manager_default_values_for_settings_file_excludes_private() {
|
||||
#[serial_test::serial]
|
||||
fn test_manager_read_local_setting_value_routes_when_flag_enabled() {
|
||||
crate::set_settings_file_enabled(true);
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
TestSettings::register(&mut app);
|
||||
@@ -1054,7 +1054,7 @@ fn test_manager_read_local_setting_value_routes_when_flag_enabled() {
|
||||
#[serial_test::serial]
|
||||
fn test_manager_read_local_setting_value_falls_back_when_flag_disabled() {
|
||||
crate::set_settings_file_enabled(false);
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
TestSettings::register(&mut app);
|
||||
@@ -1104,13 +1104,13 @@ fn test_manager_read_local_setting_value_falls_back_when_flag_disabled() {
|
||||
#[test]
|
||||
#[serial_test::serial]
|
||||
fn test_manager_read_local_setting_value_respects_hierarchy_with_settings_file() {
|
||||
use warpui_extras::user_preferences::toml_backed::TomlBackedUserPreferences;
|
||||
use galaxyui_extras::user_preferences::toml_backed::TomlBackedUserPreferences;
|
||||
|
||||
crate::set_settings_file_enabled(true);
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let file_path = dir.path().join("settings.toml");
|
||||
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
// Use the TOML-backed store for public preferences so the hierarchy
|
||||
// routing actually matters; in-memory preferences ignore hierarchy
|
||||
// entirely and would hide this bug.
|
||||
@@ -1121,7 +1121,7 @@ fn test_manager_read_local_setting_value_respects_hierarchy_with_settings_file()
|
||||
});
|
||||
app.add_singleton_model(|_| {
|
||||
crate::PrivatePreferences::new(Box::<
|
||||
warpui_extras::user_preferences::in_memory::InMemoryPreferences,
|
||||
galaxyui_extras::user_preferences::in_memory::InMemoryPreferences,
|
||||
>::default())
|
||||
});
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
|
||||
Reference in New Issue
Block a user