Skip to content

Commit a32a020

Browse files
ThomasFarstrikeThomasFarstrike
committed
Replace 'magic' value 0 with semantic lv.PART.MAIN
1 parent 81f17dd commit a32a020

File tree

24 files changed

+147
-154
lines changed

24 files changed

+147
-154
lines changed

‎internal_filesystem/apps/com.micropythonos.connect4/assets/connect4.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ def onCreate(self):
105105
(self.SCREEN_WIDTH - self.COLS * self.CELL_SIZE) // 2 - 5,
106106
self.BOARD_TOP - 5
107107
)
108-
board_bg.set_style_bg_color(lv.color_hex(self.COLOR_BOARD), 0)
109-
board_bg.set_style_radius(8, 0)
108+
board_bg.set_style_bg_color(lv.color_hex(self.COLOR_BOARD), lv.PART.MAIN)
109+
board_bg.set_style_radius(8, lv.PART.MAIN)
110110
board_bg.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
111111

112112
# Create pieces (visual representation)
@@ -119,10 +119,10 @@ def onCreate(self):
119119
x = board_x + col * self.CELL_SIZE + (self.CELL_SIZE - self.PIECE_RADIUS * 2) // 2
120120
y = self.BOARD_TOP + row * self.CELL_SIZE + (self.CELL_SIZE - self.PIECE_RADIUS * 2) // 2
121121
piece.set_pos(x, y)
122-
piece.set_style_radius(lv.RADIUS_CIRCLE, 0)
123-
piece.set_style_bg_color(lv.color_hex(self.COLOR_EMPTY), 0)
124-
piece.set_style_border_width(1, 0)
125-
piece.set_style_border_color(lv.color_hex(0x1C2833), 0)
122+
piece.set_style_radius(lv.RADIUS_CIRCLE, lv.PART.MAIN)
123+
piece.set_style_bg_color(lv.color_hex(self.COLOR_EMPTY), lv.PART.MAIN)
124+
piece.set_style_border_width(1, lv.PART.MAIN)
125+
piece.set_style_border_color(lv.color_hex(0x1C2833), lv.PART.MAIN)
126126
piece.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
127127
piece_row.append(piece)
128128
self.pieces.append(piece_row)
@@ -137,8 +137,8 @@ def onCreate(self):
137137
btn.set_size(self.CELL_SIZE, self.ROWS * self.CELL_SIZE)
138138
x = board_x + col * self.CELL_SIZE
139139
btn.set_pos(x, self.BOARD_TOP)
140-
btn.set_style_bg_opa(0, 0) # Transparent
141-
btn.set_style_border_width(0, 0)
140+
btn.set_style_bg_opa(0, lv.PART.MAIN) # Transparent
141+
btn.set_style_border_width(0, lv.PART.MAIN)
142142
btn.add_flag(lv.obj.FLAG.CLICKABLE)
143143
btn.add_event_cb(lambda e, c=col: self.on_column_click(c), lv.EVENT.CLICKED, None)
144144
btn.add_event_cb(lambda e, b=btn: self.focus_column(b), lv.EVENT.FOCUSED, None)
@@ -207,7 +207,7 @@ def animate_drop(self, col):
207207

208208
# Update the visual
209209
color = self.COLOR_PLAYER if player == self.PLAYER else self.COLOR_COMPUTER
210-
self.pieces[row][col].set_style_bg_color(lv.color_hex(color), 0)
210+
self.pieces[row][col].set_style_bg_color(lv.color_hex(color), lv.PART.MAIN)
211211

