From b1515902a7e72776715b690d901ae5b87affdbcf Mon Sep 17 00:00:00 2001 From: xynngh Date: Wed, 30 Sep 2020 16:14:17 +0400 Subject: [PATCH] Rename "recent calls" to "call log" --- README.md | 2 +- .../yetanothercallblocker/MainActivity.java | 6 +++--- .../yetanothercallblocker/Settings.java | 16 ++++++++-------- app/src/main/res/values-ru/strings.xml | 8 ++++---- app/src/main/res/values/arrays.xml | 10 +++++----- app/src/main/res/values/strings.xml | 8 ++++---- app/src/main/res/xml/root_preferences.xml | 8 ++++---- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 3be0c56..ca7109c 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ At this point most of the essential features (one would expect from a call block * Showing a notification with some caller info (positive/negative rating, category, number of negative reviews and such) when the phone's ringing. *Works offline.* * Loading and displaying a list of reviews for a number (accessed from the notification or the info view). *Requires internet.* * Automatic update of the database (for offline use). *Requires internet.* -* Displaying a list of recent calls with caller rating and the ability to show more info or load online reviews for the number. The list *works offline*, but loading reviews *requires internet.* +* Displaying call log with caller rating and the ability to show more info or load online reviews for the number. The list *works offline*, but loading reviews *requires internet.* * If "use contacts" option is enabled, the numbers present in the phone book are never blocked and the contact name is displayed next to/instead of a number throughout the app. * "Advanced call blocking mode" for blocking calls on Android 7+ before the phone starts ringing. Needs to be manually enabled in app Settings. diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/MainActivity.java b/app/src/main/java/dummydomain/yetanothercallblocker/MainActivity.java index 2058e34..82204ef 100644 --- a/app/src/main/java/dummydomain/yetanothercallblocker/MainActivity.java +++ b/app/src/main/java/dummydomain/yetanothercallblocker/MainActivity.java @@ -301,11 +301,11 @@ public class MainActivity extends AppCompatActivity { private Function, List> getCallLogGroupConverter() { Function, List> converter; - switch (settings.getRecentCallsGrouping()) { - case Settings.PREF_RECENT_CALLS_GROUPING_NONE: + switch (settings.getCallLogGrouping()) { + case Settings.PREF_CALL_LOG_GROUPING_NONE: converter = CallLogItemGroup::noGrouping; break; - case Settings.PREF_RECENT_CALLS_GROUPING_DAY: + case Settings.PREF_CALL_LOG_GROUPING_DAY: converter = CallLogItemGroup::groupInDay; break; default: diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/Settings.java b/app/src/main/java/dummydomain/yetanothercallblocker/Settings.java index bc04f92..fcaa3a7 100644 --- a/app/src/main/java/dummydomain/yetanothercallblocker/Settings.java +++ b/app/src/main/java/dummydomain/yetanothercallblocker/Settings.java @@ -23,7 +23,7 @@ public class Settings extends GenericSettings { public static final String PREF_BLACKLIST_IS_NOT_EMPTY = "blacklistIsNotEmpty"; public static final String PREF_USE_CONTACTS = "useContacts"; public static final String PREF_UI_MODE = "uiMode"; - public static final String PREF_RECENT_CALLS_GROUPING = "recentCallsGrouping"; + public static final String PREF_CALL_LOG_GROUPING = "callLogGrouping"; public static final String PREF_USE_MONITORING_SERVICE = "useMonitoringService"; public static final String PREF_NOTIFICATIONS_KNOWN = "showNotificationsForKnownCallers"; public static final String PREF_NOTIFICATIONS_UNKNOWN = "showNotificationsForUnknownCallers"; @@ -35,9 +35,9 @@ public class Settings extends GenericSettings { public static final String PREF_SAVE_CRASHES_TO_EXTERNAL_STORAGE = "saveCrashesToExternalStorage"; public static final String PREF_SAVE_LOGCAT_ON_CRASH = "saveLogcatOnCrash"; - public static final String PREF_RECENT_CALLS_GROUPING_NONE = "none"; - public static final String PREF_RECENT_CALLS_GROUPING_CONSECUTIVE = "consecutive"; - public static final String PREF_RECENT_CALLS_GROUPING_DAY = "day"; + public static final String PREF_CALL_LOG_GROUPING_NONE = "none"; + public static final String PREF_CALL_LOG_GROUPING_CONSECUTIVE = "consecutive"; + public static final String PREF_CALL_LOG_GROUPING_DAY = "day"; static final String SYS_PREFERENCES_VERSION = "__preferencesVersion"; @@ -160,12 +160,12 @@ public class Settings extends GenericSettings { setInt(PREF_UI_MODE, mode); } - public String getRecentCallsGrouping() { - return getString(PREF_RECENT_CALLS_GROUPING, PREF_RECENT_CALLS_GROUPING_CONSECUTIVE); + public String getCallLogGrouping() { + return getString(PREF_CALL_LOG_GROUPING, PREF_CALL_LOG_GROUPING_CONSECUTIVE); } - public void setRecentCallsGrouping(String value) { - setString(PREF_RECENT_CALLS_GROUPING, value); + public void setCallLogGrouping(String value) { + setString(PREF_CALL_LOG_GROUPING, value); } public boolean getUseMonitoringService() { diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 8cdef08..cb91b63 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -86,10 +86,10 @@ Светлая Тёмная Определяется системой - Группировка недавних вызовов - Без группировки - Последовательные вызовы - Непоследовательные в течение дня + Группировка списка вызовов + Без группировки + Последовательные вызовы + Непоследовательные в течение дня Из списка контактов Настройки Настройки diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 4eb54e6..0b299aa 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -10,12 +10,12 @@ 2 -1 - - @string/recent_calls_grouping_none - @string/recent_calls_grouping_consecutive - @string/recent_calls_grouping_day + + @string/call_log_grouping_none + @string/call_log_grouping_consecutive + @string/call_log_grouping_day - + none consecutive day diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 94254dd..60c94b9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -113,10 +113,10 @@ Light Dark Follow system - Recent calls grouping - No grouping - Consecutive calls - Non-consecutive in a day + Call log grouping + No grouping + Consecutive calls + Non-consecutive in a day Advanced settings Country codes diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml index 80bdd45..7413531 100644 --- a/app/src/main/res/xml/root_preferences.xml +++ b/app/src/main/res/xml/root_preferences.xml @@ -24,10 +24,10 @@ app:useSimpleSummaryProvider="true" />