From 86f78d991cdc7692b46b646fc96fd074f7876ed4 Mon Sep 17 00:00:00 2001 From: bhindor <82446373+bhindor@users.noreply.github.com> Date: Tue, 27 May 2025 20:57:12 +0900 Subject: [PATCH 1/5] Project_Setting Branch --- README.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d4895ea..b9f9565 100644 --- a/README.md +++ b/README.md @@ -1 +1,14 @@ -# Snow_Android \ No newline at end of file +# Snow_Android +커밋 이모지 +|Commit Type|설명| +|------|---| +|✅ ::|프로젝트 세팅| +|⚡️ ::|기능 업데이트| +|⚰️ ::|기능 삭제| +|🐛 ::| 버그 수정| +|🔀 ::| Merge or PR +|♻️ ::| 코드 리펙토링 +|📄 ::| 파일 생성 +|💉 ::| 테스트 코드 작성 +|🚀 ::| 새 버전 릴리즈 +|🎨 ::| 코드 스타 From 444d876e0d6a7298e4133bf0e5de1ba6fe4f7a5b Mon Sep 17 00:00:00 2001 From: bhindor Date: Tue, 27 May 2025 21:52:51 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E2=9C=85=20::=20file=20struct=20modify?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 파일구조변경 --- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/kr/hs/anu/snow/data/model/.gitkeep | 0 app/src/main/java/kr/hs/anu/snow/data/repository/.gitkeep | 0 app/src/main/java/kr/hs/anu/snow/data/source/.gitkeep | 0 app/src/main/java/kr/hs/anu/snow/di/.gitkeep | 0 app/src/main/java/kr/hs/anu/snow/util/.gitkeep | 0 app/src/main/res/layout/activity_main.xml | 2 +- 7 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/kr/hs/anu/snow/data/model/.gitkeep create mode 100644 app/src/main/java/kr/hs/anu/snow/data/repository/.gitkeep create mode 100644 app/src/main/java/kr/hs/anu/snow/data/source/.gitkeep create mode 100644 app/src/main/java/kr/hs/anu/snow/di/.gitkeep create mode 100644 app/src/main/java/kr/hs/anu/snow/util/.gitkeep diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c86d578..35acd45 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ android:theme="@style/Theme.Snow" tools:targetApi="31"> diff --git a/app/src/main/java/kr/hs/anu/snow/data/model/.gitkeep b/app/src/main/java/kr/hs/anu/snow/data/model/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/src/main/java/kr/hs/anu/snow/data/repository/.gitkeep b/app/src/main/java/kr/hs/anu/snow/data/repository/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/src/main/java/kr/hs/anu/snow/data/source/.gitkeep b/app/src/main/java/kr/hs/anu/snow/data/source/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/src/main/java/kr/hs/anu/snow/di/.gitkeep b/app/src/main/java/kr/hs/anu/snow/di/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/src/main/java/kr/hs/anu/snow/util/.gitkeep b/app/src/main/java/kr/hs/anu/snow/util/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 86a5d97..0a1ea2a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,7 +5,7 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".MainActivity"> + tools:context=".ui.main.MainActivity"> Date: Tue, 27 May 2025 21:53:20 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=E2=9C=85=20::=20viewBinding=20setting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 뷰바인딩 세팅 --- app/build.gradle.kts | 6 ++++++ .../java/kr/hs/anu/snow/{ => ui/main}/MainActivity.kt | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) rename app/src/main/java/kr/hs/anu/snow/{ => ui/main}/MainActivity.kt (71%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bb5233f..b1b898a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -26,13 +26,19 @@ android { ) } } + compileOptions { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } + kotlinOptions { jvmTarget = "11" } + + buildFeatures { + viewBinding = true + } } dependencies { diff --git a/app/src/main/java/kr/hs/anu/snow/MainActivity.kt b/app/src/main/java/kr/hs/anu/snow/ui/main/MainActivity.kt similarity index 71% rename from app/src/main/java/kr/hs/anu/snow/MainActivity.kt rename to app/src/main/java/kr/hs/anu/snow/ui/main/MainActivity.kt index 493be50..0f507db 100644 --- a/app/src/main/java/kr/hs/anu/snow/MainActivity.kt +++ b/app/src/main/java/kr/hs/anu/snow/ui/main/MainActivity.kt @@ -1,16 +1,22 @@ -package kr.hs.anu.snow +package kr.hs.anu.snow.ui.main import android.os.Bundle import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat +import kr.hs.anu.snow.R +import kr.hs.anu.snow.databinding.ActivityMainBinding class MainActivity : AppCompatActivity() { + private lateinit var binding: ActivityMainBinding + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) enableEdgeToEdge() - setContentView(R.layout.activity_main) + 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) From 34ccb8647cd36cd36150191a16f4b1428b51a3ea Mon Sep 17 00:00:00 2001 From: bhindor Date: Tue, 27 May 2025 22:28:59 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=E2=9C=85=20::=20ktlint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b1b898a..6ee408b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,7 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) + id("org.jlleitschuh.gradle.ktlint") version "11.6.1" } android { From a654b27ef602f8a81688a3b0c33e3aa791d8489f Mon Sep 17 00:00:00 2001 From: bhindor Date: Tue, 27 May 2025 22:41:50 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=8E=A8=20::=20ktlint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 2 +- .../java/kr/hs/anu/snow/ExampleInstrumentedTest.kt | 8 +++----- app/src/main/java/kr/hs/anu/snow/ui/main/MainActivity.kt | 2 +- app/src/test/java/kr/hs/anu/snow/ExampleUnitTest.kt | 5 ++--- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6ee408b..0cb28ea 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -52,4 +52,4 @@ dependencies { testImplementation(libs.junit) androidTestImplementation(libs.androidx.junit) androidTestImplementation(libs.androidx.espresso.core) -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/kr/hs/anu/snow/ExampleInstrumentedTest.kt b/app/src/androidTest/java/kr/hs/anu/snow/ExampleInstrumentedTest.kt index adad3bf..f9409f7 100644 --- a/app/src/androidTest/java/kr/hs/anu/snow/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/kr/hs/anu/snow/ExampleInstrumentedTest.kt @@ -1,13 +1,11 @@ package kr.hs.anu.snow -import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 - +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.junit.Assert.* - /** * Instrumented test, which will execute on an Android device. * @@ -21,4 +19,4 @@ class ExampleInstrumentedTest { val appContext = InstrumentationRegistry.getInstrumentation().targetContext assertEquals("kr.hs.anu.snow", appContext.packageName) } -} \ No newline at end of file +} diff --git a/app/src/main/java/kr/hs/anu/snow/ui/main/MainActivity.kt b/app/src/main/java/kr/hs/anu/snow/ui/main/MainActivity.kt index 0f507db..514d3e2 100644 --- a/app/src/main/java/kr/hs/anu/snow/ui/main/MainActivity.kt +++ b/app/src/main/java/kr/hs/anu/snow/ui/main/MainActivity.kt @@ -23,4 +23,4 @@ class MainActivity : AppCompatActivity() { insets } } -} \ No newline at end of file +} diff --git a/app/src/test/java/kr/hs/anu/snow/ExampleUnitTest.kt b/app/src/test/java/kr/hs/anu/snow/ExampleUnitTest.kt index 92458c6..ec1b544 100644 --- a/app/src/test/java/kr/hs/anu/snow/ExampleUnitTest.kt +++ b/app/src/test/java/kr/hs/anu/snow/ExampleUnitTest.kt @@ -1,9 +1,8 @@ package kr.hs.anu.snow +import org.junit.Assert.assertEquals import org.junit.Test -import org.junit.Assert.* - /** * Example local unit test, which will execute on the development machine (host). * @@ -14,4 +13,4 @@ class ExampleUnitTest { fun addition_isCorrect() { assertEquals(4, 2 + 2) } -} \ No newline at end of file +}