Skip to content

Commit 9beab84

Browse files
SlionSlion
committed
Change some strings identifiers
1 parent 5012e4d commit 9beab84

File tree

70 files changed

+4196
-4196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+4196
-4196
lines changed

‎app/src/main/java/fulguris/browser/MenuItems.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ object MenuItems {
156156
// Tab menu items (can also appear in both menus)
157157
MenuItemId.TabHistory to MenuItem(
158158
id = MenuItemId.TabHistory,
159-
labelId = R.string.settings_title_page_history,
159+
labelId = R.string.pref_title_page_history,
160160
iconId = R.drawable.ic_history,
161161
viewId = R.id.menuItemPageHistory,
162162
canBeInMainMenu = true,
@@ -228,7 +228,7 @@ object MenuItems {
228228
),
229229
MenuItemId.DomainSettings to MenuItem(
230230
id = MenuItemId.DomainSettings,
231-
labelId = R.string.settings_title_domains,
231+
labelId = R.string.pref_title_domains,
232232
iconId = R.drawable.ic_domain,
233233
viewId = R.id.menuItemDomainSettings,
234234
canBeInMainMenu = true,

‎app/src/main/java/fulguris/settings/Config.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ class Config(idOrFile: String) {
3535
var name = id.replace(filePrefix, "")
3636
name = name.replace("-", " - ")
3737
name = name.replace(" - sw", "° - sw")
38-
name = name.replace("landscape", aContext.getString(R.string.settings_title_landscape))
39-
name = name.replace("portrait", aContext.getString(R.string.settings_title_portrait))
38+
name = name.replace("landscape", aContext.getString(R.string.pref_title_landscape))
39+
name = name.replace("portrait", aContext.getString(R.string.pref_title_portrait))
4040
return "${name}dp"
4141
}
4242

‎app/src/main/java/fulguris/settings/fragment/ConfigurationCustomSettingsFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class ConfigurationCustomSettingsFragment : ConfigurationSettingsFragment() {
116116
* See [AbstractSettingsFragment.titleResourceId]
117117
*/
118118
override fun titleResourceId(): Int {
119-
return R.string.settings_title_landscape
119+
return R.string.pref_title_landscape
120120
}
121121

122122
/**

‎app/src/main/java/fulguris/settings/fragment/CookiesSettingsFragment.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class CookiesSettingsFragment : AbstractSettingsFragment() {
6161
* See [AbstractSettingsFragment.titleResourceId]
6262
*/
6363
override fun titleResourceId(): Int {
64-
return R.string.settings_title_cookies
64+
return R.string.pref_title_cookies
6565
}
6666

6767
// Set to the domain settings the user last opened
@@ -252,10 +252,10 @@ class CookiesSettingsFragment : AbstractSettingsFragment() {
252252
}
253253

254254
if (cookiesCount!=0) {
255-
catCookies?.summary = resources.getQuantityString(R.plurals.settings_summary_cookies, cookiesCount, cookiesCount)
255+
catCookies?.summary = resources.getQuantityString(R.plurals.pref_summary_cookies, cookiesCount, cookiesCount)
256256
deleteAll?.isEnabled = true
257257
} else {
258-
catCookies?.summary = resources.getString(R.string.settings_summary_cookies)
258+
catCookies?.summary = resources.getString(R.string.pref_summary_cookies)
259259
deleteAll?.isEnabled = false
260260
}
261261

‎app/src/main/java/fulguris/settings/fragment/DomainSettingsFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ class DomainSettingsFragment : AbstractSettingsFragment() {
129129
prefs.parent?.getOverridesSummary(requireContext()) { summary = it }
130130
} else {
131131
// The parent of first level domains is the default domain settings
132-
summary = getString(R.string.settings_title_default_domain_settings)
132+
summary = getString(R.string.pref_title_default_domain_settings)
133133
// Do not show 'Parent' as title we accessing default domain settings through settings activity
134-
breadcrumb = getString(R.string.settings_title_default_domain_settings)
134+
breadcrumb = getString(R.string.pref_title_default_domain_settings)
135135
}
136136

137137
setOnPreferenceClickListener {

‎app/src/main/java/fulguris/settings/fragment/DomainsSettingsFragment.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class DomainsSettingsFragment : AbstractSettingsFragment() {
9797
* See [AbstractSettingsFragment.titleResourceId]
9898
*/
9999
override fun titleResourceId(): Int {
100-
return R.string.settings_title_domains
100+
return R.string.pref_title_domains
101101
}
102102

103103
override fun providePreferencesXmlResource() = R.xml.preference_domains
@@ -111,7 +111,7 @@ class DomainsSettingsFragment : AbstractSettingsFragment() {
111111
catDomains = findPreference<x.PreferenceCategory>(resources.getString(R.string.pref_key_domains))?.apply {
112112
isOrderingAsAdded = false
113113
// Initial summary will be updated after scanning
114-
summary = getString(R.string.settings_summary_loading)
114+
summary = getString(R.string.pref_summary_loading)
115115
}
116116

117117
deleteAll = clickablePreference(
@@ -167,10 +167,10 @@ class DomainsSettingsFragment : AbstractSettingsFragment() {
167167
*/
168168
private fun updateDomainCountSummary() {
169169
catDomains?.summary = if (domainCount == 0) {
170-
getString(R.string.settings_summary_no_overrides)
170+
getString(R.string.pref_summary_no_overrides)
171171
} else {
172172
resources.getQuantityString(
173-
R.plurals.settings_summary_overrides,
173+
R.plurals.pref_summary_overrides,
174174
domainCount,
175175
domainCount
176176
)
@@ -380,8 +380,8 @@ class DomainsSettingsFragment : AbstractSettingsFragment() {
380380
// Add default domain settings entry
381381
x.Preference(requireContext()).apply {
382382
isSingleLineTitle = false
383-
title = getString(R.string.settings_title_default_domain_settings)
384-
summary = getString(R.string.settings_summary_default_domain_settings)
383+
title = getString(R.string.pref_title_default_domain_settings)
384+
summary = getString(R.string.pref_summary_default_domain_settings)
385385
order = 5
386386
fragment = "fulguris.settings.fragment.DomainSettingsFragment"
387387
onPreferenceClickListener = Preference.OnPreferenceClickListener {

‎app/src/main/java/fulguris/settings/fragment/ExtensionsSettingsFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ExtensionsSettingsFragment : AbstractSettingsFragment() {
4444

4545
private lateinit var scriptsCategory: PreferenceGroup
4646

47-
override fun titleResourceId(): Int = R.string.settings_title_extensions
47+
override fun titleResourceId(): Int = R.string.pref_title_extensions
4848

4949
override fun providePreferencesXmlResource(): Int = R.xml.preference_extensions
5050

‎app/src/main/java/fulguris/settings/fragment/LandscapeSettingsFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ class LandscapeSettingsFragment : ConfigurationSettingsFragment() {
5252
super.onCreatePreferences(savedInstanceState,rootKey)
5353

5454
// For access through options we show which configuration is currently loaded
55-
findPreference<Preference>(getString(R.string.pref_key_back))?.summary = getString(R.string.settings_title_landscape)
55+
findPreference<Preference>(getString(R.string.pref_key_back))?.summary = getString(R.string.pref_title_landscape)
5656
}
5757

5858
/**
5959
* See [AbstractSettingsFragment.titleResourceId]
6060
*/
6161
override fun titleResourceId(): Int {
62-
return R.string.settings_title_landscape
62+
return R.string.pref_title_landscape
6363
}
6464
}

‎app/src/main/java/fulguris/settings/fragment/MenusSettingsFragment.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class MenusSettingsFragment : AbstractSettingsFragment() {
5252

5353
override fun providePreferencesXmlResource() = R.xml.preference_menus
5454

55-
override fun titleResourceId(): Int = R.string.settings_title_menus
55+
override fun titleResourceId(): Int = R.string.pref_title_menus
5656

5757
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
5858
super.onCreatePreferences(savedInstanceState, rootKey)
@@ -109,7 +109,7 @@ class MenusSettingsFragment : AbstractSettingsFragment() {
109109
// Add reset preference
110110
val resetPref = x.Preference(requireContext()).apply {
111111
key = "reset_menus"
112-
title = getString(R.string.settings_title_reset_menus)
112+
title = getString(R.string.pref_title_reset_menus)
113113
icon = AppCompatResources.getDrawable(requireContext(), R.drawable.ic_reset_menu)
114114
isIconSpaceReserved = true
115115
isSingleLineTitle = false
@@ -137,7 +137,7 @@ class MenusSettingsFragment : AbstractSettingsFragment() {
137137
// Create fixed header preferences with sequential order
138138
val headerMain = x.Preference(requireContext()).apply {
139139
key = KEY_HEADER_MAIN
140-
title = getString(R.string.settings_title_main_menu)
140+
title = getString(R.string.pref_title_main_menu)
141141
isIconSpaceReserved = false
142142
isSingleLineTitle = false
143143
isSelectable = false // Make it non-clickable without graying it out
@@ -214,7 +214,7 @@ class MenusSettingsFragment : AbstractSettingsFragment() {
214214
// Create hidden menu header item
215215
val headerHidden = x.Preference(requireContext()).apply {
216216
key = KEY_HEADER_HIDDEN
217-
title = getString(R.string.settings_title_hidden)
217+
title = getString(R.string.pref_title_hidden)
218218
isIconSpaceReserved = false
219219
isSingleLineTitle = false
220220
isSelectable = false // Make it non-clickable without graying it out

‎app/src/main/java/fulguris/settings/fragment/PageHistorySettingsFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,6 @@ class PageHistorySettingsFragment : AbstractSettingsFragment() {
145145
* See [AbstractSettingsFragment.titleResourceId]
146146
*/
147147
override fun titleResourceId(): Int {
148-
return R.string.settings_title_page_history
148+
return R.string.pref_title_page_history
149149
}
150150
}

0 commit comments

Comments
 (0)