From 86170af8024303846254869ba61799b3ff62fa40 Mon Sep 17 00:00:00 2001 From: bhindor Date: Tue, 17 Jun 2025 19:20:22 +0900 Subject: [PATCH 1/4] =?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 set MVVM 구조 --- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/kr/hs/anu/nobet/data/datasource/.gitkeep | 0 app/src/main/java/kr/hs/anu/nobet/data/repository/.gitkeep | 0 app/src/main/java/kr/hs/anu/nobet/di/.gitkeep | 0 app/src/main/java/kr/hs/anu/nobet/domain/model/.gitkeep | 0 app/src/main/java/kr/hs/anu/nobet/domain/repository/.gitkeep | 0 app/src/main/java/kr/hs/anu/nobet/domain/usecase/.gitkeep | 0 .../anu/nobet/{ => presentatoin/screen/main}/MainActivity.kt | 3 ++- app/src/main/res/layout/activity_main.xml | 2 +- 9 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/kr/hs/anu/nobet/data/datasource/.gitkeep create mode 100644 app/src/main/java/kr/hs/anu/nobet/data/repository/.gitkeep create mode 100644 app/src/main/java/kr/hs/anu/nobet/di/.gitkeep create mode 100644 app/src/main/java/kr/hs/anu/nobet/domain/model/.gitkeep create mode 100644 app/src/main/java/kr/hs/anu/nobet/domain/repository/.gitkeep create mode 100644 app/src/main/java/kr/hs/anu/nobet/domain/usecase/.gitkeep rename app/src/main/java/kr/hs/anu/nobet/{ => presentatoin/screen/main}/MainActivity.kt (90%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7c1b81b..f88e35f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ android:theme="@style/Theme.NoBet" tools:targetApi="31"> diff --git a/app/src/main/java/kr/hs/anu/nobet/data/datasource/.gitkeep b/app/src/main/java/kr/hs/anu/nobet/data/datasource/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/src/main/java/kr/hs/anu/nobet/data/repository/.gitkeep b/app/src/main/java/kr/hs/anu/nobet/data/repository/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/src/main/java/kr/hs/anu/nobet/di/.gitkeep b/app/src/main/java/kr/hs/anu/nobet/di/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/src/main/java/kr/hs/anu/nobet/domain/model/.gitkeep b/app/src/main/java/kr/hs/anu/nobet/domain/model/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/src/main/java/kr/hs/anu/nobet/domain/repository/.gitkeep b/app/src/main/java/kr/hs/anu/nobet/domain/repository/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/src/main/java/kr/hs/anu/nobet/domain/usecase/.gitkeep b/app/src/main/java/kr/hs/anu/nobet/domain/usecase/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/src/main/java/kr/hs/anu/nobet/MainActivity.kt b/app/src/main/java/kr/hs/anu/nobet/presentatoin/screen/main/MainActivity.kt similarity index 90% rename from app/src/main/java/kr/hs/anu/nobet/MainActivity.kt rename to app/src/main/java/kr/hs/anu/nobet/presentatoin/screen/main/MainActivity.kt index 5ec8973..7fefca5 100644 --- a/app/src/main/java/kr/hs/anu/nobet/MainActivity.kt +++ b/app/src/main/java/kr/hs/anu/nobet/presentatoin/screen/main/MainActivity.kt @@ -1,10 +1,11 @@ -package kr.hs.anu.nobet +package kr.hs.anu.nobet.presentatoin.screen.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.nobet.R class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 86a5d97..4820839 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=".presentatoin.screen.main.MainActivity"> Date: Tue, 17 Jun 2025 19:35:05 +0900 Subject: [PATCH 2/4] =?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 | 3 +++ .../hs/anu/nobet/presentatoin/screen/main/MainActivity.kt | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 16360e5..7c993c8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -33,6 +33,9 @@ android { kotlinOptions { jvmTarget = "11" } + buildFeatures { + viewBinding = true + } } dependencies { diff --git a/app/src/main/java/kr/hs/anu/nobet/presentatoin/screen/main/MainActivity.kt b/app/src/main/java/kr/hs/anu/nobet/presentatoin/screen/main/MainActivity.kt index 7fefca5..52a3dec 100644 --- a/app/src/main/java/kr/hs/anu/nobet/presentatoin/screen/main/MainActivity.kt +++ b/app/src/main/java/kr/hs/anu/nobet/presentatoin/screen/main/MainActivity.kt @@ -6,12 +6,16 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import kr.hs.anu.nobet.R +import kr.hs.anu.nobet.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 a620b491391b82dea07d9600726165e5ce0c8eaa Mon Sep 17 00:00:00 2001 From: bhindor Date: Tue, 17 Jun 2025 19:50:13 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E2=9C=85=20::=20add=20ktlint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ktlint 추가 --- app/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7c993c8..08dcdde 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 54cf1272dac3a73363a55d2b5fc45e59aaa78e3c Mon Sep 17 00:00:00 2001 From: bhindor Date: Tue, 17 Jun 2025 19:54:14 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=8E=A8=20::=20ktlint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ktlint --- app/build.gradle.kts | 2 +- .../java/kr/hs/anu/nobet/ExampleInstrumentedTest.kt | 8 +++----- .../hs/anu/nobet/presentatoin/screen/main/MainActivity.kt | 2 +- app/src/test/java/kr/hs/anu/nobet/ExampleUnitTest.kt | 5 ++--- gradlew | 0 5 files changed, 7 insertions(+), 10 deletions(-) mode change 100644 => 100755 gradlew diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 08dcdde..3ca7183 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -49,4 +49,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/nobet/ExampleInstrumentedTest.kt b/app/src/androidTest/java/kr/hs/anu/nobet/ExampleInstrumentedTest.kt index 8e221e1..32265c3 100644 --- a/app/src/androidTest/java/kr/hs/anu/nobet/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/kr/hs/anu/nobet/ExampleInstrumentedTest.kt @@ -1,13 +1,11 @@ package kr.hs.anu.nobet -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.nobet", appContext.packageName) } -} \ No newline at end of file +} diff --git a/app/src/main/java/kr/hs/anu/nobet/presentatoin/screen/main/MainActivity.kt b/app/src/main/java/kr/hs/anu/nobet/presentatoin/screen/main/MainActivity.kt index 52a3dec..b88bdb5 100644 --- a/app/src/main/java/kr/hs/anu/nobet/presentatoin/screen/main/MainActivity.kt +++ b/app/src/main/java/kr/hs/anu/nobet/presentatoin/screen/main/MainActivity.kt @@ -22,4 +22,4 @@ class MainActivity : AppCompatActivity() { insets } } -} \ No newline at end of file +} diff --git a/app/src/test/java/kr/hs/anu/nobet/ExampleUnitTest.kt b/app/src/test/java/kr/hs/anu/nobet/ExampleUnitTest.kt index bc8a3e5..8fbe0d5 100644 --- a/app/src/test/java/kr/hs/anu/nobet/ExampleUnitTest.kt +++ b/app/src/test/java/kr/hs/anu/nobet/ExampleUnitTest.kt @@ -1,9 +1,8 @@ package kr.hs.anu.nobet +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 +} diff --git a/gradlew b/gradlew old mode 100644 new mode 100755