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

app/build.gradle

@@ -39,7 +39,7 @@ android {
         minSdkVersion 19    // 4.4
         targetSdkVersion 27
         versionCode 169
-        versionName "4.0.0.125"
+        versionName "4.0.0.126"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true

app/src/main/java/kr/co/zumo/app/lifeplus/zumo/model/SignUpModel.java

@@ -125,6 +125,7 @@ public class SignUpModel extends BaseModel {
                 Log.i(TAG, "getMemberInfoByUserNo() -> onApiSuccess() -> resultBean: " + resultBean.toPrettyJson());
 
                 memberInfoBean = resultBean.getData();
+                SuperModel.getInstance().setUserEmail(memberInfoBean.getEmail());
 
                 if (memberInfoBean.isInActiveAccount()) { // 휴면회원
                     onResult(new Event.Builder(Event.CANCEL).integer(Event.GET_MEMBER_INFO).string(memberInfoBean.getUserNo()).build());
@@ -157,7 +158,6 @@ public class SignUpModel extends BaseModel {
                 String userNo = resultBean.getUserNo();
                 if (!StringUtil.isEmpty(userNo)) {
                     SuperModel.getInstance().setUserNo(userNo);
-                    SuperModel.getInstance().setUserEmail(requestBean.getEmail());
 
                     // 처음 메인 진입 시 스페셜 코드 스낵바 표시
                     ActivityDeliveryHelper.getInstance().setPackaging(new SignUpCompletedBean());
@@ -208,7 +208,6 @@ public class SignUpModel extends BaseModel {
                 onResult(new Event.Builder(Event.SUCCESS).integer(Event.SET_MEMBER_JOIN).string(userNo).build());
 
                 SuperModel.getInstance().setUserNo(userNo);
-                SuperModel.getInstance().setUserEmail(requestBean.getEmail());
 
                 // 처음 메인 진입 시 스페셜 코드 스낵바 표시
                 ActivityDeliveryHelper.getInstance().setPackaging(new SignUpCompletedBean());

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

@@ -13,8 +13,8 @@
     android:id="@+id/image_view_series"
     android:layout_width="123dp"
     android:layout_height="92dp"
-    android:scaleType="center"
     android:background="@color/CF6F6F6"
+    android:scaleType="center"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toStartOf="@+id/text_view_series_title"
     app:layout_constraintStart_toStartOf="parent"
@@ -23,14 +23,18 @@
 
   <TextView
     android:id="@+id/text_view_series_category"
-    android:layout_width="wrap_content"
+    android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_marginTop="7dp"
+    android:layout_marginEnd="25dp"
+    android:ellipsize="end"
     android:lineSpacingExtra="4sp"
     android:maxLines="1"
     android:textColor="@color/C666666"
     android:textSize="11sp"
+    app:layout_constrainedWidth="true"
     app:layout_constraintBottom_toTopOf="@+id/text_view_series_title"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="@+id/text_view_series_title"
     app:layout_constraintTop_toTopOf="parent"
     app:layout_constraintVertical_chainStyle="packed"