diff --git a/CHANGELOG.md b/CHANGELOG.md index af9e8247f6daaec491bfb73592d0b8b55cebd845..c65862471278a5d62e6139cd4e2cc069748e3bd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 0.0.2-SNAPSHOT +* checkstytle: checkstytle code + ## 0.0.1-SNAPSHOT * refactor: For module library Android-to-OpenHarmony diff --git a/README.md b/README.md index 6f7efb24c84ea065f5d24522229fcc92c3ba7038..2f4f5f1d0ff798298ea8355e45f4f5d47f719432 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ allprojects { ```gradle dependencies { - implementation('com.gitee.chinasoft_ohos:timetable-view:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:timetable-view:0.0.2-SNAPSHOT') ...... } ``` @@ -2407,9 +2407,7 @@ CloudTest代码测试无异常 #### 版本迭代 -- ``` - 0.0.1-SNAPSHO - ``` +- 0.0.2-SNAPSHOT #### 版权和许可信息 diff --git a/entry/build.gradle b/entry/build.gradle index 42100a2c34fe9c7796278621ddc9124afa8ecf25..d1bd3629d51fb5aeb8f4f78e190e6dce40e1c744 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -11,7 +11,5 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) implementation project(path: ':timetable') testCompile 'junit:junit:4.12' - compile project(path: ':timetable') implementation 'com.alibaba:fastjson:1.2.55' - //implementation('com.gitee.chinasoft_ohos:timetable-view:0.0.1-SNAPSHOT') } diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 68c8a339175f32c46a3cb2a77735cf922327b8b5..d33d1ecbd5817846aefb1136b38b154096fc28c7 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -14,7 +14,7 @@ }, "deviceConfig": {}, "module": { - "package": "com.chinasoft.ohos", + "package": "com.zhuangfei.android_timetableview", "name": ".MyApplication", "deviceType": [ "phone" @@ -50,7 +50,7 @@ } ], "orientation": "unspecified", - "name": "com.chinasoft.ohos.MainAbility", + "name": "com.zhuangfei.android_timetableview.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "timetableview", @@ -67,7 +67,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.AttrAbility", + "name": "com.zhuangfei.android_timetableview.ability.AttrAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -83,7 +83,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.BaseFucAbility", + "name": "com.zhuangfei.android_timetableview.ability.BaseFucAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -99,7 +99,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.CustomWidthAbility", + "name": "com.zhuangfei.android_timetableview.ability.CustomWidthAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -115,7 +115,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.DateAbility", + "name": "com.zhuangfei.android_timetableview.ability.DateAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -131,7 +131,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.DateDelayAbility", + "name": "com.zhuangfei.android_timetableview.ability.DateDelayAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -147,7 +147,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.ElasticAbility", + "name": "com.zhuangfei.android_timetableview.ability.ElasticAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -163,7 +163,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.ExtrasAbility", + "name": "com.zhuangfei.android_timetableview.ability.ExtrasAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -179,7 +179,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.FlaglayoutAbility", + "name": "com.zhuangfei.android_timetableview.ability.FlaglayoutAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -195,7 +195,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.ItemStyleAbility", + "name": "com.zhuangfei.android_timetableview.ability.ItemStyleAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -211,7 +211,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.LocalConfigAbility", + "name": "com.zhuangfei.android_timetableview.ability.LocalConfigAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -227,7 +227,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.NonViewAbility", + "name": "com.zhuangfei.android_timetableview.ability.NonViewAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -243,7 +243,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.SimpleAbility", + "name": "com.zhuangfei.android_timetableview.ability.SimpleAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -259,7 +259,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.SlideAbility", + "name": "com.zhuangfei.android_timetableview.ability.SlideAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -275,7 +275,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.ColorPoolAbility", + "name": "com.zhuangfei.android_timetableview.ability.ColorPoolAbility", "icon": "$media:icon", "label": "entry", "type": "page", diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/AttrAbility.java b/entry/src/main/java/com/chinasoft/ohos/ability/AttrAbility.java index 3350b282381efd55522e6792b75abd5bcdd66ad9..bffcbfe249490e9091c9489e98d6525bee76540d 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/AttrAbility.java +++ b/entry/src/main/java/com/chinasoft/ohos/ability/AttrAbility.java @@ -14,8 +14,8 @@ */ package com.chinasoft.ohos.ability; -import com.chinasoft.ohos.slice.AttrSlice; +import com.zhuangfei.android_timetableview.slice.AttrSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/model/MyListSubject.java b/entry/src/main/java/com/chinasoft/ohos/model/MyListSubject.java deleted file mode 100644 index c1e42ab5042ad1645650c30049f435c504968ded..0000000000000000000000000000000000000000 --- a/entry/src/main/java/com/chinasoft/ohos/model/MyListSubject.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.chinasoft.ohos.model; - -import java.util.List; - -public class MyListSubject { - - List subjects; - - public void setSubjects(List subjects) { - this.subjects = subjects; - } - - public MyListSubject() { - } - - public List getSubjects() { - return subjects; - } - - public MyListSubject(List subjects) { - this.subjects = subjects; - } - - @Override - public String toString() { - return "MyListSubject{" + "subjects=" + subjects + '}'; - } -} diff --git a/entry/src/main/java/com/chinasoft/ohos/model/SubjectExtras.java b/entry/src/main/java/com/chinasoft/ohos/model/SubjectExtras.java deleted file mode 100644 index a1ee11679b0405bcc3f0b927a17a7ba2c26e21cc..0000000000000000000000000000000000000000 --- a/entry/src/main/java/com/chinasoft/ohos/model/SubjectExtras.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.chinasoft.ohos.model; - -import com.zhuangfei.timetable.model.Schedule; -import com.zhuangfei.timetable.model.ScheduleEnable; - -import java.util.List; - -/** - * 自定义实体类需要实现ScheduleEnable接口并实现getSchedule() - * - * @see ScheduleEnable#getSchedule() - */ -public class SubjectExtras implements ScheduleEnable { - - public static final String EXTRAS_ID = "extras_id"; - - private int id; - - /** - * 课程名 - */ - private String name; - - private String time; - - /** - * 教室 - */ - private String room; - - /** - * 教师 - */ - private String teacher; - - /** - * 第几周至第几周上 - */ - private List weekList; - - /** - * 开始上课的节次 - */ - private int start; - - /** - * 上课节数 - */ - private int step; - - /** - * 周几上 - */ - private int day; - - private String term; - - /** - * 一个随机数，用于对应课程的颜色 - */ - private int colorRandom = 0; - - public SubjectExtras() { - } - - public void setTime(String time) { - this.time = time; - } - - public String getTime() { - return time; - } - - public void setTerm(String term) { - this.term = term; - } - - public String getTerm() { - return term; - } - - public SubjectExtras(String term, String name, String room, String teacher, List weekList, int start, int step, int day, int colorRandom, String time) { - super(); - this.term = term; - this.name = name; - this.room = room; - this.teacher = teacher; - this.weekList = weekList; - this.start = start; - this.step = step; - this.day = day; - this.colorRandom = colorRandom; - this.time = time; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getRoom() { - return room; - } - - public void setRoom(String room) { - this.room = room; - } - - public String getTeacher() { - return teacher; - } - - public void setTeacher(String teacher) { - this.teacher = teacher; - } - - public void setWeekList(List weekList) { - this.weekList = weekList; - } - - public List getWeekList() { - return weekList; - } - - public int getStart() { - return start; - } - - public void setStart(int start) { - this.start = start; - } - - public int getStep() { - return step; - } - - public void setStep(int step) { - this.step = step; - } - - public int getDay() { - return day; - } - - public void setDay(int day) { - this.day = day; - } - - public int getColorRandom() { - return colorRandom; - } - - public void setColorRandom(int colorRandom) { - this.colorRandom = colorRandom; - } - - @Override - public Schedule getSchedule() { - Schedule schedule = new Schedule(); - schedule.setDay(getDay()); - schedule.setName(getName()); - schedule.setRoom(getRoom()); - schedule.setStart(getStart()); - schedule.setStep(getStep()); - schedule.setTeacher(getTeacher()); - schedule.setWeekList(getWeekList()); - schedule.setColorRandom(2); - schedule.putExtras(EXTRAS_ID,getId()); - return schedule; - } - - public void setId(int id) { - this.id = id; - } - - public int getId() { - return id; - } -} diff --git a/entry/src/main/java/com/chinasoft/ohos/MainAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/MainAbility.java similarity index 89% rename from entry/src/main/java/com/chinasoft/ohos/MainAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/MainAbility.java index ff3285b429946507b492e9cb1f0bb5369a386390..e37c23a48b7825249de4a243f1bd024d855ec28e 100644 --- a/entry/src/main/java/com/chinasoft/ohos/MainAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/MainAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos; +package com.zhuangfei.android_timetableview; -import com.chinasoft.ohos.slice.MainAbilitySlice; +import com.zhuangfei.android_timetableview.slice.MainAbilitySlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/MyApplication.java b/entry/src/main/java/com/zhuangfei/android_timetableview/MyApplication.java similarity index 94% rename from entry/src/main/java/com/chinasoft/ohos/MyApplication.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/MyApplication.java index fa0954dd87a81868e1b79140db421b8ec4f68ec5..e173d39021c5ef99c3d29f65d1fb3fce15ed06f9 100644 --- a/entry/src/main/java/com/chinasoft/ohos/MyApplication.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/MyApplication.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos; +package com.zhuangfei.android_timetableview; import ohos.aafwk.ability.AbilityPackage; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/BaseFucAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/BaseFucAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/BaseFucAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/BaseFucAbility.java index eb1e245ed3cc2f3599eff95f262f780f4ab7a719..3f986644bc72a96f42f6663b991bc004c6c2dfc9 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/BaseFucAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/BaseFucAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.BaseFuncSlice; +import com.zhuangfei.android_timetableview.slice.BaseFuncSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/ColorPoolAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ColorPoolAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/ColorPoolAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/ColorPoolAbility.java index c41636f27edce605b023ded538a95e4b7da1c37a..06ecdb850d40474021bfafe145e2062278fd3fdb 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/ColorPoolAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ColorPoolAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.ColorPoolSlice; +import com.zhuangfei.android_timetableview.slice.ColorPoolSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/CustomWidthAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/CustomWidthAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/CustomWidthAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/CustomWidthAbility.java index 343bdf14f01d6715e47fb6e9f9b53c86f1495167..c5ab3be682d9c1368395c5aa71a4e41609507902 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/CustomWidthAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/CustomWidthAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.CustomWidthSlice; +import com.zhuangfei.android_timetableview.slice.CustomWidthSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/DateAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateAbility.java similarity index 89% rename from entry/src/main/java/com/chinasoft/ohos/ability/DateAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateAbility.java index 2b9701aa9417d4ff356e5db0d3f93d64dd263924..57bc5a51187e3a30a70b0a3d48cc7efdf2b4c857 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/DateAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.DateSlice; +import com.zhuangfei.android_timetableview.slice.DateSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/DateDelayAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateDelayAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/DateDelayAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateDelayAbility.java index e398e11157e6395220eaff28b0bed9d3a437e5f4..65c4963dc1514c5f7883ceb99c36d8a16d0f724c 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/DateDelayAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateDelayAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.DateDelaySlice; +import com.zhuangfei.android_timetableview.slice.DateDelaySlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/ElasticAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ElasticAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/ElasticAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/ElasticAbility.java index c83e699a83886ca07fce3c28ec035a3a610e1cd4..218c8d2a02b6dda3931a1d07ec2692e0f559b45b 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/ElasticAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ElasticAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.ElasticSlice; +import com.zhuangfei.android_timetableview.slice.ElasticSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/ExtrasAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ExtrasAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/ExtrasAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/ExtrasAbility.java index 2600e1b49334d96b40ea8d1b7e1223480fa95fb2..57cac9bb18613e960421c7cfc5034cd6cd13c0ab 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/ExtrasAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ExtrasAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.ExtrasSlice; +import com.zhuangfei.android_timetableview.slice.ExtrasSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/FlaglayoutAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/FlaglayoutAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/FlaglayoutAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/FlaglayoutAbility.java index 62703a9c2c04da757e1ca44b94204347c24459b0..f1db19d0649587b4dfc627cc4e209ef1778e47f3 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/FlaglayoutAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/FlaglayoutAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.FlaglayoutSlice; +import com.zhuangfei.android_timetableview.slice.FlaglayoutSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/ItemStyleAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ItemStyleAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/ItemStyleAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/ItemStyleAbility.java index c9cf282368c6d260664c63dfd0cf455be41597e5..d1678a584fae4dc24fa053e3dea4cee0ce343e61 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/ItemStyleAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ItemStyleAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.ItemStyleSlice; +import com.zhuangfei.android_timetableview.slice.ItemStyleSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/LocalConfigAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/LocalConfigAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/LocalConfigAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/LocalConfigAbility.java index 702ec5c6fba931b953c5d1a5f1f58ea5da11619b..ded4ed92ccd78a22b4cd5b2021f726bd13fb7ffa 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/LocalConfigAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/LocalConfigAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.LocalConfigSlice; +import com.zhuangfei.android_timetableview.slice.LocalConfigSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/NonViewAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/NonViewAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/NonViewAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/NonViewAbility.java index 2c25b25a1c2e5ac6b851336e73603958ecc00581..12155a72df37f987456242a9df8aee4bf508051d 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/NonViewAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/NonViewAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.NonViewSlice; +import com.zhuangfei.android_timetableview.slice.NonViewSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/SimpleAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/SimpleAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/SimpleAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/SimpleAbility.java index bb88a2107eb58623e4907996854caaa005eead85..98913103791e68bc1f69489bcedb477e85a680a6 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/SimpleAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/SimpleAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.SimpleSlice; +import com.zhuangfei.android_timetableview.slice.SimpleSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/SlideAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/SlideAbility.java similarity index 89% rename from entry/src/main/java/com/chinasoft/ohos/ability/SlideAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/SlideAbility.java index 7c0e2c7921a977b0c3cdba4a01cf6626a9e070b4..734e894a16049d6dbadd78957e9b84179d592a38 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/SlideAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/SlideAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.SlideSlice; +import com.zhuangfei.android_timetableview.slice.SlideSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/adapter/ChooseAdapter.java b/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/ChooseAdapter.java similarity index 94% rename from entry/src/main/java/com/chinasoft/ohos/adapter/ChooseAdapter.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/adapter/ChooseAdapter.java index 60e68f6f6889c5f12a2ac88e99908bcc94f316d8..42ff61dfc588591aa9347e88119eb592795c6a44 100644 --- a/entry/src/main/java/com/chinasoft/ohos/adapter/ChooseAdapter.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/ChooseAdapter.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.chinasoft.ohos.adapter; +package com.zhuangfei.android_timetableview.adapter; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.bean.WeekChooseBean; +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.bean.WeekChooseBean; import ohos.agp.components.*; import ohos.app.Context; diff --git a/entry/src/main/java/com/chinasoft/ohos/adapter/NonViewAdapter.java b/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/NonViewAdapter.java similarity index 96% rename from entry/src/main/java/com/chinasoft/ohos/adapter/NonViewAdapter.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/adapter/NonViewAdapter.java index a1cf6a64608cf426cd245a87792b06506651f2a3..dd912207b07dc620a47a925e04c6d2c272e114ad 100644 --- a/entry/src/main/java/com/chinasoft/ohos/adapter/NonViewAdapter.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/NonViewAdapter.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.adapter; +package com.zhuangfei.android_timetableview.adapter; -import com.chinasoft.ohos.ResourceTable; +import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.timetable.model.Schedule; import com.zhuangfei.timetable.model.ScheduleColorPool; diff --git a/entry/src/main/java/com/chinasoft/ohos/adapter/OnDateDelayAdapter.java b/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/OnDateDelayAdapter.java similarity index 98% rename from entry/src/main/java/com/chinasoft/ohos/adapter/OnDateDelayAdapter.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/adapter/OnDateDelayAdapter.java index bee2a79ee00ccfec7330d517eb516f7b9735954c..31001b04cfd273e4225942d9b986db9325566007 100644 --- a/entry/src/main/java/com/chinasoft/ohos/adapter/OnDateDelayAdapter.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/OnDateDelayAdapter.java @@ -1,4 +1,4 @@ -package com.chinasoft.ohos.adapter; +package com.zhuangfei.android_timetableview.adapter; import com.zhuangfei.timetable.listener.OnDateBuildAapter; import com.zhuangfei.timetable.model.ScheduleSupport; diff --git a/entry/src/main/java/com/chinasoft/ohos/base/BaseAbilitySlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/base/BaseAbilitySlice.java similarity index 95% rename from entry/src/main/java/com/chinasoft/ohos/base/BaseAbilitySlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/base/BaseAbilitySlice.java index ec9a9a48d403f543112b6015f8f5338828d0f4e2..a05be86cefc68ea3c15ac12bcc31ca623cb3bc79 100644 --- a/entry/src/main/java/com/chinasoft/ohos/base/BaseAbilitySlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/base/BaseAbilitySlice.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.chinasoft.ohos.base; +package com.zhuangfei.android_timetableview.base; import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/bean/WeekChooseBean.java b/entry/src/main/java/com/zhuangfei/android_timetableview/bean/WeekChooseBean.java similarity index 96% rename from entry/src/main/java/com/chinasoft/ohos/bean/WeekChooseBean.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/bean/WeekChooseBean.java index e2a3794a2eedfc4b5bfd7beba86174259738ac7c..c3f04751a479ffcc0b4c61c2f9def1a968f88fa6 100644 --- a/entry/src/main/java/com/chinasoft/ohos/bean/WeekChooseBean.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/bean/WeekChooseBean.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.chinasoft.ohos.bean; +package com.zhuangfei.android_timetableview.bean; import ohos.agp.components.RadioButton; diff --git a/entry/src/main/java/com/chinasoft/ohos/config/OnMyConfigHandleAdapter.java b/entry/src/main/java/com/zhuangfei/android_timetableview/config/OnMyConfigHandleAdapter.java similarity index 97% rename from entry/src/main/java/com/chinasoft/ohos/config/OnMyConfigHandleAdapter.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/config/OnMyConfigHandleAdapter.java index 93e87d2b580b6363bd45e4c71cc40719d7eb4528..55672161754f6caa73be39a1f5300cc1a70c373e 100644 --- a/entry/src/main/java/com/chinasoft/ohos/config/OnMyConfigHandleAdapter.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/config/OnMyConfigHandleAdapter.java @@ -1,4 +1,4 @@ -package com.chinasoft.ohos.config; +package com.zhuangfei.android_timetableview.config; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; diff --git a/entry/src/main/java/com/chinasoft/ohos/custom/CustomOperater.java b/entry/src/main/java/com/zhuangfei/android_timetableview/custom/CustomOperater.java similarity index 97% rename from entry/src/main/java/com/chinasoft/ohos/custom/CustomOperater.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/custom/CustomOperater.java index 328be70f5d52125395d606d47f624e7c470bd625..72080ba1245b6caed4faff7bf503cd4faa67a117 100644 --- a/entry/src/main/java/com/chinasoft/ohos/custom/CustomOperater.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/custom/CustomOperater.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.chinasoft.ohos.custom; +package com.zhuangfei.android_timetableview.custom; import com.zhuangfei.timetable.operater.SimpleOperater; diff --git a/entry/src/main/java/com/chinasoft/ohos/dialog/ChooseWeekDialog.java b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ChooseWeekDialog.java similarity index 95% rename from entry/src/main/java/com/chinasoft/ohos/dialog/ChooseWeekDialog.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ChooseWeekDialog.java index 33a4e1578e8a7e2c47e70108477941999c8ba338..8f7124e061b13ba06366dd57096c68de2aee4a89 100644 --- a/entry/src/main/java/com/chinasoft/ohos/dialog/ChooseWeekDialog.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ChooseWeekDialog.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.chinasoft.ohos.dialog; +package com.zhuangfei.android_timetableview.dialog; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.adapter.ChooseAdapter; -import com.chinasoft.ohos.bean.WeekChooseBean; +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.adapter.ChooseAdapter; +import com.zhuangfei.android_timetableview.bean.WeekChooseBean; import com.zhuangfei.timetable.utils.ScreenUtils; import ohos.agp.components.*; diff --git a/entry/src/main/java/com/chinasoft/ohos/dialog/DialogUtil.java b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/DialogUtil.java similarity index 95% rename from entry/src/main/java/com/chinasoft/ohos/dialog/DialogUtil.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/dialog/DialogUtil.java index 5232ec66a039dd0f95f6db3e408e983979b54cfd..17e9fc326637af8fbddf3199d81609ad093ebeed 100644 --- a/entry/src/main/java/com/chinasoft/ohos/dialog/DialogUtil.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/DialogUtil.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.dialog; +package com.zhuangfei.android_timetableview.dialog; -import com.chinasoft.ohos.ResourceTable; +import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.timetable.utils.ScreenUtils; import ohos.agp.components.*; diff --git a/entry/src/main/java/com/chinasoft/ohos/dialog/TipsDialogUtil.java b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/TipsDialogUtil.java similarity index 95% rename from entry/src/main/java/com/chinasoft/ohos/dialog/TipsDialogUtil.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/dialog/TipsDialogUtil.java index 264ddf337bb484f022b57184a0d8f5cf810b3a1e..5127da8983fd174d027ebac3ae9908874901346d 100644 --- a/entry/src/main/java/com/chinasoft/ohos/dialog/TipsDialogUtil.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/TipsDialogUtil.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.dialog; +package com.zhuangfei.android_timetableview.dialog; -import com.chinasoft.ohos.ResourceTable; +import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.timetable.utils.ScreenUtils; import ohos.agp.components.ComponentContainer; @@ -62,7 +62,6 @@ public class TipsDialogUtil { toastDialog.setContentCustomComponent(customToastLayout); toastDialog.setAutoClosable(false); - toastDialog.setTransparent(true); toastDialog.setSize(ScreenUtils.getDisplayWidth(context) / 7 * 6, DirectionalLayout.LayoutConfig.MATCH_CONTENT); toastDialog.setAlignment(LayoutAlignment.CENTER); toastDialog.show(); diff --git a/entry/src/main/java/com/chinasoft/ohos/dialog/ToastUtil.java b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastUtil.java similarity index 97% rename from entry/src/main/java/com/chinasoft/ohos/dialog/ToastUtil.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastUtil.java index e84d4e611e49aa7316387b6aa110fa8cb614570a..f8ea5a76b113399855c8e7b4e9f7546ffefb684e 100644 --- a/entry/src/main/java/com/chinasoft/ohos/dialog/ToastUtil.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastUtil.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.dialog; +package com.zhuangfei.android_timetableview.dialog; -import com.chinasoft.ohos.ResourceTable; +import com.zhuangfei.android_timetableview.ResourceTable; import ohos.agp.components.*; import ohos.agp.utils.LayoutAlignment; diff --git a/entry/src/main/java/com/chinasoft/ohos/dialog/ToastViewDialog.java b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastViewDialog.java similarity index 97% rename from entry/src/main/java/com/chinasoft/ohos/dialog/ToastViewDialog.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastViewDialog.java index 5180af08b06c645bb5711da5decf2c6ce13f7b1f..692cb5ae1f61a39e6ca5ae8ab2b02dda15543f99 100644 --- a/entry/src/main/java/com/chinasoft/ohos/dialog/ToastViewDialog.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastViewDialog.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.dialog; +package com.zhuangfei.android_timetableview.dialog; import ohos.agp.components.Component; import ohos.agp.components.DirectionalLayout; diff --git a/entry/src/main/java/com/chinasoft/ohos/language/OnEnglishDateBuildAdapter.java b/entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishDateBuildAdapter.java similarity index 94% rename from entry/src/main/java/com/chinasoft/ohos/language/OnEnglishDateBuildAdapter.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishDateBuildAdapter.java index 64c8144dc12fb3e462a70ec3c4e589597d2c96f9..22f3f9cce9e9b0167f0e2fc2fedcebad87eff303 100644 --- a/entry/src/main/java/com/chinasoft/ohos/language/OnEnglishDateBuildAdapter.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishDateBuildAdapter.java @@ -1,4 +1,4 @@ -package com.chinasoft.ohos.language; +package com.zhuangfei.android_timetableview.language; import com.zhuangfei.timetable.listener.OnDateBuildAapter; import com.zhuangfei.timetable.model.ScheduleSupport; diff --git a/entry/src/main/java/com/chinasoft/ohos/language/OnEnglishItemBuildAdapter.java b/entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishItemBuildAdapter.java similarity index 93% rename from entry/src/main/java/com/chinasoft/ohos/language/OnEnglishItemBuildAdapter.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishItemBuildAdapter.java index e80081477a91017936618f496a84f30f2759f5c3..782aecf9246f3c5dfc86142ed93a7ae75afcb6b6 100644 --- a/entry/src/main/java/com/chinasoft/ohos/language/OnEnglishItemBuildAdapter.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishItemBuildAdapter.java @@ -1,4 +1,4 @@ -package com.chinasoft.ohos.language; +package com.zhuangfei.android_timetableview.language; import com.zhuangfei.timetable.listener.OnItemBuildAdapter; diff --git a/entry/src/main/java/com/chinasoft/ohos/model/MySubject.java b/entry/src/main/java/com/zhuangfei/android_timetableview/model/MySubject.java similarity index 98% rename from entry/src/main/java/com/chinasoft/ohos/model/MySubject.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/model/MySubject.java index 743faa2c87ea4ab063b35d7a23b8f4dd163840cb..60945aaee19459e1df907c258dd006ef5b46db53 100644 --- a/entry/src/main/java/com/chinasoft/ohos/model/MySubject.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/model/MySubject.java @@ -1,4 +1,4 @@ -package com.chinasoft.ohos.model; +package com.zhuangfei.android_timetableview.model; import com.zhuangfei.timetable.model.Schedule; import com.zhuangfei.timetable.model.ScheduleEnable; diff --git a/entry/src/main/java/com/chinasoft/ohos/model/SubjectRepertory.java b/entry/src/main/java/com/zhuangfei/android_timetableview/model/SubjectRepertory.java similarity index 99% rename from entry/src/main/java/com/chinasoft/ohos/model/SubjectRepertory.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/model/SubjectRepertory.java index f56c3aef024b09e9a7f50b63b05b07598c11a16d..ffb47666b28495c8cc9319212bd363913a00dbf9 100644 --- a/entry/src/main/java/com/chinasoft/ohos/model/SubjectRepertory.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/model/SubjectRepertory.java @@ -1,4 +1,4 @@ -package com.chinasoft.ohos.model; +package com.zhuangfei.android_timetableview.model; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONException; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/AttrSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/AttrSlice.java similarity index 86% rename from entry/src/main/java/com/chinasoft/ohos/slice/AttrSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/AttrSlice.java index 8ff9b0311edd060705696a2620ceff251a495b29..be9886b810761600b01255dca0ea6f5e44f1f2eb 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/AttrSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/AttrSlice.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.dialog.ToastViewDialog; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; +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.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.model.Schedule; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/BaseFuncSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/BaseFuncSlice.java similarity index 96% rename from entry/src/main/java/com/chinasoft/ohos/slice/BaseFuncSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/BaseFuncSlice.java index 182071300a48c73cb206ba9706398e9e5f0b5b41..276815325fbea36631aa79e62c4ab1e7991552a8 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/BaseFuncSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/BaseFuncSlice.java @@ -13,16 +13,16 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; - -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.bean.WeekChooseBean; -import com.chinasoft.ohos.dialog.ChooseWeekDialog; -import com.chinasoft.ohos.dialog.ToastViewDialog; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +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; 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/chinasoft/ohos/slice/ColorPoolSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ColorPoolSlice.java similarity index 92% rename from entry/src/main/java/com/chinasoft/ohos/slice/ColorPoolSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/ColorPoolSlice.java index 1d2ef0a6e80dba4350bb44242650a8e36930909c..21db3dfb1b04f038add23d01fb42450e43436099 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/ColorPoolSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ColorPoolSlice.java @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +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.timetable.TimetableView; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/CustomWidthSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/CustomWidthSlice.java similarity index 92% rename from entry/src/main/java/com/chinasoft/ohos/slice/CustomWidthSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/CustomWidthSlice.java index aaf239a4151e807e690e5dc0ca995a72667860fb..ef853fef899cbae502fd8f45163eb4b43ec6a50f 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/CustomWidthSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/CustomWidthSlice.java @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.custom.CustomOperater; -import com.chinasoft.ohos.dialog.ToastViewDialog; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; +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.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.OnDateBuildAapter; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/DateDelaySlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateDelaySlice.java similarity index 90% rename from entry/src/main/java/com/chinasoft/ohos/slice/DateDelaySlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateDelaySlice.java index f224a642127e7b386a8db1a85420a3a2d59dd92d..ad7046e74c63282875db70fb2a9b4980b2edea08 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/DateDelaySlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateDelaySlice.java @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.slice; - -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.adapter.OnDateDelayAdapter; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +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; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/DateSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateSlice.java similarity index 93% rename from entry/src/main/java/com/chinasoft/ohos/slice/DateSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateSlice.java index 3d1adfdccb7d58f666a1865cd15ce2a96db04d15..f171f5f9d456bb1caedbcad9fa3228cbc4e5353b 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/DateSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateSlice.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +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.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.OnDateBuildAapter; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/ElasticSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ElasticSlice.java similarity index 89% rename from entry/src/main/java/com/chinasoft/ohos/slice/ElasticSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/ElasticSlice.java index 51f02550215a331c92bfd71a1939262985adec7b..34bd714149922a078644238a1600d54cedf78aa6 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/ElasticSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ElasticSlice.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; +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.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/ExtrasSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ExtrasSlice.java similarity index 84% rename from entry/src/main/java/com/chinasoft/ohos/slice/ExtrasSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/ExtrasSlice.java index 9d76bd0b40e423c55198a12f9d00b52144808e2d..0400a2d71a727f0884882b635e374acfca7eaaaa 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/ExtrasSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ExtrasSlice.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.dialog.ToastViewDialog; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +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.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.model.Schedule; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/FlaglayoutSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/FlaglayoutSlice.java similarity index 91% rename from entry/src/main/java/com/chinasoft/ohos/slice/FlaglayoutSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/FlaglayoutSlice.java index 293f22cfc345a1882544116871b7fa7cbe38d6b9..3c493d86ff42e30de11cf7a180b93111fed43a87 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/FlaglayoutSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/FlaglayoutSlice.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; - -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.dialog.ToastViewDialog; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +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; 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/chinasoft/ohos/slice/ItemStyleSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ItemStyleSlice.java similarity index 94% rename from entry/src/main/java/com/chinasoft/ohos/slice/ItemStyleSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/ItemStyleSlice.java index 59b73293e252c7bafb6fad2f89d853719c295a48..cc6f5bc450e1e2aba4be64b0997817665461e1f5 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/ItemStyleSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ItemStyleSlice.java @@ -13,15 +13,15 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.language.OnEnglishDateBuildAdapter; -import com.chinasoft.ohos.language.OnEnglishItemBuildAdapter; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +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.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.OnItemBuildAdapter; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/LocalConfigSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/LocalConfigSlice.java similarity index 90% rename from entry/src/main/java/com/chinasoft/ohos/slice/LocalConfigSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/LocalConfigSlice.java index 1a5510b9b9c19ac587650991c5617cc5b58cea45..41febdfed0004a4e5a13706fad6c281d5f3a2980 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/LocalConfigSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/LocalConfigSlice.java @@ -13,16 +13,16 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; - -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.config.OnMyConfigHandleAdapter; -import com.chinasoft.ohos.dialog.DialogUtil; -import com.chinasoft.ohos.dialog.ToastViewDialog; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +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; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.model.ScheduleConfig; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/MainAbilitySlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/MainAbilitySlice.java similarity index 94% rename from entry/src/main/java/com/chinasoft/ohos/slice/MainAbilitySlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/MainAbilitySlice.java index dc2e13fcc2bb4fc3ffba448bbe4398781ee92721..137a705e68a7bc30641b68d055c33fa52f72032e 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/MainAbilitySlice.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; - -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.ability.*; -import com.chinasoft.ohos.base.BaseAbilitySlice; +package com.zhuangfei.android_timetableview.slice; +import com.chinasoft.ohos.ability.AttrAbility; +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.ability.*; +import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; import ohos.aafwk.content.Intent; import ohos.aafwk.content.Operation; import ohos.agp.components.Button; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/NonViewSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/NonViewSlice.java similarity index 92% rename from entry/src/main/java/com/chinasoft/ohos/slice/NonViewSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/NonViewSlice.java index d5f97f1d614c8a4e603f996b8d9a7c069ea656c7..5a8eaadcd6cda87d4a4bbc56507d0aa7dc44a352 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/NonViewSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/NonViewSlice.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.adapter.NonViewAdapter; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +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.timetable.model.Schedule; import com.zhuangfei.timetable.model.ScheduleSupport; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/SimpleSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SimpleSlice.java similarity index 95% rename from entry/src/main/java/com/chinasoft/ohos/slice/SimpleSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/SimpleSlice.java index 14dfe560bde3d6b4030db3673b9c1a878afdcd63..b36a658b714a6dbf9627f0e7df7592fa51e22662 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/SimpleSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SimpleSlice.java @@ -13,17 +13,17 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; - -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.bean.WeekChooseBean; -import com.chinasoft.ohos.dialog.ChooseWeekDialog; -import com.chinasoft.ohos.dialog.TipsDialogUtil; -import com.chinasoft.ohos.dialog.ToastViewDialog; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +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; 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/chinasoft/ohos/slice/SlideSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SlideSlice.java similarity index 95% rename from entry/src/main/java/com/chinasoft/ohos/slice/SlideSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/SlideSlice.java index f73e1ca28689c1a3fc8a67e441bca0677fb0fedf..81ef0a73c0c59b7bc5509e3ab5f5254860c82bbe 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/SlideSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SlideSlice.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +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.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.OnSlideBuildAdapter; diff --git a/entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinner.java b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinner.java similarity index 87% rename from entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinner.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinner.java index 8ecb00f5c69ad535539dc887cc5ce9e195166b9b..9c871d384d4a9b64e88322afbd35c3f830f9b00b 100644 --- a/entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinner.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinner.java @@ -30,9 +30,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.spinner; +package com.zhuangfei.android_timetableview.spinner; -import com.chinasoft.ohos.ResourceTable; +import com.zhuangfei.android_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.chinasoft.ohos.spinner.MaterialSpinnerBaseAdapter adapter; + private com.zhuangfei.android_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.chinasoft.ohos.spinner.MaterialSpinnerBaseAdapter mAdapter; + private com.zhuangfei.android_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.chinasoft.ohos.spinner.Utils.isRtl(context); + rtl = com.zhuangfei.android_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.chinasoft.ohos.spinner.TypedAttrUtils.getIntColor(attrs, + backgroundColor = com.zhuangfei.android_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.chinasoft.ohos.spinner.TypedAttrUtils.getIntColor(attrs, "ms_text_color", + textColor = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, "ms_text_color", defaultColor.getValue()); - textColorButton = com.chinasoft.ohos.spinner.TypedAttrUtils.getIntColor(attrs, + textColorButton = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, "ms_text_color_button", defaultColor.getValue()); - hintColor = com.chinasoft.ohos.spinner.TypedAttrUtils.getIntColor(attrs, + hintColor = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, "ms_hint_color", defaultColor.getValue()); - arrowColor = com.chinasoft.ohos.spinner.TypedAttrUtils.getIntColor(attrs, "ms_arrow_tint", textColor); - hideArrow = com.chinasoft.ohos.spinner.TypedAttrUtils.getBoolean(attrs, "ms_hide_arrow", false); - hintText = com.chinasoft.ohos.spinner.TypedAttrUtils.getString(attrs, "ms_hint", ""); + 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", ""); - popupWindowMaxHeight = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + popupWindowMaxHeight = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_dropdown_max_height", 1680); - popupWindowHeight = com.chinasoft.ohos.spinner.TypedAttrUtils.getLayoutDimension(attrs, + popupWindowHeight = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getLayoutDimension(attrs, "ms_dropdown_height", ComponentContainer.LayoutConfig.MATCH_CONTENT); - paddingTop = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + paddingTop = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_padding_top", defaultPaddingTop); - paddingLeft = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + paddingLeft = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_padding_left", defaultPaddingLeft); - paddingBottom = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + paddingBottom = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_padding_bottom", defaultPaddingBottom); - paddingRight = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + paddingRight = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_padding_right", defaultPaddingRight); - popupPaddingTop = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + popupPaddingTop = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_popup_padding_top", defaultPopupPaddingTop); - popupPaddingLeft = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + popupPaddingLeft = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_popup_padding_left", defaultPopupPaddingLeft); - popupPaddingBottom = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + popupPaddingBottom = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_popup_padding_bottom", defaultPopupPaddingBottom); - popupPaddingRight = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + popupPaddingRight = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_popup_padding_right", defaultPopupPaddingRight); - arrowColorDisabled = com.chinasoft.ohos.spinner.Utils.lighter(arrowColor, 0.8f); + arrowColorDisabled = com.zhuangfei.android_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.chinasoft.ohos.spinner.Utils.getPixelMapElement(context, ResourceTable.Media_ic_more); + arrowDrawable = com.zhuangfei.android_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.chinasoft.ohos.spinner.MaterialSpinnerAdapter<>(getContext(), items) + adapter = new com.zhuangfei.android_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.chinasoft.ohos.spinner.MaterialSpinnerAdapter adapter) { + public void setAdapter(com.zhuangfei.android_timetableview.spinner.MaterialSpinnerAdapter adapter) { this.adapter = adapter; this.adapter.setTextColor(textColor); this.adapter.setPopupPadding(popupPaddingLeft, popupPaddingTop, popupPaddingRight, popupPaddingBottom); setAdapterInternal(adapter); } - private void setAdapterInternal(com.chinasoft.ohos.spinner.MaterialSpinnerBaseAdapter adapterInternal) { + private void setAdapterInternal(com.zhuangfei.android_timetableview.spinner.MaterialSpinnerBaseAdapter adapterInternal) { this.mAdapter = adapterInternal; boolean shouldResetPopupHeight = listView.getItemProvider() != null; - adapterInternal.setHintEnabled(!com.chinasoft.ohos.spinner.Utils.isEmpty(hintText)); + adapterInternal.setHintEnabled(!com.zhuangfei.android_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.chinasoft.ohos.spinner.Utils.isEmpty(hintText)) { + if (nothingSelected && !com.zhuangfei.android_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.chinasoft.ohos.spinner.Utils.lighter(arrowColor, 0.8f); + arrowColorDisabled = com.zhuangfei.android_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.chinasoft.ohos.spinner.Utils.getPixelMapElement(mContext, ResourceTable.Media_ic_more); + arrowDrawable = com.zhuangfei.android_timetableview.spinner.Utils.getPixelMapElement(mContext, ResourceTable.Media_ic_more); } else { - arrowDrawable = com.chinasoft.ohos.spinner.Utils.getPixelMapElement(mContext, ResourceTable.Media_ic_more); + arrowDrawable = com.zhuangfei.android_timetableview.spinner.Utils.getPixelMapElement(mContext, ResourceTable.Media_ic_more); } /** * 旋转图片 动作 diff --git a/entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinnerAdapter.java b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerAdapter.java similarity index 97% rename from entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinnerAdapter.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerAdapter.java index 0f270d2fc9f45bdcbf0fdbb45eda00835df0711e..91b525c228957877e031a15e343d1905d24f7fe6 100644 --- a/entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinnerAdapter.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerAdapter.java @@ -30,7 +30,7 @@ * limitations under the License. */ -package com.chinasoft.ohos.spinner; +package com.zhuangfei.android_timetableview.spinner; import ohos.app.Context; diff --git a/entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinnerBaseAdapter.java b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerBaseAdapter.java similarity index 98% rename from entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinnerBaseAdapter.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerBaseAdapter.java index e334ceae9828b876a800bc545e16446a0e219d7c..d899a73f30a79441c57f114629108bdfa2e54976 100644 --- a/entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinnerBaseAdapter.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerBaseAdapter.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.spinner; +package com.zhuangfei.android_timetableview.spinner; -import com.chinasoft.ohos.ResourceTable; +import com.zhuangfei.android_timetableview.ResourceTable; import ohos.agp.colors.RgbColor; import ohos.agp.components.*; diff --git a/entry/src/main/java/com/chinasoft/ohos/spinner/TypedAttrUtils.java b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/TypedAttrUtils.java similarity index 98% rename from entry/src/main/java/com/chinasoft/ohos/spinner/TypedAttrUtils.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/spinner/TypedAttrUtils.java index c14f1fcf0d13c99a82e49a0fb4048304c82b8f05..be3d0eed01f2f46f9a5e84ed13bcd336e9fe8733 100644 --- a/entry/src/main/java/com/chinasoft/ohos/spinner/TypedAttrUtils.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/TypedAttrUtils.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.chinasoft.ohos.spinner; +package com.zhuangfei.android_timetableview.spinner; import ohos.agp.components.Attr; diff --git a/entry/src/main/java/com/chinasoft/ohos/spinner/Utils.java b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/Utils.java similarity index 98% rename from entry/src/main/java/com/chinasoft/ohos/spinner/Utils.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/spinner/Utils.java index 491461429a281f2052eeafd845458b04fa8da6b3..09c816efe963115d07364034b3e23a72613ea6ff 100644 --- a/entry/src/main/java/com/chinasoft/ohos/spinner/Utils.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/Utils.java @@ -15,7 +15,7 @@ * */ -package com.chinasoft.ohos.spinner; +package com.zhuangfei.android_timetableview.spinner; import ohos.agp.components.element.PixelMapElement; @@ -105,6 +105,8 @@ final class Utils { * * @param drawableId The desired resource identifier * @param context context + * + * * @return Drawable An object that can be used to draw this resource. */ static PixelMapElement getPixelMapElement(Context context, int drawableId) { diff --git a/entry/src/main/java/com/chinasoft/ohos/views/ElasticScrollView.java b/entry/src/main/java/com/zhuangfei/android_timetableview/views/ElasticScrollView.java similarity index 98% rename from entry/src/main/java/com/chinasoft/ohos/views/ElasticScrollView.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/views/ElasticScrollView.java index e9679889d18ee610d141e766ff480bc65a531f98..f518612e9f237b5c7f30a7ab745026713c6812a9 100644 --- a/entry/src/main/java/com/chinasoft/ohos/views/ElasticScrollView.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/views/ElasticScrollView.java @@ -1,4 +1,4 @@ -package com.chinasoft.ohos.views; +package com.zhuangfei.android_timetableview.views; import ohos.agp.animation.Animator; import ohos.agp.animation.AnimatorProperty; diff --git a/entry/src/main/resources/base/layout/ability_local_config.xml b/entry/src/main/resources/base/layout/ability_local_config.xml index 48307a6ca855a77d04d714b646162b5e49843c0f..db73cbc66ee518b0f50af8a5722a0c8908ab6948 100644 --- a/entry/src/main/resources/base/layout/ability_local_config.xml +++ b/entry/src/main/resources/base/layout/ability_local_config.xml @@ -5,7 +5,11 @@ ohos:orientation="vertical" xmlns:ohos="http://schemas.huawei.com/res/ohos"> - + - - - \ 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 d6780db7cbe02b0496a12f2a1708af20023cc998..db3357195c3ea836bafc23a790aa6e87ff64d837 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" /> - -