From ecbc7c5613882fb055dd40af0b42e45443c69b92 Mon Sep 17 00:00:00 2001 From: cuizhaofei Date: Mon, 31 May 2021 11:16:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9button=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=BD=AC=E5=A4=A7=E5=86=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/resources/base/layout/ability_details.xml | 4 ++-- .../com/vlonjatg/progressability/ProgressDependentLayout.java | 2 +- .../vlonjatg/progressability/ProgressDirectionalLayout.java | 2 +- .../com/vlonjatg/progressability/ProgressStackLayout.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/entry/src/main/resources/base/layout/ability_details.xml b/entry/src/main/resources/base/layout/ability_details.xml index 55bb78e..c3ad31a 100644 --- a/entry/src/main/resources/base/layout/ability_details.xml +++ b/entry/src/main/resources/base/layout/ability_details.xml @@ -56,7 +56,7 @@ ohos:height="0vp" ohos:width="match_content" ohos:layout_alignment="center" - ohos:text="hello_world" + ohos:text="Hello world!" ohos:text_size="15fp" ohos:weight="1"/> @@ -68,7 +68,7 @@ ohos:bottom_margin="5vp" ohos:left_padding="30vp" ohos:right_padding="30vp" - ohos:text="Hi" + ohos:text="HI" ohos:text_size="15fp" ohos:top_padding="7vp" app:super_normal_color="#FF4081" diff --git a/library/src/main/java/com/vlonjatg/progressability/ProgressDependentLayout.java b/library/src/main/java/com/vlonjatg/progressability/ProgressDependentLayout.java index 90440f9..2288eb8 100644 --- a/library/src/main/java/com/vlonjatg/progressability/ProgressDependentLayout.java +++ b/library/src/main/java/com/vlonjatg/progressability/ProgressDependentLayout.java @@ -200,7 +200,7 @@ public class ProgressDependentLayout extends DependentLayout implements Progress } errorStateTitleTextView.setText(parameterEntity.getTitle()); errorStateContentTextView.setText(parameterEntity.getDescription()); - errorStateButton.setText(parameterEntity.getButtonText()); + errorStateButton.setText(parameterEntity.getButtonText().toUpperCase()); errorStateButton.setClickedListener(parameterEntity.getButtonClickListener()); break; default: diff --git a/library/src/main/java/com/vlonjatg/progressability/ProgressDirectionalLayout.java b/library/src/main/java/com/vlonjatg/progressability/ProgressDirectionalLayout.java index 62c9de5..d93f359 100644 --- a/library/src/main/java/com/vlonjatg/progressability/ProgressDirectionalLayout.java +++ b/library/src/main/java/com/vlonjatg/progressability/ProgressDirectionalLayout.java @@ -201,7 +201,7 @@ public class ProgressDirectionalLayout extends DirectionalLayout implements Prog } errorStateTitleTextView.setText(parameterEntity.getTitle()); errorStateContentTextView.setText(parameterEntity.getDescription()); - errorStateButton.setText(parameterEntity.getButtonText()); + errorStateButton.setText(parameterEntity.getButtonText().toUpperCase()); errorStateButton.setClickedListener(parameterEntity.getButtonClickListener()); break; default: diff --git a/library/src/main/java/com/vlonjatg/progressability/ProgressStackLayout.java b/library/src/main/java/com/vlonjatg/progressability/ProgressStackLayout.java index d30f639..4020526 100644 --- a/library/src/main/java/com/vlonjatg/progressability/ProgressStackLayout.java +++ b/library/src/main/java/com/vlonjatg/progressability/ProgressStackLayout.java @@ -202,7 +202,7 @@ public class ProgressStackLayout extends StackLayout implements ProgressLayout { } errorStateTitleTextView.setText(parameterEntity.getTitle()); errorStateContentTextView.setText(parameterEntity.getDescription()); - errorStateButton.setText(parameterEntity.getButtonText()); + errorStateButton.setText(parameterEntity.getButtonText().toUpperCase()); errorStateButton.setClickedListener(parameterEntity.getButtonClickListener()); break; default: -- Gitee