diff --git a/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt b/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt index cc2096038..fe3edbbe4 100644 --- a/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt +++ b/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt @@ -7,6 +7,7 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import com.hmh.hamyeonham.common.view.viewBinding import com.hmh.hamyeonham.databinding.ActivitySampleBinding import com.hmh.hamyeonham.feature.login.LoginActivity +import com.hmh.hamyeonham.feature.onboarding.OnBoardingActivity import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -36,7 +37,7 @@ class SampleActivity : AppCompatActivity() { } private fun navigateToLogin() { - startActivity(Intent(this, LoginActivity::class.java)) + startActivity(Intent(this, OnBoardingActivity::class.java)) finish() } } diff --git a/app/src/main/java/com/hmh/hamyeonham/navigation/DefaultNavigationProvider.kt b/app/src/main/java/com/hmh/hamyeonham/navigation/DefaultNavigationProvider.kt index f03b9a52f..15c7b5992 100644 --- a/app/src/main/java/com/hmh/hamyeonham/navigation/DefaultNavigationProvider.kt +++ b/app/src/main/java/com/hmh/hamyeonham/navigation/DefaultNavigationProvider.kt @@ -2,7 +2,6 @@ package com.hmh.hamyeonham.navigation import android.content.Context import android.content.Intent -import androidx.fragment.app.Fragment import com.hmh.hamyeonham.challenge.point.PointActivity import com.hmh.hamyeonham.common.navigation.NavigationProvider import com.hmh.hamyeonham.common.permission.PermissionActivity @@ -11,7 +10,6 @@ import com.hmh.hamyeonham.feature.login.LoginActivity import com.hmh.hamyeonham.feature.main.MainActivity import com.hmh.hamyeonham.feature.onboarding.OnBoardingActivity import com.hmh.hamyeonham.feature.onboarding.OnBoardingStoryActivity -import com.hmh.hamyeonham.feature.onboarding.fragment.OnBoardingRequestPermissionFragment import com.hmh.hamyeonham.feature.store.StoreActivity import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/adapter/OnBoardingAppSelectionAdapter.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/adapter/AppSelectionAdapter.kt similarity index 88% rename from feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/adapter/OnBoardingAppSelectionAdapter.kt rename to feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/adapter/AppSelectionAdapter.kt index 1866cfb54..3a9c823b2 100644 --- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/adapter/OnBoardingAppSelectionAdapter.kt +++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/adapter/AppSelectionAdapter.kt @@ -11,11 +11,11 @@ import com.hmh.hamyeonham.common.context.getAppNameFromPackageName import com.hmh.hamyeonham.common.view.ItemDiffCallback import com.hmh.hamyeonham.feature.onboarding.databinding.ItemAddAppBinding -class OnBoardingAppSelectionAdapter( +class AppSelectionAdapter( private val onAppCheckboxClicked: (String) -> Unit, private val onAppCheckboxUnClicked: (String) -> Unit, ) : - ListAdapter( + ListAdapter( ItemDiffCallback( onItemsTheSame = { oldItem, newItem -> oldItem == newItem @@ -28,23 +28,23 @@ class OnBoardingAppSelectionAdapter( override fun onCreateViewHolder( parent: ViewGroup, viewType: Int, - ): OnBoardingAppSelectionViewHolder { + ): AppSelectionViewHolder { val inflater = LayoutInflater.from(parent.context) val binding = ItemAddAppBinding.inflate(inflater, parent, false) - return OnBoardingAppSelectionViewHolder( + return AppSelectionViewHolder( binding, onAppCheckboxClicked = onAppCheckboxClicked, onAppCheckboxUnClicked = onAppCheckboxUnClicked, ) } - override fun onBindViewHolder(holder: OnBoardingAppSelectionViewHolder, position: Int) { + override fun onBindViewHolder(holder: AppSelectionViewHolder, position: Int) { currentList.getOrNull(position)?.let { holder.onBind(it.packageName) } } - inner class OnBoardingAppSelectionViewHolder( + inner class AppSelectionViewHolder( private val binding: ItemAddAppBinding, private val onAppCheckboxClicked: (String) -> Unit, private val onAppCheckboxUnClicked: (String) -> Unit, diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/adapter/OnBoardingFragmentStateAdapter.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/adapter/OnBoardingFragmentStateAdapter.kt index 5038c382e..ba053b4c8 100644 --- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/adapter/OnBoardingFragmentStateAdapter.kt +++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/adapter/OnBoardingFragmentStateAdapter.kt @@ -3,12 +3,12 @@ package com.hmh.hamyeonham.feature.onboarding.adapter import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.viewpager2.adapter.FragmentStateAdapter -import com.hmh.hamyeonham.feature.onboarding.fragment.OnBoardingAppAddSelectionFragment -import com.hmh.hamyeonham.feature.onboarding.fragment.OnBoardingRequestPermissionFragment -import com.hmh.hamyeonham.feature.onboarding.fragment.OnBoardingSelectAppFragment -import com.hmh.hamyeonham.feature.onboarding.fragment.OnBoardingSelectDataFragment -import com.hmh.hamyeonham.feature.onboarding.fragment.OnBoardingSelectScreenTimeFragment -import com.hmh.hamyeonham.feature.onboarding.fragment.OnBoardingSelectUseTimeFragment +import com.hmh.hamyeonham.feature.onboarding.fragment.AppAddSelectionFragment +import com.hmh.hamyeonham.feature.onboarding.fragment.RequestPermissionFragment +import com.hmh.hamyeonham.feature.onboarding.fragment.SelectAppFragment +import com.hmh.hamyeonham.feature.onboarding.fragment.SelectDataFragment +import com.hmh.hamyeonham.feature.onboarding.fragment.SelectScreenTimeFragment +import com.hmh.hamyeonham.feature.onboarding.fragment.SelectUseTimeFragment enum class OnBoardingFragmentType { SELECT_DATA_TIME, @@ -33,21 +33,21 @@ class OnBoardingFragmentStateAdapter(fragmentActivity: FragmentActivity) : override fun createFragment(position: Int): Fragment { return when (val fragmentType = OnBoardingFragmentType.fromPosition(position)) { - OnBoardingFragmentType.SELECT_DATA_TIME -> OnBoardingSelectDataFragment.newInstance(fragmentType) + OnBoardingFragmentType.SELECT_DATA_TIME -> SelectDataFragment.newInstance(fragmentType) - OnBoardingFragmentType.SELECT_DATA_PROBLEM -> OnBoardingSelectDataFragment.newInstance( + OnBoardingFragmentType.SELECT_DATA_PROBLEM -> SelectDataFragment.newInstance( fragmentType ) - OnBoardingFragmentType.SELECT_DATA_PERIOD -> OnBoardingSelectDataFragment.newInstance( + OnBoardingFragmentType.SELECT_DATA_PERIOD -> SelectDataFragment.newInstance( fragmentType ) - OnBoardingFragmentType.SELECT_SCREEN_TIME_GOAL -> OnBoardingSelectScreenTimeFragment() - OnBoardingFragmentType.REQUEST_PERMISSION -> OnBoardingRequestPermissionFragment() - OnBoardingFragmentType.SELECT_APP -> OnBoardingSelectAppFragment() - OnBoardingFragmentType.SELECT_APP_VIEW -> OnBoardingAppAddSelectionFragment() - OnBoardingFragmentType.SELECT_USE_TIME_GOAL -> OnBoardingSelectUseTimeFragment() + OnBoardingFragmentType.SELECT_SCREEN_TIME_GOAL -> SelectScreenTimeFragment() + OnBoardingFragmentType.REQUEST_PERMISSION -> RequestPermissionFragment() + OnBoardingFragmentType.SELECT_APP -> SelectAppFragment() + OnBoardingFragmentType.SELECT_APP_VIEW -> AppAddSelectionFragment() + OnBoardingFragmentType.SELECT_USE_TIME_GOAL -> SelectUseTimeFragment() } } } \ No newline at end of file diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingAppAddSelectionFragment.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/AppAddSelectionFragment.kt similarity index 88% rename from feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingAppAddSelectionFragment.kt rename to feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/AppAddSelectionFragment.kt index 6880643bb..a295fc6d3 100644 --- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingAppAddSelectionFragment.kt +++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/AppAddSelectionFragment.kt @@ -16,8 +16,8 @@ import com.hmh.hamyeonham.common.fragment.viewLifeCycle import com.hmh.hamyeonham.common.fragment.viewLifeCycleScope import com.hmh.hamyeonham.common.view.viewBinding import com.hmh.hamyeonham.feature.onboarding.R -import com.hmh.hamyeonham.feature.onboarding.adapter.OnBoardingAppSelectionAdapter -import com.hmh.hamyeonham.feature.onboarding.databinding.FragmentOnBoardingAppAddSelectionBinding +import com.hmh.hamyeonham.feature.onboarding.adapter.AppSelectionAdapter +import com.hmh.hamyeonham.feature.onboarding.databinding.FragmentAppAddSelectionBinding import com.hmh.hamyeonham.feature.onboarding.viewmodel.OnBoardingAppSelectionEffect import com.hmh.hamyeonham.feature.onboarding.viewmodel.OnBoardingAppSelectionViewModel import com.hmh.hamyeonham.feature.onboarding.viewmodel.OnBoardingViewModel @@ -27,8 +27,8 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @AndroidEntryPoint -class OnBoardingAppAddSelectionFragment : Fragment() { - private val binding by viewBinding(FragmentOnBoardingAppAddSelectionBinding::bind) +class AppAddSelectionFragment : Fragment() { + private val binding by viewBinding(FragmentAppAddSelectionBinding::bind) private val viewModel by viewModels() private val activityViewModel by activityViewModels() @@ -37,7 +37,7 @@ class OnBoardingAppAddSelectionFragment : Fragment() { container: ViewGroup?, savedInstanceState: Bundle?, ): View { - return FragmentOnBoardingAppAddSelectionBinding.inflate(inflater, container, false).root + return FragmentAppAddSelectionBinding.inflate(inflater, container, false).root } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -54,7 +54,7 @@ class OnBoardingAppAddSelectionFragment : Fragment() { private fun initAppSelectionRecyclerAdapter() { binding.rvAppSelection.run { - adapter = OnBoardingAppSelectionAdapter( + adapter = AppSelectionAdapter( onAppCheckboxClicked = ::onAppCheckboxClicked, onAppCheckboxUnClicked = ::onAppCheckboxUnClicked, ) @@ -65,7 +65,7 @@ class OnBoardingAppAddSelectionFragment : Fragment() { private fun collectState() { viewModel.installedApps.flowWithLifecycle(viewLifeCycle).onEach { val onboardingAppSelectionAdapter = - binding.rvAppSelection.adapter as? OnBoardingAppSelectionAdapter + binding.rvAppSelection.adapter as? AppSelectionAdapter onboardingAppSelectionAdapter?.submitList(it) }.launchIn(viewLifeCycleScope) diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingRequestPermissionFragment.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/RequestPermissionFragment.kt similarity index 95% rename from feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingRequestPermissionFragment.kt rename to feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/RequestPermissionFragment.kt index 2a19b6ae6..d1a22e91b 100644 --- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingRequestPermissionFragment.kt +++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/RequestPermissionFragment.kt @@ -18,14 +18,14 @@ import com.hmh.hamyeonham.common.permission.hasNotificationPermission import com.hmh.hamyeonham.common.permission.requestNotificationPermission import com.hmh.hamyeonham.common.view.viewBinding import com.hmh.hamyeonham.feature.onboarding.R -import com.hmh.hamyeonham.feature.onboarding.databinding.FragmentOnBoardingRequestPermissionBinding +import com.hmh.hamyeonham.feature.onboarding.databinding.FragmentRequestPermissionBinding import com.hmh.hamyeonham.feature.onboarding.viewmodel.OnBoardingViewModel import com.hmh.hamyeonham.feature.onboarding.viewmodel.OnboardEvent import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint -class OnBoardingRequestPermissionFragment : Fragment() { - private val binding by viewBinding(FragmentOnBoardingRequestPermissionBinding::bind) +class RequestPermissionFragment : Fragment() { + private val binding by viewBinding(FragmentRequestPermissionBinding::bind) private val activityViewModel by activityViewModels() private val overlayPermissionLauncher: ActivityResultLauncher = @@ -57,7 +57,7 @@ class OnBoardingRequestPermissionFragment : Fragment() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?, - ): View = FragmentOnBoardingRequestPermissionBinding.inflate(inflater, container, false).root + ): View = FragmentRequestPermissionBinding.inflate(inflater, container, false).root override fun onViewCreated( view: View, diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingSelectAppFragment.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/SelectAppFragment.kt similarity index 87% rename from feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingSelectAppFragment.kt rename to feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/SelectAppFragment.kt index cb88cc9ed..397c90f73 100644 --- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingSelectAppFragment.kt +++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/SelectAppFragment.kt @@ -8,18 +8,18 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import com.hmh.hamyeonham.common.amplitude.AmplitudeUtils import com.hmh.hamyeonham.feature.onboarding.R -import com.hmh.hamyeonham.feature.onboarding.databinding.FragmentOnBoardingSelectAppBinding +import com.hmh.hamyeonham.feature.onboarding.databinding.FragmentSelectAppBinding import com.hmh.hamyeonham.feature.onboarding.viewmodel.OnBoardingViewModel import com.hmh.hamyeonham.feature.onboarding.viewmodel.OnboardEvent -class OnBoardingSelectAppFragment : Fragment() { +class SelectAppFragment : Fragment() { private val activityViewModel by activityViewModels() override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?, - ): View = FragmentOnBoardingSelectAppBinding.inflate(inflater, container, false).root + ): View = FragmentSelectAppBinding.inflate(inflater, container, false).root override fun onResume() { super.onResume() diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingSelectDataFragment.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/SelectDataFragment.kt similarity index 93% rename from feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingSelectDataFragment.kt rename to feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/SelectDataFragment.kt index 44c29f62d..44d5f3923 100644 --- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingSelectDataFragment.kt +++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/SelectDataFragment.kt @@ -13,7 +13,7 @@ import com.hmh.hamyeonham.common.primitive.extractDigits import com.hmh.hamyeonham.common.view.viewBinding import com.hmh.hamyeonham.feature.onboarding.R import com.hmh.hamyeonham.feature.onboarding.adapter.OnBoardingFragmentType -import com.hmh.hamyeonham.feature.onboarding.databinding.FragmentOnBoardingSelectDataBinding +import com.hmh.hamyeonham.feature.onboarding.databinding.FragmentSelectDataBinding import com.hmh.hamyeonham.feature.onboarding.viewmodel.OnBoardingSelectDataViewModel import com.hmh.hamyeonham.feature.onboarding.viewmodel.OnBoardingViewModel import com.hmh.hamyeonham.feature.onboarding.viewmodel.OnboardEvent @@ -22,8 +22,8 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @AndroidEntryPoint -class OnBoardingSelectDataFragment : Fragment() { - private val binding by viewBinding(FragmentOnBoardingSelectDataBinding::bind) +class SelectDataFragment : Fragment() { + private val binding by viewBinding(FragmentSelectDataBinding::bind) private val viewModel by viewModels() private val activityViewModel by activityViewModels() @@ -34,8 +34,8 @@ class OnBoardingSelectDataFragment : Fragment() { companion object { private const val ARG_FRAGMENT_TYPE = "ARG_FRAGMENT_TYPE" - fun newInstance(fragmentType: OnBoardingFragmentType): OnBoardingSelectDataFragment { - val onBoardingFragment = OnBoardingSelectDataFragment() + fun newInstance(fragmentType: OnBoardingFragmentType): SelectDataFragment { + val onBoardingFragment = SelectDataFragment() val args = Bundle().apply { putString(ARG_FRAGMENT_TYPE, fragmentType.name) @@ -49,7 +49,7 @@ class OnBoardingSelectDataFragment : Fragment() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?, - ): View = FragmentOnBoardingSelectDataBinding.inflate(inflater, container, false).root + ): View = FragmentSelectDataBinding.inflate(inflater, container, false).root override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingSelectScreenTimeFragment.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/SelectScreenTimeFragment.kt similarity index 89% rename from feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingSelectScreenTimeFragment.kt rename to feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/SelectScreenTimeFragment.kt index 156b5f95d..1e199e7bc 100644 --- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingSelectScreenTimeFragment.kt +++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/SelectScreenTimeFragment.kt @@ -10,19 +10,19 @@ import androidx.fragment.app.activityViewModels import com.hmh.hamyeonham.common.view.setupScreentimeGoalRange import com.hmh.hamyeonham.common.view.viewBinding import com.hmh.hamyeonham.feature.onboarding.R -import com.hmh.hamyeonham.feature.onboarding.databinding.FragmentOnBoardingSelectScreentimeBinding +import com.hmh.hamyeonham.feature.onboarding.databinding.FragmentSelectScreentimeBinding import com.hmh.hamyeonham.feature.onboarding.viewmodel.OnBoardingViewModel import com.hmh.hamyeonham.feature.onboarding.viewmodel.OnboardEvent -class OnBoardingSelectScreenTimeFragment : Fragment() { - private val binding by viewBinding(FragmentOnBoardingSelectScreentimeBinding::bind) +class SelectScreenTimeFragment : Fragment() { + private val binding by viewBinding(FragmentSelectScreentimeBinding::bind) private val activityViewModel by activityViewModels() override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?, ): View { - return FragmentOnBoardingSelectScreentimeBinding.inflate( + return FragmentSelectScreentimeBinding.inflate( inflater, container, false, diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingSelectUseTimeFragment.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/SelectUseTimeFragment.kt similarity index 91% rename from feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingSelectUseTimeFragment.kt rename to feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/SelectUseTimeFragment.kt index e796aaa3e..1377e952e 100644 --- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingSelectUseTimeFragment.kt +++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/SelectUseTimeFragment.kt @@ -14,14 +14,14 @@ import com.hmh.hamyeonham.common.fragment.viewLifeCycleScope import com.hmh.hamyeonham.common.view.setupScreentimeGoalRange import com.hmh.hamyeonham.common.view.viewBinding import com.hmh.hamyeonham.feature.onboarding.R -import com.hmh.hamyeonham.feature.onboarding.databinding.FragmentOnBoardingSelectUseTimeBinding +import com.hmh.hamyeonham.feature.onboarding.databinding.FragmentSelectUseTimeBinding import com.hmh.hamyeonham.feature.onboarding.viewmodel.OnBoardingViewModel import com.hmh.hamyeonham.feature.onboarding.viewmodel.OnboardEvent import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach -class OnBoardingSelectUseTimeFragment : Fragment() { - private val binding by viewBinding(FragmentOnBoardingSelectUseTimeBinding::bind) +class SelectUseTimeFragment : Fragment() { + private val binding by viewBinding(FragmentSelectUseTimeBinding::bind) private val activityViewModel by activityViewModels() override fun onCreateView( @@ -29,7 +29,7 @@ class OnBoardingSelectUseTimeFragment : Fragment() { container: ViewGroup?, savedInstanceState: Bundle?, ): View { - return FragmentOnBoardingSelectUseTimeBinding.inflate(inflater, container, false).root + return FragmentSelectUseTimeBinding.inflate(inflater, container, false).root } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/viewmodel/OnBoardingAppSelectionViewModel.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/viewmodel/AppSelectionViewModel.kt similarity index 100% rename from feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/viewmodel/OnBoardingAppSelectionViewModel.kt rename to feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/viewmodel/AppSelectionViewModel.kt diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/viewmodel/OnBoardingSelectDataViewModel.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/viewmodel/SelectOnBoardingDataViewModel.kt similarity index 100% rename from feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/viewmodel/OnBoardingSelectDataViewModel.kt rename to feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/viewmodel/SelectOnBoardingDataViewModel.kt diff --git a/feature/onboarding/src/main/res/layout/fragment_on_boarding_app_add_selection.xml b/feature/onboarding/src/main/res/layout/fragment_app_add_selection.xml similarity index 100% rename from feature/onboarding/src/main/res/layout/fragment_on_boarding_app_add_selection.xml rename to feature/onboarding/src/main/res/layout/fragment_app_add_selection.xml diff --git a/feature/onboarding/src/main/res/layout/fragment_on_boarding_request_permission.xml b/feature/onboarding/src/main/res/layout/fragment_request_permission.xml similarity index 99% rename from feature/onboarding/src/main/res/layout/fragment_on_boarding_request_permission.xml rename to feature/onboarding/src/main/res/layout/fragment_request_permission.xml index 7a1dd6f79..c790793dc 100644 --- a/feature/onboarding/src/main/res/layout/fragment_on_boarding_request_permission.xml +++ b/feature/onboarding/src/main/res/layout/fragment_request_permission.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".fragment.OnBoardingRequestPermissionFragment"> + tools:context=".fragment.RequestPermissionFragment"> + tools:context=".fragment.SelectAppFragment"> + tools:context=".fragment.SelectDataFragment"> + tools:context=".fragment.SelectUseTimeFragment">