Убрать ползунки из онлайн-настроек
This commit is contained in:
@@ -478,27 +478,11 @@ static void onlineSettings(lv_event_t *) {
|
|||||||
gScreen=Screen::Settings;clearUi();legend();topBar("SETTINGS");
|
gScreen=Screen::Settings;clearUi();legend();topBar("SETTINGS");
|
||||||
if(gPaused){gPausedBanner=label(gRoot,"PAUSED",&lv_font_montserrat_20,0xFFD34D);
|
if(gPaused){gPausedBanner=label(gRoot,"PAUSED",&lv_font_montserrat_20,0xFFD34D);
|
||||||
lv_obj_align(gPausedBanner,LV_ALIGN_TOP_MID,0,32);}
|
lv_obj_align(gPausedBanner,LV_ALIGN_TOP_MID,0,32);}
|
||||||
lv_obj_t *list=lv_obj_create(gRoot);lv_obj_set_pos(list,20,91);lv_obj_set_size(list,440,280);
|
button(gRoot,"Wi-Fi",24,125,208,55,0x214D69,[](lv_event_t *){if(!gWifiEnabled)wifiEnable(true);wifiScreen(nullptr);});
|
||||||
card(list,0x10202D);lv_obj_set_style_pad_all(list,10,0);lv_obj_set_flex_flow(list,LV_FLEX_FLOW_COLUMN);
|
button(gRoot,"TIME",248,125,208,55,0x214D69,[](lv_event_t *){timeScreen(nullptr);});
|
||||||
lv_obj_set_style_pad_row(list,9,0);
|
button(gRoot,"ACCOUNT",24,205,208,55,0x214D69,[](lv_event_t *){accountScreen(nullptr);});
|
||||||
struct Item{const char *name;uint8_t *v;uint8_t max;};
|
button(gRoot,"FIRMWARE",248,205,208,55,0x214D69,[](lv_event_t *){firmwareScreen(nullptr);});
|
||||||
Item items[]={{"Breath limit",&gLimit,4},{"Cycle tick",&gTick,10},{"Alert volume",&gAlert,10},{"Screen timeout",&gScreenTimeout,3}};
|
button(gRoot,"BACK",140,375,200,52,0x214D69,[](lv_event_t *){settings(nullptr);});
|
||||||
for(auto &it:items){lv_obj_t *row=lv_obj_create(list);lv_obj_set_size(row,400,67);card(row,0x172C3C);
|
|
||||||
lv_obj_t *n=label(row,it.name,&lv_font_montserrat_16,0xFFFFFF);lv_obj_set_pos(n,12,6);
|
|
||||||
lv_obj_t *sl=lv_slider_create(row);lv_obj_set_pos(sl,12,36);lv_obj_set_size(sl,376,16);
|
|
||||||
lv_slider_set_range(sl,0,it.max);lv_slider_set_value(sl,*it.v,LV_ANIM_OFF);
|
|
||||||
lv_obj_add_event_cb(sl,settingChanged,LV_EVENT_VALUE_CHANGED,it.v);
|
|
||||||
if(it.v==&gLimit)lv_obj_add_event_cb(sl,settingReleased,LV_EVENT_RELEASED,it.v);
|
|
||||||
}
|
|
||||||
button(gRoot,"Wi-Fi",24,383,100,42,0x214D69,[](lv_event_t *){if(!gWifiEnabled)wifiEnable(true);wifiScreen(nullptr);});
|
|
||||||
button(gRoot,"TIME",132,383,100,42,0x214D69,[](lv_event_t *){timeScreen(nullptr);});
|
|
||||||
lv_obj_t *rot=lv_checkbox_create(gRoot);lv_checkbox_set_text(rot,"ROTATION CONTROL");lv_obj_set_pos(rot,32,437);
|
|
||||||
if(gRotation)lv_obj_add_state(rot,LV_STATE_CHECKED);
|
|
||||||
lv_obj_add_event_cb(rot,[](lv_event_t *e){gRotation=lv_obj_has_state(lv_event_get_target(e),LV_STATE_CHECKED);gRotationArmed=false;gOrientation=-1;gScreenEdgeOrientation=-1;gScreenEdgeCandidate=-1;saveSettings();appendEvent(10,UINT64_MAX,0,0,0,0,gRotation);},LV_EVENT_VALUE_CHANGED,nullptr);
|
|
||||||
button(gRoot,"ONLINE",240,383,100,42,0x214D69,[](lv_event_t *){onlineScreen(nullptr);});
|
|
||||||
button(gRoot,"ACCOUNT",348,383,108,42,0x214D69,[](lv_event_t *){accountScreen(nullptr);});
|
|
||||||
button(gRoot,"FIRMWARE",24,431,120,40,0x214D69,[](lv_event_t *){firmwareScreen(nullptr);});
|
|
||||||
button(gRoot,"BACK",320,431,136,40,0x214D69,[](lv_event_t *){if(gPaused)togglePause();enterMonitor(nullptr);});
|
|
||||||
}
|
}
|
||||||
// PMU power key can blank the AMOLED independently of our timeout flag.
|
// PMU power key can blank the AMOLED independently of our timeout flag.
|
||||||
// Explicitly wake the panel for any accepted KEY1 action.
|
// Explicitly wake the panel for any accepted KEY1 action.
|
||||||
|
|||||||
Reference in New Issue
Block a user