Browse Source

[이벤트][Common] 이벤트 참여하기 구현중

Hasemi 7 years ago
parent
commit
fdd76b0390

+ 1 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventParticipationFragment.java

@@ -50,6 +50,7 @@ public class EventParticipationFragment extends FragmentBase<EventParticipationP
   protected void defineActionBar(ActionBarHelper actionBarHelper) {
     actionBarHelper.begin().title(R.string.evet_participation)
       .close(actionBar -> presenter.onNavigationClickClose(actionBar))
+      //.scroll()
       .show();
   }
 

+ 2 - 2
app/src/main/res/drawable/rectangle_c999999.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-  <solid
-    android:color="@color/C999999"/>
+<solid
+  android:color="@color/C999999"/>
 </shape>

+ 7 - 0
app/src/main/res/drawable/rectangle_cebebeb.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+  <stroke
+    android:width="1dp"
+    android:color="@color/CEBEBEB"/>
+</shape>

+ 51 - 3
app/src/main/res/layout/event_participation_item_agree.xml

@@ -1,6 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                             android:layout_width="match_parent"
-                                             android:layout_height="match_parent">
+<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:layout_marginStart="25dp"
+  android:layout_marginEnd="25dp"
+  >
 
+  <CheckBox
+    android:id="@+id/checkbox_all_agree"
+    style="@style/CommonCheckBox"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:text="@string/agree_all"
+    />
+
+  <View
+    android:layout_marginTop="20dp"
+    app:layout_constraintTop_toBottomOf="@+id/checkbox_all_agree"
+    android:id="@+id/view"
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:background="@color/CEBEBEB"/>
+
+  <LinearLayout
+    app:layout_constraintTop_toBottomOf="@+id/view"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="21dp"
+    android:orientation="horizontal"
+    >
+
+    <CheckBox
+      android:id="@+id/checkbox_agree4"
+      style="@style/CommonCheckBox"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:text="@string/phone_identify_agree4"
+      />
+
+    <ImageView
+      android:id="@+id/button_identify_agree4"
+      android:layout_width="19dp"
+      android:layout_height="19dp"
+      android:layout_gravity="center_vertical"
+      android:padding="4dp"
+      app:srcCompat="@drawable/icon_detail_arrow"/>
+  </LinearLayout>
 </android.support.constraint.ConstraintLayout>

+ 30 - 3
app/src/main/res/layout/event_participation_item_button.xml

@@ -1,6 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                             android:layout_width="match_parent"
-                                             android:layout_height="match_parent">
+<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.support.constraint.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginStart="25dp"
+    android:layout_marginEnd="25dp"
+    android:background="@color/C000000">
+
+    <TextView
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      app:layout_constraintBottom_toBottomOf="parent"
+      android:layout_marginTop="10dp"
+      android:layout_marginBottom="10dp"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:gravity="center_horizontal"
+      android:lineSpacingExtra="6sp"
+      android:text="신청하기"
+      android:textColor="@color/CFFFFFF"
+      android:textSize="15.7sp"
+      />
+
+  </android.support.constraint.ConstraintLayout>
 </android.support.constraint.ConstraintLayout>

+ 38 - 3
app/src/main/res/layout/event_participation_item_image.xml

@@ -1,6 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                             android:layout_width="match_parent"
-                                             android:layout_height="match_parent">
+<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:layout_marginStart="25dp"
+  android:layout_marginEnd="25dp">
+
+  <TextView
+    android:id="@+id/text_view_image"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:lineSpacingExtra="4sp"
+    android:text="@string/event_participation_image"
+    android:textColor="@color/C999999"
+    android:textSize="12sp"
+    />
+
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/layout_camera"
+    android:layout_width="73dp"
+    android:layout_height="73dp"
+    android:layout_marginTop="15dp"
+    android:background="@drawable/rectangle_cebebeb"
+    app:layout_constraintTop_toBottomOf="@+id/text_view_image">
+
+    <ImageView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      app:srcCompat="@drawable/icon_event_camera"
+      />
+
+  </android.support.constraint.ConstraintLayout>
 
 </android.support.constraint.ConstraintLayout>

+ 18 - 3
app/src/main/res/layout/event_participation_item_notice.xml

@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                             android:layout_width="match_parent"
-                                             android:layout_height="match_parent">
+<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:layout_marginStart="25dp"
+  android:layout_marginEnd="25dp"
+  android:background="@color/CF8F8F8"
+  >
+  <TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textSize="12sp"
+    android:textColor="@color/C000000"
+    android:lineSpacingExtra="4sp"
+    tools:text="꼭 확인해주세요"
+    />
 
 </android.support.constraint.ConstraintLayout>

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

@@ -9,7 +9,11 @@
   <ImageView
     android:id="@+id/image_view_background"
     android:layout_width="match_parent"
-    android:layout_height="269dp"
+    android:layout_height="0dp"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintDimensionRatio="V , 360: 269"
     tools:background="@color/CF8F8F8"/>
 
   <View
@@ -27,7 +31,7 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="35dp"
     android:layout_marginTop="40dp"
-    android:lineSpacingExtra="9.5sp"
+    android:lineSpacingExtra="10sp"
     android:textColor="@color/CFFFFFF"
     android:textSize="25sp"
     android:textStyle="bold"

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -781,6 +781,7 @@
   <string name="participation">신청하기</string>
   <string name="korea">대한민국</string>
   <string name="sweden">스웨덴</string>
+  <string name="agree_all">전체동의</string>
 
 
   <!-- 임의 추가 문자열 : 시작 -->