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

.idea/assetWizardSettings.xml

@@ -14,11 +14,11 @@
                         <option name="values">
                           <map>
                             <entry key="assetSourceType" value="FILE" />
-                            <entry key="height" value="16" />
+                            <entry key="height" value="11" />
                             <entry key="outputName" value="icon_bucket_complete" />
                             <entry key="overrideSize" value="true" />
-                            <entry key="sourceFile" value="C:\Users\Hasemi\Downloads\icon_bucket_complete.svg" />
-                            <entry key="width" value="16" />
+                            <entry key="sourceFile" value="C:\Users\Hasemi\Downloads\icon_bucket_complete_2.svg" />
+                            <entry key="width" value="11" />
                           </map>
                         </option>
                       </PersistentState>

app/src/main/java/kr/co/zumo/app/lifeplus/activity/ScreenIDMapper.java

@@ -30,9 +30,9 @@ public class ScreenIDMapper {
       case ScreenStarter.START_FROM_ON_BOARDING:
         screenId = ScreenID.ON_BOARDING;
         break;
-      case ScreenStarter.START_FROM_PERMISSION_INFO:
-        screenId = ScreenID.PERMISSION_INFO;
-        break;
+//      case ScreenStarter.START_FROM_PERMISSION_INFO:
+//        screenId = ScreenID.PERMISSION_INFO;
+//        break;
       case ScreenStarter.START_FROM_MEMBER_BLOCK:
         screenId = ScreenID.MEMBER_BLOCK;
         break;

app/src/main/java/kr/co/zumo/app/lifeplus/activity/ScreenStarter.java

@@ -39,7 +39,7 @@ public class ScreenStarter {
 
   public static final int START_FROM_MAIN = 0;
   public static final int START_FROM_NETWORK_ERROR = 1;
-  public static final int START_FROM_PERMISSION_INFO = 2;
+  //public static final int START_FROM_PERMISSION_INFO = 2;
   public static final int START_FROM_ON_BOARDING = 3;
   public static final int START_FROM_MEMBER_BLOCK = 4;
   public static final int START_FROM_MEMBER_REST = 5;
@@ -79,9 +79,9 @@ public class ScreenStarter {
        */
       login(userId);
     }
-    else if (preferences.isPermissionInfoDone() == false) {
-      gotoScreen(START_FROM_PERMISSION_INFO);
-    }
+//    else if (preferences.isPermissionInfoDone() == false) {
+//      gotoScreen(START_FROM_PERMISSION_INFO);
+//    }
     else if (preferences.isTutorialDone() == false) {
       gotoScreen(START_FROM_ON_BOARDING);
     }

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

@@ -60,7 +60,8 @@ public class BucketListFragment extends FragmentBase<BucketListPresenter> implem
   protected void defineActionBar() {
     ActionBarManager actionBarManager = ActionBarManager.getInstance();
     actionBarManager.setProgressVisible(false);
-    actionBarManager.setTitleVisible(false);
+    actionBarManager.setTitleVisible(true);
+    actionBarManager.setTitle(R.string.bucket_list);
     actionBarManager.setBiVisible(false);
     actionBarManager.setMenuVisible(true);
     actionBarManager.setSearchVisible(true);

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

@@ -61,11 +61,11 @@ public class BucketListPagerAdapter extends PagerAdapter {
         textViewBucketListTitle.setText(R.string.bucket_list_best_example2);
         break;
       case 2:
-        imageViewShowBucketList.setImageResource(R.drawable.img_bestbucket_3);
+        imageViewShowBucketList.setImageResource(R.drawable.img_bestbucket_4);
         textViewBucketListTitle.setText(R.string.bucket_list_best_example3);
         break;
       case 3:
-        imageViewShowBucketList.setImageResource(R.drawable.img_bestbucket_4);
+        imageViewShowBucketList.setImageResource(R.drawable.img_bestbucket_3);
         textViewBucketListTitle.setText(R.string.bucket_list_best_example4);
         break;
       case 4:

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

@@ -0,0 +1,61 @@
+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
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-17]   [최초 작성]
+ * @since 2018-10-17
+ */
+public class MyBucketListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+
+  @NonNull
+  @Override
+  public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    return null;
+  }
+
+  @Override
+  public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+
+  }
+
+  @Override
+  public int getItemCount() {
+    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/bucketlist/MyBucketListFragment.java

@@ -0,0 +1,60 @@
+package kr.co.zumo.app.lifeplus.view.fragment.bucketlist;
+
+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.IView;
+import kr.co.zumo.app.lifeplus.view.fragment.FragmentBase;
+import kr.co.zumo.app.lifeplus.view.presenter.BucketListPresenter;
+
+/**
+ * MyBucketListFragment
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-17]   [최초 작성]
+ * @since 2018-10-17
+ */
+public class MyBucketListFragment extends FragmentBase<BucketListPresenter> implements IView {
+
+
+  @Nullable
+  @Override
+  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    View view = inflater.inflate(R.layout.fragment_my_bucket_list, container, false);
+    return view;
+  }
+
+  @Override
+  protected void onAfterActivityCreated(Bundle savedInstanceState) {
+
+  }
+
+  @Override
+  protected void defineActionBar() {
+    ActionBarManager actionBarManager = ActionBarManager.getInstance();
+    actionBarManager.setProgressVisible(false);
+    actionBarManager.setTitleVisible(true);
+    actionBarManager.setTitle(R.string.bucket_list);
+    actionBarManager.setBiVisible(false);
+    actionBarManager.setMenuVisible(true);
+    actionBarManager.setSearchVisible(true);
+    actionBarManager.setBackVisible(true);
+    actionBarManager.show();
+  }
+
+  @Override
+  protected BucketListPresenter definePresenter() {
+    return new BucketListPresenter(getModel(BlankModel.class), this);
+  }
+
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/setting/SwitchTrackTextDrawable.java

@@ -26,13 +26,10 @@ import kr.co.zumo.app.lifeplus.util.ResourceUtil;
  */
 public class SwitchTrackTextDrawable extends Drawable {
 
-  private final Context mContext;
-
-  private final String mLeftText;
-
-  private final String mRightText;
-
-  private final Paint mTextPaint;
+  private Context context;
+  private String leftText;
+  private String rightText;
+  private Paint textPaint;
   private boolean isChecked;
 
   public SwitchTrackTextDrawable(@NonNull Context context,
@@ -40,27 +37,25 @@ public class SwitchTrackTextDrawable extends Drawable {
                                  @StringRes int rightTextId,
                                  boolean isChecked
   ) {
-    mContext = context;
-
+    this.context = context;
     this.isChecked = isChecked;
 
     if (isChecked) {
       //switch on
-      mLeftText = context.getString(leftTextId);
-      mTextPaint = LeftTextPaint();
-      mRightText = context.getString(R.string.empty_string);
-
+      textPaint = doTextPaint();
+      leftText = context.getString(leftTextId);
+      rightText = context.getString(R.string.empty_string);
     }
     else {
       //switch off
-      mLeftText = context.getString(R.string.empty_string);
-      mTextPaint = LeftTextPaint();
-      mRightText = context.getString(rightTextId);
+      textPaint = doTextPaint();
+      leftText = context.getString(R.string.empty_string);
+      rightText = context.getString(rightTextId);
     }
 
   }
 
-  private Paint LeftTextPaint() {
+  private Paint doTextPaint() {
     Paint textPaint = new Paint();
     textPaint.setAntiAlias(true);
     textPaint.setStyle(Paint.Style.FILL);
@@ -73,23 +68,30 @@ public class SwitchTrackTextDrawable extends Drawable {
   @Override
   public void draw(@NonNull Canvas canvas) {
     final Rect textBounds = new Rect();
-    mTextPaint.getTextBounds(mRightText, 0, mRightText.length(), textBounds);
-
-    // The baseline for the text: centered, including the height of the text itself
-    //final int heightBaseline = canvas.getClipBounds().height() / 2 + textBounds.height() / 2;
-    final int widthQuarter = canvas.getClipBounds().width() / 4;
-
-    //on 텍스트 흰색 변경
-    mTextPaint.setColor(mContext.getResources().getColor(android.R.color.white));
-    canvas.drawText(mLeftText, 0, mLeftText.length(),
-      widthQuarter + 15, 53,
-      mTextPaint);
-
-    //off  텍스트 검정 변경
-    mTextPaint.setColor(mContext.getResources().getColor(android.R.color.darker_gray));
-    canvas.drawText(mRightText, 0, mRightText.length(),
-      widthQuarter * 3 - 25, 53,
-      mTextPaint);
+    int heightBaseline;
+    int widthQuarter = canvas.getClipBounds().width() / 4;;
+
+    if (isChecked) {
+      //on 텍스트 흰색 변경
+      textPaint.getTextBounds(leftText, 0, leftText.length(), textBounds);
+      heightBaseline = canvas.getClipBounds().height() / 2 + textBounds.height() / 2;
+      textPaint.setColor(context.getResources().getColor(android.R.color.white));
+      canvas.drawText(leftText, 0, leftText.length(),
+        widthQuarter + 15, heightBaseline,
+        textPaint);
+    }
+    else {
+      //off  텍스트 검정 변경
+      textPaint.getTextBounds(rightText, 0, rightText.length(), textBounds);
+      widthQuarter = canvas.getClipBounds().width() / 4;
+      heightBaseline = canvas.getClipBounds().height() / 2 + textBounds.height() / 2;
+      textPaint.setColor(context.getResources().getColor(android.R.color.darker_gray));
+      canvas.drawText(rightText, 0, rightText.length(),
+        widthQuarter * 3 - 20, heightBaseline,
+        textPaint);;
+    }
+
+
   }
 
   @Override

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

@@ -13,7 +13,6 @@
     android:id="@+id/image_show_bucket_list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_alignParentBottom="true"
     android:layout_centerHorizontal="true"
     android:scaleType="fitXY"
     tools:srcCompat="@drawable/img_bestbucket_1"/>
@@ -36,10 +35,10 @@
     android:layout_height="wrap_content"
     android:layout_centerInParent="true"
     android:lineSpacingExtra="10sp"
-    tools:text="@string/bucket_list_best_example1"
     android:textAlignment="center"
     android:textColor="@color/CFFFFFF"
-    android:textSize="25sp"/>
+    android:textSize="25sp"
+    tools:text="@string/bucket_list_best_example1"/>
 
   <ImageView
     android:id="@+id/button_show_bucket_list"

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout
+<LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
@@ -7,15 +7,18 @@
   android:background="@color/CFFFFFF"
   android:orientation="vertical">
 
+  <RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginBottom="@dimen/action_bar_height">
   <android.support.v4.view.ViewPager
     android:id="@+id/view_pager_bucket_list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_alignParentTop="true"
-    android:layout_marginTop="30dp"
     android:layout_marginBottom="35dp"
+    android:layout_marginTop="30dp"
     android:paddingLeft="25dp"
-    android:paddingTop="30dp"
     android:paddingRight="25dp"/>
 
   <android.support.design.widget.TabLayout
@@ -60,5 +63,5 @@
     android:text="@string/bucket_list_write"
     android:textColor="@color/CD0D0D0"
     android:textSize="12sp"/>
-
-</RelativeLayout>
+  </RelativeLayout>
+</LinearLayout>

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

@@ -91,11 +91,10 @@
     android:layout_marginTop="28dp"
     android:layout_marginEnd="25dp">
 
-    <GridView
+    <android.support.v7.widget.RecyclerView
       android:layout_width="match_parent"
       android:layout_height="wrap_content">
-
-    </GridView>
+    </android.support.v7.widget.RecyclerView>
 
   </LinearLayout>
 </LinearLayout>

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

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="148dp"
+  android:layout_height="148dp"
+  android:background="@drawable/faq_text_border"
+ >
+
+  <TextView
+    android:id="@+id/text_view_bucket_title"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_centerInParent="true"
+    android:lineSpacingExtra="6sp"
+    android:text="@string/bucket_list_best_example1"
+    android:textColor="@color/C000000"
+    android:textSize="14sp"/>
+
+  <TextView
+    android:id="@+id/text_view_bucket_hash_tag1"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignTop="@+id/text_view_bucket_hash_tag2"
+    android:layout_marginStart="5dp"
+    android:layout_marginTop="0dp"
+    android:layout_toEndOf="@+id/text_view_bucket_hash_tag2"
+    android:lineSpacingExtra="4sp"
+    android:text="#시계"
+    android:textColor="#666666"
+    android:textSize="10.5sp"/>
+
+  <TextView
+    android:id="@+id/text_view_bucket_hash_tag2"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_below="@+id/text_view_bucket_title"
+    android:layout_alignStart="@+id/text_view_bucket_title"
+    android:layout_marginTop="7dp"
+    android:layout_marginBottom="26dp"
+    android:lineSpacingExtra="4sp"
+    android:text="#구매하기"
+    android:textColor="#666666"
+    android:textSize="10.5sp"/>
+
+  <ImageView
+    android:id="@+id/image_view_bucket_check"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignTop="@+id/text_view_bucket_title"
+    android:layout_marginTop="4dp"
+    android:layout_marginEnd="6dp"
+    android:layout_toStartOf="@+id/text_view_bucket_title"
+    app:srcCompat="@drawable/icon_bucket_complete"/>
+</RelativeLayout>