From f3e4b47c9d52bd2d6159c62166765d2c3a944a37 Mon Sep 17 00:00:00 2001
From: KwakEuiJin <yuijin0909@gmail.com>
Date: Thu, 4 Jan 2024 21:53:38 +0900
Subject: [PATCH] [fix]: Fix Merge Error

---
 app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt | 10 ++--------
 app/src/main/res/layout/activity_sample.xml            |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt b/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt
index ce8394da..62aa7129 100644
--- a/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt
+++ b/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt
@@ -1,27 +1,21 @@
 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.common.view.viewBinding
 import com.hmh.hamyeonham.databinding.ActivitySampleBinding
-import com.hmh.hamyeonham.statistics.StaticsActivity
 import dagger.hilt.android.AndroidEntryPoint
-import com.hmh.hamyeonham.feature.login.LoginActivity
-import com.kakao.sdk.common.KakaoSdk
-import com.hmh.hamyeonham.feature.main.MainActivity
 
 @AndroidEntryPoint
 class SampleActivity : AppCompatActivity() {
-    private lateinit var binding: ActivitySampleBinding
+    private val binding by viewBinding(ActivitySampleBinding::inflate)
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        binding = ActivitySampleBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
-
         val splashScreen = installSplashScreen()
         initSplashAnimation(splashScreen)
         setContentView(binding.root)
diff --git a/app/src/main/res/layout/activity_sample.xml b/app/src/main/res/layout/activity_sample.xml
index d36955d3..e7c78653 100644
--- a/app/src/main/res/layout/activity_sample.xml
+++ b/app/src/main/res/layout/activity_sample.xml
@@ -2,6 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/black">
+    android:background="@color/white">
 
 </androidx.constraintlayout.widget.ConstraintLayout>