-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feat/lock
# Conflicts: # data/usagestats/src/main/java/com/hmh/hamyeonham/usagestats/di/UsageStatsModule.kt # data/usagestats/src/main/java/com/hmh/hamyeonham/usagestats/repository/DefaultUsageGoalsRepository.kt # feature/onboarding/build.gradle.kts
- Loading branch information
Showing
29 changed files
with
491 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
.../main/java/com/hmh/hamyeonham/feature/onboarding/adapter/OnBoardingAppSelectionAdapter.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package com.hmh.hamyeonham.feature.onboarding.adapter | ||
|
|
||
| import android.view.LayoutInflater | ||
| import android.view.ViewGroup | ||
| import androidx.recyclerview.widget.ListAdapter | ||
| import com.hmh.hamyeonham.common.view.ItemDiffCallback | ||
| import com.hmh.hamyeonham.feature.onboarding.databinding.ItemAddAppBinding | ||
|
|
||
| class OnBoardingAppSelectionAdapter( | ||
| private val onAppCheckboxClicked: (String) -> Unit, | ||
| private val onAppCheckboxUnClicked: (String) -> Unit, | ||
| ) : | ||
| ListAdapter<String, OnBoardingAppSelectionViewHolder>( | ||
| ItemDiffCallback(onItemsTheSame = { oldItem, newItem -> | ||
| oldItem == newItem | ||
| }, onContentsTheSame = { oldItem, newItem -> | ||
| oldItem == newItem | ||
| }), | ||
| ) { | ||
|
|
||
| override fun onCreateViewHolder( | ||
| parent: ViewGroup, | ||
| viewType: Int, | ||
| ): OnBoardingAppSelectionViewHolder { | ||
| val inflater = LayoutInflater.from(parent.context) | ||
| val binding = ItemAddAppBinding.inflate(inflater, parent, false) | ||
| return OnBoardingAppSelectionViewHolder( | ||
| binding, | ||
| onAppCheckboxClicked = onAppCheckboxClicked, | ||
| onAppCheckboxUnClicked = onAppCheckboxUnClicked, | ||
| ) | ||
| } | ||
|
|
||
| override fun onBindViewHolder(holder: OnBoardingAppSelectionViewHolder, position: Int) { | ||
| holder.onBind(currentList[position]) | ||
| } | ||
| } |
34 changes: 34 additions & 0 deletions
34
...in/java/com/hmh/hamyeonham/feature/onboarding/adapter/OnBoardingAppSelectionViewHolder.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package com.hmh.hamyeonham.feature.onboarding.adapter | ||
|
|
||
| import androidx.recyclerview.widget.RecyclerView | ||
| import androidx.recyclerview.widget.RecyclerView.ViewHolder | ||
| import com.hmh.hamyeonham.common.context.getAppIconFromPackageName | ||
| import com.hmh.hamyeonham.common.context.getAppNameFromPackageName | ||
| import com.hmh.hamyeonham.feature.onboarding.databinding.ItemAddAppBinding | ||
|
|
||
| class OnBoardingAppSelectionViewHolder( | ||
| private val binding: ItemAddAppBinding, | ||
| private val onAppCheckboxClicked: (String) -> Unit, | ||
| private val onAppCheckboxUnClicked: (String) -> Unit | ||
| ) : ViewHolder(binding.root) { | ||
| fun onBind(packageName: String) { | ||
| binding.run { | ||
| val context = binding.root.context | ||
| tvAppname.text = context.getAppNameFromPackageName(packageName) | ||
| ivAppicon.setImageDrawable(context.getAppIconFromPackageName(packageName)) | ||
| } | ||
| setCheckBoxButtonListener(packageName) | ||
| } | ||
|
|
||
| private fun setCheckBoxButtonListener(packageName: String) { | ||
| binding.cbApp.setOnClickListener { | ||
| if (adapterPosition != RecyclerView.NO_POSITION) { | ||
| if (binding.cbApp.isChecked) { | ||
| onAppCheckboxClicked(packageName) | ||
| } else { | ||
| onAppCheckboxUnClicked(packageName) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
.../java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingAppAddSelectionFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package com.hmh.hamyeonham.feature.onboarding.fragment | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import androidx.fragment.app.Fragment | ||
| import androidx.fragment.app.activityViewModels | ||
| import androidx.fragment.app.viewModels | ||
| import androidx.recyclerview.widget.LinearLayoutManager | ||
| 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.viewmodel.OnBoardingAppSelectionViewModel | ||
| import com.hmh.hamyeonham.feature.onboarding.viewmodel.OnBoardingViewModel | ||
| import com.hmh.hamyeonham.feature.onboarding.viewmodel.OnboardEvent | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
|
|
||
| @AndroidEntryPoint | ||
| class OnBoardingAppAddSelectionFragment : Fragment() { | ||
| private val binding by viewBinding(FragmentOnBoardingAppAddSelectionBinding::bind) | ||
| private val viewModel by viewModels<OnBoardingAppSelectionViewModel>() | ||
| private val activityViewModel by activityViewModels<OnBoardingViewModel>() | ||
|
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, | ||
| container: ViewGroup?, | ||
| savedInstanceState: Bundle?, | ||
| ): View { | ||
| return FragmentOnBoardingAppAddSelectionBinding.inflate(inflater, container, false).root | ||
| } | ||
|
|
||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
| initViews() | ||
| } | ||
|
|
||
| private fun initViews() { | ||
| initAppSelectionRecyclerAdapter() | ||
| } | ||
|
|
||
| private fun initAppSelectionRecyclerAdapter() { | ||
| binding.rvAppSelection.run { | ||
| adapter = OnBoardingAppSelectionAdapter( | ||
| onAppCheckboxClicked = ::onAppCheckboxClicked, | ||
| onAppCheckboxUnClicked = ::onAppCheckboxUnClicked, | ||
| ) | ||
| layoutManager = LinearLayoutManager(requireContext()) | ||
| } | ||
| setViewPager() | ||
| } | ||
|
|
||
| private fun setViewPager() { | ||
| val onboardingAppSelectionAdapter = | ||
| binding.rvAppSelection.adapter as? OnBoardingAppSelectionAdapter | ||
| onboardingAppSelectionAdapter?.submitList(viewModel.getInstalledApps()) | ||
| } | ||
|
|
||
| private fun onAppCheckboxClicked(packageName: String) { | ||
| activityViewModel.sendEvent(OnboardEvent.AddApps(packageName)) | ||
| } | ||
|
|
||
| private fun onAppCheckboxUnClicked(packageName: String) { | ||
| activityViewModel.sendEvent(OnboardEvent.DeleteApp(packageName)) | ||
| } | ||
|
|
||
| override fun onResume() { | ||
| super.onResume() | ||
| activityViewModel.sendEvent(OnboardEvent.changeActivityButtonText(getString(R.string.all_select_done))) | ||
| activityViewModel.sendEvent(OnboardEvent.visibleProgressbar(false)) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.