From 576585cf4f18a20a6a57fa7d0dc55ba5ae5ded66 Mon Sep 17 00:00:00 2001 From: cmc Date: Wed, 28 Dec 2022 11:03:02 +0800 Subject: [PATCH] =?UTF-8?q?[hapjs-platform#631]=E3=80=901300=E5=BC=80?= =?UTF-8?q?=E6=BA=90=E7=89=88=E6=9C=AC=E3=80=91=E6=97=A0=E9=9A=9C=E7=A2=8D?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=84=E4=BB=B6=E5=B1=9E=E6=80=A7=E6=96=B9?= =?UTF-8?q?=E6=B3=95(rfc:#0002)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/hapjs/component/RecyclerDataItem.java | 2 +- .../component/view/flexbox/PercentFlexboxLayout.java | 2 +- .../src/main/java/org/hapjs/render/TabBar.java | 2 +- .../java/org/hapjs/system/utils/TalkBackUtils.java | 3 ++- .../runtime/src/main/res/layout/titlebar_view.xml | 2 +- .../widgets/src/main/java/org/hapjs/widgets/A.java | 2 +- .../widgets/src/main/java/org/hapjs/widgets/Div.java | 2 +- .../src/main/java/org/hapjs/widgets/Popup.java | 2 +- .../src/main/java/org/hapjs/widgets/Rating.java | 2 +- .../src/main/java/org/hapjs/widgets/Refresh.java | 2 +- .../src/main/java/org/hapjs/widgets/Select.java | 2 +- .../src/main/java/org/hapjs/widgets/ShareButton.java | 2 +- .../src/main/java/org/hapjs/widgets/Slider.java | 2 +- .../src/main/java/org/hapjs/widgets/Stack.java | 2 +- .../main/java/org/hapjs/widgets/canvas/Canvas.java | 2 +- .../main/java/org/hapjs/widgets/drawer/Drawer.java | 2 +- .../org/hapjs/widgets/drawer/DrawerNavigation.java | 2 +- .../src/main/java/org/hapjs/widgets/input/Button.java | 2 +- .../main/java/org/hapjs/widgets/input/CheckBox.java | 2 +- .../src/main/java/org/hapjs/widgets/input/Edit.java | 2 +- .../java/org/hapjs/widgets/input/EventButton.java | 2 +- .../src/main/java/org/hapjs/widgets/input/Label.java | 2 +- .../src/main/java/org/hapjs/widgets/input/Radio.java | 2 +- .../src/main/java/org/hapjs/widgets/input/Switch.java | 2 +- .../main/java/org/hapjs/widgets/input/TextArea.java | 2 +- .../main/java/org/hapjs/widgets/list/ListItem.java | 2 +- .../main/java/org/hapjs/widgets/map/CustomMarker.java | 2 +- .../src/main/java/org/hapjs/widgets/map/Map.java | 2 +- .../java/org/hapjs/widgets/picker/DatePicker.java | 2 +- .../java/org/hapjs/widgets/picker/MultiPicker.java | 2 +- .../java/org/hapjs/widgets/picker/TextPicker.java | 2 +- .../java/org/hapjs/widgets/picker/TimePicker.java | 2 +- .../org/hapjs/widgets/progress/CircularProgress.java | 2 +- .../hapjs/widgets/progress/HorizontalProgress.java | 2 +- .../main/java/org/hapjs/widgets/refresh/Refresh2.java | 2 +- .../java/org/hapjs/widgets/refresh/RefreshFooter.java | 2 +- .../java/org/hapjs/widgets/refresh/RefreshHeader.java | 2 +- .../org/hapjs/widgets/sectionlist/SectionGroup.java | 2 +- .../org/hapjs/widgets/sectionlist/SectionHeader.java | 2 +- .../org/hapjs/widgets/sectionlist/SectionItem.java | 2 +- .../org/hapjs/widgets/sectionlist/SectionList.java | 2 +- .../main/java/org/hapjs/widgets/tab/TabContent.java | 2 +- .../src/main/java/org/hapjs/widgets/tab/Tabs.java | 2 +- .../main/java/org/hapjs/widgets/text/HtmlText.java | 2 +- .../src/main/java/org/hapjs/widgets/text/Marquee.java | 2 +- .../main/java/org/hapjs/widgets/text/RichText.java | 2 +- .../src/main/java/org/hapjs/widgets/text/Text.java | 2 +- .../org/hapjs/widgets/view/image/FlexImageView.java | 11 +++++++++++ .../java/org/hapjs/widgets/view/lottie/Lottie.java | 2 +- .../hapjs/widgets/view/swiper/LoopPagerAdapter.java | 2 +- .../org/hapjs/widgets/view/text/FlexCheckBox.java | 2 +- .../org/hapjs/widgets/view/text/FlexEditText.java | 2 +- .../org/hapjs/widgets/view/text/FlexRadioButton.java | 2 +- 53 files changed, 64 insertions(+), 52 deletions(-) diff --git a/core/runtime/android/runtime/src/main/java/org/hapjs/component/RecyclerDataItem.java b/core/runtime/android/runtime/src/main/java/org/hapjs/component/RecyclerDataItem.java index 4f56b46d..8c380e98 100644 --- a/core/runtime/android/runtime/src/main/java/org/hapjs/component/RecyclerDataItem.java +++ b/core/runtime/android/runtime/src/main/java/org/hapjs/component/RecyclerDataItem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/runtime/src/main/java/org/hapjs/component/view/flexbox/PercentFlexboxLayout.java b/core/runtime/android/runtime/src/main/java/org/hapjs/component/view/flexbox/PercentFlexboxLayout.java index 90fb7881..109b4b64 100644 --- a/core/runtime/android/runtime/src/main/java/org/hapjs/component/view/flexbox/PercentFlexboxLayout.java +++ b/core/runtime/android/runtime/src/main/java/org/hapjs/component/view/flexbox/PercentFlexboxLayout.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/runtime/src/main/java/org/hapjs/render/TabBar.java b/core/runtime/android/runtime/src/main/java/org/hapjs/render/TabBar.java index 76372940..8c3638b8 100644 --- a/core/runtime/android/runtime/src/main/java/org/hapjs/render/TabBar.java +++ b/core/runtime/android/runtime/src/main/java/org/hapjs/render/TabBar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, the hapjs-platform Project Contributors + * Copyright (c) 2023-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ package org.hapjs.render; diff --git a/core/runtime/android/runtime/src/main/java/org/hapjs/system/utils/TalkBackUtils.java b/core/runtime/android/runtime/src/main/java/org/hapjs/system/utils/TalkBackUtils.java index c9c6f635..d30dae95 100644 --- a/core/runtime/android/runtime/src/main/java/org/hapjs/system/utils/TalkBackUtils.java +++ b/core/runtime/android/runtime/src/main/java/org/hapjs/system/utils/TalkBackUtils.java @@ -1,5 +1,6 @@ /* - * Copyright (C) 2022, hapjs.org. All rights reserved. + * Copyright (c) 2023-present, the hapjs-platform Project Contributors + * SPDX-License-Identifier: Apache-2.0 */ package org.hapjs.system.utils; diff --git a/core/runtime/android/runtime/src/main/res/layout/titlebar_view.xml b/core/runtime/android/runtime/src/main/res/layout/titlebar_view.xml index 937b2c59..51d8a9a4 100644 --- a/core/runtime/android/runtime/src/main/res/layout/titlebar_view.xml +++ b/core/runtime/android/runtime/src/main/res/layout/titlebar_view.xml @@ -1,7 +1,7 @@ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/A.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/A.java index b25b94fc..274490a3 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/A.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/A.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Div.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Div.java index 029b0145..28cf41d7 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Div.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Div.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Popup.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Popup.java index 2f73c78b..211c5c90 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Popup.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Popup.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Rating.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Rating.java index 9b0fdcf1..b95dd424 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Rating.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Rating.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Refresh.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Refresh.java index baaddc59..407be06e 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Refresh.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Refresh.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Select.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Select.java index fbd2b6d0..a7096f2a 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Select.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Select.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/ShareButton.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/ShareButton.java index f8b190f9..9b768801 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/ShareButton.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/ShareButton.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, the hapjs-platform Project Contributors + * Copyright (c) 2022-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Slider.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Slider.java index 5a1951e4..e47e0ddc 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Slider.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Slider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Stack.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Stack.java index bd09e005..a3b991ab 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Stack.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/Stack.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/canvas/Canvas.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/canvas/Canvas.java index 12cfbe74..bbabe5c5 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/canvas/Canvas.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/canvas/Canvas.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/drawer/Drawer.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/drawer/Drawer.java index f1a0d92b..23c7ab96 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/drawer/Drawer.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/drawer/Drawer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/drawer/DrawerNavigation.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/drawer/DrawerNavigation.java index 5b0ab174..0d5780c8 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/drawer/DrawerNavigation.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/drawer/DrawerNavigation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Button.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Button.java index 5f3603f7..2d8ece25 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Button.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Button.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/CheckBox.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/CheckBox.java index 05c2bdbb..8150c895 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/CheckBox.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/CheckBox.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Edit.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Edit.java index 6ac7bea6..f5e3dcb0 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Edit.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Edit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/EventButton.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/EventButton.java index 808a5335..33ca5e26 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/EventButton.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/EventButton.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, the hapjs-platform Project Contributors + * Copyright (c) 2022-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ package org.hapjs.widgets.input; diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Label.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Label.java index eb6f3bd6..1f6e6c2b 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Label.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Label.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Radio.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Radio.java index b105db1e..4ccd1af8 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Radio.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Radio.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Switch.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Switch.java index 947bcfa8..2b765df6 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Switch.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/Switch.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/TextArea.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/TextArea.java index 52c434ff..7697bec4 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/TextArea.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/input/TextArea.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/list/ListItem.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/list/ListItem.java index 1fb1ab1e..679e5d3a 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/list/ListItem.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/list/ListItem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/map/CustomMarker.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/map/CustomMarker.java index 2f0b69de..233b1c02 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/map/CustomMarker.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/map/CustomMarker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/map/Map.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/map/Map.java index 95e17ae3..1ac7f507 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/map/Map.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/map/Map.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/DatePicker.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/DatePicker.java index cdb74a03..367682d8 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/DatePicker.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/DatePicker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/MultiPicker.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/MultiPicker.java index e1119f6a..3656f11c 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/MultiPicker.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/MultiPicker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/TextPicker.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/TextPicker.java index 01818d61..f135dc53 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/TextPicker.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/TextPicker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/TimePicker.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/TimePicker.java index efeebbae..5faf947f 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/TimePicker.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/picker/TimePicker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/progress/CircularProgress.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/progress/CircularProgress.java index 38c9cf7d..1c766552 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/progress/CircularProgress.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/progress/CircularProgress.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/progress/HorizontalProgress.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/progress/HorizontalProgress.java index 09c952d0..f825c6f8 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/progress/HorizontalProgress.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/progress/HorizontalProgress.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/Refresh2.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/Refresh2.java index 5d99a1dd..c0a6f39c 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/Refresh2.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/Refresh2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/RefreshFooter.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/RefreshFooter.java index 09fdb281..b2213862 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/RefreshFooter.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/RefreshFooter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/RefreshHeader.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/RefreshHeader.java index fab1063e..09a5783c 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/RefreshHeader.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/refresh/RefreshHeader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionGroup.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionGroup.java index 239eb688..70ca5beb 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionGroup.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionGroup.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionHeader.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionHeader.java index 46aa3e14..dbed22f5 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionHeader.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionHeader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionItem.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionItem.java index 1c4819ae..1a3c85ac 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionItem.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionItem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionList.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionList.java index 3e92c11a..343dab8d 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionList.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/sectionlist/SectionList.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/tab/TabContent.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/tab/TabContent.java index 08b0fe86..1f717d9c 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/tab/TabContent.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/tab/TabContent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/tab/Tabs.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/tab/Tabs.java index c9e85261..3e176414 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/tab/Tabs.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/tab/Tabs.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/HtmlText.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/HtmlText.java index e208538e..97f6d197 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/HtmlText.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/HtmlText.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/Marquee.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/Marquee.java index 22e8a053..9f7314e1 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/Marquee.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/Marquee.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/RichText.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/RichText.java index ebf72b01..0f2b67ff 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/RichText.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/RichText.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/Text.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/Text.java index d7dc8f1f..ee09ca49 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/Text.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/text/Text.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/image/FlexImageView.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/image/FlexImageView.java index 62a6a6c8..1a2bac45 100755 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/image/FlexImageView.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/image/FlexImageView.java @@ -28,10 +28,12 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; +import android.view.accessibility.AccessibilityNodeInfo; import android.widget.ImageView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; import com.facebook.common.executors.UiThreadImmediateExecutorService; import com.facebook.common.util.UriUtil; @@ -1352,6 +1354,15 @@ public void process(Bitmap output, Bitmap source) { } } + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) + @Override + public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) { + super.onInitializeAccessibilityNodeInfo(info); + info.setClassName(""); + info.setClickable(false); + info.removeAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK); + } + private class ImageSizeDetectRequestListener extends BaseRequestListener { @Override public void onProducerFinishWithSuccess(String requestId, String producerName, @javax.annotation.Nullable Map extraMap) { diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/lottie/Lottie.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/lottie/Lottie.java index 4118827b..687a9a3c 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/lottie/Lottie.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/lottie/Lottie.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ package org.hapjs.widgets.view.lottie; diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/swiper/LoopPagerAdapter.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/swiper/LoopPagerAdapter.java index 6fc7f46b..79a0978a 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/swiper/LoopPagerAdapter.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/swiper/LoopPagerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexCheckBox.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexCheckBox.java index ebf12bf3..305eeee5 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexCheckBox.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexCheckBox.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexEditText.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexEditText.java index 28ea5631..e67b6d5e 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexEditText.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexEditText.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexRadioButton.java b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexRadioButton.java index d2b12940..372e4986 100644 --- a/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexRadioButton.java +++ b/core/runtime/android/widgets/src/main/java/org/hapjs/widgets/view/text/FlexRadioButton.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, the hapjs-platform Project Contributors + * Copyright (c) 2021-present, the hapjs-platform Project Contributors * SPDX-License-Identifier: Apache-2.0 */