Merge pull request #2 from DS-UMC-7th/Feature/#1-Week1

[Week/#1] 1주차 워크북 미션
DS-UMC-7th · Sep 28, 2024 · 2ae267b · 2ae267b
2 parents 9b7ca9e + d1e5ac3
commit 2ae267b
Show file tree

Hide file tree

Showing 7 changed files with 302 additions and 4 deletions.
diff --git a/app/src/main/res/drawable/group_462__3_.xml b/app/src/main/res/drawable/group_462__3_.xml
@@ -0,0 +1,32 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="45dp"
+    android:viewportWidth="40"
+    android:viewportHeight="45">
+  <path
+      android:pathData="M13.263,3.543L13.487,3.639L13.708,3.536L20.002,0.599L26.404,3.537L26.629,3.641L26.854,3.539L33.368,0.597L39.457,3.392V40.741L33.468,43.536L26.517,40.587L26.29,40.491L26.068,40.597L19.992,43.531L13.485,40.592L13.261,40.491L13.037,40.592L6.525,43.532L0.543,40.741V3.387L6.424,0.596L13.263,3.543Z"
+      android:strokeWidth="1.08696"
+      android:fillColor="#F6F6F6"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M4.239,6.413h31.304v31.522h-31.304z"
+      android:strokeWidth="1.08696"
+      android:fillColor="#FFEFB6"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M14.131,15.326a1.196,1.848 0,1 0,2.391 0a1.196,1.848 0,1 0,-2.391 0z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M24.565,15.326a1.196,1.848 0,1 0,2.391 0a1.196,1.848 0,1 0,-2.391 0z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M20.109,21.413m-2.826,0a2.826,2.826 0,1 1,5.652 0a2.826,2.826 0,1 1,-5.652 0"
+      android:strokeWidth="1.08696"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M11.087,24.783C11.087,24.783 16.391,28.686 20.186,28.696C24.004,28.706 29.348,24.783 29.348,24.783"
+      android:strokeWidth="1.08696"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/group_462__4_.xml b/app/src/main/res/drawable/group_462__4_.xml
@@ -0,0 +1,32 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="45dp"
+    android:viewportWidth="40"
+    android:viewportHeight="45">
+  <path
+      android:pathData="M13.263,3.543L13.487,3.639L13.708,3.536L20.002,0.599L26.404,3.537L26.629,3.641L26.854,3.539L33.368,0.597L39.457,3.392V40.741L33.468,43.536L26.517,40.587L26.29,40.491L26.068,40.597L19.992,43.531L13.485,40.592L13.261,40.491L13.037,40.592L6.525,43.532L0.543,40.741V3.387L6.424,0.596L13.263,3.543Z"
+      android:strokeWidth="1.08696"
+      android:fillColor="#F6F6F6"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M4.239,6.413h31.304v31.522h-31.304z"
+      android:strokeWidth="1.08696"
+      android:fillColor="#CEE7F5"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M14.13,14.891a1.196,1.848 0,1 0,2.391 0a1.196,1.848 0,1 0,-2.391 0z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M24.565,14.891a1.196,1.848 0,1 0,2.391 0a1.196,1.848 0,1 0,-2.391 0z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M20.109,20.978m-2.826,0a2.826,2.826 0,1 1,5.652 0a2.826,2.826 0,1 1,-5.652 0"
+      android:strokeWidth="1.08696"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M29.06,27.065C29.06,27.339 28.89,27.768 28.44,28.296C28.003,28.809 27.355,29.354 26.535,29.853C24.895,30.852 22.63,31.63 20.159,31.63C17.696,31.63 15.4,30.799 13.709,29.743C12.864,29.215 12.184,28.641 11.716,28.103C11.246,27.562 11.043,27.121 11.017,26.838C11.031,26.503 11.107,26.29 11.198,26.15C11.29,26.012 11.423,25.906 11.624,25.828C12.064,25.659 12.747,25.655 13.682,25.77C14.244,25.84 14.838,25.943 15.472,26.052C15.887,26.124 16.318,26.199 16.768,26.269C17.878,26.442 19.057,26.578 20.187,26.521C21.508,26.454 22.768,26.273 23.899,26.096C24.073,26.069 24.244,26.042 24.411,26.015C25.34,25.868 26.156,25.739 26.857,25.689C27.703,25.63 28.251,25.7 28.58,25.892C28.842,26.045 29.06,26.337 29.06,27.065Z"
+      android:strokeWidth="1.08696"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/group_462__5_.xml b/app/src/main/res/drawable/group_462__5_.xml
@@ -0,0 +1,32 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="45dp"
+    android:viewportWidth="40"
+    android:viewportHeight="45">
+  <path
+      android:pathData="M13.263,3.543L13.487,3.639L13.708,3.536L20.002,0.599L26.404,3.537L26.629,3.641L26.854,3.539L33.368,0.597L39.457,3.392V40.741L33.468,43.536L26.517,40.587L26.29,40.491L26.068,40.597L19.992,43.531L13.485,40.592L13.261,40.491L13.037,40.592L6.525,43.532L0.543,40.741V3.387L6.424,0.596L13.263,3.543Z"
+      android:strokeWidth="1.08696"
+      android:fillColor="#F6F6F6"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M4.239,6.413h31.304v31.522h-31.304z"
+      android:strokeWidth="1.08696"
+      android:fillColor="#BEC3ED"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M13.696,14.891a1.196,1.848 0,1 0,2.391 0a1.196,1.848 0,1 0,-2.391 0z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M24.13,14.891a1.196,1.848 0,1 0,2.391 0a1.196,1.848 0,1 0,-2.391 0z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M20.109,20.978m-2.826,0a2.826,2.826 0,1 1,5.652 0a2.826,2.826 0,1 1,-5.652 0"
+      android:strokeWidth="1.08696"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M16.042,30.328L26.477,29.458"
+      android:strokeWidth="1.08696"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/group_462__6_.xml b/app/src/main/res/drawable/group_462__6_.xml
@@ -0,0 +1,32 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="45dp"
+    android:viewportWidth="40"
+    android:viewportHeight="45">
+  <path
+      android:pathData="M13.263,3.543L13.487,3.639L13.708,3.536L20.002,0.599L26.404,3.537L26.629,3.641L26.854,3.539L33.368,0.597L39.457,3.392V40.741L33.468,43.536L26.517,40.587L26.29,40.491L26.068,40.597L19.992,43.531L13.485,40.592L13.261,40.491L13.037,40.592L6.525,43.532L0.543,40.741V3.387L6.424,0.596L13.263,3.543Z"
+      android:strokeWidth="1.08696"
+      android:fillColor="#F6F6F6"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M4.239,6.413h31.304v31.522h-31.304z"
+      android:strokeWidth="1.08696"
+      android:fillColor="#B1D3B9"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M14.493,14.891a1.196,1.848 0,1 0,2.391 0a1.196,1.848 0,1 0,-2.391 0z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M24.928,14.891a1.196,1.848 0,1 0,2.391 0a1.196,1.848 0,1 0,-2.391 0z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M20.472,20.978m-2.826,0a2.826,2.826 0,1 1,5.652 0a2.826,2.826 0,1 1,-5.652 0"
+      android:strokeWidth="1.08696"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M28.829,30.865C28.829,30.865 23.923,26.472 20.147,26.099C16.347,25.723 10.652,29.117 10.652,29.117"
+      android:strokeWidth="1.08696"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/group_462__7_.xml b/app/src/main/res/drawable/group_462__7_.xml
@@ -0,0 +1,32 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="45dp"
+    android:viewportWidth="40"
+    android:viewportHeight="45">
+  <path
+      android:pathData="M13.263,3.543L13.487,3.639L13.708,3.536L20.002,0.599L26.404,3.537L26.629,3.641L26.854,3.539L33.368,0.597L39.457,3.392V40.741L33.468,43.536L26.517,40.587L26.29,40.491L26.068,40.597L19.992,43.531L13.485,40.592L13.261,40.491L13.037,40.592L6.525,43.532L0.543,40.741V3.387L6.424,0.596L13.263,3.543Z"
+      android:strokeWidth="1.08696"
+      android:fillColor="#F6F6F6"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M4.239,6.413h31.304v31.522h-31.304z"
+      android:strokeWidth="1.08696"
+      android:fillColor="#EB8B8B"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M27.319,14.562C27.319,15.524 26.638,16.304 25.798,16.304C24.957,16.304 24.276,15.524 24.276,14.562C24.276,14.291 25.109,14.357 25.801,14.152C26.545,13.931 27.319,13.6 27.319,14.562Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M14.493,14.562C14.493,15.524 15.175,16.304 16.015,16.304C16.855,16.304 17.537,15.524 17.537,14.562C17.537,14.291 16.704,14.357 16.012,14.152C15.267,13.931 14.493,13.6 14.493,14.562Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M20.472,20.544m-2.826,0a2.826,2.826 0,1 1,5.652 0a2.826,2.826 0,1 1,-5.652 0"
+      android:strokeWidth="1.08696"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M28.829,30.431C28.829,30.431 23.923,26.037 20.147,25.664C16.347,25.289 10.652,28.682 10.652,28.682"
+      android:strokeWidth="1.08696"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/vector.xml b/app/src/main/res/drawable/vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="9dp"
+    android:height="15dp"
+    android:viewportWidth="9"
+    android:viewportHeight="15">
+  <path
+      android:pathData="M7.779,0.275C7.692,0.188 7.589,0.119 7.475,0.072C7.361,0.024 7.239,0 7.116,0C6.992,0 6.87,0.024 6.756,0.072C6.642,0.119 6.539,0.188 6.452,0.275L0.219,6.508C0.15,6.577 0.095,6.66 0.057,6.75C0.019,6.841 0,6.938 0,7.037C0,7.135 0.019,7.232 0.057,7.323C0.095,7.414 0.15,7.496 0.219,7.565L6.452,13.798C6.819,14.165 7.412,14.165 7.779,13.798C8.147,13.43 8.147,12.838 7.779,12.47L2.349,7.033L7.787,1.595C8.147,1.235 8.147,0.635 7.779,0.275Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -7,13 +7,142 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <ImageView
+        android:id="@+id/backbtn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="30dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:src="@drawable/vector" />
+
     <TextView
+        android:id="@+id/text1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:text="오늘 하루는 어땠나요?"
+        android:textSize="26sp"
+        app:layout_constraintTop_toBottomOf="@id/backbtn"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_marginTop="50dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="감정우표를 선택해주세요"
+        app:layout_constraintTop_toBottomOf="@id/text1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginTop="10dp"/>
+
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="10sp"
+        android:text="선택한 감정우표를 기반으로 맞춤형 질문이 배달됩니다"
+        app:layout_constraintTop_toBottomOf="@id/text2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginTop="25dp" />
+
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/text3"
+        app:layout_constraintEnd_toEndOf="parent">
+
+
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/group_462__3_"
+            android:layout_gravity="center"
+            android:layout_marginTop="27dp"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_gravity="center"
+            android:textSize="12sp"
+            android:text="더없이 행복한 하루였어요"/>
+
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/group_462__4_"
+            android:layout_gravity="center"
+            android:layout_marginTop="27dp"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_gravity="center"
+            android:textSize="12sp"
+            android:text="들뜨고 흥분돼요"/>
+
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/group_462__5_"
+            android:layout_gravity="center"
+            android:layout_marginTop="27dp"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_gravity="center"
+            android:textSize="12sp"
+            android:text="행복한 하루였어요"/>
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/group_462__6_"
+            android:layout_gravity="center"
+            android:layout_marginTop="27dp"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_gravity="center"
+            android:textSize="12sp"
+            android:text="생각이 많아지고 불안해요"/>
+
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/group_462__7_"
+            android:layout_gravity="center"
+            android:layout_marginTop="27dp"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_gravity="center"
+            android:textSize="12sp"
+            android:text="부글부글 화가 나요"/>
+
+
+
+
+
+    </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>