diff --git a/menudrawer/build.gradle b/core/menudrawer/build.gradle similarity index 100% rename from menudrawer/build.gradle rename to core/menudrawer/build.gradle diff --git a/menudrawer/lint-baseline.xml b/core/menudrawer/lint-baseline.xml similarity index 100% rename from menudrawer/lint-baseline.xml rename to core/menudrawer/lint-baseline.xml diff --git a/menudrawer/src/main/AndroidManifest.xml b/core/menudrawer/src/main/AndroidManifest.xml similarity index 100% rename from menudrawer/src/main/AndroidManifest.xml rename to core/menudrawer/src/main/AndroidManifest.xml diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/BuildLayerFrameLayout.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/BuildLayerFrameLayout.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/BuildLayerFrameLayout.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/BuildLayerFrameLayout.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/ColorDrawable.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/ColorDrawable.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/ColorDrawable.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/ColorDrawable.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/DraggableDrawer.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/DraggableDrawer.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/DraggableDrawer.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/DraggableDrawer.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/FloatScroller.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/FloatScroller.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/FloatScroller.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/FloatScroller.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/MenuDrawer.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/MenuDrawer.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/MenuDrawer.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/MenuDrawer.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/NoClickThroughFrameLayout.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/NoClickThroughFrameLayout.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/NoClickThroughFrameLayout.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/NoClickThroughFrameLayout.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/OverlayDrawer.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/OverlayDrawer.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/OverlayDrawer.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/OverlayDrawer.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/PeekInterpolator.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/PeekInterpolator.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/PeekInterpolator.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/PeekInterpolator.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/Position.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/Position.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/Position.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/Position.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/Scroller.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/Scroller.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/Scroller.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/Scroller.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/SinusoidalInterpolator.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/SinusoidalInterpolator.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/SinusoidalInterpolator.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/SinusoidalInterpolator.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/SlideDrawable.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/SlideDrawable.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/SlideDrawable.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/SlideDrawable.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/SlidingDrawer.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/SlidingDrawer.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/SlidingDrawer.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/SlidingDrawer.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/SmoothInterpolator.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/SmoothInterpolator.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/SmoothInterpolator.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/SmoothInterpolator.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/StaticDrawer.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/StaticDrawer.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/StaticDrawer.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/StaticDrawer.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/ViewHelper.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/ViewHelper.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/ViewHelper.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/ViewHelper.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/compat/ActionBarHelper.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/compat/ActionBarHelper.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/compat/ActionBarHelper.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/compat/ActionBarHelper.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/compat/ActionBarHelperCompat.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/compat/ActionBarHelperCompat.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/compat/ActionBarHelperCompat.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/compat/ActionBarHelperCompat.java diff --git a/menudrawer/src/main/java/net/simonvt/menudrawer/compat/ActionBarHelperNative.java b/core/menudrawer/src/main/java/net/simonvt/menudrawer/compat/ActionBarHelperNative.java similarity index 100% rename from menudrawer/src/main/java/net/simonvt/menudrawer/compat/ActionBarHelperNative.java rename to core/menudrawer/src/main/java/net/simonvt/menudrawer/compat/ActionBarHelperNative.java diff --git a/menudrawer/src/main/res/values/attrs.xml b/core/menudrawer/src/main/res/values/attrs.xml similarity index 100% rename from menudrawer/src/main/res/values/attrs.xml rename to core/menudrawer/src/main/res/values/attrs.xml diff --git a/menudrawer/src/main/res/values/colors.xml b/core/menudrawer/src/main/res/values/colors.xml similarity index 100% rename from menudrawer/src/main/res/values/colors.xml rename to core/menudrawer/src/main/res/values/colors.xml diff --git a/menudrawer/src/main/res/values/ids.xml b/core/menudrawer/src/main/res/values/ids.xml similarity index 100% rename from menudrawer/src/main/res/values/ids.xml rename to core/menudrawer/src/main/res/values/ids.xml diff --git a/menudrawer/src/main/res/values/strings.xml b/core/menudrawer/src/main/res/values/strings.xml similarity index 100% rename from menudrawer/src/main/res/values/strings.xml rename to core/menudrawer/src/main/res/values/strings.xml diff --git a/menudrawer/src/main/res/values/styles.xml b/core/menudrawer/src/main/res/values/styles.xml similarity index 100% rename from menudrawer/src/main/res/values/styles.xml rename to core/menudrawer/src/main/res/values/styles.xml diff --git a/menudrawer/.gitignore b/menudrawer/.gitignore deleted file mode 100644 index e8fa30f8..00000000 --- a/menudrawer/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/build -*.iml diff --git a/settings.gradle b/settings.gradle index 2a68d069..54b750c4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,6 +3,6 @@ include ':core:domain' include ':subsonic-api' include ':subsonic-api-image-loader' include ':core:cache' -include ':menudrawer' +include ':core:menudrawer' include ':pulltorefresh' include ':ultrasonic' diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle index 8811f245..76bb61c8 100644 --- a/ultrasonic/build.gradle +++ b/ultrasonic/build.gradle @@ -50,7 +50,7 @@ android { } dependencies { - implementation project(':menudrawer') + implementation project(':core:menudrawer') implementation project(':pulltorefresh') implementation project(':core:library') implementation project(':core:domain')