summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Heyer <mail@maxheyer.com>2020-07-09 14:24:25 +0200
committerGitHub <noreply@github.com>2020-07-09 14:24:25 +0200
commitadbae50d195cfb0a9f0081608a979e5c2b4fb1a2 (patch)
tree83b5e0790563cd74af974bc7d48074a5163db4c3
parentcceb2a2db7df9dd7b3c7b2c876f7547cf96e83f0 (diff)
fix(controls): change delete key to backspace (#64)
* Change delete key to backspace * Add BACKSPACE as delete key within snap tests * Readd delete key for warning modal * Change key for warning modal to Backspace
-rw-r--r--src/input/controls.rs14
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__cannot_move_into_small_files.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__clear_selection_when_moving_off_screen_edges.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file_press_n.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder_small_window.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder_with_multiple_children.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__eleven_files.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__empty_folder.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder_medium_width.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder_small_width.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_largest_folder_with_no_selected_tile.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__esc_to_go_up.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__files_with_size_zero.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__medium_width.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__minimum_tile_sides.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_down_and_enter_folder.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_left_and_enter_folder.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_right_and_enter_folder.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__move_up_and_enter_folder.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__noop_when_entering_file.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__noop_when_moving_off_screen_edges.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__noop_when_pressing_esc_at_base_folder.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__permission_denied_when_deleting.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__pressing_delete_with_no_selected_tile.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__small_files.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__small_files_non_square.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__small_files_with_x_as_zero.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__small_files_with_y_as_zero.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__small_width.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__small_width_long_folder_name.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__two_large_files_one_small_file.snap2
-rw-r--r--src/tests/cases/snapshots/diskonaut__tests__cases__ui__zoom_into_small_files.snap2
-rw-r--r--src/tests/cases/ui.rs16
-rw-r--r--src/ui/bottom_line.rs4
37 files changed, 51 insertions, 51 deletions
diff --git a/src/input/controls.rs b/src/input/controls.rs
index 4adaca9..ed183ce 100644
--- a/src/input/controls.rs
+++ b/src/input/controls.rs
@@ -61,10 +61,10 @@ pub fn handle_keypress_loading_mode<B: Backend>(evt: Event, app: &mut App<B>) {
key!(char '\n') => {
app.handle_enter();
}
- key!(Delete) => {
+ key!(Backspace) => {
app.show_warning_modal();
}
- key!(Esc) | key!(Backspace) => {
+ key!(Esc) => {
app.go_up();
}
_ => (),
@@ -76,7 +76,7 @@ pub fn handle_keypress_normal_mode<B: Backend>(evt: Event, app: &mut App<B>) {
key!(ctrl 'c') | key!(char 'q') => {
app.prompt_exit();
}
- key!(Delete) => {
+ key!(Backspace) => {
app.prompt_file_deletion();
}
key!(char 'l') | key!(Right) | key!(ctrl 'f') => {
@@ -103,7 +103,7 @@ pub fn handle_keypress_normal_mode<B: Backend>(evt: Event, app: &mut App<B>) {
key!(char '\n') => {
app.handle_enter();
}
- key!(Esc) | key!(Backspace) => {
+ key!(Esc) => {
app.go_up();
}
_ => (),
@@ -116,7 +116,7 @@ pub fn handle_keypress_delete_file_mode<B: Backend>(
file_to_delete: FileToDelete,
) {
match evt {
- key!(ctrl 'c') | key!(char 'q') | key!(Esc) | key!(Backspace) | key!(char 'n') => {
+ key!(ctrl 'c') | key!(char 'q') | key!(Esc) | key!(char 'n') => {
app.normal_mode();
}
key!(char 'y') => {
@@ -128,7 +128,7 @@ pub fn handle_keypress_delete_file_mode<B: Backend>(
pub fn handle_keypress_error_message<B: Backend>(evt: Event, app: &mut App<B>) {
match evt {
- key!(ctrl 'c') | key!(char 'q') | key!(Esc) | key!(Backspace) => {
+ key!(ctrl 'c') | key!(char 'q') | key!(Esc) => {
app.normal_mode();
}
_ => (),
@@ -146,7 +146,7 @@ pub fn handle_keypress_screen_too_small<B: Backend>(evt: Event, app: &mut App<B>
pub fn handle_keypress_exiting_mode<B: Backend>(evt: Event, app: &mut App<B>) {
match evt {
- key!(ctrl 'c') | key!(char 'q') | key!(Esc) | key!(Backspace) | key!(char 'n') => {
+ key!(ctrl 'c') | key!(char 'q') | key!(Esc) | key!(char 'n') => {
app.reset_ui_mode();
// we have to manually call render here to make sure ui gets updated
// because reset_ui_mode does not call it itself
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__cannot_move_into_small_files.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__cannot_move_into_small_files.snap
index 1e4b6fe..85e5131 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__cannot_move_into_small_files.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__cannot_move_into_small_files.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx│
└──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────────────────────────┘
(x = Small files)
- <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
+ <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__clear_selection_when_moving_off_screen_edges.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__clear_selection_when_moving_off_screen_edges.snap
index f5f0d6a..ee4ed28 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__clear_selection_when_moving_off_screen_edges.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__clear_selection_when_moving_off_screen_edges.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘
(x = Small files)
- <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
+ <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file.snap
index 3f86673..a866a43 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘
(x = Small files)
- <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
+ <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file_press_n.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file_press_n.snap
index 901267c..826fed0 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file_press_n.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_file_press_n.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘
(x = Small files)
- <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
+ <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder.snap
index dade986..b93f282 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘
(x = Small files)
- <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
+ <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder_small_window.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder_small_window.snap
index 18d3c22..a4bb828 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder_small_window.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder_small_window.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │
└──────────────────────────────────────────────────────────┘
(x = Small files)
- ←↓↑→/<ENTER>/<ESC>: navigate, <DELETE>: del
+ ←↓↑→/<ENTER>/<ESC>: navigate, <BACKSPACE>: del
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder_with_multiple_children.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder_with_multiple_children.snap
index 7ee834d..78627e0 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder_with_multiple_children.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__delete_folder_with_multiple_children.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────┘
(x = Small files)
- <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
+ <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__eleven_files.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__eleven_files.snap
index 5bcf46e..780b77f 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__eleven_files.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__eleven_files.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │ 8.0K (2%) │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────┴───────────────────────────────────┘
(x = Small files)
- <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
+ <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__empty_folder.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__empty_folder.snap
index e561220..ec97ce5 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__empty_folder.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__empty_folder.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████│
└────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
(x = Small files)
- <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
+ <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder.snap
index 2de6006..d6b31a4 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────┘
(x = Small files)
- <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
+ <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder_medium_width.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder_medium_width.snap
index ba9b1c9..33d6acd 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder_medium_width.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder_medium_width.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │
└────────────────────────────────────────────────────────────────────────────────────────┘
(x = Small files)
- ←↓↑→/<ENTER>/<ESC>: navigate, <DELETE>: del
+ ←↓↑→/<ENTER>/<ESC>: navigate, <BACKSPACE>: del
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder_small_width.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder_small_width.snap
index d0f457b..66ec93d 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder_small_width.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_folder_small_width.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │
└──────────────────────────────────────────────────────────┘
(x = Small files)
- ←↓↑→/<ENTER>/<ESC>: navigate, <DELETE>: del
+ ←↓↑→/<ENTER>/<ESC>: navigate, <BACKSPACE>: del
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_largest_folder_with_no_selected_tile.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_largest_folder_with_no_selected_tile.snap
index deafd8c..886027f 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_largest_folder_with_no_selected_tile.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__enter_largest_folder_with_no_selected_tile.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────┘
(x = Small files)
- <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
+ <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__esc_to_go_up.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__esc_to_go_up.snap
index 79bae57..c347f21 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__esc_to_go_up.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__esc_to_go_up.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘
(x = Small files)
- <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
+ <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__files_with_size_zero.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__files_with_size_zero.snap
index b2723a9..ceea433 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__files_with_size_zero.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__files_with_size_zero.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┘
(x = Small files)
- <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <DELETE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
+ <arrows> - move around, <ENTER> - enter folder, <ESC> - parent folder, <BACKSPACE> - delete, <+/-/0> - zoom in/out/reset, <q> - quit
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__medium_width.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__medium_width.snap
index ed15e24..27809b9 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__medium_width.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__medium_width.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │
└──────────────────────────────────────────────────────────┘
(x = Small files)
- ←↓↑→/<ENTER>/<ESC>: navigate, <DELETE>: del
+ ←↓↑→/<ENTER>/<ESC>: navigate, <BACKSPACE>: del
diff --git a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__minimum_tile_sides.snap b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__minimum_tile_sides.snap
index 0708c0a..5164ac0 100644
--- a/src/tests/cases/snapshots/diskonaut__tests__cases__ui__minimum_tile_sides.snap
+++ b/src/tests/cases/snapshots/diskonaut__tests__cases__ui__minimum_tile_sides.snap
@@ -51,5 +51,5 @@ expression: "&terminal_draw_events_mirror[0]"
│ │ │ 4.0K │ 4.0K │ 4.0K │xxxxxxxxxxxxxxxx│
└───────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────┴─────────┴────────┴─────────┴────────────────┘