Merge pull request #8 from Cleveroad/develop

fix issue #4

Author: VadimHalimendikCr

CHANGELOG.md

@@ -0,0 +1,21 @@
+# CycleMenu [![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome) <img src="https://www.cleveroad.com/public/comercial/label-android.svg" height="20"> <a href="https://www.cleveroad.com/?utm_source=github&utm_medium=label&utm_campaign=contacts"><img src="https://www.cleveroad.com/public/comercial/label-cleveroad.svg" height="20"></a>
+![Header image](/images/header.jpg)
+
+## Meet CycleMenu for Android by Cleveroad
+
+What can be better than an eye-catching design in couple with reasonable features? While using this menu you do not need to worry about the lack of space for some useful features since the scroll type can be endless as well as basic. Choose an appropriate corner, customize your icons and here you go!
+
+![Demo image](/images/demo.gif)
+
+
+During its development, we have created a custom LayoutManager for the inner RecyclerView in order to display the elements in a circle with the possibility to scroll them.
+
+In case you are in need of beautiful and functional app menu, you are welcome to use CycleMenu. Make your scroll last forever!
+
+[![Awesome](/images/logo-footer.png)](https://www.cleveroad.com/?utm_source=github&utm_medium=label&utm_campaign=contacts)
+
+## Changelog
+
+Version | Changes
+---     | ---
+v.1.0.2 | <ul><li>Updated version of the support libraries</li><li>Updated version of the build tools</li><li>Fix issue #4 https://github.com/Cleveroad/CycleMenu/issues/4</li><li>Implemented issue #5 https://github.com/Cleveroad/CycleMenu/issues/5</li></ul>

LICENSE

@@ -8,17 +8,17 @@ What can be better than an eye-catching design in couple with reasonable feature
 ![Demo image](/images/demo.gif)
 
 
-During its development, we have created a custom LayoutManager for the inner RecyclerView in order to display the elements in a circle with the possibility to scroll them.  
+During its development, we have created a custom LayoutManager for the inner RecyclerView in order to display the elements in a circle with the possibility to scroll them.
 
 In case you are in need of beautiful and functional app menu, you are welcome to use CycleMenu. Make your scroll last forever!
- 
+
 [![Awesome](/images/logo-footer.png)](https://www.cleveroad.com/?utm_source=github&utm_medium=label&utm_campaign=contacts)
 
 ## Setup and usage
 To include this library to your project add dependency in **build.gradle** file:
 ```groovy
     dependencies {
-        compile 'com.cleveroad:cycle-menu:1.0.1'
+        implementation 'com.cleveroad:cycle-menu:1.0.2'
     }
 ```
 
@@ -28,7 +28,7 @@ Use the CycleMenu in layout file
         android:id="@+id/itemCycleMenuWidget"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        
+
         app:cm_autoMaxRadius="220dp"
         app:cm_autoMinRadius="10dp"
         app:cm_corner="right_top"
@@ -44,7 +44,7 @@ Use the CycleMenu in layout file
 or programmatically
 ```JAVA
 CycleMenuWidget cycleMenuWidget = new CycleMenuWidget(mContext);
-cycleMenuWidget.setLayoutParams(new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));           
+cycleMenuWidget.setLayoutParams(new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
 container.addView(cycleMenuWidget);
 ```
 To set menu resources from xml resource or Collection use:
@@ -62,12 +62,12 @@ void setAutoMaxRadius(int autoMaxRadius)
 void setFixedRadius(int fixedRadius)
 
 ```
-If you choose to use `RADIUS_SCALING_TYPE.AUTO` then you need to setup autoMinRadius and autoMaxRadius. This values will be use to calculate radius of menu. 
-If menu has small amount of items - the radius will be calculated to fit all items but not less then autoMinRadius. If there is a lot of items in the menu then radius will be equal autoMaxRadius. 
+If you choose to use `RADIUS_SCALING_TYPE.AUTO` then you need to setup autoMinRadius and autoMaxRadius. This values will be use to calculate radius of menu.
+If menu has small amount of items - the radius will be calculated to fit all items but not less then autoMinRadius. If there is a lot of items in the menu then radius will be equal autoMaxRadius.
 if you setup autoMaxRadius bigger then available space for the menu - radius will be reduced.
 If you choose to use RADIUS_SCALING_TYPE.FIXED the the menu radius will be equal to fixedRadius. But not bigger then available space for the menu.
-  
-To setup scroll type. The scroll type can be `ENDLESS` (infinite scrolling) ans `BASIC` (general scrolling). 
+
+To setup scroll type. The scroll type can be `ENDLESS` (infinite scrolling) ans `BASIC` (general scrolling).
 ```JAVA
 void setScrollType(SCROLL scrollType)
 ```
@@ -83,33 +83,38 @@ void setRippleColor(int rippleColor)
 void setCornerImageDrawable(Drawable cornerImageDrawable)
 void setCornerImageResource(@DrawableRes int drawableRes)
 void setCornerImageBitmap(Bitmap bitmap)
+void setCollapsedRadius(int collapsedRadius)
+void setBackground(int backgroundColor)
 ```
 
 For listening changing menu state use
 ```JAVA
-setStateChangeListener( 
-    new OnStateChangedListener() {                                 
-        void onStateChanged(CycleMenuWidget.STATE state){};                                 
-        void onOpen(){};                                 
-        void onClose(){};                                 
+setStateChangeListener(
+    new OnStateChangedListener() {
+        void onStateChanged(CycleMenuWidget.STATE state){};
+        void onOpen(){};
+        void onClose(){};
 })
 ```
 For listening menu items clicks use
 ```JAVA
-setOnMenuItemClickListener( 
+setOnMenuItemClickListener(
     new OnMenuItemClickListener() {
         void onMenuItemClick(View view, int itemPosition) {}
-})                              
+})
 ```
 
 For providing saving state listener use
 ```JAVA
-setStateSaveListener( 
+setStateSaveListener(
     new StateSaveListener() {
         void saveState(int itemPosition, double lastItemAngleShift){}
 });
 ```
 
+## Changelog
+See [changelog history].
+
 ## Support
 
 If you have any questions, issues or propositions, please create a <a href="../../issues/new">new issue</a> in this repository.
@@ -145,3 +150,5 @@ Follow us:
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
+
+[changelog history]: /CHANGELOG.md

README.MD

@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -19,6 +20,7 @@ allprojects {
         maven {
             url "https://oss.sonatype.org/content/repositories/snapshots"
         }
+        google()
     }
 }
 

build.gradle

@@ -1,94 +1 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
 /build
-/captures
-/.idea
-*.apk
-gradle.properties
-### Android template
-# Built application files
-*.ap_
-
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
-
-# Intellij
-.idea/workspace.xml
-
-# Keystore files
-*.jks
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff:
-.idea/tasks.xml
-.idea/dictionaries
-.idea/vcs.xml
-.idea/jsLibraryMappings.xml
-
-# Sensitive or high-churn files:
-.idea/dataSources.ids
-.idea/dataSources.xml
-.idea/dataSources.local.xml
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
-
-# Gradle:
-.idea/gradle.xml
-.idea/libraries
-
-# Mongo Explorer plugin:
-.idea/mongoSettings.xml
-
-## File-based project format:
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties

cycle_menu/.gitignore

@@ -1,16 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 25
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        targetSdkVersion 28
+        versionCode 5
+        versionName "1.0.2"
 
     }
     buildTypes {
@@ -24,14 +22,15 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.android.support:recyclerview-v7:25.1.0'
-    compile 'com.android.support:design:25.1.0'
-
-    apply from: './gradle-mvn-push.gradle'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    //versions
+    final SUPPORT_LIB_VERSION = '28.0.0'
+
+    testImplementation 'junit:junit:4.12'
+    implementation "com.android.support:appcompat-v7:$SUPPORT_LIB_VERSION"
+    implementation "com.android.support:recyclerview-v7:$SUPPORT_LIB_VERSION"
+    implementation "com.android.support:design:$SUPPORT_LIB_VERSION"
 }
+
+//apply from: './gradle-mvn-push.gradle'

cycle_menu/build.gradle

@@ -0,0 +1,26 @@
+package com.cleveroad.sy.cyclemenuwidget;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.cleveroad.sy.cyclelayoutmanager.test", appContext.getPackageName());
+    }
+}

cycle_menu/src/androidTest/java/com/cleveroad/sy/cyclemenuwidget/ExampleInstrumentedTest.java

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.cleveroad.cyclemenuwidget">
+          package="com.cleveroad.sy.cyclemenuwidget">
 
     <application android:allowBackup="true"
                  android:label="@string/app_name"

cycle_menu/src/main/AndroidManifest.xml

@@ -1,20 +1,20 @@
-package com.cleveroad.cyclemenuwidget;
+package com.cleveroad.sy.cyclemenuwidget;
 
 import android.view.animation.Animation;
 
 class AnimationListenerAdapter implements Animation.AnimationListener {
     @Override
     public void onAnimationStart(Animation animation) {
-
+        // do nothing
     }
 
     @Override
     public void onAnimationEnd(Animation animation) {
-
+        // do nothing
     }
 
     @Override
     public void onAnimationRepeat(Animation animation) {
-
+        // do nothing
     }
 }