Added mroe space for warnings on main page, only if there are more th…

…an three warnings for a team
AtlantisSports · Dec 10, 2024 · e24a71c · e24a71c
1 parent 1833d25
commit e24a71c
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 7 deletions.
diff --git a/refbox/src/app/view_builders/main_view.rs b/refbox/src/app/view_builders/main_view.rs
@@ -103,7 +103,10 @@ pub(in super::super) fn build_main_view<'a>(
         }
     };
 
-    center_col = center_col.push(
+    let num_warns_b = snapshot.b_warnings.len();
+    let num_warns_w = snapshot.w_warnings.len();
+
+    center_col = center_col.push(if num_warns_b | num_warns_w < 4 {
         button(
             text(config_string(
                 snapshot,
@@ -119,10 +122,22 @@ pub(in super::super) fn build_main_view<'a>(
         )
         .padding(PADDING)
         .style(ButtonStyle::LightGray)
-        .width(Length::Fill)
         .height(Length::FillPortion(2))
-        .on_press(Message::ShowGameDetails),
-    );
+        .width(Length::Fill)
+        .on_press(Message::ShowGameDetails)
+    } else {
+        button(
+            text(config_string_game_num(snapshot, using_uwhscores, games))
+                .size(SMALL_TEXT)
+                .line_height(LINE_HEIGHT)
+                .vertical_alignment(Vertical::Center)
+                .horizontal_alignment(Horizontal::Left),
+        )
+        .padding(PADDING)
+        .style(ButtonStyle::LightGray)
+        .width(Length::Fill)
+        .on_press(Message::ShowGameDetails)
+    });
 
     if config.track_fouls_and_warnings {
         center_col = center_col.push(
@@ -139,7 +154,7 @@ pub(in super::super) fn build_main_view<'a>(
                                 .b_warnings
                                 .iter()
                                 .rev()
-                                .take(3)
+                                .take(10)
                                 .map(|warning| make_warning_container(
                                     warning,
                                     Some(GameColor::Black)
@@ -155,7 +170,7 @@ pub(in super::super) fn build_main_view<'a>(
                                 .w_warnings
                                 .iter()
                                 .rev()
-                                .take(3)
+                                .take(10)
                                 .map(|warning| make_warning_container(
                                     warning,
                                     Some(GameColor::White)
@@ -174,7 +189,7 @@ pub(in super::super) fn build_main_view<'a>(
                 .height(Length::Fill),
             )
             .width(Length::Fill)
-            .height(Length::FillPortion(1))
+            .height(Length::Fill)
             .on_press(Message::NoAction)
             .style(ButtonStyle::LightGray)
             .on_press(Message::ShowWarnings),

diff --git a/refbox/src/app/view_builders/shared_elements.rs b/refbox/src/app/view_builders/shared_elements.rs
@@ -639,6 +639,71 @@ pub(super) fn limit_team_name_len(name: &String, len_limit: usize) -> Cow<'_, St
     }
 }
 
+pub(super) fn config_string_game_num(
+    snapshot: &GameSnapshot,
+    using_uwhscores: bool,
+    games: &Option<BTreeMap<u32, GameInfo>>,
+) -> String {
+    let mut result = String::new();
+    if snapshot.current_period == GamePeriod::BetweenGames {
+        let prev_game;
+        let next_game;
+        if using_uwhscores {
+            if let Some(games) = games {
+                prev_game = match games.get(&snapshot.game_number) {
+                    Some(game) => game_string_short(game),
+                    None if snapshot.game_number == 0 => "None".to_string(),
+                    None => format!("Error ({})", snapshot.game_number),
+                };
+                next_game = match games.get(&snapshot.next_game_number) {
+                    Some(game) => game_string_short(game),
+                    None => format!("Error ({})", snapshot.next_game_number),
+                };
+            } else {
+                prev_game = if snapshot.game_number == 0 {
+                    "None".to_string()
+                } else {
+                    format!("Error ({})", snapshot.game_number)
+                };
+                next_game = format!("Error ({})", snapshot.next_game_number);
+            }
+        } else {
+            prev_game = if snapshot.game_number == 0 {
+                "None".to_string()
+            } else {
+                snapshot.game_number.to_string()
+            };
+            next_game = snapshot.next_game_number.to_string();
+        }
+
+        write!(
+            &mut result,
+            "Last Game: {},  Next Game: {}\n\n",
+            prev_game, next_game
+        )
+        .unwrap();
+        snapshot.next_game_number
+    } else {
+        let game;
+        if using_uwhscores {
+            if let Some(games) = games {
+                game = match games.get(&snapshot.game_number) {
+                    Some(game) => game_string_short(game),
+                    None => format!("Error ({})", snapshot.game_number),
+                };
+            } else {
+                game = format!("Error ({})", snapshot.game_number);
+            }
+        } else {
+            game = snapshot.game_number.to_string();
+        }
+        write!(&mut result, "Game: {}\n\n", game).unwrap();
+        snapshot.game_number
+    };
+
+    result
+}
+
 pub(super) fn config_string(
     snapshot: &GameSnapshot,
     config: &GameConfig,