From e58fd20030a25a85b4b6a3f82cc9a06ff6e22169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=8C=A5=E5=88=AB=E6=98=A8=E5=A4=A9=E7=9A=84=E6=88=91?= <838119225@qq.com> Date: Mon, 12 Apr 2021 18:38:52 +0800 Subject: [PATCH 1/3] test empty --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index de8bc3c..2228530 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,9 @@ First, add it in your root build.gradle at the end of repositories: ```gradle + + + allprojects { repositories { ... -- Gitee From f4a0f4b2fcfb145d177201ce0a1653b74b747f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=8C=A5=E5=88=AB=E6=98=A8=E5=A4=A9=E7=9A=84=E6=88=91?= <838119225@qq.com> Date: Mon, 12 Apr 2021 19:31:18 +0800 Subject: [PATCH 2/3] redeme --- .gitignore | 9 +- README-CN.md | 76 -- README.md | 89 +- build.gradle | 45 +- demo-kotlin/build.gradle | 41 - demo-kotlin/proguard-rules.pro | 21 - .../demo/ExampleInstrumentedTest.java | 26 - demo-kotlin/src/main/AndroidManifest.xml | 19 - .../common/stepperview/demo/MainActivity.kt | 101 --- .../VerticalStepperAdapterDemoFragment.kt | 80 -- .../fragment/VerticalStepperDemoFragment.kt | 84 -- .../ic_format_list_bulleted_black_24dp.xml | 9 - .../main/res/drawable/ic_menu_white_24dp.xml | 9 - .../drawable/ic_open_in_new_black_24dp.xml | 9 - .../main/res/drawable/ic_save_white_16dp.xml | 4 - .../res/drawable/ic_thumb_up_black_24dp.xml | 9 - .../src/main/res/layout/activity_main.xml | 44 - .../res/layout/fragment_vertical_stepper.xml | 182 ---- .../fragment_vertical_stepper_adapter.xml | 15 - .../layout/vertical_stepper_sample_item.xml | 37 - .../src/main/res/menu/navigation_main.xml | 33 - .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 9478 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 14696 -> 0 bytes demo-kotlin/src/main/res/values/colors.xml | 16 - demo-kotlin/src/main/res/values/strings.xml | 21 - demo-kotlin/src/main/res/values/styles.xml | 9 - .../stepperview/demo/ExampleUnitTest.java | 17 - demo/.gitignore | 1 - demo/build.gradle | 34 - demo/proguard-rules.pro | 25 - .../stepperview/ExampleInstrumentedTest.java | 26 - demo/src/main/AndroidManifest.xml | 21 - .../common/stepperview/demo/MainActivity.java | 118 --- .../VerticalStepperAdapterDemoFragment.java | 107 --- .../fragment/VerticalStepperDemoFragment.java | 116 --- .../ic_format_list_bulleted_black_24dp.xml | 9 - .../main/res/drawable/ic_menu_white_24dp.xml | 9 - .../drawable/ic_open_in_new_black_24dp.xml | 9 - .../main/res/drawable/ic_save_white_16dp.xml | 4 - .../res/drawable/ic_thumb_up_black_24dp.xml | 9 - demo/src/main/res/layout/activity_main.xml | 44 - .../res/layout/fragment_vertical_stepper.xml | 182 ---- .../fragment_vertical_stepper_adapter.xml | 15 - .../layout/vertical_stepper_sample_item.xml | 37 - demo/src/main/res/menu/navigation_main.xml | 33 - .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 9478 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 14696 -> 0 bytes demo/src/main/res/values/colors.xml | 16 - demo/src/main/res/values/strings.xml | 21 - demo/src/main/res/values/styles.xml | 9 - .../common/stepperview/ExampleUnitTest.java | 17 - {demo-kotlin => entry}/.gitignore | 0 entry/build.gradle | 27 + entry/proguard-rules.pro | 1 + entry/src/main/config.json | 58 ++ .../feng/common/steperview/MainAbility.java | 19 + .../feng/common/steperview/MyApplication.java | 10 + .../steperview/slice/MainAbilitySlice.java | 302 +++++++ .../feng/common/steperview/utils/Utilty.java | 97 ++ .../steperview/utils/ViewCreateHelper.java | 428 +++++++++ .../steperview/view/SampleItemProvider.java | 275 ++++++ .../main/resources/base/element/color.json | 51 ++ .../main/resources/base/element/float.json | 84 ++ .../main/resources/base/element/integer.json | 12 + .../main/resources/base/element/strarray.json | 15 + .../main/resources/base/element/string.json | 52 ++ .../base/graphic/background_ability_main.xml | 8 + .../base/graphic/background_toast.xml | 8 + .../base/graphic/blue_background.xml | 8 + .../base/graphic/blue_cir_background.xml | 12 + .../resources/base/graphic/button_skip.xml | 11 + .../base/graphic/dark_background.xml | 12 + .../base/graphic/gray_background.xml | 8 + .../main/resources/base/graphic/gray_shap.xml | 12 + .../base/graphic/ic_done_white_16dp.xml | 11 + .../ic_format_list_bulleted_black_24dp.xml | 9 + .../base/graphic/ic_menu_white_24dp.xml | 12 + .../graphic/ic_open_in_new_black_24dp.xml | 9 + .../base/graphic/ic_save_white_16dp.xml | 4 + .../base/graphic/ic_thumb_up_black_24dp.xml | 9 + .../base/graphic/ic_warning_black_24dp.xml | 11 + .../main/resources/base/graphic/icon_app.xml | 15 + .../resources/base/graphic/red_background.xml | 8 + .../main/resources/base/graphic/title_bg.xml | 8 + .../resources/base/layout/ability_main.xml | 314 +++++++ .../resources/base/layout/layout_toast.xml | 19 + .../main/resources/base/layout/left_main.xml | 123 +++ .../base/layout/pager_srcoll_item.xml | 12 + .../base/layout/step_item_layout.xml | 170 ++++ .../resources/base/layout/step_layout.xml | 54 ++ .../base/layout/step_list_item_layout.xml | 157 ++++ .../main/resources/base/media/blue_menu.png | Bin 0 -> 342 bytes .../base/media/ic_expand_less_black_12dp.png | Bin 0 -> 484 bytes .../base/media/ic_expand_less_black_16dp.png | Bin 0 -> 595 bytes .../base/media/ic_expand_more_black_12dp.png | Bin 0 -> 488 bytes .../base/media/ic_expand_more_black_16dp.png | Bin 0 -> 565 bytes entry/src/main/resources/base/media/icon.png | Bin 0 -> 6790 bytes entry/src/main/resources/base/media/warn.png | Bin 0 -> 539 bytes entry/src/ohosTest/config.json | 41 + .../common/steperview/ExampleOhosTest.java | 14 + .../feng/common/steperview/ExampleTest.java | 9 + gradle.properties | 12 +- gradle/wrapper/gradle-wrapper.jar | Bin 53636 -> 58694 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 109 ++- gradlew.bat | 33 +- library/.gitignore | 1 - library/build.gradle | 28 +- library/libs/okhttp.jar | Bin 0 -> 628291 bytes library/proguard-rules.pro | 25 - .../stepperview/ExampleInstrumentedTest.java | 26 - library/src/main/AndroidManifest.xml | 2 - library/src/main/config.json | 27 + .../stepperview/CustomeDirectionalLayout.java | 192 ++++ .../common/stepperview/IStepperAdapter.java | 73 -- .../feng/common/stepperview/IStepperView.java | 83 -- .../stepperview/VerticalStepperItemView.java | 855 ------------------ .../stepperview/VerticalStepperView.java | 481 ---------- .../stepperview/ViewBasedStepperAdapter.java | 36 - .../feng/common/stepperview/ViewUtils.java | 59 -- .../interfaces/UpdatePositionState.java | 10 + .../internal/ClipOvalFrameLayout.java | 67 -- .../internal/VerticalSpaceItemDecoration.java | 26 - .../common/stepperview/util/DensityUtils.java | 71 ++ .../stepperview/util/DrawableUtils.java | 168 ++++ .../moe/feng/common/stepperview/util/Log.java | 12 + .../stepperview/util/TypedAttrUtils.java | 117 +++ .../feng/common/stepperview/util/Utility.java | 43 + .../view/MaterialRippleLayout.java | 634 +++++++++++++ .../stepperview/view/ProgressWheel.java | 461 ++++++++++ .../common/stepperview/view/ViewUtils.java | 60 ++ .../main/res/drawable/ic_done_white_16dp.xml | 4 - .../res/drawable/ic_warning_black_24dp.xml | 9 - .../res/drawable/stepper_point_background.xml | 4 - .../vertical_stepper_item_view_layout.xml | 113 --- library/src/main/res/values/attrs.xml | 45 - library/src/main/res/values/colors.xml | 9 - library/src/main/res/values/dimens.xml | 16 - library/src/main/res/values/styles.xml | 41 - .../main/resources/base/element/color.json | 21 + .../main/resources/base/element/float.json | 40 + .../main/resources/base/element/string.json | 24 + .../base/graphic/ic_done_white_16dp.xml | 8 + .../base/graphic/ic_warning_black_24dp.xml | 11 + .../base/graphic/stepper_point_background.xml | 11 + .../common/stepperview/ExampleUnitTest.java | 17 - settings.gradle | 2 +- 147 files changed, 4609 insertions(+), 3865 deletions(-) delete mode 100644 README-CN.md delete mode 100644 demo-kotlin/build.gradle delete mode 100644 demo-kotlin/proguard-rules.pro delete mode 100644 demo-kotlin/src/androidTest/java/moe/feng/common/stepperview/demo/ExampleInstrumentedTest.java delete mode 100644 demo-kotlin/src/main/AndroidManifest.xml delete mode 100644 demo-kotlin/src/main/kotlin/moe/feng/common/stepperview/demo/MainActivity.kt delete mode 100644 demo-kotlin/src/main/kotlin/moe/feng/common/stepperview/demo/fragment/VerticalStepperAdapterDemoFragment.kt delete mode 100644 demo-kotlin/src/main/kotlin/moe/feng/common/stepperview/demo/fragment/VerticalStepperDemoFragment.kt delete mode 100644 demo-kotlin/src/main/res/drawable/ic_format_list_bulleted_black_24dp.xml delete mode 100644 demo-kotlin/src/main/res/drawable/ic_menu_white_24dp.xml delete mode 100644 demo-kotlin/src/main/res/drawable/ic_open_in_new_black_24dp.xml delete mode 100644 demo-kotlin/src/main/res/drawable/ic_save_white_16dp.xml delete mode 100644 demo-kotlin/src/main/res/drawable/ic_thumb_up_black_24dp.xml delete mode 100644 demo-kotlin/src/main/res/layout/activity_main.xml delete mode 100644 demo-kotlin/src/main/res/layout/fragment_vertical_stepper.xml delete mode 100644 demo-kotlin/src/main/res/layout/fragment_vertical_stepper_adapter.xml delete mode 100644 demo-kotlin/src/main/res/layout/vertical_stepper_sample_item.xml delete mode 100644 demo-kotlin/src/main/res/menu/navigation_main.xml delete mode 100644 demo-kotlin/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 demo-kotlin/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png delete mode 100644 demo-kotlin/src/main/res/values/colors.xml delete mode 100644 demo-kotlin/src/main/res/values/strings.xml delete mode 100644 demo-kotlin/src/main/res/values/styles.xml delete mode 100644 demo-kotlin/src/test/java/moe/feng/common/stepperview/demo/ExampleUnitTest.java delete mode 100644 demo/.gitignore delete mode 100644 demo/build.gradle delete mode 100644 demo/proguard-rules.pro delete mode 100644 demo/src/androidTest/java/moe/feng/common/stepperview/ExampleInstrumentedTest.java delete mode 100644 demo/src/main/AndroidManifest.xml delete mode 100644 demo/src/main/java/moe/feng/common/stepperview/demo/MainActivity.java delete mode 100644 demo/src/main/java/moe/feng/common/stepperview/demo/fragment/VerticalStepperAdapterDemoFragment.java delete mode 100644 demo/src/main/java/moe/feng/common/stepperview/demo/fragment/VerticalStepperDemoFragment.java delete mode 100644 demo/src/main/res/drawable/ic_format_list_bulleted_black_24dp.xml delete mode 100644 demo/src/main/res/drawable/ic_menu_white_24dp.xml delete mode 100644 demo/src/main/res/drawable/ic_open_in_new_black_24dp.xml delete mode 100644 demo/src/main/res/drawable/ic_save_white_16dp.xml delete mode 100644 demo/src/main/res/drawable/ic_thumb_up_black_24dp.xml delete mode 100644 demo/src/main/res/layout/activity_main.xml delete mode 100644 demo/src/main/res/layout/fragment_vertical_stepper.xml delete mode 100644 demo/src/main/res/layout/fragment_vertical_stepper_adapter.xml delete mode 100644 demo/src/main/res/layout/vertical_stepper_sample_item.xml delete mode 100644 demo/src/main/res/menu/navigation_main.xml delete mode 100644 demo/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 demo/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png delete mode 100644 demo/src/main/res/values/colors.xml delete mode 100644 demo/src/main/res/values/strings.xml delete mode 100644 demo/src/main/res/values/styles.xml delete mode 100644 demo/src/test/java/moe/feng/common/stepperview/ExampleUnitTest.java rename {demo-kotlin => entry}/.gitignore (100%) create mode 100644 entry/build.gradle create mode 100644 entry/proguard-rules.pro create mode 100644 entry/src/main/config.json create mode 100644 entry/src/main/java/moe/feng/common/steperview/MainAbility.java create mode 100644 entry/src/main/java/moe/feng/common/steperview/MyApplication.java create mode 100644 entry/src/main/java/moe/feng/common/steperview/slice/MainAbilitySlice.java create mode 100644 entry/src/main/java/moe/feng/common/steperview/utils/Utilty.java create mode 100644 entry/src/main/java/moe/feng/common/steperview/utils/ViewCreateHelper.java create mode 100644 entry/src/main/java/moe/feng/common/steperview/view/SampleItemProvider.java create mode 100644 entry/src/main/resources/base/element/color.json create mode 100644 entry/src/main/resources/base/element/float.json create mode 100644 entry/src/main/resources/base/element/integer.json create mode 100644 entry/src/main/resources/base/element/strarray.json create mode 100644 entry/src/main/resources/base/element/string.json create mode 100644 entry/src/main/resources/base/graphic/background_ability_main.xml create mode 100644 entry/src/main/resources/base/graphic/background_toast.xml create mode 100644 entry/src/main/resources/base/graphic/blue_background.xml create mode 100644 entry/src/main/resources/base/graphic/blue_cir_background.xml create mode 100644 entry/src/main/resources/base/graphic/button_skip.xml create mode 100644 entry/src/main/resources/base/graphic/dark_background.xml create mode 100644 entry/src/main/resources/base/graphic/gray_background.xml create mode 100644 entry/src/main/resources/base/graphic/gray_shap.xml create mode 100644 entry/src/main/resources/base/graphic/ic_done_white_16dp.xml create mode 100644 entry/src/main/resources/base/graphic/ic_format_list_bulleted_black_24dp.xml create mode 100644 entry/src/main/resources/base/graphic/ic_menu_white_24dp.xml create mode 100644 entry/src/main/resources/base/graphic/ic_open_in_new_black_24dp.xml create mode 100644 entry/src/main/resources/base/graphic/ic_save_white_16dp.xml create mode 100644 entry/src/main/resources/base/graphic/ic_thumb_up_black_24dp.xml create mode 100644 entry/src/main/resources/base/graphic/ic_warning_black_24dp.xml create mode 100644 entry/src/main/resources/base/graphic/icon_app.xml create mode 100644 entry/src/main/resources/base/graphic/red_background.xml create mode 100644 entry/src/main/resources/base/graphic/title_bg.xml create mode 100644 entry/src/main/resources/base/layout/ability_main.xml create mode 100644 entry/src/main/resources/base/layout/layout_toast.xml create mode 100644 entry/src/main/resources/base/layout/left_main.xml create mode 100644 entry/src/main/resources/base/layout/pager_srcoll_item.xml create mode 100644 entry/src/main/resources/base/layout/step_item_layout.xml create mode 100644 entry/src/main/resources/base/layout/step_layout.xml create mode 100644 entry/src/main/resources/base/layout/step_list_item_layout.xml create mode 100644 entry/src/main/resources/base/media/blue_menu.png create mode 100644 entry/src/main/resources/base/media/ic_expand_less_black_12dp.png create mode 100644 entry/src/main/resources/base/media/ic_expand_less_black_16dp.png create mode 100644 entry/src/main/resources/base/media/ic_expand_more_black_12dp.png create mode 100644 entry/src/main/resources/base/media/ic_expand_more_black_16dp.png create mode 100644 entry/src/main/resources/base/media/icon.png create mode 100644 entry/src/main/resources/base/media/warn.png create mode 100644 entry/src/ohosTest/config.json create mode 100644 entry/src/ohosTest/java/moe/feng/common/steperview/ExampleOhosTest.java create mode 100644 entry/src/test/java/moe/feng/common/steperview/ExampleTest.java delete mode 100644 library/.gitignore create mode 100644 library/libs/okhttp.jar delete mode 100644 library/proguard-rules.pro delete mode 100644 library/src/androidTest/java/moe/feng/common/stepperview/ExampleInstrumentedTest.java delete mode 100644 library/src/main/AndroidManifest.xml create mode 100644 library/src/main/config.json create mode 100644 library/src/main/java/moe/feng/common/stepperview/CustomeDirectionalLayout.java delete mode 100644 library/src/main/java/moe/feng/common/stepperview/IStepperAdapter.java delete mode 100644 library/src/main/java/moe/feng/common/stepperview/IStepperView.java delete mode 100644 library/src/main/java/moe/feng/common/stepperview/VerticalStepperItemView.java delete mode 100644 library/src/main/java/moe/feng/common/stepperview/VerticalStepperView.java delete mode 100644 library/src/main/java/moe/feng/common/stepperview/ViewBasedStepperAdapter.java delete mode 100644 library/src/main/java/moe/feng/common/stepperview/ViewUtils.java create mode 100644 library/src/main/java/moe/feng/common/stepperview/interfaces/UpdatePositionState.java delete mode 100644 library/src/main/java/moe/feng/common/stepperview/internal/ClipOvalFrameLayout.java delete mode 100644 library/src/main/java/moe/feng/common/stepperview/internal/VerticalSpaceItemDecoration.java create mode 100644 library/src/main/java/moe/feng/common/stepperview/util/DensityUtils.java create mode 100644 library/src/main/java/moe/feng/common/stepperview/util/DrawableUtils.java create mode 100644 library/src/main/java/moe/feng/common/stepperview/util/Log.java create mode 100644 library/src/main/java/moe/feng/common/stepperview/util/TypedAttrUtils.java create mode 100644 library/src/main/java/moe/feng/common/stepperview/util/Utility.java create mode 100644 library/src/main/java/moe/feng/common/stepperview/view/MaterialRippleLayout.java create mode 100644 library/src/main/java/moe/feng/common/stepperview/view/ProgressWheel.java create mode 100644 library/src/main/java/moe/feng/common/stepperview/view/ViewUtils.java delete mode 100644 library/src/main/res/drawable/ic_done_white_16dp.xml delete mode 100644 library/src/main/res/drawable/ic_warning_black_24dp.xml delete mode 100644 library/src/main/res/drawable/stepper_point_background.xml delete mode 100644 library/src/main/res/layout/vertical_stepper_item_view_layout.xml delete mode 100644 library/src/main/res/values/attrs.xml delete mode 100644 library/src/main/res/values/colors.xml delete mode 100644 library/src/main/res/values/dimens.xml delete mode 100644 library/src/main/res/values/styles.xml create mode 100644 library/src/main/resources/base/element/color.json create mode 100644 library/src/main/resources/base/element/float.json create mode 100644 library/src/main/resources/base/element/string.json create mode 100644 library/src/main/resources/base/graphic/ic_done_white_16dp.xml create mode 100644 library/src/main/resources/base/graphic/ic_warning_black_24dp.xml create mode 100644 library/src/main/resources/base/graphic/stepper_point_background.xml delete mode 100644 library/src/test/java/moe/feng/common/stepperview/ExampleUnitTest.java diff --git a/.gitignore b/.gitignore index 09b993d..37a4eb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,15 @@ *.iml .gradle /local.properties -/.idea +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml .DS_Store /build /captures .externalNativeBuild +/entry/.preview +.cxx diff --git a/README-CN.md b/README-CN.md deleted file mode 100644 index 47d28cf..0000000 --- a/README-CN.md +++ /dev/null @@ -1,76 +0,0 @@ -# MaterialStepperView - -[![](https://jitpack.io/v/moe.feng/MaterialStepperView.svg)](https://jitpack.io/#moe.feng/MaterialStepperView) - -[Material Design Stepper](https://material.io/guidelines/components/steppers.html) 控件 Android 版本 (SDK 17+) - -[项目 Wiki](https://github.com/fython/MaterialStepperView/wiki) - -## 导入 (Gradle) - -首先，在你的项目根目录的 build.gradle 加入 JitPack 的 Repositories： - -```gradle -allprojects { - repositories { - ... - maven { url 'https://jitpack.io' } - } -} -``` - -在你的应用模块中加入依赖： - -```gradle -dependencies { - compile 'moe.feng:MaterialStepperView:latest-version' -} -``` - -## 样式 - -目前我们只做了竖直样式的 Stepper 组件。 - -未来将会加入更多的样式。 - -你可以自定义正常/激活的圆点颜色、完成图标、动画时长、是否启用动画、线条颜色以及错误高亮颜色之类的参数。[How to?](https://github.com/fython/MaterialStepperView/wiki/Set-item-values-and-styles) - -### 竖直样式 Stepper - -[![Vertical Stepper View Demo](.readme/vertical.gif)](https://www.youtube.com/watch?v=y9gSwHKwxVM) - -[阅读 Wiki](https://github.com/fython/MaterialStepperView/wiki/Vertical-Style) 了解如何使用。 - -## 支持 - -如果你很喜欢这个项目并且乐意支持我，你可以通过支付宝或 PayPal 捐赠我。 - -支付宝: fythonx@gmail.com - -PayPal: [https://www.paypal.me/fython](https://www.paypal.me/fython) - -## 协议 - -``` -MIT License - -Copyright (c) 2017-2018 Fung Go (fython) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -``` diff --git a/README.md b/README.md index 2228530..f83caff 100644 --- a/README.md +++ b/README.md @@ -1,64 +1,53 @@ # MaterialStepperView -[![](https://jitpack.io/v/moe.feng/MaterialStepperView.svg)](https://jitpack.io/#moe.feng/MaterialStepperView) - -[Material Design Stepper](https://material.io/guidelines/components/steppers.html) Widgets on Android (SDK 17+) - -[Repo Wiki](https://github.com/fython/MaterialStepperView/wiki) [绠浣撲腑鏂囪鏄111](./README-CN.md) - -## Import (Gradle) - -First, add it in your root build.gradle at the end of repositories: - - -```gradle - - - -allprojects { - repositories { - ... - maven { url 'https://jitpack.io' } - } -} +**鏈」鐩槸鍩轰簬寮婧愰」鐩甅aterialStepperView杩涜楦胯挋鍖栫殑绉绘鍜屽紑鍙戠殑锛屽彲浠ラ氳繃椤圭洰鏍囩锛锛変互鍙奼ithub鍦板潃锛锛夎拷韪埌鍘熷畨鍗撻」鐩増鏈」鐩粙缁** + +#### 椤圭洰浠嬬粛 +- 椤圭洰鍚嶇О锛歁aterialStepperView +- 鎵灞炵郴鍒楋細楦胯挋鐨勭涓夋柟缁勪欢閫傞厤绉绘 +- 鍔熻兘锛氳繘搴﹁〃 +- 椤圭洰绉绘鐘舵侊細鏈夊樊寮 +- 璋冪敤宸紓锛氭棤 +- 寮鍙戠増鏈細sdk5锛孌evEco Studio2.1 beta3 +- 椤圭洰浣滆呭拰缁存姢浜猴細鐜嬪啲鍐 +- 鑱旂郴鏂瑰紡锛歸angdongdong073@chinasoftinc.com +- 鍘熼」鐩瓺oc鍦板潃锛歨ttps://github.com/fython/MaterialStepperView + +#### 椤圭洰浠嬬粛 +- 缂栫▼璇█锛欽ava +- 澶栭儴搴撲緷璧栵細鏃 + +#### 瀹夎鏁欑▼ + +1. 涓嬭浇okhttp鐨刯ar鍖卭khttp.jar锛堜綅浜庯細锛夈 +2. 鍚姩 DevEco Studio锛屽皢涓嬭浇鐨刯ar鍖咃紝瀵煎叆宸ョ▼鐩綍鈥渆ntry->libs鈥濅笅銆 +3. 鍦╩oudle绾у埆涓嬬殑build.gradle鏂囦欢涓坊鍔犱緷璧栵紝鍦╠ependences鏍囩涓鍔犲libs鐩綍涓媕ar鍖呯殑寮曠敤銆 ``` - -Add the dependency to your app modules: - -```gradle dependencies { - compile 'moe.feng:MaterialStepperView:latest-version' + implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) + 鈥︹ } ``` +4. 鍦ㄥ鍏ョ殑jar鍖呬笂鐐瑰嚮鍙抽敭锛岄夋嫨鈥淎dd as Library鈥濆鍖呰繘琛屽紩鐢紝閫夋嫨闇瑕佸紩鐢ㄧ殑妯″潡锛岀偣鍑烩淥K鈥濆嵆寮曠敤鎴愬姛銆 -## Styles - -Currently, we have only made Vertical style stepper view. - -There will be more styles in the future. - -You can customize normal/activated point color, done icon, animation duration and animation enabled also. [How to?](https://github.com/fython/MaterialStepperView/wiki/Set-item-values-and-styles) - -### Vertical Stepper View - -[![Vertical Stepper View Demo](.readme/vertical.gif)](https://www.youtube.com/watch?v=y9gSwHKwxVM) - -[Read Wiki](https://github.com/fython/MaterialStepperView/wiki/Vertical-Style) and learn how to use - -## Support me - -If you like this library project and you are willing to support me, you can donate me via Alipay or PayPal. - -Alipay: fythonx@gmail.com - -PayPal: [https://www.paypal.me/fython](https://www.paypal.me/fython) - -## License +#### 浣跨敤璇存槑 +- +``` +#### 浣跨敤璇存槑 +- 鐩墠鎴戜滑鍙仛浜嗙珫鐩存牱寮忕殑 Stepper 缁勪欢銆傛湭鏉ュ皢浼氬姞鍏ユ洿澶氱殑鏍峰紡銆 +浣犲彲浠ヨ嚜瀹氫箟姝ｅ父/婵娲荤殑鍦嗙偣棰滆壊銆佸畬鎴愬浘鏍囥佸姩鐢绘椂闀裤佹槸鍚﹀惎鐢ㄥ姩鐢汇佺嚎鏉￠鑹蹭互鍙婇敊璇珮浜鑹蹭箣绫荤殑鍙傛暟銆 +#### 娴嬭瘯淇℃伅 +CodeCheck浠ｇ爜娴嬭瘯鏃犲紓甯 +VirusTotal鐥呮瘨瀹夊叏妫娴嬮氳繃 +娴嬭瘯鍛橈細闄堢繑 +#### 鐗堟湰杩唬 +- v0.0.1-alpha +#### 鐗堟潈鍜岃鍙俊鎭 ``` MIT License -Copyright (c) 2017-2020 Siubeng Fung (fython) +Copyright (c) 2017-2018 Fung Go (fython) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/build.gradle b/build.gradle index 5506629..69bbf9d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,30 +1,37 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +apply plugin: 'com.huawei.ohos.app' + +ohos { + compileSdkVersion 5 + defaultConfig { + compatibleSdkVersion 4 + } +} + buildscript { - ext.kotlin_version = '1.3.61' repositories { - jcenter() - google() + maven { + url 'https://repo.huaweicloud.com/repository/maven/' + } + maven { + url 'https://developer.huawei.com/repo/' + } + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0-alpha09' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.huawei.ohos:hap:2.4.2.5' + classpath 'com.huawei.ohos:decctest:1.0.0.6' } } allprojects { repositories { - jcenter() - google() - maven { url "https://jitpack.io" } + maven { + url 'https://repo.huaweicloud.com/repository/maven/' + } + maven { + url 'https://developer.huawei.com/repo/' + } + jcenter() } } - -task clean(type: Delete) { - delete rootProject.buildDir -} - -ext { - minSdkVersion = 17 - targetSdkVersion = 29 - versionCode = 7 - versionName = '0.2.5' -} diff --git a/demo-kotlin/build.gradle b/demo-kotlin/build.gradle deleted file mode 100644 index 995037a..0000000 --- a/demo-kotlin/build.gradle +++ /dev/null @@ -1,41 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion rootProject.ext.targetSdkVersion - - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode rootProject.ext.versionCode - versionName rootProject.ext.versionName - applicationId "moe.feng.common.stepperview.demo" - - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - sourceSets { - main { - java.srcDirs += 'src/main/kotlin' - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - testImplementation 'junit:junit:4.12' - - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'com.google.android.material:material:1.2.0-alpha04' - implementation 'moe.feng:AlipayZeroSdk:1.1' - implementation project(':library') -} diff --git a/demo-kotlin/proguard-rules.pro b/demo-kotlin/proguard-rules.pro deleted file mode 100644 index f1b4245..0000000 --- a/demo-kotlin/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/demo-kotlin/src/androidTest/java/moe/feng/common/stepperview/demo/ExampleInstrumentedTest.java b/demo-kotlin/src/androidTest/java/moe/feng/common/stepperview/demo/ExampleInstrumentedTest.java deleted file mode 100644 index 6f4f59a..0000000 --- a/demo-kotlin/src/androidTest/java/moe/feng/common/stepperview/demo/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package moe.feng.common.stepperview.demo; - -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() throws Exception { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("moe.feng.common.stepperview.demo", appContext.getPackageName()); - } -} diff --git a/demo-kotlin/src/main/AndroidManifest.xml b/demo-kotlin/src/main/AndroidManifest.xml deleted file mode 100644 index 9811560..0000000 --- a/demo-kotlin/src/main/AndroidManifest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - diff --git a/demo-kotlin/src/main/kotlin/moe/feng/common/stepperview/demo/MainActivity.kt b/demo-kotlin/src/main/kotlin/moe/feng/common/stepperview/demo/MainActivity.kt deleted file mode 100644 index 9808557..0000000 --- a/demo-kotlin/src/main/kotlin/moe/feng/common/stepperview/demo/MainActivity.kt +++ /dev/null @@ -1,101 +0,0 @@ -package moe.feng.common.stepperview.demo - -import android.app.AlertDialog -import android.content.Intent -import android.net.Uri -import android.os.Bundle -import android.view.MenuItem -import androidx.appcompat.app.AppCompatActivity -import androidx.drawerlayout.widget.DrawerLayout -import androidx.fragment.app.Fragment -import com.google.android.material.navigation.NavigationView -import moe.feng.alipay.zerosdk.AlipayZeroSdk -import moe.feng.common.stepperview.demo.fragment.VerticalStepperAdapterDemoFragment -import moe.feng.common.stepperview.demo.fragment.VerticalStepperDemoFragment - -class MainActivity : AppCompatActivity() { - - private lateinit var mDrawerLayout: DrawerLayout - private lateinit var mNavigationView: NavigationView - - private val mVerticalStepperDemoFragment = VerticalStepperDemoFragment() - private val mVerticalStepperAdapterDemoFragment = VerticalStepperAdapterDemoFragment() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - - setSupportActionBar(findViewById(R.id.toolbar)) - supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_menu_white_24dp) - supportActionBar?.setDisplayHomeAsUpEnabled(true) - - mDrawerLayout = findViewById(R.id.drawer_layout) - - mNavigationView = findViewById(R.id.navigation_view) - mNavigationView.setNavigationItemSelectedListener(this::onNavigationItemSelected) - - if (savedInstanceState == null) { - replaceFragment(mVerticalStepperDemoFragment) - } - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) { - android.R.id.home -> { - if (mDrawerLayout.isDrawerOpen(mNavigationView)) { - mDrawerLayout.closeDrawer(mNavigationView) - } else { - mDrawerLayout.openDrawer(mNavigationView) - } - true - } - else -> false - } - - private fun onNavigationItemSelected(item: MenuItem): Boolean { - mDrawerLayout.closeDrawer(mNavigationView) - when (item.itemId) { - R.id.item_vertical_stepper -> { - replaceFragment(mVerticalStepperDemoFragment) - return true - } - R.id.item_vertical_stepper_adapter -> { - replaceFragment(mVerticalStepperAdapterDemoFragment) - return true - } - R.id.action_alipay_donate -> { - if (AlipayZeroSdk.hasInstalledAlipayClient(this)) { - AlipayZeroSdk.startAlipayClient(this, "aehvyvf4taua18zo6e") - } else { - AlertDialog.Builder(this) - .setTitle(R.string.donate_dialog_title) - .setMessage(R.string.donate_dialog_message) - .setPositiveButton(android.R.string.ok, null) - .setNeutralButton(R.string.doante_dialog_paypal_button) { _, _ -> - openWebsite("https://paypal.me/fython") - } - .show() - } - return true - } - R.id.action_fork_on_github -> { - openWebsite("https://github.com/fython/MaterialStepperView") - return true - } - else -> return false - } - } - - private fun replaceFragment(fragment: Fragment) { - supportFragmentManager.beginTransaction().replace(R.id.container, fragment).commit() - } - - private fun openWebsite(url: String) { - val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) - try { - startActivity(intent) - } catch (e: Exception) { - e.printStackTrace() - } - } - -} diff --git a/demo-kotlin/src/main/kotlin/moe/feng/common/stepperview/demo/fragment/VerticalStepperAdapterDemoFragment.kt b/demo-kotlin/src/main/kotlin/moe/feng/common/stepperview/demo/fragment/VerticalStepperAdapterDemoFragment.kt deleted file mode 100644 index 327390a..0000000 --- a/demo-kotlin/src/main/kotlin/moe/feng/common/stepperview/demo/fragment/VerticalStepperAdapterDemoFragment.kt +++ /dev/null @@ -1,80 +0,0 @@ -package moe.feng.common.stepperview.demo.fragment - -import android.content.Context -import android.os.Bundle -import android.text.Html -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.Button -import android.widget.TextView -import androidx.fragment.app.Fragment -import com.google.android.material.snackbar.Snackbar - -import moe.feng.common.stepperview.IStepperAdapter -import moe.feng.common.stepperview.VerticalStepperItemView -import moe.feng.common.stepperview.VerticalStepperView -import moe.feng.common.stepperview.demo.R - -class VerticalStepperAdapterDemoFragment : Fragment(), IStepperAdapter { - - private lateinit var mVerticalStepperView: VerticalStepperView - - override fun onCreateView(inflater: LayoutInflater, parent: ViewGroup?, savedInstanceState: Bundle?): View? { - return inflater.inflate(R.layout.fragment_vertical_stepper_adapter, parent, false) - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - mVerticalStepperView = view.findViewById(R.id.vertical_stepper_view) - mVerticalStepperView.stepperAdapter = this - } - - override fun getTitle(index: Int) = "Step $index" - - override fun getSummary(index: Int): CharSequence? = when (index) { - 0 -> Html.fromHtml("Summarized if needed" + if (mVerticalStepperView.currentStep > index) "; isDone!" else "") - 2 -> Html.fromHtml("Last step" + if (mVerticalStepperView.currentStep > index) "; isDone!" else "") - else -> null - } - - override fun size() = 3 - - override fun onCreateCustomView(index: Int, context: Context, parent: VerticalStepperItemView): View { - val inflateView = LayoutInflater.from(context).inflate(R.layout.vertical_stepper_sample_item, parent, false) - val contentView = inflateView.findViewById(R.id.item_content) - contentView.setText( - when (index) { - 0 -> R.string.content_step_0 - 1 -> R.string.content_step_1 - else -> R.string.content_step_2 - } - ) - val nextButton = inflateView.findViewById