From e8f95bd3b3be85760908c9beef868fb734b84bfb Mon Sep 17 00:00:00 2001
From: ChristianChen <freestyletime@foxmail.com>
Date: 2017年3月18日 15:49:21 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4Tag=E6=97=B6=E7=9A=84=E5=B4=A9=E6=BA=83?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
设置默认Tag时,如果不设置mOnDataChangedListener,则会造成空指针异常
---
 .../src/main/java/com/zhy/view/flowlayout/TagAdapter.java &#124; 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/TagAdapter.java b/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/TagAdapter.java
index 312c6cc..b05f850 100644
--- a/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/TagAdapter.java
+++ b/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/TagAdapter.java
@@ -2,6 +2,7 @@
 
 import android.view.View;
 
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -64,8 +65,9 @@ public int getCount()
 }
 
 public void notifyDataChanged()
- {
- mOnDataChangedListener.onChanged();
+ { 
+ if(mOnDataChangedListener != null)
+ mOnDataChangedListener.onChanged();
 }
 
 public T getItem(int position)
@@ -82,4 +84,4 @@ public boolean setSelected(int position, T t)
 
 
 
-}
\ No newline at end of file
+}
From 4e166746de314f5928bd11574205c7a933120fb6 Mon Sep 17 00:00:00 2001
From: ValuesFeng <358958028@qq.com>
Date: 2017年4月11日 09:21:34 +0800
Subject: [PATCH 2/6] fix tagview bug
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Android大部分机型中frameLayout可能会忽略子view的margin值。
但是部分机型上不会,例如华为,如果在xml中设置锅tagview的margin,在changeAdapter中会对这个margin进行拷贝,造成UI上两倍的margin效果,修改部分为只设置外层framelayout的margin,去掉子view的margin。
---
 .../src/main/java/com/zhy/view/flowlayout/TagFlowLayout.java &#124; 2 ++
 1 file changed, 2 insertions(+)
diff --git a/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/TagFlowLayout.java b/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/TagFlowLayout.java
index 986af2b..d63980d 100644
--- a/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/TagFlowLayout.java
+++ b/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/TagFlowLayout.java
@@ -139,6 +139,8 @@ private void changeAdapter()
 dip2px(getContext(), 5));
 tagViewContainer.setLayoutParams(lp);
 }
+ tagView.setLayoutParams(new FrameLayout.LayoutParams(tagView.getLayoutParams().width,
+ tagView.getLayoutParams().height));
 tagViewContainer.addView(tagView);
 addView(tagViewContainer);
 
From da1aed69f70429d547b8ef86d8fa9549b1c749ce Mon Sep 17 00:00:00 2001
From: zhanghongyang01 <zhanghongyang01@baidu.com>
Date: 2017年9月14日 15:34:27 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90fixbug=E3=80=91#97,#95,#92,#90,#85?=
 =?UTF-8?q?,#83,#80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
 .idea/.name &#124; 1 -
 .idea/compiler.xml &#124; 2 +-
 .idea/encodings.xml &#124; 6 +
 .idea/gradle.xml &#124; 8 +-
 .idea/misc.xml &#124; 29 +-
 .idea/modules.xml &#124; 6 +-
 .idea/vcs.xml &#124; 3 +-
 FlowLayout.iml &#124; 19 ++
 README.md &#124; 25 +-
 build.gradle &#124; 5 +-
 flowlayout-lib/build.gradle &#124; 89 +-----
 flowlayout-lib/flowlayout-lib.iml &#124; 56 ++--
 .../com/zhy/view/flowlayout/FlowLayout.java &#124; 67 ++--
 .../com/zhy/view/flowlayout/TagAdapter.java &#124; 60 ++--
 .../zhy/view/flowlayout/TagFlowLayout.java &#124; 298 ++++++------------
 flowlayout-lib/src/main/res/values/attrs.xml &#124; 1 -
 flowlayout/build.gradle &#124; 10 +-
 flowlayout/flowlayout.iml &#124; 83 +++--
 .../com/zhy/flowlayout/SimpleFragment.java &#124; 23 +-
 .../src/main/res/layout/activity_category.xml &#124; 2 +-
 gradle/wrapper/gradle-wrapper.properties &#124; 4 +-
 21 files changed, 339 insertions(+), 458 deletions(-)
 delete mode 100644 .idea/.name
 create mode 100644 .idea/encodings.xml
 create mode 100644 FlowLayout.iml
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 98fbf6d..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-Github-FlowLayout
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 9a8b7e5..96cc43e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
 <component name="CompilerConfiguration">
- <option name="DEFAULT_COMPILER" value="Javac" />
 <resourceextensions />
 <wildcardresourcepatterns>
 <entry name="!?*.java" />
@@ -12,6 +11,7 @@
 <entry name="!?*.flex" />
 <entry name="!?*.kt" />
 <entry name="!?*.clj" />
+ <entry name="!?*.aj" />
 </wildcardresourcepatterns>
 <annotationprocessing>
 <profile default="true" name="Default" enabled="false">
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..97626ba
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Encoding">
+ <file url="PROJECT" charset="UTF-8" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 098fd48..ff65e73 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,14 +5,14 @@
 <gradleprojectsettings>
 <option name="distributionType" value="DEFAULT_WRAPPED" />
 <option name="externalProjectPath" value="$PROJECT_DIR$" />
- <option name="gradleJvm" value="1.7" />
 <option name="modules">
 <set>
- <option value="$PROJECT_DIR$" />
- <option value="$PROJECT_DIR$/flowlayout" />
- <option value="$PROJECT_DIR$/flowlayout-lib" />
+ <option value="$USER_HOME$/git-repo/mime/FlowLayout" />
+ <option value="$USER_HOME$/git-repo/mime/FlowLayout/flowlayout" />
+ <option value="$USER_HOME$/git-repo/mime/FlowLayout/flowlayout-lib" />
 </set>
 </option>
+ <option name="resolveModulePerSourceSet" value="false" />
 </gradleprojectsettings>
 </option>
 </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bb965f4..cca2cda 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -27,31 +27,6 @@
 </value>
 </option>
 </component>
- <component name="ProjectInspectionProfilesVisibleTreeState">
- <entry key="Project Default">
- <profile-state>
- <expanded-state>
- <state>
- <id />
- </state>
- <state>
- <id>Android Lint</id>
- </state>
- <state>
- <id>Gradle</id>
- </state>
- <state>
- <id>Probable bugsGradle</id>
- </state>
- </expanded-state>
- <selected-state>
- <state>
- <id>Android</id>
- </state>
- </selected-state>
- </profile-state>
- </entry>
- </component>
 <component name="ProjectLevelVcsManager" settingsEditedManually="false">
 <optionssetting value="true" id="Add" />
 <optionssetting value="true" id="Remove" />
@@ -62,7 +37,7 @@
 <confirmationssetting value="0" id="Add" />
 <confirmationssetting value="0" id="Remove" />
 </component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
 <output url="file://$PROJECT_DIR$/build/classes" />
 </component>
 <component name="ProjectType">
@@ -72,7 +47,7 @@
 <states>
 <state key="ProjectJDKs.UI">
 <settings>
- <last-edited>1.7</last-edited>
+ <last-edited>1.8</last-edited>
 <splitter-proportions>
 <option name="proportions">
 <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 223eb4a..e744d2b 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,9 @@
 <project version="4">
 <component name="ProjectModuleManager">
 <modules>
- <module fileurl="file://$PROJECT_DIR$/Github-FlowLayout.iml" filepath="$PROJECT_DIR$/Github-FlowLayout.iml" />
- <module fileurl="file://$PROJECT_DIR$/flowlayout/flowlayout.iml" filepath="$PROJECT_DIR$/flowlayout/flowlayout.iml" />
- <module fileurl="file://$PROJECT_DIR$/flowlayout-lib/flowlayout-lib.iml" filepath="$PROJECT_DIR$/flowlayout-lib/flowlayout-lib.iml" />
+ <module fileurl="file://$USER_HOME$/git-repo/mime/FlowLayout/FlowLayout.iml" filepath="$USER_HOME$/git-repo/mime/FlowLayout/FlowLayout.iml" />
+ <module fileurl="file://$USER_HOME$/git-repo/mime/FlowLayout/flowlayout/flowlayout.iml" filepath="$USER_HOME$/git-repo/mime/FlowLayout/flowlayout/flowlayout.iml" />
+ <module fileurl="file://$USER_HOME$/git-repo/mime/FlowLayout/flowlayout-lib/flowlayout-lib.iml" filepath="$USER_HOME$/git-repo/mime/FlowLayout/flowlayout-lib/flowlayout-lib.iml" />
 </modules>
 </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 6564d52..b508650 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
 <component name="VcsDirectoryMappings">
