diff --git a/entry/src/main/config.json b/entry/src/main/config.json index f2d6d13a7d5861d5ad91106322d835ecaf5a73af..7e09f019e89c6cb6f79439a8b1a86ca5f3538bc1 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -1,6 +1,6 @@ { "app": { - "bundleName": "com.ms.square.ohos.expandabletextview.sample", + "bundleName": "com.ms.square.ohos.expandabletext.sample", "vendor": "hos", "version": { "code": 1, @@ -14,7 +14,7 @@ }, "deviceConfig": {}, "module": { - "package": "com.ms.square.ohos.expandabletextview.sample", + "package": "com.ms.square.ohos.expandabletext.sample", "name": ".MyApplication", "deviceType": [ "phone" @@ -46,7 +46,7 @@ } ], "orientation": "unspecified", - "name": "com.ms.square.ohos.expandabletextview.sample.MainAbility", + "name": "com.ms.square.ohos.expandabletext.sample.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/MainAbility.java b/entry/src/main/java/com/ms/square/ohos/expandabletext/sample/MainAbility.java similarity index 89% rename from entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/MainAbility.java rename to entry/src/main/java/com/ms/square/ohos/expandabletext/sample/MainAbility.java index e9495dec71d52b8d788a5b8523aef4cc22e53d00..8dd97547af0a0c6c5e8482a7469875e8ad245a97 100644 --- a/entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/MainAbility.java +++ b/entry/src/main/java/com/ms/square/ohos/expandabletext/sample/MainAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ms.square.ohos.expandabletextview.sample; +package com.ms.square.ohos.expandabletext.sample; -import com.ms.square.ohos.expandabletextview.sample.slice.MainAbilitySlice; +import com.ms.square.ohos.expandabletext.sample.slice.MainAbilitySlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; import ohos.agp.components.ComponentContainer; diff --git a/entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/MyApplication.java b/entry/src/main/java/com/ms/square/ohos/expandabletext/sample/MyApplication.java similarity index 93% rename from entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/MyApplication.java rename to entry/src/main/java/com/ms/square/ohos/expandabletext/sample/MyApplication.java index 50c1ced3c6c8e7cee74f83f8ea8a2f2644e65c94..446fead9983cb391002588b5586993486b2cc230 100644 --- a/entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/MyApplication.java +++ b/entry/src/main/java/com/ms/square/ohos/expandabletext/sample/MyApplication.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ms.square.ohos.expandabletextview.sample; +package com.ms.square.ohos.expandabletext.sample; import ohos.aafwk.ability.AbilityPackage; diff --git a/entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/adapter/ListAdapter.java b/entry/src/main/java/com/ms/square/ohos/expandabletext/sample/provider/ListProvider.java similarity index 90% rename from entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/adapter/ListAdapter.java rename to entry/src/main/java/com/ms/square/ohos/expandabletext/sample/provider/ListProvider.java index ddfb0172c0862f152d7606f4dfea8a5e509ac74b..9ab9998b77ea7590926d4f3f41c8e99de227a2b2 100644 --- a/entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/adapter/ListAdapter.java +++ b/entry/src/main/java/com/ms/square/ohos/expandabletext/sample/provider/ListProvider.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ms.square.ohos.expandabletextview.sample.adapter; +package com.ms.square.ohos.expandabletext.sample.provider; import ohos.agp.components.BaseItemProvider; import ohos.agp.components.Component; @@ -30,12 +30,12 @@ import java.util.List; * date 2021-03-15 10:13 * description 列表数据适配器 */ -public abstract class ListAdapter extends BaseItemProvider { +public abstract class ListProvider extends BaseItemProvider { private List data; private Context ct; private int itemId; - public ListAdapter(Context ct, int itemId, List data) { + public ListProvider(Context ct, int itemId, List data) { this.data = data; this.ct = ct; this.itemId = itemId; diff --git a/entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/adapter/MainPagerAdapter.java b/entry/src/main/java/com/ms/square/ohos/expandabletext/sample/provider/MainPagerSlideProvider.java similarity index 89% rename from entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/adapter/MainPagerAdapter.java rename to entry/src/main/java/com/ms/square/ohos/expandabletext/sample/provider/MainPagerSlideProvider.java index 10728daedab746560d4e7847424e852c11c9b414..b5ac246c64df53e39a8ef32a17fb932a8478dbd8 100644 --- a/entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/adapter/MainPagerAdapter.java +++ b/entry/src/main/java/com/ms/square/ohos/expandabletext/sample/provider/MainPagerSlideProvider.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ms.square.ohos.expandabletextview.sample.adapter; +package com.ms.square.ohos.expandabletext.sample.provider; import ohos.agp.components.Component; import ohos.agp.components.ComponentContainer; @@ -29,7 +29,7 @@ import java.util.List; * date 2021-03-15 10:13 * description PageSlider适配器 */ -public class MainPagerAdapter extends PageSliderProvider { +public class MainPagerSlideProvider extends PageSliderProvider { private List pages; /** @@ -37,7 +37,7 @@ public class MainPagerAdapter extends PageSliderProvider { * * @param pages 页面 */ - public MainPagerAdapter(ArrayList pages) { + public MainPagerSlideProvider(ArrayList pages) { this.pages = pages; } diff --git a/entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/adapter/ViewHolder.java b/entry/src/main/java/com/ms/square/ohos/expandabletext/sample/provider/ViewHolder.java similarity index 96% rename from entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/adapter/ViewHolder.java rename to entry/src/main/java/com/ms/square/ohos/expandabletext/sample/provider/ViewHolder.java index ec2a77faca36e53f3646e41712beb64185fd7d2a..de207f23f50b6085d3dc1da2c310517c211f5808 100644 --- a/entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/adapter/ViewHolder.java +++ b/entry/src/main/java/com/ms/square/ohos/expandabletext/sample/provider/ViewHolder.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ms.square.ohos.expandabletextview.sample.adapter; +package com.ms.square.ohos.expandabletext.sample.provider; import ohos.agp.components.Component; import ohos.agp.components.ComponentContainer; diff --git a/entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/slice/MainAbilitySlice.java b/entry/src/main/java/com/ms/square/ohos/expandabletext/sample/slice/MainAbilitySlice.java similarity index 93% rename from entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/slice/MainAbilitySlice.java rename to entry/src/main/java/com/ms/square/ohos/expandabletext/sample/slice/MainAbilitySlice.java index 99044629cba04b3d08bd224f29d5bfcc086451c0..0610185c770aba22d13fb9d9645ef77dd5322c12 100644 --- a/entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/ms/square/ohos/expandabletext/sample/slice/MainAbilitySlice.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.ms.square.ohos.expandabletextview.sample.slice; +package com.ms.square.ohos.expandabletext.sample.slice; -import com.ms.square.ohos.expandabletextview.sample.ResourceTable; -import com.ms.square.ohos.expandabletextview.sample.adapter.MainPagerAdapter; -import com.ms.square.ohos.expandabletextview.sample.utils.ViewCreateHelper; +import com.ms.square.ohos.expandabletext.sample.ResourceTable; +import com.ms.square.ohos.expandabletext.sample.provider.MainPagerSlideProvider; +import com.ms.square.ohos.expandabletext.sample.utils.ViewCreateHelper; import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; import ohos.agp.colors.RgbColor; @@ -85,7 +85,7 @@ public class MainAbilitySlice extends AbilitySlice implements TabList.TabSelecte tabList.addTab(tab); } tabList.selectTabAt(0); - pageSlider.setProvider(new MainPagerAdapter(initPageSliderViewData())); + pageSlider.setProvider(new MainPagerSlideProvider(initPageSliderViewData())); pageSlider.setCurrentPage(0); pageSlider.setReboundEffect(true); pageSlider.setCentralScrollMode(true); diff --git a/entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/utils/MyToast.java b/entry/src/main/java/com/ms/square/ohos/expandabletext/sample/utils/MyToast.java similarity index 98% rename from entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/utils/MyToast.java rename to entry/src/main/java/com/ms/square/ohos/expandabletext/sample/utils/MyToast.java index 1cb12e60d1af5e12a4f7291c8fee0d31fd388a98..859bc923bebc257de709c96de63e50d9c8373513 100644 --- a/entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/utils/MyToast.java +++ b/entry/src/main/java/com/ms/square/ohos/expandabletext/sample/utils/MyToast.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ms.square.ohos.expandabletextview.sample.utils; +package com.ms.square.ohos.expandabletext.sample.utils; import ohos.agp.colors.RgbColor; import ohos.agp.components.DirectionalLayout; diff --git a/entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/utils/ViewCreateHelper.java b/entry/src/main/java/com/ms/square/ohos/expandabletext/sample/utils/ViewCreateHelper.java similarity index 83% rename from entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/utils/ViewCreateHelper.java rename to entry/src/main/java/com/ms/square/ohos/expandabletext/sample/utils/ViewCreateHelper.java index 720703cf0686c0e9122b2ffeb4a174667126f194..8a0ec4b3b3b597d9d439c4deb2841fec37b19eaa 100644 --- a/entry/src/main/java/com/ms/square/ohos/expandabletextview/sample/utils/ViewCreateHelper.java +++ b/entry/src/main/java/com/ms/square/ohos/expandabletext/sample/utils/ViewCreateHelper.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ms.square.ohos.expandabletextview.sample.utils; +package com.ms.square.ohos.expandabletext.sample.utils; -import com.ms.square.ohos.expandabletextview.ExpandableTextView; -import com.ms.square.ohos.expandabletextview.sample.ResourceTable; -import com.ms.square.ohos.expandabletextview.sample.adapter.ListAdapter; -import com.ms.square.ohos.expandabletextview.sample.adapter.ViewHolder; +import com.ms.square.ohos.expandabletext.ExpandableText; +import com.ms.square.ohos.expandabletext.sample.ResourceTable; +import com.ms.square.ohos.expandabletext.sample.provider.ListProvider; +import com.ms.square.ohos.expandabletext.sample.provider.ViewHolder; import ohos.agp.components.*; import ohos.agp.render.Paint; import ohos.app.Context; @@ -79,10 +79,10 @@ public final class ViewCreateHelper { Component component = root.getComponentAt(index); Text titleText = (Text) component.findComponentById(ResourceTable.Id_title); titleText.setText("Sample " + (index + 1)); - ExpandableTextView expandableTextView = (ExpandableTextView) + ExpandableText expandableText = (ExpandableText) component.findComponentById(ResourceTable.Id_expandable); - expandableTextView.setText(slice.getString(ResourceTable.String_dummy_text2)); - expandableTextView.setOnExpandStateChangeListener(new ExpandableTextView.OnExpandStateChangeListener() { + expandableText.setText(slice.getString(ResourceTable.String_dummy_text2)); + expandableText.setOnExpandStateChangeListener(new ExpandableText.OnExpandStateChangeListener() { @Override public void onExpandStateChanged(Text textView) { @@ -115,25 +115,25 @@ public final class ViewCreateHelper { return (int) (Math.ceil(fm.descent - fm.top) + DEFAULT) * MAX_COLLAPSED_LINES; } - ListAdapter listAdapter = null; + ListProvider listProvider = null; private void initView(Component mainComponent, String title) { // 列表 ListContainer listContainer = (ListContainer) mainComponent.findComponentById(ResourceTable.Id_list_main); listContainer.enableScrollBar(1, true); - listAdapter = new ListAdapter(slice, ResourceTable.Layout_text_item, getData()) { + listProvider = new ListProvider(slice, ResourceTable.Layout_text_item, getData()) { @Override public void convert(ViewHolder viewHolder, String item, int position) { Text text = viewHolder.getView(ResourceTable.Id_expandable_text); text.setTag(position + ""); text.setHeight(getFontHeight(text.getTextSize())); - ExpandableTextView expandableTextView = viewHolder.getView(ResourceTable.Id_expandable); - expandableTextView.setText(slice.getString(ResourceTable.String_dummy_text2)); - expandableTextView.setOnExpandStateChangeListener(new ExpandableTextView.OnExpandStateChangeListener() { + ExpandableText expandableText = viewHolder.getView(ResourceTable.Id_expandable); + expandableText.setText(slice.getString(ResourceTable.String_dummy_text2)); + expandableText.setOnExpandStateChangeListener(new ExpandableText.OnExpandStateChangeListener() { @Override public void onExpandStateChanged(Text textView) { int position = Integer.valueOf(textView.getTag().toString()).intValue(); - listAdapter.notifyDataSetItemChanged(position + 1); + listProvider.notifyDataSetItemChanged(position + 1); } @Override @@ -153,7 +153,7 @@ public final class ViewCreateHelper { } } }); - listContainer.setItemProvider(listAdapter); + listContainer.setItemProvider(listProvider); listContainer.setItemClickedListener(new ListContainer.ItemClickedListener() { @Override public void onItemClicked(ListContainer listContainer, Component component, int position, long l) { diff --git a/entry/src/main/resources/base/layout/text_item.xml b/entry/src/main/resources/base/layout/text_item.xml index 3ad58a10c0afc6333091d30955abdb41a628a254..10dac9d9e59d7e02dca605869d9ec3438e643fde 100644 --- a/entry/src/main/resources/base/layout/text_item.xml +++ b/entry/src/main/resources/base/layout/text_item.xml @@ -6,7 +6,7 @@ ohos:width="match_parent" ohos:orientation="vertical"> - - + - - + \ No newline at end of file diff --git a/entry/src/ohosTest/config.json b/entry/src/ohosTest/config.json index 7ce86206d8fecc333510045bcd7ec2201771cecb..dc716cec4c4679e1eaba7be4db9ae2381da5eb8b 100644 --- a/entry/src/ohosTest/config.json +++ b/entry/src/ohosTest/config.json @@ -1,6 +1,6 @@ { "app": { - "bundleName": "com.hos.expandabletextview", + "bundleName": "com.hos.expandabletext", "vendor": "hos", "version": { "code": 1, @@ -14,7 +14,7 @@ }, "deviceConfig": {}, "module": { - "package": "com.hos.expandabletextview", + "package": "com.hos.expandabletext", "name": "testModule", "deviceType": [ "phone" diff --git a/entry/src/ohosTest/java/com/hos/expandabletextview/ExampleOhosTest.java b/entry/src/ohosTest/java/com/hos/expandabletext/ExampleOhosTest.java similarity index 77% rename from entry/src/ohosTest/java/com/hos/expandabletextview/ExampleOhosTest.java rename to entry/src/ohosTest/java/com/hos/expandabletext/ExampleOhosTest.java index d7ea0d1b3cc8b9e7870e189f13ca123b89423409..73a6de71c1def8cc5580d32284c4a2b231d2994d 100644 --- a/entry/src/ohosTest/java/com/hos/expandabletextview/ExampleOhosTest.java +++ b/entry/src/ohosTest/java/com/hos/expandabletext/ExampleOhosTest.java @@ -1,4 +1,4 @@ -package com.hos.expandabletextview; +package com.hos.expandabletext; import ohos.aafwk.ability.delegation.AbilityDelegatorRegistry; import org.junit.Test; @@ -6,12 +6,12 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; public class ExampleOhosTest { - /** + /** * 全UI应用、不支持Context,不支持单元测试 */ @Test public void testBundleName() { final String actualBundleName = AbilityDelegatorRegistry.getArguments().getTestBundleName(); - assertEquals("com.hos.expandabletextview", actualBundleName); + assertEquals("com.hos.expandabletext", actualBundleName); } } \ No newline at end of file diff --git a/lib/src/main/java/com/ms/square/ohos/expandabletextview/ExpandableTextView.java b/lib/src/main/java/com/ms/square/ohos/expandabletext/ExpandableText.java similarity index 97% rename from lib/src/main/java/com/ms/square/ohos/expandabletextview/ExpandableTextView.java rename to lib/src/main/java/com/ms/square/ohos/expandabletext/ExpandableText.java index e6ae35bf6c807475dadf94bac6f2381c0487dad6..bed6ef1b6691cfcbe7a86dd4463e2dacd34d2ae3 100644 --- a/lib/src/main/java/com/ms/square/ohos/expandabletextview/ExpandableTextView.java +++ b/lib/src/main/java/com/ms/square/ohos/expandabletext/ExpandableText.java @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ms.square.ohos.expandabletextview; +package com.ms.square.ohos.expandabletext; +import com.ms.square.ohos.expandabletextview.ResourceTable; import ohos.agp.animation.Animator; import ohos.agp.animation.AnimatorValue; import ohos.agp.components.*; @@ -41,7 +42,7 @@ import java.util.Map; * date 2021-02-22 10:12 * description 可折叠的TextView */ -public class ExpandableTextView extends DirectionalLayout implements +public class ExpandableText extends DirectionalLayout implements Component.EstimateSizeListener, Component.ClickedListener, ComponentContainer.ArrangeListener { private static final HiLogLabel logLabel = new HiLogLabel(HiLog.LOG_APP, 0x00101, "ExpandableTextView"); @@ -122,7 +123,7 @@ public class ExpandableTextView extends DirectionalLayout implements * * @param context Context */ - public ExpandableTextView(Context context) { + public ExpandableText(Context context) { this(context, null); } @@ -132,7 +133,7 @@ public class ExpandableTextView extends DirectionalLayout implements * @param context Context * @param attrSet AttrSet */ - public ExpandableTextView(Context context, AttrSet attrSet) { + public ExpandableText(Context context, AttrSet attrSet) { super(context, attrSet); this.context = context; init(attrSet); @@ -145,7 +146,7 @@ public class ExpandableTextView extends DirectionalLayout implements * @param attrSet AttrSet * @param styleName styleName */ - public ExpandableTextView(Context context, AttrSet attrSet, String styleName) { + public ExpandableText(Context context, AttrSet attrSet, String styleName) { super(context, attrSet, styleName); init(attrSet); } @@ -328,9 +329,9 @@ public class ExpandableTextView extends DirectionalLayout implements @Override public void onDraw(Component component, Canvas canvas) { //add测量的回调 - setEstimateSizeListener(ExpandableTextView.this); + setEstimateSizeListener(ExpandableText.this); //add布局的回调 - setArrangeListener(ExpandableTextView.this); + setArrangeListener(ExpandableText.this); findViews(); } diff --git a/lib/src/main/java/com/ms/square/ohos/expandabletextview/TypedAttrUtils.java b/lib/src/main/java/com/ms/square/ohos/expandabletext/TypedAttrUtils.java similarity index 98% rename from lib/src/main/java/com/ms/square/ohos/expandabletextview/TypedAttrUtils.java rename to lib/src/main/java/com/ms/square/ohos/expandabletext/TypedAttrUtils.java index cee3abc109e253fe291655e262c1453c8e5e1c72..82867487e9c2df02167af55e57e03b36410084b9 100644 --- a/lib/src/main/java/com/ms/square/ohos/expandabletextview/TypedAttrUtils.java +++ b/lib/src/main/java/com/ms/square/ohos/expandabletext/TypedAttrUtils.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ms.square.ohos.expandabletextview; +package com.ms.square.ohos.expandabletext; import ohos.agp.components.Attr;