diff --git a/app/src/androidTest/java/com/akexorcist/localizationapp/DarkThemeTest.kt b/app/src/androidTest/java/com/akexorcist/localizationapp/DarkThemeTest.kt
index 154343a..0f01432 100644
--- a/app/src/androidTest/java/com/akexorcist/localizationapp/DarkThemeTest.kt
+++ b/app/src/androidTest/java/com/akexorcist/localizationapp/DarkThemeTest.kt
@@ -1,271 +1,271 @@
 package com.akexorcist.localizationapp
 
-import android.os.Build
-import androidx.test.ext.junit.rules.ActivityScenarioRule
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.uiautomator.UiDevice
-import androidx.test.uiautomator.UiSelector
-import com.agoda.kakao.screen.Screen.Companion.onScreen
-import com.akexorcist.localizationapp.annotation.TargetApiLevel
-import com.akexorcist.localizationapp.data.ExpectedContent
-import com.akexorcist.localizationapp.runner.AndroidSdkLevel29TestRunner
-import com.akexorcist.localizationapp.screen.MainActivityScreen
-import com.akexorcist.localizationapp.screen.SimpleFragmentScreen
-import org.junit.Ignore
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
+//import android.os.Build
+//import androidx.test.ext.junit.rules.ActivityScenarioRule
+//import androidx.test.platform.app.InstrumentationRegistry
+//import androidx.test.uiautomator.UiDevice
+//import androidx.test.uiautomator.UiSelector
+//import com.agoda.kakao.screen.Screen.Companion.onScreen
+//import com.akexorcist.localizationapp.annotation.TargetApiLevel
+//import com.akexorcist.localizationapp.data.ExpectedContent
+//import com.akexorcist.localizationapp.runner.AndroidSdkLevel29TestRunner
+//import com.akexorcist.localizationapp.screen.MainActivityScreen
+//import com.akexorcist.localizationapp.screen.SimpleFragmentScreen
+//import org.junit.Ignore
+//import org.junit.Rule
+//import org.junit.Test
+//import org.junit.runner.RunWith
+//
 
