Forráskód Böngészése

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

Hasemi 6 éve
szülő
commit
4273e9eac3

+ 10 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/category/banner/MainBannerViewHolder.java

@@ -10,6 +10,7 @@ import com.bumptech.glide.request.RequestOptions;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.IImageTitleBean;
+import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 
@@ -40,9 +41,16 @@ public class MainBannerViewHolder extends RecyclerView.ViewHolder {
       imageViewBannerItem.setScaleType(ImageView.ScaleType.CENTER);
       Glide.with(imageViewBannerItem)
         .asBitmap()
-        .apply( new RequestOptions().placeholder(R.drawable.image_loading_middle))
+        .apply(new RequestOptions().placeholder(R.drawable.image_loading_middle))
         .load(bean.getImageUrl()).into(imageViewBannerItem);
-      textViewBannerItem.setText(bean.getTitle());
+      String title = bean.getTitle();
+      if (StringUtil.isFull(title)) {
+        textViewBannerItem.setText(title);
+        textViewBannerItem.setVisibility(View.VISIBLE);
+      }
+      else {
+        textViewBannerItem.setVisibility(View.GONE);
+      }
     }
 
     imageViewBannerItem.setOnClickListener(view -> {

+ 0 - 1
app/src/main/res/drawable/ic_checkbox_off.xml

@@ -1,6 +1,5 @@
 <vector android:height="14dp" android:viewportHeight="54"
     android:viewportWidth="54" android:width="14dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFF" android:fillType="evenOdd" android:pathData="M-98,-1332h1440v2560H-98z"/>
     <path android:fillColor="#E5E5E5" android:fillType="evenOdd" android:pathData="M27,27m-27,0a27,27 0,1 1,54 0a27,27 0,1 1,-54 0"/>
     <path android:fillColor="#00000000" android:fillType="evenOdd"
         android:pathData="M13.304,27.637l8.186,8.186L40.273,17.04"

+ 1 - 0
app/src/main/res/layout/dialog_promotion.xml

@@ -58,6 +58,7 @@
         android:padding="10dp"
         android:text="@string/not_show_today"
         android:textColor="@color/C999999"
+        app:layout_constraintHorizontal_bias="0"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"