Browse Source

[카테고리메인][Common] 카테고리메인 변경사항 반영

Hasemi 6 years ago
parent
commit
875a38f171

+ 13 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type3/ThirdCategoryMainFragment.java

@@ -1,6 +1,9 @@
 package kr.co.zumo.app.lifeplus.view.screen.category.type3;
 
+import android.graphics.Rect;
 import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
 
 import java.util.List;
 
@@ -99,8 +102,16 @@ public class ThirdCategoryMainFragment extends CategoryMainFragment<ThirdCategor
     });
     recyclerView.setLayoutManager(gridLayoutManager);
 
-    recyclerView.setPadding(ResourceUtil.dpToPx(17), 0, ResourceUtil.dpToPx(17), ResourceUtil.dpToPx(25));
-    recyclerView.addItemDecoration(new GridItemDecoration(getActivity(), ResourceUtil.dpToPx(8), ResourceUtil.dpToPx(5), ResourceUtil.dpToPx(8), ResourceUtil.dpToPx(20)));
+    recyclerView.setPadding(ResourceUtil.dpToPx(23), 0, ResourceUtil.dpToPx(23), ResourceUtil.dpToPx(25));
+    recyclerView.addItemDecoration(new GridItemDecoration(getActivity(), ResourceUtil.dpToPx(2), ResourceUtil.dpToPx(12), ResourceUtil.dpToPx(2), ResourceUtil.dpToPx(12)) {
+      @Override
+      public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        super.getItemOffsets(outRect, view, parent, state);
+        if (parent.getChildAdapterPosition(view) == 0 || parent.getChildAdapterPosition(view) == 1) {
+          outRect.top = ResourceUtil.dpToPx(6);
+        }
+      }
+    });
   }
 
   @Override

BIN
app/src/main/res/drawable-hdpi/rectangle_2.png


BIN
app/src/main/res/drawable-mdpi/rectangle_2.png


BIN
app/src/main/res/drawable-xhdpi/rectangle_2.png


BIN
app/src/main/res/drawable-xxhdpi/rectangle_2.png


BIN
app/src/main/res/drawable-xxxhdpi/rectangle_2.png


+ 6 - 3
app/src/main/res/layout/fragment_bucket_list_with_tag_detail.xml

@@ -159,14 +159,17 @@
 
     <LinearLayout
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
+      android:layout_height="match_parent"
+      android:orientation="vertical"
       app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
       <android.support.v7.widget.RecyclerView
+
         android:id="@+id/recycler_view_bucket_list_detail"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginTop="10dp"
+        android:layout_weight="1"
         android:clipToPadding="false"
         android:paddingTop="15dp"
 
@@ -181,7 +184,7 @@
     android:visibility="gone"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintTop_toBottomOf="@id/scroll_layout"
-    tools:visibility="visible">
+    tools:visibility="gone">
 
     <ImageView
       android:id="@+id/image_result_nothing"

+ 1 - 2
app/src/main/res/layout/main_fourth_category_linear_view.xml

@@ -46,16 +46,15 @@
     tools:text="개미 벗어나기
누구나 주개미 벗어나기
누구나 주개미 벗어나기
누구나 주개미 벗어나기
누구나 주개미 벗어나기
누구나 주개미 벗어나기
누구나 주"/>
 
   <TextView
-    android:visibility="gone"
     android:id="@+id/text_view_main_fourth_category_title3"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_marginTop="5dp"
     android:layout_marginEnd="28dp"
-    android:layout_marginBottom="7dp"
     android:lineSpacingExtra="4sp"
     android:textColor="@color/C999999"
     android:textSize="11sp"
+    android:visibility="gone"
     app:layout_constrainedWidth="true"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toStartOf="@+id/image_view_main_fourth_category"