212212
# Check for win or tie
213213
if self.check_win(row, col):
@@ -456,9 +456,9 @@ def check_direction(self, row, col, dr, dc):
456456
def highlight_winning_pieces(self):
457457
"""Highlight the winning pieces"""
458458
for row, col in self.winning_positions:
459-
self.pieces[row][col].set_style_bg_color(lv.color_hex(self.COLOR_WIN), 0)
460-
self.pieces[row][col].set_style_border_width(3, 0)
461-
self.pieces[row][col].set_style_border_color(lv.color_hex(0xFFFFFF), 0)
459+
self.pieces[row][col].set_style_bg_color(lv.color_hex(self.COLOR_WIN), lv.PART.MAIN)
460+
self.pieces[row][col].set_style_border_width(3, lv.PART.MAIN)
461+
self.pieces[row][col].set_style_border_color(lv.color_hex(0xFFFFFF), lv.PART.MAIN)
462462

463463
def is_board_full(self):
464464
"""Check if the board is full"""
@@ -477,6 +477,6 @@ def new_game(self):
477477
# Reset visual pieces
478478
for row in range(self.ROWS):
479479
for col in range(self.COLS):
480-
self.pieces[row][col].set_style_bg_color(lv.color_hex(self.COLOR_EMPTY), 0)
481-
self.pieces[row][col].set_style_border_width(1, 0)
482-
self.pieces[row][col].set_style_border_color(lv.color_hex(0x1C2833), 0)
480+
self.pieces[row][col].set_style_bg_color(lv.color_hex(self.COLOR_EMPTY), lv.PART.MAIN)
481+
self.pieces[row][col].set_style_border_width(1, lv.PART.MAIN)
482+
self.pieces[row][col].set_style_border_color(lv.color_hex(0x1C2833), lv.PART.MAIN)

‎internal_filesystem/apps/com.micropythonos.doom_launcher/assets/main.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Main(Activity):
2121

2222
def onCreate(self):
2323
screen = lv.obj()
24-
screen.set_style_pad_all(15, 0)
24+
screen.set_style_pad_all(15, lv.PART.MAIN)
2525

2626
# Create title label
2727
title_label = lv.label(screen)
@@ -39,7 +39,7 @@ def onCreate(self):
3939
self.status_label.set_long_mode(lv.label.LONG_MODE.WRAP)
4040
self.status_label.align(lv.ALIGN.BOTTOM_LEFT, 0, 0)
4141
# Set default green color for status label
42-
self.status_label.set_style_text_color(lv.color_hex(0x00FF00), 0)
42+
self.status_label.set_style_text_color(lv.color_hex(0x00FF00), lv.PART.MAIN)
4343

4444
self.setContentView(screen)
4545

‎internal_filesystem/apps/com.micropythonos.draw/assets/draw.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def onCreate(self):
2222
self.hor_res = d.get_horizontal_resolution()
2323
self.ver_res = d.get_vertical_resolution()
2424
self.canvas.set_size(self.hor_res, self.ver_res)
25-
self.canvas.set_style_bg_color(lv.color_white(), 0)
25+
self.canvas.set_style_bg_color(lv.color_white(), lv.PART.MAIN)
2626
buffer = bytearray(self.hor_res * self.ver_res * 4)
2727
self.canvas.set_buffer(buffer, self.hor_res, self.ver_res, lv.COLOR_FORMAT.NATIVE)
2828
self.canvas.fill_bg(lv.color_white(), lv.OPA.COVER)

