Bugfix & update canScrollVertically()

simonebortolin · simonebortolin · commit 8c36ad45e01f · 2018-12-24T17:38:19.000+01:00
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Step 1. Add it in your **root** build.gradle at the end of repositories:
 Step 2. Add the dependency
 
 	dependencies {
-	        implementation 'com.github.simonebortolin:FlowLayoutManager:1.5'
+	        implementation 'com.github.simonebortolin:FlowLayoutManager:1.7'
 	}
 
 Item per line limitation
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.xiaofeng.androidlibs"
         minSdkVersion androidMinSdkVersion
         targetSdkVersion androidTargetSdkVersion
-        versionCode 15
-        versionName "1.5"
+        versionCode 17
+        versionName "1.7"
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
diff --git a/app/src/main/java/com/xiaofeng/androidlibs/DemoAdapter.java b/app/src/main/java/com/xiaofeng/androidlibs/DemoAdapter.java
@@ -1,5 +1,6 @@
 package com.xiaofeng.androidlibs;
 
+import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,9 +14,8 @@
  */
 public class DemoAdapter extends RecyclerView.Adapter<DemoViewHolder> {
     private List<String> items;
-    private boolean showMeta = false;
 
-    public DemoAdapter() {
+    private DemoAdapter() {
         this.items = new LinkedList<>();
     }
 
@@ -24,13 +24,14 @@ public DemoAdapter(List<String> items) {
         this.items.addAll(items);
     }
 
+    @NonNull
     @Override
-    public DemoViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        return new DemoViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.main_item, parent, false)).setShowMeta(showMeta);
+    public DemoViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new DemoViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.main_item, parent, false));
     }
 
     @Override
