Merge branch 'master' of https://github.com/antondudakov/AndroidLibs into antondudakov-master

# Conflicts:
#	.idea/gradle.xml
#	.idea/misc.xml
#	app/build.gradle
#	build.gradle
#	flowlayoutmanager/build.gradle
#	flowlayoutmanager/src/main/java/com/xiaofeng/flowlayoutmanager/FlowLayoutManager.java
#	gradle/wrapper/gradle-wrapper.properties

Author: simonebortolin

.idea/gradle.xml

@@ -19,23 +19,23 @@
 
 public class MainActivity extends AppCompatActivity {
 
-	RecyclerView recyclerView;
+    private static final int REQ_CODE_SETTINGS = 101;
+    RecyclerView recyclerView;
 	FlowLayoutManager flowLayoutManager;
 	MarkdownView markdownView;
-	private static final int REQ_CODE_SETTINGS = 101;
 	private boolean settingChanged = false;
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.app_bar_main);
-		Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-		setSupportActionBar(toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
 		init();
 	}
 
 	private void init() {
-		recyclerView = (RecyclerView) findViewById(R.id.list);
-		flowLayoutManager = new FlowLayoutManager().singleItemPerLine();
+        recyclerView = findViewById(R.id.list);
+        flowLayoutManager = new FlowLayoutManager().singleItemPerLine();
 		flowLayoutManager.setAutoMeasureEnabled(true);
 		recyclerView.setLayoutManager(flowLayoutManager);
 		recyclerView.setAdapter(new DemoAdapter(1, DemoUtil.generate(32, 10, 60, 1, false)));

.idea/misc.xml

@@ -3,9 +3,8 @@
 
     <solid android:color="@color/colorPrimaryDark" />
     <stroke
-        android:color="@color/colorAccent"
         android:width="1dp"
-        />
+        android:color="@color/colorAccent" />
     <corners android:radius="4dp" />
 
 </shape>

app/src/main/java/com/xiaofeng/androidlibs/MainActivity.java

@@ -5,19 +5,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:context="com.xiaofeng.androidlibs.MainActivity"
-    tools:showIn="@layout/app_bar_main"
-    android:orientation="vertical">
+    tools:showIn="@layout/app_bar_main">
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:background="@color/instructionBackground">
+        android:background="@color/instructionBackground"
+        android:padding="8dp">
         <us.feras.mdv.MarkdownView
             android:id="@+id/instruction_mdown"
             android:layout_width="match_parent"
@@ -28,11 +28,11 @@
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="48dp"
+        android:background="?attr/colorPrimary"
         android:clipToPadding="false"
-        android:scrollbars="vertical"
+        android:fadeScrollbars="false"
+        android:padding="48dp"
         android:scrollbarStyle="outsideOverlay"
         android:scrollbarThumbVertical="@color/colorPrimaryDark"
-        android:fadeScrollbars="false"
-        android:background="?attr/colorPrimary"/>
+        android:scrollbars="vertical" />
 </LinearLayout>

app/src/main/res/drawable/tagbg.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:background="@drawable/tagbg"
+    android:background="@drawable/tagbg"
+    android:orientation="horizontal"
     android:padding="10dp">
     <TextView
         android:id="@+id/tag_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="4dp"
-        android:textColor="@android:color/white"
-        android:text="0000"/>
+        android:text="0000"
+        android:textColor="@android:color/white" />
     <TextView
         android:id="@+id/tag_count"
         android:layout_width="wrap_content"
-        android:textColor="@android:color/white"
         android:layout_height="wrap_content"
-        android:text="(4)"/>
+        android:text="(4)"
+        android:textColor="@android:color/white" />
 
 </LinearLayout>

app/src/main/res/layout/content_main.xml

@@ -1,3 +1,36 @@
-/build
-.idea/
-/*/.idea/
+#built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Windows thumbnail db
+Thumbs.db
+
+# OSX files
+.DS_Store
+
+# Android Studio
+*.iml
+.idea
+#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
+.gradle
+build/
+.navigation
+captures/
+output.json 
+
+#NDK
+obj/
+.externalNativeBuild

app/src/main/res/layout/listitem_tag.xml

@@ -5,6 +5,6 @@
  */
 public enum Alignment {
 	LEFT,
-	RIGHT,
-	CENTER
+    RIGHT,
+    CENTER
 }

flowlayoutmanager/.gitignore

@@ -1,8 +1,5 @@
 package com.xiaofeng.flowlayoutmanager;
 
-import com.xiaofeng.flowlayoutmanager.cache.CacheHelper;
-import com.xiaofeng.flowlayoutmanager.cache.Line;
-
 import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.Rect;
@@ -12,7 +9,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
-import android.widget.Toast;
 
 import com.xiaofeng.flowlayoutmanager.cache.CacheHelper;
 import com.xiaofeng.flowlayoutmanager.cache.Line;
@@ -27,15 +23,15 @@
 public class FlowLayoutManager extends RecyclerView.LayoutManager {
 
 	private static final String LOG_TAG = "FlowLayoutManager";
-	RecyclerView recyclerView;
-	int firstChildAdapterPosition = 0;
-	RecyclerView.Recycler recyclerRef;
-	FlowLayoutOptions flowLayoutOptions;
-	FlowLayoutOptions newFlowLayoutOptions;
-	LayoutHelper layoutHelper;
-	CacheHelper cacheHelper;
-	@Nullable
-	private ViewTreeObserver.OnGlobalLayoutListener globalLayoutListener;
+    private RecyclerView recyclerView;
+    private int firstChildAdapterPosition = 0;
+    private RecyclerView.Recycler recyclerRef;
+    private FlowLayoutOptions flowLayoutOptions;
+    private FlowLayoutOptions newFlowLayoutOptions;
+    private LayoutHelper layoutHelper;
+    private CacheHelper cacheHelper;
+    @Nullable
+    private ViewTreeObserver.OnGlobalLayoutListener globalLayoutListener;
 
 	public FlowLayoutManager() {
 		flowLayoutOptions = new FlowLayoutOptions();
@@ -503,14 +499,14 @@ public void onGlobalLayout() {
 
 	}
 
-	@Override
-	public void onDetachedFromWindow(RecyclerView view, RecyclerView.Recycler recycler) {
-		super.onDetachedFromWindow(view, recycler);
-		if (globalLayoutListener != null) {
-			view.getViewTreeObserver().removeOnGlobalLayoutListener(globalLayoutListener);
-			globalLayoutListener = null;
-		}
-	}
+    @Override
+    public void onDetachedFromWindow(RecyclerView view, RecyclerView.Recycler recycler) {
+        super.onDetachedFromWindow(view, recycler);
+        if (globalLayoutListener != null) {
+            view.getViewTreeObserver().removeOnGlobalLayoutListener(globalLayoutListener);
+            globalLayoutListener = null;
+        }
+    }
 
 	@Override
 	public boolean supportsPredictiveItemAnimations() {
@@ -614,9 +610,9 @@ private int getMaxHeightLayoutPositionInLine(int layoutPosition) {
 
 	private List<View> getAllViewsInLine(int index) {
 		int firstItemIndex = index;
-		while (!isStartOfLine(firstItemIndex)) {
-			firstItemIndex --;
-		}
+        while (!isStartOfLine(firstItemIndex)) {
+            firstItemIndex--;
+        }
 
 		List<View> viewList = new LinkedList<>();
 		viewList.add(getChildAt(firstItemIndex));
@@ -912,7 +908,7 @@ public int computeVerticalScrollExtent(RecyclerView.State state) {
             return 0;
         }
 //        if (!smoothScrollbarEnabled) {
-            return Math.abs(getPosition(startChild) - getPosition(endChild)) + 1;
+        return Math.abs(getPosition(startChild) - getPosition(endChild)) + 1;
 //        }
 //        final int extend = getDecoratedRight(endChild) - getDecoratedLeft(startChild);
 //        return Math.min(getTotalSpace(), extend);

flowlayoutmanager/src/main/java/com/xiaofeng/flowlayoutmanager/Alignment.java

@@ -15,26 +15,6 @@ public LayoutHelper(RecyclerView.LayoutManager layoutManager, RecyclerView recyc
 		this.recyclerView = recyclerView;
 	}
 
-	public int leftVisibleEdge() {
-		return recyclerView.getPaddingLeft();
-	}
-
-	public int rightVisibleEdge() {
-		return layoutManager.getWidth() - layoutManager.getPaddingRight();
-	}
-
-	public int visibleAreaWidth() {
-		return rightVisibleEdge() - leftVisibleEdge();
-	}
-
-	public int topVisibleEdge() {
-		return layoutManager.getPaddingTop();
-	}
-
-	public int bottomVisibleEdge() {
-		return layoutManager.getHeight() - layoutManager.getPaddingBottom();
-	}
-
 	public static boolean hasItemsPerLineLimit(FlowLayoutOptions layoutOptions) {
 		return layoutOptions.itemsPerLine > 0;
 	}
@@ -47,20 +27,40 @@ public static boolean shouldStartNewline(int x, int childWidth, int leftEdge, in
 			case RIGHT:
 				return x - childWidth < leftEdge;
 			case LEFT:
-			case CENTER:
-			default:
-				return x + childWidth > rightEdge;
+            case CENTER:
+            default:
+                return x + childWidth > rightEdge;
 		}
 	}
 
+    public int leftVisibleEdge() {
+        return recyclerView.getPaddingLeft();
+    }
+
+    public int rightVisibleEdge() {
+        return layoutManager.getWidth() - layoutManager.getPaddingRight();
+    }
+
+    public int visibleAreaWidth() {
+        return rightVisibleEdge() - leftVisibleEdge();
+    }
+
+    public int topVisibleEdge() {
+        return layoutManager.getPaddingTop();
+    }
+
+    public int bottomVisibleEdge() {
+        return layoutManager.getHeight() - layoutManager.getPaddingBottom();
+    }
+
 	public Point layoutStartPoint(LayoutContext layoutContext) {
 		switch (layoutContext.layoutOptions.alignment) {
 			case RIGHT:
 				return new Point(rightVisibleEdge(), topVisibleEdge());
-			case LEFT:
-			case CENTER:
-			default:
-				return new Point(leftVisibleEdge(), topVisibleEdge());
+            case LEFT:
+            case CENTER:
+            default:
+                return new Point(leftVisibleEdge(), topVisibleEdge());
 		}
 	}
 }