@@ -114,42 +114,43 @@ bool IsThor(PlanetInfo e) => e.ID.Equals(PlanetId.Thor) ||
114
114
private void OnClickCell ( (
115
115
SelectPlanetCell cell ,
116
116
SelectPlanetCell . ViewModel viewModel ) tuple )
117
+ {
118
+ OnClickSelectedPlanetSubject . OnNext ( this ) ;
119
+ }
120
+
121
+ private void OnClickDisableCell ( (
122
+ SelectPlanetCell cell ,
123
+ SelectPlanetCell . ViewModel viewModel ) tuple )
117
124
{
118
125
var ( _, viewModel ) = tuple ;
119
- if ( viewModel . IsSelected )
126
+ if ( viewModel == null || viewModel . HasError )
120
127
{
121
- OnClickSelectedPlanetSubject . OnNext ( this ) ;
122
- return ;
128
+ Widget . Find < OneButtonSystem > ( ) . Show ( L10nManager . Localize ( "ERROR_UNABLE_CONNECT_PLANET" ) ,
129
+ L10nManager . Localize ( "UI_YES" ) ,
130
+ null ) ;
123
131
}
124
-
125
- var selectedPlanetId = viewModel . PlanetId ;
126
- var newItemsSource = ItemsSource . Select ( e =>
132
+ else
127
133
{
128
- if ( e . IsSelected )
129
- {
130
- e . IsSelected = false ;
131
- return e ;
132
- }
133
-
134
- if ( e . PlanetId . Equals ( selectedPlanetId ) )
134
+ var selectedPlanetId = viewModel . PlanetId ;
135
+ var newItemsSource = ItemsSource . Select ( e =>
135
136
{
136
- e . IsSelected = true ;
137
- return e ;
138
- }
137
+ if ( e . IsSelected )
138
+ {
139
+ e . IsSelected = false ;
140
+ return e ;
141
+ }
139
142
140
- return e ;
141
- } ) . ToArray ( ) ;
142
- UpdateContents ( newItemsSource ) ;
143
- OnChangeSelectedPlanetSubject . OnNext ( ( this , tuple . viewModel . PlanetId ) ) ;
144
- }
143
+ if ( e . PlanetId . Equals ( selectedPlanetId ) )
144
+ {
145
+ e . IsSelected = true ;
146
+ return e ;
147
+ }
145
148
146
- private void OnClickDisableCell ( (
147
- SelectPlanetCell cell ,
148
- SelectPlanetCell . ViewModel viewModel ) tuple )
149
- {
150
- Widget . Find < OneButtonSystem > ( ) . Show ( L10nManager . Localize ( "ERROR_UNABLE_CONNECT_PLANET" ) ,
151
- L10nManager . Localize ( "UI_YES" ) ,
152
- null ) ;
149
+ return e ;
150
+ } ) . ToArray ( ) ;
151
+ UpdateContents ( newItemsSource ) ;
152
+ OnChangeSelectedPlanetSubject . OnNext ( ( this , tuple . viewModel . PlanetId ) ) ;
153
+ }
153
154
}
154
155
}
155
156
}
0 commit comments