diff --git a/internal_filesystem/builtin/apps/com.micropythonos.hotspot/META-INF/MANIFEST.JSON b/internal_filesystem/builtin/apps/com.micropythonos.settings.hotspot/META-INF/MANIFEST.JSON similarity index 75% rename from internal_filesystem/builtin/apps/com.micropythonos.hotspot/META-INF/MANIFEST.JSON rename to internal_filesystem/builtin/apps/com.micropythonos.settings.hotspot/META-INF/MANIFEST.JSON index 4a85e53f..c3b07729 100644 --- a/internal_filesystem/builtin/apps/com.micropythonos.hotspot/META-INF/MANIFEST.JSON +++ b/internal_filesystem/builtin/apps/com.micropythonos.settings.hotspot/META-INF/MANIFEST.JSON @@ -3,9 +3,9 @@ "publisher": "MicroPythonOS", "short_description": "Configure Wi-Fi hotspot settings.", "long_description": "Configure and toggle the device Wi-Fi hotspot, including SSID, security, and network options.", -"icon_url": "https://apps.micropythonos.com/apps/com.micropythonos.hotspot/icons/com.micropythonos.hotspot_0.1.0_64x64.png", -"download_url": "https://apps.micropythonos.com/apps/com.micropythonos.hotspot/mpks/com.micropythonos.hotspot_0.1.0.mpk", -"fullname": "com.micropythonos.hotspot", +"icon_url": "https://apps.micropythonos.com/apps/com.micropythonos.settings.hotspot/icons/com.micropythonos.settings.hotspot_0.1.0_64x64.png", +"download_url": "https://apps.micropythonos.com/apps/com.micropythonos.settings.hotspot/mpks/com.micropythonos.settings.hotspot_0.1.0.mpk", +"fullname": "com.micropythonos.settings.hotspot", "version": "0.1.0", "category": "networking", "activities": [ diff --git a/internal_filesystem/builtin/apps/com.micropythonos.hotspot/assets/hotspot_settings.py b/internal_filesystem/builtin/apps/com.micropythonos.settings.hotspot/assets/hotspot_settings.py similarity index 95% rename from internal_filesystem/builtin/apps/com.micropythonos.hotspot/assets/hotspot_settings.py rename to internal_filesystem/builtin/apps/com.micropythonos.settings.hotspot/assets/hotspot_settings.py index d381c44c..ec0ce526 100644 --- a/internal_filesystem/builtin/apps/com.micropythonos.hotspot/assets/hotspot_settings.py +++ b/internal_filesystem/builtin/apps/com.micropythonos.settings.hotspot/assets/hotspot_settings.py @@ -8,7 +8,7 @@ class HotspotSettings(Activity): Hotspot configuration app. Uses SettingsActivity to render and edit hotspot preferences stored under - com.micropythonos.hotspot. + com.micropythonos.settings.hotspot. """ DEFAULTS = { @@ -24,8 +24,8 @@ class HotspotSettings(Activity): prefs = None def onCreate(self): - self.prefs = SharedPreferences("com.micropythonos.hotspot", defaults=self.DEFAULTS) - self.ui_prefs = SharedPreferences("com.micropythonos.hotspot") + self.prefs = SharedPreferences("com.micropythonos.settings.hotspot", defaults=self.DEFAULTS) + self.ui_prefs = SharedPreferences("com.micropythonos.settings.hotspot") screen = lv.obj() screen.set_style_border_width(0, lv.PART.MAIN) screen.set_style_pad_all(DisplayMetrics.pct_of_width(3), lv.PART.MAIN) diff --git a/internal_filesystem/builtin/apps/com.micropythonos.hotspot/res/mipmap-mdpi/icon_64x64.png b/internal_filesystem/builtin/apps/com.micropythonos.settings.hotspot/res/mipmap-mdpi/icon_64x64.png similarity index 100% rename from internal_filesystem/builtin/apps/com.micropythonos.hotspot/res/mipmap-mdpi/icon_64x64.png rename to internal_filesystem/builtin/apps/com.micropythonos.settings.hotspot/res/mipmap-mdpi/icon_64x64.png diff --git a/internal_filesystem/builtin/apps/com.micropythonos.webserver/META-INF/MANIFEST.JSON b/internal_filesystem/builtin/apps/com.micropythonos.settings.webserver/META-INF/MANIFEST.JSON similarity index 74% rename from internal_filesystem/builtin/apps/com.micropythonos.webserver/META-INF/MANIFEST.JSON rename to internal_filesystem/builtin/apps/com.micropythonos.settings.webserver/META-INF/MANIFEST.JSON index e2cc5d18..ba3fe285 100644 --- a/internal_filesystem/builtin/apps/com.micropythonos.webserver/META-INF/MANIFEST.JSON +++ b/internal_filesystem/builtin/apps/com.micropythonos.settings.webserver/META-INF/MANIFEST.JSON @@ -3,9 +3,9 @@ "publisher": "MicroPythonOS", "short_description": "Configure and control the WebServer.", "long_description": "Configure WebServer settings, start or stop the WebREPL web server.", -"icon_url": "https://apps.micropythonos.com/apps/com.micropythonos.webserver/icons/com.micropythonos.webserver_0.1.0_64x64.png", -"download_url": "https://apps.micropythonos.com/apps/com.micropythonos.webserver/mpks/com.micropythonos.webserver_0.1.0.mpk", -"fullname": "com.micropythonos.webserver", +"icon_url": "https://apps.micropythonos.com/apps/com.micropythonos.settings.webserver/icons/com.micropythonos.settings.webserver_0.1.0_64x64.png", +"download_url": "https://apps.micropythonos.com/apps/com.micropythonos.settings.webserver/mpks/com.micropythonos.settings.webserver_0.1.0.mpk", +"fullname": "com.micropythonos.settings.webserver", "version": "0.1.0", "category": "networking", "activities": [ diff --git a/internal_filesystem/builtin/apps/com.micropythonos.webserver/assets/webserver_settings.py b/internal_filesystem/builtin/apps/com.micropythonos.settings.webserver/assets/webserver_settings.py similarity index 100% rename from internal_filesystem/builtin/apps/com.micropythonos.webserver/assets/webserver_settings.py rename to internal_filesystem/builtin/apps/com.micropythonos.settings.webserver/assets/webserver_settings.py diff --git a/internal_filesystem/builtin/apps/com.micropythonos.wifi/META-INF/MANIFEST.JSON b/internal_filesystem/builtin/apps/com.micropythonos.settings.wifi/META-INF/MANIFEST.JSON similarity index 76% rename from internal_filesystem/builtin/apps/com.micropythonos.wifi/META-INF/MANIFEST.JSON rename to internal_filesystem/builtin/apps/com.micropythonos.settings.wifi/META-INF/MANIFEST.JSON index c463bc89..ede10083 100644 --- a/internal_filesystem/builtin/apps/com.micropythonos.wifi/META-INF/MANIFEST.JSON +++ b/internal_filesystem/builtin/apps/com.micropythonos.settings.wifi/META-INF/MANIFEST.JSON @@ -3,9 +3,9 @@ "publisher": "MicroPythonOS", "short_description": "WiFi Network Configuration", "long_description": "Scans for wireless networks, shows a list of SSIDs, allows for password entry, and connecting.", -"icon_url": "https://apps.micropythonos.com/apps/com.micropythonos.wifi/icons/com.micropythonos.wifi_0.1.2_64x64.png", -"download_url": "https://apps.micropythonos.com/apps/com.micropythonos.wifi/mpks/com.micropythonos.wifi_0.1.2.mpk", -"fullname": "com.micropythonos.wifi", +"icon_url": "https://apps.micropythonos.com/apps/com.micropythonos.settings.wifi/icons/com.micropythonos.settings.wifi_0.1.2_64x64.png", +"download_url": "https://apps.micropythonos.com/apps/com.micropythonos.settings.wifi/mpks/com.micropythonos.settings.wifi_0.1.2.mpk", +"fullname": "com.micropythonos.settings.wifi", "version": "0.1.2", "category": "networking", "activities": [ diff --git a/internal_filesystem/builtin/apps/com.micropythonos.wifi/assets/wifi_settings.py b/internal_filesystem/builtin/apps/com.micropythonos.settings.wifi/assets/wifi_settings.py similarity index 100% rename from internal_filesystem/builtin/apps/com.micropythonos.wifi/assets/wifi_settings.py rename to internal_filesystem/builtin/apps/com.micropythonos.settings.wifi/assets/wifi_settings.py diff --git a/internal_filesystem/builtin/apps/com.micropythonos.wifi/res/mipmap-mdpi/icon_64x64.png b/internal_filesystem/builtin/apps/com.micropythonos.settings.wifi/res/mipmap-mdpi/icon_64x64.png similarity index 100% rename from internal_filesystem/builtin/apps/com.micropythonos.wifi/res/mipmap-mdpi/icon_64x64.png rename to internal_filesystem/builtin/apps/com.micropythonos.settings.wifi/res/mipmap-mdpi/icon_64x64.png diff --git a/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py b/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py index 78bd1237..6211892c 100644 --- a/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py +++ b/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py @@ -9,19 +9,19 @@ from check_imu_calibration import CheckIMUCalibrationActivity class LaunchWiFi(Activity): def onCreate(self): - AppManager.start_app("com.micropythonos.wifi") + AppManager.start_app("com.micropythonos.settings.wifi") class LaunchHotspot(Activity): def onCreate(self): - AppManager.start_app("com.micropythonos.hotspot") + AppManager.start_app("com.micropythonos.settings.hotspot") class LaunchWebServer(Activity): def onCreate(self): - AppManager.start_app("com.micropythonos.webserver") + AppManager.start_app("com.micropythonos.settings.webserver") class Settings(SettingsActivity): diff --git a/internal_filesystem/lib/mpos/ui/topmenu.py b/internal_filesystem/lib/mpos/ui/topmenu.py index 422314f6..1744316c 100644 --- a/internal_filesystem/lib/mpos/ui/topmenu.py +++ b/internal_filesystem/lib/mpos/ui/topmenu.py @@ -273,7 +273,7 @@ def create_drawer(): wifi_label.center() def wifi_event(e): close_drawer() - AppManager.start_app("com.micropythonos.wifi") + AppManager.start_app("com.micropythonos.settings.wifi") wifi_btn.add_event_cb(wifi_event,lv.EVENT.CLICKED,None) settings_btn=lv.button(drawer) settings_btn.set_size(lv.pct(drawer_button_pct),lv.pct(20)) diff --git a/internal_filesystem/lib/mpos/webserver/webserver.py b/internal_filesystem/lib/mpos/webserver/webserver.py index 0588aa2c..6518614a 100644 --- a/internal_filesystem/lib/mpos/webserver/webserver.py +++ b/internal_filesystem/lib/mpos/webserver/webserver.py @@ -5,7 +5,7 @@ from .webrepl_http import accept_handler class WebServer: - PREFS_NAMESPACE = "com.micropythonos.webserver" + PREFS_NAMESPACE = "com.micropythonos.settings.webserver" DEFAULTS = { "autostart": "False", "port": "7890",