- <ul class="image_map">
+ <ul class="image_map">
+ <ul class="image_map">
 </component>
 </project>
\ No newline at end of file
diff --git a/FlowLayout.iml b/FlowLayout.iml
new file mode 100644
index 0000000..9df424a
--- /dev/null
+++ b/FlowLayout.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="FlowLayout" external.linked.project.path="$MODULE_DIR$" external.root.project.path="/Volumes/Macintosh HD/Volumes/Macintosh HD/Users/zhanghongyang01/git-repo/mime/FlowLayout" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="java-gradle" name="Java-Gradle">
+ <configuration>
+ <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+ <option name="BUILDABLE" value="false" />
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <excludefolder url="file://$MODULE_DIR$/.gradle" />
+ </content>
+ <orderentry type="inheritedJdk" />
+ <orderentry type="sourceFolder" forTests="false" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/README.md b/README.md
index bb9c598..70c6cc6 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Android流式布局,支持单选、多选等,适合用于产品标签等。
 
 ```java
 dependencies {
- compile 'com.zhy:flowlayout-lib:1.0.3'
+ compile 'com.hyman:flowlayout-lib:1.1.1'
 }
 ```
 
@@ -43,7 +43,9 @@ dependencies {
 支持属性:
 
 `max_select`:-1为不限制选择数量,>=1的数字为控制选择tag的数量
-`auto_select_effect` 是否开启默认的选中效果,即为selector中设置的效果,默认为true;如果设置为false,则无选中效果,需要自己在回调中处理。
+
+支持通过state=checked来控制选中和取消,也可以自己在Adapter
+的onSelected和unSelected中分别处理显示。
 
 ###设置数据
 
@@ -61,12 +63,11 @@ mFlowLayout.setAdapter(new TagAdapter<string>(mVals)
 });
 ```
 
+
 getView中回调,类似ListView等用法。
 
 ### 对于选中状态
 
-你还在复杂的写代码设置选中后标签的显示效果么,翔哥说No!
-
 ```java
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
@@ -81,6 +82,22 @@ getView中回调,类似ListView等用法。
 设置个background,上面一个状态为android:state_checked,另一个为正常。写写布局文件我都嫌慢,怎么能写一堆代码控制效果,设置改个效果,岂不是没时间dota了。
 
 
