    const int network_x = !s->scene.uilayout_sidebarcollapsed ? 50 : -(sbr_w);
    const int network_y = 273;
    const int network_w = 100;
    const int network_h = 100;
    const char *network_type = network_type_map[s->scene.networkType];
    nvgFillColor(s->vg, COLOR_WHITE);
    nvgFontSize(s->vg, 48);
    nvgFontFaceId(s->vg, s->font_sans_regular);
    nvgTextAlign(s->vg, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE);
    nvgTextBox(s->vg, network_x, network_y, network_w, network_type ? network_type : "--", NULL);
 
</s> remove   const int img_idx = s->scene.networkType == cereal::ThermalData::NetworkType::NONE ? 0 : network_strength_map[s->scene.networkStrength];
 </s> add   const int img_idx = s->scene.thermal.getNetworkType() == cereal::ThermalData::NetworkType::NONE ? 0 : network_strength_map[s->scene.thermal.getNetworkStrength()]; </s> remove   int battery_img = s->scene.batteryCharging ? s->img_battery_charging : s->img_battery;
 </s> add   int battery_img = s->scene.thermal.getBatteryStatus() == "Charging" ? s->img_battery_charging : s->img_battery; </s> remove   const int face_x = (valid_frame_x + face_size + (bdr_s * 2)) + (scene->is_rhd ? valid_frame_w - box_h / 2:0);
  const int face_y = (box_y + box_h - face_size - bdr_s - (bdr_s * 1.5));
  ui_draw_circle_image(s->vg, face_x, face_y, face_size, s->img_face, scene->face_prob > 0.4);
 </s> add   const int x = (valid_frame_x + face_size + (bdr_s * 2)) + (scene->is_rhd ? valid_frame_w - box_h / 2:0);
  const int y = (box_y + box_h - face_size - bdr_s - (bdr_s * 1.5));
  ui_draw_circle_image(s->vg, x, y, face_size, s->img_face, scene->driver_state.getFaceProb() > 0.4); </s> remove   s->model_changed = false;
  s->livempc_or_radarstate_changed = false;

 </s> add  </s> remove   } else {
    ;
 </s> add 
  const char *network_type = network_type_map[s->scene.thermal.getNetworkType()];
    const int network_x = !s->scene.uilayout_sidebarcollapsed ? 50 : -(sbr_w);
    const int network_y = 273;
    const int network_w = 100;
    const int network_h = 100;
  const char *network_type = network_type_map[s->scene.thermal.getNetworkType()];
    nvgFillColor(s->vg, COLOR_WHITE);
    nvgFontSize(s->vg, 48);
    nvgFontFaceId(s->vg, s->font_sans_regular);
    nvgTextAlign(s->vg, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE);
    nvgTextBox(s->vg, network_x, network_y, network_w, network_type ? network_type : "--", NULL);
keep keep keep keep replace keep keep keep keep keep
 ui.cc: remove variables from UIScene, use event::Reader to get data  (#1585)

* use struct to store lead status

* remove white space

* use RadarState::LeadData::Reader

* use reader to get thermal data

* use reader

* continue

* remove variables

reset submodules,fix some errors

reset submodules

revert

* remove s->scene.gps_planner_active

* modify

* cleanup

* done

* resolve conflict

* remove irrelevant comment

* remove white space 
selfdrive/ui/sidebar.cc