Преглед на файлове

[마이][Common] 마이코인 적립 사용 내역 스크롤뷰 제거

Hasemi преди 7 години
родител
ревизия
5d51f90eef

+ 8 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/my/coin/MyCoinFragment.java

@@ -9,6 +9,7 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,7 +35,10 @@ import kr.co.zumo.app.lifeplus.view.presenter.MyCoinPresenter;
 public class MyCoinFragment extends FragmentBase<MyCoinPresenter> {
 
   private RecyclerView recyclerViewCoinList;
+  private ImageView imageViewFilter;
   private List<MyCoinBean> myCoinBeanList;
+
+
   @Nullable
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -43,6 +47,8 @@ public class MyCoinFragment extends FragmentBase<MyCoinPresenter> {
 
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
+    imageViewFilter = findViewById(R.id.image_view_filter);
+    //imageViewFilter.setOnClickListener(view -> {presenter.onEvent();});
     doDummyData();
     recyclerViewCoinList = findViewById(R.id.recycler_view_coin_list);
     MyCoinListViewAdapter adapter = new MyCoinListViewAdapter(getActivity(), myCoinBeanList);
@@ -50,6 +56,7 @@ public class MyCoinFragment extends FragmentBase<MyCoinPresenter> {
     SettingExpandableListViewDecoration decoration = new SettingExpandableListViewDecoration(getActivity(), Color.parseColor("#ebebeb"), 1);
     recyclerViewCoinList.addItemDecoration(decoration);
     recyclerViewCoinList.setAdapter(adapter);
+
   }
 
   @Override
@@ -62,6 +69,7 @@ public class MyCoinFragment extends FragmentBase<MyCoinPresenter> {
     actionBarManager.setMenuVisible(true);
     actionBarManager.setSearchVisible(true);
     actionBarManager.setBackVisible(true);
+    actionBarManager.setScrollable(true);
     actionBarManager.show();
 
   }

+ 2 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/MyCoinPresenter.java

@@ -62,4 +62,6 @@ public class MyCoinPresenter extends Presenter<BlankModel, IView> {
   public void onResult(Event event) {
 
   }
+
+
 }

+ 8 - 9
app/src/main/res/layout/fragment_my_coin.xml

@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+<LinearLayout
+  xmlns:tools="http://schemas.android.com/tools"
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical">
 
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    >
 
     <LinearLayout
       android:layout_width="match_parent"
@@ -176,13 +172,17 @@
       android:background="@color/C000000"/>
 
     <LinearLayout
+      android:id="@+id/layout_filter_contents"
       android:layout_width="match_parent"
       android:layout_height="160dp"
       android:background="@color/CF8F8F8"
       android:orientation="vertical"
       android:paddingStart="25dp"
       android:paddingTop="30dp"
-      android:paddingEnd="25dp">
+      android:paddingEnd="25dp"
+      android:visibility="gone"
+      tools:visibility="visible"
+      >
 
 
       <RadioGroup
@@ -358,5 +358,4 @@
       android:layout_height="wrap_content"
       android:layout_marginStart="25dp"
       android:layout_marginEnd="25dp"/>
-  </LinearLayout>
-</ScrollView>
+  </LinearLayout>

+ 17 - 17
app/src/main/res/layout/my_coin_detail_view.xml

@@ -1,39 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   android:orientation="vertical"
+  xmlns:tools="http://schemas.android.com/tools"
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
 
   <RelativeLayout
     android:layout_width="match_parent"
-    android:layout_height="98dp"
+    android:layout_height="wrap_content"
     android:layout_marginStart="25dp"
-    android:layout_marginEnd="25dp">
+    android:layout_marginEnd="25dp"
+    android:paddingTop="30dp"
+    android:paddingBottom="30dp">
 
     <TextView
       android:id="@+id/text_view_coin_use_title"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginTop="30dp"
+
       android:lineSpacingExtra="5.5sp"
-      android:text="스타벅스 아이스 아메리카노 Tall"
       android:textColor="#000000"
       android:textSize="14sp"
+      tools:text="호텔앤리조트 가평 힐링 스토리
+펜션 1박"
       />
 
     <TextView
       android:id="@+id/text_view_coin_use_detail"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:layout_alignTop="@+id/text_view_coin_use_title"
       android:layout_alignParentEnd="true"
-      android:layout_alignParentBottom="true"
-      android:layout_marginEnd="16dp"
-      android:layout_marginBottom="38dp"
+      android:layout_marginTop="11dp"
+      android:layout_marginEnd="24dp"
       android:lineSpacingExtra="5.5sp"
-      android:text="-4,100"
       android:textColor="@color/CF12815"
-      android:textSize="14sp"/>
+      android:textSize="14sp"
+      tools:text="-4,100"/>
 
     <TextView
       android:id="@+id/text_view_coin_use_date"
@@ -41,14 +45,12 @@
       android:layout_height="wrap_content"
       android:layout_below="@+id/text_view_coin_use_title"
       android:layout_alignParentStart="true"
-      android:layout_alignParentBottom="true"
       android:layout_marginStart="0dp"
       android:layout_marginTop="5dp"
-      android:layout_marginBottom="28dp"
       android:lineSpacingExtra="3.5sp"
-      android:text="2018.05.27"
       android:textColor="@color/C999999"
-      android:textSize="12sp"/>
+      android:textSize="12sp"
+      tools:text="2018.05.27"/>
 
     <TextView
       android:id="@+id/text_view_coin_use_flag"
@@ -56,14 +58,12 @@
       android:layout_height="wrap_content"
       android:layout_below="@+id/text_view_coin_use_title"
       android:layout_alignParentStart="true"
-      android:layout_alignParentBottom="true"
       android:layout_marginStart="64dp"
       android:layout_marginTop="5dp"
-      android:layout_marginBottom="28dp"
       android:lineSpacingExtra="4sp"
-      android:text="취소"
       android:textColor="@color/C999999"
-      android:textSize="12sp"/>
+      android:textSize="12sp"
+      tools:text="취소"/>
   </RelativeLayout>
 
 </LinearLayout>