Merge branch 'main' into dev

Author: rigor789

.github/workflows/ci.yml

@@ -5,6 +5,8 @@ on:
     branches: [main, docs/ui]
   pull_request:
     branches: [main, docs/ui]
+  merge_group:
+    branches: [main, docs/ui]
 
 jobs:
   build:

.gitignore

@@ -5,5 +5,7 @@ node_modules
 .vitepress/dist
 .vitepress/cache
 
+explore/
+
 yarn.lock
 .DS_Store

.textlintrc

@@ -72,6 +72,7 @@
         ["labelled", "labeled"],
         ["licence", "license"],
         ["organise", "organize"],
+        ["optimise", "optimize"],
 
         // Common misspellings
         ["gaurantee", "guarantee"],

.vitepress/config.mts

@@ -1,6 +1,7 @@
 import { defineConfig } from 'vitepress'
 import apiSidebar from '../content/api/sidebar.json'
 import mainSidebar from '../content/sidebar'
+import uiSidebar from '../content/ui/sidebar'
 import nav from './nav'
 import './theme/cliLanguage'
 import path from 'node:path'
@@ -36,6 +37,7 @@ export default defineConfig({
     nav,
     sidebar: {
       '/api': apiSidebar,
+      '/ui': uiSidebar,
       '/': mainSidebar,
     },
   },

.vitepress/nav.ts

@@ -12,21 +12,22 @@ export default [
   {
     text: 'Docs',
     link: '/',
-    activeMatch: '^/(?!plugins|best-practices|api|dev-reference|tutorials)',
+    activeMatch: '^/(?!plugins|best-practices|api|dev-reference|tutorials|ui)',
     icon: 'BookOpenIcon',
   },
-  {
-    text: 'Preview',
-    link: 'https://preview.nativescript.org',
-    icon: 'DevicePhoneMobileIcon',
-    target: '_blank',
-  },
+
   {
     text: 'Tutorials',
     link: '/tutorials/',
     activeMatch: '^/tutorials',
     icon: 'AcademicCapIcon',
   },
+  {
+    text: 'Preview',
+    link: 'https://preview.nativescript.org',
+    icon: 'DevicePhoneMobileIcon',
+    target: '_blank',
+  },
   {
     text: 'Plugins',
     link: '/soon',
@@ -44,6 +45,12 @@ export default [
     link: '/soon',
     icon: 'CpuChipIcon',
   },
+  {
+    text: 'UI Components',
+    link: '/ui/',
+    activeMatch: '^/ui',
+    icon: 'CubeTransparentIcon',
+  },
   {
     text: 'API Reference',
     link: '/api/',

content/api/class/Image.md

@@ -19,38 +19,9 @@ export default [
         link: '/guide/creating-a-project',
       },
       {
-        text: 'Development Workflow',
-        items: [
-          {
-            text: 'Running',
-            link: '/guide/running',
-          },
-          {
-            text: 'Debugging',
-            link: '/guide/debugging',
-          },
-          {
-            text: 'Testing',
-            link: '/guide/testing'
-          },
-          {
-            text: 'Plugins',
-            link: '/guide/development-workflow/using-packages'
-          },
-        ],
-      },
-      {
-        text: 'Tutorials',
-        link: '/tutorials/',
+        text: 'Using Modals',
+        link: '/guide/navigation/modals',
       },
-      {
-        text: 'Publishing',
-        link: '/guide/publishing/',
-      },
-      // {
-      //   text: 'Tutorials',
-      //   link: '/tutorials/',
-      // },
       {
         text: 'Troubleshooting',
         link: '/troubleshooting',
@@ -68,11 +39,18 @@ export default [
         text: 'Running',
         link: '/guide/running',
       },
-
+      {
+        text: 'Using Plugins',
+        link: '/guide/development-workflow/using-packages'
+      },
       {
         text: 'Debugging',
         link: '/guide/debugging',
       },
+      {
+        text: 'Testing',
+        link: '/guide/testing'
+      },
       {
         text: 'Publishing',
         link: '/guide/publishing/',
@@ -261,127 +239,4 @@ export default [
       },
     ],
   },
-  {
-    text: 'UI',
-    items: [
-      {
-        text: 'Dialogs',
-        link: '/ui/dialogs',
-      },
-      {
-        text: 'Gestures',
-        link: '/ui/gestures',
-      },
-      {
-        text: 'Image',
-        items: [
-          {
-            text: 'ImageCache',
-            link: '/guide/ui/image-cache'
-          },
-          {
-            text: 'ImageSource',
-            link: '/guide/ui/image-source'
-          }
-        ]
-      },
-      //       { text: 'Styling', link: '//#' },
-      //       { text: 'Interactivity', link: '//#' },
-      {
-        text: 'Layout Containers',
-        items: [
-          //           { text: 'StackLayout', link: '//#' },
-          //           { text: 'GridLayout', link: '//#' },
-          //           { text: 'RootLayout', link: '//#' },
-          //           { text: 'FlexboxLayout', link: '//#' },
-          //           { text: 'WrapLayout', link: '//#' },
-          { text: 'AbsoluteLayout', link: '/ui/absolute-layout' },
-        ],
-      },
-      //       {
-      //         text: 'Navigation Components',
-      //         items: [
-      //           { text: 'Frame', link: '//#' },
-      //           { text: 'Page', link: '//#' },
-      //           { text: 'ActionBar', link: '//#' },
-      //           { text: 'ActionItem', link: '//#' },
-      //           { text: 'NavigationButton', link: '//#' },
-      //         ],
-      //       },
-      //       {
-      //         text: 'Components',
-      //         items: [
-      //           { text: 'ActivityIndicator', link: '//#' },
-      //           { text: 'Button', link: '//#' },
-      //           { text: 'DatePicker', link: '//#' },
-      //           { text: 'HtmlView', link: '//#' },
-      //           { text: 'Image', link: '/' },
-      //           { text: 'Label', link: '//#' },
-      //           { text: 'ListPicker', link: '//#' },
-      //           { text: 'ListView', link: '//#' },
-      //           { text: 'Placeholder', link: '//#' },
-      //           { text: 'Progress', link: '//#' },
-      //           { text: 'ScrollView', link: '//#' },
-      //           { text: 'SearchBar', link: '//#' },
-      //           { text: 'SegmentedBar', link: '//#' },
-      //           { text: 'Slider', link: '//#' },
-      //           { text: 'Switch', link: '//#' },
-      //           { text: 'TabView', link: '//#' },
-      //           { text: 'TextField', link: '//#' },
-      //           { text: 'TextView', link: '//#' },
-      //           { text: 'TimePicker', link: '//#' },
-      //           { text: 'WevView', link: '//#' },
-    ],
-  },
-  //   {
-  //     text: 'Diving Deeper',
-  //     items: [{ text: 'Architecture concepts', link: '//#' }],
-  //   },
-  // {
-  //   text: 'UI & Styling',
-  //   items: [
-  //     {
-  //       text: 'UI & Styling',
-  //       link: '//#',
-  //     },
-  //     { text: 'Interaction', link: '//#' },
-  //   ],
-  // },
-  // {
-  //   text: 'Networking & Security',
-  //   items: [
-  //     { text: 'Networking', link: '//#' },
-  //     {
-  //       text: 'Security (Nathanael)',
-  //       link: '//#',
-  //     },
-  //   ],
-  // },
-  // {
-  //   text: 'Performance',
-  //   items: [{ text: 'Performance', link: '//#' }],
-  // },
-
-  // {
-  //   text: 'Distribution',
-  //   items: [
-  //     {
-  //       text: 'Releasing your app',
-  //       link: '//#',
-  //     },
-  //   ],
-  // },
-  // {
-  //   text: 'Troubleshooting',
-  //   items: [
-  //     {
-  //       text: 'Common Issues',
-  //       link: '//#',
-  //     },
-  //     {
-  //       text: 'Common Pitfalls',
-  //       link: '//#',
-  //     },
-  //   ],
-  // },
 ] as NSSidebarGroup[]