Skip to content

fix #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WirelessAlien merged 2 commits into from
Sep 1, 2026
Merged

fix #192

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95e3df8
fix
WirelessAlien Sep 1, 2026
03be8f7
Potential fix for pull request finding
WirelessAlien Sep 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions app/src/main/java/com/wirelessalien/android/moviedb/activity/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ class MainActivity : BaseActivity() {
}
if (selectedFragment != null) {
supportFragmentManager.beginTransaction().replace(R.id.container, selectedFragment).commit()
updateSearchBarTitle(selectedFragment)
updateToolbarTitle(selectedFragment)
updateSearchViewHint(selectedFragment)
updateSearchViewChips(selectedFragment)
return@setOnItemSelectedListener true
Expand Down Expand Up @@ -328,12 +328,15 @@ class MainActivity : BaseActivity() {
}
binding.bottomNavigation.menu.findItem(initialItemId).isChecked = true
supportFragmentManager.beginTransaction().replace(R.id.container, initialFragment).commit()
updateSearchBarTitle(initialFragment)
updateToolbarTitle(initialFragment)
updateSearchViewHint(initialFragment)
updateSearchViewChips(initialFragment)
}

prefListener = OnSharedPreferenceChangeListener { _: SharedPreferences?, key: String? ->
if (key == "user_has_active_purchase" || key == "user_is_subscribed") {
getCurrentFragment()?.let { updateToolbarTitle(it) }
}
if (key == HIDE_HOME_PREFERENCE || key == HIDE_MOVIES_PREFERENCE || key == HIDE_SERIES_PREFERENCE || key == HIDE_SAVED_PREFERENCE || key == HIDE_ACCOUNT_PREFERENCE || key == HIDE_ACCOUNT_TKT_PREFERENCE) {
val menu1 = binding.bottomNavigation.menu
menu1.findItem(R.id.nav_home).isVisible =
Expand Down Expand Up @@ -616,6 +619,7 @@ class MainActivity : BaseActivity() {
if (BuildConfig.FLAVOR == "full") {
if (!isFreeUser && !hasActivePurchase && !isSubscribed) {
supportFragmentManager.setFragmentResultListener(BillingBottomSheetFragment.REQUEST_KEY, this) { _, _ ->
getCurrentFragment()?.let { updateToolbarTitle(it) }
if (!preferences.getBoolean("sync_provider_dialog_shown", false)) {
showSyncProviderDialog()
}
Expand Down Expand Up @@ -667,7 +671,7 @@ class MainActivity : BaseActivity() {
return supportFragmentManager.findFragmentById(R.id.container)
}

private fun updateSearchBarTitle(fragment: Fragment) {
private fun updateToolbarTitle(fragment: Fragment) {
val appName = if (BuildConfig.FLAVOR == "full" && (preferences.getBoolean("user_has_active_purchase", false) || preferences.getBoolean("user_is_subscribed", false))) {
getString(R.string.premium_title)
} else {
Expand All @@ -681,7 +685,8 @@ class MainActivity : BaseActivity() {
}
is ListFragment -> getString(R.string.title_saved)
is AccountDataFragment -> getString(R.string.title_account)
else -> appName
is AccountDataFragmentTkt -> getString(R.string.title_account)
else -> getString(R.string.app_name)
Comment thread
Copilot marked this conversation as resolved.
}
binding.toolbar.title = title
}
Expand Down Expand Up @@ -1389,6 +1394,7 @@ class MainActivity : BaseActivity() {
override fun onResume() {
ThemeHelper.applyAmoledTheme(this)
super.onResume()
getCurrentFragment()?.let { updateToolbarTitle(it) }
}

override fun onSupportNavigateUp(): Boolean {
Expand Down
Loading