布局调整

horstonema · Oct 19, 2017 · 20eac25 · 20eac25
1 parent 03ab11c
commit 20eac25
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 20 deletions.
diff --git a/RecyclerViewRefreshDemo/.idea/misc.xml b/RecyclerViewRefreshDemo/.idea/misc.xml
diff --git a/RecyclerViewRefreshDemo/app/src/main/java/com/yl/recyclerview/adapter/LoadMoreAdapter.java b/RecyclerViewRefreshDemo/app/src/main/java/com/yl/recyclerview/adapter/LoadMoreAdapter.java
@@ -6,6 +6,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -77,19 +78,19 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
                 case LOADING: // 正在加载
                     footViewHolder.pbLoading.setVisibility(View.VISIBLE);
                     footViewHolder.tvLoading.setVisibility(View.VISIBLE);
-                    footViewHolder.tvEnd.setVisibility(View.GONE);
+                    footViewHolder.llEnd.setVisibility(View.GONE);
                     break;
 
                 case LOADING_COMPLETE: // 加载完成
                     footViewHolder.pbLoading.setVisibility(View.INVISIBLE);
                     footViewHolder.tvLoading.setVisibility(View.INVISIBLE);
-                    footViewHolder.tvEnd.setVisibility(View.GONE);
+                    footViewHolder.llEnd.setVisibility(View.GONE);
                     break;
 
                 case LOADING_END: // 加载到底
                     footViewHolder.pbLoading.setVisibility(View.GONE);
                     footViewHolder.tvLoading.setVisibility(View.GONE);
-                    footViewHolder.tvEnd.setVisibility(View.VISIBLE);
+                    footViewHolder.llEnd.setVisibility(View.VISIBLE);
                     break;
 
                 default:
@@ -133,13 +134,13 @@ private class FootViewHolder extends RecyclerView.ViewHolder {
 
         ProgressBar pbLoading;
         TextView tvLoading;
-        TextView tvEnd;
+        LinearLayout llEnd;
 
         FootViewHolder(View itemView) {
             super(itemView);
             pbLoading = (ProgressBar) itemView.findViewById(R.id.pb_loading);
             tvLoading = (TextView) itemView.findViewById(R.id.tv_loading);
-            tvEnd = (TextView) itemView.findViewById(R.id.tv_end);
+            llEnd = (LinearLayout) itemView.findViewById(R.id.ll_end);
         }
     }
 

diff --git a/RecyclerViewRefreshDemo/app/src/main/java/com/yl/recyclerview/wrapper/LoadMoreWrapper.java b/RecyclerViewRefreshDemo/app/src/main/java/com/yl/recyclerview/wrapper/LoadMoreWrapper.java
@@ -5,6 +5,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -66,19 +67,19 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
                 case LOADING: // 正在加载
                     footViewHolder.pbLoading.setVisibility(View.VISIBLE);
                     footViewHolder.tvLoading.setVisibility(View.VISIBLE);
-                    footViewHolder.tvEnd.setVisibility(View.GONE);
+                    footViewHolder.llEnd.setVisibility(View.GONE);
                     break;
 
                 case LOADING_COMPLETE: // 加载完成
                     footViewHolder.pbLoading.setVisibility(View.INVISIBLE);
                     footViewHolder.tvLoading.setVisibility(View.INVISIBLE);
-                    footViewHolder.tvEnd.setVisibility(View.GONE);
+                    footViewHolder.llEnd.setVisibility(View.GONE);
                     break;
 
                 case LOADING_END: // 加载到底
                     footViewHolder.pbLoading.setVisibility(View.GONE);
                     footViewHolder.tvLoading.setVisibility(View.GONE);
-                    footViewHolder.tvEnd.setVisibility(View.VISIBLE);
+                    footViewHolder.llEnd.setVisibility(View.VISIBLE);
                     break;
 
                 default:
@@ -114,13 +115,13 @@ private class FootViewHolder extends RecyclerView.ViewHolder {
 
         ProgressBar pbLoading;
         TextView tvLoading;
-        TextView tvEnd;
+        LinearLayout llEnd;
 
         FootViewHolder(View itemView) {
             super(itemView);
             pbLoading = (ProgressBar) itemView.findViewById(R.id.pb_loading);
             tvLoading = (TextView) itemView.findViewById(R.id.tv_loading);
-            tvEnd = (TextView) itemView.findViewById(R.id.tv_end);
+            llEnd = (LinearLayout) itemView.findViewById(R.id.ll_end);
         }
     }
 

diff --git a/RecyclerViewRefreshDemo/app/src/main/res/layout/adapter_recyclerview.xml b/RecyclerViewRefreshDemo/app/src/main/res/layout/adapter_recyclerview.xml
@@ -2,11 +2,11 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="70dp">
+    android:layout_height="60dp">
 
     <android.support.v7.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="60dp"
+        android:layout_height="50dp"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         card_view:cardCornerRadius="8dp">

diff --git a/RecyclerViewRefreshDemo/app/src/main/res/layout/layout_refresh_footer.xml b/RecyclerViewRefreshDemo/app/src/main/res/layout/layout_refresh_footer.xml
@@ -17,15 +17,45 @@
         android:layout_height="wrap_content"
         android:padding="15dp"
         android:text="正在加载..."
+        android:textColor="#4DB6AC"
         android:textSize="16sp" />
 
-    <TextView
-        android:id="@+id/tv_end"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/ll_end"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="15dp"
-        android:text="---------- 我是有底线的 ----------"
-        android:textSize="16sp"
-        android:visibility="gone" />
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:visibility="gone">
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1"
+            android:alpha="0.5"
+            android:background="#4DB6AC"
+            android:gravity="start" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1.2"
+            android:gravity="center"
+            android:padding="15dp"
+            android:text="我是有底线的"
+            android:textColor="#4DB6AC"
+            android:textSize="16sp" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1"
+            android:alpha="0.5"
+            android:background="#4DB6AC"
+            android:gravity="end" />
+
+    </LinearLayout>
 
 </LinearLayout>