Skip to content

Commit

Permalink
For mozilla-mobile#23121 - Replace @drawble/ic_back_button with @draw…
Browse files Browse the repository at this point in the history
…able/mozac_ic_back
  • Loading branch information
gabrielluong committed Jan 20, 2022
1 parent 9fc6d64 commit b6a9832
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 17 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/org/mozilla/fenix/HomeActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
setSupportActionBar(navigationToolbar)
// Add ids to this that we don't want to have a toolbar back button
setupNavigationToolbar()
setNavigationIcon(R.drawable.ic_back_button)
setNavigationIcon(R.drawable.mozac_ic_back)

isToolbarInflated = true
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/mozilla/fenix/ext/Fragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fun Fragment.getPreferenceKey(@StringRes resourceId: Int): String = getString(re
*/
fun Fragment.showToolbar(title: String) {
(requireActivity() as AppCompatActivity).title = title
activity?.setNavigationIcon(R.drawable.ic_back_button)
activity?.setNavigationIcon(R.drawable.mozac_ic_back)
(activity as NavHostActivity).getSupportActionBarAndInflateIfNecessary().show()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ open class LibraryPageView(
activity?.title = title
val toolbar = activity?.findViewById<Toolbar>(R.id.navigationToolbar)
toolbar?.setToolbarColors(foregroundColor, backgroundColor)
toolbar?.setNavigationIcon(R.drawable.ic_back_button)
toolbar?.setNavigationIcon(R.drawable.mozac_ic_back)
toolbar?.navigationIcon?.setTint(foregroundColor)
}
}
14 changes: 0 additions & 14 deletions app/src/main/res/drawable/ic_back_button.xml

This file was deleted.

0 comments on commit b6a9832

Please sign in to comment.