diff --git a/README.OPENSOURCE b/README.OPENSOURCE index 98163f8265ad3c0a1bb69a48457804b0f221f28a..4017411fa3660f574cea8ed3445e26c3179a1f53 100644 --- a/README.OPENSOURCE +++ b/README.OPENSOURCE @@ -12,7 +12,7 @@ "Upstream URL": "https://github.com/v2rc/RxDiffUtil", - "Description": "围绕Android DiffUtil库的 RecyclerView窗口小部件的Rx包装器,它处理线程并使用来响应对适配器的并发更改" + "Description": "围绕 DiffUtil库的 RecyclerView窗口小部件的Rx包装器,它处理线程并使用来响应对适配器的并发更改" } diff --git a/entry/src/main/config.json b/entry/src/main/config.json index b4aedcb214c895edaba2d863a4d5c19ada3e1f77..7039cc5ca8d8683a591b32cc5ff4a0fac8717e9b 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -1,6 +1,6 @@ { "app": { - "bundleName": "cafe.adriel.androidaudioconverter.rxdiffutil", + "bundleName": "cafe.adriel.ohosaudioconverter.rxdiffutil", "vendor": "adriel", "version": { "code": 1000000, @@ -9,9 +9,9 @@ }, "deviceConfig": {}, "module": { - "package": "cafe.adriel.androidaudioconverter.rxdiffutil", + "package": "cafe.adriel.ohosaudioconverter.rxdiffutil", "name": ".MyApplication", - "mainAbility": "cafe.adriel.androidaudioconverter.rxdiffutil.MainAbility", + "mainAbility": "cafe.adriel.ohosaudioconverter.rxdiffutil.MainAbility", "deviceType": [ "phone", "tablet" @@ -35,7 +35,7 @@ } ], "orientation": "unspecified", - "name": "cafe.adriel.androidaudioconverter.rxdiffutil.MainAbility", + "name": "cafe.adriel.ohosaudioconverter.rxdiffutil.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:entry_MainAbility", diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/CustStateChangedListener.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/CustStateChangedListener.java similarity index 95% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/CustStateChangedListener.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/CustStateChangedListener.java index f463fa3fe8c171d10725e6fed8439caeafd0e5d4..1a18e6b72c0b10eddb3ca23ad0d9a6341d6bf6ec 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/CustStateChangedListener.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/CustStateChangedListener.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; import ohos.agp.animation.Animator; diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/CustomTableLayout.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/CustomTableLayout.java similarity index 97% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/CustomTableLayout.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/CustomTableLayout.java index b3a3990f7dc156d1cfea62fd1467df9c9045e9d8..fed465e3880145249b274d1e0b537e23ce4cc548 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/CustomTableLayout.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/CustomTableLayout.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; -import cafe.adriel.androidaudioconverter.rxdiffutil.adapter.BaseProvider; +import cafe.adriel.ohosaudioconverter.rxdiffutil.adapter.BaseProvider; import ohos.agp.animation.Animator; import ohos.agp.animation.AnimatorProperty; import ohos.agp.components.*; @@ -27,7 +27,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static cafe.adriel.androidaudioconverter.rxdiffutil.ThingRepository.*; +import static cafe.adriel.ohosaudioconverter.rxdiffutil.ThingRepository.*; /** * CustomTableLayout. diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/DiffResult.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/DiffResult.java similarity index 90% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/DiffResult.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/DiffResult.java index 781bdab3115094f882d932bff7e57f7a12c12cc3..7a15721abc8ab2b8200173ed0a8654d7ee2f3ab6 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/DiffResult.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/DiffResult.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; -import cafe.adriel.androidaudioconverter.rxdiffutil.adapter.BaseProvider; +import cafe.adriel.ohosaudioconverter.rxdiffutil.adapter.BaseProvider; /** * DiffResult. diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/MainAbility.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/MainAbility.java similarity index 87% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/MainAbility.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/MainAbility.java index 6de0b4e769ddcc8fc14c126597920f6aa5f00abc..3d68a6b0013d6614ee64f583d4165d03ef3c871b 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/MainAbility.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/MainAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; -import cafe.adriel.androidaudioconverter.rxdiffutil.slice.MainAbilitySlice; +import cafe.adriel.ohosaudioconverter.rxdiffutil.slice.MainAbilitySlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/MyApplication.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/MyApplication.java similarity index 93% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/MyApplication.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/MyApplication.java index 59081e1e779886727a85ec56023dfcb675759634..bee818077f268f6b38d5ca74256c498612adf267 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/MyApplication.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/MyApplication.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; import ohos.aafwk.ability.AbilityPackage; diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/Thing.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/Thing.java similarity index 98% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/Thing.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/Thing.java index 4870e187c92ac565fe4e2e3c0a51e720e1f74a47..0a2508735104adf2d45dea1451da8694b3894261 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/Thing.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/Thing.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; import ohos.utils.Parcel; import ohos.utils.Sequenceable; diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/ThingRepository.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ThingRepository.java similarity index 98% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/ThingRepository.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ThingRepository.java index 61f064d09a95ef9b7fb4461d30504c36541661b9..938d5b166f7c4be4d51a9a36d4e2d42c2c6a4617 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/ThingRepository.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ThingRepository.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.schedulers.Schedulers; diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/adapter/BaseProvider.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/adapter/BaseProvider.java similarity index 95% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/adapter/BaseProvider.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/adapter/BaseProvider.java index 74f135287165fb5ef67fd6a9a0aef514378fcf08..116ad023289bf5c36a023d2a2bc211a09b7de99e 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/adapter/BaseProvider.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/adapter/BaseProvider.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil.adapter; +package cafe.adriel.ohosaudioconverter.rxdiffutil.adapter; import ohos.agp.components.Component; import ohos.agp.components.ComponentContainer; diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/slice/MainAbilitySlice.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/slice/MainAbilitySlice.java similarity index 95% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/slice/MainAbilitySlice.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/slice/MainAbilitySlice.java index 46fba1613e0eafcdc7a02d35c67597c8c265d3c6..7cb685898b4b472520d13a5d362b2a2dea153f25 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/slice/MainAbilitySlice.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/slice/MainAbilitySlice.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil.slice; +package cafe.adriel.ohosaudioconverter.rxdiffutil.slice; -import cafe.adriel.androidaudioconverter.rxdiffutil.*; -import cafe.adriel.androidaudioconverter.rxdiffutil.adapter.BaseProvider; +import cafe.adriel.ohosaudioconverter.rxdiffutil.*; +import cafe.adriel.ohosaudioconverter.rxdiffutil.adapter.BaseProvider; import io.reactivex.rxjava3.disposables.Disposable; import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import static cafe.adriel.androidaudioconverter.rxdiffutil.DiffResult.calculateDiff; +import static cafe.adriel.ohosaudioconverter.rxdiffutil.DiffResult.calculateDiff; import static io.reactivex.rxjava3.openharmony.schedulers.OpenHarmonySchedulers.mainThread; import static io.reactivex.rxjava3.schedulers.Schedulers.computation; diff --git a/entry/src/main/resources/base/layout/ability_main.xml b/entry/src/main/resources/base/layout/ability_main.xml index cffdd842e060dc9c4bd49f00b6cf841bd9d933e2..4e45e065b819f1c14a372b3c718bacd2aa5033f7 100644 --- a/entry/src/main/resources/base/layout/ability_main.xml +++ b/entry/src/main/resources/base/layout/ability_main.xml @@ -7,7 +7,7 @@ ohos:orientation="vertical"> - + diff --git a/entry/src/ohosTest/java/cafe/adriel/androidaudioconverter/rxdiffutil/ExampleOhosTest.java b/entry/src/ohosTest/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ExampleOhosTest.java similarity index 72% rename from entry/src/ohosTest/java/cafe/adriel/androidaudioconverter/rxdiffutil/ExampleOhosTest.java rename to entry/src/ohosTest/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ExampleOhosTest.java index 58f1dc542b46ff99bfdced67a6d7ea1276ccce27..ed5c8fee41e6b60bd7c7b6c80d158e1246bf0643 100644 --- a/entry/src/ohosTest/java/cafe/adriel/androidaudioconverter/rxdiffutil/ExampleOhosTest.java +++ b/entry/src/ohosTest/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ExampleOhosTest.java @@ -1,4 +1,4 @@ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; import junit.framework.TestCase; import ohos.aafwk.ability.delegation.AbilityDelegatorRegistry; @@ -11,6 +11,6 @@ public class ExampleOhosTest extends TestCase { @Test public void testBundleName() { final String actualBundleName = AbilityDelegatorRegistry.getArguments().getTestBundleName(); - Assert.assertEquals("cafe.adriel.androidaudioconverter.rxdiffutil", actualBundleName); + Assert.assertEquals("cafe.adriel.ohosaudioconverter.rxdiffutil", actualBundleName); } } \ No newline at end of file diff --git a/entry/src/ohosTest/java/cafe/adriel/androidaudioconverter/rxdiffutil/RxDiffUtilTest.java b/entry/src/ohosTest/java/cafe/adriel/ohosaudioconverter/rxdiffutil/RxDiffUtilTest.java similarity index 88% rename from entry/src/ohosTest/java/cafe/adriel/androidaudioconverter/rxdiffutil/RxDiffUtilTest.java rename to entry/src/ohosTest/java/cafe/adriel/ohosaudioconverter/rxdiffutil/RxDiffUtilTest.java index 1ff5b03be5452a79724fa927ae5b3bc3775d437b..734f3c9fd8ea25faed53c1897abde4bfeefe4196 100644 --- a/entry/src/ohosTest/java/cafe/adriel/androidaudioconverter/rxdiffutil/RxDiffUtilTest.java +++ b/entry/src/ohosTest/java/cafe/adriel/ohosaudioconverter/rxdiffutil/RxDiffUtilTest.java @@ -1,4 +1,4 @@ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; import junit.framework.TestCase; import org.junit.Test; diff --git a/entry/src/test/java/cafe/adriel/androidaudioconverter/rxdiffutil/ExampleTest.java b/entry/src/test/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ExampleTest.java similarity index 64% rename from entry/src/test/java/cafe/adriel/androidaudioconverter/rxdiffutil/ExampleTest.java rename to entry/src/test/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ExampleTest.java index f33beef9273c2181c70cf96363f478d37c301c27..7c371ba725d411c746f88d2f0f2397cff41d67a9 100644 --- a/entry/src/test/java/cafe/adriel/androidaudioconverter/rxdiffutil/ExampleTest.java +++ b/entry/src/test/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ExampleTest.java @@ -1,4 +1,4 @@ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; import org.junit.Test;