-
-@RunWith(AndroidSdkLevel29TestRunner::class)
-class DarkThemeTest {
-    @JvmField
-    val uiDevices: UiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-
-    @Rule
-    @JvmField
-    val rule = ActivityScenarioRule(MainActivity::class.java)
-
-    @Test
-    @TargetApiLevel(Build.VERSION_CODES.Q)
-    @Ignore("For local running only, dark theme in quick settings panel is required")
-    fun darkTheme() {
-        onScreen<MainActivityScreen> {
-            buttonDarkTheme {
-                scrollTo()
-                click()
-            }
-        }
-        // Chinese
-        onScreen<SimpleFragmentScreen> {
-            buttonChinese {
-                scrollTo()
-                click()
-            }
-            textViewContent {
-                hasText(ExpectedContent.APPLE_CHINESE)
-            }
-        }
-        uiDevices.openQuickSettings()
-        uiDevices.findObject(UiSelector().text("Dark theme")).click()
-        uiDevices.pressBack()
-        uiDevices.pressBack()
-        onScreen<SimpleFragmentScreen> {
-            textViewContent {
-                hasText(ExpectedContent.APPLE_CHINESE)
-            }
-            pressBack()
-        }
-        onScreen<MainActivityScreen> {
-            textViewTitle {
-                hasText(ExpectedContent.HELLO_WORLD_CHINESE)
-                uiDevices.setOrientationNatural()
-                hasText(ExpectedContent.HELLO_WORLD_CHINESE)
-            }
-            buttonDarkTheme {
-                scrollTo()
-                click()
-            }
-        }
-        // Italian
-        onScreen<SimpleFragmentScreen> {
-            textViewContent {
-                hasText(ExpectedContent.APPLE_CHINESE)
-            }
-            buttonItalian {
-                scrollTo()
-                click()
-            }
-            textViewContent {
-                hasText(ExpectedContent.APPLE_ITALIAN)
-            }
-        }
-        uiDevices.openQuickSettings()
-        uiDevices.findObject(UiSelector().text("Dark theme")).click()
-        uiDevices.pressBack()
-        uiDevices.pressBack()
-        onScreen<SimpleFragmentScreen> {
-            textViewContent {
-                hasText(ExpectedContent.APPLE_ITALIAN)
-            }
-            pressBack()
-        }
-        onScreen<MainActivityScreen> {
-            textViewTitle {
-                hasText(ExpectedContent.HELLO_WORLD_ITALIAN)
-                uiDevices.setOrientationNatural()
-                hasText(ExpectedContent.HELLO_WORLD_ITALIAN)
-            }
-            buttonDarkTheme {
-                scrollTo()
-                click()
-            }
-        }
-        // Japanese
-        onScreen<SimpleFragmentScreen> {
-            textViewContent {
-                hasText(ExpectedContent.APPLE_ITALIAN)
-            }
-            buttonJapanese {
-                scrollTo()
-                click()
-            }
-            textViewContent {
-                hasText(ExpectedContent.APPLE_JAPANESE)
-            }
-        }
-        uiDevices.openQuickSettings()
-        uiDevices.findObject(UiSelector().text("Dark theme")).click()
-        uiDevices.pressBack()
-        uiDevices.pressBack()
-        onScreen<SimpleFragmentScreen> {
-            textViewContent {
-                hasText(ExpectedContent.APPLE_JAPANESE)
-            }
-            pressBack()
-        }
-        onScreen<MainActivityScreen> {
-            textViewTitle {
-                hasText(ExpectedContent.HELLO_WORLD_JAPANESE)
-                uiDevices.setOrientationNatural()
-                hasText(ExpectedContent.HELLO_WORLD_JAPANESE)
-            }
-            buttonDarkTheme {
-                scrollTo()
-                click()
-            }
-        }
-        // Korean
-        onScreen<SimpleFragmentScreen> {
-            textViewContent {
-                hasText(ExpectedContent.APPLE_JAPANESE)
-            }
-            buttonKorean {
-                scrollTo()
-                click()
-            }
-            textViewContent {
-                hasText(ExpectedContent.APPLE_KOREAN)
-            }
-        }
-        uiDevices.openQuickSettings()
-        uiDevices.findObject(UiSelector().text("Dark theme")).click()
-        uiDevices.pressBack()
-        uiDevices.pressBack()
-        onScreen<SimpleFragmentScreen> {
-            textViewContent {
-                hasText(ExpectedContent.APPLE_KOREAN)
-            }
-            pressBack()
-        }
-        onScreen<MainActivityScreen> {
-            textViewTitle {
-                hasText(ExpectedContent.HELLO_WORLD_KOREAN)
-                uiDevices.setOrientationNatural()
-                hasText(ExpectedContent.HELLO_WORLD_KOREAN)
-            }
-            buttonDarkTheme {
-                scrollTo()
-                click()
-            }
-        }
-        // Portuguese
-        onScreen<SimpleFragmentScreen> {
-            textViewContent {
-                hasText(ExpectedContent.APPLE_KOREAN)
-            }
-            buttonPortuguese {
-                scrollTo()
-                click()
-            }
-            textViewContent {
-                hasText(ExpectedContent.APPLE_PORTUGUESE)
-            }
-        }
-        uiDevices.openQuickSettings()
-        uiDevices.findObject(UiSelector().text("Dark theme")).click()
-        uiDevices.pressBack()
-        uiDevices.pressBack()
-        onScreen<SimpleFragmentScreen> {
-            textViewContent {
-                hasText(ExpectedContent.APPLE_PORTUGUESE)
-            }
-            pressBack()
-        }
-        onScreen<MainActivityScreen> {
-            textViewTitle {
-                hasText(ExpectedContent.HELLO_WORLD_PORTUGUESE)
-                uiDevices.setOrientationNatural()
-                hasText(ExpectedContent.HELLO_WORLD_PORTUGUESE)
-            }
-            buttonDarkTheme {
-                scrollTo()
-                click()
-            }
-        }
-        // Thai
-        onScreen<SimpleFragmentScreen> {
-            textViewContent {
-                hasText(ExpectedContent.APPLE_PORTUGUESE)
-            }
-            buttonThai {
-                scrollTo()
-                click()
-            }
-            textViewContent {
-                hasText(ExpectedContent.APPLE_THAI)
-            }
-        }
-        uiDevices.openQuickSettings()
-        uiDevices.findObject(UiSelector().text("Dark theme")).click()
-        uiDevices.pressBack()
-        uiDevices.pressBack()
-        onScreen<SimpleFragmentScreen> {
-            textViewContent {
-                hasText(ExpectedContent.APPLE_THAI)
-            }
-            pressBack()
-        }
-        onScreen<MainActivityScreen> {
-            textViewTitle {
-                hasText(ExpectedContent.HELLO_WORLD_THAI)
-                uiDevices.setOrientationNatural()
-                hasText(ExpectedContent.HELLO_WORLD_THAI)
-            }
-            buttonDarkTheme {
-                scrollTo()
-                click()
-            }
-        }
-        // American
-        onScreen<SimpleFragmentScreen> {
-            textViewContent {
-                hasText(ExpectedContent.APPLE_THAI)
-            }
-            buttonAmerican {
-                scrollTo()
-                click()
-            }
-            textViewContent {
-                hasText(ExpectedContent.APPLE_AMERICAN)
-            }
-        }
-        uiDevices.openQuickSettings()
-        uiDevices.findObject(UiSelector().text("Dark theme")).click()
-        uiDevices.pressBack()
-        uiDevices.pressBack()
-        onScreen<SimpleFragmentScreen> {
-            textViewContent {
-                hasText(ExpectedContent.APPLE_AMERICAN)
-            }
-            pressBack()
-        }
-        onScreen<MainActivityScreen> {
-            textViewTitle {
-                hasText(ExpectedContent.HELLO_WORLD_AMERICAN)
-                uiDevices.setOrientationNatural()
-                hasText(ExpectedContent.HELLO_WORLD_AMERICAN)
-            }
-        }
-    }
-}
+//@RunWith(AndroidSdkLevel29TestRunner::class)
+//class DarkThemeTest {
+//    @JvmField
+//    val uiDevices: UiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+//
+//    @Rule
+//    @JvmField
+//    val rule = ActivityScenarioRule(MainActivity::class.java)
+//
+//    @Test
+//    @TargetApiLevel(Build.VERSION_CODES.Q)
+//    @Ignore("For local running only, dark theme in quick settings panel is required")
+//    fun darkTheme() {
+//        onScreen<MainActivityScreen> {
+//            buttonDarkTheme {
+//                scrollTo()
+//                click()
+//            }
+//        }
+//        // Chinese
+//        onScreen<SimpleFragmentScreen> {
+//            buttonChinese {
+//                scrollTo()
+//                click()
+//            }
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_CHINESE)
+//            }
+//        }
+//        uiDevices.openQuickSettings()
+//        uiDevices.findObject(UiSelector().text("Dark theme")).click()
+//        uiDevices.pressBack()
+//        uiDevices.pressBack()
+//        onScreen<SimpleFragmentScreen> {
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_CHINESE)
+//            }
+//            pressBack()
+//        }
+//        onScreen<MainActivityScreen> {
+//            textViewTitle {
+//                hasText(ExpectedContent.HELLO_WORLD_CHINESE)
+//                uiDevices.setOrientationNatural()
+//                hasText(ExpectedContent.HELLO_WORLD_CHINESE)
+//            }
+//            buttonDarkTheme {
+//                scrollTo()
+//                click()
+//            }
+//        }
+//        // Italian
+//        onScreen<SimpleFragmentScreen> {
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_CHINESE)
+//            }
+//            buttonItalian {
+//                scrollTo()
+//                click()
+//            }
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_ITALIAN)
+//            }
+//        }
+//        uiDevices.openQuickSettings()
+//        uiDevices.findObject(UiSelector().text("Dark theme")).click()
+//        uiDevices.pressBack()
+//        uiDevices.pressBack()
+//        onScreen<SimpleFragmentScreen> {
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_ITALIAN)
+//            }
+//            pressBack()
+//        }
+//        onScreen<MainActivityScreen> {
+//            textViewTitle {
+//                hasText(ExpectedContent.HELLO_WORLD_ITALIAN)
+//                uiDevices.setOrientationNatural()
+//                hasText(ExpectedContent.HELLO_WORLD_ITALIAN)
+//            }
+//            buttonDarkTheme {
+//                scrollTo()
+//                click()
+//            }
+//        }
+//        // Japanese
+//        onScreen<SimpleFragmentScreen> {
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_ITALIAN)
+//            }
+//            buttonJapanese {
+//                scrollTo()
+//                click()
+//            }
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_JAPANESE)
+//            }
+//        }
+//        uiDevices.openQuickSettings()
+//        uiDevices.findObject(UiSelector().text("Dark theme")).click()
+//        uiDevices.pressBack()
+//        uiDevices.pressBack()
+//        onScreen<SimpleFragmentScreen> {
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_JAPANESE)
+//            }
+//            pressBack()
+//        }
+//        onScreen<MainActivityScreen> {
+//            textViewTitle {
+//                hasText(ExpectedContent.HELLO_WORLD_JAPANESE)
+//                uiDevices.setOrientationNatural()
+//                hasText(ExpectedContent.HELLO_WORLD_JAPANESE)
+//            }
+//            buttonDarkTheme {
+//                scrollTo()
+//                click()
+//            }
+//        }
+//        // Korean
+//        onScreen<SimpleFragmentScreen> {
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_JAPANESE)
+//            }
+//            buttonKorean {
+//                scrollTo()
+//                click()
+//            }
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_KOREAN)
+//            }
+//        }
+//        uiDevices.openQuickSettings()
+//        uiDevices.findObject(UiSelector().text("Dark theme")).click()
+//        uiDevices.pressBack()
+//        uiDevices.pressBack()
+//        onScreen<SimpleFragmentScreen> {
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_KOREAN)
+//            }
+//            pressBack()
+//        }
+//        onScreen<MainActivityScreen> {
+//            textViewTitle {
+//                hasText(ExpectedContent.HELLO_WORLD_KOREAN)
+//                uiDevices.setOrientationNatural()
+//                hasText(ExpectedContent.HELLO_WORLD_KOREAN)
+//            }
+//            buttonDarkTheme {
+//                scrollTo()
+//                click()
+//            }
+//        }
+//        // Portuguese
+//        onScreen<SimpleFragmentScreen> {
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_KOREAN)
+//            }
+//            buttonPortuguese {
+//                scrollTo()
+//                click()
+//            }
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_PORTUGUESE)
+//            }
+//        }
+//        uiDevices.openQuickSettings()
+//        uiDevices.findObject(UiSelector().text("Dark theme")).click()
+//        uiDevices.pressBack()
+//        uiDevices.pressBack()
+//        onScreen<SimpleFragmentScreen> {
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_PORTUGUESE)
+//            }
+//            pressBack()
+//        }
+//        onScreen<MainActivityScreen> {
+//            textViewTitle {
+//                hasText(ExpectedContent.HELLO_WORLD_PORTUGUESE)
+//                uiDevices.setOrientationNatural()
+//                hasText(ExpectedContent.HELLO_WORLD_PORTUGUESE)
+//            }
+//            buttonDarkTheme {
+//                scrollTo()
+//                click()
+//            }
+//        }
+//        // Thai
+//        onScreen<SimpleFragmentScreen> {
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_PORTUGUESE)
+//            }
+//            buttonThai {
+//                scrollTo()
+//                click()
+//            }
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_THAI)
+//            }
+//        }
+//        uiDevices.openQuickSettings()
+//        uiDevices.findObject(UiSelector().text("Dark theme")).click()
+//        uiDevices.pressBack()
+//        uiDevices.pressBack()
+//        onScreen<SimpleFragmentScreen> {
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_THAI)
+//            }
+//            pressBack()
+//        }
+//        onScreen<MainActivityScreen> {
+//            textViewTitle {
+//                hasText(ExpectedContent.HELLO_WORLD_THAI)
+//                uiDevices.setOrientationNatural()
+//                hasText(ExpectedContent.HELLO_WORLD_THAI)
+//            }
+//            buttonDarkTheme {
+//                scrollTo()
+//                click()
+//            }
+//        }
+//        // American
+//        onScreen<SimpleFragmentScreen> {
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_THAI)
+//            }
+//            buttonAmerican {
+//                scrollTo()
+//                click()
+//            }
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_AMERICAN)
+//            }
+//        }
+//        uiDevices.openQuickSettings()
+//        uiDevices.findObject(UiSelector().text("Dark theme")).click()
+//        uiDevices.pressBack()
+//        uiDevices.pressBack()
+//        onScreen<SimpleFragmentScreen> {
+//            textViewContent {
+//                hasText(ExpectedContent.APPLE_AMERICAN)
+//            }
+//            pressBack()
+//        }
+//        onScreen<MainActivityScreen> {
+//            textViewTitle {
+//                hasText(ExpectedContent.HELLO_WORLD_AMERICAN)
+//                uiDevices.setOrientationNatural()
+//                hasText(ExpectedContent.HELLO_WORLD_AMERICAN)
+//            }
+//        }
+//    }
+//}
diff --git a/app/src/main/java/com/akexorcist/localizationapp/hilt/HiltActivity.kt b/app/src/main/java/com/akexorcist/localizationapp/hilt/HiltActivity.kt
index 4a16cff..cf71cba 100644
--- a/app/src/main/java/com/akexorcist/localizationapp/hilt/HiltActivity.kt
+++ b/app/src/main/java/com/akexorcist/localizationapp/hilt/HiltActivity.kt
@@ -13,36 +13,8 @@ class HiltActivity : LocalizationActivity() {
     @Inject
     lateinit var storyProvider: StoryProvider
 
-    companion object {
-        private const val KEY_SCROLL_X = "scroll_x"
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
-
-        binding.textViewContent.text = storyProvider.getAppleStory()
-        binding.btnBack.setOnClickListener { super.onBackPressed() }
-        binding.layoutLanguageChooser.btnAmerican.setOnClickListener { setLanguage("en") }
-        binding.layoutLanguageChooser.btnChinese.setOnClickListener { setLanguage("zh") }
-        binding.layoutLanguageChooser.btnItalian.setOnClickListener { setLanguage("it") }
-        binding.layoutLanguageChooser.btnJapanese.setOnClickListener { setLanguage("ja") }
-        binding.layoutLanguageChooser.btnKorean.setOnClickListener { setLanguage("ko") }
-        binding.layoutLanguageChooser.btnPortuguese.setOnClickListener { setLanguage("pt") }
-        binding.layoutLanguageChooser.btnThai.setOnClickListener { setLanguage("th") }
-    }
-
-    public override fun onSaveInstanceState(outState: Bundle) {
-        // Save x-position of horizontal scroll view.
-        outState.putInt(KEY_SCROLL_X, binding.layoutLanguageChooser.svLanguageChooser.scrollX)
-        super.onSaveInstanceState(outState)
-    }
-
-    public override fun onRestoreInstanceState(savedInstanceState: Bundle) {
-        super.onRestoreInstanceState(savedInstanceState)
-        // Restore x-position of horizontal scroll view.
-        binding.layoutLanguageChooser.svLanguageChooser.scrollTo(
-            savedInstanceState.getInt(KEY_SCROLL_X), 0
-        )
     }
 }
