From 132ae9b77dd4ea25c2d0e9999bdac8c56ceb0249 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Sun, 24 Oct 2021 16:49:19 +0200 Subject: [PATCH] Update: Set AppBar title based on name of Repositry/App --- .../kotlin/com/looker/droidify/screen/ProductFragment.kt | 5 ++--- .../kotlin/com/looker/droidify/screen/RepositoryFragment.kt | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/looker/droidify/screen/ProductFragment.kt b/src/main/kotlin/com/looker/droidify/screen/ProductFragment.kt index b96f70d0..6b700804 100644 --- a/src/main/kotlin/com/looker/droidify/screen/ProductFragment.kt +++ b/src/main/kotlin/com/looker/droidify/screen/ProductFragment.kt @@ -13,12 +13,12 @@ import android.view.View import android.view.ViewGroup import android.widget.FrameLayout import androidx.appcompat.app.AlertDialog -import androidx.appcompat.widget.Toolbar import androidx.fragment.app.DialogFragment import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.appbar.CollapsingToolbarLayout import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.looker.droidify.R import com.looker.droidify.content.ProductPreferences @@ -330,8 +330,7 @@ class ProductFragment() : ScreenFragment(), ProductAdapter.Callbacks { (it.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition() != 0 } == true - if (showPackageName) toolbar?.title = products[0].first.name - else toolbar?.title = getString(R.string.application) + (toolbar.parent as CollapsingToolbarLayout).title = if (showPackageName) products[0].first.name else getString(R.string.application) } private fun updateToolbarButtons() { diff --git a/src/main/kotlin/com/looker/droidify/screen/RepositoryFragment.kt b/src/main/kotlin/com/looker/droidify/screen/RepositoryFragment.kt index 310769c2..5275f2a9 100644 --- a/src/main/kotlin/com/looker/droidify/screen/RepositoryFragment.kt +++ b/src/main/kotlin/com/looker/droidify/screen/RepositoryFragment.kt @@ -114,6 +114,7 @@ class RepositoryFragment() : ScreenFragment() { } else { layout.addTitleText(R.string.address, repository.address) if (repository.updated > 0L) { + toolbar.title = repository.name layout.addTitleText(R.string.name, repository.name) layout.addTitleText(R.string.description, repository.description.replace('\n', ' ')) layout.addTitleText(R.string.last_update, run {