diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f895792 --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) +Copyright © 2016 moxun + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the “Software”), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER 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. \ No newline at end of file diff --git a/README.md b/README.md index 6fb3b54..252132f 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ copy代码,或转向Android Studio ##### Android Studio / IDEA - 在`build.gradle`中添加 ``` -compile 'com.moxun:tagcloudlib:1.0.2' +compile 'com.moxun:tagcloudlib:1.0.3' ``` - 在布局文件中引入 diff --git a/app/src/test/java/com/moxun/tagcloud/ExampleUnitTest.java b/app/src/test/java/com/moxun/tagcloud/ExampleUnitTest.java deleted file mode 100644 index b26b30c..0000000 --- a/app/src/test/java/com/moxun/tagcloud/ExampleUnitTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.moxun.tagcloud; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * To work on unit tests, switch the Test Artifact in the Build Variants view. - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/tagcloudlib/build.gradle b/tagcloudlib/build.gradle index eeb473b..6877118 100644 --- a/tagcloudlib/build.gradle +++ b/tagcloudlib/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' -version = "1.0.2" +version = "1.0.3" android { compileSdkVersion 'Google Inc.:Google APIs:23' buildToolsVersion "23.0.2" @@ -37,8 +37,8 @@ install { // Set your license licenses { license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + name 'The MIT License (MIT)' + url 'http://mit-license.org/' } } developers { @@ -84,7 +84,7 @@ bintray { name = "tagcloudview" //发布到Bintray上的项目名字 websiteUrl = siteUrl vcsUrl = gitUrl - licenses = ["Apache-2.0"] + licenses = ["MIT"] publish = true } } diff --git a/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/Tag.java b/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/Tag.java index 43ce63e..5c67664 100755 --- a/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/Tag.java +++ b/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/Tag.java @@ -1,11 +1,29 @@ package com.moxun.tagcloudlib.view; import android.graphics.Color; -import android.util.Log; /** - * Created by moxun on 1/19/2016 + * Copyright © 2016 moxun + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the “Software”), + * to deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER 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. */ + public class Tag { private int popularity; //this is the importance/popularity of the Tag diff --git a/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloud.java b/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloud.java index 7cf225a..12485ed 100755 --- a/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloud.java +++ b/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloud.java @@ -1,6 +1,25 @@ package com.moxun.tagcloudlib.view; + /** - * Created by moxun on 16/1/19 + * Copyright © 2016 moxun + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the “Software”), + * to deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER 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. */ import java.util.ArrayList; diff --git a/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloudView.java b/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloudView.java index 483a334..fb50f03 100755 --- a/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloudView.java +++ b/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloudView.java @@ -1,7 +1,25 @@ package com.moxun.tagcloudlib.view; /** - * Created by moxun on 19/1/2016 + * Copyright © 2016 moxun + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the “Software”), + * to deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER 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. */ import android.content.Context; diff --git a/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagsAdapter.java b/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagsAdapter.java index f5c587b..5f92e7a 100644 --- a/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagsAdapter.java +++ b/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagsAdapter.java @@ -5,8 +5,27 @@ import android.view.ViewGroup; /** - * Created by moxun on 16/1/19. + * Copyright © 2016 moxun + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the “Software”), + * to deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER 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. */ + public abstract class TagsAdapter { private OnDataSetChangeListener onDataSetChangeListener; diff --git a/tagcloudlib/src/main/res/drawable/bg.png b/tagcloudlib/src/main/res/drawable/bg.png deleted file mode 100644 index aee44e1..0000000 Binary files a/tagcloudlib/src/main/res/drawable/bg.png and /dev/null differ diff --git a/tagcloudlib/src/test/java/com/moxun/tagcloud/ExampleUnitTest.java b/tagcloudlib/src/test/java/com/moxun/tagcloud/ExampleUnitTest.java deleted file mode 100644 index b26b30c..0000000 --- a/tagcloudlib/src/test/java/com/moxun/tagcloud/ExampleUnitTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.moxun.tagcloud; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * To work on unit tests, switch the Test Artifact in the Build Variants view. - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file