Skip to content

Commit 9c73ece

Browse files
authored
Fix some nullable warnings (#4757)
1 parent 46def5a commit 9c73ece

4 files changed

Lines changed: 21 additions & 7 deletions

File tree

src/UniGetUI.Avalonia/Models/PackageCollections.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,8 @@ public IEnumerable<PackageWrapper> ApplyToList(IEnumerable<PackageWrapper> items
327327
Sorter.Checked => w.IsChecked ? "0" : "1",
328328
Sorter.Name => w.Package.Name,
329329
Sorter.Id => w.Package.Id,
330-
Sorter.Version => w.Package.NormalizedVersion.ToString(),
331-
Sorter.NewVersion => w.Package.NormalizedNewVersion.ToString(),
330+
Sorter.Version => w.Package.NormalizedVersion.ToString() ?? string.Empty,
331+
Sorter.NewVersion => w.Package.NormalizedNewVersion.ToString() ?? string.Empty,
332332
Sorter.Source => w.Package.Source.AsString_DisplayName,
333333
_ => w.Package.Name,
334334
};

src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ public CheckboxButtonCard()
9494
StateChanged?.Invoke(this, EventArgs.Empty);
9595
Button.IsEnabled = (_checkbox.IsChecked ?? false) ? true : _buttonAlwaysOn;
9696
_textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
97-
AccessibilityAnnouncementService.AnnounceToggle(_textblock.Text, _checkbox.IsChecked ?? false);
97+
if (_textblock.Text is not null)
98+
{
99+
AccessibilityAnnouncementService.AnnounceToggle(_textblock.Text, _checkbox.IsChecked ?? false);
100+
}
98101
};
99102
Button.Click += (s, e) => Click?.Invoke(s, e);
100103
ApplyAutomationMetadata(_checkbox, _textblock.Text);

src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,10 @@ protected virtual void _checkbox_Toggled(object? sender, RoutedEventArgs e)
118118
StateChanged?.Invoke(this, EventArgs.Empty);
119119
_textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
120120
SyncToggleItemStatus();
121-
AccessibilityAnnouncementService.AnnounceToggle(_textblock.Text, _checkbox.IsChecked ?? false);
121+
if (_textblock.Text is not null)
122+
{
123+
AccessibilityAnnouncementService.AnnounceToggle(_textblock.Text, _checkbox.IsChecked ?? false);
124+
}
122125
var cmd = StateChangedCommand;
123126
if (cmd?.CanExecute(null) == true)
124127
cmd.Execute(null);
@@ -133,9 +136,11 @@ protected void SyncToggleItemStatus()
133136
AutomationProperties.SetItemStatus(_checkbox, state);
134137
// Name with state suffix: guarantees VoiceOver announces state on macOS
135138
// where ToggleSwitch AX role may not expose IsChecked natively
136-
string baseName = _textblock.Text;
139+
string? baseName = _textblock.Text;
137140
if (!string.IsNullOrEmpty(baseName))
141+
{
138142
AutomationProperties.SetName(_checkbox, $"{baseName}, {state}");
143+
}
139144
}
140145
}
141146

@@ -197,6 +202,9 @@ protected override void _checkbox_Toggled(object? sender, RoutedEventArgs e)
197202
StateChanged?.Invoke(this, EventArgs.Empty);
198203
_textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
199204
SyncToggleItemStatus();
200-
AccessibilityAnnouncementService.AnnounceToggle(_textblock.Text, _checkbox.IsChecked ?? false);
205+
if (_textblock.Text is not null)
206+
{
207+
AccessibilityAnnouncementService.AnnounceToggle(_textblock.Text, _checkbox.IsChecked ?? false);
208+
}
201209
}
202210
}

src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,10 @@ await SecureSettings.TrySet(
150150
cmd.Execute(null);
151151
_textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
152152
_checkbox.IsChecked = SecureSettings.Get(setting_name) ^ IS_INVERTED ^ ForceInversion;
153-
AccessibilityAnnouncementService.AnnounceToggle(_textblock.Text, _checkbox.IsChecked ?? false);
153+
if (_textblock.Text is not null)
154+
{
155+
AccessibilityAnnouncementService.AnnounceToggle(_textblock.Text, _checkbox.IsChecked ?? false);
156+
}
154157
_loading.IsVisible = false;
155158
_checkbox.IsEnabled = true;
156159
}

0 commit comments

Comments
 (0)