Merge branch 'antondudakov-master'

Author: simonebortolin

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

@@ -15,7 +15,7 @@ public class DemoUtil {
 	public static List<String> generate(int total, int minLen, int maxLen, int maxLinesPerItem, boolean randomOrder) {
 		ArrayList<String> result = new ArrayList<>(total);
 		StringBuilder sb = new StringBuilder();
-		for (int i = 1; i <= total; i ++) {
+		for (int i = 1; i <= total; i++) {
 			int lineCount = random.nextInt(maxLinesPerItem) + 1;
 			List<String> lines = generate(lineCount, minLen, maxLen, randomOrder);
 			boolean firstLine = true;
@@ -27,7 +27,7 @@ public static List<String> generate(int total, int minLen, int maxLen, int maxLi
 				}
 				sb.append(line);
 			}
-			result.add(sb.toString() +  " (" + i + ")");
+			result.add(sb.toString() + " (" + i + ")");
 		}
 		return result;
 	}

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

@@ -19,23 +19,23 @@
 
 public class MainActivity extends AppCompatActivity {
 
-    private static final int REQ_CODE_SETTINGS = 101;
-    RecyclerView recyclerView;
+	private static final int REQ_CODE_SETTINGS = 101;
+	RecyclerView recyclerView;
 	FlowLayoutManager flowLayoutManager;
 	MarkdownView markdownView;
 	private boolean settingChanged = false;
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.app_bar_main);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
+		Toolbar toolbar = findViewById(R.id.toolbar);
+		setSupportActionBar(toolbar);
 		init();
 	}
 
 	private void init() {
-        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)));

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

@@ -30,8 +30,8 @@ public static boolean shouldStartNewline(int x, int childWidth, int leftEdge, in
             case CENTER:
             default:
                 return x + childWidth > rightEdge;
-		}
-	}
+        }
+    }
 
     public int leftVisibleEdge() {
         return recyclerView.getPaddingLeft();
@@ -61,6 +61,6 @@ public Point layoutStartPoint(LayoutContext layoutContext) {
             case CENTER:
             default:
                 return new Point(leftVisibleEdge(), topVisibleEdge());
-		}
-	}
+        }
+    }
 }