Skip to content

Commit 007ee6b

Browse files
ThomasFarstrikeThomasFarstrike
committed
Move all settings apps to com.micropythonos.settings.*
1 parent 3cb8b91 commit 007ee6b

11 files changed

Lines changed: 17 additions & 17 deletions

File tree

internal_filesystem/builtin/apps/com.micropythonos.hotspot/META-INF/MANIFEST.JSON renamed to internal_filesystem/builtin/apps/com.micropythonos.settings.hotspot/META-INF/MANIFEST.JSON

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"publisher": "MicroPythonOS",
44
"short_description": "Configure Wi-Fi hotspot settings.",
55
"long_description": "Configure and toggle the device Wi-Fi hotspot, including SSID, security, and network options.",
6-
"icon_url": "https://apps.micropythonos.com/apps/com.micropythonos.hotspot/icons/com.micropythonos.hotspot_0.1.0_64x64.png",
7-
"download_url": "https://apps.micropythonos.com/apps/com.micropythonos.hotspot/mpks/com.micropythonos.hotspot_0.1.0.mpk",
8-
"fullname": "com.micropythonos.hotspot",
6+
"icon_url": "https://apps.micropythonos.com/apps/com.micropythonos.settings.hotspot/icons/com.micropythonos.settings.hotspot_0.1.0_64x64.png",
7+
"download_url": "https://apps.micropythonos.com/apps/com.micropythonos.settings.hotspot/mpks/com.micropythonos.settings.hotspot_0.1.0.mpk",
8+
"fullname": "com.micropythonos.settings.hotspot",
99
"version": "0.1.0",
1010
"category": "networking",
1111
"activities": [

internal_filesystem/builtin/apps/com.micropythonos.hotspot/assets/hotspot_settings.py renamed to internal_filesystem/builtin/apps/com.micropythonos.settings.hotspot/assets/hotspot_settings.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class HotspotSettings(Activity):
88
Hotspot configuration app.
99
1010
Uses SettingsActivity to render and edit hotspot preferences stored under
11-
com.micropythonos.hotspot.
11+
com.micropythonos.settings.hotspot.
1212
"""
1313

1414
DEFAULTS = {
@@ -24,8 +24,8 @@ class HotspotSettings(Activity):
2424
prefs = None
2525

2626
def onCreate(self):
27-
self.prefs = SharedPreferences("com.micropythonos.hotspot", defaults=self.DEFAULTS)
28-
self.ui_prefs = SharedPreferences("com.micropythonos.hotspot")
27+
self.prefs = SharedPreferences("com.micropythonos.settings.hotspot", defaults=self.DEFAULTS)
28+
self.ui_prefs = SharedPreferences("com.micropythonos.settings.hotspot")
2929
screen = lv.obj()
3030
screen.set_style_border_width(0, lv.PART.MAIN)
3131
screen.set_style_pad_all(DisplayMetrics.pct_of_width(3), lv.PART.MAIN)

internal_filesystem/builtin/apps/com.micropythonos.hotspot/res/mipmap-mdpi/icon_64x64.png renamed to internal_filesystem/builtin/apps/com.micropythonos.settings.hotspot/res/mipmap-mdpi/icon_64x64.png

File renamed without changes.

internal_filesystem/builtin/apps/com.micropythonos.webserver/META-INF/MANIFEST.JSON renamed to internal_filesystem/builtin/apps/com.micropythonos.settings.webserver/META-INF/MANIFEST.JSON

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"publisher": "MicroPythonOS",
44
"short_description": "Configure and control the WebServer.",
55
"long_description": "Configure WebServer settings, start or stop the WebREPL web server.",
6-
"icon_url": "https://apps.micropythonos.com/apps/com.micropythonos.webserver/icons/com.micropythonos.webserver_0.1.0_64x64.png",
7-
"download_url": "https://apps.micropythonos.com/apps/com.micropythonos.webserver/mpks/com.micropythonos.webserver_0.1.0.mpk",
8-
"fullname": "com.micropythonos.webserver",
6+
"icon_url": "https://apps.micropythonos.com/apps/com.micropythonos.settings.webserver/icons/com.micropythonos.settings.webserver_0.1.0_64x64.png",
7+
"download_url": "https://apps.micropythonos.com/apps/com.micropythonos.settings.webserver/mpks/com.micropythonos.settings.webserver_0.1.0.mpk",
8+
"fullname": "com.micropythonos.settings.webserver",
99
"version": "0.1.0",
1010
"category": "networking",
1111
"activities": [

internal_filesystem/builtin/apps/com.micropythonos.webserver/assets/webserver_settings.py renamed to internal_filesystem/builtin/apps/com.micropythonos.settings.webserver/assets/webserver_settings.py

File renamed without changes.

internal_filesystem/builtin/apps/com.micropythonos.wifi/META-INF/MANIFEST.JSON renamed to internal_filesystem/builtin/apps/com.micropythonos.settings.wifi/META-INF/MANIFEST.JSON

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"publisher": "MicroPythonOS",
44
"short_description": "WiFi Network Configuration",
55
"long_description": "Scans for wireless networks, shows a list of SSIDs, allows for password entry, and connecting.",
6-
"icon_url": "https://apps.micropythonos.com/apps/com.micropythonos.wifi/icons/com.micropythonos.wifi_0.1.2_64x64.png",
7-
"download_url": "https://apps.micropythonos.com/apps/com.micropythonos.wifi/mpks/com.micropythonos.wifi_0.1.2.mpk",
8-
"fullname": "com.micropythonos.wifi",
6+
"icon_url": "https://apps.micropythonos.com/apps/com.micropythonos.settings.wifi/icons/com.micropythonos.settings.wifi_0.1.2_64x64.png",
7+
"download_url": "https://apps.micropythonos.com/apps/com.micropythonos.settings.wifi/mpks/com.micropythonos.settings.wifi_0.1.2.mpk",
8+
"fullname": "com.micropythonos.settings.wifi",
99
"version": "0.1.2",
1010
"category": "networking",
1111
"activities": [

internal_filesystem/builtin/apps/com.micropythonos.wifi/assets/wifi_settings.py renamed to internal_filesystem/builtin/apps/com.micropythonos.settings.wifi/assets/wifi_settings.py

File renamed without changes.

internal_filesystem/builtin/apps/com.micropythonos.wifi/res/mipmap-mdpi/icon_64x64.png renamed to internal_filesystem/builtin/apps/com.micropythonos.settings.wifi/res/mipmap-mdpi/icon_64x64.png

File renamed without changes.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
class LaunchWiFi(Activity):
1010

1111
def onCreate(self):
12-
AppManager.start_app("com.micropythonos.wifi")
12+
AppManager.start_app("com.micropythonos.settings.wifi")
1313

1414

1515
class LaunchHotspot(Activity):
1616

1717
def onCreate(self):
18-
AppManager.start_app("com.micropythonos.hotspot")
18+
AppManager.start_app("com.micropythonos.settings.hotspot")
1919

2020

2121
class LaunchWebServer(Activity):
2222

2323
def onCreate(self):
24-
AppManager.start_app("com.micropythonos.webserver")
24+
AppManager.start_app("com.micropythonos.settings.webserver")
2525

2626

2727
class Settings(SettingsActivity):

‎internal_filesystem/lib/mpos/ui/topmenu.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ def brightness_slider_released(e):
273273
wifi_label.center()
274274
def wifi_event(e):
275275
close_drawer()
276-
AppManager.start_app("com.micropythonos.wifi")
276+
AppManager.start_app("com.micropythonos.settings.wifi")
277277
wifi_btn.add_event_cb(wifi_event,lv.EVENT.CLICKED,None)
278278
settings_btn=lv.button(drawer)
279279
settings_btn.set_size(lv.pct(drawer_button_pct),lv.pct(20))

0 commit comments

Comments
 (0)