bcarrella
/
YetAnotherCallBlocker
mirror of https://gitlab.com/xynngh/YetAnotherCallBlocker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master' 

Word wrap for settings headers

See merge request xynngh/YetAnotherCallBlocker!38
This commit is contained in:
VladWinner 2024-05-01 09:36:13 +00:00
parent 4bdc8be733 4660a5c8a0
commit 00cf887d58
2 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/res/menu/activity_main.xml
View File

@ -13,36 +13,43 @@
android:id="@+id/menu_show_notifications" android:id="@+id/menu_show_notifications"
android:checkable="true" android:checkable="true"
android:onClick="onShowNotificationsChanged" android:onClick="onShowNotificationsChanged"
android:title="@string/incoming_call_notifications" /> android:title="@string/incoming_call_notifications"
android:singleLineTitle="false" />
<item <item
android:id="@+id/menu_block_calls" android:id="@+id/menu_block_calls"
android:checkable="true" android:checkable="true"
android:onClick="onBlockCallsChanged" android:onClick="onBlockCallsChanged"
android:title="@string/block_negative_sia_short" /> android:title="@string/block_negative_sia_short"
android:singleLineTitle="false" />
<item <item
android:id="@+id/menu_auto_updates" android:id="@+id/menu_auto_updates"
android:checkable="true" android:checkable="true"
android:onClick="onAutoUpdatesChanged" android:onClick="onAutoUpdatesChanged"
android:title="@string/auto_updates" /> android:title="@string/auto_updates"
android:singleLineTitle="false" />
<item <item
android:id="@+id/menu_use_contacts" android:id="@+id/menu_use_contacts"
android:checkable="true" android:checkable="true"
android:onClick="onUseContactsChanged" android:onClick="onUseContactsChanged"
android:title="@string/use_contacts" /> android:title="@string/use_contacts"
android:singleLineTitle="false" />
<item <item
android:onClick="onOpenBlacklist" android:onClick="onOpenBlacklist"
android:title="@string/open_blacklist_activity" /> android:title="@string/open_blacklist_activity"
android:singleLineTitle="false" />
<item <item
android:onClick="onOpenSettings" android:onClick="onOpenSettings"
android:title="@string/open_settings_activity" /> android:title="@string/open_settings_activity"
android:singleLineTitle="false" />
<item <item
android:onClick="onOpenAbout" android:onClick="onOpenAbout"
android:title="@string/open_about_activity" /> android:title="@string/open_about_activity"
android:singleLineTitle="false" />
</menu> </menu>

47
app/src/main/res/xml/root_preferences.xml
View File

