Skip to content

Commit 330a350

Browse files
committed
Adjust download-on-wifi preference to match iOS
Affects: https://ebce-lyrasis.atlassian.net/browse/PP-3971
1 parent e7d18cc commit 330a350

3 files changed

Lines changed: 9 additions & 11 deletions

File tree

palace-ui/src/main/java/org/nypl/simplified/ui/settings/SettingsMainFragment3.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,6 @@ class SettingsMainFragment3 : PreferenceFragmentCompat() {
166166
profiles: ProfilesControllerType,
167167
profilePrefs: ProfilePreferences
168168
) {
169-
val context =
170-
this.requireContext()
171-
172169
if (profilePrefs.downloadOnlyOnWIFI) {
173170
downloadSwitch.isChecked = true
174171
} else {

palace-ui/src/main/res/values/stringsSettings.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,8 @@
8383
<string name="settingsNotificationsEnabled">Notifications are enabled.\nDisabling notifications will restart the application.</string>
8484
<string name="settingsNotificationsDisabled">Notifications are disabled.</string>
8585
<string name="settingsNetwork">Network</string>
86-
<string name="settingsNetworkWIFIOnly">Only download books when Wi-Fi is available.</string>
87-
<string name="settingsNetworkWIFIOnlyEnabled">Download only on Wi-Fi.</string>
88-
<string name="settingsNetworkWIFIOnlyDisabled">Download when any network is available.</string>
86+
<string name="settingsNetworkDownloadWIFI">Download Only on Wi-Fi</string>
87+
<string name="settingsNetworkWIFIOnlyEnabled">When enabled, books and audiobooks will only download over Wi-Fi. Downloads will be blocked on cellular data.</string>
8988
<string name="settingsAccessibilitySearchButton">Library Search Button</string>
9089
<string name="settingsAccessibilitySearchButtonClose">Close Search Button</string>
9190
</resources>

palace-ui/src/main/res/xml/settings.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616
android:title="@string/settingsNotificationsEnabled" />
1717
</PreferenceCategory>
1818

19-
<SwitchPreferenceCompat
20-
android:summaryOff="@string/settingsNetworkWIFIOnlyDisabled"
21-
android:summaryOn="@string/settingsNetworkWIFIOnlyEnabled"
22-
android:key="settingsNetworkDownloadWIFIOnly"
23-
android:title="@string/settingsNetwork" />
19+
<PreferenceCategory android:title="@string/settingsNetwork">
20+
<SwitchPreferenceCompat
21+
app:singleLineTitle="false"
22+
android:summary="@string/settingsNetworkWIFIOnlyEnabled"
23+
android:key="settingsNetworkDownloadWIFIOnly"
24+
android:title="@string/settingsNetworkDownloadWIFI" />
25+
</PreferenceCategory>
2426

2527
<PreferenceCategory android:title="@string/settingsDocumentation">
2628
<Preference

0 commit comments

Comments
 (0)