‎internal_filesystem/apps/com.micropythonos.imageview/assets/imageview.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ def onCreate(self):
3939
self.prev_button.add_event_cb(lambda e: self.show_prev_image(),lv.EVENT.CLICKED,None)
4040
prev_label = lv.label(self.prev_button)
4141
prev_label.set_text(lv.SYMBOL.LEFT)
42-
prev_label.set_style_text_font(lv.font_montserrat_16, 0)
42+
prev_label.set_style_text_font(lv.font_montserrat_16, lv.PART.MAIN)
4343
self.play_button = lv.button(screen)
4444
self.play_button.align(lv.ALIGN.BOTTOM_MID,0,0)
45-
self.play_button.set_style_opa(lv.OPA.TRANSP, 0)
45+
self.play_button.set_style_opa(lv.OPA.TRANSP, lv.PART.MAIN)
4646
#self.play_button.add_flag(lv.obj.FLAG.HIDDEN)
4747
#self.play_button.add_event_cb(lambda e: self.unfocus_if_not_fullscreen(),lv.EVENT.FOCUSED,None)
48-
#self.play_button.set_style_shadow_opa(lv.OPA.TRANSP, 0)
48+
#self.play_button.set_style_shadow_opa(lv.OPA.TRANSP, lv.PART.MAIN)
4949
#self.play_button.add_event_cb(lambda e: self.play(),lv.EVENT.CLICKED,None)
5050
#play_label = lv.label(self.play_button)
5151
#play_label.set_text(lv.SYMBOL.PLAY)
@@ -54,15 +54,15 @@ def onCreate(self):
5454
self.delete_button.add_event_cb(lambda e: self.delete_image(),lv.EVENT.CLICKED,None)
5555
delete_label = lv.label(self.delete_button)
5656
delete_label.set_text(lv.SYMBOL.TRASH)
57-
delete_label.set_style_text_font(lv.font_montserrat_16, 0)
57+
delete_label.set_style_text_font(lv.font_montserrat_16, lv.PART.MAIN)
5858
self.next_button = lv.button(screen)
5959
self.next_button.align(lv.ALIGN.BOTTOM_RIGHT,0,0)
6060
#self.next_button.add_event_cb(self.print_events, lv.EVENT.ALL, None)
6161
self.next_button.add_event_cb(lambda e: self.show_next_image_if_fullscreen(),lv.EVENT.FOCUSED,None)
6262
self.next_button.add_event_cb(lambda e: self.show_next_image(),lv.EVENT.CLICKED,None)
6363
next_label = lv.label(self.next_button)
6464
next_label.set_text(lv.SYMBOL.RIGHT)
65-
next_label.set_style_text_font(lv.font_montserrat_16, 0)
65+
next_label.set_style_text_font(lv.font_montserrat_16, lv.PART.MAIN)
6666
#screen.add_event_cb(self.print_events, lv.EVENT.ALL, None)
6767
self.setContentView(screen)
6868

‎internal_filesystem/apps/com.micropythonos.nostr/assets/fullscreen_qr.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ def onCreate(self):
3232
big_receive_qr.set_dark_color(lv.color_black())
3333
big_receive_qr.set_light_color(lv.color_white())
3434
big_receive_qr.center()
35-
big_receive_qr.set_style_border_color(lv.color_white(), 0)
36-
big_receive_qr.set_style_border_width(0, 0);
35+
big_receive_qr.set_style_border_color(lv.color_white(), lv.PART.MAIN)
36+
big_receive_qr.set_style_border_width(0, lv.PART.MAIN);
3737
print(f"Updating QR code with data: {receive_qr_data[:20]}...")
3838
big_receive_qr.update(receive_qr_data, len(receive_qr_data))
3939
print("QR code updated, setting content view")

‎internal_filesystem/apps/com.micropythonos.nostr/assets/nostr_app.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class NostrApp(Activity):
7171
def onCreate(self):
7272
self.prefs = SharedPreferences("com.micropythonos.nostr")
7373
self.main_screen = lv.obj()
74-
self.main_screen.set_style_pad_all(10, 0)
74+
self.main_screen.set_style_pad_all(10, lv.PART.MAIN)
7575
# Header line
7676
header_line = lv.line(self.main_screen)
7777
header_line.set_points([{'x':0,'y':35},{'x':200,'y':35}],2)
@@ -80,7 +80,7 @@ def onCreate(self):
8080
self.balance_label = lv.label(self.main_screen)
8181
self.balance_label.set_text("")
8282
self.balance_label.align(lv.ALIGN.TOP_LEFT, 0, 0)
83-
self.balance_label.set_style_text_font(lv.font_montserrat_24, 0)
83+
self.balance_label.set_style_text_font(lv.font_montserrat_24, lv.PART.MAIN)
8484
self.balance_label.add_flag(lv.obj.FLAG.CLICKABLE)
8585
self.balance_label.set_width(DisplayMetrics.pct_of_width(100))
8686
# Events label
@@ -97,7 +97,7 @@ def onCreate(self):
9797
settings_button.add_event_cb(self.settings_button_tap,lv.EVENT.CLICKED,None)
9898
settings_label = lv.label(settings_button)
9999
settings_label.set_text(lv.SYMBOL.SETTINGS)
100-
settings_label.set_style_text_font(lv.font_montserrat_24, 0)
100+
settings_label.set_style_text_font(lv.font_montserrat_24, lv.PART.MAIN)
101101
settings_label.center()
102102
self.setContentView(self.main_screen)
103103