@ -6,22 +6,26 @@
app:defaultValue="true" app:defaultValue="true"
app:key="incomingCallNotifications" app:key="incomingCallNotifications"
app:summary="@string/incoming_call_notifications_summary" app:summary="@string/incoming_call_notifications_summary"
app:title="@string/incoming_call_notifications" /> app:title="@string/incoming_call_notifications"
app:singleLineTitle="false" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="autoUpdateEnabled" app:key="autoUpdateEnabled"
app:persistent="false" app:persistent="false"
app:summary="@string/auto_updates_summary" app:summary="@string/auto_updates_summary"
app:title="@string/auto_updates" /> app:title="@string/auto_updates"
app:singleLineTitle="false" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="useContacts" app:key="useContacts"
app:summary="@string/use_contacts_summary" app:summary="@string/use_contacts_summary"
app:title="@string/use_contacts" /> app:title="@string/use_contacts"
app:singleLineTitle="false" />
<dummydomain.yetanothercallblocker.preference.IntListPreference <dummydomain.yetanothercallblocker.preference.IntListPreference
app:defaultValue="-1" app:defaultValue="-1"
app:entries="@array/ui_mode_entries" app:entries="@array/ui_mode_entries"
app:entryValues="@array/ui_mode_entry_values" app:entryValues="@array/ui_mode_entry_values"
app:key="uiMode" app:key="uiMode"
app:title="@string/ui_mode" app:title="@string/ui_mode"
app:singleLineTitle="false"
app:useSimpleSummaryProvider="true" /> app:useSimpleSummaryProvider="true" />
<ListPreference <ListPreference
app:defaultValue="consecutive" app:defaultValue="consecutive"
@ -29,6 +33,7 @@
app:entryValues="@array/call_log_grouping_values" app:entryValues="@array/call_log_grouping_values"
app:key="callLogGrouping" app:key="callLogGrouping"
app:title="@string/call_log_grouping" app:title="@string/call_log_grouping"
app:singleLineTitle="false"
app:useSimpleSummaryProvider="true" /> app:useSimpleSummaryProvider="true" />
</PreferenceCategory> </PreferenceCategory>
@ -36,60 +41,72 @@
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="blockNegativeSiaNumbers" app:key="blockNegativeSiaNumbers"
app:summary="@string/block_negative_sia_numbers_summary" app:summary="@string/block_negative_sia_numbers_summary"
app:title="@string/block_negative_sia" /> app:title="@string/block_negative_sia"
app:singleLineTitle="false" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="blockHiddenNumbers" app:key="blockHiddenNumbers"
app:summary="@string/block_hidden_number_summary" app:summary="@string/block_hidden_number_summary"
app:title="@string/block_hidden_number" /> app:title="@string/block_hidden_number"
app:singleLineTitle="false" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:defaultValue="true" app:defaultValue="true"
app:key="blockBlacklisted" app:key="blockBlacklisted"
app:summary="@string/block_blacklisted_summary" app:summary="@string/block_blacklisted_summary"
app:title="@string/block_blacklisted" /> app:title="@string/block_blacklisted"
app:singleLineTitle="false" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="useCallScreeningService" app:key="useCallScreeningService"
app:persistent="false" app:persistent="false"
app:summary="@string/use_call_screening_service_summary" app:summary="@string/use_call_screening_service_summary"
app:title="@string/use_call_screening_service" /> app:title="@string/use_call_screening_service"
app:singleLineTitle="false" />
</PreferenceCategory> </PreferenceCategory>
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="useMonitoringService" app:key="useMonitoringService"
app:summary="@string/use_monitoring_service_summary" app:summary="@string/use_monitoring_service_summary"
app:title="@string/use_monitoring_service" /> app:title="@string/use_monitoring_service"
app:singleLineTitle="false" />
<PreferenceCategory <PreferenceCategory
app:key="categoryNotifications" app:key="categoryNotifications"
app:title="@string/notification_settings"> app:title="@string/notification_settings"
app:singleLineTitle="false">
<Preference <Preference
app:key="notificationChannelSettings" app:key="notificationChannelSettings"
app:persistent="false" app:persistent="false"
app:title="@string/notification_settings" /> app:title="@string/notification_settings"
app:singleLineTitle="false" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
app:key="categoryNotificationsLegacy" app:key="categoryNotificationsLegacy"
app:title="@string/notification_settings"> app:title="@string/notification_settings"
app:singleLineTitle="false">
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="showNotificationsForKnownCallers" app:key="showNotificationsForKnownCallers"
app:summary="@string/show_notifications_for_known_callers_summary" app:summary="@string/show_notifications_for_known_callers_summary"
app:title="@string/show_notifications_for_known_callers" /> app:title="@string/show_notifications_for_known_callers"
app:singleLineTitle="false" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="showNotificationsForUnknownCallers" app:key="showNotificationsForUnknownCallers"
app:summary="@string/show_notifications_for_unknown_callers_summary" app:summary="@string/show_notifications_for_unknown_callers_summary"
app:title="@string/show_notifications_for_unknown_callers" /> app:title="@string/show_notifications_for_unknown_callers"
app:singleLineTitle="false" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="showNotificationsForBlockedCallsNonPersistent" app:key="showNotificationsForBlockedCallsNonPersistent"
app:persistent="false" app:persistent="false"
app:summary="@string/show_notifications_for_blocked_calls_summary" app:summary="@string/show_notifications_for_blocked_calls_summary"
app:title="@string/show_notifications_for_blocked_calls" /> app:title="@string/show_notifications_for_blocked_calls"
app:singleLineTitle="false" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory app:title="@string/settings_screen_advanced"> <PreferenceCategory app:title="@string/settings_screen_advanced">
<Preference <Preference
app:fragment="dummydomain.yetanothercallblocker.AdvancedSettingsFragment" app:fragment="dummydomain.yetanothercallblocker.AdvancedSettingsFragment"
app:key="screenAdvanced" app:key="screenAdvanced"
app:title="@string/settings_screen_advanced" /> app:title="@string/settings_screen_advanced"
app:singleLineTitle="false" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>