Use is_valid for Id

This commit is contained in:
2026-08-18 17:31:19 +03:00
parent 3cd7c12baa
commit d3c28179b6
10 changed files with 36 additions and 32 deletions
+5 -6
View File
@@ -1,7 +1,7 @@
use crate::data_provider::card_sets::update_deck;
use crate::data_provider::card_stats::{add_stat_list, load_stats_of_deck};
use crate::history::HistoryState;
use crate::lang::{AppendMode, CardStatistics, DeckSettings, INVALID_ID, Id, OrderMode};
use crate::lang::{AppendMode, CardStatistics, DeckSettings, Id, OrderMode};
use crate::navigation::Page::{History, PreviousPage, Repetition, RepetitionSettings};
use crate::navigation::{NavigatedPage, Page};
use crate::repetition::RepetitionState;
@@ -115,7 +115,7 @@ impl NavigatedPage<RepetitionsMessage> for RepetitionsState {
let index = self.selected_deck_index.unwrap();
self.clear_selection();
let deck = self.decks.remove(index);
if deck.id != INVALID_ID {
if deck.id.is_valid() {
let mut state = self.state.lock().unwrap();
state.decks.remove(index);
self.decks = self
@@ -292,7 +292,7 @@ impl RepetitionsState {
impl RepetitionsState {
fn launch_delete_button(&self, deck: &DeckViewData) -> Element<'_, RepetitionsMessage> {
if deck.id != INVALID_ID {
if deck.id.is_valid() {
if deck.append_mode == AppendMode::Manual
&& deck.existing_words_indices.as_ref().unwrap().is_empty()
{
@@ -325,7 +325,7 @@ impl RepetitionsState {
]
.spacing(QUARTER_SPACING),
{
if deck.id == INVALID_ID {
if !deck.id.is_valid() {
column![
column![
text!("Передняя сторона"),
@@ -548,8 +548,7 @@ impl RepetitionsState {
} else {
None
},
text_color:
_x.palette().primary,
text_color: _x.palette().primary,
border: Border {
color: Default::default(),
width: 0.0,