From eda35152a07ece8f2da144146be4e5bc9f4d2900 Mon Sep 17 00:00:00 2001
From: EKwong <qinerjiang@banggood.com>
Date: 2018年3月20日 17:17:01 +0800
Subject: [PATCH 1/2] 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 2/2] =?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/waws80/FlowLayout/compare/master...hongyangAndroid:FlowLayout:master.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://github.com/waws80/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>