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

Rename "recent calls" to "call log"

This commit is contained in:
xynngh 2020-09-30 16:14:17 +04:00
parent 1ecb236332
commit b1515902a7
7 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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.

6
app/src/main/java/dummydomain/yetanothercallblocker/MainActivity.java
View File

@ -301,11 +301,11 @@ public class MainActivity extends AppCompatActivity {
private Function<List<CallLogItem>, List<CallLogItemGroup>> getCallLogGroupConverter() {
Function<List<CallLogItem>, List<CallLogItemGroup>> 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:

16
app/src/main/java/dummydomain/yetanothercallblocker/Settings.java
View File

@ -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() {

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

@ -86,10 +86,10 @@
<string name="ui_mode_day">Светлая</string>
<string name="ui_mode_night">Тёмная</string>
<string name="ui_mode_auto">Определяется системой</string>
<string name="recent_calls_grouping">Группировка недавних вызовов</string>
<string name="recent_calls_grouping_none">Без группировки</string>
<string name="recent_calls_grouping_consecutive">Последовательные вызовы</string>
<string name="recent_calls_grouping_day">Непоследовательные в течение дня</string>
<string name="call_log_grouping">Группировка списка вызовов</string>
<string name="call_log_grouping_none">Без группировки</string>
<string name="call_log_grouping_consecutive">Последовательные вызовы</string>
<string name="call_log_grouping_day">Непоследовательные в течение дня</string>
<string name="notification_incoming_call_contact">Из списка контактов</string>
<string name="open_settings_activity">Настройки</string>
<string name="title_settings_activity">Настройки</string>

10
app/src/main/res/values/arrays.xml
View File

@ -10,12 +10,12 @@
<item>2</item>
<item>-1</item>
</string-array>
<string-array name="recent_calls_grouping_entries">
<item>@string/recent_calls_grouping_none</item>
<item>@string/recent_calls_grouping_consecutive</item>
<item>@string/recent_calls_grouping_day</item>
<string-array name="call_log_grouping_entries">
<item>@string/call_log_grouping_none</item>
<item>@string/call_log_grouping_consecutive</item>
<item>@string/call_log_grouping_day</item>
</string-array>
<string-array name="recent_calls_grouping_values">
<string-array name="call_log_grouping_values">
<item>none</item>
<item>consecutive</item>
<item>day</item>

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

@ -113,10 +113,10 @@
<string name="ui_mode_day">Light</string>
<string name="ui_mode_night">Dark</string>
<string name="ui_mode_auto">Follow system</string>
<string name="recent_calls_grouping">Recent calls grouping</string>
<string name="recent_calls_grouping_none">No grouping</string>
<string name="recent_calls_grouping_consecutive">Consecutive calls</string>
<string name="recent_calls_grouping_day">Non-consecutive in a day</string>
<string name="call_log_grouping">Call log grouping</string>
<string name="call_log_grouping_none">No grouping</string>
<string name="call_log_grouping_consecutive">Consecutive calls</string>
<string name="call_log_grouping_day">Non-consecutive in a day</string>
<string name="settings_screen_advanced">Advanced settings</string>
<string name="settings_category_country_codes">Country codes</string>

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

@ -24,10 +24,10 @@
app:useSimpleSummaryProvider="true" />
<ListPreference
app:defaultValue="consecutive"
app:entries="@array/recent_calls_grouping_entries"
app:entryValues="@array/recent_calls_grouping_values"
app:key="recentCallsGrouping"
app:title="@string/recent_calls_grouping"
app:entries="@array/call_log_grouping_entries"
app:entryValues="@array/call_log_grouping_values"
app:key="callLogGrouping"
app:title="@string/call_log_grouping"
app:useSimpleSummaryProvider="true" />
</PreferenceCategory>