Improve details activity layout

2022-03-13 17:10:34 +02:00
parent 88a3589f1d
commit c115bcc163
14 changed files with 281 additions and 372 deletions
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ComickFunRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ComickFunRepository.kt
@@ -77,7 +77,7 @@ class ComickFunRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposi
 				altTitle = null,
 				url = slug,
 				publicUrl = "https://$domain/comic/$slug",
-				rating = jo.getDouble("rating").toFloat() / 10f,
+				rating = jo.optDouble("rating", -10.0).toFloat() / 10f,
 				isNsfw = false,
 				coverUrl = jo.getString("cover_url"),
 				largeCoverUrl = null,
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
@@ -4,13 +4,12 @@ import android.app.ActivityOptions
 import android.os.Bundle
 import android.view.*
 import android.widget.AdapterView
+import android.widget.Spinner
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
-import androidx.core.view.updatePaddingRelative
-import androidx.fragment.app.FragmentContainerView
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.divider.MaterialDividerItemDecoration
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
@@ -26,7 +25,6 @@ import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.download.ui.service.DownloadService
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
-import org.koitharu.kotatsu.utils.ext.getEnd

 class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 	OnListItemClickListener<ChapterListItem>,
@@ -59,21 +57,9 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 			setHasFixedSize(true)
 			adapter = chaptersAdapter
 		}
-		val branchesAdapter = BranchesAdapter()
-		binding.spinnerBranches.adapter = branchesAdapter
-		binding.spinnerBranches.onItemSelectedListener = this
-
+		binding.spinnerBranches?.let(::initSpinner)
 		viewModel.isLoading.observe(viewLifecycleOwner, this::onLoadingStateChanged)
 		viewModel.chapters.observe(viewLifecycleOwner, this::onChaptersChanged)
-		viewModel.branches.observe(viewLifecycleOwner) {
-			branchesAdapter.setItems(it)
-			binding.spinnerBranches.isVisible = it.size > 1
-		}
-		viewModel.selectedBranchIndex.observe(viewLifecycleOwner) {
-			if (it != -1 && it != binding.spinnerBranches.selectedItemPosition) {
-				binding.spinnerBranches.setSelection(it)
-			}
-		}
 		viewModel.isChaptersReversed.observe(viewLifecycleOwner) {
 			activity?.invalidateOptionsMenu()
 		}
@@ -82,7 +68,7 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 	override fun onDestroyView() {
 		chaptersAdapter = null
 		selectionDecoration = null
-		binding.spinnerBranches.adapter = null
+		binding.spinnerBranches?.adapter = null
 		super.onDestroyView()
 	}

@@ -169,7 +155,8 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 	}

 	override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-		viewModel.setSelectedBranch(binding.spinnerBranches.selectedItem as String?)
+		val spinner = binding.spinnerBranches ?: return
+		viewModel.setSelectedBranch(spinner.selectedItem as String?)
 	}

 	override fun onNothingSelected(parent: AdapterView<*>?) = Unit
@@ -204,10 +191,25 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),

 	override fun onWindowInsetsChanged(insets: Insets) {
 		binding.recyclerViewChapters.updatePadding(
-			bottom = insets.bottom + binding.spinnerBranches.height,
+			bottom = insets.bottom + (binding.spinnerBranches?.height ?: 0),
 		)
 	}

+	private fun initSpinner(spinner: Spinner) {
+		val branchesAdapter = BranchesAdapter()
+		spinner.adapter = branchesAdapter
+		spinner.onItemSelectedListener = this
+		viewModel.branches.observe(viewLifecycleOwner) {
+			branchesAdapter.setItems(it)
+			spinner.isVisible = it.size > 1
+		}
+		viewModel.selectedBranchIndex.observe(viewLifecycleOwner) {
+			if (it != -1 && it != spinner.selectedItemPosition) {
+				spinner.setSelection(it)
+			}
+		}
+	}
+
 	private fun onChaptersChanged(list: List<ChapterListItem>) {
 		chaptersAdapter?.items = list
 	}
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
@@ -6,12 +6,16 @@ import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.Spinner
 import android.widget.Toast
 import androidx.appcompat.view.ActionMode
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.Insets
 import androidx.core.net.toFile
+import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.lifecycle.lifecycleScope
@@ -32,6 +36,7 @@ import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.os.ShortcutsRepository
 import org.koitharu.kotatsu.databinding.ActivityDetailsBinding
+import org.koitharu.kotatsu.details.ui.adapter.BranchesAdapter
 import org.koitharu.kotatsu.download.ui.service.DownloadService
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
@@ -40,7 +45,8 @@ import org.koitharu.kotatsu.utils.ShareHelper
 import org.koitharu.kotatsu.utils.ext.buildAlertDialog
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage

-class DetailsActivity : BaseActivity<ActivityDetailsBinding>(), TabLayoutMediator.TabConfigurationStrategy {
+class DetailsActivity : BaseActivity<ActivityDetailsBinding>(), TabLayoutMediator.TabConfigurationStrategy,
+	AdapterView.OnItemSelectedListener {

 	private val viewModel by viewModel<DetailsViewModel> {
 		parametersOf(MangaIntent(intent))
@@ -49,12 +55,16 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(), TabLayoutMediato
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityDetailsBinding.inflate(layoutInflater))
-		supportActionBar?.setDisplayHomeAsUpEnabled(true)
+		supportActionBar?.run {
+			setDisplayHomeAsUpEnabled(true)
+			setDisplayShowTitleEnabled(false)
+		}
 		val pager = binding.pager
 		if (pager != null) {
 			pager.adapter = MangaDetailsAdapter(this)
 			TabLayoutMediator(checkNotNull(binding.tabs), pager, this).attach()
 		}
+		binding.spinnerBranches?.let(::initSpinner)

 		viewModel.manga.observe(this, ::onMangaUpdated)
 		viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
@@ -226,6 +236,13 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(), TabLayoutMediato
 		binding.pager?.isUserInputEnabled = true
 	}

+	override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+		val spinner = binding.spinnerBranches ?: return
+		viewModel.setSelectedBranch(spinner.selectedItem as String?)
+	}
+
+	override fun onNothingSelected(parent: AdapterView<*>?) = Unit
+
 	fun showChapterMissingDialog(chapterId: Long) {
 		val remoteManga = viewModel.getRemoteManga()
 		if (remoteManga == null) {
@@ -252,6 +269,21 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(), TabLayoutMediato
 		}.show()
 	}

+	private fun initSpinner(spinner: Spinner) {
+		val branchesAdapter = BranchesAdapter()
+		spinner.adapter = branchesAdapter
+		spinner.onItemSelectedListener = this
+		viewModel.branches.observe(this) {
+			branchesAdapter.setItems(it)
+			spinner.isVisible = it.size > 1
+		}
+		viewModel.selectedBranchIndex.observe(this) {
+			if (it != -1 && it != spinner.selectedItemPosition) {
+				spinner.setSelection(it)
+			}
+		}
+	}
+
 	companion object {

 		fun newIntent(context: Context, manga: Manga): Intent {
--- a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
@@ -209,6 +209,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
 			}
 		}
 		drawer?.closeDrawers()
+		appBar.setExpanded(true)
 		return true
 	}