feat: 7주차 미션_레몬

README.md

@@ -6,11 +6,11 @@
 
 <table>
   <tr>
-    <td align="center">도리/ 김도연(팀장)</td>
-    <td align="center">제로/ 정규은(팀원)</td>
-    <td align="center">레몬/ 김지아(팀원)</td>
-    <td align="center">우가/ 강수아(팀원)</td>
-    <td align="center">묵은지/ 임은지(팀원)</td>
+    <td align="center">도리/ 김도연<br>(파트장)</td>
+    <td align="center">제로/ 정규은<br>(챌린저)</td>
+    <td align="center">레몬/ 김지아<br>(챌린저)</td>
+    <td align="center">우가/ 강수아<br>(챌린저)</td>
+    <td align="center">묵은지/ 임은지<br>(챌린저)</td>
   </tr>
   <tr>
     <td align="center">

Week1/app/src/main/java/com/example/week1/MainActivity.kt

@@ -1,68 +1,68 @@
 package com.example.week1
 
+import android.graphics.Color
 import android.os.Bundle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
-import android.widget.TextView
-import android.widget.ImageView
-import android.graphics.Color
+import com.example.week1.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityMainBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
-        setContentView(R.layout.activity_main)
-        val text1 : TextView = findViewById<TextView>(R.id.text1)
-        val text2 : TextView = findViewById<TextView>(R.id.text2)
-        val text3 : TextView = findViewById<TextView>(R.id.text3)
-        val text4 : TextView = findViewById<TextView>(R.id.text4)
-        val text5 : TextView = findViewById<TextView>(R.id.text5)
-        val good : ImageView = findViewById<ImageView>(R.id.good)
-        val happy : ImageView = findViewById<ImageView>(R.id.happy)
-        val soso : ImageView = findViewById<ImageView>(R.id.soso)
-        val bad : ImageView = findViewById<ImageView>(R.id.bad)
-        val angry : ImageView = findViewById<ImageView>(R.id.angry)
-
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+            insets
+        }
         fun resetTextColors() {
-            text1.setTextColor(Color.BLACK)
-            text2.setTextColor(Color.BLACK)
-            text3.setTextColor(Color.BLACK)
-            text4.setTextColor(Color.BLACK)
-            text5.setTextColor(Color.BLACK)
+            binding.textgood.setTextColor(Color.BLACK)
+            binding.texthappy.setTextColor(Color.BLACK)
+            binding.textsoso.setTextColor(Color.BLACK)
+            binding.textbad.setTextColor(Color.BLACK)
+            binding.textangry.setTextColor(Color.BLACK)
         }
 
