瀏覽代碼

[마이][Common] 버킷리스트 사각형 모듈 디자인 수정

Hasemi 7 年之前
父節點
當前提交
e86d7222aa

+ 10 - 9
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/MyBucketListFragment.java

@@ -72,6 +72,16 @@ public class MyBucketListFragment extends FragmentBase<MyBucketListPresenter> im
     imageViewBucketCheck.setOnClickListener(view -> {
       presenter.onEvent(new Event.Builder(Event.TOGGLE).bool(isClicked()).build());
     });
+
+    recyclerViewMyBucketList.addItemDecoration(new RecyclerView.ItemDecoration() {
+      @Override
+      public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        outRect.right = ResourceUtil.dpToPx(8);
+        outRect.left = ResourceUtil.dpToPx(8);
+        outRect.top = ResourceUtil.dpToPx(8);
+        outRect.bottom = ResourceUtil.dpToPx(8);
+      }
+    });
   }
 
   @Override
@@ -122,15 +132,6 @@ public class MyBucketListFragment extends FragmentBase<MyBucketListPresenter> im
       }
     });
     recyclerViewMyBucketList.setNestedScrollingEnabled(false);
-    recyclerViewMyBucketList.addItemDecoration(new RecyclerView.ItemDecoration() {
-      @Override
-      public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
-        outRect.right = ResourceUtil.dpToPx(8);
-        outRect.left = ResourceUtil.dpToPx(8);
-        outRect.top = ResourceUtil.dpToPx(8);
-        outRect.bottom = ResourceUtil.dpToPx(8);
-      }
-    });
     recyclerViewMyBucketList.setLayoutManager(new GridLayoutManager(getActivity(), 2));
     recyclerViewMyBucketList.setAdapter(adapter);
   }

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/MyBucketListViewHolder.java

@@ -47,11 +47,11 @@ public class MyBucketListViewHolder extends RecyclerView.ViewHolder {
     if (bean.isCompleted()) {
       //버킷리스트 달성 완료 체크 유무
       imageViewBucketCheck.setVisibility(View.VISIBLE);
-      layoutCardView.setBackgroundColor(itemView.getResources().getColor(R.color.CE5E5E5));
+      layoutCardView.setBackground(itemView.getResources().getDrawable(R.drawable.rectangle_border_cf8f8f8));
     }
     else {
       imageViewBucketCheck.setVisibility(View.GONE);
-      layoutCardView.setBackground(itemView.getResources().getDrawable(R.drawable.faq_text_border));
+      layoutCardView.setBackground(itemView.getResources().getDrawable(R.drawable.rectangle_border_ce5e5e5));
     }
 
     ArrayList<TagBean> tags = bean.getTagList();

+ 9 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/main/MyMainFragment.java

@@ -1,5 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.main;
 
+import android.graphics.Rect;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -24,6 +25,7 @@ import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketWithTagBean;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
@@ -290,6 +292,13 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
         }
       }
     });
+    recyclerViewBucketListPreview.addItemDecoration(new RecyclerView.ItemDecoration() {
+      @Override
+      public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        outRect.left = ResourceUtil.dpToPx(8);
+        outRect.right = ResourceUtil.dpToPx(8);
+      }
+    });
     recyclerViewBucketListPreview.setLayoutManager(new GridLayoutManager(getActivity(), 2));
     recyclerViewBucketListPreview.setAdapter(adapter);
   }

app/src/main/res/drawable/faq_text_border.xml → app/src/main/res/drawable/rectangle_border_ce5e5e5.xml


+ 9 - 0
app/src/main/res/drawable/rectangle_border_cf8f8f8.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item>
+    <shape android:shape="rectangle">
+      <stroke android:color="@color/CE5E5E5" android:width="1dp"/>
+      <solid android:color="@color/CF8F8F8"/>
+    </shape>
+  </item>
+</selector>

+ 1 - 1
app/src/main/res/layout/fragment_member_block.xml

@@ -156,7 +156,7 @@
       android:layout_height="wrap_content"
       android:layout_marginLeft="24dp"
       android:layout_marginRight="24dp"
-      android:background="@drawable/faq_text_border"
+      android:background="@drawable/rectangle_border_ce5e5e5"
       android:gravity="center"
       android:orientation="horizontal"
       android:paddingBottom="17dp"

+ 1 - 1
app/src/main/res/layout/fragment_my_coin_main.xml

@@ -26,7 +26,7 @@
         android:layout_marginTop="25dp"
         android:layout_marginEnd="30dp"
         android:layout_marginBottom="25dp"
-        android:background="@drawable/faq_text_border"
+        android:background="@drawable/rectangle_border_ce5e5e5"
         app:layout_constraintBottom_toBottomOf="@+id/first_layout"
         app:layout_constraintStart_toStartOf="@+id/first_layout"
         app:layout_constraintTop_toTopOf="@+id/first_layout">

+ 1 - 1
app/src/main/res/layout/fragment_my_faq_write.xml

@@ -97,7 +97,7 @@
       android:layout_marginStart="25dp"
       android:layout_marginEnd="25dp"
       android:layout_weight="1"
-      android:background="@drawable/faq_text_border"
+      android:background="@drawable/rectangle_border_ce5e5e5"
       android:orientation="vertical">
 
       <EditText

+ 2 - 2
app/src/main/res/layout/fragment_my_main.xml

@@ -595,8 +595,8 @@
       android:id="@+id/layout_my_bucket_list_preview"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
-      android:layout_marginStart="25dp"
-      android:layout_marginEnd="25dp"
+      android:layout_marginStart="17dp"
+      android:layout_marginEnd="17dp"
       android:layout_marginTop="20dp"
       app:layout_constraintTop_toBottomOf="@+id/layout_best_bucket"
       android:layout_width="match_parent"

+ 1 - 1
app/src/main/res/layout/fragment_rest_member.xml

@@ -163,7 +163,7 @@
       android:layout_height="wrap_content"
       android:layout_marginLeft="24dp"
       android:layout_marginRight="24dp"
-      android:background="@drawable/faq_text_border"
+      android:background="@drawable/rectangle_border_ce5e5e5"
       android:gravity="center"
       android:orientation="horizontal"
       android:paddingLeft="45dp"

+ 1 - 1
app/src/main/res/layout/my_bucket_list_card_view.xml

@@ -5,7 +5,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="@drawable/faq_text_border"
+  android:background="@drawable/rectangle_border_ce5e5e5"
   android:orientation="vertical"
   >
 

+ 1 - 1
app/src/main/res/layout/setting_user_quit_fail.xml

@@ -63,7 +63,7 @@
       android:layout_height="70dp"
       android:layout_marginLeft="25dp"
       android:layout_marginRight="25dp"
-      android:background="@drawable/faq_text_border"
+      android:background="@drawable/rectangle_border_ce5e5e5"
       android:paddingStart="15dp"
       android:paddingEnd="15dp"
       >

+ 1 - 1
app/src/main/res/layout/setting_user_quit_information.xml

@@ -62,7 +62,7 @@
       android:layout_height="70dp"
       android:layout_marginLeft="25dp"
       android:layout_marginRight="25dp"
-      android:background="@drawable/faq_text_border"
+      android:background="@drawable/rectangle_border_ce5e5e5"
       android:paddingStart="15dp"
       android:paddingEnd="15dp"
       >