@@ -156,7 +156,7 @@ def went_offline(self):
156156
self.events_label.set_text(f"WiFi is not connected, can't talk to relay...")
157157

158158
def update_events_label_font(self):
159-
self.events_label.set_style_text_font(self.events_label_fonts[self.events_label_current_font], 0)
159+
self.events_label.set_style_text_font(self.events_label_fonts[self.events_label_current_font], lv.PART.MAIN)
160160

161161
def events_label_clicked(self, event):
162162
self.events_label_current_font = (self.events_label_current_font + 1) % len(self.events_label_fonts)

‎internal_filesystem/apps/com.micropythonos.showfonts/assets/showfonts.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def addAllFontsTitles(self, screen):
4040
y = 0
4141
for font, name in fonts:
4242
title = lv.label(screen)
43-
title.set_style_text_font(font, 0)
43+
title.set_style_text_font(font, lv.PART.MAIN)
4444
title.set_text(f"{name}: 2357 !@#$%^&*( {lv.SYMBOL.OK} {lv.SYMBOL.BACKSPACE} 丰 😀")
4545
title.set_pos(0, y)
4646
y += font.get_line_height() + 4
@@ -66,7 +66,7 @@ def addAllFonts(self, screen):
6666
x = 0
6767
title = lv.label(screen)
6868
title.set_text(name + ": 2357 !@#$%^&*(")
69-
title.set_style_text_font(lv.font_montserrat_16, 0)
69+
title.set_style_text_font(lv.font_montserrat_16, lv.PART.MAIN)
7070
title.set_pos(x, y)
7171
y += title.get_height() + 20
7272

@@ -75,7 +75,7 @@ def addAllFonts(self, screen):
7575
for cp in range(0x20, 0xFF):
7676
if font.get_glyph_dsc(font, dsc, cp, cp+1):
7777
lbl = lv.label(screen)
78-
lbl.set_style_text_font(font, 0)
78+
lbl.set_style_text_font(font, lv.PART.MAIN)
7979
lbl.set_text(chr(cp))
8080
lbl.set_pos(x, y)
8181

@@ -106,7 +106,7 @@ def addAllGlyphs(self, screen, start_y):
106106
for font, name in fonts:
107107
title = lv.label(screen)
108108
title.set_text(name)
109-
title.set_style_text_font(lv.font_montserrat_16, 0)
109+
title.set_style_text_font(lv.font_montserrat_16, lv.PART.MAIN)
110110
title.set_pos(4, y)
111111
y += title.get_height() + 20
112112

@@ -119,7 +119,7 @@ def addAllGlyphs(self, screen, start_y):
119119
#print(f"{cp} : {chr(cp)}", end="")
120120
#print(f"{chr(cp)},", end="")
121121
lbl = lv.label(screen)
122-
lbl.set_style_text_font(font, 0)
122+
lbl.set_style_text_font(font, lv.PART.MAIN)
123123
lbl.set_text(chr(cp))
124124
lbl.set_pos(x, y)
125125

