[알림][Common] 레이아웃 수정

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/notification/NotiListFragment.java

@@ -98,6 +98,7 @@ public class NotiListFragment extends Fragment {
     recyclerViewAlarmList = getView().findViewById(R.id.recycler_view_alarm_list);
     NotiListAdapter notiListAdapter = new NotiListAdapter(notificationBeans);
     recyclerViewAlarmList.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
+    recyclerViewAlarmList.setAdapter(notiListAdapter);
     recyclerViewAlarmList.addItemDecoration(new RecyclerView.ItemDecoration() {
       @Override
       public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
@@ -105,7 +106,6 @@ public class NotiListFragment extends Fragment {
         outRect.bottom = ResourceUtil.dpToPx(12);
       }
     });
-    recyclerViewAlarmList.setAdapter(notiListAdapter);
   }
 
   interface INotiListFragmentListener {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/notification/NotiTextLinkViewHolder.java

@@ -1,6 +1,7 @@
 package kr.co.zumo.app.lifeplus.view.screen.notification;
 
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import kr.co.zumo.app.R;
@@ -24,6 +25,7 @@ public class NotiTextLinkViewHolder extends NotiViewHolder {
   protected TextView textViewAlarmDate;
   protected TextView textViewAlarmDetail;
   protected TextView textViewShowContents;
+  protected ImageView imageViewArrow;
 
   public NotiTextLinkViewHolder(View itemView) {
     super(itemView);
@@ -32,7 +34,7 @@ public class NotiTextLinkViewHolder extends NotiViewHolder {
     textViewAlarmDate = itemView.findViewById(R.id.text_view_date);
     textViewAlarmDetail = itemView.findViewById(R.id.text_view_detail);
     textViewShowContents = itemView.findViewById(R.id.text_view_show_contents);
-
+    imageViewArrow = itemView.findViewById(R.id.image_view_open_arrow);
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/notification/NotiTextViewHolder.java

@@ -20,6 +20,7 @@ public class NotiTextViewHolder extends NotiTextLinkViewHolder {
 
   @Override
   protected void setLink() {
+    imageViewArrow.setVisibility(View.GONE);
     textViewShowContents.setVisibility(View.GONE);
   }
 }

app/src/main/res/layout/fragment_faq_list.xml

@@ -12,13 +12,13 @@
     android:id="@+id/expandable_list_view_faq"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="10dp"
     android:layout_marginLeft="25dp"
     android:layout_marginRight="25dp"
-    android:paddingTop="26dp"
+    android:layout_marginBottom="10dp"
+    android:clipToPadding="false"
     android:divider="@color/CFFFFFF"
     android:dividerHeight="50dp"
-    android:clipToPadding="false"
+    android:paddingTop="26dp"
     >
   </android.support.v7.widget.RecyclerView>
 

app/src/main/res/layout/fragment_noti_list.xml

@@ -10,14 +10,15 @@
 
   <android.support.v7.widget.RecyclerView
     android:id="@+id/recycler_view_alarm_list"
+    android:clipToPadding="false"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="10dp"
-    android:layout_marginLeft="25dp"
-    android:layout_marginRight="25dp"
-    android:layout_marginTop="26dp"
+    android:layout_marginStart="25dp"
+    android:layout_marginEnd="25dp"
+    android:paddingTop="20dp"
     android:divider="@color/CFFFFFF"
-    android:dividerHeight="50dp">
+    android:dividerHeight="26dp">
 
   </android.support.v7.widget.RecyclerView>
 

app/src/main/res/layout/noti_image_text_contents.xml

@@ -24,13 +24,15 @@
 
   <TextView
     android:id="@+id/text_view_title"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="23dp"
     android:layout_marginTop="5dp"
+    android:layout_marginEnd="23dp"
     android:lineSpacingExtra="6sp"
     android:textColor="@color/C333333"
     android:textSize="14sp"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/text_view_category"
     tools:text="디뮤지엄 전시회 티켓 증정 이벤트"
@@ -52,13 +54,15 @@
 
   <TextView
     android:id="@+id/text_view_detail"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="23dp"
     android:layout_marginTop="17dp"
+    android:layout_marginEnd="23dp"
     android:lineSpacingExtra="10sp"
     android:textColor="@color/C999999"
     android:textSize="12sp"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/text_view_date"
     tools:text="이벤트에 참여해주시는 분들이 많아지는만큼,관련하여
@@ -68,12 +72,15 @@
 
   <ImageView
     android:id="@+id/image_view_contents"
-    android:layout_width="266dp"
+    android:layout_width="match_parent"
     android:layout_height="175dp"
     android:layout_marginStart="23dp"
     android:layout_marginTop="12dp"
-    android:scaleType="fitXY"
+    android:layout_marginEnd="23dp"
+    android:scaleType="centerCrop"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
+
     app:layout_constraintTop_toBottomOf="@+id/text_view_detail"
     tools:src="@drawable/img_bestbucket_banner_1"/>
 
@@ -100,11 +107,11 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="2dp"
-    android:layout_marginBottom="25dp"
     android:rotation="-90"
     android:scaleType="center"
-    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintBottom_toBottomOf="@+id/text_view_show_contents"
     app:layout_constraintStart_toEndOf="@+id/text_view_show_contents"
+    app:layout_constraintTop_toTopOf="@+id/text_view_show_contents"
     app:srcCompat="@drawable/icon_openarrow"/>
 
 

app/src/main/res/layout/noti_text_contents.xml

@@ -24,17 +24,18 @@
 
   <TextView
     android:id="@+id/text_view_title"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="23dp"
     android:layout_marginTop="5dp"
+    android:layout_marginEnd="23dp"
     android:lineSpacingExtra="6sp"
     android:textColor="@color/C333333"
     android:textSize="14sp"
     app:layout_constraintEnd_toEndOf="parent"
-    android:layout_marginEnd="23dp"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/text_view_category"
+    app:layout_goneMarginEnd="23dp"
     tools:text="포인트 소멸 안내3일 이내 포인트가 소멸될 예정입니다.
 기간 내 포인트 혜택을 누려보세요.3일 이내 포인트가 소멸될 예정입니다.
 기간 내 포인트 혜택을 누려보세요.3일 이내 포인트가 소멸될 예정입니다.
@@ -57,14 +58,16 @@
 
   <TextView
     android:id="@+id/text_view_detail"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="23dp"
     android:layout_marginTop="17dp"
+    android:layout_marginEnd="23dp"
     android:lineSpacingExtra="10sp"
     android:textColor="@color/C999999"
     android:textSize="12sp"
     app:layout_constraintBottom_toTopOf="@+id/text_view_show_contents"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/text_view_date"
     app:layout_goneMarginBottom="23dp"
@@ -86,32 +89,32 @@
     android:id="@+id/text_view_show_contents"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginStart="23dp"
     android:layout_marginTop="12dp"
     android:layout_marginBottom="23dp"
     android:gravity="center_horizontal"
     android:lineSpacingExtra="10sp"
     android:textColor="@color/C000000"
     android:textSize="12sp"
-    app:layout_constraintBottom_toBottomOf="parent"
+    android:layout_marginStart="23dp"
     app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toStartOf="@+id/image_view_open_arrow"
+    app:layout_constraintHorizontal_chainStyle="packed"
     app:layout_constraintTop_toBottomOf="@+id/text_view_detail"
-    tools:text="포인트 내역 확인"
-    tools:visibility="visible"
-    />
+    tools:visibility="visible"/>
 
   <ImageView
     android:id="@+id/image_view_open_arrow"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="2dp"
-    android:layout_marginBottom="25dp"
     android:rotation="-90"
     android:scaleType="center"
-    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintBottom_toBottomOf="@+id/text_view_show_contents"
+    app:layout_constraintTop_toTopOf="@+id/text_view_show_contents"
+    app:layout_constraintHorizontal_chainStyle="packed"
     app:layout_constraintStart_toEndOf="@+id/text_view_show_contents"
     app:srcCompat="@drawable/icon_openarrow"
-    tools:visibility="visible"
-    />
+    tools:visibility="visible"/>
 
 </android.support.constraint.ConstraintLayout>