athaliar/APKDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

view_toolbar_action: Switch to actual toolbar everywhere

Browse Source 
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta
2024-12-12 21:39:05 +07:00
parent fd134096c8
commit ca03ab3d7f
13 changed files with 69 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/aurora/store/view/ui/about/AboutFragment.kt
View File

@@ -42,10 +42,7 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>() {
super.onViewCreated(view, savedInstanceState)
// Toolbar
binding.layoutToolbarAction.txtTitle.text = getString(R.string.title_about)
binding.layoutToolbarAction.imgActionPrimary.setOnClickListener {
findNavController().navigateUp()
}
binding.toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
// About Details
binding.imgIcon.load(R.mipmap.ic_launcher)

5
app/src/main/java/com/aurora/store/view/ui/account/AccountFragment.kt
View File

@@ -47,10 +47,7 @@ class AccountFragment : BaseFragment<FragmentAccountBinding>() {
super.onViewCreated(view, savedInstanceState)
// Toolbar
binding.layoutToolbarAction.txtTitle.text = getString(R.string.title_account_manager)
binding.layoutToolbarAction.imgActionPrimary.setOnClickListener {
findNavController().navigateUp()
}
binding.toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
// Chips
view.context.apply {

6
app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreFragment.kt
View File

@@ -60,9 +60,7 @@ class DetailsMoreFragment : BaseFragment<FragmentDetailsMoreBinding>() {
}
// Toolbar
binding.layoutToolbarActionMore.toolbar.setOnClickListener {
findNavController().navigateUp()
}
binding.toolbar.setOnClickListener { findNavController().navigateUp() }
inflateDescription(args.app)
inflateFiles(args.app)
@@ -95,7 +93,7 @@ class DetailsMoreFragment : BaseFragment<FragmentDetailsMoreBinding>() {
}
private fun inflateDescription(app: App) {
binding.layoutToolbarActionMore.txtTitle.text = app.displayName
binding.toolbar.title = app.displayName
binding.txtDescription.text = HtmlCompat.fromHtml(
app.description,
HtmlCompat.FROM_HTML_MODE_COMPACT

8
app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewFragment.kt
View File

@@ -58,11 +58,9 @@ class DetailsReviewFragment : BaseFragment<FragmentDetailsReviewBinding>() {
}
// Toolbar
binding.layoutToolbarActionReview.apply {
txtTitle.text = args.displayName
toolbar.setOnClickListener {
findNavController().navigateUp()
}
binding.toolbar.apply {
title = args.displayName
setNavigationOnClickListener { findNavController().navigateUp() }
}
viewModel.liveData.observe(viewLifecycleOwner) {

9
app/src/main/java/com/aurora/store/view/ui/details/DevProfileFragment.kt
View File

@@ -50,10 +50,9 @@ class DevProfileFragment : BaseFragment<FragmentDevProfileBinding>(),
val developerCarouselController = DeveloperCarouselController(this)
// Toolbar
binding.layoutToolbarAction.apply {
txtTitle.text =
if (args.title.isNullOrBlank()) getString(R.string.details_dev_profile) else args.title
toolbar.setOnClickListener { findNavController().navigateUp() }
binding.toolbar.apply {
title = if (args.title.isNullOrBlank()) getString(R.string.details_dev_profile) else args.title
setNavigationOnClickListener { findNavController().navigateUp() }
}
// RecyclerView
@@ -78,7 +77,7 @@ class DevProfileFragment : BaseFragment<FragmentDevProfileBinding>(),
is ViewState.Success<*> -> {
(it.data as DevStream).apply {
binding.layoutToolbarAction.txtTitle.text = title
binding.toolbar.title = title
binding.txtDevName.text = title
binding.txtDevDescription.text = description
binding.imgIcon.load(imgUrl)