diff --git a/application/AppScope/app.json b/application/AppScope/app.json index 4a2224e5c3a1a923c9b6ef2e6777400a9b3195d2..07971b1d0bc16713a73dcb9e47d02e0c7a8b6329 100644 --- a/application/AppScope/app.json +++ b/application/AppScope/app.json @@ -2,8 +2,8 @@ "app": { "bundleName": "com.ohos.dhardwareui", "vendor": "example", - "versionCode": 10000037, - "versionName": "1.0.37", + "versionCode": 10000038, + "versionName": "1.0.38", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 12, diff --git a/application/AppScope/app.json5 b/application/AppScope/app.json5 index 29dc8935ecf5e3aec6ca0daa0a5ce3c693dc6f69..d0d8963349da3930c6455e6b735f4e89fed798d9 100644 --- a/application/AppScope/app.json5 +++ b/application/AppScope/app.json5 @@ -16,8 +16,8 @@ "app": { "bundleName": "com.ohos.dhardwareui", "vendor": "example", - "versionCode": 10000037, - "versionName": "1.0.37", + "versionCode": 10000038, + "versionName": "1.0.38", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 12, diff --git a/application/AppScope/resources/base/profile/configuration.json b/application/AppScope/resources/base/profile/configuration.json new file mode 100644 index 0000000000000000000000000000000000000000..e4a0a9ff989d4f7f58bdbf9e0c50a20369b28f26 --- /dev/null +++ b/application/AppScope/resources/base/profile/configuration.json @@ -0,0 +1,5 @@ +{ + "configuration": { + "fontSizeScale": "followSystem" + } +} \ No newline at end of file diff --git a/application/entry/src/main/ets/pages/ContinueSwitch.ets b/application/entry/src/main/ets/pages/ContinueSwitch.ets index 007d150c10bd93c9ab9bd0c0c507b7fd9d96dc7c..07688eb086cbda91b5fb3a081aa0c1c71205eb01 100644 --- a/application/entry/src/main/ets/pages/ContinueSwitch.ets +++ b/application/entry/src/main/ets/pages/ContinueSwitch.ets @@ -324,7 +324,9 @@ struct ContinueSwitch { } .margin({ bottom: CommonConstants.CONTINUE_DESC_TEXT_MARGIN_BOTTOM, - top: CommonConstants.CONTINUE_DESC_TEXT_MARGIN_TOP + top: CommonConstants.CONTINUE_DESC_TEXT_MARGIN_TOP, + left: $r('app.float.margin_8'), + right: $r('app.float.margin_8') }) .textAlign(TextAlign.Center) .width('100%') @@ -453,6 +455,9 @@ struct ContinueSwitch { .onAreaChange((oldArea: Area, newArea: Area) => { logger.info(`${TAG} Scroll, oldArea.height = ${oldArea.height}, newArea.height = ${newArea.height}`); }) + + ScrollBar({ scroller: this.scroller, direction: ScrollBarDirection.Vertical, state: BarState.Auto }) + .position({ right: 0, bottom: 16 }) } build() { @@ -490,6 +495,8 @@ struct ContinueSwitch { } logger.info(`${TAG} this.imageAnimatorWidth = ${this.imageAnimatorWidth}, this.imageAnimatorHeight = ${this.imageAnimatorHeight}`); }) + .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM]) + .padding({ bottom: $r('app.float.margin_16') }) } private getContentVisibility(): Visibility { diff --git a/application/entry/src/main/resources/base/element/float.json b/application/entry/src/main/resources/base/element/float.json new file mode 100644 index 0000000000000000000000000000000000000000..64bf2941f8d07c961e826ac46da04a0896e52a1d --- /dev/null +++ b/application/entry/src/main/resources/base/element/float.json @@ -0,0 +1,12 @@ +{ + "float": [ + { + "name": "margin_8", + "value": "8vp" + }, + { + "name": "margin_16", + "value": "16vp" + } + ] +} \ No newline at end of file