Jelajahi Sumber

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

Hasemi 6 tahun lalu
induk
melakukan
c714a7e1b7

+ 3 - 7
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventWinnerFragment.java

@@ -5,8 +5,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.constraint.ConstraintLayout;
 import android.support.constraint.ConstraintSet;
-import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -144,17 +142,16 @@ public class EventWinnerFragment extends FragmentBase<EventWinnerPresenter> impl
       constraintSet.constrainWidth(textViewName.getId(), 0);
       constraintSet.connect(textViewName.getId(), ConstraintSet.START, nameId, ConstraintSet.START, 0);
       constraintSet.connect(textViewName.getId(), ConstraintSet.TOP, nameId, ConstraintSet.BOTTOM, marginEnd);
-      constraintSet.connect(textViewName.getId(), ConstraintSet.END, R.id.text_view_phone, ConstraintSet.START, nameMarginEnd);
+      constraintSet.connect(textViewName.getId(), ConstraintSet.END, R.id.text_view_phone, ConstraintSet.START, 0);
       nameId = textViewName.getId();
 
       constraintSet.constrainWidth(textViewNumber.getId(), 0);
-      constraintSet.connect(textViewNumber.getId(), ConstraintSet.START, numberId, ConstraintSet.START, 0);
+      constraintSet.connect(textViewNumber.getId(), ConstraintSet.START, R.id.text_view_phone, ConstraintSet.START, marginEnd);
       constraintSet.connect(textViewNumber.getId(), ConstraintSet.TOP, numberId, ConstraintSet.BOTTOM, marginEnd);
       constraintSet.connect(textViewNumber.getId(), ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END, marginEnd);
       numberId = textViewNumber.getId();
 
       constraintSet.applyTo(layoutContainer);
-
     }
   }
 
@@ -162,8 +159,7 @@ public class EventWinnerFragment extends FragmentBase<EventWinnerPresenter> impl
     textView.setId(View.generateViewId());
     textView.setTextSize(12);
     textView.setWidth(0);
-    textView.setSingleLine();
-    textView.setEllipsize(TextUtils.TruncateAt.END);
+    textView.setMaxLines(1);
     textView.setTextColor(ResourceUtil.getColor(R.color.C666666));
   }
 }