diff --git a/README.md b/README.md deleted file mode 100644 index 2c7613b..0000000 --- a/README.md +++ /dev/null @@ -1,94 +0,0 @@ -# 10th_Android - - -

팀원 구성

-
- - - - - - - - - - - - - - - - -
도리/ 김도연(팀장)제로/ 정규은(팀원)레몬/ 김지아(팀원)우가/ 강수아(팀원)묵은지/ 임은지(팀원)
-
- @kimdoyeon1234 -
-
- @jeongkyueun -
-
- @Lemon0610 -
-
- @sua710 -
-
- @mookeunji05 -
- -
- -### Git 작업 순서 - -본인의 브랜치에서만 작업하고, `main` 브랜치는 직접 수정하지 않습니다. - -#### 1. 현재 브랜치 확인 -```sh -git branch -``` - -#### 2. 변경 사항 확인 -```sh -git status -``` - -#### 3. 변경된 파일 추가 -```sh -git add . -``` - -#### 4. 커밋 메시지 작성 -```sh -git commit -m "Commit Message" -``` - -#### 5. 원격 저장소에 본인 브랜치로 푸시 -```sh -git push origin <브랜치명> -``` - -### Commit Convention - -커밋 메시지는 `타입: n주차 미션 설명`의 형식을 갖추어 작성합니다. - -| 타입 | 설명 | -|-----------|--------------------------------| -| feat | 새로운 기능 추가 | -| fix | 버그 수정 | -| refactor | 코드 리팩토링 | -| docs | 문서 수정 (README 등) | -| style | 코드 스타일 변경 (세미콜론 추가 등)| -| chore | 빌드 및 패키지 설정 변경 | -| test | 테스트 코드 추가 | - -#### Commit Example -```sh -git commit -m "feat: 1주차 미션 화면 전환 기능" -git commit -m "fix: 5주차 미션 API 응답 오류 수정" -``` - -### PR Convention - -- Pull Request(PR)은 미션 별로 생성합니다. -- PR 제목은 `n주차 미션` 형식으로 작성합니다. -- 파트장이 승인한 후, main 브랜치로 Merge 합니다. diff --git a/Week1/app/build.gradle.kts b/Week1/app/build.gradle.kts deleted file mode 100644 index cfcfc78..0000000 --- a/Week1/app/build.gradle.kts +++ /dev/null @@ -1,47 +0,0 @@ -plugins { - alias(libs.plugins.android.application) -} - -android { - namespace = "com.example.week1" - compileSdk { - version = release(36) { - minorApiLevel = 1 - } - } - - defaultConfig { - applicationId = "com.example.week1" - minSdk = 24 - targetSdk = 36 - versionCode = 1 - versionName = "1.0" - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - } - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 - } -} - -dependencies { - implementation(libs.androidx.core.ktx) - implementation(libs.androidx.appcompat) - implementation(libs.material) - implementation(libs.androidx.activity) - implementation(libs.androidx.constraintlayout) - testImplementation(libs.junit) - androidTestImplementation(libs.androidx.junit) - androidTestImplementation(libs.androidx.espresso.core) -} \ No newline at end of file diff --git a/Week1/app/src/main/java/com/example/week1/MainActivity.kt b/Week1/app/src/main/java/com/example/week1/MainActivity.kt deleted file mode 100644 index 865a367..0000000 --- a/Week1/app/src/main/java/com/example/week1/MainActivity.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.example.week1 - -import android.os.Bundle -import androidx.activity.enableEdgeToEdge -import androidx.appcompat.app.AppCompatActivity -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat -import android.widget.TextView -import android.widget.ImageView -import android.graphics.Color - -class MainActivity : AppCompatActivity() { - 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) - - fun resetTextColors() { - text1.setTextColor(Color.BLACK) - text2.setTextColor(Color.BLACK) - text3.setTextColor(Color.BLACK) - text4.setTextColor(Color.BLACK) - text5.setTextColor(Color.BLACK) - } - - good.setOnClickListener { - resetTextColors() - text1.setTextColor(Color.parseColor("#F9DC77")) - } - - happy.setOnClickListener { - resetTextColors() - text2.setTextColor(Color.parseColor("#AEE9FE")) - } - - soso.setOnClickListener { - resetTextColors() - text3.setTextColor(Color.parseColor("#94A5FE")) - } - - bad.setOnClickListener { - resetTextColors() - text4.setTextColor(Color.parseColor("#77C48D")) - } - - 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 - } - } - -} \ 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 deleted file mode 100644 index a8d8000..0000000 --- a/Week1/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Week1/app/src/main/res/values/strings.xml b/Week1/app/src/main/res/values/strings.xml deleted file mode 100644 index ade1634..0000000 --- a/Week1/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 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..2799786 --- /dev/null +++ b/Week3/app/src/main/res/values/strings.xml @@ -0,0 +1,40 @@ + + Week3 + + 구매하기 + 위시리스트 + 장바구니 + 프로필 + Discover + 9월 4일 목요일 + What is new + 나이키 최신 상품 + 전체 + Tops & T-Shirts + Shoes + 위시리스트 + 장바구니가 비어있습니다. + 제품을 추가하면 여기에 표시됩니다. + 주문하기 + + 상품 번호 + 상품 이름 + 상품 설명 + 색상 갯수 + ₩10,000 + + 닉네임" + 프로필 수정 + 주문 + 패스 + 이벤트 + 설정 + 나이키 멤버 혜택 + 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 @@ + + + + + + +