Suggestions update action

app/src/main/java/org/koitharu/kotatsu/reader/ui/SimpleSettingsActivity.kt

@@ -14,10 +14,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.databinding.ActivitySettingsSimpleBinding
-import org.koitharu.kotatsu.settings.MainSettingsFragment
+import org.koitharu.kotatsu.settings.*
-import org.koitharu.kotatsu.settings.NetworkSettingsFragment
-import org.koitharu.kotatsu.settings.ReaderSettingsFragment
-import org.koitharu.kotatsu.settings.SourceSettingsFragment
 
 class SimpleSettingsActivity : BaseActivity<ActivitySettingsSimpleBinding>() {
 
@@ -27,9 +24,11 @@ class SimpleSettingsActivity : BaseActivity<ActivitySettingsSimpleBinding>() {
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 		supportFragmentManager.commit {
 			replace(
-				R.id.container, when (intent?.action) {
+				R.id.container,
+				when (intent?.action) {
 					Intent.ACTION_MANAGE_NETWORK_USAGE -> NetworkSettingsFragment()
 					ACTION_READER -> ReaderSettingsFragment()
+					ACTION_SUGGESTIONS -> SuggestionsSettingsFragment()
 					ACTION_SOURCE -> SourceSettingsFragment.newInstance(
 						intent.getParcelableExtra(EXTRA_SOURCE) ?: MangaSource.LOCAL
 					)
@@ -55,6 +54,8 @@ class SimpleSettingsActivity : BaseActivity<ActivitySettingsSimpleBinding>() {
 
 		private const val ACTION_READER =
 			"${BuildConfig.APPLICATION_ID}.action.MANAGE_READER_SETTINGS"
+		private const val ACTION_SUGGESTIONS =
+			"${BuildConfig.APPLICATION_ID}.action.MANAGE_SUGGESTIONS"
 		private const val ACTION_SOURCE =
 			"${BuildConfig.APPLICATION_ID}.action.MANAGE_SOURCE_SETTINGS"
 		private const val EXTRA_SOURCE = "source"
@@ -63,6 +64,10 @@ class SimpleSettingsActivity : BaseActivity<ActivitySettingsSimpleBinding>() {
 			Intent(context, SimpleSettingsActivity::class.java)
 				.setAction(ACTION_READER)
 
+		fun newSuggestionsSettingsIntent(context: Context) =
+			Intent(context, SimpleSettingsActivity::class.java)
+				.setAction(ACTION_SUGGESTIONS)
+
 		fun newSourceSettingsIntent(context: Context, source: MangaSource) =
 			Intent(context, SimpleSettingsActivity::class.java)
 				.setAction(ACTION_SOURCE)

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

@@ -1,18 +1,47 @@
 package org.koitharu.kotatsu.suggestions.ui
 
 import android.os.Bundle
-import android.view.View
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import com.google.android.material.snackbar.Snackbar
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.list.ui.MangaListFragment
+import org.koitharu.kotatsu.reader.ui.SimpleSettingsActivity
 
 class SuggestionsFragment : MangaListFragment() {
 
 	override val viewModel by viewModel<SuggestionsViewModel>()
 	override val isSwipeRefreshEnabled = false
 
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
+		super.onCreate(savedInstanceState)
+		setHasOptionsMenu(true)
+	}
+
+	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+		super.onCreateOptionsMenu(menu, inflater)
+		inflater.inflate(R.menu.opt_suggestions, menu)
+	}
+
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
+		return when (item.itemId) {
+			R.id.action_update -> {
+				SuggestionsWorker.startNow(requireContext())
+				Snackbar.make(
+					binding.recyclerView,
+					R.string.feed_will_update_soon,
+					Snackbar.LENGTH_LONG,
+				).show()
+				true
+			}
+			R.id.action_settings -> {
+				startActivity(SimpleSettingsActivity.newSuggestionsSettingsIntent(requireContext()))
+				true
+			}
+			else -> super.onOptionsItemSelected(item)
+		}
 	}
 
 	override fun onScrolledToEnd() = Unit

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

@@ -7,10 +7,7 @@ import kotlinx.coroutines.flow.combine
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
-import org.koitharu.kotatsu.list.ui.model.EmptyState
+import org.koitharu.kotatsu.list.ui.model.*
-import org.koitharu.kotatsu.list.ui.model.LoadingState
-import org.koitharu.kotatsu.list.ui.model.toErrorState
-import org.koitharu.kotatsu.list.ui.model.toUi
 import org.koitharu.kotatsu.suggestions.domain.SuggestionRepository
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.onFirst
@@ -20,6 +17,8 @@ class SuggestionsViewModel(
 	settings: AppSettings,
 ) : MangaListViewModel(settings) {
 
+	private val headerModel = ListHeader(null, R.string.suggestions)
+
 	override val content = combine(
 		repository.observeAll(),
 		createListModeFlow()
@@ -30,7 +29,10 @@ class SuggestionsViewModel(
 				textPrimary = R.string.nothing_found,
 				textSecondary = R.string.text_suggestion_holder,
 			))
-			else -> list.toUi(mode)
+			else -> buildList<ListModel>(list.size + 1) {
+				add(headerModel)
+				list.toUi(this, mode)
+			}
 		}
 	}.onFirst {
 		isLoading.postValue(false)

app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt

@@ -78,7 +78,7 @@ class FeedFragment : BaseFragment<FragmentFeedBinding>(), PaginationScrollListen
 				Snackbar.make(
 					binding.recyclerView,
 					R.string.feed_will_update_soon,
-					Snackbar.LENGTH_SHORT
+					Snackbar.LENGTH_LONG,
 				).show()
 				true
 			}

app/src/main/res/menu/opt_suggestions.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@+id/action_update"
+		android:orderInCategory="50"
+		android:title="@string/update"
+		app:showAsAction="never" />
+
+	<item
+		android:id="@+id/action_settings"
+		android:orderInCategory="90"
+		android:title="@string/settings"
+		app:showAsAction="never" />
+
+</menu>