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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/onboarding/OnBoardingFragment.java

@@ -19,7 +19,6 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 import kr.co.zumo.app.lifeplus.model.BlankModel;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
-import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 
 /**
@@ -51,11 +50,11 @@ public class OnBoardingFragment extends FragmentBase<OnBoardingPresenter> implem
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
 
-    bottomBar = (View) findViewById(R.id.tutorial_bottom_layout);
+ //   bottomBar = (View) findViewById(R.id.tutorial_bottom_layout);
     viewPager = (ViewPager) findViewById(R.id.tutorial_view_pager);
     tabLayout = (TabLayout) findViewById(R.id.tutorial_tab_layout);
-    buttonTutorial1 = (TextView) bottomBar.findViewById(R.id.button1_tutorial);
-    buttonTutorial2 = (TextView) bottomBar.findViewById(R.id.button2_tutorial);
+//    buttonTutorial1 = (TextView) bottomBar.findViewById(R.id.button1_tutorial);
+//    buttonTutorial2 = (TextView) bottomBar.findViewById(R.id.button2_tutorial);
 
     findViewById(R.id.main_content).setPadding(0, ResourceUtil.getStatusBarHeight(), 0, 0);
 
@@ -79,7 +78,7 @@ public class OnBoardingFragment extends FragmentBase<OnBoardingPresenter> implem
 
       // TODO: 2차 오픈: 준비중, 얼랏 처리
       public void onPageSelected(int position) {
-        bottomBar.setVisibility(position != 3 ? View.VISIBLE : View.INVISIBLE);
+        //bottomBar.setVisibility(position != 0 ? View.VISIBLE : View.INVISIBLE);
       }
 
       @Override
@@ -88,8 +87,8 @@ public class OnBoardingFragment extends FragmentBase<OnBoardingPresenter> implem
 
       }
     });
-    buttonTutorial1.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_LEFT).build()));
-    buttonTutorial2.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_RIGHT).build()));
+//    buttonTutorial1.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_LEFT).build()));
+//    buttonTutorial2.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_RIGHT).build()));
 
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/onboarding/OnBoardingPagerAdapter.java

@@ -33,7 +33,7 @@ public class OnBoardingPagerAdapter extends PagerAdapter {
   protected LayoutInflater layoutInflater;
   private Presenter presenter;
  // private static final int VIEW_COUNT = 5;
-  private static final int VIEW_COUNT = 4;
+  private static final int VIEW_COUNT = 1;
 
   /**
    * event 처리를 위한 presenter 설정
@@ -95,28 +95,29 @@ public class OnBoardingPagerAdapter extends PagerAdapter {
     tabLayout.setVisibility(View.VISIBLE);
 
     switch (position) {
-      case 0:
-        imageViewTutorial.setImageResource(R.drawable.mockup_step_01);
-        textViewTitle.setText(R.string.tutorial_title1);
-        textViewDetail.setText(R.string.tutorial_title1_message);
-        break;
       // TODO: 2차 오픈: 준비중, 얼랏 처리
+//      case 0:
+//        imageViewTutorial.setImageResource(R.drawable.mockup_step_01);
+//        textViewTitle.setText(R.string.tutorial_title1);
+//        textViewDetail.setText(R.string.tutorial_title1_message);
+//        break;
+//
 //      case 1:
 //        imageViewTutorial.setImageResource(R.drawable.mockup_step_02);
 //        textViewTitle.setText(R.string.tutorial_title2);
-//        textViewDetail.setText(R.string.tutorial_title2_message);
+//       textViewDetail.setText(R.string.tutorial_title2_message);
 //        break;
-      case 1:
-        imageViewTutorial.setImageResource(R.drawable.mockup_step_03);
-        textViewTitle.setText(R.string.tutorial_title3);
-        textViewDetail.setText(R.string.tutorial_title3_message);
-        break;
-      case 2:
-        imageViewTutorial.setImageResource(R.drawable.mockup_step_04);
-        textViewTitle.setText(R.string.tutorial_title4);
-        textViewDetail.setText(R.string.tutorial_title4_message);
-        break;
-      case 3:
+//      case 1:
+//        imageViewTutorial.setImageResource(R.drawable.mockup_step_03);
+//        textViewTitle.setText(R.string.tutorial_title3);
+//        textViewDetail.setText(R.string.tutorial_title3_message);
+//        break;
+//      case 2:
+//        imageViewTutorial.setImageResource(R.drawable.mockup_step_04);
+//        textViewTitle.setText(R.string.tutorial_title4);
+//        textViewDetail.setText(R.string.tutorial_title4_message);
+//        break;
+      case 0:
         //하단 바 사라짐
         view = layoutInflater.inflate(R.layout.on_boarding_last, container, false);
         Button buttonStart = view.findViewById(R.id.button_start_main);

app/src/main/res/drawable/listicle_dim_bottom_15.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+  <gradient
+    android:angle="90"
+    android:endColor="#00000000"
+    android:centerColor="#20000000"
+    android:startColor="#26000000"
+    android:type="linear"/>
+</shape>

app/src/main/res/drawable/listicle_dim_bottom_30.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+  <gradient
+    android:angle="90"
+    android:endColor="#00000000"
+    android:startColor="#4d000000"
+    android:type="linear"/>
+</shape>

app/src/main/res/drawable/listicle_dim_full.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+
+  <solid android:color="#1A000000"/>
+  <corners
+    android:radius="0dp"/>
+</shape>

app/src/main/res/drawable/listicle_dim_top.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+<gradient
+  android:angle="90"
+  android:endColor="#00000000"
+  android:startColor="#38000000"
+  android:centerColor="#0F000000"
+  android:type="linear"/>
+</shape>

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

@@ -7,6 +7,7 @@
   android:layout_height="match_parent"
   android:descendantFocusability="blocksDescendants">
 
+
   <android.support.v7.widget.RecyclerView
     android:id="@+id/recycler_view_listicle_view"
     android:layout_width="match_parent"
@@ -14,6 +15,43 @@
     android:nestedScrollingEnabled="false">
 
   </android.support.v7.widget.RecyclerView>
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="183dp"
+    android:background="@drawable/listicle_dim_top"
+    app:layout_constraintTop_toTopOf="parent"
+    android:rotation="180"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    />
+
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="183dp"
+    android:background="@drawable/listicle_dim_bottom_15"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    />
+
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="190dp"
+    android:background="@drawable/listicle_dim_bottom_30"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintBottom_toBottomOf="parent"
+    />
+
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/listicle_dim_full"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    />
 
   <android.support.constraint.ConstraintLayout
     android:id="@+id/layout_pager"
@@ -111,8 +149,7 @@
     android:textSize="26dp"
     app:layout_constraintBottom_toTopOf="@+id/text_view_title"
     app:layout_constraintStart_toStartOf="parent"
-    tools:text="05"
-    tools:textColor="@color/C000000"/>
+    tools:text="05"/>
 
   <ImageView
     android:id="@+id/oval"
@@ -136,8 +173,7 @@
     android:textSize="18dp"
     app:layout_constraintBottom_toTopOf="@+id/text_view_sub_title"
     app:layout_constraintStart_toStartOf="parent"
-    tools:text="진주, 로스팅웨어"
-    tools:textColor="@color/C000000"/>
+    tools:text="진주, 로스팅웨어"/>
 
   <TextView
     android:id="@+id/text_view_sub_title"
@@ -151,6 +187,5 @@
     app:layout_constraintBottom_toTopOf="@+id/layout_pager"
     app:layout_constraintStart_toStartOf="parent"
     tools:text="대문샷을 부르는 감각적인 로스팅 팩토리
-대문샷을 부르는 감각적인 로스팅 팩토리"
-    tools:textColor="@color/C000000"/>
+대문샷을 부르는 감각적인 로스팅 팩토리"/>
 </android.support.constraint.ConstraintLayout>

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

@@ -16,25 +16,5 @@
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
-    tools:src="@drawable/banner_bg_1"/>
-
-  <View
-    android:id="@+id/top_dim"
-    android:layout_width="match_parent"
-    android:layout_height="0dp"
-    android:background="@drawable/rectangle_dim_black_20"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"/>
-
-  <View
-    android:id="@+id/dim"
-    android:layout_width="match_parent"
-    android:layout_height="183dp"
-    android:background="@drawable/rectangle_dim_black_50_gradation"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    />
+    tools:src="@color/CFFFFFF"/>
 </android.support.constraint.ConstraintLayout>

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

@@ -26,6 +26,6 @@
     app:tabGravity="center"
     app:tabIndicatorHeight="0dp"/>
 
-  <include layout="@layout/on_boarding_bottom_layout"/>
+  <!--<include layout="@layout/on_boarding_bottom_layout"/>-->
 
 </RelativeLayout>