Keyboard improvements

.gitignore

@@ -16,3 +16,4 @@ cmake/
 .cache/
 compile_commands.json
 build-tests/
+CMakeFiles/

CMakeLists.txt

@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 3.21)
 
-project(MarathonOS VERSION 1.0.0 LANGUAGES CXX)
+project(MarathonOS VERSION 1.0.0 LANGUAGES C CXX)
+
+enable_testing()
+
 
 if(POLICY CMP0071)
     cmake_policy(SET CMP0071 NEW)
@@ -156,6 +159,16 @@ find_package(Qt6 6.4 COMPONENTS WaylandCompositor)
 if(TARGET Qt6::WaylandCompositor)
     message(STATUS "Qt WaylandCompositor found - enabling Wayland support")
     set(HAVE_WAYLAND TRUE)
+
+    # Also find the private module for text-input-v3 support
+    find_package(Qt6 6.4 COMPONENTS WaylandCompositorPrivate QUIET)
+    if(TARGET Qt6::WaylandCompositorPrivate)
+        message(STATUS "Qt WaylandCompositorPrivate found - enabling text-input-v3 for native apps")
+        set(HAVE_WAYLAND_PRIVATE TRUE)
+    else()
+        message(STATUS "Qt WaylandCompositorPrivate not found - text-input-v3 disabled")
+        set(HAVE_WAYLAND_PRIVATE FALSE)
+    endif()
 else()
         message(STATUS "Qt WaylandCompositor not found - Wayland support disabled")
     set(HAVE_WAYLAND FALSE)
@@ -253,3 +266,7 @@ install(DIRECTORY docs/
     FILES_MATCHING PATTERN "*.md"
 )
 
+# Tests
+if(BUILD_TESTING)
+    add_subdirectory(tests)
+endif()

apps/calendar/CalendarApp.qml

@@ -1,68 +1,82 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
 import MarathonOS.Shell
 import MarathonUI.Containers
 import MarathonUI.Core
-import MarathonUI.Theme
 import MarathonUI.Navigation
