diff --git a/app-catalog/samples/basic/build.gradle b/app-catalog/samples/basic/build.gradle index a8e59e7..8489c50 100644 --- a/app-catalog/samples/basic/build.gradle +++ b/app-catalog/samples/basic/build.gradle @@ -18,8 +18,8 @@ android { dependencies { // implementation fileTree(include: ['*.jar', "*.aar"], dir: "libs") - implementation project(path: ':app-catalog:samples:xpermissions:libs:xpermissions') - implementation project(path: ':app-catalog:samples:basic:libs:base') + implementation project(path: ':app-catalog:samples:xpermissions:libxpermissions') + implementation project(path: ':app-catalog:samples:basic:libbase') implementation libs.androidx.constraintlayout implementation libs.androidx.activity.compose implementation libs.casa.ui diff --git a/app-catalog/samples/basic/libs/base/build.gradle b/app-catalog/samples/basic/libbase/build.gradle similarity index 100% rename from app-catalog/samples/basic/libs/base/build.gradle rename to app-catalog/samples/basic/libbase/build.gradle diff --git a/app-catalog/samples/basic/libs/base/src/main/AndroidManifest.xml b/app-catalog/samples/basic/libbase/src/main/AndroidManifest.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/AndroidManifest.xml rename to app-catalog/samples/basic/libbase/src/main/AndroidManifest.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/BaseActivity.java b/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseActivity.java similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/BaseActivity.java rename to app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseActivity.java diff --git a/app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/BaseAdapter.java b/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseAdapter.java similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/BaseAdapter.java rename to app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseAdapter.java diff --git a/app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/BaseDialog.java b/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseDialog.java similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/BaseDialog.java rename to app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseDialog.java diff --git a/app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/BaseFragment.java b/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseFragment.java similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/BaseFragment.java rename to app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BaseFragment.java diff --git a/app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/BasePopupWindow.java b/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BasePopupWindow.java similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/BasePopupWindow.java rename to app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BasePopupWindow.java diff --git a/app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/BottomSheetDialog.java b/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BottomSheetDialog.java similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/BottomSheetDialog.java rename to app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/BottomSheetDialog.java diff --git a/app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/FragmentPagerAdapter.java b/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/FragmentPagerAdapter.java similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/FragmentPagerAdapter.java rename to app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/FragmentPagerAdapter.java diff --git a/app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/RecyclerPagerAdapter.java b/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/RecyclerPagerAdapter.java similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/RecyclerPagerAdapter.java rename to app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/RecyclerPagerAdapter.java diff --git a/app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/action/ActivityAction.java b/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/ActivityAction.java similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/action/ActivityAction.java rename to app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/ActivityAction.java diff --git a/app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/action/AnimAction.java b/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/AnimAction.java similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/action/AnimAction.java rename to app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/AnimAction.java diff --git a/app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/action/BundleAction.java b/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/BundleAction.java similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/action/BundleAction.java rename to app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/BundleAction.java diff --git a/app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/action/ClickAction.java b/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/ClickAction.java similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/action/ClickAction.java rename to app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/ClickAction.java diff --git a/app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/action/HandlerAction.java b/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/HandlerAction.java similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/action/HandlerAction.java rename to app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/HandlerAction.java diff --git a/app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/action/KeyboardAction.java b/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/KeyboardAction.java similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/action/KeyboardAction.java rename to app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/KeyboardAction.java diff --git a/app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/action/ResourcesAction.java b/app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/ResourcesAction.java similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/java/lib/wintmain/base/action/ResourcesAction.java rename to app-catalog/samples/basic/libbase/src/main/java/lib/wintmain/base/action/ResourcesAction.java diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw1024dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1024dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw1024dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1024dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw1024dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1024dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw1024dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1024dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw1280dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1280dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw1280dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1280dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw1280dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1280dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw1280dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1280dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw1365dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1365dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw1365dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1365dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw1365dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1365dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw1365dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw1365dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw240dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw240dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw240dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw240dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw240dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw240dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw240dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw240dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw320dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw320dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw320dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw320dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw320dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw320dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw320dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw320dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw360dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw360dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw360dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw360dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw360dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw360dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw360dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw360dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw362dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw362dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw362dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw362dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw362dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw362dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw362dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw362dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw384dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw384dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw384dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw384dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw384dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw384dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw384dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw384dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw392dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw392dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw392dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw392dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw392dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw392dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw392dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw392dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw400dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw400dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw400dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw400dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw400dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw400dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw400dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw400dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw410dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw410dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw410dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw410dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw410dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw410dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw410dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw410dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw411dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw411dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw411dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw411dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw411dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw411dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw411dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw411dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw432dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw432dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw432dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw432dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw432dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw432dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw432dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw432dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw480dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw480dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw480dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw480dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw480dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw480dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw480dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw480dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw533dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw533dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw533dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw533dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw533dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw533dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw533dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw533dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw540dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw540dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw540dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw540dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw540dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw540dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw540dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw540dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw592dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw592dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw592dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw592dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw592dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw592dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw592dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw592dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw600dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw600dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw600dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw600dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw600dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw600dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw600dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw600dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw640dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw640dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw640dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw640dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw640dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw640dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw640dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw640dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw662dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw662dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw662dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw662dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw662dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw662dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw662dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw662dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw720dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw720dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw720dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw720dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw720dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw720dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw720dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw720dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw768dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw768dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw768dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw768dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw768dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw768dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw768dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw768dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw800dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw800dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw800dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw800dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw800dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw800dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw800dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw800dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw811dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw811dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw811dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw811dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw811dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw811dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw811dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw811dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw820dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw820dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw820dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw820dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw820dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw820dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw820dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw820dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw960dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw960dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw960dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw960dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw960dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw960dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw960dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw960dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw961dp/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw961dp/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw961dp/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw961dp/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw961dp/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values-sw961dp/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values-sw961dp/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values-sw961dp/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values/dimens_dp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values/dimens_dp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values/dimens_dp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values/dimens_dp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res-sw/values/dimens_sp.xml b/app-catalog/samples/basic/libbase/src/main/res-sw/values/dimens_sp.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res-sw/values/dimens_sp.xml rename to app-catalog/samples/basic/libbase/src/main/res-sw/values/dimens_sp.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/layout_fall_down.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/layout_fall_down.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/layout_fall_down.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/layout_fall_down.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/layout_fall_down_item.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/layout_fall_down_item.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/layout_fall_down_item.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/layout_fall_down_item.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/layout_from_bottom.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/layout_from_bottom.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/layout_from_bottom.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/layout_from_bottom.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/layout_from_bottom_item.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/layout_from_bottom_item.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/layout_from_bottom_item.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/layout_from_bottom_item.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/layout_from_right.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/layout_from_right.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/layout_from_right.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/layout_from_right.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/layout_from_right_item.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/layout_from_right_item.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/layout_from_right_item.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/layout_from_right_item.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/window_bottom_in.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/window_bottom_in.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/window_bottom_in.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/window_bottom_in.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/window_bottom_out.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/window_bottom_out.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/window_bottom_out.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/window_bottom_out.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/window_ios_in.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/window_ios_in.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/window_ios_in.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/window_ios_in.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/window_ios_out.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/window_ios_out.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/window_ios_out.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/window_ios_out.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/window_left_in.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/window_left_in.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/window_left_in.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/window_left_in.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/window_left_out.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/window_left_out.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/window_left_out.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/window_left_out.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/window_right_in.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/window_right_in.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/window_right_in.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/window_right_in.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/window_right_out.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/window_right_out.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/window_right_out.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/window_right_out.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/window_scale_in.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/window_scale_in.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/window_scale_in.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/window_scale_in.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/window_scale_out.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/window_scale_out.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/window_scale_out.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/window_scale_out.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/window_top_in.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/window_top_in.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/window_top_in.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/window_top_in.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/anim/window_top_out.xml b/app-catalog/samples/basic/libbase/src/main/res/anim/window_top_out.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/anim/window_top_out.xml rename to app-catalog/samples/basic/libbase/src/main/res/anim/window_top_out.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/values/colors.xml b/app-catalog/samples/basic/libbase/src/main/res/values/colors.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/values/colors.xml rename to app-catalog/samples/basic/libbase/src/main/res/values/colors.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/values/integers.xml b/app-catalog/samples/basic/libbase/src/main/res/values/integers.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/values/integers.xml rename to app-catalog/samples/basic/libbase/src/main/res/values/integers.xml diff --git a/app-catalog/samples/basic/libs/base/src/main/res/values/styles.xml b/app-catalog/samples/basic/libbase/src/main/res/values/styles.xml similarity index 100% rename from app-catalog/samples/basic/libs/base/src/main/res/values/styles.xml rename to app-catalog/samples/basic/libbase/src/main/res/values/styles.xml diff --git a/app-catalog/samples/mymusicplayer/build.gradle b/app-catalog/samples/mymusicplayer/build.gradle index 3921547..6827415 100644 --- a/app-catalog/samples/mymusicplayer/build.gradle +++ b/app-catalog/samples/mymusicplayer/build.gradle @@ -24,6 +24,6 @@ dependencies { implementation "androidx.constraintlayout:constraintlayout:2.1.4" implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2" - implementation project(path: ':app-catalog:samples:toaster:libs:toaster') + implementation project(path: ':app-catalog:samples:toaster:libtoaster') implementation 'com.karumi:dexter:5.0.0' } \ No newline at end of file diff --git a/app-catalog/samples/shadowlayout/build.gradle b/app-catalog/samples/shadowlayout/build.gradle index b6e5619..f73b03b 100644 --- a/app-catalog/samples/shadowlayout/build.gradle +++ b/app-catalog/samples/shadowlayout/build.gradle @@ -10,6 +10,6 @@ android { } dependencies { - implementation project(path: ':app-catalog:samples:shadowlayout:libs:shadowlib') + implementation project(path: ':app-catalog:samples:shadowlayout:libshadowlayout') implementation "androidx.databinding:databinding-runtime:8.1.4" } \ No newline at end of file diff --git a/app-catalog/samples/shadowlayout/libs/shadowlib/build.gradle b/app-catalog/samples/shadowlayout/libshadowlayout/build.gradle similarity index 76% rename from app-catalog/samples/shadowlayout/libs/shadowlib/build.gradle rename to app-catalog/samples/shadowlayout/libshadowlayout/build.gradle index b229489..a337817 100644 --- a/app-catalog/samples/shadowlayout/libs/shadowlib/build.gradle +++ b/app-catalog/samples/shadowlayout/libshadowlayout/build.gradle @@ -1,7 +1,7 @@ apply from: "$rootDir/gradle/sample-build.gradle" android { - namespace 'lib.wintmain.shadowlib' + namespace 'lib.wintmain.shadowlayout' } dependencies { diff --git a/app-catalog/samples/shadowlayout/libs/shadowlib/src/main/AndroidManifest.xml b/app-catalog/samples/shadowlayout/libshadowlayout/src/main/AndroidManifest.xml similarity index 100% rename from app-catalog/samples/shadowlayout/libs/shadowlib/src/main/AndroidManifest.xml rename to app-catalog/samples/shadowlayout/libshadowlayout/src/main/AndroidManifest.xml diff --git a/app-catalog/samples/shadowlayout/libs/shadowlib/src/main/java/lib/wintmain/shadowlib/GlideRoundTransform.java b/app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/GlideRoundTransform.java similarity index 99% rename from app-catalog/samples/shadowlayout/libs/shadowlib/src/main/java/lib/wintmain/shadowlib/GlideRoundTransform.java rename to app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/GlideRoundTransform.java index e83c47b..2a83292 100644 --- a/app-catalog/samples/shadowlayout/libs/shadowlib/src/main/java/lib/wintmain/shadowlib/GlideRoundTransform.java +++ b/app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/GlideRoundTransform.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.shadowlib; +package lib.wintmain.shadowlayout; import android.content.Context; import android.graphics.*; diff --git a/app-catalog/samples/shadowlayout/libs/shadowlib/src/main/java/lib/wintmain/shadowlib/GlideRoundUtils.java b/app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/GlideRoundUtils.java similarity index 99% rename from app-catalog/samples/shadowlayout/libs/shadowlib/src/main/java/lib/wintmain/shadowlib/GlideRoundUtils.java rename to app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/GlideRoundUtils.java index d50022a..e8d9e16 100644 --- a/app-catalog/samples/shadowlayout/libs/shadowlib/src/main/java/lib/wintmain/shadowlib/GlideRoundUtils.java +++ b/app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/GlideRoundUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package lib.wintmain.shadowlib; +package lib.wintmain.shadowlayout; import android.graphics.drawable.Drawable; import android.view.View; diff --git a/app-catalog/samples/shadowlayout/libs/shadowlib/src/main/java/lib/wintmain/shadowlib/ShadowLayout.java b/app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/ShadowLayout.java similarity index 99% rename from app-catalog/samples/shadowlayout/libs/shadowlib/src/main/java/lib/wintmain/shadowlib/ShadowLayout.java rename to app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/ShadowLayout.java index 33d2d5e..766847b 100644 --- a/app-catalog/samples/shadowlayout/libs/shadowlib/src/main/java/lib/wintmain/shadowlib/ShadowLayout.java +++ b/app-catalog/samples/shadowlayout/libshadowlayout/src/main/java/lib/wintmain/shadowlayout/ShadowLayout.java @@ -14,8 +14,7 @@ * limitations under the License. */ -package lib.wintmain.shadowlib; - +package lib.wintmain.shadowlayout; import android.content.Context; import android.content.res.ColorStateList; diff --git a/app-catalog/samples/shadowlayout/libs/shadowlib/src/main/res/values/attrs.xml b/app-catalog/samples/shadowlayout/libshadowlayout/src/main/res/values/attrs.xml similarity index 100% rename from app-catalog/samples/shadowlayout/libs/shadowlib/src/main/res/values/attrs.xml rename to app-catalog/samples/shadowlayout/libshadowlayout/src/main/res/values/attrs.xml diff --git a/app-catalog/samples/shadowlayout/libs/shadowlib/src/main/res/values/colors.xml b/app-catalog/samples/shadowlayout/libshadowlayout/src/main/res/values/colors.xml similarity index 100% rename from app-catalog/samples/shadowlayout/libs/shadowlib/src/main/res/values/colors.xml rename to app-catalog/samples/shadowlayout/libshadowlayout/src/main/res/values/colors.xml diff --git a/app-catalog/samples/shadowlayout/libs/shadowlib/src/main/res/values/dimens.xml b/app-catalog/samples/shadowlayout/libshadowlayout/src/main/res/values/dimens.xml similarity index 100% rename from app-catalog/samples/shadowlayout/libs/shadowlib/src/main/res/values/dimens.xml rename to app-catalog/samples/shadowlayout/libshadowlayout/src/main/res/values/dimens.xml diff --git a/app-catalog/samples/shadowlayout/libs/shadowlib/src/main/res/values/strings.xml b/app-catalog/samples/shadowlayout/libshadowlayout/src/main/res/values/strings.xml similarity index 100% rename from app-catalog/samples/shadowlayout/libs/shadowlib/src/main/res/values/strings.xml rename to app-catalog/samples/shadowlayout/libshadowlayout/src/main/res/values/strings.xml diff --git a/app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/StarShowActivity.java b/app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/StarShowActivity.java index 917a882..d629d89 100644 --- a/app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/StarShowActivity.java +++ b/app-catalog/samples/shadowlayout/src/main/java/com/wintmain/shadowlayout/StarShowActivity.java @@ -22,7 +22,7 @@ import android.widget.ImageView; import android.widget.SeekBar; import androidx.appcompat.app.AppCompatActivity; -import lib.wintmain.shadowlib.ShadowLayout; +import lib.wintmain.shadowlayout.ShadowLayout; public class StarShowActivity extends AppCompatActivity implements View.OnClickListener { private ShadowLayout ShadowLayout; diff --git a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_main.xml b/app-catalog/samples/shadowlayout/src/main/res/layout/activity_main.xml index 4d4803e..27d492a 100644 --- a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_main.xml +++ b/app-catalog/samples/shadowlayout/src/main/res/layout/activity_main.xml @@ -27,7 +27,7 @@ android:orientation="vertical"> - - + - - + - - + - - + \ No newline at end of file diff --git a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_shadow.xml b/app-catalog/samples/shadowlayout/src/main/res/layout/activity_shadow.xml index 1c97f16..e771e71 100644 --- a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_shadow.xml +++ b/app-catalog/samples/shadowlayout/src/main/res/layout/activity_shadow.xml @@ -26,7 +26,7 @@ android:layout_height="match_parent"> - - - + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + @@ -281,7 +281,7 @@ - - + \ No newline at end of file diff --git a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_shape.xml b/app-catalog/samples/shadowlayout/src/main/res/layout/activity_shape.xml index 8f4c8b3..0486223 100644 --- a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_shape.xml +++ b/app-catalog/samples/shadowlayout/src/main/res/layout/activity_shape.xml @@ -27,7 +27,7 @@ android:orientation="vertical"> - - - + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + diff --git a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_starshow.xml b/app-catalog/samples/shadowlayout/src/main/res/layout/activity_starshow.xml index 0323f77..b35bbd6 100644 --- a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_starshow.xml +++ b/app-catalog/samples/shadowlayout/src/main/res/layout/activity_starshow.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="200dp"> - - + diff --git a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_wiki.xml b/app-catalog/samples/shadowlayout/src/main/res/layout/activity_wiki.xml index a18d61d..70dcd51 100644 --- a/app-catalog/samples/shadowlayout/src/main/res/layout/activity_wiki.xml +++ b/app-catalog/samples/shadowlayout/src/main/res/layout/activity_wiki.xml @@ -40,7 +40,7 @@ android:max="100" android:progress="5" /> - - - + - + \ No newline at end of file diff --git a/app-catalog/samples/titlebar/build.gradle b/app-catalog/samples/titlebar/build.gradle index 70705f3..872bc4c 100644 --- a/app-catalog/samples/titlebar/build.gradle +++ b/app-catalog/samples/titlebar/build.gradle @@ -5,5 +5,5 @@ android { } dependencies { - implementation project(path: ':app-catalog:samples:titlebar:libs') + implementation project(path: ':app-catalog:samples:titlebar:libtitlebar') } diff --git a/app-catalog/samples/titlebar/libs/build.gradle b/app-catalog/samples/titlebar/libtitlebar/build.gradle similarity index 100% rename from app-catalog/samples/titlebar/libs/build.gradle rename to app-catalog/samples/titlebar/libtitlebar/build.gradle diff --git a/app-catalog/samples/titlebar/libs/src/main/AndroidManifest.xml b/app-catalog/samples/titlebar/libtitlebar/src/main/AndroidManifest.xml similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/AndroidManifest.xml rename to app-catalog/samples/titlebar/libtitlebar/src/main/AndroidManifest.xml diff --git a/app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/ITitleBarStyle.java b/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/ITitleBarStyle.java similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/ITitleBarStyle.java rename to app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/ITitleBarStyle.java diff --git a/app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/OnTitleBarListener.java b/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/OnTitleBarListener.java similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/OnTitleBarListener.java rename to app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/OnTitleBarListener.java diff --git a/app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/SelectorDrawable.java b/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/SelectorDrawable.java similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/SelectorDrawable.java rename to app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/SelectorDrawable.java diff --git a/app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/TitleBarExt.java b/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/TitleBarExt.java similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/TitleBarExt.java rename to app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/TitleBarExt.java diff --git a/app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/TitleBarSupport.java b/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/TitleBarSupport.java similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/TitleBarSupport.java rename to app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/TitleBarSupport.java diff --git a/app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/style/CommonBarStyle.java b/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/CommonBarStyle.java similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/style/CommonBarStyle.java rename to app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/CommonBarStyle.java diff --git a/app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/style/LightBarStyle.java b/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/LightBarStyle.java similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/style/LightBarStyle.java rename to app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/LightBarStyle.java diff --git a/app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/style/NightBarStyle.java b/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/NightBarStyle.java similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/style/NightBarStyle.java rename to app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/NightBarStyle.java diff --git a/app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/style/RippleBarStyle.java b/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/RippleBarStyle.java similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/style/RippleBarStyle.java rename to app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/RippleBarStyle.java diff --git a/app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/style/TransparentBarStyle.java b/app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/TransparentBarStyle.java similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/java/lib/wintmain/titlebar/style/TransparentBarStyle.java rename to app-catalog/samples/titlebar/libtitlebar/src/main/java/lib/wintmain/titlebar/style/TransparentBarStyle.java diff --git a/app-catalog/samples/titlebar/libs/src/main/res/drawable/bar_arrows_left_black.xml b/app-catalog/samples/titlebar/libtitlebar/src/main/res/drawable/bar_arrows_left_black.xml similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/res/drawable/bar_arrows_left_black.xml rename to app-catalog/samples/titlebar/libtitlebar/src/main/res/drawable/bar_arrows_left_black.xml diff --git a/app-catalog/samples/titlebar/libs/src/main/res/drawable/bar_arrows_left_white.xml b/app-catalog/samples/titlebar/libtitlebar/src/main/res/drawable/bar_arrows_left_white.xml similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/res/drawable/bar_arrows_left_white.xml rename to app-catalog/samples/titlebar/libtitlebar/src/main/res/drawable/bar_arrows_left_white.xml diff --git a/app-catalog/samples/titlebar/libs/src/main/res/drawable/bar_drawable_placeholder.xml b/app-catalog/samples/titlebar/libtitlebar/src/main/res/drawable/bar_drawable_placeholder.xml similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/res/drawable/bar_drawable_placeholder.xml rename to app-catalog/samples/titlebar/libtitlebar/src/main/res/drawable/bar_drawable_placeholder.xml diff --git a/app-catalog/samples/titlebar/libs/src/main/res/values/attrs.xml b/app-catalog/samples/titlebar/libtitlebar/src/main/res/values/attrs.xml similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/res/values/attrs.xml rename to app-catalog/samples/titlebar/libtitlebar/src/main/res/values/attrs.xml diff --git a/app-catalog/samples/titlebar/libs/src/main/res/values/string.xml b/app-catalog/samples/titlebar/libtitlebar/src/main/res/values/string.xml similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/res/values/string.xml rename to app-catalog/samples/titlebar/libtitlebar/src/main/res/values/string.xml diff --git a/app-catalog/samples/titlebar/libs/src/main/res/values/style.xml b/app-catalog/samples/titlebar/libtitlebar/src/main/res/values/style.xml similarity index 100% rename from app-catalog/samples/titlebar/libs/src/main/res/values/style.xml rename to app-catalog/samples/titlebar/libtitlebar/src/main/res/values/style.xml diff --git a/app-catalog/samples/toaster/build.gradle b/app-catalog/samples/toaster/build.gradle index 9a2b054..fd021a4 100644 --- a/app-catalog/samples/toaster/build.gradle +++ b/app-catalog/samples/toaster/build.gradle @@ -5,5 +5,5 @@ android { } dependencies { - implementation project(path: ':app-catalog:samples:toaster:libs:toaster') + implementation project(path: ':app-catalog:samples:toaster:libtoaster') } \ No newline at end of file diff --git a/app-catalog/samples/toaster/libs/toaster/build.gradle b/app-catalog/samples/toaster/libtoaster/build.gradle similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/build.gradle rename to app-catalog/samples/toaster/libtoaster/build.gradle diff --git a/app-catalog/samples/toaster/libs/toaster/src/main/AndroidManifest.xml b/app-catalog/samples/toaster/libtoaster/src/main/AndroidManifest.xml similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/src/main/AndroidManifest.xml rename to app-catalog/samples/toaster/libtoaster/src/main/AndroidManifest.xml diff --git a/app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/style/ToastBlackStyle.java b/app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/style/ToastBlackStyle.java similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/style/ToastBlackStyle.java rename to app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/style/ToastBlackStyle.java diff --git a/app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/style/ToastWhiteStyle.java b/app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/style/ToastWhiteStyle.java similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/style/ToastWhiteStyle.java rename to app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/style/ToastWhiteStyle.java diff --git a/app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/toast/BaseToast.java b/app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/toast/BaseToast.java similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/toast/BaseToast.java rename to app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/toast/BaseToast.java diff --git a/app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/toast/IToastStyle.java b/app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/toast/IToastStyle.java similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/toast/IToastStyle.java rename to app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/toast/IToastStyle.java diff --git a/app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/toast/SupportToast.java b/app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/toast/SupportToast.java similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/toast/SupportToast.java rename to app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/toast/SupportToast.java diff --git a/app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/toast/ToastHelper.java b/app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/toast/ToastHelper.java similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/toast/ToastHelper.java rename to app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/toast/ToastHelper.java diff --git a/app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/toast/ToastUtils.java b/app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/toast/ToastUtils.java similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/toast/ToastUtils.java rename to app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/toast/ToastUtils.java diff --git a/app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/toast/WindowHelper.java b/app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/toast/WindowHelper.java similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/toast/WindowHelper.java rename to app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/toast/WindowHelper.java diff --git a/app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/toast/XToast.java b/app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/toast/XToast.java similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/src/main/java/lib/wintmain/toaster/toast/XToast.java rename to app-catalog/samples/toaster/libtoaster/src/main/java/lib/wintmain/toaster/toast/XToast.java diff --git a/app-catalog/samples/toaster/libs/toaster/src/main/res/values-night/themes.xml b/app-catalog/samples/toaster/libtoaster/src/main/res/values-night/themes.xml similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/src/main/res/values-night/themes.xml rename to app-catalog/samples/toaster/libtoaster/src/main/res/values-night/themes.xml diff --git a/app-catalog/samples/toaster/libs/toaster/src/main/res/values/colors.xml b/app-catalog/samples/toaster/libtoaster/src/main/res/values/colors.xml similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/src/main/res/values/colors.xml rename to app-catalog/samples/toaster/libtoaster/src/main/res/values/colors.xml diff --git a/app-catalog/samples/toaster/libs/toaster/src/main/res/values/ids.xml b/app-catalog/samples/toaster/libtoaster/src/main/res/values/ids.xml similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/src/main/res/values/ids.xml rename to app-catalog/samples/toaster/libtoaster/src/main/res/values/ids.xml diff --git a/app-catalog/samples/toaster/libs/toaster/src/main/res/values/strings.xml b/app-catalog/samples/toaster/libtoaster/src/main/res/values/strings.xml similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/src/main/res/values/strings.xml rename to app-catalog/samples/toaster/libtoaster/src/main/res/values/strings.xml diff --git a/app-catalog/samples/toaster/libs/toaster/src/main/res/values/style.xml b/app-catalog/samples/toaster/libtoaster/src/main/res/values/style.xml similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/src/main/res/values/style.xml rename to app-catalog/samples/toaster/libtoaster/src/main/res/values/style.xml diff --git a/app-catalog/samples/toaster/libs/toaster/src/main/res/values/themes.xml b/app-catalog/samples/toaster/libtoaster/src/main/res/values/themes.xml similarity index 100% rename from app-catalog/samples/toaster/libs/toaster/src/main/res/values/themes.xml rename to app-catalog/samples/toaster/libtoaster/src/main/res/values/themes.xml diff --git a/app-catalog/samples/xpermissions/build.gradle b/app-catalog/samples/xpermissions/build.gradle index fabe46f..ae64101 100644 --- a/app-catalog/samples/xpermissions/build.gradle +++ b/app-catalog/samples/xpermissions/build.gradle @@ -5,6 +5,6 @@ android { } dependencies { - implementation project(path: ':app-catalog:samples:xpermissions:libs:xpermissions') - implementation project(path: ':app-catalog:samples:toaster:libs:toaster') + implementation project(path: ':app-catalog:samples:xpermissions:libxpermissions') + implementation project(path: ':app-catalog:samples:toaster:libtoaster') } \ No newline at end of file diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/build.gradle b/app-catalog/samples/xpermissions/libxpermissions/build.gradle similarity index 85% rename from app-catalog/samples/xpermissions/libs/xpermissions/build.gradle rename to app-catalog/samples/xpermissions/libxpermissions/build.gradle index e675372..4193f50 100644 --- a/app-catalog/samples/xpermissions/libs/xpermissions/build.gradle +++ b/app-catalog/samples/xpermissions/libxpermissions/build.gradle @@ -1,7 +1,7 @@ apply from: "$rootDir/gradle/sample-build.gradle" android { - namespace 'lib.wintmain.xpermissions' + namespace 'lib.wintmain' } dependencies { diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/AndroidManifest.xml b/app-catalog/samples/xpermissions/libxpermissions/src/main/AndroidManifest.xml similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/AndroidManifest.xml rename to app-catalog/samples/xpermissions/libxpermissions/src/main/AndroidManifest.xml diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/permissionbase/PermissionBox.kt b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/permissionbase/PermissionBox.kt similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/permissionbase/PermissionBox.kt rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/permissionbase/PermissionBox.kt diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/AndroidManifestInfo.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/AndroidManifestInfo.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/AndroidManifestInfo.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/AndroidManifestInfo.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/AndroidManifestParser.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/AndroidManifestParser.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/AndroidManifestParser.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/AndroidManifestParser.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/AndroidVersion.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/AndroidVersion.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/AndroidVersion.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/AndroidVersion.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/GetInstalledAppsPermissionCompat.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/GetInstalledAppsPermissionCompat.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/GetInstalledAppsPermissionCompat.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/GetInstalledAppsPermissionCompat.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/IPermissionInterceptor.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/IPermissionInterceptor.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/IPermissionInterceptor.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/IPermissionInterceptor.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/NotificationListenerPermissionCompat.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/NotificationListenerPermissionCompat.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/NotificationListenerPermissionCompat.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/NotificationListenerPermissionCompat.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/NotificationPermissionCompat.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/NotificationPermissionCompat.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/NotificationPermissionCompat.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/NotificationPermissionCompat.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/OnPermissionCallback.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/OnPermissionCallback.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/OnPermissionCallback.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/OnPermissionCallback.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/OnPermissionPageCallback.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/OnPermissionPageCallback.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/OnPermissionPageCallback.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/OnPermissionPageCallback.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/Permission.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/Permission.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/Permission.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/Permission.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionApi.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionApi.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionApi.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionApi.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionChecker.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionChecker.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionChecker.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionChecker.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegate.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegate.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegate.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegate.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV14.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV14.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV14.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV14.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV18.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV18.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV18.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV18.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV19.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV19.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV19.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV19.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV21.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV21.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV21.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV21.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV23.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV23.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV23.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV23.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV26.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV26.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV26.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV26.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV28.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV28.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV28.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV28.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV29.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV29.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV29.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV29.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV30.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV30.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV30.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV30.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV31.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV31.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV31.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV31.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV33.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV33.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV33.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionDelegateImplV33.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionFragment.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionFragment.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionFragment.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionFragment.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionIntentManager.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionIntentManager.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionIntentManager.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionIntentManager.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionPageFragment.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionPageFragment.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionPageFragment.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionPageFragment.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionUtils.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionUtils.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PermissionUtils.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PermissionUtils.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PhoneRomUtils.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PhoneRomUtils.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/PhoneRomUtils.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/PhoneRomUtils.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/StartActivityManager.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/StartActivityManager.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/StartActivityManager.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/StartActivityManager.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/WindowPermissionCompat.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/WindowPermissionCompat.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/WindowPermissionCompat.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/WindowPermissionCompat.java diff --git a/app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/XPermissions.java b/app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/XPermissions.java similarity index 100% rename from app-catalog/samples/xpermissions/libs/xpermissions/src/main/java/lib/wintmain/xpermissions/XPermissions.java rename to app-catalog/samples/xpermissions/libxpermissions/src/main/java/lib/wintmain/xpermissions/XPermissions.java