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 +|♻️ ::| 코드 리펙토링 +|📄 ::| 파일 생성 +|💉 ::| 테스트 코드 작성 +|🚀 ::| 새 버전 릴리즈 +|🎨 ::| 코드 스타 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bb5233f..0cb28ea 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 { @@ -26,13 +27,19 @@ android { ) } } + compileOptions { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } + kotlinOptions { jvmTarget = "11" } + + buildFeatures { + viewBinding = true + } } dependencies { @@ -45,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/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/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..514d3e2 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,20 +1,26 @@ -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) insets } } -} \ No newline at end of file +} 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">