+也可以不依赖state_checked,在下面的回调中自行设置:
+
+```
+#Adapter
+@Override
+public void onSelected(int position, View view) {
+ super.onSelected(position, view);
+}
+
+@Override
+public void unSelected(int position, View view) {
+ super.unSelected(position, view);
+}
+```
+
+
 ###事件
 
 ```java
diff --git a/build.gradle b/build.gradle
index 5cfc154..9cf74fe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,9 +5,8 @@ buildscript {
 jcenter()
 }
 dependencies {
- classpath 'com.android.tools.build:gradle:1.2.3'
- classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
- classpath 'com.github.dcendents:android-maven-plugin:1.2'
+ classpath 'com.android.tools.build:gradle:2.2.0'
+ classpath 'com.novoda:bintray-release:0.3.4'
 
 // NOTE: Do not place your application dependencies here; they belong
 // in the individual module build.gradle files
diff --git a/flowlayout-lib/build.gradle b/flowlayout-lib/build.gradle
index 236c418..24a0941 100644
--- a/flowlayout-lib/build.gradle
+++ b/flowlayout-lib/build.gradle
@@ -1,15 +1,13 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
+apply plugin: 'com.novoda.bintray-release'
 
-version = "1.0.3"
 android {
- compileSdkVersion 22
- buildToolsVersion "23.0.0 rc3"
+ compileSdkVersion 25
+ buildToolsVersion "25.0.3"
 
 defaultConfig {
 minSdkVersion 10
- targetSdkVersion 22
+ targetSdkVersion 25
 versionCode 1
 versionName "1.0"
 }
@@ -23,78 +21,13 @@ android {
 
 dependencies {
 compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support:appcompat-v7:22.2.1'
 }
 
-def siteUrl = 'https://github.com/hongyangAndroid/FlowLayout' // #CONFIG# // project homepage
-def gitUrl = 'https://github.com/hongyangAndroid/FlowLayout.git' // #CONFIG# // project git
-group = "com.zhy"
-
-install {
- repositories.mavenInstaller {
- // This generates POM.xml with proper parameters
- pom {
- project {
- packaging 'aar'
- name 'flowlayout' // #CONFIG# // project title
- url siteUrl
- // Set your license
- licenses {
- license {
- name 'The Apache Software License, Version 2.0'
- url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
- }
- }
- developers {
- developer {
- id 'hongyangAndroid' // #CONFIG# // your user id (you can write your nickname)
- name 'ZhangHongyang' // #CONFIG# // your user name
- email '623565791@qq.com' // #CONFIG# // your email
- }
- }
- scm {
- connection gitUrl
- developerConnection gitUrl
- url siteUrl
- }
- }
- }
- }
-}
-
-task sourcesJar(type: Jar) {
- from android.sourceSets.main.java.srcDirs
- classifier = 'sources'
-}
-
-task javadoc(type: Javadoc) {
- source = android.sourceSets.main.java.srcDirs
- classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+publish {
+ userOrg = 'hongyangandroid'//bintray.com用户名
+ groupId = 'com.hyman'//jcenter上的路径
+ artifactId = 'flowlayout-lib'//项目名称
+ publishVersion = '1.1.1'//版本号
+ desc = 'save time'
+ website = 'https://github.com/hongyangAndroid/FlowLayout'
 }
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
- classifier = 'javadoc'
- from javadoc.destinationDir
-}
-
-artifacts {
- archives javadocJar
- archives sourcesJar
-}
-
-Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
-bintray {
- user = properties.getProperty("bintray.user")
- key = properties.getProperty("bintray.apikey")
- configurations = ['archives']
- pkg {
- repo = "maven"
- name = "flowlayout" // #CONFIG# project name in jcenter
- websiteUrl = siteUrl
- vcsUrl = gitUrl
- licenses = ["Apache-2.0"]
- publish = true
- }
-}
-
diff --git a/flowlayout-lib/flowlayout-lib.iml b/flowlayout-lib/flowlayout-lib.iml
index 1f320ce..e9fa2bd 100644
--- a/flowlayout-lib/flowlayout-lib.iml
+++ b/flowlayout-lib/flowlayout-lib.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":flowlayout-lib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.zhy" external.system.module.version="1.0.3" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":flowlayout-lib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="/Volumes/Macintosh HD/Volumes/Macintosh HD/Users/zhanghongyang01/git-repo/mime/FlowLayout" external.system.id="GRADLE" external.system.module.group="com.zhy" external.system.module.version="1.0.3" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
@@ -12,10 +12,7 @@
 <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
 <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
 <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
- <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
- <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
 <aftersynctasks>
- <task>generateDebugAndroidTestSources</task>
 <task>generateDebugSources</task>
 </aftersynctasks>
 <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -29,21 +26,23 @@
 </component>
 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
 <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
- <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+ <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
 <exclude-output />
 <content url="file://$MODULE_DIR$">
 <sourcefolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+ <sourcefolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
- <sourcefolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+ <sourcefolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
- <sourcefolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -51,6 +50,15 @@
 <sourcefolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+ <sourcefolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+ <sourcefolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -58,6 +66,15 @@
 <sourcefolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+ <sourcefolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -65,37 +82,28 @@
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
 <excludefolder url="file://$MODULE_DIR$/build/docs" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/blame" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/classes" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/dex" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/lint" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/res" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
 <excludefolder url="file://$MODULE_DIR$/build/libs" />
 <excludefolder url="file://$MODULE_DIR$/build/outputs" />
- <excludefolder url="file://$MODULE_DIR$/build/poms" />
+ <excludefolder url="file://$MODULE_DIR$/build/publications" />
 <excludefolder url="file://$MODULE_DIR$/build/tmp" />
 </content>
- <orderentry type="jdk" jdkName="Android API 22 Platform (3)" jdkType="Android SDK" />
+ <orderentry type="jdk" jdkName="Android API 25 Platform (1)" jdkType="Android SDK" />
 <orderentry type="sourceFolder" forTests="false" />
- <orderentry type="library" exported="" name="support-v4-22.2.1" level="project" />
- <orderentry type="library" exported="" name="support-annotations-22.2.1" level="project" />
- <orderentry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
 </component>
 </module>
\ No newline at end of file
diff --git a/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/FlowLayout.java b/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/FlowLayout.java
index 2811100..c9553f9 100755
--- a/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/FlowLayout.java
+++ b/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/FlowLayout.java
@@ -9,8 +9,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class FlowLayout extends ViewGroup
-{
+public class FlowLayout extends ViewGroup {
 private static final String TAG = "FlowLayout";
 private static final int LEFT = -1;
 private static final int CENTER = 0;
@@ -22,27 +21,23 @@ public class FlowLayout extends ViewGroup
 private int mGravity;
 private List<view> lineViews = new ArrayList<strong>();
 
- public FlowLayout(Context context, AttributeSet attrs, int defStyle)
- {
+ public FlowLayout(Context context, AttributeSet attrs, int defStyle) {
 super(context, attrs, defStyle);
 TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.TagFlowLayout);
- mGravity = ta.getInt(R.styleable.TagFlowLayout_gravity,LEFT);
+ mGravity = ta.getInt(R.styleable.TagFlowLayout_gravity, LEFT);
 ta.recycle();
 }
 
- public FlowLayout(Context context, AttributeSet attrs)
- {
+ public FlowLayout(Context context, AttributeSet attrs) {
 this(context, attrs, 0);
 }
 
- public FlowLayout(Context context)
- {
+ public FlowLayout(Context context) {
 this(context, null);
 }
 
 @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
- {
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 int sizeWidth = MeasureSpec.getSize(widthMeasureSpec);
 int modeWidth = MeasureSpec.getMode(widthMeasureSpec);
 int sizeHeight = MeasureSpec.getSize(heightMeasureSpec);
@@ -57,13 +52,10 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
 
 int cCount = getChildCount();
 
- for (int i = 0; i < cCount; i++) - { + for (int i = 0; i < cCount; i++) { View child = getChildAt(i); - if (child.getVisibility() == View.GONE) - { - if (i == cCount - 1) - { + if (child.getVisibility() == View.GONE) { + if (i == cCount - 1) { width = Math.max(lineWidth, width); height += lineHeight; } @@ -78,19 +70,16 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) int childHeight = child.getMeasuredHeight() + lp.topMargin + lp.bottomMargin; - if (lineWidth + childWidth> sizeWidth - getPaddingLeft() - getPaddingRight())
- {
+ if (lineWidth + childWidth> sizeWidth - getPaddingLeft() - getPaddingRight()) {
 width = Math.max(width, lineWidth);
 lineWidth = childWidth;
 height += lineHeight;
 lineHeight = childHeight;
- } else
- {
+ } else {
 lineWidth += childWidth;
 lineHeight = Math.max(lineHeight, childHeight);
 }
- if (i == cCount - 1)
- {
+ if (i == cCount - 1) {
 width = Math.max(lineWidth, width);
 height += lineHeight;
 }
@@ -105,8 +94,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
 
 
 @Override
- protected void onLayout(boolean changed, int l, int t, int r, int b)
- {
+ protected void onLayout(boolean changed, int l, int t, int r, int b) {
 mAllViews.clear();
 mLineHeight.clear();
 mLineWidth.clear();
@@ -119,8 +107,7 @@ protected void onLayout(boolean changed, int l, int t, int r, int b)
 
 int cCount = getChildCount();
 
- for (int i = 0; i < cCount; i++) - { + for (int i = 0; i < cCount; i++) { View child = getChildAt(i); if (child.getVisibility() == View.GONE) continue; MarginLayoutParams lp = (MarginLayoutParams) child @@ -129,8 +116,7 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) int childWidth = child.getMeasuredWidth(); int childHeight = child.getMeasuredHeight(); - if (childWidth + lineWidth + lp.leftMargin + lp.rightMargin> width - getPaddingLeft() - getPaddingRight())
- {
+ if (childWidth + lineWidth + lp.leftMargin + lp.rightMargin> width - getPaddingLeft() - getPaddingRight()) {
 mLineHeight.add(lineHeight);
 mAllViews.add(lineViews);
 mLineWidth.add(lineWidth);
@@ -150,36 +136,32 @@ protected void onLayout(boolean changed, int l, int t, int r, int b)
 mAllViews.add(lineViews);
 
 
-
 int left = getPaddingLeft();
 int top = getPaddingTop();
 
 int lineNum = mAllViews.size();
 
- for (int i = 0; i < lineNum; i++) - { + for (int i = 0; i < lineNum; i++) { lineViews = mAllViews.get(i); lineHeight = mLineHeight.get(i); // set gravity int currentLineWidth = this.mLineWidth.get(i); - switch (this.mGravity){ + switch (this.mGravity) { case LEFT: left = getPaddingLeft(); break; case CENTER: - left = (width - currentLineWidth)/2+getPaddingLeft(); + left = (width - currentLineWidth) / 2 + getPaddingLeft(); break; case RIGHT: left = width - currentLineWidth + getPaddingLeft(); break; } - for (int j = 0; j < lineViews.size(); j++) - { + for (int j = 0; j < lineViews.size(); j++) { View child = lineViews.get(j); - if (child.getVisibility() == View.GONE) - { + if (child.getVisibility() == View.GONE) { continue; } @@ -202,20 +184,17 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) } @Override - public LayoutParams generateLayoutParams(AttributeSet attrs) - { + public LayoutParams generateLayoutParams(AttributeSet attrs) { return new MarginLayoutParams(getContext(), attrs); } @Override - protected LayoutParams generateDefaultLayoutParams() - { + protected LayoutParams generateDefaultLayoutParams() { return new MarginLayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); } @Override - protected LayoutParams generateLayoutParams(LayoutParams p) - { + protected LayoutParams generateLayoutParams(LayoutParams p) { return new MarginLayoutParams(p); } } diff --git a/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/TagAdapter.java b/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/TagAdapter.java index b05f850..61b73a1 100644 --- a/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/TagAdapter.java +++ b/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/TagAdapter.java @@ -1,5 +1,6 @@ package com.zhy.view.flowlayout; +import android.util.Log; import android.view.View; @@ -9,79 +10,80 @@ import java.util.List; import java.util.Set; -public abstract class TagAdapter<t>
-{
+public abstract class TagAdapter<t> {
 private List<t> mTagDatas;
 private OnDataChangedListener mOnDataChangedListener;
+ @Deprecated
 private HashSet<integer> mCheckedPosList = new HashSet<integer>();
 
- public TagAdapter(List<t> datas)
- {
+ public TagAdapter(List<t> datas) {
 mTagDatas = datas;
 }
 
- public TagAdapter(T[] datas)
- {
+ @Deprecated
+ public TagAdapter(T[] datas) {
 mTagDatas = new ArrayList<t>(Arrays.asList(datas));
 }
 
- interface OnDataChangedListener
- {
+ interface OnDataChangedListener {
 void onChanged();
 }
 
- void setOnDataChangedListener(OnDataChangedListener listener)
- {
+ void setOnDataChangedListener(OnDataChangedListener listener) {
 mOnDataChangedListener = listener;
 }
 
- public void setSelectedList(int... poses)
- {
+ @Deprecated
+ public void setSelectedList(int... poses) {
 Set<integer> set = new HashSet<strong>();
- for (int pos : poses)
- {
+ for (int pos : poses) {
 set.add(pos);
 }
 setSelectedList(set);
 }
 
- public void setSelectedList(Set<integer> set)
- {
+ @Deprecated
+ public void setSelectedList(Set<integer> set) {
 mCheckedPosList.clear();
- if (set != null)
+ if (set != null) {
 mCheckedPosList.addAll(set);
+ }
 notifyDataChanged();
 }
 
- HashSet<integer> getPreCheckedList()
- {
+ @Deprecated
+ HashSet<integer> getPreCheckedList() {
 return mCheckedPosList;
 }
 
 
- public int getCount()
- {
+ public int getCount() {
 return mTagDatas == null ? 0 : mTagDatas.size();
 }
 
- public void notifyDataChanged()
- { 
- if(mOnDataChangedListener != null)
+ public void notifyDataChanged() {
+ if (mOnDataChangedListener != null)
 mOnDataChangedListener.onChanged();
 }
 
- public T getItem(int position)
- {
+ public T getItem(int position) {
 return mTagDatas.get(position);
 }
 
 public abstract View getView(FlowLayout parent, int position, T t);
 
- public boolean setSelected(int position, T t)
- {
- return false;
+
+ public void onSelected(int position, View view){
+ Log.d("zhy","onSelected " + position);
 }
 
+ public void unSelected(int position, View view){
+ Log.d("zhy","unSelected " + position);
+ }
+
+ public boolean setSelected(int position, T t) {
+ return false;
+ }
 
 
 }
diff --git a/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/TagFlowLayout.java b/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/TagFlowLayout.java
index d63980d..ba90897 100644
--- a/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/TagFlowLayout.java
+++ b/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/TagFlowLayout.java
@@ -10,6 +10,8 @@
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -18,234 +20,179 @@
 /**
 * Created by zhy on 15/9/10.
 */
-public class TagFlowLayout extends FlowLayout implements TagAdapter.OnDataChangedListener
-{
+public class TagFlowLayout extends FlowLayout
+ implements TagAdapter.OnDataChangedListener {
+
 private TagAdapter mTagAdapter;
- private boolean mAutoSelectEffect = true;
 private int mSelectedMax = -1;//-1为不限制数量
 private static final String TAG = "TagFlowLayout";
- private MotionEvent mMotionEvent;
 
 private Set<integer> mSelectedView = new HashSet<integer>();
 
+ private OnSelectListener mOnSelectListener;
+ private OnTagClickListener mOnTagClickListener;
 
- public TagFlowLayout(Context context, AttributeSet attrs, int defStyle)
- {
+ public interface OnSelectListener {
+ void onSelected(Set<integer> selectPosSet);
+ }
+
+ public interface OnTagClickListener {
+ boolean onTagClick(View view, int position, FlowLayout parent);
+ }
+
+ public TagFlowLayout(Context context, AttributeSet attrs, int defStyle) {
 super(context, attrs, defStyle);
 TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.TagFlowLayout);
- mAutoSelectEffect = ta.getBoolean(R.styleable.TagFlowLayout_auto_select_effect, true);
 mSelectedMax = ta.getInt(R.styleable.TagFlowLayout_max_select, -1);
 ta.recycle();
-
- if (mAutoSelectEffect)
- {
- setClickable(true);
- }
 }
 
- public TagFlowLayout(Context context, AttributeSet attrs)
- {
+ public TagFlowLayout(Context context, AttributeSet attrs) {
 this(context, attrs, 0);
 }
 
- public TagFlowLayout(Context context)
- {
+ public TagFlowLayout(Context context) {
 this(context, null);
 }
 
 
 @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
- {
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 int cCount = getChildCount();
-
- for (int i = 0; i < cCount; i++) - { + for (int i = 0; i < cCount; i++) { TagView tagView = (TagView) getChildAt(i); - if (tagView.getVisibility() == View.GONE) continue; - if (tagView.getTagView().getVisibility() == View.GONE) - { + if (tagView.getVisibility() == View.GONE) { + continue; + } + if (tagView.getTagView().getVisibility() == View.GONE) { tagView.setVisibility(View.GONE); } } super.onMeasure(widthMeasureSpec, heightMeasureSpec); } - public interface OnSelectListener - { - void onSelected(Set<integer> selectPosSet);
- }
-
- private OnSelectListener mOnSelectListener;
 
- public void setOnSelectListener(OnSelectListener onSelectListener)
- {
+ public void setOnSelectListener(OnSelectListener onSelectListener) {
 mOnSelectListener = onSelectListener;
- if (mOnSelectListener != null) setClickable(true);
 }
 
- public interface OnTagClickListener
- {
- boolean onTagClick(View view, int position, FlowLayout parent);
- }
 
- private OnTagClickListener mOnTagClickListener;
-
- public void setOnTagClickListener(OnTagClickListener onTagClickListener)
- {
+ public void setOnTagClickListener(OnTagClickListener onTagClickListener) {
 mOnTagClickListener = onTagClickListener;
- if (onTagClickListener != null) setClickable(true);
 }
 
-
- public void setAdapter(TagAdapter adapter)
- {
+ public void setAdapter(TagAdapter adapter) {
 mTagAdapter = adapter;
 mTagAdapter.setOnDataChangedListener(this);
 mSelectedView.clear();
 changeAdapter();
-
 }
 
- private void changeAdapter()
- {
+ @SuppressWarnings("ResourceType")
+ private void changeAdapter() {
 removeAllViews();
 TagAdapter adapter = mTagAdapter;
 TagView tagViewContainer = null;
 HashSet preCheckedList = mTagAdapter.getPreCheckedList();
- for (int i = 0; i < adapter.getCount(); i++) - { + for (int i = 0; i < adapter.getCount(); i++) { View tagView = adapter.getView(this, i, adapter.getItem(i)); tagViewContainer = new TagView(getContext()); -// ViewGroup.MarginLayoutParams clp = (ViewGroup.MarginLayoutParams) tagView.getLayoutParams(); -// ViewGroup.MarginLayoutParams lp = new ViewGroup.MarginLayoutParams(clp); -// lp.width = ViewGroup.LayoutParams.WRAP_CONTENT; -// lp.height = ViewGroup.LayoutParams.WRAP_CONTENT; -// lp.topMargin = clp.topMargin; -// lp.bottomMargin = clp.bottomMargin; -// lp.leftMargin = clp.leftMargin; -// lp.rightMargin = clp.rightMargin; tagView.setDuplicateParentStateEnabled(true); - if (tagView.getLayoutParams() != null) - { + if (tagView.getLayoutParams() != null) { tagViewContainer.setLayoutParams(tagView.getLayoutParams()); - } else - { - MarginLayoutParams lp = new MarginLayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); + + + } else { + MarginLayoutParams lp = new MarginLayoutParams( + LayoutParams.WRAP_CONTENT, + LayoutParams.WRAP_CONTENT); lp.setMargins(dip2px(getContext(), 5), dip2px(getContext(), 5), dip2px(getContext(), 5), dip2px(getContext(), 5)); tagViewContainer.setLayoutParams(lp); } - tagView.setLayoutParams(new FrameLayout.LayoutParams(tagView.getLayoutParams().width, - tagView.getLayoutParams().height)); + LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); + tagView.setLayoutParams(lp); tagViewContainer.addView(tagView); addView(tagViewContainer); - - if (preCheckedList.contains(i)) - { - tagViewContainer.setChecked(true); + if (preCheckedList.contains(i)) { + setChildChecked(i, tagViewContainer); } - if (mTagAdapter.setSelected(i, adapter.getItem(i))) - { - mSelectedView.add(i); - tagViewContainer.setChecked(true); + if (mTagAdapter.setSelected(i, adapter.getItem(i))) { + setChildChecked(i, tagViewContainer); } + tagView.setClickable(false); + final TagView finalTagViewContainer = tagViewContainer; + final int position = i; + tagViewContainer.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + doSelect(finalTagViewContainer, position); + if (mOnTagClickListener != null) { + mOnTagClickListener.onTagClick(finalTagViewContainer, position, + TagFlowLayout.this); + } + } + }); } mSelectedView.addAll(preCheckedList); - - } - - - @Override - public boolean onTouchEvent(MotionEvent event) - { - if (event.getAction() == MotionEvent.ACTION_UP) - { - mMotionEvent = MotionEvent.obtain(event); - } - return super.onTouchEvent(event); } - @Override - public boolean performClick() - { - if (mMotionEvent == null) return super.performClick(); - - int x = (int) mMotionEvent.getX(); - int y = (int) mMotionEvent.getY(); - mMotionEvent = null; - - TagView child = findChild(x, y); - int pos = findPosByView(child); - if (child != null) - { - doSelect(child, pos); - if (mOnTagClickListener != null) - { - return mOnTagClickListener.onTagClick(child.getTagView(), pos, this); - } - } - return true; - } - - - public void setMaxSelectCount(int count) - { - if (mSelectedView.size()> count)
- {
+ public void setMaxSelectCount(int count) {
+ if (mSelectedView.size()> count) {
 Log.w(TAG, "you has already select more than " + count + " views , so it will be clear .");
 mSelectedView.clear();
 }
 mSelectedMax = count;
 }
 
- public Set<integer> getSelectedList()
- {
+ public Set<integer> getSelectedList() {
 return new HashSet<integer>(mSelectedView);
 }
 
- private void doSelect(TagView child, int position)
- {
- if (mAutoSelectEffect)
- {
- if (!child.isChecked())
- {
- //处理max_select=1的情况
- if (mSelectedMax == 1 && mSelectedView.size() == 1)
- {
- Iterator<integer> iterator = mSelectedView.iterator();
- Integer preIndex = iterator.next();
- TagView pre = (TagView) getChildAt(preIndex);
- pre.setChecked(false);
- child.setChecked(true);
- mSelectedView.remove(preIndex);
- mSelectedView.add(position);
- } else
- {
- if (mSelectedMax> 0 && mSelectedView.size()>= mSelectedMax)
- return;
- child.setChecked(true);
- mSelectedView.add(position);
+ private void setChildChecked(int position, TagView view) {
+ view.setChecked(true);
+ mTagAdapter.onSelected(position, view.getTagView());
+ }
+
+ private void setChildUnChecked(int position, TagView view) {
+ view.setChecked(false);
+ mTagAdapter.unSelected(position, view.getTagView());
+ }
+
+ private void doSelect(TagView child, int position) {
+ if (!child.isChecked()) {
+ //处理max_select=1的情况
+ if (mSelectedMax == 1 && mSelectedView.size() == 1) {
+ Iterator<integer> iterator = mSelectedView.iterator();
+ Integer preIndex = iterator.next();
+ TagView pre = (TagView) getChildAt(preIndex);
+ setChildUnChecked(preIndex, pre);
+ setChildChecked(position, child);
+
+ mSelectedView.remove(preIndex);
+ mSelectedView.add(position);
+ } else {
+ if (mSelectedMax> 0 && mSelectedView.size()>= mSelectedMax) {
+ return;
 }
- } else
- {
- child.setChecked(false);
- mSelectedView.remove(position);
- }
- if (mOnSelectListener != null)
- {
- mOnSelectListener.onSelected(new HashSet<integer>(mSelectedView));
+ setChildChecked(position, child);
+ mSelectedView.add(position);
 }
+ } else {
+ setChildUnChecked(position, child);
+ mSelectedView.remove(position);
+ }
+ if (mOnSelectListener != null) {
+ mOnSelectListener.onSelected(new HashSet<integer>(mSelectedView));
 }
 }
 
- public TagAdapter getAdapter()
- {
+ public TagAdapter getAdapter() {
 return mTagAdapter;
 }
 
@@ -255,16 +202,13 @@ public TagAdapter getAdapter()
 
 
 @Override
- protected Parcelable onSaveInstanceState()
- {
+ protected Parcelable onSaveInstanceState() {
 Bundle bundle = new Bundle();
 bundle.putParcelable(KEY_DEFAULT, super.onSaveInstanceState());
 
 String selectPos = "";
- if (mSelectedView.size()> 0)
- {
- for (int key : mSelectedView)
- {
+ if (mSelectedView.size()> 0) {
+ for (int key : mSelectedView) {
 selectPos += key + "&#124;";
 }
 selectPos = selectPos.substring(0, selectPos.length() - 1);
@@ -274,23 +218,20 @@ protected Parcelable onSaveInstanceState()
 }
 
 @Override
- protected void onRestoreInstanceState(Parcelable state)
- {
- if (state instanceof Bundle)
- {
+ protected void onRestoreInstanceState(Parcelable state) {
+ if (state instanceof Bundle) {
 Bundle bundle = (Bundle) state;
 String mSelectPos = bundle.getString(KEY_CHOOSE_POS);
- if (!TextUtils.isEmpty(mSelectPos))
- {
+ if (!TextUtils.isEmpty(mSelectPos)) {
 String[] split = mSelectPos.split("\\&#124;");
- for (String pos : split)
- {
+ for (String pos : split) {
 int index = Integer.parseInt(pos);
 mSelectedView.add(index);
 
 TagView tagView = (TagView) getChildAt(index);
- if (tagView != null)
- tagView.setChecked(true);
+ if (tagView != null) {
+ setChildChecked(index, tagView);
+ }
 }
 
 }
@@ -300,43 +241,14 @@ protected void onRestoreInstanceState(Parcelable state)
 super.onRestoreInstanceState(state);
 }
 
- private int findPosByView(View child)
- {
- final int cCount = getChildCount();
- for (int i = 0; i < cCount; i++) - { - View v = getChildAt(i); - if (v == child) return i; - } - return -1; - } - - private TagView findChild(int x, int y) - { - final int cCount = getChildCount(); - for (int i = 0; i < cCount; i++) - { - TagView v = (TagView) getChildAt(i); - if (v.getVisibility() == View.GONE) continue; - Rect outRect = new Rect(); - v.getHitRect(outRect); - if (outRect.contains(x, y)) - { - return v; - } - } - return null; - } @Override - public void onChanged() - { + public void onChanged() { mSelectedView.clear(); changeAdapter(); } - public static int dip2px(Context context, float dpValue) - { + public static int dip2px(Context context, float dpValue) { final float scale = context.getResources().getDisplayMetrics().density; return (int) (dpValue * scale + 0.5f); } diff --git a/flowlayout-lib/src/main/res/values/attrs.xml b/flowlayout-lib/src/main/res/values/attrs.xml index b887d20..0bce3c5 100644 --- a/flowlayout-lib/src/main/res/values/attrs.xml +++ b/flowlayout-lib/src/main/res/values/attrs.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
 <resources>
 <declare-styleable name="TagFlowLayout">
- <attr name="auto_select_effect" format="boolean"></attr>
 <attr name="max_select" format="integer"></attr>
 <attr name="gravity">
 <enum name="left" value="-1" />
diff --git a/flowlayout/build.gradle b/flowlayout/build.gradle
index da34a8c..97325f6 100644
--- a/flowlayout/build.gradle
+++ b/flowlayout/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
- compileSdkVersion 22
- buildToolsVersion "23.0.0 rc3"
+ compileSdkVersion 25
+ buildToolsVersion "25.0.3"
 
 defaultConfig {
 applicationId "com.zhy.flowlayout"
 minSdkVersion 10
- targetSdkVersion 22
+ targetSdkVersion 25
 versionCode 1
 versionName "1.0"
 }
@@ -21,8 +21,8 @@ android {
 
 dependencies {
 compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support:appcompat-v7:22.2.1'
+ compile 'com.android.support:appcompat-v7:25.3.0'
 compile project(':flowlayout-lib')
- compile 'com.android.support:design:22.2.0'
+ compile 'com.android.support:design:25.3.0'
 compile 'com.zhy:base-adapter:2.0.1'
 }
diff --git a/flowlayout/flowlayout.iml b/flowlayout/flowlayout.iml
index 5a59941..f71cb50 100644
--- a/flowlayout/flowlayout.iml
+++ b/flowlayout/flowlayout.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":flowlayout" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Github-FlowLayout" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":flowlayout" external.linked.project.path="$MODULE_DIR$" external.root.project.path="/Volumes/Macintosh HD/Volumes/Macintosh HD/Users/zhanghongyang01/git-repo/mime/FlowLayout" external.system.id="GRADLE" external.system.module.group="Github-FlowLayout" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
@@ -12,10 +12,7 @@
 <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
 <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
 <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
- <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
- <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
 <aftersynctasks>
- <task>generateDebugAndroidTestSources</task>
 <task>generateDebugSources</task>
 </aftersynctasks>
 <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,21 +25,23 @@
 </component>
 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
 <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
- <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+ <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
 <exclude-output />
 <content url="file://$MODULE_DIR$">
 <sourcefolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+ <sourcefolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
- <sourcefolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+ <sourcefolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
 <sourcefolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
- <sourcefolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -50,6 +49,15 @@
 <sourcefolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+ <sourcefolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+ <sourcefolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -57,6 +65,15 @@
 <sourcefolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+ <sourcefolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -64,41 +81,53 @@
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/assets" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/blame" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/classes" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/dex" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.0/jars" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.2.0/jars" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.3.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/25.3.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/25.3.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/25.3.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/25.3.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/25.3.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/25.3.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/25.3.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.3.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.3.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/transition/25.3.0/jars" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.zhy/base-adapter/2.0.1/jars" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/libs" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/res" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
 <excludefolder url="file://$MODULE_DIR$/build/outputs" />
 <excludefolder url="file://$MODULE_DIR$/build/tmp" />
 </content>
- <orderentry type="jdk" jdkName="Android API 22 Platform (3)" jdkType="Android SDK" />
+ <orderentry type="jdk" jdkName="Android API 25 Platform (1)" jdkType="Android SDK" />
 <orderentry type="sourceFolder" forTests="false" />
- <orderentry type="library" exported="" name="support-v4-23.2.0" level="project" />
- <orderentry type="library" exported="" name="recyclerview-v7-23.2.0" level="project" />
- <orderentry type="library" exported="" name="design-22.2.0" level="project" />
- <orderentry type="library" exported="" name="support-annotations-23.2.0" level="project" />
 <orderentry type="library" exported="" name="base-adapter-2.0.1" level="project" />
- <orderentry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
+ <orderentry type="library" exported="" name="design-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="transition-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="support-compat-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="support-v4-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="support-media-compat-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="support-core-ui-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="recyclerview-v7-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="support-core-utils-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="appcompat-v7-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="support-fragment-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="animated-vector-drawable-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="support-annotations-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="support-vector-drawable-25.3.0" level="project" />
 <orderentry type="module" module-name="flowlayout-lib" exported="" />
 </component>
 </module>
\ No newline at end of file
diff --git a/flowlayout/src/main/java/com/zhy/flowlayout/SimpleFragment.java b/flowlayout/src/main/java/com/zhy/flowlayout/SimpleFragment.java
index c1068c9..ec2d723 100644
--- a/flowlayout/src/main/java/com/zhy/flowlayout/SimpleFragment.java
+++ b/flowlayout/src/main/java/com/zhy/flowlayout/SimpleFragment.java
@@ -7,6 +7,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.zhy.view.flowlayout.FlowLayout;
 import com.zhy.view.flowlayout.TagAdapter;
@@ -15,8 +16,7 @@
 /**
 * Created by zhy on 15/9/10.
 */
-public class SimpleFragment extends Fragment
-{
+public class SimpleFragment extends Fragment {
 private String[] mVals = new String[]
 {"Hello", "Android", "Weclome Hi ", "Button", "TextView", "Hello",
 "Android", "Weclome", "Button ImageView", "TextView", "Helloworld",
@@ -26,27 +26,30 @@ public class SimpleFragment extends Fragment
 
 @Nullable
 @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
- {
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 return inflater.inflate(R.layout.fragment_event_test, container, false);
 }
 
 @Override
- public void onViewCreated(View view, @Nullable Bundle savedInstanceState)
- {
+ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
 final LayoutInflater mInflater = LayoutInflater.from(getActivity());
 mFlowLayout = (TagFlowLayout) view.findViewById(R.id.id_flowlayout);
+ mFlowLayout.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Toast.makeText(getActivity(), "FlowLayout Clicked", Toast.LENGTH_SHORT).show();
+ }
+ });
 
- mFlowLayout.setAdapter(new TagAdapter<string>(mVals)
- {
+ mFlowLayout.setAdapter(new TagAdapter<string>(mVals) {
 @Override
- public View getView(FlowLayout parent, int position, String s)
- {
+ public View getView(FlowLayout parent, int position, String s) {
 TextView tv = (TextView) mInflater.inflate(R.layout.tv,
 mFlowLayout, false);
 tv.setText(s);
 return tv;
 }
+
 });
 }
 }
diff --git a/flowlayout/src/main/res/layout/activity_category.xml b/flowlayout/src/main/res/layout/activity_category.xml
index af0debb..cc13802 100644
--- a/flowlayout/src/main/res/layout/activity_category.xml
+++ b/flowlayout/src/main/res/layout/activity_category.xml
@@ -13,7 +13,7 @@
 app:tabGravity="fill"
 android:background="#ffffff"
 app:tabIndicatorColor="#0ddcff"
- app:tabMode="fixed"
+ app:tabMode="scrollable"
 app:tabSelectedTextColor="#0ddcff"
 app:tabTextColor="#000000"/>
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ff2ac0e..b6cbdd5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Sep 30 14:01:04 GMT+08:00 2015
+#Tue Sep 12 16:51:04 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
From 0cc775f91061d9c458f83aafb35310968d357a4a Mon Sep 17 00:00:00 2001
From: zhanghongyang01 <zhanghongyang01@baidu.com>
Date: 2017年9月21日 17:28:30 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9gravity->tag=5Fgravity?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
 README.md &#124; 2 +-
 flowlayout-lib/build.gradle &#124; 2 +-
 flowlayout-lib/flowlayout-lib.iml &#124; 19 ++++++++-----------
 .../com/zhy/view/flowlayout/FlowLayout.java &#124; 2 +-
 flowlayout-lib/src/main/res/values/attrs.xml &#124; 2 +-
 flowlayout/flowlayout.iml &#124; 16 ++++++++--------
 .../layout/fragment_gravity_flow_layout.xml &#124; 6 +++---
 7 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/README.md b/README.md
index 70c6cc6..5b4a0a5 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Android流式布局,支持单选、多选等,适合用于产品标签等。
 
 ```java
 dependencies {
- compile 'com.hyman:flowlayout-lib:1.1.1'
+ compile 'com.hyman:flowlayout-lib:1.1.2'
 }
 ```
 
diff --git a/flowlayout-lib/build.gradle b/flowlayout-lib/build.gradle
index 24a0941..7f985d0 100644
--- a/flowlayout-lib/build.gradle
+++ b/flowlayout-lib/build.gradle
@@ -27,7 +27,7 @@ publish {
 userOrg = 'hongyangandroid'//bintray.com用户名
 groupId = 'com.hyman'//jcenter上的路径
 artifactId = 'flowlayout-lib'//项目名称
- publishVersion = '1.1.1'//版本号
+ publishVersion = '1.1.2'//版本号
 desc = 'save time'
 website = 'https://github.com/hongyangAndroid/FlowLayout'
 }
diff --git a/flowlayout-lib/flowlayout-lib.iml b/flowlayout-lib/flowlayout-lib.iml
index e9fa2bd..d467457 100644
--- a/flowlayout-lib/flowlayout-lib.iml
+++ b/flowlayout-lib/flowlayout-lib.iml
@@ -67,14 +67,6 @@
 <sourcefolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -83,8 +75,15 @@
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
 <excludefolder url="file://$MODULE_DIR$/build/docs" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/blame" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/classes" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -93,10 +92,8 @@
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/lint" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/res" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/rs" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
- <excludefolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
 <excludefolder url="file://$MODULE_DIR$/build/libs" />
 <excludefolder url="file://$MODULE_DIR$/build/outputs" />
diff --git a/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/FlowLayout.java b/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/FlowLayout.java
index c9553f9..d865c62 100755
--- a/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/FlowLayout.java
+++ b/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/FlowLayout.java
@@ -24,7 +24,7 @@ public class FlowLayout extends ViewGroup {
 public FlowLayout(Context context, AttributeSet attrs, int defStyle) {
 super(context, attrs, defStyle);
 TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.TagFlowLayout);
- mGravity = ta.getInt(R.styleable.TagFlowLayout_gravity, LEFT);
+ mGravity = ta.getInt(R.styleable.TagFlowLayout_tag_gravity, LEFT);
 ta.recycle();
 }
 
diff --git a/flowlayout-lib/src/main/res/values/attrs.xml b/flowlayout-lib/src/main/res/values/attrs.xml
index 0bce3c5..d1454ed 100644
--- a/flowlayout-lib/src/main/res/values/attrs.xml
+++ b/flowlayout-lib/src/main/res/values/attrs.xml
@@ -2,7 +2,7 @@
 <resources>
 <declare-styleable name="TagFlowLayout">
 <attr name="max_select" format="integer"></attr>
- <attr name="gravity">
+ <attr name="tag_gravity">
 <enum name="left" value="-1" />
 <enum name="center" value="0" />
 <enum name="right" value="1" />
diff --git a/flowlayout/flowlayout.iml b/flowlayout/flowlayout.iml
index f71cb50..3474d7e 100644
--- a/flowlayout/flowlayout.iml
+++ b/flowlayout/flowlayout.iml
@@ -66,14 +66,6 @@
 <sourcefolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/assets" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/blame" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/classes" />
diff --git a/flowlayout/src/main/res/layout/fragment_gravity_flow_layout.xml b/flowlayout/src/main/res/layout/fragment_gravity_flow_layout.xml
index 3048688..0a5aa69 100644
--- a/flowlayout/src/main/res/layout/fragment_gravity_flow_layout.xml
+++ b/flowlayout/src/main/res/layout/fragment_gravity_flow_layout.xml
@@ -16,7 +16,7 @@
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
 android:layout_marginTop="6dp"
- app:gravity="left">
+ app:tag_gravity="left">
 
 <textview android:layout_ @@ -71,7 +71,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="6dp" - app:gravity="center">
+ app:tag_gravity="center">
 
 <textview android:layout_ @@ -127,7 +127,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="6dp" - app:gravity="right">
+ app:tag_gravity="right">
 
 <textview android:layout_ From eda35152a07ece8f2da144146be4e5bc9f4d2900 Mon Sep 17 00:00:00 2001 From: EKwong <qinerjiang@banggood.com>
Date: 2018年3月20日 17:17:01 +0800
Subject: [PATCH 5/6] try to give FlowLayout an RTL function
---
 .gitignore &#124; 3 ++
 .idea/gradle.xml &#124; 6 +--
 .idea/misc.xml &#124; 15 +-----
 .idea/modules.xml &#124; 9 ++--
 FlowLayout.iml &#124; 2 +-
 flowlayout-lib/build.gradle &#124; 3 +-
 flowlayout-lib/flowlayout-lib.iml &#124; 49 ++++++++++-------
 .../com/zhy/view/flowlayout/FlowLayout.java &#124; 17 +++++-
 flowlayout/flowlayout.iml &#124; 54 +++++++++----------
 9 files changed, 85 insertions(+), 73 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9c4de58..31df7f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@
 .DS_Store
 /build
 /captures
+/.idea/inspectionProfiles/
+/.idea/smartfox_info.xml
+
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ff65e73..25e8f3d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,9 +7,9 @@
 <option name="externalProjectPath" value="$PROJECT_DIR$" />
 <option name="modules">
 <set>
- <option value="$USER_HOME$/git-repo/mime/FlowLayout" />
- <option value="$USER_HOME$/git-repo/mime/FlowLayout/flowlayout" />
- <option value="$USER_HOME$/git-repo/mime/FlowLayout/flowlayout-lib" />
+ <option value="$PROJECT_DIR$" />
+ <option value="$PROJECT_DIR$/flowlayout" />
+ <option value="$PROJECT_DIR$/flowlayout-lib" />
 </set>
 </option>
 <option name="resolveModulePerSourceSet" value="false" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index cca2cda..cc72de3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
- <component name="EntryPointsManager">
- <entry_points version="2.0" />
- </component>
 <component name="NullableNotNullManager">
 <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
 <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -27,17 +24,7 @@
 </value>
 </option>
 </component>
- <component name="ProjectLevelVcsManager" settingsEditedManually="false">
- <optionssetting value="true" id="Add" />
- <optionssetting value="true" id="Remove" />
- <optionssetting value="true" id="Checkout" />
- <optionssetting value="true" id="Update" />
- <optionssetting value="true" id="Status" />
- <optionssetting value="true" id="Edit" />
- <confirmationssetting value="0" id="Add" />
- <confirmationssetting value="0" id="Remove" />
- </component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
 <output url="file://$PROJECT_DIR$/build/classes" />
 </component>
 <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index e744d2b..4fb344c 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,12 @@
 <project version="4">
 <component name="ProjectModuleManager">
 <modules>
- <module fileurl="file://$USER_HOME$/git-repo/mime/FlowLayout/FlowLayout.iml" filepath="$USER_HOME$/git-repo/mime/FlowLayout/FlowLayout.iml" />
- <module fileurl="file://$USER_HOME$/git-repo/mime/FlowLayout/flowlayout/flowlayout.iml" filepath="$USER_HOME$/git-repo/mime/FlowLayout/flowlayout/flowlayout.iml" />
- <module fileurl="file://$USER_HOME$/git-repo/mime/FlowLayout/flowlayout-lib/flowlayout-lib.iml" filepath="$USER_HOME$/git-repo/mime/FlowLayout/flowlayout-lib/flowlayout-lib.iml" />
+ <module fileurl="file://$PROJECT_DIR$/FlowLayout.iml" filepath="$PROJECT_DIR$/FlowLayout.iml" />
+ <module fileurl="file://C:\Users\erkang\git-repo\mime\FlowLayout\FlowLayout.iml" filepath="C:\Users\erkang\git-repo\mime\FlowLayout\FlowLayout.iml" />
+ <module fileurl="file://$PROJECT_DIR$/flowlayout/flowlayout.iml" filepath="$PROJECT_DIR$/flowlayout/flowlayout.iml" />
+ <module fileurl="file://C:\Users\erkang\git-repo\mime\FlowLayout\flowlayout\flowlayout.iml" filepath="C:\Users\erkang\git-repo\mime\FlowLayout\flowlayout\flowlayout.iml" />
+ <module fileurl="file://$PROJECT_DIR$/flowlayout-lib/flowlayout-lib.iml" filepath="$PROJECT_DIR$/flowlayout-lib/flowlayout-lib.iml" />
+ <module fileurl="file://C:\Users\erkang\git-repo\mime\FlowLayout\flowlayout-lib\flowlayout-lib.iml" filepath="C:\Users\erkang\git-repo\mime\FlowLayout\flowlayout-lib\flowlayout-lib.iml" />
 </modules>
 </component>
 </project>
\ No newline at end of file
diff --git a/FlowLayout.iml b/FlowLayout.iml
index 9df424a..2046591 100644
--- a/FlowLayout.iml
+++ b/FlowLayout.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="FlowLayout" external.linked.project.path="$MODULE_DIR$" external.root.project.path="/Volumes/Macintosh HD/Volumes/Macintosh HD/Users/zhanghongyang01/git-repo/mime/FlowLayout" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="FlowLayout" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="java-gradle" name="Java-Gradle">
 <configuration>
diff --git a/flowlayout-lib/build.gradle b/flowlayout-lib/build.gradle
index 7f985d0..31ef8a6 100644
--- a/flowlayout-lib/build.gradle
+++ b/flowlayout-lib/build.gradle
@@ -20,7 +20,8 @@ android {
 }
 
 dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
+ compile fileTree(include: ['*.jar'], dir: 'libs')
+ compile 'com.android.support:support-v4:25.0.0'
 }
 
 publish {
diff --git a/flowlayout-lib/flowlayout-lib.iml b/flowlayout-lib/flowlayout-lib.iml
index d467457..3f22574 100644
--- a/flowlayout-lib/flowlayout-lib.iml
+++ b/flowlayout-lib/flowlayout-lib.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":flowlayout-lib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="/Volumes/Macintosh HD/Volumes/Macintosh HD/Users/zhanghongyang01/git-repo/mime/FlowLayout" external.system.id="GRADLE" external.system.module.group="com.zhy" external.system.module.version="1.0.3" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":flowlayout-lib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
@@ -9,7 +9,6 @@
 <facet type="android" name="Android">
 <configuration>
 <option name="SELECTED_BUILD_VARIANT" value="debug" />
- <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
 <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
 <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
 <aftersynctasks>
@@ -20,11 +19,11 @@
 <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
 <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
 <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
- <option name="LIBRARY_PROJECT" value="true" />
+ <option name="PROJECT_TYPE" value="1" />
 </configuration>
 </facet>
 </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
 <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
 <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
 <exclude-output />
@@ -48,7 +47,6 @@
 <sourcefolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
- <sourcefolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
@@ -56,7 +54,6 @@
 <sourcefolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
@@ -64,43 +61,55 @@
 <sourcefolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourcefolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
- <sourcefolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
- <sourcefolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
- <sourcefolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
- <sourcefolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
- <excludefolder url="file://$MODULE_DIR$/build/docs" />
+ <sourcefolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/blame" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/classes" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/25.0.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/25.0.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/25.0.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/25.0.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/25.0.0/jars" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.0.0/jars" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/lint" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/res" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/rs" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
- <excludefolder url="file://$MODULE_DIR$/build/libs" />
+ <excludefolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
 <excludefolder url="file://$MODULE_DIR$/build/outputs" />
- <excludefolder url="file://$MODULE_DIR$/build/publications" />
 <excludefolder url="file://$MODULE_DIR$/build/tmp" />
 </content>
- <orderentry type="jdk" jdkName="Android API 25 Platform (1)" jdkType="Android SDK" />
+ <orderentry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
 <orderentry type="sourceFolder" forTests="false" />
+ <orderentry type="library" exported="" name="com.android.support:support-fragment-25.0.0" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:support-annotations:25.0.0@jar" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:support-media-compat-25.0.0" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:support-core-ui-25.0.0" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:support-compat-25.0.0" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:support-core-utils-25.0.0" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:support-v4-25.0.0" level="project" />
 </component>
 </module>
\ No newline at end of file
diff --git a/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/FlowLayout.java b/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/FlowLayout.java
index d865c62..48f4c9d 100755
--- a/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/FlowLayout.java
+++ b/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/FlowLayout.java
@@ -3,11 +3,15 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
+import android.util.LayoutDirection;
 import android.view.View;
 import android.view.ViewGroup;
+import android.support.v4.text.TextUtilsCompat;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 
 public class FlowLayout extends ViewGroup {
 private static final String TAG = "FlowLayout";
@@ -25,6 +29,14 @@ public FlowLayout(Context context, AttributeSet attrs, int defStyle) {
 super(context, attrs, defStyle);
 TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.TagFlowLayout);
 mGravity = ta.getInt(R.styleable.TagFlowLayout_tag_gravity, LEFT);
+ int layoutDirection = TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault());
+ if (layoutDirection == LayoutDirection.RTL) {
+ if (mGravity == LEFT) {
+ mGravity = RIGHT;
+ } else {
+ mGravity = LEFT;
+ }
+ }
 ta.recycle();
 }
 
@@ -155,7 +167,10 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
 left = (width - currentLineWidth) / 2 + getPaddingLeft();
 break;
 case RIGHT:
- left = width - currentLineWidth + getPaddingLeft();
+ // 适配了rtl,需要补偿一个padding值
+ left = width - currentLineWidth + getPaddingLeft() - getPaddingLeft();
+ // 适配了rtl,需要把lineViews里面的数组倒序排
+ Collections.reverse(lineViews);
 break;
 }
 
diff --git a/flowlayout/flowlayout.iml b/flowlayout/flowlayout.iml
index 3474d7e..33086c4 100644
--- a/flowlayout/flowlayout.iml
+++ b/flowlayout/flowlayout.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":flowlayout" external.linked.project.path="$MODULE_DIR$" external.root.project.path="/Volumes/Macintosh HD/Volumes/Macintosh HD/Users/zhanghongyang01/git-repo/mime/FlowLayout" external.system.id="GRADLE" external.system.module.group="Github-FlowLayout" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":flowlayout" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
@@ -9,7 +9,6 @@
 <facet type="android" name="Android">
 <configuration>
 <option name="SELECTED_BUILD_VARIANT" value="debug" />
- <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
 <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
 <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
 <aftersynctasks>
@@ -23,7 +22,7 @@
 </configuration>
 </facet>
 </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
 <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
 <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
 <exclude-output />
@@ -47,7 +46,6 @@
 <sourcefolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
- <sourcefolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
@@ -55,7 +53,6 @@
 <sourcefolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
@@ -63,25 +60,22 @@
 <sourcefolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourcefolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
 <sourcefolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
- <sourcefolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
- <sourcefolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
- <sourcefolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
- <sourcefolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
 <sourcefolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourcefolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
 <sourcefolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+ <sourcefolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+ <sourcefolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/assets" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/blame" />
 <excludefolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -112,22 +106,22 @@
 <excludefolder url="file://$MODULE_DIR$/build/outputs" />
 <excludefolder url="file://$MODULE_DIR$/build/tmp" />
 </content>
- <orderentry type="jdk" jdkName="Android API 25 Platform (1)" jdkType="Android SDK" />
+ <orderentry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
 <orderentry type="sourceFolder" forTests="false" />
- <orderentry type="library" exported="" name="base-adapter-2.0.1" level="project" />
- <orderentry type="library" exported="" name="design-25.3.0" level="project" />
- <orderentry type="library" exported="" name="transition-25.3.0" level="project" />
- <orderentry type="library" exported="" name="support-compat-25.3.0" level="project" />
- <orderentry type="library" exported="" name="support-v4-25.3.0" level="project" />
- <orderentry type="library" exported="" name="support-media-compat-25.3.0" level="project" />
- <orderentry type="library" exported="" name="support-core-ui-25.3.0" level="project" />
- <orderentry type="library" exported="" name="recyclerview-v7-25.3.0" level="project" />
- <orderentry type="library" exported="" name="support-core-utils-25.3.0" level="project" />
- <orderentry type="library" exported="" name="appcompat-v7-25.3.0" level="project" />
- <orderentry type="library" exported="" name="support-fragment-25.3.0" level="project" />
- <orderentry type="library" exported="" name="animated-vector-drawable-25.3.0" level="project" />
- <orderentry type="library" exported="" name="support-annotations-25.3.0" level="project" />
- <orderentry type="library" exported="" name="support-vector-drawable-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:animated-vector-drawable-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:support-core-utils-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:design-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:appcompat-v7-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:support-compat-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:transition-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:support-core-ui-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:support-annotations:25.3.0@jar" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:support-media-compat-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="com.zhy:base-adapter-2.0.1" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:support-vector-drawable-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:support-v4-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:support-fragment-25.3.0" level="project" />
+ <orderentry type="library" exported="" name="com.android.support:recyclerview-v7-25.3.0" level="project" />
 <orderentry type="module" module-name="flowlayout-lib" exported="" />
 </component>
 </module>
\ No newline at end of file
From 12f679441644a37bc31527e29d9d11b708238615 Mon Sep 17 00:00:00 2001
From: EKwong <qinerjiang@banggood.com>
Date: 2018年3月20日 17:53:38 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix=20bug=E2=80=9C=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
 .../src/main/java/com/zhy/view/flowlayout/FlowLayout.java &#124; 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/FlowLayout.java b/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/FlowLayout.java
index 48f4c9d..57850b5 100755
--- a/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/FlowLayout.java
+++ b/flowlayout-lib/src/main/java/com/zhy/view/flowlayout/FlowLayout.java
@@ -168,7 +168,7 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
 break;
 case RIGHT:
 // 适配了rtl,需要补偿一个padding值
- left = width - currentLineWidth + getPaddingLeft() - getPaddingLeft();
+ left = width - (currentLineWidth + getPaddingLeft()) - getPaddingRight();
 // 适配了rtl,需要把lineViews里面的数组倒序排
 Collections.reverse(lineViews);
 break;
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://github.com/SnowLight/FlowLayout/compare/master...hongyangAndroid:FlowLayout:master.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://github.com/SnowLight/FlowLayout/compare/master...hongyangAndroid:FlowLayout:master.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>