‎internal_filesystem/apps/com.micropythonos.soundrecorder/assets/sound_recorder.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def onCreate(self):
6767
title = lv.label(screen)
6868
title.set_text("Sound Recorder")
6969
title.align(lv.ALIGN.TOP_MID, 0, 10)
70-
title.set_style_text_font(lv.font_montserrat_20, 0)
70+
title.set_style_text_font(lv.font_montserrat_20, lv.PART.MAIN)
7171

7272
# Status label (shows microphone availability)
7373
self._status_label = lv.label(screen)
@@ -77,7 +77,7 @@ def onCreate(self):
7777
self._timer_label = lv.label(screen)
7878
self._timer_label.set_text(self._format_timer_text(0))
7979
self._timer_label.align(lv.ALIGN.CENTER, 0, -30)
80-
self._timer_label.set_style_text_font(lv.font_montserrat_24, 0)
80+
self._timer_label.set_style_text_font(lv.font_montserrat_24, lv.PART.MAIN)
8181

8282
# Record button
8383
self._record_button = lv.button(screen)
@@ -138,11 +138,11 @@ def _update_status(self):
138138
"""Update status label based on microphone availability."""
139139
if AudioFlinger.has_microphone():
140140
self._status_label.set_text("Microphone ready")
141-
self._status_label.set_style_text_color(lv.color_hex(0x00AA00), 0)
141+
self._status_label.set_style_text_color(lv.color_hex(0x00AA00), lv.PART.MAIN)
142142
self._record_button.remove_flag(lv.obj.FLAG.HIDDEN)
143143
else:
144144
self._status_label.set_text("No microphone available")
145-
self._status_label.set_style_text_color(lv.color_hex(0xAA0000), 0)
145+
self._status_label.set_style_text_color(lv.color_hex(0xAA0000), lv.PART.MAIN)
146146
self._record_button.add_flag(lv.obj.FLAG.HIDDEN)
147147

148148
def _find_last_recording(self):
@@ -259,7 +259,7 @@ def _start_recording(self):
259259
if self._current_max_duration_ms < self.MIN_DURATION_MS:
260260
print("SoundRecorder: Not enough storage space")
261261
self._status_label.set_text("Not enough storage space")
262-
self._status_label.set_style_text_color(lv.color_hex(0xAA0000), 0)
262+
self._status_label.set_style_text_color(lv.color_hex(0xAA0000), lv.PART.MAIN)
263263
return
264264

265265
# Start recording
@@ -285,9 +285,9 @@ def _start_recording(self):
285285

286286
# Update UI
287287
self._record_button_label.set_text(lv.SYMBOL.STOP + " Stop")
288-
self._record_button.set_style_bg_color(lv.color_hex(0xAA0000), 0)
288+
self._record_button.set_style_bg_color(lv.color_hex(0xAA0000), lv.PART.MAIN)
289289
self._status_label.set_text("Recording...")
290-
self._status_label.set_style_text_color(lv.color_hex(0xAA0000), 0)
290+
self._status_label.set_style_text_color(lv.color_hex(0xAA0000), lv.PART.MAIN)
291291

292292
# Hide play/delete buttons during recording
293293
self._play_button.add_flag(lv.obj.FLAG.HIDDEN)
@@ -298,7 +298,7 @@ def _start_recording(self):
298298
else:
299299
print("SoundRecorder: record_wav failed!")
300300
self._status_label.set_text("Failed to start recording")
301-
self._status_label.set_style_text_color(lv.color_hex(0xAA0000), 0)
301+
self._status_label.set_style_text_color(lv.color_hex(0xAA0000), lv.PART.MAIN)
302302

303303
def _stop_recording(self):
304304
"""Stop recording audio."""
@@ -307,7 +307,7 @@ def _stop_recording(self):
307307

308308
# Show "Saving..." status immediately (file finalization takes time on SD card)
309309
self._status_label.set_text("Saving...")
310-
self._status_label.set_style_text_color(lv.color_hex(0xFF8800), 0) # Orange
310+
self._status_label.set_style_text_color(lv.color_hex(0xFF8800), lv.PART.MAIN) # Orange
311311

