diff --git a/permissionmanager/src/main/ets/common/components/dialog.ets b/permissionmanager/src/main/ets/common/components/dialog.ets index 08c0fc4233fbc5331ecd1583bce0541b68f2acd5..7491db0d6354f0560d4d26507a78e831edc49e26 100644 --- a/permissionmanager/src/main/ets/common/components/dialog.ets +++ b/permissionmanager/src/main/ets/common/components/dialog.ets @@ -16,6 +16,7 @@ import Constants from '../utils/constant'; import audio from '@ohos.multimedia.audio' import camera from '@ohos.multimedia.camera' +import deviceInfo from '@ohos.deviceInfo' @Extend(Button) function customizeButton() { .backgroundColor($r('app.color.default_background_color')) @@ -55,7 +56,7 @@ export struct globalDialog { controller: CustomDialogController; build() { - Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.End }) { + Flex({ justifyContent: FlexAlign.Center, alignItems: deviceInfo.deviceType == Constants.DEFAULT_DEVICE_TYPE ? ItemAlign.End : ItemAlign.Center }) { Column() { Text(globalThis.currentPermissionGroup == 'CAMERA' ? $r('app.string.close_camera') : $r('app.string.close_microphone')) .fontSize(Constants.TEXT_BIG_FONT_SIZE) diff --git a/permissionmanager/src/main/ets/common/utils/constant.ets b/permissionmanager/src/main/ets/common/utils/constant.ets index 0352e1c4b659ef29336ad8d51266c24d2c3b38c9..1c07b9dbbf3c70bb58d8aa007ff1da59c2154de1 100644 --- a/permissionmanager/src/main/ets/common/utils/constant.ets +++ b/permissionmanager/src/main/ets/common/utils/constant.ets @@ -212,7 +212,6 @@ export default class Constants { static MANAGEMENT_ROW_PADDING_RIGHT = 12; static MANAGEMENT_ROW_PADDING_TOP = 8; static MANAGEMENT_ROW_MARGIN_TOP = 12; - static MANAGEMENT_TRANSPARENCY = 0.8; static APPLICATION_IMAGE_WIDTH = 40; static APPLICATION_IMAGE_HEIGHT = 40; static APPLICATION_IMAGE_MARGIN_RIGHT = 16; @@ -284,6 +283,10 @@ export default class Constants { static BUNDLE_NAME = 'com.ohos.permissionmanager' + static DEFAULT_DEVICE_TYPE = 'default' + static TABLET_DEVICE_TYPE = 'tablet' + static PERMISSION_DIALOG_MARGIN_BOTTOM = 62 + static START_SUBSCRIPT = 0 static END_SUBSCRIPT = 500 diff --git a/permissionmanager/src/main/ets/pages/application-secondary.ets b/permissionmanager/src/main/ets/pages/application-secondary.ets index 5a5f2b65ad79e3ddc6a9236128b59f9b3ea17c16..9556d4dd6655c69a9f55652bc6c7092d028ca490 100644 --- a/permissionmanager/src/main/ets/pages/application-secondary.ets +++ b/permissionmanager/src/main/ets/pages/application-secondary.ets @@ -340,7 +340,6 @@ struct appNamePlusPage { .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) .backgroundColor($r("sys.color.ohos_id_color_sub_background")) - .opacity(Constants.MANAGEMENT_TRANSPARENCY) } } } diff --git a/permissionmanager/src/main/ets/pages/application-tertiary.ets b/permissionmanager/src/main/ets/pages/application-tertiary.ets index b27315a13ccd707ad7eed913b237837efb15dc8a..e488af43a5ac80f3d7e3faa2a1b4bd72d061f5dd 100644 --- a/permissionmanager/src/main/ets/pages/application-tertiary.ets +++ b/permissionmanager/src/main/ets/pages/application-tertiary.ets @@ -115,7 +115,6 @@ struct mediaDocumentPage { .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) .backgroundColor($r("sys.color.ohos_id_color_sub_background")) - .opacity(Constants.MANAGEMENT_TRANSPARENCY) } } } diff --git a/permissionmanager/src/main/ets/pages/authority-secondary.ets b/permissionmanager/src/main/ets/pages/authority-secondary.ets index 85a71ca3ecee6e1af9b87fb8a78062a37afbdfd0..3a5a3d90f1b3303e0c7b807f2fbe2b9f5165ca8e 100644 --- a/permissionmanager/src/main/ets/pages/authority-secondary.ets +++ b/permissionmanager/src/main/ets/pages/authority-secondary.ets @@ -83,7 +83,6 @@ struct appNamePage { .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) .backgroundColor($r("sys.color.ohos_id_color_sub_background")) - .opacity(Constants.MANAGEMENT_TRANSPARENCY) } } } diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets index b7bd11e3b7c8a090e3decf608feffeb43d66b82f..7650f1d2186a14cdf39b362295d78f28e04b9e0f 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets @@ -113,7 +113,6 @@ struct locationInfoPage { .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) .backgroundColor($r("sys.color.ohos_id_color_sub_background")) - .opacity(Constants.MANAGEMENT_TRANSPARENCY) } } @@ -497,7 +496,7 @@ struct applicationItem { .fontColor($r('app.color.secondary_font_color')) .margin({ top: Constants.AUTHORITY_TEXT_MARGIN_TOP, left: Constants.AUTHORITY_TEXT_MARGIN_LEFT }) } - } + }.padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) Scroll() { Row() { Column() { diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary.ets b/permissionmanager/src/main/ets/pages/authority-tertiary.ets index 33b2ae8cf898c018fc464b409ddddd13b10f1640..e3543c2fa8a6b27969e7b28de11bc81adceac61f 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary.ets @@ -104,7 +104,6 @@ struct locationInfoPage { .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) .backgroundColor($r("sys.color.ohos_id_color_sub_background")) - .opacity(Constants.MANAGEMENT_TRANSPARENCY) } } } @@ -312,7 +311,7 @@ struct applicationItem { .fontSize(Constants.TEXT_SMAL_FONT_SIZE) .fontColor($r('app.color.secondary_font_color')) .margin({ top: Constants.AUTHORITY_TEXT_MARGIN_TOP, left: Constants.AUTHORITY_TEXT_MARGIN_LEFT }) - } + }.padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) Scroll() { Row() { Column() { diff --git a/permissionmanager/src/main/ets/pages/dialogPlus.ets b/permissionmanager/src/main/ets/pages/dialogPlus.ets index d406bdcca845db71bddcfb348b9a2350aa4de1c4..a01722f4948435e3c5e0c8b1d7d83cbcb4bb80f7 100644 --- a/permissionmanager/src/main/ets/pages/dialogPlus.ets +++ b/permissionmanager/src/main/ets/pages/dialogPlus.ets @@ -17,6 +17,7 @@ import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; import bundle from '@ohos.bundle'; import bundleManager from '@ohos.bundle.bundleManager'; import rpc from '@ohos.rpc'; +import deviceInfo from '@ohos.deviceInfo'; import { Log, getPermissionGroup } from '../common/utils/utils' import Constants from '../common/utils/constant' import { BundleFlag } from '../common/model/bundle' @@ -69,7 +70,7 @@ struct PermissionDialog { controller: CustomDialogController build() { - Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) { + Flex({ justifyContent: FlexAlign.Center, alignItems: deviceInfo.deviceType == Constants.DEFAULT_DEVICE_TYPE ? ItemAlign.End : ItemAlign.Center }) { Column() { if ((this.initStatus != Constants.INIT_NEED_TO_WAIT) && this.verify()) { Image(this.grantGroups[this.count].icon) @@ -144,6 +145,7 @@ struct PermissionDialog { .borderRadius(Constants.DIALOG_PRIVACY_BORDER_RADIUS) .width(Constants.DIALOG_PRIVACY_WIDTH) .padding({ bottom: Constants.DIALOG_PADDING_BOTTOM }) + .margin({ bottom: Constants.PERMISSION_DIALOG_MARGIN_BOTTOM }) }.width(Constants.FULL_WIDTH) .height(Constants.FULL_HEIGHT) } diff --git a/permissionmanager/src/main/ets/pages/globalSwitch.ets b/permissionmanager/src/main/ets/pages/globalSwitch.ets index e23f8b25a7b9a4caa3c70019b40c0d45740cb242..7cb9222c04cadbb75fdb9fc14afdd0a6b4fd005b 100644 --- a/permissionmanager/src/main/ets/pages/globalSwitch.ets +++ b/permissionmanager/src/main/ets/pages/globalSwitch.ets @@ -19,6 +19,7 @@ import camera from '@ohos.multimedia.camera'; import bundle from '@ohos.bundle'; import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; import { Log } from '../common/utils/utils' +import deviceInfo from '@ohos.deviceInfo' const MICROPHONE = 'microphone' const CAMERA = 'camera' @@ -53,7 +54,7 @@ struct globalDialog { controller: CustomDialogController build() { - Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.End }) { + Flex({ justifyContent: FlexAlign.Center, alignItems: deviceInfo.deviceType == Constants.DEFAULT_DEVICE_TYPE ? ItemAlign.End : ItemAlign.Center }) { Column() { Text(globalThis.globalState == MICROPHONE ? $r('app.string.global_title_microphone') : globalThis.globalState == CAMERA ? $r('app.string.global_title_camera') : diff --git a/permissionmanager/src/main/ets/pages/other-permissions.ets b/permissionmanager/src/main/ets/pages/other-permissions.ets index d35c48121cef9d02711b8177df7af4b58311df23..aa34c23e86a5ccf9fed149416c3b235fc943a075 100644 --- a/permissionmanager/src/main/ets/pages/other-permissions.ets +++ b/permissionmanager/src/main/ets/pages/other-permissions.ets @@ -81,7 +81,6 @@ struct appNamePage { .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) .backgroundColor($r("sys.color.ohos_id_color_sub_background")) - .opacity(Constants.MANAGEMENT_TRANSPARENCY) } } diff --git a/permissionmanager/src/main/ets/pages/permission-access-record.ets b/permissionmanager/src/main/ets/pages/permission-access-record.ets index 8939b840761aa6b4bd872efb8ebc9f262f071c62..c676af21297f0a331cef498664c5d6ddbb5648b5 100644 --- a/permissionmanager/src/main/ets/pages/permission-access-record.ets +++ b/permissionmanager/src/main/ets/pages/permission-access-record.ets @@ -330,7 +330,6 @@ struct permissionRecordPage { .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) .backgroundColor($r("sys.color.ohos_id_color_sub_background")) - .opacity(Constants.MANAGEMENT_TRANSPARENCY) } }