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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/CoopRecommendGoodsHolder.java

@@ -33,6 +33,7 @@ public class CoopRecommendGoodsHolder {
   private TextView textViewProduct;
   private TextView textViewPrice;
   private ImageView imageViewDetailArrow;
+  private ImageView imageViewCoin;
 
   public CoopRecommendGoodsHolder(View itemView) {
     textViewTitle = itemView.findViewById(R.id.text_view_buy_text);
@@ -41,6 +42,7 @@ public class CoopRecommendGoodsHolder {
     textViewProduct = itemView.findViewById(R.id.text_view_product);
     textViewPrice = itemView.findViewById(R.id.text_view_price);
     imageViewDetailArrow = itemView.findViewById(R.id.image_view_detail_arrow);
+    imageViewCoin = itemView.findViewById(R.id.image_view_coin);
     layoutContainer = itemView.findViewById(R.id.layout_coops_recommend);
   }
 
@@ -50,9 +52,30 @@ public class CoopRecommendGoodsHolder {
     textViewStore.setText(bean.getBrand());
     textViewProduct.setText(bean.getName());
     textViewPrice.setText(StringUtil.toComma(bean.getPrice()));
+
     imageViewDetailArrow.setOnClickListener(view -> {
       listener.onEvent(new Event.Builder(Event.CLICK).build());
     });
+
+    imageViewCouponImage.setOnClickListener(view -> {
+      listener.onEvent(new Event.Builder(Event.CLICK).build());
+    });
+
+    textViewProduct.setOnClickListener(view -> {
+      listener.onEvent(new Event.Builder(Event.CLICK).build());
+    });
+
+    textViewPrice.setOnClickListener(view -> {
+      listener.onEvent(new Event.Builder(Event.CLICK).build());
+    });
+    
+    imageViewCoin.setOnClickListener(view -> {
+      listener.onEvent(new Event.Builder(Event.CLICK).build());
+    });
+
+    textViewStore.setOnClickListener(view -> {
+      listener.onEvent(new Event.Builder(Event.CLICK).build());
+    });
   }
 
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/main/MyMainPresenter.java

@@ -15,7 +15,6 @@ import kr.co.zumo.app.lifeplus.bean.api.BucketWithTagBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
 import kr.co.zumo.app.lifeplus.config.NetworkConfig;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
-import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.DoubleChecker;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -166,13 +165,7 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
         }
         break;
       case Event.MY_COIN_MAIN:
-        if (AppUtil.isDebug()) {
           go(ScreenID.MY_COIN_MAIN);
-        }
-        else {
-          // TODO: 추후개발 예정
-          showErrorDialog(R.string.ready_comment);
-        }
         break;
       case Event.DETAIL:
         // 버킷 상세

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

@@ -99,7 +99,7 @@ public class NotiPresenter extends Presenter<NotiModel, INotiView> {
 
   @Override
   public void onActionButtonClick() {
-    // todo 지우기 버튼 눌렀음
+    // // FIXME: 알림 전체보기 삭제됨
   }
 
   private void render() {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/widget/LifeplusWidget.java

@@ -8,13 +8,10 @@ import android.content.Intent;
 import android.widget.RemoteViews;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
-import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.AppWidgetTarget;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.activity.MainActivity;
-import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 
 /**
  * Implementation of App Widget functionality.
@@ -40,13 +37,24 @@ public class LifeplusWidget extends AppWidgetProvider {
     AppWidgetTarget backgroundImage = new AppWidgetTarget(context, R.id.image_view_background, views, appWidgetId);
 
     // TODO: RoundedCorners 적용 예정 
+//    Glide.with(context)
+//      .asBitmap()
+//      .load("http://210.216.157.64:38080/resources/contents/bucket/bg/img_bestbucket_1.jpg")
+//      .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(ResourceUtil.dpToPx(8))))
+//      .into(backgroundImage);
+//
+
+//    MultiTransformation multiTransformation = new MultiTransformation(
+//      new CenterCrop(),
+//      new RoundedCorners(100)
+//    );
+
+
     Glide.with(context)
       .asBitmap()
-      .apply(new RequestOptions().centerCrop().transform(new RoundedCorners(ResourceUtil.dpToPx(100))))
       .load("http://210.216.157.64:38080/resources/contents/bucket/bg/img_bestbucket_1.jpg")
       .into(backgroundImage);
 
-    appWidgetManager.updateAppWidget(appWidgetId, views);
 
   }
 
@@ -68,5 +76,8 @@ public class LifeplusWidget extends AppWidgetProvider {
   public void onDisabled(Context context) {
     // Enter relevant functionality for when the last widget is disabled
   }
+
+
 }
 
+

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

@@ -8,14 +8,20 @@
   android:layout_margin="@dimen/widget_margin"
   tools:background="@color/C000000">
 
-  <ImageView
-    android:id="@+id/image_view_background"
+  <FrameLayout
+    android:id="@+id/container_image_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/radius_8"
-    android:scaleType="centerCrop"
-    tools:background="@drawable/banner_bg_1"
-    />
+    android:background="@drawable/radius_8">
+
+    <ImageView
+      android:id="@+id/image_view_background"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:scaleType="centerCrop"
+      tools:background="@drawable/img_banner_mycoin"
+      />
+  </FrameLayout>
 
   <ImageView
     android:id="@+id/image_view_bi"

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

@@ -9,7 +9,7 @@
   <CheckBox
     android:id="@+id/check_box"
     android:layout_width="wrap_content"
-    android:layout_height="30dp"
+    android:layout_height="35dp"
     android:background="@null"
     android:button="@android:color/transparent"
     android:paddingStart="4dp"