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

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

@@ -87,6 +87,7 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
   private TextView textRecommendSubTitle;
   private ImageView imageRecommend;
   private View viewForTouchOfRecommend;
+  private View textRecommendButton;
 
   @Override
   protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -115,6 +116,7 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
     textRecommendSubTitle = findViewById(R.id.text_recommend_sub_title);
     imageRecommend = findViewById(R.id.image_view_recommend);
     viewForTouchOfRecommend = findViewById(R.id.view_for_touch_of_recommend);
+    textRecommendButton = findViewById(R.id.text_recommend_button);
 
     textCouponCount = findViewById(R.id.text_view_coupon_count);
     textPurchaseCount = findViewById(R.id.text_view_purchase_count);
@@ -218,6 +220,7 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
   @Override
   public void setRecommendContents(MyRecommendContentsBean bean) {
     if (null != bean && StringUtil.isFull(bean.getImageUrl())) {
+      textRecommendButton.setVisibility(View.VISIBLE);
       textRecommendTitle.setText(bean.getTitle());
       textRecommendSubTitle.setText(bean.getSubTitle());
 

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

@@ -120,23 +120,6 @@ public class MyMainModel extends Model {
 
   public void loadPurchaseCount(IEventListener listener) {
     listener.onEvent(new Event.Builder(Event.SUCCESS).integer(0).build());
-//    disposableEvent = new APIEventMyListModule().call(new RequestBean(), new APIModuleListener<EventListResultBean>() {
-//      @Override
-//      public void onApiSuccess(EventListResultBean resultBean) {
-//        if (null != resultBean.getData()) {
-//          int count = resultBean.getData().size();
-//          listener.onEvent(new Event.Builder(Event.SUCCESS).integer(count).build());
-//        }
-//        else {
-//          this.onApiError("invalid result", new APIError(APIError.ERROR_INVAlID_RESULT));
-//        }
-//      }
-//
-//      @Override
-//      public void onApiError(String errorMessage, APIError error) {
-//        listener.onEvent(new Event.Builder(Event.ERROR).integer(0).build());
-//      }
-//    });
   }
 
   public MyRecommendContentsBean getMyRecommendContentsBean() {

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

@@ -70,25 +70,24 @@
 
       <TextView
         android:id="@+id/text_view_write_app_review"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="11dp"
+        android:layout_marginTop="8dp"
         android:layout_marginEnd="24dp"
-        android:layout_marginBottom="11dp"
-        android:gravity="center_horizontal"
-        android:lineSpacingExtra="6sp"
-        android:padding="10dp"
-        android:textAlignment="center"
+        android:layout_marginBottom="8dp"
+        android:gravity="center"
+        android:includeFontPadding="false"
+        android:minWidth="100dp"
+        android:padding="7dp"
         android:textColor="@color/C000000"
         android:textSize="14sp"
         android:textStyle="bold"
-        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/guide_line"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@string/app_review_write"
+        tools:text="abcdabcdabcdabcdabcd"
         />
 
     </android.support.constraint.ConstraintLayout>

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

@@ -80,16 +80,17 @@
 
       <TextView
         android:id="@+id/text_view_next_time"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginTop="11dp"
+        android:layout_marginTop="9dp"
         android:layout_marginEnd="10dp"
-        android:layout_marginBottom="11dp"
+        android:layout_marginBottom="9dp"
         android:background="?android:attr/selectableItemBackground"
         android:gravity="center_horizontal"
         android:lineSpacingExtra="6sp"
-        android:padding="5dp"
+        android:minWidth="100dp"
+        android:padding="7dp"
         android:textColor="@color/C000000"
         android:textSize="14sp"
         android:textStyle="bold"
@@ -114,16 +115,17 @@
 
       <TextView
         android:id="@+id/text_view_write_app_review"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginTop="11dp"
+        android:layout_marginTop="9dp"
         android:layout_marginEnd="10dp"
-        android:layout_marginBottom="11dp"
+        android:layout_marginBottom="9dp"
         android:background="?android:attr/selectableItemBackground"
         android:gravity="center_horizontal"
         android:lineSpacingExtra="6sp"
-        android:padding="5dp"
+        android:minWidth="100dp"
+        android:padding="7dp"
         android:textColor="@color/C000000"
         android:textSize="14sp"
         android:textStyle="bold"

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

@@ -423,7 +423,7 @@
         android:textColor="@color/CFFFFFF"
         android:textSize="21sp"
         app:layout_constrainedHeight="true"
-        app:layout_constraintBottom_toTopOf="@+id/textView8"
+        app:layout_constraintBottom_toTopOf="@+id/text_recommend_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="parent"
@@ -432,7 +432,7 @@
         tools:text="주목해야할 어드벤쳐 여행지 10선 주목해야할  "/>
 
       <TextView
-        android:id="@+id/textView8"
+        android:id="@+id/text_recommend_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="31dp"
@@ -447,6 +447,8 @@
         android:text="@string/go_contents"
         android:textColor="@color/CFFFFFF"
         android:textSize="12sp"
+        android:visibility="gone"
+        tools:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"/>