diff --git a/README.md b/README.md index 2c7613b..3c1d120 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ - - - - - + + + + +
도리/ 김도연(팀장)제로/ 정규은(팀원)레몬/ 김지아(팀원)우가/ 강수아(팀원)묵은지/ 임은지(팀원)도리/ 김도연
(파트장)
제로/ 정규은
(챌린저)
레몬/ 김지아
(챌린저)
우가/ 강수아
(챌린저)
묵은지/ 임은지
(챌린저)
diff --git a/Week1/app/src/main/java/com/example/week1/MainActivity.kt b/Week1/app/src/main/java/com/example/week1/MainActivity.kt index 865a367..149f1fe 100644 --- a/Week1/app/src/main/java/com/example/week1/MainActivity.kt +++ b/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(R.id.text1) - val text2 : TextView = findViewById(R.id.text2) - val text3 : TextView = findViewById(R.id.text3) - val text4 : TextView = findViewById(R.id.text4) - val text5 : TextView = findViewById(R.id.text5) - val good : ImageView = findViewById(R.id.good) - val happy : ImageView = findViewById(R.id.happy) - val soso : ImageView = findViewById(R.id.soso) - val bad : ImageView = findViewById(R.id.bad) - val angry : ImageView = findViewById(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) + ) } } - } \ No newline at end of file diff --git a/Week1/app/src/main/res/drawable/angry.png b/Week1/app/src/main/res/drawable/angry.png deleted file mode 100644 index 217a46b..0000000 Binary files a/Week1/app/src/main/res/drawable/angry.png and /dev/null differ diff --git a/Week1/app/src/main/res/drawable/arrow_back.xml b/Week1/app/src/main/res/drawable/arrow_back.xml deleted file mode 100644 index 99f85de..0000000 --- a/Week1/app/src/main/res/drawable/arrow_back.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/Week1/app/src/main/res/drawable/bad.png b/Week1/app/src/main/res/drawable/bad.png deleted file mode 100644 index f8aea2f..0000000 Binary files a/Week1/app/src/main/res/drawable/bad.png and /dev/null differ diff --git a/Week1/app/src/main/res/drawable/good.png b/Week1/app/src/main/res/drawable/good.png deleted file mode 100644 index 039a3ac..0000000 Binary files a/Week1/app/src/main/res/drawable/good.png and /dev/null differ diff --git a/Week1/app/src/main/res/drawable/happy.png b/Week1/app/src/main/res/drawable/happy.png deleted file mode 100644 index 90e8e66..0000000 Binary files a/Week1/app/src/main/res/drawable/happy.png and /dev/null differ diff --git a/Week1/app/src/main/res/drawable/soso.png b/Week1/app/src/main/res/drawable/soso.png deleted file mode 100644 index dc37241..0000000 Binary files a/Week1/app/src/main/res/drawable/soso.png and /dev/null differ diff --git a/Week1/app/src/main/res/layout/activity_main.xml b/Week1/app/src/main/res/layout/activity_main.xml index a8d8000..a709999 100644 --- a/Week1/app/src/main/res/layout/activity_main.xml +++ b/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"/> + app:layout_constraintTop_toBottomOf="@+id/detail" + android:contentDescription="@string/my_image_description"/> + app:layout_constraintTop_toBottomOf="@+id/textgood" + android:contentDescription="@string/my_image_description"/> + app:layout_constraintTop_toBottomOf="@+id/texthappy" + android:contentDescription="@string/my_image_description"/> + app:layout_constraintTop_toBottomOf="@+id/textsoso" + android:contentDescription="@string/my_image_description"/> + app:layout_constraintTop_toBottomOf="@+id/textbad" + android:contentDescription="@string/my_image_description"/> Week1 + 오늘 하루는 어땠나요? + 감정우표를 선택해주세요 + 선택한 감정우표를 기반으로 맞춤형 질문이 배달됩니다 + 더없이 행복한 하루였어요 + 들뜨고 흥분돼요 + 평범한 하루였어요 + 생각이 많아지고 불안해요 + 부글부글 화가 나요 + . \ No newline at end of file diff --git a/Week1/app/src/main/res/values/themes.xml b/Week1/app/src/main/res/values/themes.xml deleted file mode 100644 index fb78203..0000000 --- a/Week1/app/src/main/res/values/themes.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/Week1/app/src/main/res/values/colors.xml b/Week3/app/src/main/res/values/colors.xml similarity index 75% rename from Week1/app/src/main/res/values/colors.xml rename to Week3/app/src/main/res/values/colors.xml index c8524cd..b427f3b 100644 --- a/Week1/app/src/main/res/values/colors.xml +++ b/Week3/app/src/main/res/values/colors.xml @@ -2,4 +2,5 @@ #FF000000 #FFFFFFFF + #FFEEEEEE \ No newline at end of file diff --git a/Week3/app/src/main/res/values/strings.xml b/Week3/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..bc54e9c --- /dev/null +++ b/Week3/app/src/main/res/values/strings.xml @@ -0,0 +1,34 @@ + + Week3 + + 구매하기 + 위시리스트 + 장바구니 + 프로필 + Discover + 9월 4일 목요일 + What is new + 나이키 최신 상품 + 전체 + Tops & T-Shirts + Shoes + 위시리스트 + 장바구니가 비어있습니다. + 제품을 추가하면 여기에 표시됩니다. + 주문하기 + + 닉네임" + 프로필 수정 + 주문 + 패스 + 이벤트 + 설정 + 나이키 멤버 혜택 + 0개 사용 가능 + > + 팔로잉 (5) + 편집 + 회원 가입일: 2024.01.01 + 설명 + + \ No newline at end of file diff --git a/Week3/app/src/main/res/values/themes.xml b/Week3/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..400c4c9 --- /dev/null +++ b/Week3/app/src/main/res/values/themes.xml @@ -0,0 +1,14 @@ + + + + + + +