Merge branch 'feature/nextgen' of github.com:KotatsuApp/Kotatsu into feature/nextgen

app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesBottomSheet.kt

@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.FragmentManager
+import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseBottomSheet
@@ -22,6 +23,7 @@ import org.koitharu.kotatsu.utils.ext.assistedViewModels
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.withArgs
 
+@AndroidEntryPoint
 class FavouriteCategoriesBottomSheet :
 	BaseBottomSheet<SheetFavoriteCategoriesBinding>(),
 	OnListItemClickListener<MangaCategoryItem>,
@@ -31,7 +33,7 @@ class FavouriteCategoriesBottomSheet :
 	@Inject
 	lateinit var viewModelFactory: MangaCategoriesViewModel.Factory
 
-	private val viewModel by assistedViewModels {
+	private val viewModel: MangaCategoriesViewModel by assistedViewModels {
 		viewModelFactory.create(
 			requireNotNull(arguments?.getParcelableArrayList<ParcelableManga>(KEY_MANGA_LIST)).map { it.manga },
 		)

app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt

@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import coil.ImageLoader
 import com.google.android.material.snackbar.Snackbar
+import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
@@ -49,6 +50,7 @@ import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.utils.ShareHelper
 import org.koitharu.kotatsu.utils.ext.*
 
+@AndroidEntryPoint
 abstract class MangaListFragment :
 	BaseFragment<FragmentListBinding>(),
 	PaginationScrollListener.Callback,

app/src/main/java/org/koitharu/kotatsu/scrobbling/ui/selector/ScrobblingSelectorBottomSheet.kt

@@ -8,7 +8,6 @@ import android.widget.Toast
 import androidx.appcompat.widget.SearchView
 import androidx.fragment.app.FragmentManager
 import coil.ImageLoader
-import javax.inject.Inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.base.ui.BaseBottomSheet
@@ -23,6 +22,7 @@ import org.koitharu.kotatsu.scrobbling.ui.selector.adapter.ShikimoriSelectorAdap
 import org.koitharu.kotatsu.utils.ext.assistedViewModels
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.withArgs
+import javax.inject.Inject
 
 class ScrobblingSelectorBottomSheet :
 	BaseBottomSheet<SheetScrobblingSelectorBinding>(),

app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt

@@ -8,6 +8,7 @@ import androidx.appcompat.widget.SearchView
 import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
 import androidx.fragment.app.commit
+import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.databinding.ActivitySearchBinding
@@ -15,6 +16,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionViewModel
 import org.koitharu.kotatsu.utils.ext.showKeyboard
 
+@AndroidEntryPoint
 class SearchActivity : BaseActivity<ActivitySearchBinding>(), SearchView.OnQueryTextListener {
 
 	private val searchSuggestionViewModel by viewModels<SearchSuggestionViewModel>()

app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionFragment.kt

@@ -9,6 +9,7 @@ import androidx.core.view.updatePadding
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.ItemTouchHelper
 import coil.ImageLoader
+import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
@@ -16,6 +17,7 @@ import org.koitharu.kotatsu.databinding.FragmentSearchSuggestionBinding
 import org.koitharu.kotatsu.search.ui.suggestion.adapter.SearchSuggestionAdapter
 import org.koitharu.kotatsu.utils.ext.addMenuProvider
 
+@AndroidEntryPoint
 class SearchSuggestionFragment :
 	BaseFragment<FragmentSearchSuggestionBinding>(),
 	SearchSuggestionItemCallback.SuggestionItemListener {

app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesDialogFragment.kt

@@ -10,6 +10,7 @@ import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.RecyclerView
 import coil.ImageLoader
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.AlertDialogFragment
@@ -18,6 +19,7 @@ import org.koitharu.kotatsu.settings.sources.adapter.SourceConfigAdapter
 import org.koitharu.kotatsu.settings.sources.adapter.SourceConfigListener
 import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
 
+@AndroidEntryPoint
 class NewSourcesDialogFragment :
 	AlertDialogFragment<DialogOnboardBinding>(),
 	SourceConfigListener,

app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt

@@ -36,15 +36,22 @@ class NewSourcesViewModel @Inject constructor(
 
 	private fun buildList() {
 		val locales = LocaleListCompat.getDefault().mapToSet { it.language }
-		val hidden = settings.hiddenSources
+		val pendingHidden = HashSet<String>()
 		sources.value = initialList.map {
 			val locale = it.locale
+			val isEnabledByLocale = locale == null || locale in locales
+			if (!isEnabledByLocale) {
+				pendingHidden += it.name
+			}
 			SourceConfigItem.SourceItem(
 				source = it,
 				summary = it.getLocaleTitle(),
-				isEnabled = it.name !in hidden && (locale == null || locale in locales),
+				isEnabled = isEnabledByLocale,
 				isDraggable = false,
 			)
 		}
+		if (pendingHidden.isNotEmpty()) {
+			settings.hiddenSources += pendingHidden
+		}
 	}
 }

app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt

@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.viewModels
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.AlertDialogFragment
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
@@ -17,6 +18,7 @@ import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
 import org.koitharu.kotatsu.utils.ext.showAllowStateLoss
 import org.koitharu.kotatsu.utils.ext.withArgs
 
+@AndroidEntryPoint
 class OnboardDialogFragment :
 	AlertDialogFragment<DialogOnboardBinding>(),
 	OnListItemClickListener<SourceLocale>,

app/src/main/java/org/koitharu/kotatsu/settings/protect/ProtectSetupActivity.kt

@@ -15,12 +15,14 @@ import androidx.activity.viewModels
 import androidx.core.graphics.Insets
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.databinding.ActivitySetupProtectBinding
 
 private const val MIN_PASSWORD_LENGTH = 4
 
+@AndroidEntryPoint
 class ProtectSetupActivity :
 	BaseActivity<ActivitySetupProtectBinding>(),
 	TextWatcher,

app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsActivity.kt

@@ -9,11 +9,13 @@ import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.fragment.app.commit
 import com.google.android.material.appbar.AppBarLayout
+import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.databinding.ActivityContainerBinding
 import org.koitharu.kotatsu.main.ui.AppBarOwner
 
+@AndroidEntryPoint
 class SuggestionsActivity :
 	BaseActivity<ActivityContainerBinding>(),
 	AppBarOwner {

app/src/main/java/org/koitharu/kotatsu/sync/ui/SyncAuthActivity.kt

@@ -15,12 +15,14 @@ import androidx.core.view.isVisible
 import androidx.transition.Fade
 import androidx.transition.TransitionManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.databinding.ActivitySyncAuthBinding
 import org.koitharu.kotatsu.sync.domain.SyncAuthResult
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 
+@AndroidEntryPoint
 class SyncAuthActivity : BaseActivity<ActivitySyncAuthBinding>(), View.OnClickListener {
 
 	private var accountAuthenticatorResponse: AccountAuthenticatorResponse? = null