From d98ff9ffcf6e638a10042258a8bbb91cbbb79d2d Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sat, 6 Oct 2018 14:29:54 +0200 Subject: [PATCH] Move pulltorefresh module to core modules. --- {pulltorefresh => core/pulltorefresh}/build.gradle | 0 .../pulltorefresh}/lint-baseline.xml | 0 .../pulltorefresh}/src/main/AndroidManifest.xml | 0 .../pulltorefresh/library/ILoadingLayout.java | 0 .../pulltorefresh/library/IPullToRefresh.java | 0 .../pulltorefresh/library/LoadingLayoutProxy.java | 0 .../pulltorefresh/library/OverscrollHelper.java | 0 .../library/PullToRefreshAdapterViewBase.java | 0 .../pulltorefresh/library/PullToRefreshBase.java | 0 .../library/PullToRefreshExpandableListView.java | 0 .../library/PullToRefreshGridView.java | 0 .../library/PullToRefreshHorizontalScrollView.java | 0 .../library/PullToRefreshListView.java | 0 .../library/PullToRefreshScrollView.java | 0 .../pulltorefresh/library/PullToRefreshWebView.java | 0 .../library/extras/PullToRefreshWebView2.java | 0 .../library/extras/SoundPullEventListener.java | 0 .../library/internal/EmptyViewMethodAccessor.java | 0 .../library/internal/FlipLoadingLayout.java | 0 .../library/internal/IndicatorLayout.java | 0 .../library/internal/LoadingLayout.java | 0 .../library/internal/RotateLoadingLayout.java | 0 .../pulltorefresh/library/internal/Utils.java | 0 .../pulltorefresh/library/internal/ViewCompat.java | 0 .../src/main/res/anim/slide_in_from_bottom.xml | 0 .../src/main/res/anim/slide_in_from_top.xml | 0 .../src/main/res/anim/slide_out_to_bottom.xml | 0 .../src/main/res/anim/slide_out_to_top.xml | 0 .../src/main/res/drawable-hdpi/default_ptr_flip.png | Bin .../main/res/drawable-hdpi/default_ptr_rotate.png | Bin .../src/main/res/drawable-hdpi/indicator_arrow.png | Bin .../src/main/res/drawable-mdpi/default_ptr_flip.png | Bin .../main/res/drawable-mdpi/default_ptr_rotate.png | Bin .../src/main/res/drawable-mdpi/indicator_arrow.png | Bin .../main/res/drawable-xhdpi/default_ptr_flip.png | Bin .../main/res/drawable-xhdpi/default_ptr_rotate.png | Bin .../src/main/res/drawable-xhdpi/indicator_arrow.png | Bin .../src/main/res/drawable/indicator_bg_bottom.xml | 0 .../src/main/res/drawable/indicator_bg_top.xml | 0 .../layout/pull_to_refresh_header_horizontal.xml | 0 .../res/layout/pull_to_refresh_header_vertical.xml | 0 .../src/main/res/values-ar/pull_refresh_strings.xml | 6 ++++++ .../src/main/res/values-cs/pull_refresh_strings.xml | 12 ++++++------ .../src/main/res/values-de/pull_refresh_strings.xml | 12 ++++++------ .../src/main/res/values-es/pull_refresh_strings.xml | 12 ++++++------ .../src/main/res/values-fi/pull_refresh_strings.xml | 0 .../src/main/res/values-fr/pull_refresh_strings.xml | 12 ++++++------ .../src/main/res/values-he/pull_refresh_strings.xml | 12 ++++++------ .../src/main/res/values-it/pull_refresh_strings.xml | 12 ++++++------ .../src/main/res/values-iw/pull_refresh_strings.xml | 12 ++++++------ .../src/main/res/values-ja/pull_refresh_strings.xml | 12 ++++++------ .../src/main/res/values-ko/pull_refresh_strings.xml | 12 ++++++------ .../src/main/res/values-nl/pull_refresh_strings.xml | 12 ++++++------ .../src/main/res/values-pl/pull_refresh_strings.xml | 12 ++++++------ .../main/res/values-pt-rBR/pull_refresh_strings.xml | 12 ++++++------ .../src/main/res/values-pt/pull_refresh_strings.xml | 12 ++++++------ .../src/main/res/values-ro/pull_refresh_strings.xml | 12 ++++++------ .../src/main/res/values-ru/pull_refresh_strings.xml | 12 ++++++------ .../src/main/res/values-zh/pull_refresh_strings.xml | 12 ++++++------ .../pulltorefresh}/src/main/res/values/attrs.xml | 0 .../pulltorefresh}/src/main/res/values/dimens.xml | 0 .../pulltorefresh}/src/main/res/values/ids.xml | 0 .../src/main/res/values/pull_refresh_strings.xml | 0 pulltorefresh/.gitignore | 2 -- .../src/main/res/values-ar/pull_refresh_strings.xml | 6 ------ settings.gradle | 2 +- ultrasonic/build.gradle | 2 +- 67 files changed, 104 insertions(+), 106 deletions(-) rename {pulltorefresh => core/pulltorefresh}/build.gradle (100%) rename {pulltorefresh => core/pulltorefresh}/lint-baseline.xml (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/AndroidManifest.xml (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/ILoadingLayout.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/IPullToRefresh.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/LoadingLayoutProxy.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/OverscrollHelper.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshBase.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshExpandableListView.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshGridView.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshHorizontalScrollView.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshListView.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshScrollView.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshWebView.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/extras/PullToRefreshWebView2.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/extras/SoundPullEventListener.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/internal/EmptyViewMethodAccessor.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/internal/IndicatorLayout.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/internal/LoadingLayout.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/internal/RotateLoadingLayout.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/internal/Utils.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/java/com/handmark/pulltorefresh/library/internal/ViewCompat.java (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/anim/slide_in_from_bottom.xml (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/anim/slide_in_from_top.xml (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/anim/slide_out_to_bottom.xml (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/anim/slide_out_to_top.xml (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/drawable-hdpi/default_ptr_flip.png (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/drawable-hdpi/default_ptr_rotate.png (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/drawable-hdpi/indicator_arrow.png (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/drawable-mdpi/default_ptr_flip.png (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/drawable-mdpi/default_ptr_rotate.png (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/drawable-mdpi/indicator_arrow.png (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/drawable-xhdpi/default_ptr_flip.png (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/drawable-xhdpi/default_ptr_rotate.png (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/drawable-xhdpi/indicator_arrow.png (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/drawable/indicator_bg_bottom.xml (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/drawable/indicator_bg_top.xml (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/layout/pull_to_refresh_header_horizontal.xml (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/layout/pull_to_refresh_header_vertical.xml (100%) create mode 100644 core/pulltorefresh/src/main/res/values-ar/pull_refresh_strings.xml rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-cs/pull_refresh_strings.xml (98%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-de/pull_refresh_strings.xml (98%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-es/pull_refresh_strings.xml (98%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-fi/pull_refresh_strings.xml (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-fr/pull_refresh_strings.xml (98%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-he/pull_refresh_strings.xml (98%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-it/pull_refresh_strings.xml (98%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-iw/pull_refresh_strings.xml (98%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-ja/pull_refresh_strings.xml (98%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-ko/pull_refresh_strings.xml (98%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-nl/pull_refresh_strings.xml (98%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-pl/pull_refresh_strings.xml (98%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-pt-rBR/pull_refresh_strings.xml (98%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-pt/pull_refresh_strings.xml (98%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-ro/pull_refresh_strings.xml (98%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-ru/pull_refresh_strings.xml (98%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values-zh/pull_refresh_strings.xml (97%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values/attrs.xml (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values/dimens.xml (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values/ids.xml (100%) rename {pulltorefresh => core/pulltorefresh}/src/main/res/values/pull_refresh_strings.xml (100%) delete mode 100644 pulltorefresh/.gitignore delete mode 100644 pulltorefresh/src/main/res/values-ar/pull_refresh_strings.xml diff --git a/pulltorefresh/build.gradle b/core/pulltorefresh/build.gradle similarity index 100% rename from pulltorefresh/build.gradle rename to core/pulltorefresh/build.gradle diff --git a/pulltorefresh/lint-baseline.xml b/core/pulltorefresh/lint-baseline.xml similarity index 100% rename from pulltorefresh/lint-baseline.xml rename to core/pulltorefresh/lint-baseline.xml diff --git a/pulltorefresh/src/main/AndroidManifest.xml b/core/pulltorefresh/src/main/AndroidManifest.xml similarity index 100% rename from pulltorefresh/src/main/AndroidManifest.xml rename to core/pulltorefresh/src/main/AndroidManifest.xml diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/ILoadingLayout.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/ILoadingLayout.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/ILoadingLayout.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/ILoadingLayout.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/IPullToRefresh.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/IPullToRefresh.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/IPullToRefresh.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/IPullToRefresh.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/LoadingLayoutProxy.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/LoadingLayoutProxy.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/LoadingLayoutProxy.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/LoadingLayoutProxy.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/OverscrollHelper.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/OverscrollHelper.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/OverscrollHelper.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/OverscrollHelper.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshBase.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshBase.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshBase.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshBase.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshExpandableListView.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshExpandableListView.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshExpandableListView.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshExpandableListView.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshGridView.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshGridView.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshGridView.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshGridView.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshHorizontalScrollView.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshHorizontalScrollView.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshHorizontalScrollView.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshHorizontalScrollView.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshListView.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshListView.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshListView.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshListView.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshScrollView.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshScrollView.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshScrollView.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshScrollView.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshWebView.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshWebView.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshWebView.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshWebView.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/extras/PullToRefreshWebView2.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/extras/PullToRefreshWebView2.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/extras/PullToRefreshWebView2.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/extras/PullToRefreshWebView2.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/extras/SoundPullEventListener.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/extras/SoundPullEventListener.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/extras/SoundPullEventListener.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/extras/SoundPullEventListener.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/EmptyViewMethodAccessor.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/EmptyViewMethodAccessor.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/EmptyViewMethodAccessor.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/EmptyViewMethodAccessor.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/IndicatorLayout.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/IndicatorLayout.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/IndicatorLayout.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/IndicatorLayout.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/LoadingLayout.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/LoadingLayout.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/LoadingLayout.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/LoadingLayout.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/RotateLoadingLayout.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/RotateLoadingLayout.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/RotateLoadingLayout.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/RotateLoadingLayout.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/Utils.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/Utils.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/Utils.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/Utils.java diff --git a/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/ViewCompat.java b/core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/ViewCompat.java similarity index 100% rename from pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/ViewCompat.java rename to core/pulltorefresh/src/main/java/com/handmark/pulltorefresh/library/internal/ViewCompat.java diff --git a/pulltorefresh/src/main/res/anim/slide_in_from_bottom.xml b/core/pulltorefresh/src/main/res/anim/slide_in_from_bottom.xml similarity index 100% rename from pulltorefresh/src/main/res/anim/slide_in_from_bottom.xml rename to core/pulltorefresh/src/main/res/anim/slide_in_from_bottom.xml diff --git a/pulltorefresh/src/main/res/anim/slide_in_from_top.xml b/core/pulltorefresh/src/main/res/anim/slide_in_from_top.xml similarity index 100% rename from pulltorefresh/src/main/res/anim/slide_in_from_top.xml rename to core/pulltorefresh/src/main/res/anim/slide_in_from_top.xml diff --git a/pulltorefresh/src/main/res/anim/slide_out_to_bottom.xml b/core/pulltorefresh/src/main/res/anim/slide_out_to_bottom.xml similarity index 100% rename from pulltorefresh/src/main/res/anim/slide_out_to_bottom.xml rename to core/pulltorefresh/src/main/res/anim/slide_out_to_bottom.xml diff --git a/pulltorefresh/src/main/res/anim/slide_out_to_top.xml b/core/pulltorefresh/src/main/res/anim/slide_out_to_top.xml similarity index 100% rename from pulltorefresh/src/main/res/anim/slide_out_to_top.xml rename to core/pulltorefresh/src/main/res/anim/slide_out_to_top.xml diff --git a/pulltorefresh/src/main/res/drawable-hdpi/default_ptr_flip.png b/core/pulltorefresh/src/main/res/drawable-hdpi/default_ptr_flip.png similarity index 100% rename from pulltorefresh/src/main/res/drawable-hdpi/default_ptr_flip.png rename to core/pulltorefresh/src/main/res/drawable-hdpi/default_ptr_flip.png diff --git a/pulltorefresh/src/main/res/drawable-hdpi/default_ptr_rotate.png b/core/pulltorefresh/src/main/res/drawable-hdpi/default_ptr_rotate.png similarity index 100% rename from pulltorefresh/src/main/res/drawable-hdpi/default_ptr_rotate.png rename to core/pulltorefresh/src/main/res/drawable-hdpi/default_ptr_rotate.png diff --git a/pulltorefresh/src/main/res/drawable-hdpi/indicator_arrow.png b/core/pulltorefresh/src/main/res/drawable-hdpi/indicator_arrow.png similarity index 100% rename from pulltorefresh/src/main/res/drawable-hdpi/indicator_arrow.png rename to core/pulltorefresh/src/main/res/drawable-hdpi/indicator_arrow.png diff --git a/pulltorefresh/src/main/res/drawable-mdpi/default_ptr_flip.png b/core/pulltorefresh/src/main/res/drawable-mdpi/default_ptr_flip.png similarity index 100% rename from pulltorefresh/src/main/res/drawable-mdpi/default_ptr_flip.png rename to core/pulltorefresh/src/main/res/drawable-mdpi/default_ptr_flip.png diff --git a/pulltorefresh/src/main/res/drawable-mdpi/default_ptr_rotate.png b/core/pulltorefresh/src/main/res/drawable-mdpi/default_ptr_rotate.png similarity index 100% rename from pulltorefresh/src/main/res/drawable-mdpi/default_ptr_rotate.png rename to core/pulltorefresh/src/main/res/drawable-mdpi/default_ptr_rotate.png diff --git a/pulltorefresh/src/main/res/drawable-mdpi/indicator_arrow.png b/core/pulltorefresh/src/main/res/drawable-mdpi/indicator_arrow.png similarity index 100% rename from pulltorefresh/src/main/res/drawable-mdpi/indicator_arrow.png rename to core/pulltorefresh/src/main/res/drawable-mdpi/indicator_arrow.png diff --git a/pulltorefresh/src/main/res/drawable-xhdpi/default_ptr_flip.png b/core/pulltorefresh/src/main/res/drawable-xhdpi/default_ptr_flip.png similarity index 100% rename from pulltorefresh/src/main/res/drawable-xhdpi/default_ptr_flip.png rename to core/pulltorefresh/src/main/res/drawable-xhdpi/default_ptr_flip.png diff --git a/pulltorefresh/src/main/res/drawable-xhdpi/default_ptr_rotate.png b/core/pulltorefresh/src/main/res/drawable-xhdpi/default_ptr_rotate.png similarity index 100% rename from pulltorefresh/src/main/res/drawable-xhdpi/default_ptr_rotate.png rename to core/pulltorefresh/src/main/res/drawable-xhdpi/default_ptr_rotate.png diff --git a/pulltorefresh/src/main/res/drawable-xhdpi/indicator_arrow.png b/core/pulltorefresh/src/main/res/drawable-xhdpi/indicator_arrow.png similarity index 100% rename from pulltorefresh/src/main/res/drawable-xhdpi/indicator_arrow.png rename to core/pulltorefresh/src/main/res/drawable-xhdpi/indicator_arrow.png diff --git a/pulltorefresh/src/main/res/drawable/indicator_bg_bottom.xml b/core/pulltorefresh/src/main/res/drawable/indicator_bg_bottom.xml similarity index 100% rename from pulltorefresh/src/main/res/drawable/indicator_bg_bottom.xml rename to core/pulltorefresh/src/main/res/drawable/indicator_bg_bottom.xml diff --git a/pulltorefresh/src/main/res/drawable/indicator_bg_top.xml b/core/pulltorefresh/src/main/res/drawable/indicator_bg_top.xml similarity index 100% rename from pulltorefresh/src/main/res/drawable/indicator_bg_top.xml rename to core/pulltorefresh/src/main/res/drawable/indicator_bg_top.xml diff --git a/pulltorefresh/src/main/res/layout/pull_to_refresh_header_horizontal.xml b/core/pulltorefresh/src/main/res/layout/pull_to_refresh_header_horizontal.xml similarity index 100% rename from pulltorefresh/src/main/res/layout/pull_to_refresh_header_horizontal.xml rename to core/pulltorefresh/src/main/res/layout/pull_to_refresh_header_horizontal.xml diff --git a/pulltorefresh/src/main/res/layout/pull_to_refresh_header_vertical.xml b/core/pulltorefresh/src/main/res/layout/pull_to_refresh_header_vertical.xml similarity index 100% rename from pulltorefresh/src/main/res/layout/pull_to_refresh_header_vertical.xml rename to core/pulltorefresh/src/main/res/layout/pull_to_refresh_header_vertical.xml diff --git a/core/pulltorefresh/src/main/res/values-ar/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-ar/pull_refresh_strings.xml new file mode 100644 index 00000000..25d5392d --- /dev/null +++ b/core/pulltorefresh/src/main/res/values-ar/pull_refresh_strings.xml @@ -0,0 +1,6 @@ + + + اسحب للتحديث… + اترك للتحديث… + تحميل… + diff --git a/pulltorefresh/src/main/res/values-cs/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-cs/pull_refresh_strings.xml similarity index 98% rename from pulltorefresh/src/main/res/values-cs/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-cs/pull_refresh_strings.xml index a8f0acea..c878da0c 100755 --- a/pulltorefresh/src/main/res/values-cs/pull_refresh_strings.xml +++ b/core/pulltorefresh/src/main/res/values-cs/pull_refresh_strings.xml @@ -1,6 +1,6 @@ - - - Tažením aktualizujete… - Uvolněním aktualizujete… - Načítání… - + + + Tažením aktualizujete… + Uvolněním aktualizujete… + Načítání… + diff --git a/pulltorefresh/src/main/res/values-de/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-de/pull_refresh_strings.xml similarity index 98% rename from pulltorefresh/src/main/res/values-de/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-de/pull_refresh_strings.xml index 3f773deb..901291bf 100755 --- a/pulltorefresh/src/main/res/values-de/pull_refresh_strings.xml +++ b/core/pulltorefresh/src/main/res/values-de/pull_refresh_strings.xml @@ -1,6 +1,6 @@ - - - Ziehen zum Aktualisieren… - Loslassen zum Aktualisieren… - Laden… - + + + Ziehen zum Aktualisieren… + Loslassen zum Aktualisieren… + Laden… + diff --git a/pulltorefresh/src/main/res/values-es/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-es/pull_refresh_strings.xml similarity index 98% rename from pulltorefresh/src/main/res/values-es/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-es/pull_refresh_strings.xml index 6f85c100..5e9d2803 100755 --- a/pulltorefresh/src/main/res/values-es/pull_refresh_strings.xml +++ b/core/pulltorefresh/src/main/res/values-es/pull_refresh_strings.xml @@ -1,6 +1,6 @@ - - - Tirar para actualizar… - Soltar para actualizar… - Cargando… - + + + Tirar para actualizar… + Soltar para actualizar… + Cargando… + diff --git a/pulltorefresh/src/main/res/values-fi/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-fi/pull_refresh_strings.xml similarity index 100% rename from pulltorefresh/src/main/res/values-fi/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-fi/pull_refresh_strings.xml diff --git a/pulltorefresh/src/main/res/values-fr/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-fr/pull_refresh_strings.xml similarity index 98% rename from pulltorefresh/src/main/res/values-fr/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-fr/pull_refresh_strings.xml index e59f07ec..fb53ef8c 100755 --- a/pulltorefresh/src/main/res/values-fr/pull_refresh_strings.xml +++ b/core/pulltorefresh/src/main/res/values-fr/pull_refresh_strings.xml @@ -1,6 +1,6 @@ - - - Tirez pour rafraîchir… - Relâcher pour rafraîchir… - Chargement… - + + + Tirez pour rafraîchir… + Relâcher pour rafraîchir… + Chargement… + diff --git a/pulltorefresh/src/main/res/values-he/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-he/pull_refresh_strings.xml similarity index 98% rename from pulltorefresh/src/main/res/values-he/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-he/pull_refresh_strings.xml index f22f7853..beedc1f6 100644 --- a/pulltorefresh/src/main/res/values-he/pull_refresh_strings.xml +++ b/core/pulltorefresh/src/main/res/values-he/pull_refresh_strings.xml @@ -1,6 +1,6 @@ - - - משוך לרענון… - שחרר לרענון… - טוען… - + + + משוך לרענון… + שחרר לרענון… + טוען… + diff --git a/pulltorefresh/src/main/res/values-it/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-it/pull_refresh_strings.xml similarity index 98% rename from pulltorefresh/src/main/res/values-it/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-it/pull_refresh_strings.xml index 9eaa7495..415fb9ed 100755 --- a/pulltorefresh/src/main/res/values-it/pull_refresh_strings.xml +++ b/core/pulltorefresh/src/main/res/values-it/pull_refresh_strings.xml @@ -1,6 +1,6 @@ - - - Tira per aggiornare… - Rilascia per aggionare… - Caricamento… - + + + Tira per aggiornare… + Rilascia per aggionare… + Caricamento… + diff --git a/pulltorefresh/src/main/res/values-iw/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-iw/pull_refresh_strings.xml similarity index 98% rename from pulltorefresh/src/main/res/values-iw/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-iw/pull_refresh_strings.xml index f22f7853..beedc1f6 100644 --- a/pulltorefresh/src/main/res/values-iw/pull_refresh_strings.xml +++ b/core/pulltorefresh/src/main/res/values-iw/pull_refresh_strings.xml @@ -1,6 +1,6 @@ - - - משוך לרענון… - שחרר לרענון… - טוען… - + + + משוך לרענון… + שחרר לרענון… + טוען… + diff --git a/pulltorefresh/src/main/res/values-ja/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-ja/pull_refresh_strings.xml similarity index 98% rename from pulltorefresh/src/main/res/values-ja/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-ja/pull_refresh_strings.xml index 12415443..d24842c9 100644 --- a/pulltorefresh/src/main/res/values-ja/pull_refresh_strings.xml +++ b/core/pulltorefresh/src/main/res/values-ja/pull_refresh_strings.xml @@ -1,6 +1,6 @@ - - - 画面を引っ張って… - 指を離して更新… - 読み込み中… - + + + 画面を引っ張って… + 指を離して更新… + 読み込み中… + diff --git a/pulltorefresh/src/main/res/values-ko/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-ko/pull_refresh_strings.xml similarity index 98% rename from pulltorefresh/src/main/res/values-ko/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-ko/pull_refresh_strings.xml index 15d86d4d..53edd592 100755 --- a/pulltorefresh/src/main/res/values-ko/pull_refresh_strings.xml +++ b/core/pulltorefresh/src/main/res/values-ko/pull_refresh_strings.xml @@ -1,6 +1,6 @@ - - - 당겨서 새로 고침… - 놓아서 새로 고침… - 로드 중… - + + + 당겨서 새로 고침… + 놓아서 새로 고침… + 로드 중… + diff --git a/pulltorefresh/src/main/res/values-nl/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-nl/pull_refresh_strings.xml similarity index 98% rename from pulltorefresh/src/main/res/values-nl/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-nl/pull_refresh_strings.xml index 0701c9b4..4c063ed9 100755 --- a/pulltorefresh/src/main/res/values-nl/pull_refresh_strings.xml +++ b/core/pulltorefresh/src/main/res/values-nl/pull_refresh_strings.xml @@ -1,6 +1,6 @@ - - - Sleep om te vernieuwen… - Loslaten om te vernieuwen… - Laden… - + + + Sleep om te vernieuwen… + Loslaten om te vernieuwen… + Laden… + diff --git a/pulltorefresh/src/main/res/values-pl/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-pl/pull_refresh_strings.xml similarity index 98% rename from pulltorefresh/src/main/res/values-pl/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-pl/pull_refresh_strings.xml index 7d474c18..007255a2 100755 --- a/pulltorefresh/src/main/res/values-pl/pull_refresh_strings.xml +++ b/core/pulltorefresh/src/main/res/values-pl/pull_refresh_strings.xml @@ -1,6 +1,6 @@ - - - Pociągnij, aby odświeżyć… - Puść, aby odświeżyć… - Wczytywanie… - + + + Pociągnij, aby odświeżyć… + Puść, aby odświeżyć… + Wczytywanie… + diff --git a/pulltorefresh/src/main/res/values-pt-rBR/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-pt-rBR/pull_refresh_strings.xml similarity index 98% rename from pulltorefresh/src/main/res/values-pt-rBR/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-pt-rBR/pull_refresh_strings.xml index 1a4359a8..0ec1ef7f 100755 --- a/pulltorefresh/src/main/res/values-pt-rBR/pull_refresh_strings.xml +++ b/core/pulltorefresh/src/main/res/values-pt-rBR/pull_refresh_strings.xml @@ -1,6 +1,6 @@ - - - Puxe para atualizar… - Libere para atualizar… - Carregando… - + + + Puxe para atualizar… + Libere para atualizar… + Carregando… + diff --git a/pulltorefresh/src/main/res/values-pt/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-pt/pull_refresh_strings.xml similarity index 98% rename from pulltorefresh/src/main/res/values-pt/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-pt/pull_refresh_strings.xml index 71eea31a..d08bc63b 100755 --- a/pulltorefresh/src/main/res/values-pt/pull_refresh_strings.xml +++ b/core/pulltorefresh/src/main/res/values-pt/pull_refresh_strings.xml @@ -1,6 +1,6 @@ - - - Puxe para atualizar… - Liberação para atualizar… - A carregar… - + + + Puxe para atualizar… + Liberação para atualizar… + A carregar… + diff --git a/pulltorefresh/src/main/res/values-ro/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-ro/pull_refresh_strings.xml similarity index 98% rename from pulltorefresh/src/main/res/values-ro/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-ro/pull_refresh_strings.xml index c89e80a9..87ddc941 100644 --- a/pulltorefresh/src/main/res/values-ro/pull_refresh_strings.xml +++ b/core/pulltorefresh/src/main/res/values-ro/pull_refresh_strings.xml @@ -1,6 +1,6 @@ - - - Trage pentru a reîmprospăta… - Eliberează pentru a reîmprospăta… - Încărcare… - + + + Trage pentru a reîmprospăta… + Eliberează pentru a reîmprospăta… + Încărcare… + diff --git a/pulltorefresh/src/main/res/values-ru/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-ru/pull_refresh_strings.xml similarity index 98% rename from pulltorefresh/src/main/res/values-ru/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-ru/pull_refresh_strings.xml index ca364ff8..71ddcda7 100755 --- a/pulltorefresh/src/main/res/values-ru/pull_refresh_strings.xml +++ b/core/pulltorefresh/src/main/res/values-ru/pull_refresh_strings.xml @@ -1,6 +1,6 @@ - - - Потяните для обновления… - Отпустите для обновления… - Загрузка… - + + + Потяните для обновления… + Отпустите для обновления… + Загрузка… + diff --git a/pulltorefresh/src/main/res/values-zh/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values-zh/pull_refresh_strings.xml similarity index 97% rename from pulltorefresh/src/main/res/values-zh/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values-zh/pull_refresh_strings.xml index 397376be..08766e0b 100755 --- a/pulltorefresh/src/main/res/values-zh/pull_refresh_strings.xml +++ b/core/pulltorefresh/src/main/res/values-zh/pull_refresh_strings.xml @@ -1,6 +1,6 @@ - - - 下拉刷新… - 放开以刷新… - 正在载入… - + + + 下拉刷新… + 放开以刷新… + 正在载入… + diff --git a/pulltorefresh/src/main/res/values/attrs.xml b/core/pulltorefresh/src/main/res/values/attrs.xml similarity index 100% rename from pulltorefresh/src/main/res/values/attrs.xml rename to core/pulltorefresh/src/main/res/values/attrs.xml diff --git a/pulltorefresh/src/main/res/values/dimens.xml b/core/pulltorefresh/src/main/res/values/dimens.xml similarity index 100% rename from pulltorefresh/src/main/res/values/dimens.xml rename to core/pulltorefresh/src/main/res/values/dimens.xml diff --git a/pulltorefresh/src/main/res/values/ids.xml b/core/pulltorefresh/src/main/res/values/ids.xml similarity index 100% rename from pulltorefresh/src/main/res/values/ids.xml rename to core/pulltorefresh/src/main/res/values/ids.xml diff --git a/pulltorefresh/src/main/res/values/pull_refresh_strings.xml b/core/pulltorefresh/src/main/res/values/pull_refresh_strings.xml similarity index 100% rename from pulltorefresh/src/main/res/values/pull_refresh_strings.xml rename to core/pulltorefresh/src/main/res/values/pull_refresh_strings.xml diff --git a/pulltorefresh/.gitignore b/pulltorefresh/.gitignore deleted file mode 100644 index e8fa30f8..00000000 --- a/pulltorefresh/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/build -*.iml diff --git a/pulltorefresh/src/main/res/values-ar/pull_refresh_strings.xml b/pulltorefresh/src/main/res/values-ar/pull_refresh_strings.xml deleted file mode 100644 index 5b0b571c..00000000 --- a/pulltorefresh/src/main/res/values-ar/pull_refresh_strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - اسحب للتحديث… - اترك للتحديث… - تحميل… - diff --git a/settings.gradle b/settings.gradle index 54b750c4..920ad785 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,5 +4,5 @@ include ':subsonic-api' include ':subsonic-api-image-loader' include ':core:cache' include ':core:menudrawer' -include ':pulltorefresh' +include ':core:pulltorefresh' include ':ultrasonic' diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle index 76bb61c8..e9bec200 100644 --- a/ultrasonic/build.gradle +++ b/ultrasonic/build.gradle @@ -51,7 +51,7 @@ android { dependencies { implementation project(':core:menudrawer') - implementation project(':pulltorefresh') + implementation project(':core:pulltorefresh') implementation project(':core:library') implementation project(':core:domain') implementation project(':subsonic-api')