312312
# Disable record button while saving
313313
self._record_button.add_flag(lv.obj.FLAG.HIDDEN)
@@ -331,7 +331,7 @@ def _recording_finished(self, message):
331331
# Re-enable and reset record button
332332
self._record_button.remove_flag(lv.obj.FLAG.HIDDEN)
333333
self._record_button_label.set_text(lv.SYMBOL.AUDIO + " Record")
334-
self._record_button.set_style_bg_color(lv.theme_get_color_primary(None), 0)
334+
self._record_button.set_style_bg_color(lv.theme_get_color_primary(None), lv.PART.MAIN)
335335

336336
# Update status and find recordings
337337
self._update_status()
@@ -377,10 +377,10 @@ def _on_play_clicked(self, event):
377377

378378
if success:
379379
self._status_label.set_text("Playing...")
380-
self._status_label.set_style_text_color(lv.color_hex(0x0000AA), 0)
380+
self._status_label.set_style_text_color(lv.color_hex(0x0000AA), lv.PART.MAIN)
381381
else:
382382
self._status_label.set_text("Playback failed")
383-
self._status_label.set_style_text_color(lv.color_hex(0xAA0000), 0)
383+
self._status_label.set_style_text_color(lv.color_hex(0xAA0000), lv.PART.MAIN)
384384

385385
def _on_playback_complete(self, message):
386386
"""Callback when playback finishes."""
@@ -402,4 +402,4 @@ def _on_delete_clicked(self, event):
402402
except Exception as e:
403403
print(f"SoundRecorder: Delete failed: {e}")
404404
self._status_label.set_text("Delete failed")
405-
self._status_label.set_style_text_color(lv.color_hex(0xAA0000), 0)
405+
self._status_label.set_style_text_color(lv.color_hex(0xAA0000), lv.PART.MAIN)

‎internal_filesystem/builtin/apps/com.micropythonos.about/assets/about.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ def _add_label(self, parent, text, is_header=False, margin_top=DisplayMetrics.pc
1010
label.set_text(text)
1111
if is_header:
1212
primary_color = lv.theme_get_color_primary(None)
13-
label.set_style_text_color(primary_color, 0)
14-
label.set_style_text_font(lv.font_montserrat_14, 0)
15-
label.set_style_margin_top(margin_top, 0)
16-
label.set_style_margin_bottom(DisplayMetrics.pct_of_height(2), 0)
13+
label.set_style_text_color(primary_color, lv.PART.MAIN)
14+
label.set_style_text_font(lv.font_montserrat_14, lv.PART.MAIN)
15+
label.set_style_margin_top(margin_top, lv.PART.MAIN)
16+
label.set_style_margin_bottom(DisplayMetrics.pct_of_height(2), lv.PART.MAIN)
1717
else:
18-
label.set_style_text_font(lv.font_montserrat_12, 0)
19-
label.set_style_margin_bottom(2, 0)
18+
label.set_style_text_font(lv.font_montserrat_12, lv.PART.MAIN)
19+
label.set_style_margin_bottom(2, lv.PART.MAIN)
2020
return label
2121

2222
def _add_disk_info(self, screen, path):
@@ -35,7 +35,7 @@ def _add_disk_info(self, screen, path):
3535

3636
def onCreate(self):
3737
screen = lv.obj()
38-
screen.set_style_border_width(0, 0)
38+
screen.set_style_border_width(0, lv.PART.MAIN)
3939
screen.set_flex_flow(lv.FLEX_FLOW.COLUMN)
4040
screen.set_style_pad_all(DisplayMetrics.pct_of_width(2), lv.PART.MAIN)
4141
# Make the screen focusable so it can be scrolled with the arrow keys

0 commit comments

Comments
 (0)