blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Closes #3939 - Adds strings for delete browsing history

master
Emily Kager 2019-08-06 14:40:17 -07:00 committed by Emily Kager
parent b20c381af9
commit 0604e9858d
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
View File

@ -216,11 +216,11 @@ class HistoryFragment : LibraryPageFragment<HistoryItem>(), BackHandler {
private fun displayDeleteAllDialog() {
activity?.let { activity ->
AlertDialog.Builder(activity).apply {
setMessage(R.string.history_delete_all_dialog)
setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _ ->
setMessage(R.string.delete_browsing_data_prompt_message)
setNegativeButton(R.string.delete_browsing_data_prompt_cancel) { dialog: DialogInterface, _ ->
dialog.cancel()
}
setPositiveButton(R.string.history_clear_dialog) { dialog: DialogInterface, _ ->
setPositiveButton(R.string.delete_browsing_data_prompt_allow) { dialog: DialogInterface, _ ->
historyStore.dispatch(HistoryAction.EnterDeletionMode)
lifecycleScope.launch {
requireComponents.analytics.metrics.track(Event.HistoryAllItemsRemoved)

26
app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt
View File

@ -33,7 +33,11 @@ class DeleteBrowsingDataFragment : Fragment() {
private lateinit var sessionObserver: SessionManager.Observer
private var tabCollections: List<TabCollection> = listOf()
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? =
inflater.inflate(R.layout.fragment_delete_browsing_data, container, false)
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@ -78,15 +82,13 @@ class DeleteBrowsingDataFragment : Fragment() {
private fun askToDelete() {
context?.let {
AlertDialog.Builder(it).apply {
val appName = context.getString(R.string.app_name)
val message = context.getString(R.string.preferences_delete_browsing_data_prompt_message, appName)
setMessage(message)
setMessage(R.string.delete_browsing_data_prompt_message)
setNegativeButton(R.string.preferences_delete_browsing_data_prompt_cancel) { it: DialogInterface, _ ->
setNegativeButton(R.string.delete_browsing_data_prompt_cancel) { it: DialogInterface, _ ->
it.cancel()
}
setPositiveButton(R.string.preferences_delete_browsing_data_prompt_allow) { it: DialogInterface, _ ->
setPositiveButton(R.string.delete_browsing_data_prompt_allow) { it: DialogInterface, _ ->
it.dismiss()
deleteSelected()
}
@ -125,7 +127,9 @@ class DeleteBrowsingDataFragment : Fragment() {
delete_browsing_data_wrapper.isClickable = true
delete_browsing_data_wrapper.alpha = ENABLED_ALPHA
listOf(open_tabs_item, browsing_data_item, collections_item).forEach { it.isChecked = false }
listOf(open_tabs_item, browsing_data_item, collections_item).forEach {
it.isChecked = false
}
updateTabCount()
updateHistoryCount()
@ -149,7 +153,10 @@ class DeleteBrowsingDataFragment : Fragment() {
private fun updateTabCount() {
view?.open_tabs_item?.apply {
val openTabs = requireComponents.core.sessionManager.sessions.size
subtitleView.text = resources.getString(R.string.preferences_delete_browsing_data_tabs_subtitle, openTabs)
subtitleView.text = resources.getString(
R.string.preferences_delete_browsing_data_tabs_subtitle,
openTabs
)
isEnabled = openTabs > 0
}
}
@ -176,7 +183,8 @@ class DeleteBrowsingDataFragment : Fragment() {
view?.browsing_data_item?.subtitleView?.text = ""
viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
val collectionsCount = requireComponents.core.tabCollectionStorage.getTabCollectionsCount()
val collectionsCount =
requireComponents.core.tabCollectionStorage.getTabCollectionsCount()
launch(Dispatchers.Main) {
view?.collections_item?.apply {
subtitleView.text =

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

@ -620,12 +620,12 @@
<!-- Text for the button to delete browsing data -->
<string name="preferences_delete_browsing_data_button">Delete browsing data</string>
<!-- Dialog message to the user asking to delete browsing data. Parameter is the name of the app (e.g. Fenix) -->
<string name="preferences_delete_browsing_data_prompt_message">Allow %s to delete your browsing data?</string>
<!-- Dialog message to the user asking to delete browsing data. -->
<string name="delete_browsing_data_prompt_message">This will delete all of your browsing data.</string>
<!-- Text for the cancel button for the data deletion dialog -->
<string name="preferences_delete_browsing_data_prompt_cancel">Don’t allow</string>
<string name="delete_browsing_data_prompt_cancel">Cancel</string>
<!-- Text for the allow button for the data deletion dialog -->
<string name="preferences_delete_browsing_data_prompt_allow">Allow</string>
<string name="delete_browsing_data_prompt_allow">Delete</string>
<!-- Text for the snackbar confirmation that the data was deleted -->
<string name="preferences_delete_browsing_data_snackbar">Browsing data deleted</string>