blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Fixes #3529 - Display "Edit folder" title when editing a bookmark folder (#3549)

master
Andrei Teslovan 2019-06-24 23:34:15 +03:00 committed by Colin Lee
parent 03a5cb2fb4
commit 2ebe0a2a48
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt
View File

@ -71,8 +71,8 @@ class EditBookmarkFragment : Fragment(), CoroutineScope {
override fun onResume() {
super.onResume()
(activity as? AppCompatActivity)?.title = getString(R.string.edit_bookmark_fragment_title)
(activity as? AppCompatActivity)?.supportActionBar?.show()
val activity = activity as? AppCompatActivity
activity?.supportActionBar?.show()
guidToEdit = EditBookmarkFragmentArgs.fromBundle(arguments!!).guidToEdit
launch(IO) {
@ -83,10 +83,12 @@ class EditBookmarkFragment : Fragment(), CoroutineScope {
launch(Main) {
when (bookmarkNode?.type) {
BookmarkNodeType.FOLDER -> {
activity?.title = getString(R.string.edit_bookmark_folder_fragment_title)
bookmark_url_edit.visibility = View.GONE
bookmark_url_label.visibility = View.GONE
}
BookmarkNodeType.ITEM -> {
activity?.title = getString(R.string.edit_bookmark_fragment_title)
}
else -> throw IllegalArgumentException()
}

1
app/src/main/res/navigation/nav_graph.xml
View File

@ -206,7 +206,6 @@
<fragment
android:id="@+id/bookmarkEditFragment"
android:name="org.mozilla.fenix.library.bookmarks.edit.EditBookmarkFragment"
android:label="@string/edit_bookmark_fragment_title"
tools:layout="@layout/fragment_edit_bookmark">
<argument
android:name="guidToEdit"

2
app/src/main/res/values/strings.xml
View File

@ -406,6 +406,8 @@
<string name="bookmarks_multi_select_title">%1$d selected</string>
<!-- Bookmark editing screen title -->
<string name="edit_bookmark_fragment_title">Edit bookmark</string>
<!-- Bookmark folder editing screen title -->
<string name="edit_bookmark_folder_fragment_title">Edit folder</string>
<!-- Bookmark sign in button message -->
<string name="bookmark_sign_in_button">Sign in to see synced bookmarks</string>
<!-- Bookmark URL editing field label -->