diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 48f50825..05ed02c8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -43,6 +43,18 @@ android { dependencies { + // Feature + implementation(projects.feature.statistics) + + // Domain + implementation(projects.domain.usagestats) + + // Data + implementation(projects.data.usagestats) + + // Core + implementation(projects.core.common) + // Firebase implementation(platform(libs.firebase)) implementation(libs.bundles.firebase) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 43f73e8b..dff28e6b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,7 +4,16 @@ + + + + - - @@ -32,15 +38,14 @@ android:exported="true"> + - - - - diff --git a/app/src/main/java/com/hmh/hamyeonham/HMHApplication.kt b/app/src/main/java/com/hmh/hamyeonham/HMHApplication.kt new file mode 100644 index 00000000..6b867294 --- /dev/null +++ b/app/src/main/java/com/hmh/hamyeonham/HMHApplication.kt @@ -0,0 +1,9 @@ +package com.hmh.hamyeonham + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class HMHApplication : Application() { + +} diff --git a/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt b/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt index 698291d1..62aa7129 100644 --- a/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt +++ b/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt @@ -1,31 +1,24 @@ package com.hmh.hamyeonham -import android.content.Intent import android.os.Bundle import android.view.animation.Animation import android.view.animation.AnimationUtils import androidx.appcompat.app.AppCompatActivity import androidx.core.splashscreen.SplashScreen import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen -import com.hmh.hamyeonham.feature.login.LoginActivity -import com.kakao.sdk.common.KakaoSdk -import com.hmh.hamyeonham.feature.main.MainActivity +import com.hmh.hamyeonham.common.view.viewBinding +import com.hmh.hamyeonham.databinding.ActivitySampleBinding +import dagger.hilt.android.AndroidEntryPoint +@AndroidEntryPoint class SampleActivity : AppCompatActivity() { + private val binding by viewBinding(ActivitySampleBinding::inflate) + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val splashScreen = installSplashScreen() initSplashAnimation(splashScreen) - - setContentView(R.layout.activity_sample) - - initKakaoSdk() - Intent(this, LoginActivity::class.java).let(::startActivity) - } - - private fun initKakaoSdk() { - KakaoSdk.init(this, BuildConfig.KAKAO_API_KEY) + setContentView(binding.root) } private fun initSplashAnimation(splashScreen: SplashScreen) { diff --git a/app/src/main/res/layout/activity_sample.xml b/app/src/main/res/layout/activity_sample.xml index 25105a0d..e7c78653 100644 --- a/app/src/main/res/layout/activity_sample.xml +++ b/app/src/main/res/layout/activity_sample.xml @@ -1,18 +1,7 @@ - - + android:background="@color/white"> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4e12be50..6ad288b1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,4 @@ HMH-Android + 목표시간 \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 1b3f4c68..dc7c6a96 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,5 +1,6 @@ + + + + + + + + + + \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 769059f1..9b0c9668 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -21,6 +21,11 @@ rootProject.name = "HMH-Android" include(":app") include(":core:common") include(":core:database") + include(":feature:onboarding") include(":feature:main") +include(":feature:statistics") include(":feature:login") + +include(":data:usagestats") +include(":domain:usagestats")