openharmony/applications_dlp_manager
1
0
Fork 0
mirror of https://github.com/openharmony/applications_dlp_manager.git synced 2026-07-01 13:20:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Description:深色模式下显示异常

Browse Source 
Match-id-8b66fe307731604ccf2fc2b425edec46bff9ea90
This commit is contained in:
li-li-wang
2023-07-24 21:21:19 +08:00
committed by baoyang
parent 1b0fcc9e42
commit c403c54f15
10 changed files with 79 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
entry/src/main/ets/common/components/dlp_alert_dialog.ets
+3 -3
View File
@@ -28,7 +28,7 @@ struct DlpAlertDialog {
.width(Constants.DU_WIDTH_FULL)
.fontFamily($r('app.string.typeface'))
.fontSize(Constants.DA_FONT_SIZE)
.fontColor($r('app.color.da_font_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontWeight(FontWeight.Medium)
}
.height(Constants.DA_ROW_HEIGHT)
@@ -40,7 +40,7 @@ struct DlpAlertDialog {
.width(Constants.DU_WIDTH_FULL)
.fontFamily($r('app.string.typeface'))
.fontSize(Constants.DA_SCROLL_FONT_SIZE)
.fontColor($r('app.color.da_scroll_font_color'))
.fontColor($r('sys.color.ohos_id_color_text_secondary'))
.fontWeight(FontWeight.Regular)
}
.scrollBarColor(Color.Gray).scrollBarWidth(Constants.DA_SCROLL_BAR_WIDTH)
@@ -73,7 +73,7 @@ struct DlpAlertDialog {
.width(Constants.DA_COLOUM_WIDTH)
.borderRadius(Constants.DA_COLOUM_RADIUS)
.alignItems(HorizontalAlign.Center)
.backgroundColor($r('app.color.da_background_color'))
.backgroundColor($r('app.color.da_button_color'))
}
}
entry/src/main/ets/common/constant.ets
+1
View File
@@ -209,6 +209,7 @@ export default class Constants {
static ENCRYPTION_EMIT_DIRECTION_STATUS = 1;
static ENCRYPTION_ADD_STAFF_LENGTH_MAX = 50;
static ENCRYPTION_ADD_STAFF_LENGTH = 0.9;
static ENCRYPTION_STATUS_VALUE_COLOR = 0.6;
static FOOTER_OPACITY_ONE = 1;
static FOOTER_OPACITY_SEPC= 0.6;
entry/src/main/ets/common/encryptionComponents/AddStaff.ets
+1 -1
View File
@@ -75,7 +75,7 @@ struct staffInput {
placeholder: !this.staffArray.length && (globalThis.domainAccount ? $r('app.string.enter_a_complete_work_ID') : $r('app.string.enter_a_complete_account')),
})
.flexGrow(Constants.ENCRYPTION_ADD_STAFF_FLEX_GROW)
.backgroundColor(Color.White)
.backgroundColor($r('app.color.da_button_color'))
.borderRadius(Constants.PP_ROW_RADIUS)
.fontSize($r('sys.float.ohos_id_text_size_body1'))
.fontColor(this.isInputInvalid ? $r('sys.color.ohos_id_color_handup') : $r('sys.color.ohos_id_color_text_primary'))
entry/src/main/ets/common/encryptionComponents/encrypting.ets
+36 -61
View File
@@ -21,71 +21,46 @@ struct EncryptingPanel {
build() {
if (this.processing) {
GridRow({
columns: {
xs: Constants.XS_COLUMNS,
sm: Constants.SM_COLUMNS,
md: Constants.MD_COLUMNS,
lg: Constants.LG_COLUMNS
},
gutter: Constants.DIALOG_GUTTER
}) {
GridCol({
span: {
xs: Constants.XS_SPAN,
sm: Constants.SM_SPAN,
md: Constants.DIALOG_MD_SPAN,
lg: Constants.DIALOG_LG_SPAN
},
offset: {
xs: Constants.XS_OFFSET,
sm: Constants.SM_OFFSET,
md: Constants.DIALOG_MD_OFFSET,
lg: Constants.DIALOG_LG_OFFSET
}
}) {
Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center,
direction: FlexDirection.Column }) {
Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
Column() {
Column() {
Text($r('app.string.header_title'))
.fontWeight(FontWeight.Medium)
.fontFamily($r('app.string.typeface'))
.fontColor($r('app.color.text_color'))
.fontSize(Constants.HEADER_TEXT_FRONT_SIZE)
.lineHeight(Constants.HEADER_TEXT_LINE_HEIGHT)
.width(Constants.HEADER_TEXT_WIDTH)
.align(Alignment.Start)
}
.width(Constants.HEADER_COLUMN_WIDTH)
.height(Constants.HEADER_COLUMN_HEIGHT)
.padding({
left: Constants.HEADER_COLUMN_PADDING_LEFT,
right: Constants.HEADER_COLUMN_PADDING_RIGHT
})
Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center,
direction: FlexDirection.Column }) {
Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
Column() {
Row() {
Text($r('app.string.header_title'))
.fontWeight(FontWeight.Medium)
.fontFamily($r('app.string.typeface'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize(Constants.HEADER_TEXT_FRONT_SIZE)
.lineHeight(Constants.HEADER_TEXT_LINE_HEIGHT)
.width(Constants.HEADER_TEXT_WIDTH)
.align(Alignment.Start)
}
.width(Constants.HEADER_COLUMN_WIDTH)
.height(Constants.HEADER_COLUMN_HEIGHT)
.padding({
left: Constants.HEADER_COLUMN_PADDING_LEFT,
right: Constants.HEADER_COLUMN_PADDING_RIGHT
})
Row() {
LoadingProgress()
.color(Color.Blue)
.height(Constants.ENCRYPTION_LOADING_ICON_HEIGHT)
.width(Constants.ENCRYPTION_LOADING_ICON_HEIGHT)
}
Row() {
LoadingProgress()
.color(Color.Blue)
.height(Constants.ENCRYPTION_LOADING_ICON_HEIGHT)
.width(Constants.ENCRYPTION_LOADING_ICON_HEIGHT)
}
Row() {
Text($r('app.string.encryption_loading_title'))
.fontSize($r('sys.float.ohos_id_text_size_body1'))
.fontColor(0xCCCCCC)
.width(Constants.HEADER_TEXT_WIDTH)
.textAlign(TextAlign.Center)
}
}
.width(Constants.HEADER_COLUMN_WIDTH)
.height(Constants.ENCRYPTION_LOADING_HEIGHT)
.backgroundColor($r('app.color.index_background_color'))
.borderRadius(Constants.INDEX_BORDER_RADIUS)
Row() {
Text($r('app.string.encryption_loading_title'))
.fontSize($r('sys.float.ohos_id_text_size_body1'))
.fontColor(0xCCCCCC)
.width(Constants.HEADER_TEXT_WIDTH)
.textAlign(TextAlign.Center)
}
}
.width(Constants.HEADER_COLUMN_WIDTH)
.height(Constants.ENCRYPTION_LOADING_HEIGHT)
.backgroundColor($r('app.color.da_button_color'))
.borderRadius(Constants.INDEX_BORDER_RADIUS)
}
}
}
entry/src/main/ets/pages/changeEncryption.ets
+12 -8
View File
@@ -380,7 +380,7 @@ struct changeEncryption {
Text($r('app.string.header_title'))
.fontWeight(FontWeight.Medium)
.fontFamily($r('app.string.typeface'))
.fontColor($r('app.color.text_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize(Constants.HEADER_TEXT_FRONT_SIZE)
.lineHeight(Constants.HEADER_TEXT_LINE_HEIGHT)
.width(Constants.HEADER_TEXT_WIDTH)
@@ -416,17 +416,18 @@ struct changeEncryption {
Text(' : ')
.fontFamily($r('app.string.typeface'))
.fontWeight(FontWeight.Regular)
.fontColor($r('app.color.text_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize($r('sys.float.ohos_id_text_size_body2'))
Text($r('app.string.PERMISSION_TYPE_SELECT_ALL'))
.fontFamily($r('app.string.typeface'))
.fontWeight(FontWeight.Regular)
.fontColor($r('app.color.text_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize($r('sys.float.ohos_id_text_size_body2'))
Image($r('app.media.details'))
.width(Constants.FOOTER_ROW_PAD_RIGHT)
.height(Constants.FOOTER_ROW_PAD_RIGHT)
.margin({ left: Constants.AP_TEXT_PAD_RIGHT })
.fillColor($r('sys.color.ohos_id_color_text_secondary'))
.onClick(() => {
this.handlePopupReadOnly = !this.handlePopupReadOnly
})
@@ -459,12 +460,13 @@ struct changeEncryption {
Text(` (${this.staffDataArrayReadOnly['length']}):`)
.fontFamily($r('app.string.typeface'))
.fontWeight(FontWeight.Regular)
.fontColor($r('app.color.text_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize($r('sys.float.ohos_id_text_size_body2'))
Image($r('app.media.details'))
.width(Constants.FOOTER_ROW_PAD_RIGHT)
.height(Constants.FOOTER_ROW_PAD_RIGHT)
.margin({ left: Constants.AP_TEXT_PAD_RIGHT })
.fillColor($r('sys.color.ohos_id_color_text_secondary'))
.onClick(() => {
this.handlePopupReadOnly = !this.handlePopupReadOnly
})
@@ -550,17 +552,18 @@ struct changeEncryption {
Text(' : ')
.fontFamily($r('app.string.typeface'))
.fontWeight(FontWeight.Regular)
.fontColor($r('app.color.text_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize($r('sys.float.ohos_id_text_size_body2'))
Text(this.selectedPermissionTypeEdit.data === 'all' ? $r('app.string.PERMISSION_TYPE_SELECT_ALL') : $r('app.string.PERMISSION_TYPE_SELECT_SELF'))
.fontFamily($r('app.string.typeface'))
.fontWeight(FontWeight.Regular)
.fontColor($r('app.color.text_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize($r('sys.float.ohos_id_text_size_body2'))
Image($r('app.media.details'))
.width(Constants.FOOTER_ROW_PAD_RIGHT)
.height(Constants.FOOTER_ROW_PAD_RIGHT)
.margin({ left: Constants.AP_TEXT_PAD_RIGHT })
.fillColor($r('sys.color.ohos_id_color_text_secondary'))
.onClick(() => {
this.handlePopupEdit = !this.handlePopupEdit
})
@@ -594,12 +597,13 @@ struct changeEncryption {
Text(` (${this.staffDataArrayEdit['length']}):`)
.fontFamily($r('app.string.typeface'))
.fontWeight(FontWeight.Regular)
.fontColor($r('app.color.text_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize($r('sys.float.ohos_id_text_size_body2'))
Image($r('app.media.details'))
.width(Constants.FOOTER_ROW_PAD_RIGHT)
.height(Constants.FOOTER_ROW_PAD_RIGHT)
.margin({ left: Constants.AP_TEXT_PAD_RIGHT })
.fillColor($r('sys.color.ohos_id_color_text_secondary'))
.onClick(() => {
this.handlePopupEdit = !this.handlePopupEdit
})
@@ -740,7 +744,7 @@ struct changeEncryption {
}
.visibility(this.prepareData ? Visibility.Hidden : Visibility.Visible)
.width(Constants.HEADER_COLUMN_WIDTH)
.backgroundColor($r('app.color.index_background_color'))
.backgroundColor($r('app.color.da_button_color'))
.borderRadius(Constants.INDEX_BORDER_RADIUS)
}
}
entry/src/main/ets/pages/encryptionProtection.ets
+4 -2
View File
@@ -629,7 +629,7 @@ struct DlpDialog {
Text($r('app.string.header_title'))
.fontWeight(FontWeight.Medium)
.fontFamily($r('app.string.typeface'))
.fontColor($r('app.color.text_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize(Constants.HEADER_TEXT_FRONT_SIZE)
.lineHeight(Constants.HEADER_TEXT_LINE_HEIGHT)
.width(Constants.HEADER_TEXT_WIDTH)
@@ -663,6 +663,7 @@ struct DlpDialog {
.width(Constants.FOOTER_ROW_PAD_RIGHT)
.height(Constants.FOOTER_ROW_PAD_RIGHT)
.margin({ left: Constants.AP_TEXT_PAD_RIGHT })
.fillColor($r('sys.color.ohos_id_color_text_secondary'))
.onClick(() => {
this.handlePopupReadOnly = !this.handlePopupReadOnly
})
@@ -709,6 +710,7 @@ struct DlpDialog {
.width(Constants.FOOTER_ROW_PAD_RIGHT)
.height(Constants.FOOTER_ROW_PAD_RIGHT)
.margin({ left: Constants.AP_TEXT_PAD_RIGHT })
.fillColor($r('sys.color.ohos_id_color_text_secondary'))
.onClick(() => {
this.handlePopupEdit = !this.handlePopupEdit
})
@@ -810,7 +812,7 @@ struct DlpDialog {
}
.visibility(this.processing ? Visibility.Hidden : Visibility.Visible)
.width(Constants.FOOTER_ROW_WIDTH)
.backgroundColor($r('app.color.index_background_color'))
.backgroundColor($r('app.color.da_button_color'))
.borderRadius(Constants.INDEX_BORDER_RADIUS)
}
}
entry/src/main/ets/pages/encryptionSuccess.ets
+13 -9
View File
@@ -138,9 +138,9 @@ struct encryptionSuccess {
Column() {
Row() {
Text($r('app.string.header_title'))
.fontWeight(FontWeight.Bold)
.fontWeight(FontWeight.Medium)
.fontFamily($r('app.string.typeface'))
.fontColor($r('app.color.text_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize(Constants.HEADER_TEXT_FRONT_SIZE)
.lineHeight(Constants.HEADER_TEXT_LINE_HEIGHT)
.width(Constants.HEADER_TEXT_WIDTH)
@@ -218,17 +218,18 @@ struct encryptionSuccess {
Text(' : ')
.fontFamily($r('app.string.typeface'))
.fontWeight(FontWeight.Regular)
.fontColor($r('app.color.text_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize($r('sys.float.ohos_id_text_size_body2'))
Text($r('app.string.PERMISSION_TYPE_SELECT_ALL'))
.fontFamily($r('app.string.typeface'))
.fontWeight(FontWeight.Regular)
.fontColor($r('app.color.text_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize($r('sys.float.ohos_id_text_size_body2'))
Image($r('app.media.details'))
.width(Constants.FOOTER_ROW_PAD_RIGHT)
.height(Constants.FOOTER_ROW_PAD_RIGHT)
.margin({ left: Constants.AP_TEXT_PAD_RIGHT })
.fillColor($r('sys.color.ohos_id_color_text_secondary'))
.onClick(() => {
this.handlePopupReadOnly = !this.handlePopupReadOnly
})
@@ -261,12 +262,13 @@ struct encryptionSuccess {
Text(` (${this.staffDataArrayReadOnly['length']}):`)
.fontFamily($r('app.string.typeface'))
.fontWeight(FontWeight.Regular)
.fontColor($r('app.color.text_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize($r('sys.float.ohos_id_text_size_body2'))
Image($r('app.media.details'))
.width(Constants.FOOTER_ROW_PAD_RIGHT)
.height(Constants.FOOTER_ROW_PAD_RIGHT)
.margin({ left: Constants.AP_TEXT_PAD_RIGHT })
.fillColor($r('sys.color.ohos_id_color_text_secondary'))
.onClick(() => {
this.handlePopupReadOnly = !this.handlePopupReadOnly
})
@@ -352,17 +354,18 @@ struct encryptionSuccess {
Text(' : ')
.fontFamily($r('app.string.typeface'))
.fontWeight(FontWeight.Regular)
.fontColor($r('app.color.text_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize($r('sys.float.ohos_id_text_size_body2'))
Text(this.routerParams['selectedPermissionTypeEdit'].data === 'all' ? $r('app.string.PERMISSION_TYPE_SELECT_ALL') : $r('app.string.PERMISSION_TYPE_SELECT_SELF'))
.fontFamily($r('app.string.typeface'))
.fontWeight(FontWeight.Regular)
.fontColor($r('app.color.text_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize($r('sys.float.ohos_id_text_size_body2'))
Image($r('app.media.details'))
.width(Constants.FOOTER_ROW_PAD_RIGHT)
.height(Constants.FOOTER_ROW_PAD_RIGHT)
.margin({ left: Constants.AP_TEXT_PAD_RIGHT })
.fillColor($r('sys.color.ohos_id_color_text_secondary'))
.onClick(() => {
this.handlePopupEdit = !this.handlePopupEdit
})
@@ -396,12 +399,13 @@ struct encryptionSuccess {
Text(` (${this.staffDataArrayEdit['length']}):`)
.fontFamily($r('app.string.typeface'))
.fontWeight(FontWeight.Regular)
.fontColor($r('app.color.text_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize($r('sys.float.ohos_id_text_size_body2'))
Image($r('app.media.details'))
.width(Constants.FOOTER_ROW_PAD_RIGHT)
.height(Constants.FOOTER_ROW_PAD_RIGHT)
.margin({ left: Constants.AP_TEXT_PAD_RIGHT })
.fillColor($r('sys.color.ohos_id_color_text_secondary'))
.onClick(() => {
this.handlePopupEdit = !this.handlePopupEdit
})
@@ -563,7 +567,7 @@ struct encryptionSuccess {
})
}
.width(Constants.HEADER_COLUMN_WIDTH)
.backgroundColor($r('app.color.index_background_color'))
.backgroundColor($r('app.color.da_button_color'))
.borderRadius(Constants.INDEX_BORDER_RADIUS)
}
}
entry/src/main/ets/pages/permissionStatus.ets
+4 -2
View File
@@ -176,7 +176,7 @@ struct PermissionStatus {
Text($r('app.string.header_title'))
.fontWeight(FontWeight.Medium)
.fontFamily($r('app.string.typeface'))
.fontColor($r('app.color.text_color'))
.fontColor($r('sys.color.ohos_id_color_text_primary'))
.fontSize(Constants.HEADER_TEXT_FRONT_SIZE)
.lineHeight(Constants.HEADER_TEXT_LINE_HEIGHT)
.width(Constants.HEADER_TEXT_WIDTH)
@@ -217,6 +217,8 @@ struct PermissionStatus {
Image(item.value ? $r('app.media.ok') : $r('app.media.cancel'))
.width(Constants.PP_IMAGE_WIDTH)
.height(Constants.PP_IMAGE_HEIGHT)
.fillColor($r('sys.color.ohos_id_color_text_primary'))
.opacity(Constants.ENCRYPTION_STATUS_VALUE_COLOR)
}
}
}, item => JSON.stringify(item))
@@ -275,7 +277,7 @@ struct PermissionStatus {
})
}
.width(Constants.HEADER_COLUMN_WIDTH)
.backgroundColor($r('app.color.index_background_color'))
.backgroundColor($r('app.color.da_button_color'))
.borderRadius(Constants.INDEX_BORDER_RADIUS)
}
}
entry/src/main/resources/base/element/color.json
+1 -1
View File
@@ -74,7 +74,7 @@
},
{
"name": "da_button_color",
"value": "#00FFFFFF"
"value": "#fff"
},
{
"name": "base_button_color",
entry/src/main/resources/dark/element/color.json
+4
View File
@@ -15,6 +15,10 @@
{
"name": "base_button_color",
"value": "#E6000000"
},
{
"name": "da_button_color",
"value": "#D9202224"
}
]
}