Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

app/src/main/java/kr/co/zumo/app/lifeplus/bean/MyCoinBean.java

@@ -0,0 +1,58 @@
+package kr.co.zumo.app.lifeplus.bean;
+
+/**
+ * MyCoinBean
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-17]   [최초 작성]
+ * @since 2018-10-17
+ */
+public class MyCoinBean extends JsonBeanBase {
+
+  private String title;
+  private String data;;
+  private String use_flag;
+  private String use_detail;
+
+  public MyCoinBean(String title, String data, String use_flag, String use_detail) {
+    this.title = title;
+    this.data = data;
+    this.use_flag = use_flag;
+    this.use_detail = use_detail;
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  public String getData() {
+    return data;
+  }
+
+  public void setData(String data) {
+    this.data = data;
+  }
+
+  public String getUse_flag() {
+    return use_flag;
+  }
+
+  public void setUse_flag(String use_flag) {
+    this.use_flag = use_flag;
+  }
+
+  public String getUse_detail() {
+    return use_detail;
+  }
+
+  public void setUse_detail(String use_detail) {
+    this.use_detail = use_detail;
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/bucketlist/MyBucketListAdapter.java

@@ -2,12 +2,7 @@ package kr.co.zumo.app.lifeplus.view.fragment.bucketlist;
 
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
-import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import kr.co.zumo.app.R;
 
 /**
  * MyBucketListAdapter
@@ -38,24 +33,6 @@ public class MyBucketListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
     return 8;
   }
 
-  private class MyBucketListViewHloder extends RecyclerView.ViewHolder{
-
-    private TextView textViewBucketTitle;
-    private TextView textViewHashTag1;
-    private TextView textViewHashTag2;
-    private ImageView imageViewCheck;
-
-    public MyBucketListViewHloder(View itemView) {
-      super(itemView);
-      textViewBucketTitle = itemView.findViewById(R.id.text_view_bucket_title);
-      textViewHashTag1= itemView.findViewById(R.id.text_view_bucket_hash_tag1);
-      textViewHashTag2 = itemView.findViewById(R.id.text_view_bucket_hash_tag2);
-      imageViewCheck = itemView.findViewById(R.id.image_view_bucket_check);
-    }
-
-
-
-  }
 
 
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/factory/BasicFragmentFactory.java

@@ -14,7 +14,7 @@ import kr.co.zumo.app.lifeplus.view.fragment.main.MainFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.member.MemberBlockFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.member.MemberRestActiveCompletedFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.member.MemberRestStartFragment;
-import kr.co.zumo.app.lifeplus.view.fragment.my.MyCoinFragment;
+import kr.co.zumo.app.lifeplus.view.fragment.my.coin.MyCoinFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.onboarding.OnBoardingFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.pin.PinConfirmFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.pin.PinResetFragment;

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/my/MyCoinFragment.java

@@ -1,57 +0,0 @@
-package kr.co.zumo.app.lifeplus.view.fragment.my;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
-import kr.co.zumo.app.lifeplus.model.BlankModel;
-import kr.co.zumo.app.lifeplus.view.fragment.FragmentBase;
-import kr.co.zumo.app.lifeplus.view.presenter.MyCoinPresenter;
-
-/**
- * MyCoinFragment
- * <pre>
- * </pre>
- *
- * @author 하세미
- * @version 1.0
- * @history 하세미   [2018-10-17]   [최초 작성]
- * @since 2018-10-17
- */
-public class MyCoinFragment extends FragmentBase<MyCoinPresenter> {
-
-  @Nullable
-  @Override
-  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.fragment_my_coin, container, false);
-  }
-
-  @Override
-  protected void onAfterActivityCreated(Bundle savedInstanceState) {
-
-  }
-
-  @Override
-  protected void defineActionBar() {
-    ActionBarManager actionBarManager = ActionBarManager.getInstance();
-    actionBarManager.setProgressVisible(false);
-    actionBarManager.setTitleVisible(true);
-    actionBarManager.setTitle(R.string.use_coin);
-    actionBarManager.setBiVisible(false);
-    actionBarManager.setMenuVisible(true);
-    actionBarManager.setSearchVisible(true);
-    actionBarManager.setBackVisible(true);
-    actionBarManager.show();
-
-  }
-
-  @Override
-  protected MyCoinPresenter definePresenter() {
-    return new MyCoinPresenter(getModel(BlankModel.class), this);
-  }
-}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/my/coin/MyCoinFragment.java

@@ -0,0 +1,89 @@
+package kr.co.zumo.app.lifeplus.view.fragment.my.coin;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+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;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.MyCoinBean;
+import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
+import kr.co.zumo.app.lifeplus.model.BlankModel;
+import kr.co.zumo.app.lifeplus.view.fragment.FragmentBase;
+import kr.co.zumo.app.lifeplus.view.fragment.setting.SettingExpandableListViewDecoration;
+import kr.co.zumo.app.lifeplus.view.presenter.MyCoinPresenter;
+
+/**
+ * MyCoinFragment
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-17]   [최초 작성]
+ * @since 2018-10-17
+ */
+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) {
+    return inflater.inflate(R.layout.fragment_my_coin, container, false);
+  }
+
+  @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);
+    recyclerViewCoinList.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
+    SettingExpandableListViewDecoration decoration = new SettingExpandableListViewDecoration(getActivity(), Color.parseColor("#ebebeb"), 1);
+    recyclerViewCoinList.addItemDecoration(decoration);
+    recyclerViewCoinList.setAdapter(adapter);
+
+  }
+
+  @Override
+  protected void defineActionBar() {
+    ActionBarManager actionBarManager = ActionBarManager.getInstance();
+    actionBarManager.setProgressVisible(false);
+    actionBarManager.setTitleVisible(true);
+    actionBarManager.setTitle(R.string.use_coin);
+    actionBarManager.setBiVisible(false);
+    actionBarManager.setMenuVisible(true);
+    actionBarManager.setSearchVisible(true);
+    actionBarManager.setBackVisible(true);
+    actionBarManager.setScrollable(true);
+    actionBarManager.show();
+
+  }
+
+  public void doDummyData(){
+    myCoinBeanList = new ArrayList<>();
+    myCoinBeanList.add(new MyCoinBean("스타벅스 아이스 아메리카노 Tall","2018.05.27","사용", "-4,100" ));
+    myCoinBeanList.add(new MyCoinBean("4월 출석체크 미션 성공","2018.05.27","적립", "+1,500" ));
+    myCoinBeanList.add(new MyCoinBean("메소드 친환경 핸드워시 ","2018.05.27","사용", "-4,100" ));
+    myCoinBeanList.add(new MyCoinBean("호텔앤리조트 가평 힐링 스토리\n" + "펜션 1박","2018.05.27","사용", "-4,100" ));
+    myCoinBeanList.add(new MyCoinBean("스타벅스 아이스 아메리카노 Tall","2018.05.27","사용", "-4,100" ));
+  }
+  @Override
+  protected MyCoinPresenter definePresenter() {
+    return new MyCoinPresenter(getModel(BlankModel.class), this);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/my/coin/MyCoinListViewAdapter.java

@@ -0,0 +1,55 @@
+package kr.co.zumo.app.lifeplus.view.fragment.my.coin;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.MyCoinBean;
+
+/**
+ * MyCoinListViewAdapter
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-17]   [최초 작성]
+ * @since 2018-10-17
+ */
+public class MyCoinListViewAdapter extends RecyclerView.Adapter<MyCoinViewHolder> {
+
+  private Context context;
+  private List<MyCoinBean> myCoinBeanList;
+
+
+  public MyCoinListViewAdapter(Context context,List<MyCoinBean> myCoinBeanList) {
+    this.context = context;
+    this.myCoinBeanList = myCoinBeanList;
+  }
+
+  @NonNull
+  @Override
+  public MyCoinViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    View view = LayoutInflater
+      .from(parent.getContext())
+      .inflate(R.layout.my_coin_detail_view, parent, false);
+    return new MyCoinViewHolder(view);
+  }
+
+  @Override
+  public void onBindViewHolder(@NonNull MyCoinViewHolder holder, int position) {
+    MyCoinBean bean = myCoinBeanList.get(position);
+    holder.doMyCoinDataSetting(bean);
+  }
+
+  @Override
+  public int getItemCount() {
+    return 5;
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/my/coin/MyCoinViewHolder.java

@@ -0,0 +1,45 @@
+package kr.co.zumo.app.lifeplus.view.fragment.my.coin;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.MyCoinBean;
+
+/**
+ * MyBucketListViewHolder
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-17]   [최초 작성]
+ * @since 2018-10-17
+ */
+public class MyCoinViewHolder extends RecyclerView.ViewHolder {
+
+
+  private TextView textViewCoinUseTitle;
+  private TextView textViewCoinUseDetail;
+  private TextView textViewCoinUseDate;
+  private TextView textViewCoinUseFlag;
+
+
+  public MyCoinViewHolder(View itemView) {
+
+    super(itemView);
+    textViewCoinUseTitle = itemView.findViewById(R.id.text_view_coin_use_title);
+    textViewCoinUseDetail= itemView.findViewById(R.id.text_view_coin_use_detail);
+    textViewCoinUseDate = itemView.findViewById(R.id.text_view_coin_use_date);
+    textViewCoinUseFlag = itemView.findViewById(R.id.text_view_coin_use_flag);
+
+  }
+
+  public void doMyCoinDataSetting(MyCoinBean bean){
+    textViewCoinUseTitle.setText(bean.getTitle());
+    textViewCoinUseDetail.setText(bean.getUse_detail());
+    textViewCoinUseDate.setText(bean.getData());
+    textViewCoinUseFlag.setText(bean.getUse_flag());
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/MyCoinPresenter.java

@@ -1,8 +1,10 @@
 package kr.co.zumo.app.lifeplus.view.presenter;
 
 import kr.co.zumo.app.lifeplus.model.BlankModel;
+import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IView;
+import kr.co.zumo.app.lifeplus.view.command.FragmentChangeCommand;
 
 /**
  * MyCoinPresenter
@@ -47,7 +49,8 @@ public class MyCoinPresenter extends Presenter<BlankModel, IView> {
 
   @Override
   public boolean onBackPressed() {
-    return false;
+    onCommand(new FragmentChangeCommand(ScreenID.MAIN, ScreenID.DIRECTION_BACK));
+    return true;
   }
 
   @Override
@@ -59,4 +62,6 @@ public class MyCoinPresenter extends Presenter<BlankModel, IView> {
   public void onResult(Event event) {
 
   }
+
+
 }

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
@@ -353,9 +353,9 @@
     </LinearLayout>
 
     <android.support.v7.widget.RecyclerView
+      android:id="@+id/recycler_view_coin_list"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginStart="25dp"
       android:layout_marginEnd="25dp"/>
-  </LinearLayout>
-</ScrollView>
+  </LinearLayout>

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

@@ -1,6 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                             android:layout_width="match_parent"
-                                             android:layout_height="match_parent">
+<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="wrap_content"
+    android:layout_marginStart="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:lineSpacingExtra="5.5sp"
+      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_marginTop="11dp"
+      android:layout_marginEnd="24dp"
+      android:lineSpacingExtra="5.5sp"
+      android:textColor="@color/CF12815"
+      android:textSize="14sp"
+      tools:text="-4,100"/>
+
+    <TextView
+      android:id="@+id/text_view_coin_use_date"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_below="@+id/text_view_coin_use_title"
+      android:layout_alignParentStart="true"
+      android:layout_marginStart="0dp"
+      android:layout_marginTop="5dp"
+      android:lineSpacingExtra="3.5sp"
+      android:textColor="@color/C999999"
+      android:textSize="12sp"
+      tools:text="2018.05.27"/>
+
+    <TextView
+      android:id="@+id/text_view_coin_use_flag"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_below="@+id/text_view_coin_use_title"
+      android:layout_alignParentStart="true"
+      android:layout_marginStart="64dp"
+      android:layout_marginTop="5dp"
+      android:lineSpacingExtra="4sp"
+      android:textColor="@color/C999999"
+      android:textSize="12sp"
+      tools:text="취소"/>
+  </RelativeLayout>
+
+</LinearLayout>
 
-</android.support.constraint.ConstraintLayout>