- 이벤트 글자수 표시 레이아웃 추가

- 북마크 통계 추가

app/build.gradle

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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/entry/EventQuestionAnswerViewHolder.java

@@ -5,6 +5,7 @@ import android.widget.TextView;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.EventQuestionBean;
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 import kr.co.zumo.app.lifeplus.view.SimpleTextWatcher;
@@ -25,12 +26,14 @@ public class EventQuestionAnswerViewHolder extends EventQuestionViewHolder {
   private ClearEditText editTextAnswer;
   private TextView textViewValidation;
   private TextView textViewQuestion;
+  private TextView textViewCount;
 
   public EventQuestionAnswerViewHolder(View itemView) {
     super(itemView);
     editTextAnswer = itemView.findViewById(R.id.edit_text_input);
     textViewQuestion = itemView.findViewById(R.id.text_view_question);
     textViewValidation = itemView.findViewById(R.id.text_validation);
+    textViewCount = itemView.findViewById(R.id.text_count);
   }
 
   @Override
@@ -51,6 +54,8 @@ public class EventQuestionAnswerViewHolder extends EventQuestionViewHolder {
       @Override
       public void onTextChanged(CharSequence s, int start, int before, int count) {
         listener.onEvent(new Event.Builder(Event.TEXT).index(index).string(s.toString()).build());
+        //TODO: set counting
+        textViewCount.setText(String.valueOf(s.length()));
       }
     });
   }

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

@@ -4,6 +4,7 @@ import android.util.Log;
 
 import kr.co.zumo.app.lifeplus.bean.ContentsDeliveryBean;
 import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
+import kr.co.zumo.app.lifeplus.helper.GoogleAnalyticsHelper;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.DoubleChecker;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -109,6 +110,10 @@ public class BookMarkListPresenter extends Presenter<BookMarkListModel, IBookMar
         Log.w("APP# BookMarkListPresenter | onEventInternal 104", "|" + bean.toPrettyJson());
         ContentsDeliveryBean contentsDeliveryBean = new ContentsDeliveryBean.Builder(bean).listItemNo(bean.getListItemNo()).build();
 
+        if(bean != null) {
+          googleAnalyticsHelper.sendGA(GoogleAnalyticsHelper.Category.CONTENTS_DETAIL, GoogleAnalyticsHelper.Label.BOOKMARK, bean.getTitle());
+        }
+
         model.setDeliveryPackaging(contentsDeliveryBean);
 
         go(ScreenID.CONTENTS);

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

@@ -1,57 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:focusable="true"
-  android:focusableInTouchMode="true"
-  android:paddingStart="25dp"
-  android:paddingTop="19dp"
-  android:paddingEnd="25dp"
-  >
-
-  <TextView
-    android:id="@+id/text_view_question"
-    android:layout_width="wrap_content"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:lineSpacingExtra="3.5sp"
-    android:textColor="@color/C999999"
-    android:textSize="12sp"
-    app:layout_constraintStart_toStartOf="parent"
-    tools:text="@string/event_question_answer_title"/>
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:paddingStart="25dp"
+    android:paddingTop="19dp"
+    android:paddingEnd="25dp">
 
+    <TextView
+        android:id="@+id/text_view_question"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:lineSpacingExtra="3.5sp"
+        android:textColor="@color/C999999"
+        android:textSize="12sp"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="@string/event_question_answer_title" />
 
-  <kr.co.zumo.app.lifeplus.view.custom.ClearEditText
-    android:id="@+id/edit_text_input"
-    android:layout_width="match_parent"
-    android:layout_height="66dp"
-    android:layout_marginTop="2dp"
-    android:background="@drawable/button_underline_background"
-    android:inputType="text"
-    android:lineSpacingExtra="6sp"
-    android:maxLines="1"
-    android:paddingStart="5dp"
-    android:paddingBottom="38dp"
-    android:textColorHint="@color/CC5C5C5"
-    android:textSize="14sp"
-    app:layout_constraintTop_toBottomOf="@+id/text_view_question"
-    android:hint="@string/event_question_answer_hint"/>
 
-  <TextView
-    android:id="@+id/text_validation"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="37dp"
-    android:lineSpacingExtra="4sp"
-    android:text="@string/event_question_answer_validation"
-    android:textColor="@color/CF13F15"
-    android:textSize="11sp"
-    android:visibility="gone"
-    app:layout_constraintStart_toStartOf="@+id/edit_text_input"
-    app:layout_constraintTop_toBottomOf="@+id/text_view_question"
-    app:layout_constraintVertical_chainStyle="spread_inside"
-    tools:visibility="visible"
-    />
+    <kr.co.zumo.app.lifeplus.view.custom.ClearEditText
+        android:id="@+id/edit_text_input"
+        android:layout_width="match_parent"
+        android:layout_height="66dp"
+        android:layout_marginTop="2dp"
+        android:background="@drawable/button_underline_background"
+        android:hint="@string/event_question_answer_hint"
+        android:inputType="text"
+        android:lineSpacingExtra="6sp"
+        android:maxLength="40"
+        android:maxLines="1"
+        android:paddingStart="5dp"
+        android:paddingBottom="38dp"
+        android:textColorHint="@color/CC5C5C5"
+        android:textSize="14sp"
+        app:layout_constraintTop_toBottomOf="@+id/text_view_question" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:gravity="right"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="37dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="@+id/edit_text_input"
+        app:layout_constraintTop_toBottomOf="@+id/text_view_question">
+
+        <TextView
+            android:id="@+id/text_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#f12815"
+            android:textSize="10.5sp"
+            android:text="0" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#999999"
+            android:textSize="10.5sp"
+            android:text=" / 40" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/text_validation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="37dp"
+        android:lineSpacingExtra="4sp"
+        android:text="@string/event_question_answer_validation"
+        android:textColor="@color/CF13F15"
+        android:textSize="11sp"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="@+id/edit_text_input"
+        app:layout_constraintTop_toBottomOf="@+id/text_view_question"
+        app:layout_constraintVertical_chainStyle="spread_inside"
+        tools:visibility="visible" />
 </android.support.constraint.ConstraintLayout>

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

@@ -4,6 +4,8 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="wrap_content"
+    android:paddingLeft="13dp"
+    android:paddingRight="13dp"
   android:layout_height="wrap_content">
 
   <CheckBox
@@ -11,9 +13,7 @@
     style="@style/CommonCheckBox"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginStart="13dp"
     android:layout_marginTop="7dp"
-    android:layout_marginEnd="13dp"
     android:layout_marginBottom="7dp"
     android:background="@null"
     android:button="@null"

app/src/main/res/values/strings.xml

@@ -934,6 +934,8 @@
   <string name="send_temporary_password">임시 비밀번호를\n메일로 전송하였습니다.</string>
   <string name="event_complete_title">참여가 완료되었습니다.</string>
   <string name="ga_title_and_url">%1$s_%2$s</string>
+  <string name="count">%1$d/%2$d</string>
+  <string name="count_default">0/40</string>
   <!-- zumo -->
 
   <!-- ad platform keys -->