From 12dd45c34ebcd5b85c81eb5f4330862a811be56c Mon Sep 17 00:00:00 2001 From: guojin26 Date: Fri, 5 Nov 2021 11:56:14 +0800 Subject: [PATCH] update directory Signed-off-by: guojin26 --- {UI => eTSUI}/eTSBuildCommonView/README_zh.md | 0 {UI => eTSUI}/eTSBuildCommonView/build.gradle | 68 +-- .../eTSBuildCommonView/entry/build.gradle | 30 +- .../entry/src/main/config.json | 0 .../entry/src/main/ets/MainAbility/app.ets | 0 .../main/ets/MainAbility/pages/FoodDetail.ets | 0 .../main/resources/base/element/string.json | 22 +- .../src/main/resources/base/media/Logo.png | Bin .../src/main/resources/phone/media/Tomato.png | Bin .../src/main/resources/rawfile/Tomato.png | Bin .../screenshots/device/FoodDetail.png | Bin .../eTSBuildCommonView}/settings.gradle | 2 +- .../README_zh.md | 0 .../build.gradle | 68 +-- .../entry/build.gradle | 32 +- .../entry/src/main/config.json | 0 .../entry/src/main/ets/MainAbility/app.ets | 0 .../main/ets/MainAbility/model/FoodData.ets | 92 ++-- .../ets/MainAbility/model/FoodDataModels.ets | 78 ++-- .../MainAbility/pages/FoodCategoryList.ets | 392 +++++++++--------- .../main/ets/MainAbility/pages/FoodDetail.ets | 0 .../main/resources/base/element/string.json | 22 +- .../src/main/resources/base/media/Logo.png | Bin .../main/resources/phone/media/Avocado.png | Bin .../src/main/resources/phone/media/Back.png | Bin .../main/resources/phone/media/Blueberry.png | Bin .../src/main/resources/phone/media/Crab.png | Bin .../main/resources/phone/media/Cucumber.png | Bin .../main/resources/phone/media/IceCream.png | Bin .../src/main/resources/phone/media/Kiwi.png | Bin .../main/resources/phone/media/Mushroom.png | Bin .../src/main/resources/phone/media/Onion.png | Bin .../src/main/resources/phone/media/Pitaya.png | Bin .../main/resources/phone/media/Strawberry.png | Bin .../src/main/resources/phone/media/Switch.png | Bin .../src/main/resources/phone/media/Tomato.png | Bin .../src/main/resources/phone/media/Walnut.png | Bin .../screenshots/device/FoodCategory.png | Bin .../screenshots/device/FoodDetail.png | Bin .../screenshots/device/FoodList.png | Bin .../settings.gradle | 2 +- 41 files changed, 404 insertions(+), 404 deletions(-) rename {UI => eTSUI}/eTSBuildCommonView/README_zh.md (100%) rename {UI => eTSUI}/eTSBuildCommonView/build.gradle (96%) rename {UI => eTSUI}/eTSBuildCommonView/entry/build.gradle (96%) rename {UI => eTSUI}/eTSBuildCommonView/entry/src/main/config.json (100%) rename {UI => eTSUI}/eTSBuildCommonView/entry/src/main/ets/MainAbility/app.ets (100%) rename {UI => eTSUI}/eTSBuildCommonView/entry/src/main/ets/MainAbility/pages/FoodDetail.ets (100%) rename {UI => eTSUI}/eTSBuildCommonView/entry/src/main/resources/base/element/string.json (94%) rename {UI => eTSUI}/eTSBuildCommonView/entry/src/main/resources/base/media/Logo.png (100%) rename {UI => eTSUI}/eTSBuildCommonView/entry/src/main/resources/phone/media/Tomato.png (100%) rename {UI => eTSUI}/eTSBuildCommonView/entry/src/main/resources/rawfile/Tomato.png (100%) rename {UI => eTSUI}/eTSBuildCommonView/screenshots/device/FoodDetail.png (100%) rename {UI/eTSDefiningPageLayoutAndConnection => eTSUI/eTSBuildCommonView}/settings.gradle (94%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/README_zh.md (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/build.gradle (96%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/build.gradle (96%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/config.json (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/app.ets (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/model/FoodData.ets (96%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/model/FoodDataModels.ets (98%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/pages/FoodCategoryList.ets (96%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/pages/FoodDetail.ets (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/base/element/string.json (94%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/base/media/Logo.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Avocado.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Back.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Blueberry.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Crab.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Cucumber.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/IceCream.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Kiwi.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Mushroom.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Onion.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Pitaya.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Strawberry.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Switch.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Tomato.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Walnut.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/screenshots/device/FoodCategory.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/screenshots/device/FoodDetail.png (100%) rename {UI => eTSUI}/eTSDefiningPageLayoutAndConnection/screenshots/device/FoodList.png (100%) rename {UI/eTSBuildCommonView => eTSUI/eTSDefiningPageLayoutAndConnection}/settings.gradle (94%) diff --git a/UI/eTSBuildCommonView/README_zh.md b/eTSUI/eTSBuildCommonView/README_zh.md similarity index 100% rename from UI/eTSBuildCommonView/README_zh.md rename to eTSUI/eTSBuildCommonView/README_zh.md diff --git a/UI/eTSBuildCommonView/build.gradle b/eTSUI/eTSBuildCommonView/build.gradle similarity index 96% rename from UI/eTSBuildCommonView/build.gradle rename to eTSUI/eTSBuildCommonView/build.gradle index 987446063c..d79190c37f 100644 --- a/UI/eTSBuildCommonView/build.gradle +++ b/eTSUI/eTSBuildCommonView/build.gradle @@ -1,34 +1,34 @@ -// 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 7 - supportSystem "standard" -} - -buildscript { - repositories { - maven { - url 'https://repo.huaweicloud.com/repository/maven/' - } - maven { - url 'https://developer.huawei.com/repo/' - } - } - dependencies { - classpath 'com.huawei.ohos:hap:3.0.3.2' - classpath 'com.huawei.ohos:decctest:1.2.6.0' - } -} - -allprojects { - repositories { - maven { - url 'https://repo.huaweicloud.com/repository/maven/' - } - maven { - url 'https://developer.huawei.com/repo/' - } - } -} +// 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 7 + supportSystem "standard" +} + +buildscript { + repositories { + maven { + url 'https://repo.huaweicloud.com/repository/maven/' + } + maven { + url 'https://developer.huawei.com/repo/' + } + } + dependencies { + classpath 'com.huawei.ohos:hap:3.0.3.2' + classpath 'com.huawei.ohos:decctest:1.2.6.0' + } +} + +allprojects { + repositories { + maven { + url 'https://repo.huaweicloud.com/repository/maven/' + } + maven { + url 'https://developer.huawei.com/repo/' + } + } +} diff --git a/UI/eTSBuildCommonView/entry/build.gradle b/eTSUI/eTSBuildCommonView/entry/build.gradle similarity index 96% rename from UI/eTSBuildCommonView/entry/build.gradle rename to eTSUI/eTSBuildCommonView/entry/build.gradle index 1395dd5951..cb1b043b0a 100644 --- a/UI/eTSBuildCommonView/entry/build.gradle +++ b/eTSUI/eTSBuildCommonView/entry/build.gradle @@ -1,16 +1,16 @@ -apply plugin: 'com.huawei.ohos.hap' -//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510 -ohos { - compileSdkVersion 7 - defaultConfig { - compatibleSdkVersion 7 - } - buildTypes { - release { - proguardOpt { - proguardEnabled false - rulesFiles 'proguard-rules.pro' - } - } - } +apply plugin: 'com.huawei.ohos.hap' +//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510 +ohos { + compileSdkVersion 7 + defaultConfig { + compatibleSdkVersion 7 + } + buildTypes { + release { + proguardOpt { + proguardEnabled false + rulesFiles 'proguard-rules.pro' + } + } + } } \ No newline at end of file diff --git a/UI/eTSBuildCommonView/entry/src/main/config.json b/eTSUI/eTSBuildCommonView/entry/src/main/config.json similarity index 100% rename from UI/eTSBuildCommonView/entry/src/main/config.json rename to eTSUI/eTSBuildCommonView/entry/src/main/config.json diff --git a/UI/eTSBuildCommonView/entry/src/main/ets/MainAbility/app.ets b/eTSUI/eTSBuildCommonView/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from UI/eTSBuildCommonView/entry/src/main/ets/MainAbility/app.ets rename to eTSUI/eTSBuildCommonView/entry/src/main/ets/MainAbility/app.ets diff --git a/UI/eTSBuildCommonView/entry/src/main/ets/MainAbility/pages/FoodDetail.ets b/eTSUI/eTSBuildCommonView/entry/src/main/ets/MainAbility/pages/FoodDetail.ets similarity index 100% rename from UI/eTSBuildCommonView/entry/src/main/ets/MainAbility/pages/FoodDetail.ets rename to eTSUI/eTSBuildCommonView/entry/src/main/ets/MainAbility/pages/FoodDetail.ets diff --git a/UI/eTSBuildCommonView/entry/src/main/resources/base/element/string.json b/eTSUI/eTSBuildCommonView/entry/src/main/resources/base/element/string.json similarity index 94% rename from UI/eTSBuildCommonView/entry/src/main/resources/base/element/string.json rename to eTSUI/eTSBuildCommonView/entry/src/main/resources/base/element/string.json index a369e7b5d7..3440475e7c 100644 --- a/UI/eTSBuildCommonView/entry/src/main/resources/base/element/string.json +++ b/eTSUI/eTSBuildCommonView/entry/src/main/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "Healthy Diet" - }, - { - "name": "mainability_description", - "value": "ETS_Empty Ability" - } - ] +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "Healthy Diet" + }, + { + "name": "mainability_description", + "value": "ETS_Empty Ability" + } + ] } \ No newline at end of file diff --git a/UI/eTSBuildCommonView/entry/src/main/resources/base/media/Logo.png b/eTSUI/eTSBuildCommonView/entry/src/main/resources/base/media/Logo.png similarity index 100% rename from UI/eTSBuildCommonView/entry/src/main/resources/base/media/Logo.png rename to eTSUI/eTSBuildCommonView/entry/src/main/resources/base/media/Logo.png diff --git a/UI/eTSBuildCommonView/entry/src/main/resources/phone/media/Tomato.png b/eTSUI/eTSBuildCommonView/entry/src/main/resources/phone/media/Tomato.png similarity index 100% rename from UI/eTSBuildCommonView/entry/src/main/resources/phone/media/Tomato.png rename to eTSUI/eTSBuildCommonView/entry/src/main/resources/phone/media/Tomato.png diff --git a/UI/eTSBuildCommonView/entry/src/main/resources/rawfile/Tomato.png b/eTSUI/eTSBuildCommonView/entry/src/main/resources/rawfile/Tomato.png similarity index 100% rename from UI/eTSBuildCommonView/entry/src/main/resources/rawfile/Tomato.png rename to eTSUI/eTSBuildCommonView/entry/src/main/resources/rawfile/Tomato.png diff --git a/UI/eTSBuildCommonView/screenshots/device/FoodDetail.png b/eTSUI/eTSBuildCommonView/screenshots/device/FoodDetail.png similarity index 100% rename from UI/eTSBuildCommonView/screenshots/device/FoodDetail.png rename to eTSUI/eTSBuildCommonView/screenshots/device/FoodDetail.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/settings.gradle b/eTSUI/eTSBuildCommonView/settings.gradle similarity index 94% rename from UI/eTSDefiningPageLayoutAndConnection/settings.gradle rename to eTSUI/eTSBuildCommonView/settings.gradle index 28d595f2fb..4773db7323 100644 --- a/UI/eTSDefiningPageLayoutAndConnection/settings.gradle +++ b/eTSUI/eTSBuildCommonView/settings.gradle @@ -1 +1 @@ -include ':entry' +include ':entry' diff --git a/UI/eTSDefiningPageLayoutAndConnection/README_zh.md b/eTSUI/eTSDefiningPageLayoutAndConnection/README_zh.md similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/README_zh.md rename to eTSUI/eTSDefiningPageLayoutAndConnection/README_zh.md diff --git a/UI/eTSDefiningPageLayoutAndConnection/build.gradle b/eTSUI/eTSDefiningPageLayoutAndConnection/build.gradle similarity index 96% rename from UI/eTSDefiningPageLayoutAndConnection/build.gradle rename to eTSUI/eTSDefiningPageLayoutAndConnection/build.gradle index 987446063c..d79190c37f 100644 --- a/UI/eTSDefiningPageLayoutAndConnection/build.gradle +++ b/eTSUI/eTSDefiningPageLayoutAndConnection/build.gradle @@ -1,34 +1,34 @@ -// 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 7 - supportSystem "standard" -} - -buildscript { - repositories { - maven { - url 'https://repo.huaweicloud.com/repository/maven/' - } - maven { - url 'https://developer.huawei.com/repo/' - } - } - dependencies { - classpath 'com.huawei.ohos:hap:3.0.3.2' - classpath 'com.huawei.ohos:decctest:1.2.6.0' - } -} - -allprojects { - repositories { - maven { - url 'https://repo.huaweicloud.com/repository/maven/' - } - maven { - url 'https://developer.huawei.com/repo/' - } - } -} +// 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 7 + supportSystem "standard" +} + +buildscript { + repositories { + maven { + url 'https://repo.huaweicloud.com/repository/maven/' + } + maven { + url 'https://developer.huawei.com/repo/' + } + } + dependencies { + classpath 'com.huawei.ohos:hap:3.0.3.2' + classpath 'com.huawei.ohos:decctest:1.2.6.0' + } +} + +allprojects { + repositories { + maven { + url 'https://repo.huaweicloud.com/repository/maven/' + } + maven { + url 'https://developer.huawei.com/repo/' + } + } +} diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/build.gradle b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/build.gradle similarity index 96% rename from UI/eTSDefiningPageLayoutAndConnection/entry/build.gradle rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/build.gradle index 03845c6a75..8243c3b322 100644 --- a/UI/eTSDefiningPageLayoutAndConnection/entry/build.gradle +++ b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/build.gradle @@ -1,16 +1,16 @@ -apply plugin: 'com.huawei.ohos.hap' -//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510 -ohos { - compileSdkVersion 7 - defaultConfig { - compatibleSdkVersion 7 - } - buildTypes { - release { - proguardOpt { - proguardEnabled false - rulesFiles 'proguard-rules.pro' - } - } - } -} +apply plugin: 'com.huawei.ohos.hap' +//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510 +ohos { + compileSdkVersion 7 + defaultConfig { + compatibleSdkVersion 7 + } + buildTypes { + release { + proguardOpt { + proguardEnabled false + rulesFiles 'proguard-rules.pro' + } + } + } +} diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/config.json b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/config.json similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/config.json rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/config.json diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/app.ets b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/app.ets rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/app.ets diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/model/FoodData.ets b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/model/FoodData.ets similarity index 96% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/model/FoodData.ets rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/model/FoodData.ets index 458b87ab5d..3507f35acc 100644 --- a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/model/FoodData.ets +++ b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/model/FoodData.ets @@ -1,47 +1,47 @@ -/* - * Copyright (c) 2021 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 enum Category { - Fruit, - Vegetable, - Nut, - Seafood, - Dessert -} - -let NextId = 0; -export class FoodData { - id: string; - name: string; - image: Resource - category: Category; - calories: number; - protein: number; - fat: number; - carbohydrates: number; - vitaminC: number; - - constructor(name: string, image: Resource, category: Category, calories: number, protein: number, fat: number, carbohydrates: number, vitaminC: number) { - this.id = `${ NextId++ }`; - this.name = name; - this.image = image; - this.category = category; - this.calories = calories; - this.protein = protein; - this.fat = fat; - this.carbohydrates = carbohydrates; - this.vitaminC = vitaminC; - } +/* + * Copyright (c) 2021 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 enum Category { + Fruit, + Vegetable, + Nut, + Seafood, + Dessert +} + +let NextId = 0; +export class FoodData { + id: string; + name: string; + image: Resource + category: Category; + calories: number; + protein: number; + fat: number; + carbohydrates: number; + vitaminC: number; + + constructor(name: string, image: Resource, category: Category, calories: number, protein: number, fat: number, carbohydrates: number, vitaminC: number) { + this.id = `${ NextId++ }`; + this.name = name; + this.image = image; + this.category = category; + this.calories = calories; + this.protein = protein; + this.fat = fat; + this.carbohydrates = carbohydrates; + this.vitaminC = vitaminC; + } } \ No newline at end of file diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/model/FoodDataModels.ets b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/model/FoodDataModels.ets similarity index 98% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/model/FoodDataModels.ets rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/model/FoodDataModels.ets index 71a700f708..fd6fa8304e 100644 --- a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/model/FoodDataModels.ets +++ b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/model/FoodDataModels.ets @@ -1,39 +1,39 @@ -/* - * Copyright (c) 2021 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. - */ - -import { FoodData, Category } from './FoodData' - -const FoodComposition: any[] = [ - { 'name': 'Tomato', 'image': $r('app.media.Tomato'), 'category': Category.Vegetable, 'calories': 17, 'protein': 0.9, 'fat': 0.2, 'carbohydrates': 3.9, 'vitaminC': 17.8 }, - { 'name': 'Walnut', 'image': $r('app.media.Walnut'), 'category': Category.Nut, 'calories': 654 , 'protein': 15, 'fat': 65, 'carbohydrates': 14, 'vitaminC': 1.3 }, - { 'name': 'Cucumber', 'image': $r('app.media.Cucumber'), 'category': Category.Vegetable, 'calories': 30, 'protein': 3, 'fat': 0, 'carbohydrates': 1.9, 'vitaminC': 2.1 }, - { 'name': 'Blueberry', 'image': $r('app.media.Blueberry'), 'category': Category.Fruit, 'calories': 57, 'protein': 0.7, 'fat': 0.3, 'carbohydrates': 14, 'vitaminC': 9.7 }, - { 'name': 'Crab', 'image': $r('app.media.Crab'), 'category': Category.Seafood, 'calories': 97, 'protein': 19, 'fat': 1.5, 'carbohydrates': 0, 'vitaminC': 7.6 }, - { 'name': 'IceCream', 'image': $r('app.media.IceCream'), 'category': Category.Dessert, 'calories': 207, 'protein': 3.5, 'fat': 11, 'carbohydrates': 24, 'vitaminC': 0.6 }, - { 'name': 'Onion', 'image': $r('app.media.Onion'), 'category': Category.Vegetable, 'calories': 39, 'protein': 1.1, 'fat': 0.1, 'carbohydrates': 9, 'vitaminC': 7.4 }, - { 'name': 'Mushroom', 'image': $r('app.media.Mushroom'), 'category': Category.Vegetable, 'calories': 22, 'protein': 3.1, 'fat': 0.3, 'carbohydrates': 3.3, 'vitaminC': 2.1 }, - { 'name': 'Kiwi', 'image': $r('app.media.Kiwi'), 'category': Category.Fruit, 'calories': 60 , 'protein': 1.1, 'fat': 0.5, 'carbohydrates': 15, 'vitaminC': 20.5 }, - { 'name': 'Pitaya', 'image': $r('app.media.Pitaya'), 'category': Category.Fruit, 'calories': 60, 'protein': 1.2, 'fat': 0, 'carbohydrates': 10, 'vitaminC': 60.9 }, - { 'name': 'Avocado', 'image': $r('app.media.Avocado'), 'category': Category.Fruit, 'calories': 160, 'protein': 2, 'fat': 15, 'carbohydrates': 9, 'vitaminC': 10 }, - { 'name': 'Strawberry', 'image': $r('app.media.Strawberry'), 'category': Category.Fruit, 'calories': 32, 'protein': 0.7, 'fat': 0.3, 'carbohydrates': 8, 'vitaminC': 58.8 } -] - -export function initializeOnStartup(): Array { - let FoodDataArray: Array = [] - FoodComposition.forEach(item => { - FoodDataArray.push(new FoodData(item.name, item.image, item.category, item.calories, item.protein, item.fat, item.carbohydrates, item.vitaminC)); - }) - return FoodDataArray; -} +/* + * Copyright (c) 2021 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. + */ + +import { FoodData, Category } from './FoodData' + +const FoodComposition: any[] = [ + { 'name': 'Tomato', 'image': $r('app.media.Tomato'), 'category': Category.Vegetable, 'calories': 17, 'protein': 0.9, 'fat': 0.2, 'carbohydrates': 3.9, 'vitaminC': 17.8 }, + { 'name': 'Walnut', 'image': $r('app.media.Walnut'), 'category': Category.Nut, 'calories': 654 , 'protein': 15, 'fat': 65, 'carbohydrates': 14, 'vitaminC': 1.3 }, + { 'name': 'Cucumber', 'image': $r('app.media.Cucumber'), 'category': Category.Vegetable, 'calories': 30, 'protein': 3, 'fat': 0, 'carbohydrates': 1.9, 'vitaminC': 2.1 }, + { 'name': 'Blueberry', 'image': $r('app.media.Blueberry'), 'category': Category.Fruit, 'calories': 57, 'protein': 0.7, 'fat': 0.3, 'carbohydrates': 14, 'vitaminC': 9.7 }, + { 'name': 'Crab', 'image': $r('app.media.Crab'), 'category': Category.Seafood, 'calories': 97, 'protein': 19, 'fat': 1.5, 'carbohydrates': 0, 'vitaminC': 7.6 }, + { 'name': 'IceCream', 'image': $r('app.media.IceCream'), 'category': Category.Dessert, 'calories': 207, 'protein': 3.5, 'fat': 11, 'carbohydrates': 24, 'vitaminC': 0.6 }, + { 'name': 'Onion', 'image': $r('app.media.Onion'), 'category': Category.Vegetable, 'calories': 39, 'protein': 1.1, 'fat': 0.1, 'carbohydrates': 9, 'vitaminC': 7.4 }, + { 'name': 'Mushroom', 'image': $r('app.media.Mushroom'), 'category': Category.Vegetable, 'calories': 22, 'protein': 3.1, 'fat': 0.3, 'carbohydrates': 3.3, 'vitaminC': 2.1 }, + { 'name': 'Kiwi', 'image': $r('app.media.Kiwi'), 'category': Category.Fruit, 'calories': 60 , 'protein': 1.1, 'fat': 0.5, 'carbohydrates': 15, 'vitaminC': 20.5 }, + { 'name': 'Pitaya', 'image': $r('app.media.Pitaya'), 'category': Category.Fruit, 'calories': 60, 'protein': 1.2, 'fat': 0, 'carbohydrates': 10, 'vitaminC': 60.9 }, + { 'name': 'Avocado', 'image': $r('app.media.Avocado'), 'category': Category.Fruit, 'calories': 160, 'protein': 2, 'fat': 15, 'carbohydrates': 9, 'vitaminC': 10 }, + { 'name': 'Strawberry', 'image': $r('app.media.Strawberry'), 'category': Category.Fruit, 'calories': 32, 'protein': 0.7, 'fat': 0.3, 'carbohydrates': 8, 'vitaminC': 58.8 } +] + +export function initializeOnStartup(): Array { + let FoodDataArray: Array = [] + FoodComposition.forEach(item => { + FoodDataArray.push(new FoodData(item.name, item.image, item.category, item.calories, item.protein, item.fat, item.carbohydrates, item.vitaminC)); + }) + return FoodDataArray; +} diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/pages/FoodCategoryList.ets b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/pages/FoodCategoryList.ets similarity index 96% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/pages/FoodCategoryList.ets rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/pages/FoodCategoryList.ets index 1d60743c95..d22841b46c 100644 --- a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/pages/FoodCategoryList.ets +++ b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/pages/FoodCategoryList.ets @@ -1,196 +1,196 @@ -/* - * Copyright (c) 2021 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. - */ - -import router from '@system.router' -import { Category, FoodData } from '../model/FoodData' -import { initializeOnStartup } from '../model/FoodDataModels' - -@Component -struct FoodListItem { - private foodItem: FoodData - build() { - Navigator({ target: 'pages/FoodDetail' }) { - Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { - Row() { - Image(this.foodItem.image) - .objectFit(ImageFit.Contain) - .autoResize(false) - .height(40) - .width(40) - } - .backgroundColor('#FFf1f3f5') - .margin({ right: 16 }) - Text(this.foodItem.name) - .fontSize(14) - .flexGrow(1) - Text(this.foodItem.calories + ' kcal') - .fontSize(14) - } - .height(64) - } - .params({ foodId: this.foodItem }) - .margin({ right: 24, left: 32 }) - } -} - - -@Component -struct FoodList { - private foodItems: FoodData[] - build() { - Column() { - Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { - Text('Food List') - .fontSize(20) - .margin({ left: 20 }) - } - .height('7%') - .backgroundColor('#FFf1f3f5') - List() { - ForEach(this.foodItems, item => { - ListItem() { - FoodListItem({ foodItem: item }) - } - }, item => item.id.toString()) - }.height('93%') - } - } -} - -@Component -struct FoodGridItem { - private foodItem: FoodData - build() { - Column() { - Row() { - Image(this.foodItem.image) - .objectFit(ImageFit.Contain) - .height(152) - .width('100%') - }.backgroundColor('#FFf1f3f5') - Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { - Text(this.foodItem.name) - .fontSize(14) - .flexGrow(1) - .padding({ left: 8 }) - Text(this.foodItem.calories + 'kcal') - .fontSize(14) - .margin({ right: 6 }) - } - .height(32) - .width('100%') - .backgroundColor('#FFe5e5e5') - } - .height(184) - .width('100%') - .onClick(() => { - router.push({ uri: 'pages/FoodDetail', params: { foodId: this.foodItem } }) - }) - } -} - -@Component -struct FoodGrid { - private foodItems: FoodData[] - private gridRowTemplate: string = '' - private heightValue: number - - aboutToAppear() { - var rows = Math.round(this.foodItems.length / 2); - this.gridRowTemplate = '1fr '.repeat(rows); - this.heightValue = rows * 192 - 8; - } - - build() { - Scroll() { - Grid() { - ForEach(this.foodItems, (item: FoodData) => { - GridItem() { - FoodGridItem({ foodItem: item }) - } - }, (item: FoodData) => item.id.toString()) - } - .rowsTemplate(this.gridRowTemplate) - .columnsTemplate('1fr 1fr') - .columnsGap(8) - .rowsGap(8) - .height(this.heightValue) - } - .scrollBar(BarState.Off) - .padding({ left: 16, right: 16 }) - } -} - -@Component -struct FoodCategory { - private foodItems: FoodData[] - build() { - Stack() { - Tabs() { - TabContent() { - FoodGrid({ foodItems: this.foodItems }) - }.tabBar('All') - - TabContent() { - FoodGrid({ foodItems: this.foodItems.filter(item => (item.category === Category.Vegetable)) }) - }.tabBar('Vegetable') - - TabContent() { - FoodGrid({ foodItems: this.foodItems.filter(item => (item.category === Category.Fruit)) }) - }.tabBar('Fruit') - - TabContent() { - FoodGrid({ foodItems: this.foodItems.filter(item => (item.category === Category.Nut)) }) - }.tabBar('Nut') - - TabContent() { - FoodGrid({ foodItems: this.foodItems.filter(item => (item.category === Category.Seafood)) }) - }.tabBar('Seafood') - - TabContent() { - FoodGrid({ foodItems: this.foodItems.filter(item => (item.category === Category.Dessert)) }) - }.tabBar('Dessert') - } - .barWidth(280) - .barMode(BarMode.Scrollable) - } - } -} - -@Entry -@Component -struct FoodCategoryList { - private foodItems: FoodData[] = initializeOnStartup() - @State private showList: boolean = false - - build() { - Column() { - Stack({ alignContent: Alignment.TopEnd }) { - if (this.showList) { - FoodList({ foodItems: this.foodItems }) - } else { - FoodCategory({ foodItems: this.foodItems }) - } - Image($r('app.media.Switch')) - .height(24) - .width(24) - .margin({ top: 15, right: 10 }) - .onClick(() => { - this.showList = !this.showList - }) - } - }.height('100%') - } -} +/* + * Copyright (c) 2021 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. + */ + +import router from '@system.router' +import { Category, FoodData } from '../model/FoodData' +import { initializeOnStartup } from '../model/FoodDataModels' + +@Component +struct FoodListItem { + private foodItem: FoodData + build() { + Navigator({ target: 'pages/FoodDetail' }) { + Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { + Row() { + Image(this.foodItem.image) + .objectFit(ImageFit.Contain) + .autoResize(false) + .height(40) + .width(40) + } + .backgroundColor('#FFf1f3f5') + .margin({ right: 16 }) + Text(this.foodItem.name) + .fontSize(14) + .flexGrow(1) + Text(this.foodItem.calories + ' kcal') + .fontSize(14) + } + .height(64) + } + .params({ foodId: this.foodItem }) + .margin({ right: 24, left: 32 }) + } +} + + +@Component +struct FoodList { + private foodItems: FoodData[] + build() { + Column() { + Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { + Text('Food List') + .fontSize(20) + .margin({ left: 20 }) + } + .height('7%') + .backgroundColor('#FFf1f3f5') + List() { + ForEach(this.foodItems, item => { + ListItem() { + FoodListItem({ foodItem: item }) + } + }, item => item.id.toString()) + }.height('93%') + } + } +} + +@Component +struct FoodGridItem { + private foodItem: FoodData + build() { + Column() { + Row() { + Image(this.foodItem.image) + .objectFit(ImageFit.Contain) + .height(152) + .width('100%') + }.backgroundColor('#FFf1f3f5') + Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { + Text(this.foodItem.name) + .fontSize(14) + .flexGrow(1) + .padding({ left: 8 }) + Text(this.foodItem.calories + 'kcal') + .fontSize(14) + .margin({ right: 6 }) + } + .height(32) + .width('100%') + .backgroundColor('#FFe5e5e5') + } + .height(184) + .width('100%') + .onClick(() => { + router.push({ uri: 'pages/FoodDetail', params: { foodId: this.foodItem } }) + }) + } +} + +@Component +struct FoodGrid { + private foodItems: FoodData[] + private gridRowTemplate: string = '' + private heightValue: number + + aboutToAppear() { + var rows = Math.round(this.foodItems.length / 2); + this.gridRowTemplate = '1fr '.repeat(rows); + this.heightValue = rows * 192 - 8; + } + + build() { + Scroll() { + Grid() { + ForEach(this.foodItems, (item: FoodData) => { + GridItem() { + FoodGridItem({ foodItem: item }) + } + }, (item: FoodData) => item.id.toString()) + } + .rowsTemplate(this.gridRowTemplate) + .columnsTemplate('1fr 1fr') + .columnsGap(8) + .rowsGap(8) + .height(this.heightValue) + } + .scrollBar(BarState.Off) + .padding({ left: 16, right: 16 }) + } +} + +@Component +struct FoodCategory { + private foodItems: FoodData[] + build() { + Stack() { + Tabs() { + TabContent() { + FoodGrid({ foodItems: this.foodItems }) + }.tabBar('All') + + TabContent() { + FoodGrid({ foodItems: this.foodItems.filter(item => (item.category === Category.Vegetable)) }) + }.tabBar('Vegetable') + + TabContent() { + FoodGrid({ foodItems: this.foodItems.filter(item => (item.category === Category.Fruit)) }) + }.tabBar('Fruit') + + TabContent() { + FoodGrid({ foodItems: this.foodItems.filter(item => (item.category === Category.Nut)) }) + }.tabBar('Nut') + + TabContent() { + FoodGrid({ foodItems: this.foodItems.filter(item => (item.category === Category.Seafood)) }) + }.tabBar('Seafood') + + TabContent() { + FoodGrid({ foodItems: this.foodItems.filter(item => (item.category === Category.Dessert)) }) + }.tabBar('Dessert') + } + .barWidth(280) + .barMode(BarMode.Scrollable) + } + } +} + +@Entry +@Component +struct FoodCategoryList { + private foodItems: FoodData[] = initializeOnStartup() + @State private showList: boolean = false + + build() { + Column() { + Stack({ alignContent: Alignment.TopEnd }) { + if (this.showList) { + FoodList({ foodItems: this.foodItems }) + } else { + FoodCategory({ foodItems: this.foodItems }) + } + Image($r('app.media.Switch')) + .height(24) + .width(24) + .margin({ top: 15, right: 10 }) + .onClick(() => { + this.showList = !this.showList + }) + } + }.height('100%') + } +} diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/pages/FoodDetail.ets b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/pages/FoodDetail.ets similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/pages/FoodDetail.ets rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/ets/MainAbility/pages/FoodDetail.ets diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/base/element/string.json b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/base/element/string.json similarity index 94% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/base/element/string.json rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/base/element/string.json index a369e7b5d7..3440475e7c 100644 --- a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/base/element/string.json +++ b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "Healthy Diet" - }, - { - "name": "mainability_description", - "value": "ETS_Empty Ability" - } - ] +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "Healthy Diet" + }, + { + "name": "mainability_description", + "value": "ETS_Empty Ability" + } + ] } \ No newline at end of file diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/base/media/Logo.png b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/base/media/Logo.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/base/media/Logo.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/base/media/Logo.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Avocado.png b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Avocado.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Avocado.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Avocado.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Back.png b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Back.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Back.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Back.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Blueberry.png b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Blueberry.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Blueberry.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Blueberry.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Crab.png b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Crab.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Crab.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Crab.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Cucumber.png b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Cucumber.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Cucumber.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Cucumber.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/IceCream.png b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/IceCream.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/IceCream.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/IceCream.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Kiwi.png b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Kiwi.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Kiwi.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Kiwi.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Mushroom.png b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Mushroom.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Mushroom.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Mushroom.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Onion.png b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Onion.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Onion.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Onion.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Pitaya.png b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Pitaya.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Pitaya.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Pitaya.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Strawberry.png b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Strawberry.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Strawberry.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Strawberry.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Switch.png b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Switch.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Switch.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Switch.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Tomato.png b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Tomato.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Tomato.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Tomato.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Walnut.png b/eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Walnut.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Walnut.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/entry/src/main/resources/phone/media/Walnut.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/screenshots/device/FoodCategory.png b/eTSUI/eTSDefiningPageLayoutAndConnection/screenshots/device/FoodCategory.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/screenshots/device/FoodCategory.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/screenshots/device/FoodCategory.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/screenshots/device/FoodDetail.png b/eTSUI/eTSDefiningPageLayoutAndConnection/screenshots/device/FoodDetail.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/screenshots/device/FoodDetail.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/screenshots/device/FoodDetail.png diff --git a/UI/eTSDefiningPageLayoutAndConnection/screenshots/device/FoodList.png b/eTSUI/eTSDefiningPageLayoutAndConnection/screenshots/device/FoodList.png similarity index 100% rename from UI/eTSDefiningPageLayoutAndConnection/screenshots/device/FoodList.png rename to eTSUI/eTSDefiningPageLayoutAndConnection/screenshots/device/FoodList.png diff --git a/UI/eTSBuildCommonView/settings.gradle b/eTSUI/eTSDefiningPageLayoutAndConnection/settings.gradle similarity index 94% rename from UI/eTSBuildCommonView/settings.gradle rename to eTSUI/eTSDefiningPageLayoutAndConnection/settings.gradle index 28d595f2fb..4773db7323 100644 --- a/UI/eTSBuildCommonView/settings.gradle +++ b/eTSUI/eTSDefiningPageLayoutAndConnection/settings.gradle @@ -1 +1 @@ -include ':entry' +include ':entry' -- Gitee