diff --git a/app/src/main/java/com/akexorcist/localizationapp/hilt/HiltFragmentWithViewModel.kt b/app/src/main/java/com/akexorcist/localizationapp/hilt/HiltFragmentWithViewModel.kt
new file mode 100644
index 0000000..36dcf50
--- /dev/null
+++ b/app/src/main/java/com/akexorcist/localizationapp/hilt/HiltFragmentWithViewModel.kt
@@ -0,0 +1,69 @@
+package com.akexorcist.localizationapp.hilt
+
+import android.os.Bundle
+import android.view.View
+import android.widget.Button
+import android.widget.ImageButton
+import android.widget.ScrollView
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import com.akexorcist.localizationactivity.ui.LocalizationActivity
+import com.akexorcist.localizationapp.R
+import dagger.hilt.android.AndroidEntryPoint
+
+
+@AndroidEntryPoint
+class HiltFragmentWithViewModel : Fragment(R.layout.fragment_hilt) {
+
+    private val hiltViewModel: HiltViewModel by viewModels()
+
+    private var languageChooserScrollView: ScrollView? = null
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupUi(view)
+    }
+
+    private fun setupUi(view: View) {
+        languageChooserScrollView = view.findViewById(R.id.sv_language_chooser)
+
+        view.findViewById<TextView>(R.id.text_view_content).text = hiltViewModel.storyProvider.getAppleStory()
+        view.findViewById<Button>(R.id.btn_back).setOnClickListener { activity?.onBackPressed() }
+        view.findViewById<ImageButton>(R.id.btn_american).setOnClickListener { setLanguage("en") }
+        view.findViewById<ImageButton>(R.id.btn_chinese).setOnClickListener { setLanguage("zh") }
+        view.findViewById<ImageButton>(R.id.btn_italian).setOnClickListener { setLanguage("it") }
+        view.findViewById<ImageButton>(R.id.btn_japanese).setOnClickListener { setLanguage("ja") }
+        view.findViewById<ImageButton>(R.id.btn_korean).setOnClickListener { setLanguage("ko") }
+        view.findViewById<ImageButton>(R.id.btn_portuguese).setOnClickListener { setLanguage("pt") }
+        view.findViewById<ImageButton>(R.id.btn_thai).setOnClickListener { setLanguage("th") }
+    }
+
+    private fun setLanguage(newLanguage: String) {
+        (activity as? LocalizationActivity)?.setLanguage(newLanguage)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        // Save x-position of horizontal scroll view.
+        languageChooserScrollView?.scrollX?.let { scrollX ->
+            outState.putInt(KEY_SCROLL_X, scrollX)
+        }
+        super.onSaveInstanceState(outState)
+    }
+
+
+    override fun onViewStateRestored(savedInstanceState: Bundle?) {
+        super.onViewStateRestored(savedInstanceState)
+        languageChooserScrollView?.scrollTo(savedInstanceState?.getInt(KEY_SCROLL_X) ?: 0, 0)
+
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        languageChooserScrollView = null
+    }
+
+    companion object {
+        private const val KEY_SCROLL_X = "scroll_x"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/akexorcist/localizationapp/hilt/HiltViewModel.kt b/app/src/main/java/com/akexorcist/localizationapp/hilt/HiltViewModel.kt
new file mode 100644
index 0000000..ce33855
--- /dev/null
+++ b/app/src/main/java/com/akexorcist/localizationapp/hilt/HiltViewModel.kt
@@ -0,0 +1,13 @@
+package com.akexorcist.localizationapp.hilt
+
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+
+@HiltViewModel
+class HiltViewModel @Inject constructor(val storyProvider: SimpleStoryProvider) : ViewModel(){
+    init {
+        storyProvider.getAppleStory()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/akexorcist/localizationapp/hilt/StoryProvider.kt b/app/src/main/java/com/akexorcist/localizationapp/hilt/StoryProvider.kt
index dca32aa..a1b471b 100644
--- a/app/src/main/java/com/akexorcist/localizationapp/hilt/StoryProvider.kt
+++ b/app/src/main/java/com/akexorcist/localizationapp/hilt/StoryProvider.kt
@@ -2,7 +2,7 @@ package com.akexorcist.localizationapp.hilt
 
 import android.content.Context
 import com.akexorcist.localizationapp.R
-import dagger.hilt.android.qualifiers.ActivityContext
+import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 interface StoryProvider {
@@ -10,9 +10,9 @@ interface StoryProvider {
 }
 
 class SimpleStoryProvider @Inject constructor(
-    @ActivityContext private val context: Context
+    @ApplicationContext private val appContext: Context
 ) : StoryProvider {
     override fun getAppleStory(): String {
-        return context.getString(R.string.sample_apple_story)
+        return appContext.getString(R.string.sample_apple_story)
     }
 }
diff --git a/app/src/main/res/layout/activity_hilt.xml b/app/src/main/res/layout/activity_hilt.xml
index 6685fe4..04ab912 100644
--- a/app/src/main/res/layout/activity_hilt.xml
+++ b/app/src/main/res/layout/activity_hilt.xml
@@ -1,52 +1,7 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/hilt_activity_fragment_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/shape_background_primary_gradient"
-    android:orientation="vertical"
-    tools:context=".hilt.HiltActivity">
-
-    <Button
-        android:id="@+id/btn_back"
-        style="@style/Button.White.Outline.Menu"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:text="@string/back" />
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:padding="16dp"
-        android:layout_weight="1">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/shape_background_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/text_view_content"
-                style="@style/Text.Content.White"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="16dp"
-                tools:text="@string/sample_youtube_app" />
-
-        </LinearLayout>
-
-    </ScrollView>
-
-    <include
-        android:id="@+id/layout_language_chooser"
-        layout="@layout/layout_language_chooser"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="24dp" />
-
-</LinearLayout>
+    android:name="com.akexorcist.localizationapp.hilt.HiltFragmentWithViewModel"
+    tools:context=".hilt.HiltActivity"/>
diff --git a/app/src/main/res/layout/fragment_hilt.xml b/app/src/main/res/layout/fragment_hilt.xml
new file mode 100644
index 0000000..6685fe4
--- /dev/null
+++ b/app/src/main/res/layout/fragment_hilt.xml
@@ -0,0 +1,52 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/shape_background_primary_gradient"
+    android:orientation="vertical"
+    tools:context=".hilt.HiltActivity">
+
+    <Button
+        android:id="@+id/btn_back"
+        style="@style/Button.White.Outline.Menu"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:text="@string/back" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:padding="16dp"
+        android:layout_weight="1">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/shape_background_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/text_view_content"
+                style="@style/Text.Content.White"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="16dp"
+                tools:text="@string/sample_youtube_app" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <include
+        android:id="@+id/layout_language_chooser"
+        layout="@layout/layout_language_chooser"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp" />
+
+</LinearLayout>
diff --git a/localization/src/main/java/com/akexorcist/localizationactivity/core/LocalizationActivityDelegate.kt b/localization/src/main/java/com/akexorcist/localizationactivity/core/LocalizationActivityDelegate.kt
index 8d39d6e..ef79866 100644
--- a/localization/src/main/java/com/akexorcist/localizationactivity/core/LocalizationActivityDelegate.kt
+++ b/localization/src/main/java/com/akexorcist/localizationactivity/core/LocalizationActivityDelegate.kt
@@ -8,6 +8,7 @@ import android.content.res.Resources
 import android.os.Build
 import android.os.Handler
 import android.os.LocaleList
+import android.os.Looper
 import java.util.*
 
 open class LocalizationActivityDelegate(val activity: Activity) {
@@ -34,7 +35,7 @@ open class LocalizationActivityDelegate(val activity: Activity) {
 
     // If activity is run to back stack. So we have to check if this activity is resume working.
     fun onResume(context: Context) {
-        Handler().post {
+        Handler(Looper.getMainLooper()).post {
             checkLocaleChange(context)
             checkAfterLocaleChanging()
         }
diff --git a/localization/src/main/java/com/akexorcist/localizationactivity/core/LocalizationApplicationDelegate.kt b/localization/src/main/java/com/akexorcist/localizationactivity/core/LocalizationApplicationDelegate.kt
index eed7fc1..cf8e085 100644
--- a/localization/src/main/java/com/akexorcist/localizationactivity/core/LocalizationApplicationDelegate.kt
+++ b/localization/src/main/java/com/akexorcist/localizationactivity/core/LocalizationApplicationDelegate.kt
@@ -1,6 +1,7 @@
 package com.akexorcist.localizationactivity.core
 
 import android.content.Context
+import android.content.res.Resources
 import java.util.*
 
 class LocalizationApplicationDelegate {
@@ -9,7 +10,9 @@ class LocalizationApplicationDelegate {
 
     fun attachBaseContext(context: Context): Context = LocalizationUtility.applyLocalizationContext(context)
 
-    fun getApplicationContext(applicationContext: Context): Context = LocalizationUtility.applyLocalizationContext(applicationContext)
+    fun getApplicationContext(applicationContext: Context): Context = LocalizationUtility.applyLocalizationConfig(applicationContext)
+
+    fun getResources(appContext: Context): Resources = LocalizationUtility.getResources(appContext)
 
     fun setDefaultLanguage(context: Context, language: String) {
         val locale = Locale(language)
diff --git a/localization/src/main/java/com/akexorcist/localizationactivity/core/LocalizationUtility.kt b/localization/src/main/java/com/akexorcist/localizationactivity/core/LocalizationUtility.kt
index 6aac575..42d7a8f 100644
--- a/localization/src/main/java/com/akexorcist/localizationactivity/core/LocalizationUtility.kt
+++ b/localization/src/main/java/com/akexorcist/localizationactivity/core/LocalizationUtility.kt
@@ -2,51 +2,121 @@ package com.akexorcist.localizationactivity.core
 
 import android.content.Context
 import android.content.res.Configuration
+import android.content.res.Resources
 import android.os.Build
 import android.os.LocaleList
+import android.util.DisplayMetrics
 import java.util.*
 
 object LocalizationUtility {
+    fun applyLocalizationConfig(baseContext: Context): Context {
+        val baseLocale = getLocaleFromConfiguration(baseContext.resources.configuration)
+        val currentLocale = LanguageSetting.getLanguageWithDefault(
+                baseContext,
+                LanguageSetting.getDefaultLanguage(baseContext)
+        )
+        if (!isRequestedLocaleChanged(baseLocale, currentLocale)) return baseContext
+
+        return when {
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.O -> {
+                val localeList = LocaleList(currentLocale)
+                LocaleList.setDefault(localeList)
+                val config = Configuration().apply {
+                    setLocale(currentLocale)
+                    setLocales(localeList)
+                }
+                baseContext.createConfigurationContext(config)
+            }
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 -> {
+                val config = Configuration().apply {
+                    setLocale(currentLocale)
+                }
+                baseContext.createConfigurationContext(config)
+            }
+            else -> {
+                val config = Configuration().apply {
+                    @Suppress("DEPRECATION")
+                    locale = currentLocale
+                }
+                @Suppress("DEPRECATION")
+                baseContext.resources.updateConfiguration(
+                        config,
+                        baseContext.resources.displayMetrics
+                )
+                baseContext
+            }
+        }
+    }
+
     fun applyLocalizationContext(baseContext: Context): Context {
         val baseLocale = getLocaleFromConfiguration(baseContext.resources.configuration)
         val currentLocale = LanguageSetting.getLanguageWithDefault(
-            baseContext,
-            LanguageSetting.getDefaultLanguage(baseContext)
+                baseContext,
+                LanguageSetting.getDefaultLanguage(baseContext)
         )
-        if (!baseLocale.toString().equals(currentLocale.toString(), ignoreCase = true)) {
-            return when {
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.O -> {
-                    val context = LocalizationContext(baseContext)
-                    val localeList = LocaleList(currentLocale)
-                    LocaleList.setDefault(localeList)
-                    val config = Configuration().apply {
-                        setLocale(currentLocale)
-                        setLocales(localeList)
-                    }
-                    context.createConfigurationContext(config)
-                }
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 -> {
-                    val context = LocalizationContext(baseContext)
-                    val config = Configuration().apply {
-                        setLocale(currentLocale)
-                    }
-                    context.createConfigurationContext(config)
-                }
-                else -> {
-                    val config = Configuration().apply {
-                        @Suppress("DEPRECATION")
-                        locale = currentLocale
-                    }
+        if (!isRequestedLocaleChanged(baseLocale, currentLocale)) return baseContext
+
+        return when {
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.O -> {
+                val context = LocalizationContext(baseContext)
+                val localeList = LocaleList(currentLocale)
+                LocaleList.setDefault(localeList)
+                val config = Configuration().apply {
+                    setLocale(currentLocale)
+                    setLocales(localeList)
+                }
+                context.createConfigurationContext(config)
+            }
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 -> {
+                val context = LocalizationContext(baseContext)
+                val config = Configuration().apply {
+                    setLocale(currentLocale)
+                }
+                context.createConfigurationContext(config)
+            }
+            else -> {
+                val config = Configuration().apply {
                     @Suppress("DEPRECATION")
-                    baseContext.resources.updateConfiguration(
+                    locale = currentLocale
+                }
+                @Suppress("DEPRECATION")
+                baseContext.resources.updateConfiguration(
                         config,
                         baseContext.resources.displayMetrics
-                    )
-                    baseContext
+                )
+                baseContext
+            }
+        }
+    }
+
+    private fun isRequestedLocaleChanged(baseLocale: Locale, currentLocale: Locale) =
+            !baseLocale.toString().equals(currentLocale.toString(), ignoreCase = true)
+
+    fun getResources(appContext: Context): Resources {
+        val locale = LanguageSetting.getLanguageWithDefault(appContext, LanguageSetting.getDefaultLanguage(appContext))
+
+        return when {
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.O -> {
+                val configuration = Configuration().apply {
+                    setLocales(LocaleList(locale))
                 }
+                appContext.createConfigurationContext(configuration).resources
+            }
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 -> {
+                val configuration = Configuration().apply {
+                    setLocale(locale)
+                }
+                appContext.createConfigurationContext(configuration).resources
+            }
+            else -> {
+                val configuration = Configuration().apply {
+                    @Suppress("DEPRECATION")
+                    this.locale = locale
+                }
+                val metrics: DisplayMetrics = appContext.resources.displayMetrics
+                @Suppress("DEPRECATION")
+                return Resources(appContext.assets, metrics, configuration)
             }
-        } else {
-            return baseContext
         }
     }
 
diff --git a/localization/src/main/java/com/akexorcist/localizationactivity/ui/LocalizationApplication.kt b/localization/src/main/java/com/akexorcist/localizationactivity/ui/LocalizationApplication.kt
index 3a927e9..545dca3 100644
--- a/localization/src/main/java/com/akexorcist/localizationactivity/ui/LocalizationApplication.kt
+++ b/localization/src/main/java/com/akexorcist/localizationactivity/ui/LocalizationApplication.kt
@@ -3,6 +3,7 @@ package com.akexorcist.localizationactivity.ui
 import android.app.Application
 import android.content.Context
 import android.content.res.Configuration
+import android.content.res.Resources
 import com.akexorcist.localizationactivity.core.LocalizationApplicationDelegate
 import java.util.*
 
@@ -23,5 +24,9 @@ abstract class LocalizationApplication : Application() {
         return localizationDelegate.getApplicationContext(super.getApplicationContext())
     }
 
+    override fun getResources(): Resources {
+        return localizationDelegate.getResources(this)
+    }
+
     abstract fun getDefaultLanguage(): Locale
 }