Переглянути джерело

[이벤트][Common] 참여하기 레이아웃 일부 수정

Hasemi 6 роки тому
батько
коміт
7f9765fa78

+ 3 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/EventParticipationCheckbox.java

@@ -23,18 +23,18 @@ import kr.co.zumo.app.R;
  * @history 하세미   [2019-01-16]   [최초 작성]
  * @since 2019-01-16
  */
-public class EventParticipationCheckbox extends ConstraintLayout {
+public class EventMultiCheckBox extends ConstraintLayout {
 
   private LayoutInflater inflater;
   private CheckBox checkBox;
 
 
-  public EventParticipationCheckbox(Context context) {
+  public EventMultiCheckBox(Context context) {
     super(context);
     init(context);
   }
 
-  public EventParticipationCheckbox(Context context, AttributeSet attrs) {
+  public EventMultiCheckBox(Context context, AttributeSet attrs) {
     super(context, attrs);
     init(context);
   }

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventQuestionMultiView.java

@@ -12,7 +12,7 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.EventQuestionBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventQuestionItemBean;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
-import kr.co.zumo.app.lifeplus.view.custom.EventParticipationCheckbox;
+import kr.co.zumo.app.lifeplus.view.custom.EventMultiCheckBox;
 
 /**
  * EventParticipationMultipleChoiceViewHolder
@@ -43,7 +43,7 @@ class EventQuestionMultiView extends EventQuestionView {
 
     for (int i = 0; i < bean.getEventQuestionItemBeanList().size(); i++) {
       EventQuestionItemBean itemBean = bean.getEventQuestionItemBeanList().get(i);
-      EventParticipationCheckbox checkbox = new EventParticipationCheckbox(itemView.getContext());
+      EventMultiCheckBox checkbox = new EventMultiCheckBox(itemView.getContext());
       checkbox.setText(itemBean.getQuestionItemName());
       layoutChoiceView.addView(checkbox);
     }

+ 0 - 1
app/src/main/res/layout/event_participation_checkbox.xml

@@ -15,7 +15,6 @@
     android:background="@drawable/custom_rectangle_radio_selector"
     android:button="@null"
     android:includeFontPadding="false"
-    android:singleLine="true"
     android:drawableLeft="@drawable/custom_check_box"
     android:drawablePadding="8dp"
     android:lineSpacingExtra="0sp"

+ 1 - 1
app/src/main/res/layout/event_participation_item_single_choice.xml

@@ -25,7 +25,7 @@
     android:id="@+id/layout_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="15dp"
+    android:layout_marginTop="8dp"
     android:orientation="vertical"
     android:paddingStart="12dp"
     android:paddingEnd="12dp"

+ 6 - 1
app/src/main/res/layout/event_single_answer_check.xml

@@ -12,15 +12,20 @@
     android:layout_width="match_parent"
     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"
     android:checked="false"
-    android:lineSpacingExtra="6sp"
+    android:includeFontPadding="false"
+    android:lineSpacingExtra="0sp"
     android:textColor="@drawable/my_faq_radio_text_selector"
     android:textSize="14sp"
+    app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
     tools:text="텍스트 영역의 텍스트 길이가 2줄 Full 케이스일
 경우 사용됨"
     />

+ 6 - 2
app/src/main/res/layout/fragment_search.xml

@@ -24,7 +24,9 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="42dp"
-      android:lineSpacingExtra="6sp"
+      android:includeFontPadding="false"
+      android:lineSpacingExtra="0sp"
+      android:singleLine="true"
       android:text="@string/search_hint_hash"
       android:textColor="@color/C000000"
       android:textSize="16sp"
@@ -43,10 +45,12 @@
       android:background="@null"
       android:hint="@string/search_hint"
       android:imeOptions="actionSearch"
+      android:includeFontPadding="false"
       android:inputType="text"
-      android:maxLines="1"
+      android:lineSpacingExtra="0dp"
       android:paddingTop="10dp"
       android:paddingBottom="10dp"
+      android:singleLine="true"
       android:textColor="@color/C000000"
       android:textSize="16sp"
       app:layout_constrainedWidth="true"

Різницю між файлами не показано, бо вона завелика
+ 1 - 1
app/src/sandbox/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java