-        good.setOnClickListener {
+        binding.good.setOnClickListener {
             resetTextColors()
-            text1.setTextColor(Color.parseColor("#F9DC77"))
+            binding.textgood.setTextColor(
+                ContextCompat.getColor(this, R.color.good)
+            )
         }
 
-        happy.setOnClickListener {
+        binding.happy.setOnClickListener {
             resetTextColors()
-            text2.setTextColor(Color.parseColor("#AEE9FE"))
+            binding.texthappy.setTextColor(
+                ContextCompat.getColor(this, R.color.happy)
+            )
         }
 
-        soso.setOnClickListener {
+        binding.soso.setOnClickListener {
             resetTextColors()
-            text3.setTextColor(Color.parseColor("#94A5FE"))
+            binding.textsoso.setTextColor(
+                ContextCompat.getColor(this, R.color.soso)
+            )
         }
 
-        bad.setOnClickListener {
+        binding.bad.setOnClickListener {
             resetTextColors()
-            text4.setTextColor(Color.parseColor("#77C48D"))
+            binding.textbad.setTextColor(
+                ContextCompat.getColor(this, R.color.bad)
+            )
         }
 
-        angry.setOnClickListener {
+        binding.angry.setOnClickListener {
             resetTextColors()
-            text5.setTextColor(Color.parseColor("#D94F49"))
-        }
-
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
-            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
-            insets
+            binding.textangry.setTextColor(
+                ContextCompat.getColor(this, R.color.angry)
+            )
         }
     }
-
 }

Week1/app/src/main/res/layout/activity_main.xml

@@ -15,14 +15,15 @@
         android:layout_marginStart="20dp"
         android:src="@drawable/arrow_back"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent"
+        android:contentDescription="@string/my_image_description"/>
 
     <TextView
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="80dp"
-        android:text="오늘 하루는 어땠나요?"
+        android:text="@string/title"
         android:textSize="30sp"
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
@@ -36,7 +37,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:text="감정우표를 선택해주세요"
+        android:text="@string/description"
         android:textSize="20sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/detail"
@@ -48,7 +49,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="30dp"
-        android:text="선택한 감정우표를 기반으로 맞춤형 질문이 배달됩니다"
+        android:text="@string/detail"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/good"
         app:layout_constraintStart_toStartOf="parent"
@@ -59,17 +60,18 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="40dp"
-        android:src="@drawable/good"
+        android:src="@drawable/ic_emotion_good"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/text1"
+        app:layout_constraintBottom_toTopOf="@+id/textgood"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/detail"/>
+        app:layout_constraintTop_toBottomOf="@+id/detail"
+        android:contentDescription="@string/my_image_description"/>
 
     <TextView
-        android:id="@+id/text1"
+        android:id="@+id/textgood"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="더없이 행복한 하루였어요"
+        android:text="@string/good"
         android:textColor="@color/black"
         app:layout_constraintBottom_toTopOf="@+id/happy"
         app:layout_constraintEnd_toEndOf="parent"
@@ -81,17 +83,18 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:src="@drawable/happy"
+        android:src="@drawable/ic_emotion_happy"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/text2"
+        app:layout_constraintBottom_toTopOf="@+id/texthappy"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text1"/>
+        app:layout_constraintTop_toBottomOf="@+id/textgood"
+        android:contentDescription="@string/my_image_description"/>
 
     <TextView
-        android:id="@+id/text2"
+        android:id="@+id/texthappy"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="들뜨고 흥분돼요"
+        android:text="@string/happy"
         android:textColor="@color/black"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/soso"
@@ -103,17 +106,18 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:src="@drawable/soso"
+        android:src="@drawable/ic_emotion_soso"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/text3"
+        app:layout_constraintBottom_toTopOf="@+id/textsoso"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text2"/>
+        app:layout_constraintTop_toBottomOf="@+id/texthappy"
+        android:contentDescription="@string/my_image_description"/>
 
     <TextView
-        android:id="@+id/text3"
+        android:id="@+id/textsoso"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="평범한 하루였어요"
+        android:text="@string/soso"
         android:textColor="@color/black"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/bad"
@@ -125,17 +129,18 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:src="@drawable/bad"
+        android:src="@drawable/ic_emotion_bad"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/text4"
+        app:layout_constraintBottom_toTopOf="@+id/textbad"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text3"/>
+        app:layout_constraintTop_toBottomOf="@+id/textsoso"
+        android:contentDescription="@string/my_image_description"/>
 
     <TextView
-        android:id="@+id/text4"
+        android:id="@+id/textbad"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="생각이 많아지고 불안해요"
+        android:text="@string/bad"
         android:textColor="@color/black"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/angry"
@@ -147,17 +152,18 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:src="@drawable/angry"
+        android:src="@drawable/ic_emotion_angry"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/text5"
+        app:layout_constraintBottom_toTopOf="@+id/textangry"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text4"/>
+        app:layout_constraintTop_toBottomOf="@+id/textbad"
+        android:contentDescription="@string/my_image_description"/>
 
     <TextView
-        android:id="@+id/text5"
+        android:id="@+id/textangry"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="부글부글 화가 나요"
+        android:text="@string/angry"
         android:textColor="@color/black"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

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

@@ -1,3 +1,12 @@
 <resources>
     <string name="app_name">Week1</string>
+    <string name="title">오늘 하루는 어땠나요?</string>
+    <string name="description">감정우표를 선택해주세요</string>
+    <string name="detail">선택한 감정우표를 기반으로 맞춤형 질문이 배달됩니다</string>
+    <string name="good">더없이 행복한 하루였어요</string>
+    <string name="happy">들뜨고 흥분돼요</string>
+    <string name="soso">평범한 하루였어요</string>
+    <string name="bad">생각이 많아지고 불안해요</string>
+    <string name="angry">부글부글 화가 나요</string>
+    <string name="my_image_description">.</string>
 </resources>