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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsOverviewHolder.java

@@ -1,5 +1,7 @@
 package kr.co.zumo.app.lifeplus.view.screen.contents;
 
+import android.graphics.Bitmap;
+import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
@@ -7,7 +9,11 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
+import com.bumptech.glide.request.target.Target;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsItemBean;
@@ -36,6 +42,7 @@ public class ContentsOverviewHolder extends RecyclerView.ViewHolder {
   private IEventListener listener;
   private ContentsItemBean contentsItemBean;
   private ImageView flagVideo;
+  private View dim;
   private int index;
 
   public ContentsOverviewHolder(View itemView) {
@@ -44,7 +51,7 @@ public class ContentsOverviewHolder extends RecyclerView.ViewHolder {
     textViewTitle = itemView.findViewById(R.id.text_view_title);
     textViewSubTitle = itemView.findViewById(R.id.text_view_sub_title);
     textViewCategoryNumber = itemView.findViewById(R.id.text_view_category_number);
-    View dim = itemView.findViewById(R.id.view_dim);
+    dim = itemView.findViewById(R.id.view_dim);
     flagVideo = itemView.findViewById(R.id.image_view_video);
     Visibler.invisible(dim);
   }
@@ -67,6 +74,18 @@ public class ContentsOverviewHolder extends RecyclerView.ViewHolder {
           .asBitmap()
           .apply(new RequestOptions().centerCrop())
           .apply(new RequestOptions().placeholder(ResourceUtil.getDrawable(imageViewItem.getContext(), R.drawable.image_loading_second_category)))
+          .addListener(new RequestListener<Bitmap>() {
+            @Override
+            public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Bitmap> target, boolean isFirstResource) {
+              return false;
+            }
+
+            @Override
+            public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
+              Visibler.visible(dim);
+              return false;
+            }
+          })
           .load(url).into(imageViewItem);
       }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/inquiry/InquiryExpandableViewHolder.java

@@ -3,6 +3,7 @@
  */
 package kr.co.zumo.app.lifeplus.view.screen.inquiry;
 
+import android.graphics.Typeface;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
@@ -72,7 +73,9 @@ public class InquiryExpandableViewHolder extends RecyclerView.ViewHolder {
     }
     else {
       layoutAnswer.setVisibility(View.GONE);
-      TextUtil.toNormal(textViewQuestion);
+      // TODO: API 19버전 미작동
+      //TextUtil.toNormal(textViewQuestion);
+      textViewAnswer.setTypeface(null, Typeface.NORMAL);
     }
     buttonArrow.setImageResource(isExpanded ? R.drawable.icon_closearrow : R.drawable.icon_open_arrow);
 

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

@@ -56,7 +56,8 @@ public class NotiExpandableViewHolder extends NotiViewHolder {
     //textViewAlarmContents.setMovementMethod(LinkMovementMethod.getInstance());
 
     webView.getSettings().setJavaScriptEnabled(true);
-    webView.loadData(bean.getContents(), "text/html", "UTF-8");
+    webView.getSettings().setDefaultTextEncodingName("utf-8");
+    webView.loadData(bean.getContents(), "text/html; charset=utf-8", "UTF-8");
     // 스크롤바 없애기
 
     webView.setHorizontalScrollBarEnabled(false);

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

@@ -54,7 +54,7 @@
     <android.support.constraint.ConstraintLayout
       android:id="@+id/bottom_view"
       android:layout_width="match_parent"
-      android:layout_height="0dp"
+      android:layout_height="150dp"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/image_view_thumbnail">

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

@@ -10,9 +10,10 @@
     android:id="@+id/recycler_view_default_book_mark"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:paddingBottom="17dp"
     android:scrollbarStyle="outsideOverlay"
     android:scrollbars="vertical"
-    android:clipToPadding="false"
     app:layout_constraintTop_toTopOf="parent"/>
 
 </android.support.constraint.ConstraintLayout>

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

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-  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:background="@drawable/bgimg_step_05"
-  android:gravity="bottom"
-  android:orientation="vertical">
-
-  <ImageView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_alignParentStart="true"
-    android:layout_alignParentBottom="true"
-    android:layout_marginStart="35dp"
-    android:layout_marginBottom="17dp"
-    app:srcCompat="@drawable/ic_bi_step_5_wh"/>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentStart="true"
-    android:layout_alignParentBottom="true"
-    android:layout_marginStart="35dp"
-    android:layout_marginBottom="30dp"
-    android:orientation="vertical">
-
-    <TextView
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_alignParentStart="true"
-      android:layout_alignParentTop="true"
-      android:layout_marginBottom="13dp"
-      android:text="@string/tutorial_title_last"
-      android:textColor="@color/CFFFFFF"
-      android:textSize="30dp"/>
-
-    <TextView
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:lineSpacingExtra="5.8sp"
-      android:text="@string/tutorial_title_last_message"
-      android:textColor="@color/CFFFFFF"
-      android:textSize="17dp"
-      />
-
-  </LinearLayout>
-
-  <Button
-    android:id="@+id/button_start_main"
-    style="@style/WhiteButton"
-    android:layout_width="113dp"
-    android:layout_height="38dp"
-    android:layout_marginStart="35dp"
-    android:layout_marginBottom="39dp"
-    android:text="시작하기"
-    android:textColor="@color/C000000"/>
-
-</LinearLayout>

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

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-  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="match_parent"
-  android:layout_height="match_parent"
-  android:orientation="vertical"
-  android:paddingTop="100dp">
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-
-    android:orientation="vertical">
-
-    <TextView
-      android:id="@+id/text_view_tutorial_title"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:lineSpacingExtra="9sp"
-      android:textAlignment="center"
-      android:textColor="#000000"
-      android:textSize="24sp"
-      tools:text="@string/tutorial_start"
-      />
-  </LinearLayout>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="7dp"
-    android:orientation="vertical">
-
-    <TextView
-      android:id="@+id/text_view_tutorial_detail"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:lineSpacingExtra="5sp"
-      android:textAlignment="center"
-      android:textColor="#666666"
-      android:textSize="14sp"
-      tools:text="@string/tutorial_start"
-      />
-
-  </LinearLayout>
-
-  <Space
-    android:layout_width="match_parent"
-    android:layout_height="0dp"
-    android:layout_weight="1"/>
-
-  <RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center|bottom">
-
-    <ImageView
-      android:id="@+id/image_view_tutorial"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentStart="true"
-      android:layout_alignParentTop="true"
-      tools:src="@drawable/mockup_main_60"/>
-  </RelativeLayout>
-</LinearLayout>