Skip to content

Commit 6c0503e

Browse files
committed
app: refactor some blocks to separate variables
1 parent 73e1dc5 commit 6c0503e

File tree

1 file changed

+28
-23
lines changed

1 file changed

+28
-23
lines changed

crates/companion-app/src/main.rs

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -374,34 +374,39 @@ fn view(state: &State) -> Element<'_, Message> {
374374
empty_block()
375375
};
376376

377+
let top_block = column![
378+
row![
379+
text("Game installation found! Type: ").size(20),
380+
text(install_dir.0.to_string()).size(20),
381+
],
382+
text("Select profile and press \"Register\"").size(20),
383+
// todo: show something when no profiles found
384+
text("Found profiles:").size(20),
385+
];
386+
let bottom_block = row![
387+
button("Register").on_press_maybe(
388+
if state.server_ok
389+
&& !state.need_reset_config
390+
&& let Some(ref p) = state.selected_profile
391+
&& config.find_profile(p).is_none()
392+
{
393+
Some(Message::RegisterOnServer)
394+
} else {
395+
None
396+
}
397+
),
398+
config_reset_button,
399+
copied_block,
400+
]
401+
.spacing(10);
402+
377403
container(
378404
column![
379-
row![
380-
text("Game installation found! Type: ").size(20),
381-
text(install_dir.0.to_string()).size(20),
382-
],
383-
text("Select profile and press \"Register\"").size(20),
384-
// todo: show something when no profiles found
385-
text("Found profiles:").size(20),
405+
top_block,
386406
Column::from_iter(profiles),
387407
// using separate nested column to prevent spacing between empty elements
388408
column![server_ok_block, app_update_block, config_reset_block],
389-
row![
390-
button("Register").on_press_maybe(
391-
if state.server_ok
392-
&& !state.need_reset_config
393-
&& let Some(ref p) = state.selected_profile
394-
&& config.find_profile(p).is_none()
395-
{
396-
Some(Message::RegisterOnServer)
397-
} else {
398-
None
399-
}
400-
),
401-
config_reset_button,
402-
copied_block,
403-
]
404-
.spacing(10),
409+
bottom_block,
405410
]
406411
.spacing(10),
407412
)

0 commit comments

Comments
 (0)