From 1c93c9134c6a22c4801a3cd6bdb2de4643dbade9 Mon Sep 17 00:00:00 2001 From: HYL123698745 <1252347619@qq.com> Date: Thu, 3 Jun 2021 09:13:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A2=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/config.json | 32 +++++----- .../MainAbility.java | 4 +- .../MyApplication.java | 2 +- .../ability/AttrAbility.java | 4 +- .../ability/BaseFucAbility.java | 4 +- .../ability/ColorPoolAbility.java | 4 +- .../ability/CustomWidthAbility.java | 4 +- .../ability/DateAbility.java | 4 +- .../ability/DateDelayAbility.java | 4 +- .../ability/ElasticAbility.java | 4 +- .../ability/ExtrasAbility.java | 4 +- .../ability/FlaglayoutAbility.java | 4 +- .../ability/ItemStyleAbility.java | 4 +- .../ability/LocalConfigAbility.java | 4 +- .../ability/NonViewAbility.java | 4 +- .../ability/SimpleAbility.java | 4 +- .../ability/SlideAbility.java | 4 +- .../adapter/ChooseAdapter.java | 6 +- .../adapter/NonViewAdapter.java | 4 +- .../adapter/OnDateDelayAdapter.java | 2 +- .../base/BaseAbilitySlice.java | 3 +- .../bean/WeekChooseBean.java | 2 +- .../config/OnMyConfigHandleAdapter.java | 2 +- .../custom/CustomOperater.java | 2 +- .../dialog/ChooseWeekDialog.java | 8 +-- .../dialog/DialogUtil.java | 4 +- .../dialog/TipsDialogUtil.java | 4 +- .../dialog/ToastUtil.java | 4 +- .../dialog/ToastViewDialog.java | 2 +- .../language/OnEnglishDateBuildAdapter.java | 2 +- .../language/OnEnglishItemBuildAdapter.java | 2 +- .../model/MySubject.java | 2 +- .../model/SubjectRepertory.java | 2 +- .../slice/AttrSlice.java | 12 ++-- .../slice/BaseFuncSlice.java | 20 +++--- .../slice/ColorPoolSlice.java | 12 ++-- .../slice/CustomWidthSlice.java | 14 ++-- .../slice/DateDelaySlice.java | 16 ++--- .../slice/DateSlice.java | 12 ++-- .../slice/ElasticSlice.java | 10 +-- .../slice/ExtrasSlice.java | 14 ++-- .../slice/FlaglayoutSlice.java | 16 ++--- .../slice/ItemStyleSlice.java | 16 ++--- .../slice/LocalConfigSlice.java | 20 +++--- .../slice/MainAbilitySlice.java | 8 +-- .../slice/NonViewSlice.java | 12 ++-- .../slice/SimpleSlice.java | 22 +++---- .../slice/SlideSlice.java | 12 ++-- .../spinner/MaterialSpinner.java | 64 +++++++++---------- .../spinner/MaterialSpinnerAdapter.java | 2 +- .../spinner/MaterialSpinnerBaseAdapter.java | 4 +- .../spinner/TypedAttrUtils.java | 2 +- .../spinner/Utils.java | 2 +- .../views/ElasticScrollView.java | 2 +- .../base/layout/ability_non_view.xml | 2 +- .../base/layout/custom_myscrollview.xml | 4 +- .../base/layout/header_base_func.xml | 2 +- .../resources/base/layout/header_simple.xml | 2 +- .../ExampleOhosTest.java | 2 +- 59 files changed, 224 insertions(+), 225 deletions(-) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/MainAbility.java (89%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/MyApplication.java (94%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/AttrAbility.java (89%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/BaseFucAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/ColorPoolAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/CustomWidthAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/DateAbility.java (89%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/DateDelayAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/ElasticAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/ExtrasAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/FlaglayoutAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/ItemStyleAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/LocalConfigAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/NonViewAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/SimpleAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/SlideAbility.java (89%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/adapter/ChooseAdapter.java (94%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/adapter/NonViewAdapter.java (96%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/adapter/OnDateDelayAdapter.java (98%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/base/BaseAbilitySlice.java (92%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/bean/WeekChooseBean.java (96%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/config/OnMyConfigHandleAdapter.java (97%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/custom/CustomOperater.java (97%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/dialog/ChooseWeekDialog.java (95%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/dialog/DialogUtil.java (95%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/dialog/TipsDialogUtil.java (95%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/dialog/ToastUtil.java (97%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/dialog/ToastViewDialog.java (97%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/language/OnEnglishDateBuildAdapter.java (94%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/language/OnEnglishItemBuildAdapter.java (93%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/model/MySubject.java (98%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/model/SubjectRepertory.java (99%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/AttrSlice.java (86%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/BaseFuncSlice.java (96%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/ColorPoolSlice.java (92%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/CustomWidthSlice.java (92%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/DateDelaySlice.java (90%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/DateSlice.java (93%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/ElasticSlice.java (89%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/ExtrasSlice.java (85%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/FlaglayoutSlice.java (91%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/ItemStyleSlice.java (94%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/LocalConfigSlice.java (90%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/MainAbilitySlice.java (95%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/NonViewSlice.java (93%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/SimpleSlice.java (95%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/SlideSlice.java (95%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/spinner/MaterialSpinner.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/spinner/MaterialSpinnerAdapter.java (97%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/spinner/MaterialSpinnerBaseAdapter.java (98%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/spinner/TypedAttrUtils.java (98%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/spinner/Utils.java (99%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/views/ElasticScrollView.java (98%) rename entry/src/ohostest/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ExampleOhosTest.java (95%) diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 6de909d..bf2aa44 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -14,7 +14,7 @@ }, "deviceConfig": {}, "module": { - "package": "com.zhuangfei.android_timetableview", + "package": "com.zhuangfei.ohos_timetableview", "name": ".MyApplication", "deviceType": [ "phone" @@ -50,7 +50,7 @@ } ], "orientation": "unspecified", - "name": "com.zhuangfei.android_timetableview.MainAbility", + "name": "com.zhuangfei.ohos_timetableview.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "timetableview", @@ -67,7 +67,7 @@ ] }, "orientation": "unspecified", - "name": "com.zhuangfei.android_timetableview.ability.AttrAbility", + "name": "com.zhuangfei.ohos_timetableview.ability.AttrAbility", "icon": "$media:icon", "label": "timetableview", "type": "page", @@ -83,7 +83,7 @@ ] }, "orientation": "unspecified", - "name": "com.zhuangfei.android_timetableview.ability.BaseFucAbility", + "name": "com.zhuangfei.ohos_timetableview.ability.BaseFucAbility", "icon": "$media:icon", "label": "timetableview", "type": "page", @@ -99,7 +99,7 @@ ] }, "orientation": "unspecified", - "name": "com.zhuangfei.android_timetableview.ability.CustomWidthAbility", + "name": "com.zhuangfei.ohos_timetableview.ability.CustomWidthAbility", "icon": "$media:icon", "label": "timetableview", "type": "page", @@ -115,7 +115,7 @@ ] }, "orientation": "unspecified", - "name": "com.zhuangfei.android_timetableview.ability.DateAbility", + "name": "com.zhuangfei.ohos_timetableview.ability.DateAbility", "icon": "$media:icon", "label": "timetableview", "type": "page", @@ -131,7 +131,7 @@ ] }, "orientation": "unspecified", - "name": "com.zhuangfei.android_timetableview.ability.DateDelayAbility", + "name": "com.zhuangfei.ohos_timetableview.ability.DateDelayAbility", "icon": "$media:icon", "label": "timetableview", "type": "page", @@ -147,7 +147,7 @@ ] }, "orientation": "unspecified", - "name": "com.zhuangfei.android_timetableview.ability.ElasticAbility", + "name": "com.zhuangfei.ohos_timetableview.ability.ElasticAbility", "icon": "$media:icon", "label": "timetableview", "type": "page", @@ -163,7 +163,7 @@ ] }, "orientation": "unspecified", - "name": "com.zhuangfei.android_timetableview.ability.ExtrasAbility", + "name": "com.zhuangfei.ohos_timetableview.ability.ExtrasAbility", "icon": "$media:icon", "label": "timetableview", "type": "page", @@ -179,7 +179,7 @@ ] }, "orientation": "unspecified", - "name": "com.zhuangfei.android_timetableview.ability.FlaglayoutAbility", + "name": "com.zhuangfei.ohos_timetableview.ability.FlaglayoutAbility", "icon": "$media:icon", "label": "timetableview", "type": "page", @@ -195,7 +195,7 @@ ] }, "orientation": "unspecified", - "name": "com.zhuangfei.android_timetableview.ability.ItemStyleAbility", + "name": "com.zhuangfei.ohos_timetableview.ability.ItemStyleAbility", "icon": "$media:icon", "label": "timetableview", "type": "page", @@ -211,7 +211,7 @@ ] }, "orientation": "unspecified", - "name": "com.zhuangfei.android_timetableview.ability.LocalConfigAbility", + "name": "com.zhuangfei.ohos_timetableview.ability.LocalConfigAbility", "icon": "$media:icon", "label": "timetableview", "type": "page", @@ -227,7 +227,7 @@ ] }, "orientation": "unspecified", - "name": "com.zhuangfei.android_timetableview.ability.NonViewAbility", + "name": "com.zhuangfei.ohos_timetableview.ability.NonViewAbility", "icon": "$media:icon", "label": "timetableview", "type": "page", @@ -243,7 +243,7 @@ ] }, "orientation": "unspecified", - "name": "com.zhuangfei.android_timetableview.ability.SimpleAbility", + "name": "com.zhuangfei.ohos_timetableview.ability.SimpleAbility", "icon": "$media:icon", "label": "timetableview", "type": "page", @@ -259,7 +259,7 @@ ] }, "orientation": "unspecified", - "name": "com.zhuangfei.android_timetableview.ability.SlideAbility", + "name": "com.zhuangfei.ohos_timetableview.ability.SlideAbility", "icon": "$media:icon", "label": "timetableview", "type": "page", @@ -275,7 +275,7 @@ ] }, "orientation": "unspecified", - "name": "com.zhuangfei.android_timetableview.ability.ColorPoolAbility", + "name": "com.zhuangfei.ohos_timetableview.ability.ColorPoolAbility", "icon": "$media:icon", "label": "timetableview", "type": "page", diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/MainAbility.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/MainAbility.java similarity index 89% rename from entry/src/main/java/com/zhuangfei/android_timetableview/MainAbility.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/MainAbility.java index e37c23a..91458be 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/MainAbility.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/MainAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zhuangfei.android_timetableview; +package com.zhuangfei.ohos_timetableview; -import com.zhuangfei.android_timetableview.slice.MainAbilitySlice; +import com.zhuangfei.ohos_timetableview.slice.MainAbilitySlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/MyApplication.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/MyApplication.java similarity index 94% rename from entry/src/main/java/com/zhuangfei/android_timetableview/MyApplication.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/MyApplication.java index e173d39..fb3cf98 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/MyApplication.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/MyApplication.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zhuangfei.android_timetableview; +package com.zhuangfei.ohos_timetableview; import ohos.aafwk.ability.AbilityPackage; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/AttrAbility.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/AttrAbility.java similarity index 89% rename from entry/src/main/java/com/zhuangfei/android_timetableview/ability/AttrAbility.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/AttrAbility.java index 720c20d..07631eb 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/AttrAbility.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/AttrAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zhuangfei.android_timetableview.ability; +package com.zhuangfei.ohos_timetableview.ability; -import com.zhuangfei.android_timetableview.slice.AttrSlice; +import com.zhuangfei.ohos_timetableview.slice.AttrSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/BaseFucAbility.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/BaseFucAbility.java similarity index 88% rename from entry/src/main/java/com/zhuangfei/android_timetableview/ability/BaseFucAbility.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/BaseFucAbility.java index 3f98664..4185c46 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/BaseFucAbility.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/BaseFucAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zhuangfei.android_timetableview.ability; +package com.zhuangfei.ohos_timetableview.ability; -import com.zhuangfei.android_timetableview.slice.BaseFuncSlice; +import com.zhuangfei.ohos_timetableview.slice.BaseFuncSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ColorPoolAbility.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/ColorPoolAbility.java similarity index 88% rename from entry/src/main/java/com/zhuangfei/android_timetableview/ability/ColorPoolAbility.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/ColorPoolAbility.java index 06ecdb8..6146f54 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ColorPoolAbility.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/ColorPoolAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zhuangfei.android_timetableview.ability; +package com.zhuangfei.ohos_timetableview.ability; -import com.zhuangfei.android_timetableview.slice.ColorPoolSlice; +import com.zhuangfei.ohos_timetableview.slice.ColorPoolSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/CustomWidthAbility.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/CustomWidthAbility.java similarity index 88% rename from entry/src/main/java/com/zhuangfei/android_timetableview/ability/CustomWidthAbility.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/CustomWidthAbility.java index c5ab3be..e344023 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/CustomWidthAbility.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/CustomWidthAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zhuangfei.android_timetableview.ability; +package com.zhuangfei.ohos_timetableview.ability; -import com.zhuangfei.android_timetableview.slice.CustomWidthSlice; +import com.zhuangfei.ohos_timetableview.slice.CustomWidthSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateAbility.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/DateAbility.java similarity index 89% rename from entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateAbility.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/DateAbility.java index 57bc5a5..4fe7f96 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateAbility.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/DateAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zhuangfei.android_timetableview.ability; +package com.zhuangfei.ohos_timetableview.ability; -import com.zhuangfei.android_timetableview.slice.DateSlice; +import com.zhuangfei.ohos_timetableview.slice.DateSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateDelayAbility.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/DateDelayAbility.java similarity index 88% rename from entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateDelayAbility.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/DateDelayAbility.java index 65c4963..9d9f4f3 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateDelayAbility.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/DateDelayAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.ability; +package com.zhuangfei.ohos_timetableview.ability; -import com.zhuangfei.android_timetableview.slice.DateDelaySlice; +import com.zhuangfei.ohos_timetableview.slice.DateDelaySlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ElasticAbility.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/ElasticAbility.java similarity index 88% rename from entry/src/main/java/com/zhuangfei/android_timetableview/ability/ElasticAbility.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/ElasticAbility.java index 218c8d2..1cabef7 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ElasticAbility.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/ElasticAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.ability; +package com.zhuangfei.ohos_timetableview.ability; -import com.zhuangfei.android_timetableview.slice.ElasticSlice; +import com.zhuangfei.ohos_timetableview.slice.ElasticSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ExtrasAbility.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/ExtrasAbility.java similarity index 88% rename from entry/src/main/java/com/zhuangfei/android_timetableview/ability/ExtrasAbility.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/ExtrasAbility.java index 57cac9b..e374662 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ExtrasAbility.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/ExtrasAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zhuangfei.android_timetableview.ability; +package com.zhuangfei.ohos_timetableview.ability; -import com.zhuangfei.android_timetableview.slice.ExtrasSlice; +import com.zhuangfei.ohos_timetableview.slice.ExtrasSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/FlaglayoutAbility.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/FlaglayoutAbility.java similarity index 88% rename from entry/src/main/java/com/zhuangfei/android_timetableview/ability/FlaglayoutAbility.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/FlaglayoutAbility.java index f1db19d..0e3137b 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/FlaglayoutAbility.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/FlaglayoutAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.ability; +package com.zhuangfei.ohos_timetableview.ability; -import com.zhuangfei.android_timetableview.slice.FlaglayoutSlice; +import com.zhuangfei.ohos_timetableview.slice.FlaglayoutSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ItemStyleAbility.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/ItemStyleAbility.java similarity index 88% rename from entry/src/main/java/com/zhuangfei/android_timetableview/ability/ItemStyleAbility.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/ItemStyleAbility.java index d1678a5..4d84f82 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ItemStyleAbility.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/ItemStyleAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.ability; +package com.zhuangfei.ohos_timetableview.ability; -import com.zhuangfei.android_timetableview.slice.ItemStyleSlice; +import com.zhuangfei.ohos_timetableview.slice.ItemStyleSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/LocalConfigAbility.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/LocalConfigAbility.java similarity index 88% rename from entry/src/main/java/com/zhuangfei/android_timetableview/ability/LocalConfigAbility.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/LocalConfigAbility.java index ded4ed9..9e4c409 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/LocalConfigAbility.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/LocalConfigAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.ability; +package com.zhuangfei.ohos_timetableview.ability; -import com.zhuangfei.android_timetableview.slice.LocalConfigSlice; +import com.zhuangfei.ohos_timetableview.slice.LocalConfigSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/NonViewAbility.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/NonViewAbility.java similarity index 88% rename from entry/src/main/java/com/zhuangfei/android_timetableview/ability/NonViewAbility.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/NonViewAbility.java index 12155a7..2893929 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/NonViewAbility.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/NonViewAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.ability; +package com.zhuangfei.ohos_timetableview.ability; -import com.zhuangfei.android_timetableview.slice.NonViewSlice; +import com.zhuangfei.ohos_timetableview.slice.NonViewSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/SimpleAbility.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/SimpleAbility.java similarity index 88% rename from entry/src/main/java/com/zhuangfei/android_timetableview/ability/SimpleAbility.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/SimpleAbility.java index 9891310..a52c255 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/SimpleAbility.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/SimpleAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.ability; +package com.zhuangfei.ohos_timetableview.ability; -import com.zhuangfei.android_timetableview.slice.SimpleSlice; +import com.zhuangfei.ohos_timetableview.slice.SimpleSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/SlideAbility.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/SlideAbility.java similarity index 89% rename from entry/src/main/java/com/zhuangfei/android_timetableview/ability/SlideAbility.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/SlideAbility.java index 734e894..511b5a3 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/ability/SlideAbility.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/ability/SlideAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.ability; +package com.zhuangfei.ohos_timetableview.ability; -import com.zhuangfei.android_timetableview.slice.SlideSlice; +import com.zhuangfei.ohos_timetableview.slice.SlideSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/ChooseAdapter.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/adapter/ChooseAdapter.java similarity index 94% rename from entry/src/main/java/com/zhuangfei/android_timetableview/adapter/ChooseAdapter.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/adapter/ChooseAdapter.java index 42ff61d..ea55f48 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/ChooseAdapter.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/adapter/ChooseAdapter.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.adapter; +package com.zhuangfei.ohos_timetableview.adapter; -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.bean.WeekChooseBean; +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.bean.WeekChooseBean; import ohos.agp.components.*; import ohos.app.Context; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/NonViewAdapter.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/adapter/NonViewAdapter.java similarity index 96% rename from entry/src/main/java/com/zhuangfei/android_timetableview/adapter/NonViewAdapter.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/adapter/NonViewAdapter.java index dd91220..09e1270 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/NonViewAdapter.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/adapter/NonViewAdapter.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.adapter; +package com.zhuangfei.ohos_timetableview.adapter; -import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.ResourceTable; import com.zhuangfei.timetable.model.Schedule; import com.zhuangfei.timetable.model.ScheduleColorPool; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/OnDateDelayAdapter.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/adapter/OnDateDelayAdapter.java similarity index 98% rename from entry/src/main/java/com/zhuangfei/android_timetableview/adapter/OnDateDelayAdapter.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/adapter/OnDateDelayAdapter.java index 31001b0..9786b11 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/OnDateDelayAdapter.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/adapter/OnDateDelayAdapter.java @@ -1,4 +1,4 @@ -package com.zhuangfei.android_timetableview.adapter; +package com.zhuangfei.ohos_timetableview.adapter; import com.zhuangfei.timetable.listener.OnDateBuildAapter; import com.zhuangfei.timetable.model.ScheduleSupport; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/base/BaseAbilitySlice.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/base/BaseAbilitySlice.java similarity index 92% rename from entry/src/main/java/com/zhuangfei/android_timetableview/base/BaseAbilitySlice.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/base/BaseAbilitySlice.java index 4156631..3013738 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/base/BaseAbilitySlice.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/base/BaseAbilitySlice.java @@ -13,11 +13,10 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.base; +package com.zhuangfei.ohos_timetableview.base; import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; -import ohos.aafwk.content.Operation; import ohos.agp.utils.Color; import ohos.agp.window.service.WindowManager; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/bean/WeekChooseBean.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/bean/WeekChooseBean.java similarity index 96% rename from entry/src/main/java/com/zhuangfei/android_timetableview/bean/WeekChooseBean.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/bean/WeekChooseBean.java index c3f0475..f550aad 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/bean/WeekChooseBean.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/bean/WeekChooseBean.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.bean; +package com.zhuangfei.ohos_timetableview.bean; import ohos.agp.components.RadioButton; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/config/OnMyConfigHandleAdapter.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/config/OnMyConfigHandleAdapter.java similarity index 97% rename from entry/src/main/java/com/zhuangfei/android_timetableview/config/OnMyConfigHandleAdapter.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/config/OnMyConfigHandleAdapter.java index 5567216..1148ca1 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/config/OnMyConfigHandleAdapter.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/config/OnMyConfigHandleAdapter.java @@ -1,4 +1,4 @@ -package com.zhuangfei.android_timetableview.config; +package com.zhuangfei.ohos_timetableview.config; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/custom/CustomOperater.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/custom/CustomOperater.java similarity index 97% rename from entry/src/main/java/com/zhuangfei/android_timetableview/custom/CustomOperater.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/custom/CustomOperater.java index 72080ba..6de8d33 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/custom/CustomOperater.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/custom/CustomOperater.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.custom; +package com.zhuangfei.ohos_timetableview.custom; import com.zhuangfei.timetable.operater.SimpleOperater; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ChooseWeekDialog.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/dialog/ChooseWeekDialog.java similarity index 95% rename from entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ChooseWeekDialog.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/dialog/ChooseWeekDialog.java index 8f7124e..8188a7f 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ChooseWeekDialog.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/dialog/ChooseWeekDialog.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.dialog; +package com.zhuangfei.ohos_timetableview.dialog; -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.adapter.ChooseAdapter; -import com.zhuangfei.android_timetableview.bean.WeekChooseBean; +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.adapter.ChooseAdapter; +import com.zhuangfei.ohos_timetableview.bean.WeekChooseBean; import com.zhuangfei.timetable.utils.ScreenUtils; import ohos.agp.components.*; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/DialogUtil.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/dialog/DialogUtil.java similarity index 95% rename from entry/src/main/java/com/zhuangfei/android_timetableview/dialog/DialogUtil.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/dialog/DialogUtil.java index 17e9fc3..169c9bb 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/DialogUtil.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/dialog/DialogUtil.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.dialog; +package com.zhuangfei.ohos_timetableview.dialog; -import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.ResourceTable; import com.zhuangfei.timetable.utils.ScreenUtils; import ohos.agp.components.*; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/TipsDialogUtil.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/dialog/TipsDialogUtil.java similarity index 95% rename from entry/src/main/java/com/zhuangfei/android_timetableview/dialog/TipsDialogUtil.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/dialog/TipsDialogUtil.java index 5127da8..ce1d7b0 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/TipsDialogUtil.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/dialog/TipsDialogUtil.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.dialog; +package com.zhuangfei.ohos_timetableview.dialog; -import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.ResourceTable; import com.zhuangfei.timetable.utils.ScreenUtils; import ohos.agp.components.ComponentContainer; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastUtil.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/dialog/ToastUtil.java similarity index 97% rename from entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastUtil.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/dialog/ToastUtil.java index f8ea5a7..aaeef6d 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastUtil.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/dialog/ToastUtil.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.dialog; +package com.zhuangfei.ohos_timetableview.dialog; -import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.ResourceTable; import ohos.agp.components.*; import ohos.agp.utils.LayoutAlignment; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastViewDialog.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/dialog/ToastViewDialog.java similarity index 97% rename from entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastViewDialog.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/dialog/ToastViewDialog.java index 692cb5a..ef5d781 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastViewDialog.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/dialog/ToastViewDialog.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zhuangfei.android_timetableview.dialog; +package com.zhuangfei.ohos_timetableview.dialog; import ohos.agp.components.Component; import ohos.agp.components.DirectionalLayout; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishDateBuildAdapter.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/language/OnEnglishDateBuildAdapter.java similarity index 94% rename from entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishDateBuildAdapter.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/language/OnEnglishDateBuildAdapter.java index 22f3f9c..6039b47 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishDateBuildAdapter.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/language/OnEnglishDateBuildAdapter.java @@ -1,4 +1,4 @@ -package com.zhuangfei.android_timetableview.language; +package com.zhuangfei.ohos_timetableview.language; import com.zhuangfei.timetable.listener.OnDateBuildAapter; import com.zhuangfei.timetable.model.ScheduleSupport; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishItemBuildAdapter.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/language/OnEnglishItemBuildAdapter.java similarity index 93% rename from entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishItemBuildAdapter.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/language/OnEnglishItemBuildAdapter.java index 782aecf..b9c1954 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishItemBuildAdapter.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/language/OnEnglishItemBuildAdapter.java @@ -1,4 +1,4 @@ -package com.zhuangfei.android_timetableview.language; +package com.zhuangfei.ohos_timetableview.language; import com.zhuangfei.timetable.listener.OnItemBuildAdapter; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/model/MySubject.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/model/MySubject.java similarity index 98% rename from entry/src/main/java/com/zhuangfei/android_timetableview/model/MySubject.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/model/MySubject.java index 60945aa..22b38bb 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/model/MySubject.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/model/MySubject.java @@ -1,4 +1,4 @@ -package com.zhuangfei.android_timetableview.model; +package com.zhuangfei.ohos_timetableview.model; import com.zhuangfei.timetable.model.Schedule; import com.zhuangfei.timetable.model.ScheduleEnable; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/model/SubjectRepertory.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/model/SubjectRepertory.java similarity index 99% rename from entry/src/main/java/com/zhuangfei/android_timetableview/model/SubjectRepertory.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/model/SubjectRepertory.java index ffb4766..f8004d7 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/model/SubjectRepertory.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/model/SubjectRepertory.java @@ -1,4 +1,4 @@ -package com.zhuangfei.android_timetableview.model; +package com.zhuangfei.ohos_timetableview.model; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONException; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/AttrSlice.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/AttrSlice.java similarity index 86% rename from entry/src/main/java/com/zhuangfei/android_timetableview/slice/AttrSlice.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/AttrSlice.java index 5a89076..9fd4d05 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/AttrSlice.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/AttrSlice.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.slice; +package com.zhuangfei.ohos_timetableview.slice; -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; -import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; -import com.zhuangfei.android_timetableview.model.MySubject; -import com.zhuangfei.android_timetableview.model.SubjectRepertory; +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.ohos_timetableview.dialog.ToastViewDialog; +import com.zhuangfei.ohos_timetableview.model.MySubject; +import com.zhuangfei.ohos_timetableview.model.SubjectRepertory; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.model.Schedule; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/BaseFuncSlice.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/BaseFuncSlice.java similarity index 96% rename from entry/src/main/java/com/zhuangfei/android_timetableview/slice/BaseFuncSlice.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/BaseFuncSlice.java index 3b00c72..52dd713 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/BaseFuncSlice.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/BaseFuncSlice.java @@ -13,16 +13,16 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.slice; - -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; -import com.zhuangfei.android_timetableview.bean.WeekChooseBean; -import com.zhuangfei.android_timetableview.dialog.ChooseWeekDialog; -import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; -import com.zhuangfei.android_timetableview.model.MySubject; -import com.zhuangfei.android_timetableview.model.SubjectRepertory; -import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; +package com.zhuangfei.ohos_timetableview.slice; + +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.ohos_timetableview.bean.WeekChooseBean; +import com.zhuangfei.ohos_timetableview.dialog.ChooseWeekDialog; +import com.zhuangfei.ohos_timetableview.dialog.ToastViewDialog; +import com.zhuangfei.ohos_timetableview.model.MySubject; +import com.zhuangfei.ohos_timetableview.model.SubjectRepertory; +import com.zhuangfei.ohos_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.IWeekView; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ColorPoolSlice.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/ColorPoolSlice.java similarity index 92% rename from entry/src/main/java/com/zhuangfei/android_timetableview/slice/ColorPoolSlice.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/ColorPoolSlice.java index 72622ff..715cd65 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ColorPoolSlice.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/ColorPoolSlice.java @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zhuangfei.android_timetableview.slice; +package com.zhuangfei.ohos_timetableview.slice; -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; -import com.zhuangfei.android_timetableview.model.MySubject; -import com.zhuangfei.android_timetableview.model.SubjectRepertory; -import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.ohos_timetableview.model.MySubject; +import com.zhuangfei.ohos_timetableview.model.SubjectRepertory; +import com.zhuangfei.ohos_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/CustomWidthSlice.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/CustomWidthSlice.java similarity index 92% rename from entry/src/main/java/com/zhuangfei/android_timetableview/slice/CustomWidthSlice.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/CustomWidthSlice.java index d480ec9..6e0e621 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/CustomWidthSlice.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/CustomWidthSlice.java @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zhuangfei.android_timetableview.slice; +package com.zhuangfei.ohos_timetableview.slice; -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; -import com.zhuangfei.android_timetableview.custom.CustomOperater; -import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; -import com.zhuangfei.android_timetableview.model.MySubject; -import com.zhuangfei.android_timetableview.model.SubjectRepertory; +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.ohos_timetableview.custom.CustomOperater; +import com.zhuangfei.ohos_timetableview.dialog.ToastViewDialog; +import com.zhuangfei.ohos_timetableview.model.MySubject; +import com.zhuangfei.ohos_timetableview.model.SubjectRepertory; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.OnDateBuildAapter; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateDelaySlice.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/DateDelaySlice.java similarity index 90% rename from entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateDelaySlice.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/DateDelaySlice.java index 9340af3..cba7061 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateDelaySlice.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/DateDelaySlice.java @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zhuangfei.android_timetableview.slice; - -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.adapter.OnDateDelayAdapter; -import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; -import com.zhuangfei.android_timetableview.model.MySubject; -import com.zhuangfei.android_timetableview.model.SubjectRepertory; -import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; +package com.zhuangfei.ohos_timetableview.slice; + +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.adapter.OnDateDelayAdapter; +import com.zhuangfei.ohos_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.ohos_timetableview.model.MySubject; +import com.zhuangfei.ohos_timetableview.model.SubjectRepertory; +import com.zhuangfei.ohos_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateSlice.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/DateSlice.java similarity index 93% rename from entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateSlice.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/DateSlice.java index af7e9a9..13b1e44 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateSlice.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/DateSlice.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.slice; +package com.zhuangfei.ohos_timetableview.slice; -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; -import com.zhuangfei.android_timetableview.model.MySubject; -import com.zhuangfei.android_timetableview.model.SubjectRepertory; -import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.ohos_timetableview.model.MySubject; +import com.zhuangfei.ohos_timetableview.model.SubjectRepertory; +import com.zhuangfei.ohos_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.OnDateBuildAapter; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ElasticSlice.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/ElasticSlice.java similarity index 89% rename from entry/src/main/java/com/zhuangfei/android_timetableview/slice/ElasticSlice.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/ElasticSlice.java index 6fe6f98..1133f15 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ElasticSlice.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/ElasticSlice.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zhuangfei.android_timetableview.slice; +package com.zhuangfei.ohos_timetableview.slice; -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; -import com.zhuangfei.android_timetableview.model.MySubject; -import com.zhuangfei.android_timetableview.model.SubjectRepertory; +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.ohos_timetableview.model.MySubject; +import com.zhuangfei.ohos_timetableview.model.SubjectRepertory; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ExtrasSlice.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/ExtrasSlice.java similarity index 85% rename from entry/src/main/java/com/zhuangfei/android_timetableview/slice/ExtrasSlice.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/ExtrasSlice.java index fc7e3db..b2a9d2b 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ExtrasSlice.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/ExtrasSlice.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.slice; +package com.zhuangfei.ohos_timetableview.slice; -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; -import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; -import com.zhuangfei.android_timetableview.model.MySubject; -import com.zhuangfei.android_timetableview.model.SubjectRepertory; -import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.ohos_timetableview.dialog.ToastViewDialog; +import com.zhuangfei.ohos_timetableview.model.MySubject; +import com.zhuangfei.ohos_timetableview.model.SubjectRepertory; +import com.zhuangfei.ohos_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.model.Schedule; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/FlaglayoutSlice.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/FlaglayoutSlice.java similarity index 91% rename from entry/src/main/java/com/zhuangfei/android_timetableview/slice/FlaglayoutSlice.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/FlaglayoutSlice.java index e5d80a0..ac4f7eb 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/FlaglayoutSlice.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/FlaglayoutSlice.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.slice; - -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; -import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; -import com.zhuangfei.android_timetableview.model.MySubject; -import com.zhuangfei.android_timetableview.model.SubjectRepertory; -import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; +package com.zhuangfei.ohos_timetableview.slice; + +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.ohos_timetableview.dialog.ToastViewDialog; +import com.zhuangfei.ohos_timetableview.model.MySubject; +import com.zhuangfei.ohos_timetableview.model.SubjectRepertory; +import com.zhuangfei.ohos_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.model.Schedule; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ItemStyleSlice.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/ItemStyleSlice.java similarity index 94% rename from entry/src/main/java/com/zhuangfei/android_timetableview/slice/ItemStyleSlice.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/ItemStyleSlice.java index ce21f34..6f538f6 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ItemStyleSlice.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/ItemStyleSlice.java @@ -13,15 +13,15 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.slice; +package com.zhuangfei.ohos_timetableview.slice; -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; -import com.zhuangfei.android_timetableview.language.OnEnglishDateBuildAdapter; -import com.zhuangfei.android_timetableview.language.OnEnglishItemBuildAdapter; -import com.zhuangfei.android_timetableview.model.MySubject; -import com.zhuangfei.android_timetableview.model.SubjectRepertory; -import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.ohos_timetableview.language.OnEnglishDateBuildAdapter; +import com.zhuangfei.ohos_timetableview.language.OnEnglishItemBuildAdapter; +import com.zhuangfei.ohos_timetableview.model.MySubject; +import com.zhuangfei.ohos_timetableview.model.SubjectRepertory; +import com.zhuangfei.ohos_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.OnItemBuildAdapter; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/LocalConfigSlice.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/LocalConfigSlice.java similarity index 90% rename from entry/src/main/java/com/zhuangfei/android_timetableview/slice/LocalConfigSlice.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/LocalConfigSlice.java index 5e21032..627a57b 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/LocalConfigSlice.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/LocalConfigSlice.java @@ -13,16 +13,16 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.slice; - -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; -import com.zhuangfei.android_timetableview.config.OnMyConfigHandleAdapter; -import com.zhuangfei.android_timetableview.dialog.DialogUtil; -import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; -import com.zhuangfei.android_timetableview.model.MySubject; -import com.zhuangfei.android_timetableview.model.SubjectRepertory; -import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; +package com.zhuangfei.ohos_timetableview.slice; + +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.ohos_timetableview.config.OnMyConfigHandleAdapter; +import com.zhuangfei.ohos_timetableview.dialog.DialogUtil; +import com.zhuangfei.ohos_timetableview.dialog.ToastViewDialog; +import com.zhuangfei.ohos_timetableview.model.MySubject; +import com.zhuangfei.ohos_timetableview.model.SubjectRepertory; +import com.zhuangfei.ohos_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.model.ScheduleConfig; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/MainAbilitySlice.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/MainAbilitySlice.java similarity index 95% rename from entry/src/main/java/com/zhuangfei/android_timetableview/slice/MainAbilitySlice.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/MainAbilitySlice.java index c6ffce9..fd82e5a 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/MainAbilitySlice.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.slice; +package com.zhuangfei.ohos_timetableview.slice; -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.ability.*; -import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.ability.*; +import com.zhuangfei.ohos_timetableview.base.BaseAbilitySlice; import ohos.aafwk.content.Intent; import ohos.aafwk.content.Operation; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/NonViewSlice.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/NonViewSlice.java similarity index 93% rename from entry/src/main/java/com/zhuangfei/android_timetableview/slice/NonViewSlice.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/NonViewSlice.java index f4062ee..63d69b7 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/NonViewSlice.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/NonViewSlice.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.slice; +package com.zhuangfei.ohos_timetableview.slice; -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.adapter.NonViewAdapter; -import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; -import com.zhuangfei.android_timetableview.model.SubjectRepertory; -import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.adapter.NonViewAdapter; +import com.zhuangfei.ohos_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.ohos_timetableview.model.SubjectRepertory; +import com.zhuangfei.ohos_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.model.Schedule; import com.zhuangfei.timetable.model.ScheduleSupport; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SimpleSlice.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/SimpleSlice.java similarity index 95% rename from entry/src/main/java/com/zhuangfei/android_timetableview/slice/SimpleSlice.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/SimpleSlice.java index 152d507..8fc0c7e 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SimpleSlice.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/SimpleSlice.java @@ -13,17 +13,17 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.slice; - -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; -import com.zhuangfei.android_timetableview.bean.WeekChooseBean; -import com.zhuangfei.android_timetableview.dialog.ChooseWeekDialog; -import com.zhuangfei.android_timetableview.dialog.TipsDialogUtil; -import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; -import com.zhuangfei.android_timetableview.model.MySubject; -import com.zhuangfei.android_timetableview.model.SubjectRepertory; -import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; +package com.zhuangfei.ohos_timetableview.slice; + +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.ohos_timetableview.bean.WeekChooseBean; +import com.zhuangfei.ohos_timetableview.dialog.ChooseWeekDialog; +import com.zhuangfei.ohos_timetableview.dialog.TipsDialogUtil; +import com.zhuangfei.ohos_timetableview.dialog.ToastViewDialog; +import com.zhuangfei.ohos_timetableview.model.MySubject; +import com.zhuangfei.ohos_timetableview.model.SubjectRepertory; +import com.zhuangfei.ohos_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.IWeekView; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SlideSlice.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/SlideSlice.java similarity index 95% rename from entry/src/main/java/com/zhuangfei/android_timetableview/slice/SlideSlice.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/SlideSlice.java index 5e6bedb..e9fb15b 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SlideSlice.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/slice/SlideSlice.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.slice; +package com.zhuangfei.ohos_timetableview.slice; -import com.zhuangfei.android_timetableview.ResourceTable; -import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; -import com.zhuangfei.android_timetableview.model.MySubject; -import com.zhuangfei.android_timetableview.model.SubjectRepertory; -import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; +import com.zhuangfei.ohos_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.ohos_timetableview.model.MySubject; +import com.zhuangfei.ohos_timetableview.model.SubjectRepertory; +import com.zhuangfei.ohos_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.OnSlideBuildAdapter; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinner.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/spinner/MaterialSpinner.java similarity index 88% rename from entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinner.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/spinner/MaterialSpinner.java index 9c871d3..a7d22f2 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinner.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/spinner/MaterialSpinner.java @@ -30,9 +30,9 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.spinner; +package com.zhuangfei.ohos_timetableview.spinner; -import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.ResourceTable; import com.zhuangfei.timetable.utils.ScreenUtils; import ohos.aafwk.ability.Ability; @@ -74,7 +74,7 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene private OnNothingSelectedListener onNothingSelectedListener; private OnItemSelectedListener onItemSelectedListener; - private com.zhuangfei.android_timetableview.spinner.MaterialSpinnerBaseAdapter adapter; + private com.zhuangfei.ohos_timetableview.spinner.MaterialSpinnerBaseAdapter adapter; private PopupDialog popupWindow; private ListContainer listView; private PixelMapElement arrowDrawable; @@ -97,7 +97,7 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene private int popupPaddingBottom; private int popupPaddingRight; private String hintText; - private com.zhuangfei.android_timetableview.spinner.MaterialSpinnerBaseAdapter mAdapter; + private com.zhuangfei.ohos_timetableview.spinner.MaterialSpinnerBaseAdapter mAdapter; /** * MaterialSpinner @@ -137,7 +137,7 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene private void init(Context context, AttrSet attrs) { HiLog.info(LABEL, "init() "); Color defaultColor = getTextColor(); - rtl = com.zhuangfei.android_timetableview.spinner.Utils.isRtl(context); + rtl = com.zhuangfei.ohos_timetableview.spinner.Utils.isRtl(context); int paddingLeft = 0; int paddingTop = 0; @@ -173,41 +173,41 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene defaultPopupPaddingBottom = (int) resourceManager.getElement( ResourceTable.Float_ms__padding_top).getFloat(); - backgroundColor = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, + backgroundColor = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, "ms_background_color", Color.WHITE.getValue()); backgroundSelector = attrs.getAttr("ms_background_selector").get().getElement(); HiLog.info(LABEL, "backgroundSelector = " + backgroundSelector); - textColor = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, "ms_text_color", + textColor = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, "ms_text_color", defaultColor.getValue()); - textColorButton = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, + textColorButton = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, "ms_text_color_button", defaultColor.getValue()); - hintColor = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, + hintColor = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, "ms_hint_color", defaultColor.getValue()); - arrowColor = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, "ms_arrow_tint", textColor); - hideArrow = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getBoolean(attrs, "ms_hide_arrow", false); - hintText = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getString(attrs, "ms_hint", ""); + arrowColor = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, "ms_arrow_tint", textColor); + hideArrow = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getBoolean(attrs, "ms_hide_arrow", false); + hintText = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getString(attrs, "ms_hint", ""); - popupWindowMaxHeight = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + popupWindowMaxHeight = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_dropdown_max_height", 1680); - popupWindowHeight = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getLayoutDimension(attrs, + popupWindowHeight = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getLayoutDimension(attrs, "ms_dropdown_height", ComponentContainer.LayoutConfig.MATCH_CONTENT); - paddingTop = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + paddingTop = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_padding_top", defaultPaddingTop); - paddingLeft = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + paddingLeft = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_padding_left", defaultPaddingLeft); - paddingBottom = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + paddingBottom = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_padding_bottom", defaultPaddingBottom); - paddingRight = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + paddingRight = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_padding_right", defaultPaddingRight); - popupPaddingTop = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + popupPaddingTop = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_popup_padding_top", defaultPopupPaddingTop); - popupPaddingLeft = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + popupPaddingLeft = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_popup_padding_left", defaultPopupPaddingLeft); - popupPaddingBottom = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + popupPaddingBottom = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_popup_padding_bottom", defaultPopupPaddingBottom); - popupPaddingRight = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + popupPaddingRight = com.zhuangfei.ohos_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_popup_padding_right", defaultPopupPaddingRight); - arrowColorDisabled = com.zhuangfei.android_timetableview.spinner.Utils.lighter(arrowColor, 0.8f); + arrowColorDisabled = com.zhuangfei.ohos_timetableview.spinner.Utils.lighter(arrowColor, 0.8f); HiLog.info(LABEL, "arrowColorDisabled = " + arrowColorDisabled); HiLog.info(LABEL, "init textColor = " + textColor @@ -235,7 +235,7 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene } if (!hideArrow) { - arrowDrawable = com.zhuangfei.android_timetableview.spinner.Utils.getPixelMapElement(context, ResourceTable.Media_ic_more); + arrowDrawable = com.zhuangfei.ohos_timetableview.spinner.Utils.getPixelMapElement(context, ResourceTable.Media_ic_more); Element[] drawables = getAroundElements(); if (rtl) { drawables[0] = arrowDrawable; @@ -446,7 +446,7 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene * @param The item type */ public void setItems(List items) { - adapter = new com.zhuangfei.android_timetableview.spinner.MaterialSpinnerAdapter<>(getContext(), items) + adapter = new com.zhuangfei.ohos_timetableview.spinner.MaterialSpinnerAdapter<>(getContext(), items) .setPopupPadding(popupPaddingLeft, popupPaddingTop, popupPaddingRight, popupPaddingBottom) .setTextSize(textSize) .setTextColor(textColor); @@ -459,24 +459,24 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene * @param adapter The adapter * @param The type */ - public void setAdapter(com.zhuangfei.android_timetableview.spinner.MaterialSpinnerAdapter adapter) { + public void setAdapter(com.zhuangfei.ohos_timetableview.spinner.MaterialSpinnerAdapter adapter) { this.adapter = adapter; this.adapter.setTextColor(textColor); this.adapter.setPopupPadding(popupPaddingLeft, popupPaddingTop, popupPaddingRight, popupPaddingBottom); setAdapterInternal(adapter); } - private void setAdapterInternal(com.zhuangfei.android_timetableview.spinner.MaterialSpinnerBaseAdapter adapterInternal) { + private void setAdapterInternal(com.zhuangfei.ohos_timetableview.spinner.MaterialSpinnerBaseAdapter adapterInternal) { this.mAdapter = adapterInternal; boolean shouldResetPopupHeight = listView.getItemProvider() != null; - adapterInternal.setHintEnabled(!com.zhuangfei.android_timetableview.spinner.Utils.isEmpty(hintText)); + adapterInternal.setHintEnabled(!com.zhuangfei.ohos_timetableview.spinner.Utils.isEmpty(hintText)); listView.setItemProvider(adapterInternal); HiLog.info(LABEL, "selectedIndex = " + selectedIndex + ", shouldResetPopupHeight = " + shouldResetPopupHeight); if (selectedIndex >= adapterInternal.getCount()) { selectedIndex = 0; } if (adapterInternal.getItems().size() > 0) { - if (nothingSelected && !com.zhuangfei.android_timetableview.spinner.Utils.isEmpty(hintText)) { + if (nothingSelected && !com.zhuangfei.ohos_timetableview.spinner.Utils.isEmpty(hintText)) { setText(hintText); setHintColor(new Color(hintColor)); } else { @@ -537,7 +537,7 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene */ public void setArrowColor(int color) { arrowColor = color; - arrowColorDisabled = com.zhuangfei.android_timetableview.spinner.Utils.lighter(arrowColor, 0.8f); + arrowColorDisabled = com.zhuangfei.ohos_timetableview.spinner.Utils.lighter(arrowColor, 0.8f); } private boolean canShowPopup() { @@ -569,9 +569,9 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene setLayoutDirection(LayoutDirection.RTL); } if (shouldRotateUp) { - arrowDrawable = com.zhuangfei.android_timetableview.spinner.Utils.getPixelMapElement(mContext, ResourceTable.Media_ic_more); + arrowDrawable = com.zhuangfei.ohos_timetableview.spinner.Utils.getPixelMapElement(mContext, ResourceTable.Media_ic_more); } else { - arrowDrawable = com.zhuangfei.android_timetableview.spinner.Utils.getPixelMapElement(mContext, ResourceTable.Media_ic_more); + arrowDrawable = com.zhuangfei.ohos_timetableview.spinner.Utils.getPixelMapElement(mContext, ResourceTable.Media_ic_more); } /** * 旋转图片 动作 diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerAdapter.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/spinner/MaterialSpinnerAdapter.java similarity index 97% rename from entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerAdapter.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/spinner/MaterialSpinnerAdapter.java index 91b525c..05c6240 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerAdapter.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/spinner/MaterialSpinnerAdapter.java @@ -30,7 +30,7 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.spinner; +package com.zhuangfei.ohos_timetableview.spinner; import ohos.app.Context; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerBaseAdapter.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/spinner/MaterialSpinnerBaseAdapter.java similarity index 98% rename from entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerBaseAdapter.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/spinner/MaterialSpinnerBaseAdapter.java index d899a73..f955023 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerBaseAdapter.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/spinner/MaterialSpinnerBaseAdapter.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.spinner; +package com.zhuangfei.ohos_timetableview.spinner; -import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.ohos_timetableview.ResourceTable; import ohos.agp.colors.RgbColor; import ohos.agp.components.*; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/TypedAttrUtils.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/spinner/TypedAttrUtils.java similarity index 98% rename from entry/src/main/java/com/zhuangfei/android_timetableview/spinner/TypedAttrUtils.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/spinner/TypedAttrUtils.java index be3d0ee..73b34ef 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/TypedAttrUtils.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/spinner/TypedAttrUtils.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.zhuangfei.android_timetableview.spinner; +package com.zhuangfei.ohos_timetableview.spinner; import ohos.agp.components.Attr; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/Utils.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/spinner/Utils.java similarity index 99% rename from entry/src/main/java/com/zhuangfei/android_timetableview/spinner/Utils.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/spinner/Utils.java index 09c816e..39466c8 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/Utils.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/spinner/Utils.java @@ -15,7 +15,7 @@ * */ -package com.zhuangfei.android_timetableview.spinner; +package com.zhuangfei.ohos_timetableview.spinner; import ohos.agp.components.element.PixelMapElement; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/views/ElasticScrollView.java b/entry/src/main/java/com/zhuangfei/ohos_timetableview/views/ElasticScrollView.java similarity index 98% rename from entry/src/main/java/com/zhuangfei/android_timetableview/views/ElasticScrollView.java rename to entry/src/main/java/com/zhuangfei/ohos_timetableview/views/ElasticScrollView.java index f518612..b2bd801 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/views/ElasticScrollView.java +++ b/entry/src/main/java/com/zhuangfei/ohos_timetableview/views/ElasticScrollView.java @@ -1,4 +1,4 @@ -package com.zhuangfei.android_timetableview.views; +package com.zhuangfei.ohos_timetableview.views; import ohos.agp.animation.Animator; import ohos.agp.animation.AnimatorProperty; diff --git a/entry/src/main/resources/base/layout/ability_non_view.xml b/entry/src/main/resources/base/layout/ability_non_view.xml index d6752f8..4591a1a 100644 --- a/entry/src/main/resources/base/layout/ability_non_view.xml +++ b/entry/src/main/resources/base/layout/ability_non_view.xml @@ -19,7 +19,7 @@ ohos:text_color="$color:app_course_textcolor_blue" ohos:text_size="16fp" /> - - - \ No newline at end of file + \ No newline at end of file diff --git a/entry/src/main/resources/base/layout/header_base_func.xml b/entry/src/main/resources/base/layout/header_base_func.xml index db33571..bba155d 100644 --- a/entry/src/main/resources/base/layout/header_base_func.xml +++ b/entry/src/main/resources/base/layout/header_base_func.xml @@ -27,7 +27,7 @@ ohos:text_size="10fp" /> - -