-    public void onBindViewHolder(final DemoViewHolder holder, final int position) {
+    public void onBindViewHolder(@NonNull final DemoViewHolder holder, final int position) {
         holder.setTagText(items.get(position));
         holder.tagSize.setClickable(false);
         holder.tagText.setClickable(false);
diff --git a/app/src/main/java/com/xiaofeng/androidlibs/DemoViewHolder.java b/app/src/main/java/com/xiaofeng/androidlibs/DemoViewHolder.java
@@ -5,43 +5,18 @@
 import android.widget.TextView;
 
 public class DemoViewHolder extends RecyclerView.ViewHolder {
-	boolean showMeta = false;
 	TextView tagText, tagSize;
 	public DemoViewHolder(View itemView) {
 		super(itemView);
-		tagText = (TextView)itemView.findViewById(R.id.tag_text);
-		tagSize = (TextView)itemView.findViewById(R.id.tag_count);
+		tagText = itemView.findViewById(R.id.tag_text);
+		tagSize = itemView.findViewById(R.id.tag_count);
 	}
 
 	public void setTagText(String tag) {
 		tagText.setText(tag);
-		if (showMeta) {
-			String[] lines = tag.split("\n");
-			StringBuilder sb = new StringBuilder();
-			sb.append("(").append(lines.length).append(":");
-			int length = 0;
-			boolean first = true;
-			for (String line : lines) {
-				if (first) {
-					first = false;
-				} else {
-					sb.append(",");
-				}
-				sb.append(line.length());
-				length += line.length();
-			}
-			sb.append(":").append(length).append(")");
-			tagSize.setText(sb.toString());
-		}
-	}
 
-	public DemoViewHolder setShowMeta(boolean showMeta) {
-		this.showMeta = showMeta;
-		if (showMeta) {
-			tagSize.setVisibility(View.VISIBLE);
-		} else {
-			tagSize.setVisibility(View.GONE);
-		}
-		return this;
+
 	}
+
+
 }
diff --git a/app/src/main/java/com/xiaofeng/androidlibs/MainActivity.java b/app/src/main/java/com/xiaofeng/androidlibs/MainActivity.java
@@ -32,6 +32,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
             switch (item.getItemId()) {
                 case R.id.navigation_left:
                     flowLayoutManager = new FlowLayoutManager().setAlignment(Alignment.LEFT);
+                    flowLayoutManager.setAutoMeasureEnabled(true);
 
                     recyclerView.setLayoutManager(flowLayoutManager);
                     recyclerView.getAdapter().notifyDataSetChanged();
diff --git a/app/src/main/java/com/xiaofeng/androidlibs/util/ArrayUtil.java b/app/src/main/java/com/xiaofeng/androidlibs/util/ArrayUtil.java
diff --git a/app/src/main/java/com/xiaofeng/androidlibs/util/CollectionUtil.java b/app/src/main/java/com/xiaofeng/androidlibs/util/CollectionUtil.java
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
@@ -7,15 +7,19 @@
     android:layout_height="match_parent"
     tools:context="com.xiaofeng.androidlibs.MainActivity">
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:fadeScrollbars="false"
-        android:padding="48dp"
-        android:scrollbarStyle="outsideOverlay"
-        android:scrollbars="vertical" />
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toTopOf="@id/navigation"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:clipToPadding="false"
+            android:fadeScrollbars="false"
+            android:padding="48dp"
+            android:scrollbarStyle="outsideOverlay"
+            android:scrollbars="vertical" />
 
     <android.support.design.widget.BottomNavigationView
         android:id="@+id/navigation"
diff --git a/app/src/main/res/layout/main_item.xml b/app/src/main/res/layout/main_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@drawable/tagbg"
@@ -13,13 +14,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="4dp"
-        android:text="0000"
-        android:textColor="@color/colorPrimary" />
+        tools:text="0000"
+        android:textColor="@color/colorPrimary"
+        android:layout_marginEnd="4dp" />
     <TextView
         android:id="@+id/tag_count"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="(4)"
+        tools:text="(4)"
         android:textColor="@color/colorPrimary" />
 
 </LinearLayout>
diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation.xml
@@ -4,16 +4,15 @@
     <item
         android:id="@+id/navigation_left"
         android:icon="@drawable/ic_format_align_left_black_24dp"
-        android:title="Left" />
+        android:title="@string/left" />
 
     <item
         android:id="@+id/navigation_center"
         android:icon="@drawable/ic_format_align_center_black_24dp"
-        android:title="Center" />
+        android:title="@string/center" />
 
     <item
         android:id="@+id/navigation_rigth"
         android:icon="@drawable/ic_format_align_right_black_24dp"
-        android:title="Rigth" />
-
+        android:title="@string/rigth" />
 </menu>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -3,5 +3,4 @@
     <color name="colorPrimary">#F44336</color>
     <color name="colorPrimaryDark">#D32F2F</color>
     <color name="colorAccent">#2196F3</color>
-    <color name="instructionBackground">#ffff99</color>
 </resources>
diff --git a/app/src/main/res/values/drawables.xml b/app/src/main/res/values/drawables.xml
@@ -1,4 +1,4 @@
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
     <item name="ic_menu_camera" type="drawable">@android:drawable/ic_menu_camera</item>
     <item name="ic_menu_gallery" type="drawable">@android:drawable/ic_menu_gallery</item>
     <item name="ic_menu_slideshow" type="drawable">@android:drawable/ic_menu_slideshow</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -51,4 +51,7 @@
     <string name="title_home">Home</string>
     <string name="title_dashboard">Dashboard</string>
     <string name="title_notifications">Notifications</string>
+    <string name="left">Left</string>
+    <string name="center">Center</string>
+    <string name="rigth">Rigth</string>
 </resources>
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
@@ -16,11 +16,4 @@
         android:title="@string/pref_max_lines_per_item_title"
         android:defaultValue="@string/pref_max_lines_per_item_default"
         android:inputType="numberDecimal"/>
-    <!--<SwitchPreference-->
-        <!--android:key="@string/pref_key_show_meta"-->
-        <!--android:title="@string/pref_show_meta_title"-->
-        <!--android:defaultValue="@bool/pref_show_meta_default"-->
-        <!--android:summaryOn="@string/pref_show_meta_summary_on"-->
-        <!--android:summaryOff="@string/pref_show_meta_summary_off"/>-->
-
 </PreferenceScreen>
diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ subprojects {
     ext.playServiceVersion = "8.4.0"
     ext.androidBuildToolVersion = "26.0.2"
     ext.androidCompileSdkVersion = 26
-    ext.androidMinSdkVersion = 15
+    ext.androidMinSdkVersion = 16
     ext.androidTargetSdkVersion = 26
 }
 
diff --git a/flowlayoutmanager/src/main/java/com/xiaofeng/flowlayoutmanager/FlowLayoutManager.java b/flowlayoutmanager/src/main/java/com/xiaofeng/flowlayoutmanager/FlowLayoutManager.java
diff --git a/flowlayoutmanager/src/main/res/values/strings.xml b/flowlayoutmanager/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ Step 1. Add it in your root build.gradle at the end of repositories:`
`25`	`25`	`Step 2. Add the dependency`
`26`	`26`
`27`	`27`	`dependencies {`
`28`		`- implementation 'com.github.simonebortolin:FlowLayoutManager:1.5'`
	`28`	`+ implementation 'com.github.simonebortolin:FlowLayoutManager:1.7'`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`Item per line limitation`