diff --git a/README.md b/README.md index 705ea6c..187e1ba 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ copy代码,或使用ADT的maven插件 ##### Android Studio / IDEA - 在`build.gradle`中添加 ``` -compile 'com.moxun:tagcloudlib:1.1.1' +compile 'com.moxun:tagcloudlib:1.1.2' ``` - 在布局文件中引入 diff --git a/app/src/main/java/com/moxun/tagcloud/TextTagsAdapter.java b/app/src/main/java/com/moxun/tagcloud/TextTagsAdapter.java index d4c1927..8d4d217 100644 --- a/app/src/main/java/com/moxun/tagcloud/TextTagsAdapter.java +++ b/app/src/main/java/com/moxun/tagcloud/TextTagsAdapter.java @@ -1,6 +1,5 @@ package com.moxun.tagcloud; -import android.app.Application; import android.content.Context; import android.support.annotation.NonNull; import android.util.Log; @@ -15,7 +14,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Random; /** * Created by moxun on 16/1/19. @@ -37,8 +35,6 @@ public int getCount() { @Override public View getView(final Context context, final int position, ViewGroup parent) { TextView tv = new TextView(context); - ViewGroup.MarginLayoutParams lp = new ViewGroup.MarginLayoutParams(200, 100); - tv.setLayoutParams(lp); tv.setText("No." + position); tv.setGravity(Gravity.CENTER); tv.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/res/layout/tag_item_view.xml b/app/src/main/res/layout/tag_item_view.xml index 847e75b..77f3f91 100644 --- a/app/src/main/res/layout/tag_item_view.xml +++ b/app/src/main/res/layout/tag_item_view.xml @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/tagcloudlib/build.gradle b/tagcloudlib/build.gradle index 6488479..073672a 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.1.1" +version = "1.1.2" android { compileSdkVersion 23 buildToolsVersion "23.0.1" @@ -43,7 +43,7 @@ install { } developers { developer { - id 'misakuo' //填写开发者基本信息 + id 'misakuo' //开发者基本信息 name 'moxun' email 'furmint@foxmail.com' } @@ -77,10 +77,10 @@ artifacts { Properties properties = new Properties() File file = project.rootProject.file('local.properties') if(file != null && file.exists()) { - println("Building on local machine......") + println("\nBuilding on local machine......") properties.load(file.newDataInputStream()) } else { - println("Building on Travis......") + println("\nBuilding on Travis......") properties.put("bintray.user",System.getenv("USER")) properties.put("bintray.apikey",System.getenv("TOKEN")) } 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 9a653f0..a86e892 100755 --- a/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloudView.java +++ b/tagcloudlib/src/main/java/com/moxun/tagcloudlib/view/TagCloudView.java @@ -176,7 +176,8 @@ public void run() { removeAllViews(); for (int i = 0; i < tagsAdapter.getCount(); i++) { TagCloudView.this.mTagCloud.add(new Tag(tagsAdapter.getPopularity(i))); - addView(tagsAdapter.getView(getContext(), i, TagCloudView.this)); + View view = tagsAdapter.getView(getContext(), i, TagCloudView.this); + addView(view); } mTagCloud.create(true); @@ -201,8 +202,6 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { int widthMode = MeasureSpec.getMode(widthMeasureSpec); int heightMode = MeasureSpec.getMode(heightMeasureSpec); - measureChildren(widthMode, heightMode); - if (layoutParams == null) { layoutParams = (MarginLayoutParams) getLayoutParams(); } @@ -210,6 +209,8 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { int dimensionX = widthMode == MeasureSpec.EXACTLY ? contentWidth : minSize - layoutParams.leftMargin - layoutParams.rightMargin; int dimensionY = heightMode == MeasureSpec.EXACTLY ? contentHeight : minSize - layoutParams.leftMargin - layoutParams.rightMargin; setMeasuredDimension(dimensionX, dimensionY); + + measureChildren(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED); } @Override