+import MarathonUI.Theme
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import "stores"
 
 MApp {
     id: calendarApp
-    appId: "calendar"
-    appName: "Calendar"
-    appIcon: "assets/icon.svg"
 
     property date currentDate: new Date()
     property var selectedDate: null
     property int currentView: 0
-
-    Component.onCompleted: {
-        CalendarStorage.init();
-    }
+    property Item navStack: null
 
     function createEvent(title, date, time, allDay, recurring) {
         var event = {
-            title: title || "Untitled Event",
-            date: date,
-            time: time || "12:00",
-            allDay: allDay || false,
-            recurring: recurring || "none"
+            "title": title || "Untitled Event",
+            "date": date,
+            "time": time || "12:00",
+            "allDay": allDay || false,
+            "recurring": recurring || "none"
         };
-        CalendarStorage.addEvent(event);
+        calendarStorage.addEvent(event);
         return event;
     }
 
     function getEventsForDate(date) {
-        return CalendarStorage.getEventsForDate(date);
+        return calendarStorage.getEventsForDate(date);
     }
 
     function deleteEvent(id) {
-        return CalendarStorage.deleteEvent(id);
+        return calendarStorage.deleteEvent(id);
     }
 
-    property Item navStack: null
+    // Helper to open detail page
+    function openEventDetail(event) {
+        if (navStack)
+            navStack.push("pages/EventDetailPage.qml", {
+                "event": event,
+                "onDelete": eventId => {
+                    calendarApp.deleteEvent(eventId);
+                }
+            });
+    }
 
+    appId: "calendar"
+    appName: "Calendar"
+    appIcon: "assets/icon.svg"
+    Component.onCompleted: {
+        calendarStorage.init();
+    }
     navigationDepth: navStack ? navStack.depth : 0
     onBackPressed: {
-        if (navStack && navStack.depth > 1) {
+        // If filtering by date, clear filter
+        // If in list view (without filter), go back to month view
+        // Let the shell handle closing the app if at root
+
+        if (navStack && navStack.depth > 1)
             navStack.pop();
-        } else if (calendarApp.selectedDate !== null) {
-            // If filtering by date, clear filter
+        else if (calendarApp.selectedDate !== null)
             calendarApp.selectedDate = null;
-        } else if (calendarApp.currentView === 1) {
-            // If in list view (without filter), go back to month view
+        else if (calendarApp.currentView === 1)
             calendarApp.currentView = 0;
-        } else {
-            // Let the shell handle closing the app if at root
+        else
             navigationDepth = 0;
-        }
+    }
+
+    CalendarStorage {
+        id: calendarStorage
     }
 
     content: StackView {
         id: stackView
-        anchors.fill: parent
 
+        anchors.fill: parent
         Component.onCompleted: calendarApp.navStack = stackView
 
         initialItem: Rectangle {
@@ -88,20 +102,19 @@ MApp {
 
                 MTabBar {
                     id: tabBar
+
                     width: parent.width
                     activeTab: calendarApp.currentView
-
                     tabs: [
                         {
-                            label: "Month",
-                            icon: "calendar"
+                            "label": "Month",
+                            "icon": "calendar"
                         },
                         {
-                            label: "List",
-                            icon: "list"
+                            "label": "List",
+                            "icon": "list"
                         }
                     ]
-
                     onTabSelected: index => {
                         HapticService.light();
                         calendarApp.currentView = index;
@@ -137,6 +150,7 @@ MApp {
                 easing.type: Easing.OutCubic
             }
         }
+
         pushExit: Transition {
             PropertyAnimation {
                 property: "x"
@@ -146,6 +160,7 @@ MApp {
                 easing.type: Easing.OutCubic
             }
         }
+
         popEnter: Transition {
             PropertyAnimation {
                 property: "x"
@@ -155,6 +170,7 @@ MApp {
                 easing.type: Easing.OutCubic
             }
         }
+
         popExit: Transition {
             PropertyAnimation {
                 property: "x"
@@ -165,16 +181,4 @@ MApp {
             }
         }
     }
-
-    // Helper to open detail page
-    function openEventDetail(event) {
-        if (navStack) {
-            navStack.push("pages/EventDetailPage.qml", {
-                "event": event,
-                "onDelete": eventId => {
-                    calendarApp.deleteEvent(eventId);
-                }
-            });
-        }
-    }
 }

apps/calendar/stores/CalendarStorage.qml

@@ -1,12 +1,37 @@
-pragma Singleton
-import QtQuick
 import MarathonOS.Shell
+import QtQuick
 
 QtObject {
     id: root
 
     property var events: []
     property int nextEventId: 1
+    property Connections calendarConnection
+
+    calendarConnection: Connections {
+        function onEventsLoaded() {
+            root.events = CalendarManager.events;
+            root.dataChanged();
+        }
+
+        function onEventCreated(event) {
+            root.events = CalendarManager.events;
+            root.dataChanged();
+        }
+
+        function onEventUpdated(event) {
+            root.events = CalendarManager.events;
+            root.dataChanged();
+        }
+
+        function onEventDeleted(eventId) {
+            root.events = CalendarManager.events;
+            root.dataChanged();
+        }
+
+        target: typeof CalendarManager !== 'undefined' ? CalendarManager : null
+        enabled: typeof CalendarManager !== 'undefined'
+    }
 
     // Signal to notify listeners of changes
     signal dataChanged
@@ -21,8 +46,12 @@ QtObject {
                 events = JSON.parse(savedEvents);
                 if (events.length > 0) {
                     // Ensure IDs are numbers
-                    events.forEach(e => e.id = Number(e.id));
-                    nextEventId = Math.max(...events.map(e => e.id)) + 1;
+                    events.forEach(e => {
+                        return e.id = Number(e.id);
+                    });
+                    nextEventId = Math.max(events.map(e => {
+                        return e.id;
+                    })) + 1;
                 }
             } catch (e) {
                 Logger.error("CalendarStorage", "Failed to load events: " + e);
@@ -93,33 +122,27 @@ QtObject {
     }
 
     function getEventsForDate(date) {
-        if (typeof CalendarManager !== 'undefined') {
+        if (typeof CalendarManager !== 'undefined')
             return CalendarManager.getEventsForDate(date);
-        }
 
         var dateStr = Qt.formatDate(date, "yyyy-MM-dd");
         var result = [];
-
         for (var i = 0; i < events.length; i++) {
             var event = events[i];
-
             if (event.date === dateStr) {
                 result.push(event);
             } else if (event.recurring !== "none") {
                 var eventDate = new Date(event.date);
                 var checkDate = new Date(date);
-
                 if (event.recurring === "daily" && checkDate >= eventDate) {
                     result.push(event);
                 } else if (event.recurring === "weekly" && checkDate >= eventDate) {
                     var daysDiff = Math.floor((checkDate - eventDate) / (1000 * 60 * 60 * 24));
-                    if (daysDiff % 7 === 0) {
+                    if (daysDiff % 7 === 0)
                         result.push(event);
-                    }
                 } else if (event.recurring === "monthly" && checkDate >= eventDate) {
-                    if (checkDate.getDate() === eventDate.getDate()) {
+                    if (checkDate.getDate() === eventDate.getDate())
                         result.push(event);
-                    }
                 }
             }
         }
@@ -129,29 +152,4 @@ QtObject {
     function getAllEvents() {
         return events;
     }
-
-    property Connections calendarConnection: Connections {
-        target: typeof CalendarManager !== 'undefined' ? CalendarManager : null
-        enabled: typeof CalendarManager !== 'undefined'
-
-        function onEventsLoaded() {
-            root.events = CalendarManager.events;
-            root.dataChanged();
-        }
-
-        function onEventCreated(event) {
-            root.events = CalendarManager.events;
-            root.dataChanged();
-        }
-
-        function onEventUpdated(event) {
-            root.events = CalendarManager.events;
-            root.dataChanged();
-        }
-
-        function onEventDeleted(eventId) {
-            root.events = CalendarManager.events;
-            root.dataChanged();
-        }
-    }
 }

apps/calendar/stores/qmldir

@@ -0,0 +1 @@
+singleton CalendarStorage 1.0 CalendarStorage.qml