Skip to content

Fix back arrow appearing as hamburger icon #11769

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
merged 2 commits into from
Jul 28, 2023
Merged

Fix back arrow appearing as hamburger icon #11769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
391ffa5
Fix back arrow appearing as hamburger icon
ZetaTom Jun 22, 2023
55bd8cb
Fix back icon when returning from build-in pdf viewer
ZetaTom Jun 23, 2023
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
2 changes: 2 additions & 0 deletions app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1080,6 +1080,8 @@ public void onBackPressed() {
}
} else if (leftFragment instanceof PreviewTextStringFragment) {
createMinFragments(null);
} else if (leftFragment instanceof PreviewPdfFragment) {
super.onBackPressed();
} else {
// pop back
resetScrolling(true);
Expand Down
24 changes: 18 additions & 6 deletions app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,7 +1519,7 @@ protected void setTitle() {
setTitle(R.string.drawer_item_shared);
break;
default:
setTitle(themeUtils.getDefaultDisplayNameForRootFolder(getContext()));
setTitle(themeUtils.getDefaultDisplayNameForRootFolder(getContext()), false);
break;
}
}
Expand Down Expand Up @@ -1586,7 +1586,7 @@ public void onMessageEvent(ChangeMenuEvent changeMenuEvent) {
((FileDisplayActivity) activity).initSyncBroadcastReceiver();
}

setTitle(themeUtils.getDefaultDisplayNameForRootFolder(getContext()));
setTitle(themeUtils.getDefaultDisplayNameForRootFolder(getContext()), false);
activity.getIntent().removeExtra(OCFileListFragment.SEARCH_EVENT);
}

Expand Down Expand Up @@ -1832,18 +1832,30 @@ public void onMessageEvent(FileLockEvent event) {
}
}

/**
* Theme default action bar according to provided parameters.
* Replaces back arrow with hamburger menu icon.
*
* @param title string res id of title to be shown in action bar
*/
protected void setTitle(@StringRes final int title) {
setTitle(getContext().getString(title));
setTitle(requireContext().getString(title), true);
}

protected void setTitle(final String title) {
getActivity().runOnUiThread(() -> {
/**
* Theme default action bar according to provided parameters.
*
* @param title title to be shown in action bar
* @param showBackAsMenu iff true replace back arrow with hamburger menu icon
*/
protected void setTitle(final String title, Boolean showBackAsMenu) {
requireActivity().runOnUiThread(() -> {
if (getActivity() != null) {
final ActionBar actionBar = ((FileDisplayActivity) getActivity()).getSupportActionBar();
final Context context = getContext();

if (actionBar != null && context != null) {
viewThemeUtils.files.themeActionBar(context, actionBar, title, true);
viewThemeUtils.files.themeActionBar(context, actionBar, title, showBackAsMenu);
}
}
});
Expand Down