!22 rectify repo file structure for API9

Merge pull request !22 from guozejun/master

.gitignore

@@ -1,16 +1,4 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-/entry/.preview
-.cxx
 /node_modules
+/local.properties
+/.idea
+**/build

AppScope/app.json5

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,9 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-include ':phone', ':tablet', ':pc',':common:utils', ':common:component'
-
-project(':tablet').projectDir = new File('./product/tablet')
-project(':phone').projectDir = new File('./product/phone')
-project(':pc').projectDir = new File('./product/pc')
 
+{
+  "app": {
+    "bundleName": "com.ohos.note",
+    "vendor": "example",
+    "versionCode": 1000000,
+    "versionName": "1.0.0",
+    "icon": "$media:app_icon",
+    "label": "$string:app_name",
+    "distributedNotificationEnabled": true
+  }
+}

AppScope/resources/base/element/string.json

@@ -0,0 +1,8 @@
+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "ohos_note"
+    }
+  ]
+}

LICENSE

@@ -173,4 +173,4 @@ Apache License
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS
+   END OF TERMS AND CONDITIONS

build-profile.json5

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+{
+  "app": {
+    "compileSdkVersion": 9,
+    "compatibleSdkVersion": 9,
+    "products": [
+      {
+        "name": "default",
+      }
+    ]
+  },
+  "modules": [
+    {
+      "name": "phone",
+      "srcPath": "./product/phone",
+      "targets": [
+        {
+          "name": "default",
+          "applyToProducts": [
+            "default"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "tablet",
+      "srcPath": "./product/tablet",
+      "targets": [
+        {
+          "name": "default",
+          "applyToProducts": [
+            "default"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "utils",
+      "srcPath": "./common/utils"
+    },
+    {
+      "name": "component",
+      "srcPath": "./common/component"
+    },
+    {
+      "name": "resources",
+      "srcPath": "./common/resources"
+    }
+  ]
+}

build.gradle

@@ -1,38 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-apply plugin: 'com.huawei.ohos.app'
-
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
-    compileSdkVersion 8
-    supportSystem "standard"
-}
-
-buildscript {
-    repositories {
-        maven {
-            url 'http://repo.ark.tools.huawei.com/artifactory/maven-public/'
-            allowInsecureProtocol = true
-        }
-        maven {
-            url 'http://mirrors.tools.huawei.com/maven/'
-            allowInsecureProtocol = true
-        }
-    }
-    dependencies {
-        classpath 'com.huawei.ohos:hap:3.0.6.4'
-        classpath 'com.huawei.ohos:decctest:1.2.7.2'
-    }
-}
-
-allprojects {
-    repositories {
-        maven {
-            url 'http://repo.ark.tools.huawei.com/artifactory/maven-public/'
-            allowInsecureProtocol = true
-        }
-        maven {
-            url 'http://mirrors.tools.huawei.com/maven/'
-            allowInsecureProtocol = true
-        }
-    }
-}

common/component/.gitignore

@@ -0,0 +1,3 @@
+/node_modules
+/.preview
+/build

common/component/build-profile.json5

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+{
+  "apiType": "stageMode",
+  "buildOption": {
+  }
+}

common/component/build.gradle

@@ -1,20 +0,0 @@
-apply plugin: 'com.huawei.ohos.library'
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
-    compileSdkVersion 8
-    defaultConfig {
-        compatibleSdkVersion 8
-    }
-
-    buildTypes {
-        release {
-            proguardOpt {
-                proguardEnabled false
-                rulesFiles 'proguard-rules.pro'
-            }
-        }
-    }
-}
-
-dependencies {
-}

common/component/hvigorfile.js

@@ -0,0 +1,3 @@
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').harTasks
+

common/component/index.ets

@@ -13,20 +13,9 @@
  * limitations under the License.
  */
 
-import {LogUtil} from '../../../../../../common/utils/src/main/ets/default/baseUtil/LogUtil.ets'
-
-const TAG = "NoteApp"
-
-export default {
-  onCreate() {
-    LogUtil.info(TAG, "Application onCreate")
-    AppStorage.SetOrCreate('AllFolderArray', [])
-    AppStorage.SetOrCreate('AllNoteArray', [])
-    AppStorage.SetOrCreate('DBQueryFinished', 0)
-    LogUtil.info(TAG, "AppStorage SetOrCreate : AllFolderArray, AllNoteArray, DBQueryFinished")
-  },
-
-  onDestroy() {
-    LogUtil.info(TAG, 'Application onDestroy')
-  },
-}
+export * from './src/main/ets/components/CusDialogComp';
+export * from './src/main/ets/components/FolderListComp';
+export * from './src/main/ets/components/NoteContent';
+export { ToolBarComp, NoteContentComp, NoteContentOverViewComp } from './src/main/ets/components/NoteContentComp';
+export { NoteContentCompPortrait } from './src/main/ets/components/NoteContentCompPortrait';
+export * from './src/main/ets/components/NoteListComp';

common/component/package-lock.json

@@ -0,0 +1,22 @@
+{
+  "name": "@ohos/component",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@ohos/source": {
+      "version": "file:../resources"
+    },
+    "@ohos/utils": {
+      "version": "file:../utils",
+      "requires": {
+        "@ohos/source": "file:../resources"
+      },
+      "dependencies": {
+        "@ohos/source": {
+          "version": "file:../resources"
+        }
+      }
+    }
+  }
+}

common/component/package.json

@@ -0,0 +1,17 @@
+{
+	"license": "ISC",
+	"types": "",
+	"devDependencies": {},
+	"name": "@ohos/component",
+	"description": "a npm package which contains arkUI2.0 page",
+	"ohos": {
+		"org": ""
+	},
+	"main": "index.ets",
+	"repository": {},
+	"version": "1.0.0",
+	"dependencies": {
+		"@ohos/utils": "file:../utils",
+		"@ohos/source": "file:../resources"
+	}
+}

common/component/proguard-rules.pro

@@ -1 +0,0 @@
-# config module specific ProGuard rules here.

common/component/src/main/config.json

@@ -1,22 +0,0 @@
-{
-  "app": {
-    "bundleName": "com.ohos.note",
-    "vendor": "ohos",
-    "version": {
-      "code": 1000003,
-      "name": "1.0.3"
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.ohos.note.common",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "component",
-      "moduleType": "har"
-    }
-  }
-}

common/component/src/main/ets/components/CusDialogComp.ets

@@ -13,16 +13,15 @@
  * limitations under the License.
  */
 
-import FolderData from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/FolderData.ets'
-import NoteData from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/NoteData.ets'
-import {circleColorArray, fontColorArray} from '../../../../../../common/utils/src/main/ets/default/model/NoteBaseData.ets'
-import {SysDefFolderUuid, DeleteFileType, FolderType} from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/EnumData.ets'
-import GlobalResourceManager from '../../../../../../common/utils/src/main/ets/default/baseUtil/GlobalResourceManager.ets'
-import FolderUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/FolderUtil.ets'
-import NoteUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/NoteUtil.ets'
-import {LogUtil} from '../../../../../../common/utils/src/main/ets/default/baseUtil/LogUtil.ets'
+import GlobalResourceManager from '@ohos/utils/src/main/ets/default/baseUtil/GlobalResourceManager'
+import FolderData from '@ohos/utils/src/main/ets/default/model/databaseModel/FolderData'
+import FolderUtil from '@ohos/utils/src/main/ets/default/baseUtil/FolderUtil'
+import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData'
+import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil'
+import { circleColorArray, fontColorArray, SysDefFolderUuid, DeleteFileType, FolderType, LogUtil } from '@ohos/utils'
 
 const TAG = "CusDialogComp"
+
 @CustomDialog
 export struct NewOrEditFolderDialog {
   newOrEditFolderDialogCtl: CustomDialogController
@@ -69,10 +68,10 @@ export struct NewOrEditFolderDialog {
           })
       }.margin({ bottom: 4, left: 24, right: 24 })
 
-        Divider()
-          .height(1)
-          .margin({ left: 64, right: 24 })
-          .color((this.isExisted && this.inputName != this.oriInputName) ? $r("app.color.category_already_exist_divider_color"):$r("app.color.divider_color_182431"))
+      Divider()
+        .height(1)
+        .margin({ left: 64, right: 24 })
+        .color((this.isExisted && this.inputName != this.oriInputName) ? $r("app.color.category_already_exist_divider_color") : $r("app.color.divider_color_182431"))
 
       Text($r("app.string.category_already_exist"))
         .fontSize(10)

common/component/src/main/ets/components/FolderListComp.ets

@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-import FolderData from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/FolderData.ets'
-import NoteData from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/NoteData.ets'
-import {SysDefFolderUuid, TableName, FolderType, FolderTableColumn, NoteTableColumn, Delete, DeleteFileType} from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/EnumData.ets'
-import {NewOrEditFolderDialog, DeleteDialog} from './CusDialogComp.ets'
-import StyleConstants from '../../../../../../common/utils/src/main/ets/default/constants/StyleConstants.ets'
-import RdbStoreUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets'
-import FolderUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/FolderUtil.ets'
-import NoteUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/NoteUtil.ets'
-import {LogUtil} from '../../../../../../common/utils/src/main/ets/default/baseUtil/LogUtil.ets'
+import FolderData from '@ohos/utils/src/main/ets/default/model/databaseModel/FolderData'
+import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData'
+import {SysDefFolderUuid, TableName, FolderType, FolderTableColumn, NoteTableColumn, Delete, DeleteFileType} from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData'
+import {NewOrEditFolderDialog, DeleteDialog} from './CusDialogComp'
+import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants'
+import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil'
+import FolderUtil from '@ohos/utils/src/main/ets/default/baseUtil/FolderUtil'
+import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil'
+import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil'
 
 // Folder list component
 @Component
@@ -67,7 +67,6 @@ export struct FolderListComp {
       }.width('100%')
       .padding({ left: 12, right: 12 })
 
-      Blank()
       Column() {
         FolderItemComp({
           folderItem: FolderUtil.getFolderData(AppStorage.Get('AllFolderArray'), SysDefFolderUuid.MyFavorites),

common/component/src/main/ets/components/NoteContent.ets

@@ -13,23 +13,23 @@
  * limitations under the License.
  */
 
-import DateUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/DateUtil.ets'
-import RdbStoreUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets'
-import FolderData from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/FolderData.ets'
-import NoteData from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/NoteData.ets'
+import DateUtil from '@ohos/utils/src/main/ets/default/baseUtil/DateUtil'
+import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil'
+import FolderData from '@ohos/utils/src/main/ets/default/model/databaseModel/FolderData'
+import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData'
 import {TableName, NoteTableColumn, SysDefFolderUuid, Favorite, Delete
-} from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/EnumData.ets'
-import StyleConstants from '../../../../../../common/utils/src/main/ets/default/constants/StyleConstants.ets'
-import {EditContentDialog, DeleteDialog, EditTitleDialog} from './CusDialogComp.ets'
-import FolderUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/FolderUtil.ets'
-import NoteUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/NoteUtil.ets'
+} from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData'
+import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants'
+import {EditContentDialog, DeleteDialog, EditTitleDialog} from './CusDialogComp'
+import FolderUtil from '@ohos/utils/src/main/ets/default/baseUtil/FolderUtil'
+import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil'
 import prompt from '@system.prompt'
 import featureAbility from '@ohos.ability.featureAbility'
-import {LogUtil} from '../../../../../../common/utils/src/main/ets/default/baseUtil/LogUtil.ets'
-import OperationUtils from '../../../../../../common/utils/src/main/ets/default/baseUtil/OperationUtils.ets'
+import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil'
+import OperationUtils from '@ohos/utils/src/main/ets/default/baseUtil/OperationUtils'
 import mediaquery from '@ohos.mediaquery'
 import router from '@system.router';
-import inputMethod from '@ohos.inputMethod';
+import inputMethod from '@ohos.inputmethod';
 
 const TAG = "NoteContent"
 
@@ -147,7 +147,7 @@ export struct ToolBarComp {
   controllerShow: WebController
 
   editContentDialogCtl: CustomDialogController = new CustomDialogController({
-    builder: EditContentDialog({ confirm: this.confirm.bind(this), dialogType: 0 }),
+    builder: EditContentDialog({ confirm: this.confirm.bind(this) }),
     alignment: DialogAlignment.Bottom,
     autoCancel: true,
     customStyle: true,
@@ -318,7 +318,7 @@ export struct NoteContentOverViewComp {
   @StorageLink('AllFolderArray') AllFolderArray: FolderData[]  = []
   @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[]  = []
   editTitleDialogCtl: CustomDialogController = new CustomDialogController({
-    builder: EditTitleDialog({ confirm: this.confirm.bind(this), dialogType: 0 }),
+    builder: EditTitleDialog({ confirm: this.confirm.bind(this) }),
     alignment: DialogAlignment.Center,
     autoCancel: false,
     customStyle: true,

common/component/src/main/ets/components/NoteContentComp.ets

@@ -13,21 +13,21 @@
  * limitations under the License.
  */
 
-import DateUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/DateUtil.ets'
-import RdbStoreUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets'
-import FolderData from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/FolderData.ets'
-import NoteData from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/NoteData.ets'
-import {TableName, NoteTableColumn, SysDefFolderUuid, Favorite, Delete} from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/EnumData.ets'
-import StyleConstants from '../../../../../../common/utils/src/main/ets/default/constants/StyleConstants.ets'
-import {EditContentDialog, DeleteDialog, EditTitleDialog} from './CusDialogComp.ets'
-import FolderUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/FolderUtil.ets'
-import NoteUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/NoteUtil.ets'
+import DateUtil from '@ohos/utils/src/main/ets/default/baseUtil/DateUtil'
+import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil'
+import FolderData from '@ohos/utils/src/main/ets/default/model/databaseModel/FolderData'
+import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData'
+import {TableName, NoteTableColumn, SysDefFolderUuid, Favorite, Delete} from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData'
+import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants'
+import {EditContentDialog, DeleteDialog, EditTitleDialog} from './CusDialogComp'
+import FolderUtil from '@ohos/utils/src/main/ets/default/baseUtil/FolderUtil'
+import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil'
 import prompt from '@system.prompt'
 import featureAbility from '@ohos.ability.featureAbility'
-import {LogUtil} from '../../../../../../common/utils/src/main/ets/default/baseUtil/LogUtil.ets'
-import OperationUtils from '../../../../../../common/utils/src/main/ets/default/baseUtil/OperationUtils.ets'
+import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil'
+import OperationUtils from '@ohos/utils/src/main/ets/default/baseUtil/OperationUtils'
 import mediaquery from '@ohos.mediaquery'
-import inputMethod from '@ohos.inputMethod';
+import inputMethod from '@ohos.inputmethod';
 
 const TAG = "NoteContentComp"
 
@@ -197,7 +197,7 @@ export struct NoteContentOverViewComp {
   @Consume('RefreshFlag') refreshFlag: number
   controllerShow: WebController
   editTitleDialogCtl: CustomDialogController = new CustomDialogController({
-    builder: EditTitleDialog({ confirm: this.confirm.bind(this), dialogType: 0 }),
+    builder: EditTitleDialog({ confirm: this.confirm.bind(this) }),
     alignment: DialogAlignment.Center,
     autoCancel: false,
     customStyle: true,
@@ -339,7 +339,7 @@ export struct ToolBarComp {
   }
 
   editContentDialogCtl: CustomDialogController = new CustomDialogController({
-    builder: EditContentDialog({ confirm: this.confirm.bind(this), dialogType: 0 }),
+    builder: EditContentDialog({ confirm: this.confirm.bind(this) }),
     alignment: DialogAlignment.Bottom,
     autoCancel: true,
     customStyle: true,

common/component/src/main/ets/components/NoteContentCompPortrait.ets

@@ -13,22 +13,22 @@
  * limitations under the License.
  */
 
-import DateUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/DateUtil.ets'
-import RdbStoreUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets'
-import FolderData from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/FolderData.ets'
-import NoteData from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/NoteData.ets'
+import DateUtil from '@ohos/utils/src/main/ets/default/baseUtil/DateUtil'
+import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil'
+import FolderData from '@ohos/utils/src/main/ets/default/model/databaseModel/FolderData'
+import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData'
 import {TableName, NoteTableColumn, SysDefFolderUuid, Favorite, Delete
-} from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/EnumData.ets'
-import StyleConstants from '../../../../../../common/utils/src/main/ets/default/constants/StyleConstants.ets'
-import {EditContentDialogPortrait, DeleteDialog, EditTitleDialog} from './CusDialogComp.ets'
-import FolderUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/FolderUtil.ets'
-import NoteUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/NoteUtil.ets'
+} from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData'
+import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants'
+import {EditContentDialogPortrait, DeleteDialog, EditTitleDialog} from './CusDialogComp'
+import FolderUtil from '@ohos/utils/src/main/ets/default/baseUtil/FolderUtil'
+import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil'
 import prompt from '@system.prompt'
 import featureAbility from '@ohos.ability.featureAbility';
-import {LogUtil} from '../../../../../../common/utils/src/main/ets/default/baseUtil/LogUtil.ets'
-import OperationUtils from '../../../../../../common/utils/src/main/ets/default/baseUtil/OperationUtils.ets'
+import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil'
+import OperationUtils from '@ohos/utils/src/main/ets/default/baseUtil/OperationUtils'
 import router from '@system.router'
-import inputMethod from '@ohos.inputMethod';
+import inputMethod from '@ohos.inputmethod';
 
 var time_id: number
 
@@ -146,7 +146,7 @@ export struct NoteContentOverViewComp {
   @StorageLink('AllFolderArray') AllFolderArray: FolderData[]  = []
   @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[]  = []
   editTitleDialogCtl: CustomDialogController = new CustomDialogController({
-    builder: EditTitleDialog({ confirm: this.confirm.bind(this), dialogType: 0 }),
+    builder: EditTitleDialog({ confirm: this.confirm.bind(this) }),
     alignment: DialogAlignment.Center,
     autoCancel: false,
     customStyle: true,
@@ -377,7 +377,7 @@ export struct DeleteNoteComp {
           .onClick(() => {
             this.selectedNoteData.is_deleted = Delete.No
             this.selectedNoteData.deleted_time = 0
-            prompt.showToast({ message: $r('app.string.restore'), duration: 2000 })
+            prompt.showToast({ message: $r('app.string.restore').toString(), duration: 2000 })
             this.refreshFlag = (this.refreshFlag == 0 ? 1 : 0)
             // update note to db
             let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable)
@@ -407,7 +407,7 @@ export struct EditNoteCompForPortrait {
   @Consume('EditModel') editModel: boolean
   controllerShow: WebController
   editContentDialogCtl: CustomDialogController = new CustomDialogController({
-    builder: EditContentDialogPortrait({ confirm: this.confirm.bind(this), dialogType: 0 }),
+    builder: EditContentDialogPortrait({ confirm: this.confirm.bind(this) }),
     alignment: DialogAlignment.Bottom,
     autoCancel: true,
     customStyle: true,

common/component/src/main/ets/components/NoteListComp.ets

@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-import DateUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/DateUtil.ets'
-import FolderData from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/FolderData.ets'
-import NoteData from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/NoteData.ets'
-import {TableName, NoteTableColumn, SysDefFolderUuid, Favorite, Delete, Top, NoteType} from '../../../../../../common/utils/src/main/ets/default/model/databaseModel/EnumData.ets'
-import {NoteDataMoveDialog, DeleteDialog} from './CusDialogComp.ets'
-import RdbStoreUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets'
+import DateUtil from '@ohos/utils/src/main/ets/default/baseUtil/DateUtil'
+import FolderData from '@ohos/utils/src/main/ets/default/model/databaseModel/FolderData'
+import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData'
+import {TableName, NoteTableColumn, SysDefFolderUuid, Favorite, Delete, Top, NoteType} from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData'
+import {NoteDataMoveDialog, DeleteDialog} from './CusDialogComp'
+import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil'
 import prompt from '@system.prompt'
-import NoteUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/NoteUtil.ets'
-import FolderUtil from '../../../../../../common/utils/src/main/ets/default/baseUtil/FolderUtil.ets'
-import StyleConstants from '../../../../../../common/utils/src/main/ets/default/constants/StyleConstants.ets'
-import SearchModel from '../../../../../../common/utils/src/main/ets/default/model/searchModel/SearchModel.ets'
-import {LogUtil} from '../../../../../../common/utils/src/main/ets/default/baseUtil/LogUtil.ets'
+import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil'
+import FolderUtil from '@ohos/utils/src/main/ets/default/baseUtil/FolderUtil'
+import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants'
+import SearchModel from '@ohos/utils/src/main/ets/default/model/searchModel/SearchModel'
+import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil'
 import router from '@system.router';
 
 const TAG = "NoteListComp"
@@ -521,7 +521,7 @@ export struct OperateNoteComp {
           this.CheckedNoteArray.forEach((noteItem) => {
             noteItem.is_deleted = Delete.No
             noteItem.deleted_time = 0
-            prompt.showToast({ message: $r('app.string.restore'), duration: 2000 })
+            prompt.showToast({ message: $r('app.string.restore').toString(), duration: 2000 })
             // update note to db
             let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable)
             predicates_note.equalTo(NoteTableColumn.Uuid, noteItem.uuid)
@@ -788,7 +788,7 @@ export struct OperateNoteCompForPortrait {
               this.CheckedNoteArray.forEach((noteItem) => {
                 noteItem.is_deleted = Delete.No
                 noteItem.deleted_time = 0
-                prompt.showToast({ message: $r('app.string.restore'), duration: 2000 })
+                prompt.showToast({ message: $r('app.string.restore').toString(), duration: 2000 })
                 // update note to db
                 let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable)
                 predicates_note.equalTo(NoteTableColumn.Uuid, noteItem.uuid)

common/component/src/main/module.json5

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+{
+  "module": {
+    "name": "component",
+    "type": "har",
+    "deviceTypes": [
+      "phone",
+      "tablet"
+    ],
+    "uiSyntax": "ets"
+  }
+}

common/resources/.gitignore

@@ -0,0 +1,3 @@
+/node_modules
+/.preview
+/build

common/resources/build-profile.json5

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+{
+  "apiType": "stageMode",
+  "buildOption": {
+  }
+}

common/resources/hvigorfile.js

@@ -0,0 +1,3 @@
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').harTasks
+

common/resources/index.ets

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { MainPage } from './src/main/ets/components/MainPage/MainPage'

common/resources/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/resources",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

common/resources/package.json

@@ -0,0 +1,14 @@
+{
+	"license":"ISC",
+	"types":"",
+	"devDependencies":{},
+	"name":"@ohos/resources",
+	"description":"a npm package which contains arkUI2.0 page",
+	"ohos":{
+		"org":""
+	},
+	"main":"index.ets",
+	"repository":{},
+	"version":"1.0.0",
+	"dependencies":{}
+}

common/resources/src/main/ets/components/MainPage/MainPage.ets

@@ -15,11 +15,18 @@
 
 @Entry
 @Component
-struct Index {
+export struct MainPage {
+  @State message: string = 'Hello World'
+
   build() {
-    Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
+    Row() {
+      Column() {
+        Text(this.message)
+          .fontSize(50)
+          .fontWeight(FontWeight.Bold)
+      }
+      .width('100%')
     }
-    .width('100%')
     .height('100%')
   }
-}
+}

common/resources/src/main/module.json5

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+{
+  "module": {
+    "name": "resources",
+    "type": "har",
+    "deviceTypes": [
+      "phone",
+      "tablet"
+    ],
+    "uiSyntax": "ets"
+  }
+}