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/Week2/app/build.gradle.kts b/Week2/app/build.gradle.kts deleted file mode 100644 index 8707c64..0000000 --- a/Week2/app/build.gradle.kts +++ /dev/null @@ -1,53 +0,0 @@ -plugins { - alias(libs.plugins.android.application) -} - -android { - namespace = "com.example.week2" - compileSdk { - version = release(36) { - minorApiLevel = 1 - } - } - - defaultConfig { - applicationId = "com.example.week2" - 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 - } - - buildFeatures { - viewBinding = true - } -} - -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) - implementation(libs.androidx.navigation.fragment.ktx) - implementation(libs.androidx.navigation.ui.ktx) -} \ No newline at end of file diff --git a/Week2/app/src/main/java/com/example/week2/BuyAllFragment.kt b/Week2/app/src/main/java/com/example/week2/BuyAllFragment.kt deleted file mode 100644 index 79ed64b..0000000 --- a/Week2/app/src/main/java/com/example/week2/BuyAllFragment.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.week2 - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment - -class BuyAllFragment : Fragment() { - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - return inflater.inflate(R.layout.fragment_buy_all, container, false) - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - } -} \ No newline at end of file diff --git a/Week2/app/src/main/java/com/example/week2/BuyFragment.kt b/Week2/app/src/main/java/com/example/week2/BuyFragment.kt deleted file mode 100644 index 155d22f..0000000 --- a/Week2/app/src/main/java/com/example/week2/BuyFragment.kt +++ /dev/null @@ -1,71 +0,0 @@ -package com.example.week2 - -import android.graphics.Typeface -import android.os.Bundle -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.fragment.app.Fragment -import com.example.week2.databinding.FragmentBuyBinding -import com.google.android.material.tabs.TabLayout - -class BuyFragment : Fragment(R.layout.fragment_buy) { - - private var _binding: FragmentBuyBinding? = null - private val binding get() = _binding!! - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - _binding = FragmentBuyBinding.bind(view) - - setupTabs() - } - - private fun setupTabs() { - binding.tabLayout.addTab(binding.tabLayout.newTab().setText(getString(R.string.all))) - binding.tabLayout.addTab(binding.tabLayout.newTab().setText(getString(R.string.Shirts))) - binding.tabLayout.addTab(binding.tabLayout.newTab().setText(getString(R.string.Shoes))) - - replaceTabFragment(BuyAllFragment()) - - binding.tabLayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener { - override fun onTabSelected(tab: TabLayout.Tab?) { - updateTabStyle(tab, true) - - when (tab?.position) { - 0 -> replaceTabFragment(BuyAllFragment()) - 1 -> replaceTabFragment(BuyTopsFragment()) - 2 -> replaceTabFragment(BuyShoesFragment()) - } - } - - override fun onTabUnselected(tab: TabLayout.Tab?) { - updateTabStyle(tab, false) - } - - override fun onTabReselected(tab: TabLayout.Tab?) {} - }) - - updateTabStyle(binding.tabLayout.getTabAt(0), true) - } - - private fun replaceTabFragment(fragment: Fragment) { - childFragmentManager.beginTransaction() - .replace(R.id.tabContent, fragment) - .commit() - } - - private fun updateTabStyle(tab: TabLayout.Tab?, isBold: Boolean) { - val tabView = (binding.tabLayout.getChildAt(0) as ViewGroup).getChildAt(tab?.position ?: 0) as ViewGroup - val textView = tabView.getChildAt(1) as? TextView - - textView?.let { - it.typeface = if (isBold) Typeface.DEFAULT_BOLD else Typeface.DEFAULT - } - } - - override fun onDestroyView() { - super.onDestroyView() - _binding = null - } -} \ No newline at end of file diff --git a/Week2/app/src/main/java/com/example/week2/BuyShoesFragment.kt b/Week2/app/src/main/java/com/example/week2/BuyShoesFragment.kt deleted file mode 100644 index d818d30..0000000 --- a/Week2/app/src/main/java/com/example/week2/BuyShoesFragment.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.week2 - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment - -class BuyShoesFragment : Fragment() { - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - return inflater.inflate(R.layout.fragment_buy_shoes, container, false) - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - } -} \ No newline at end of file diff --git a/Week2/app/src/main/java/com/example/week2/BuyTopsFragment.kt b/Week2/app/src/main/java/com/example/week2/BuyTopsFragment.kt deleted file mode 100644 index 27357fe..0000000 --- a/Week2/app/src/main/java/com/example/week2/BuyTopsFragment.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.week2 - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment - -class BuyTopsFragment : Fragment() { - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - return inflater.inflate(R.layout.fragment_buy_tops, container, false) - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - } -} \ No newline at end of file diff --git a/Week2/app/src/main/java/com/example/week2/HomeFragment.kt b/Week2/app/src/main/java/com/example/week2/HomeFragment.kt deleted file mode 100644 index 6035368..0000000 --- a/Week2/app/src/main/java/com/example/week2/HomeFragment.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.week2 - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment - -class HomeFragment : Fragment() { - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - return inflater.inflate(R.layout.fragment_home, container, false) - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - } -} \ No newline at end of file diff --git a/Week2/app/src/main/java/com/example/week2/MainActivity.kt b/Week2/app/src/main/java/com/example/week2/MainActivity.kt deleted file mode 100644 index 88f176a..0000000 --- a/Week2/app/src/main/java/com/example/week2/MainActivity.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.example.week2 -import com.example.week2.databinding.ActivityMainBinding - -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.util.Log -import androidx.fragment.app.Fragment -import androidx.navigation.fragment.NavHostFragment -import androidx.navigation.ui.setupWithNavController - -class MainActivity : AppCompatActivity() { - private val TAG = "LIFE_QUIZ" - private lateinit var binding: ActivityMainBinding - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - enableEdgeToEdge() - Log.d(TAG, "onCreate") - - binding = ActivityMainBinding.inflate(layoutInflater) - setContentView(binding.root) - - val navHostFragment = supportFragmentManager - .findFragmentById(R.id.nav_host_fragment) as NavHostFragment - val navController = navHostFragment.navController - binding.bottomBarInclude.bottomNav.setupWithNavController(navController) - - ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets -> - val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) - v.setPadding(systemBars.left, systemBars.top, systemBars.right, 0) - insets - } - } - - override fun onStart() { - super.onStart() - Log.d(TAG, "onStart") - } - override fun onResume() { - super.onResume() - Log.d(TAG, "onResume") - } - override fun onPause() { - super.onPause() - Log.d(TAG, "onPause") - } - override fun onStop() { - super.onStop() - Log.d(TAG, "onStop") - } - override fun onDestroy() { - super.onDestroy() - Log.d(TAG, "onDestroy") - } - override fun onRestart() { - super.onRestart() - Log.d(TAG, "onRestart") - } -} \ No newline at end of file diff --git a/Week2/app/src/main/java/com/example/week2/ProfileFragment.kt b/Week2/app/src/main/java/com/example/week2/ProfileFragment.kt deleted file mode 100644 index 3124d89..0000000 --- a/Week2/app/src/main/java/com/example/week2/ProfileFragment.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.week2 - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment - -class ProfileFragment : Fragment() { - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - return inflater.inflate(R.layout.fragment_profile, container, false) - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - } -} \ No newline at end of file diff --git a/Week2/app/src/main/java/com/example/week2/ShoppingcartFragment.kt b/Week2/app/src/main/java/com/example/week2/ShoppingcartFragment.kt deleted file mode 100644 index 4b3f85e..0000000 --- a/Week2/app/src/main/java/com/example/week2/ShoppingcartFragment.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.example.week2 - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import android.widget.Button -import androidx.navigation.fragment.findNavController -import androidx.navigation.NavOptions - -class ShoppingcartFragment : Fragment() { - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - - ): View { - return inflater.inflate(R.layout.fragment_shoppingcart, container, false) - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - val button = view.findViewById