Skip to content

Commit 02c2e22

Browse files
bugginsbuggins
committed
Merge branch 'master' of github.com:buggins/coolreader
2 parents af112a7 + 3ecaba1 commit 02c2e22

25 files changed

+986
-149
lines changed

‎android/AndroidManifest.xml

+18-17
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<uses-permission android:name="android.permission.INTERNET"/>
2424
<!-- Stop TTS on incoming call -->
2525
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
26+
<!-- foreground TTS control service, for API >= 28 -->
27+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
2628
<!-- Hide Android3 soft buttons on Archos -->
2729
<!--uses-permission android:name="archos.permission.FULLSCREEN.FULL"/-->
2830
<!-- Required permission to use in-app billing. -->
@@ -149,26 +151,25 @@
149151
<data android:mimeType="application/vnd.oasis.opendocument.text"/>
150152
</intent-filter>
151153
</activity>
152-
153-
154+
154155
<!-- Database service -->
155-
<service android:name=".db.CRDBService" />
156-
157-
<!-- Donations support -->
158-
<service android:name=".donations.BillingService" />
159-
160-
<receiver android:name="org.coolreader.donations.BillingReceiver">
156+
<service
157+
android:name=".db.CRDBService"
158+
android:enabled="true"
159+
android:exported="false" />
160+
161+
<!-- TTS control service -->
162+
<service
163+
android:name=".tts.TTSControlService"
164+
android:enabled="true"
165+
android:exported="false"
166+
android:foregroundServiceType="mediaPlayback" />
167+
168+
<!-- Stop TTS on incoming call -->
169+
<receiver android:name="org.coolreader.PhoneStateReceiver">
161170
<intent-filter>
162-
<action android:name="com.android.vending.billing.IN_APP_NOTIFY" />
163-
<action android:name="com.android.vending.billing.RESPONSE_CODE" />
164-
<action android:name="com.android.vending.billing.PURCHASE_STATE_CHANGED" />
171+
<action android:name="android.intent.action.PHONE_STATE" />
165172
</intent-filter>
166173
</receiver>
167-
<!-- Stop TTS on incoming call -->
168-
<receiver android:name="org.coolreader.PhoneStateReceiver">
169-
<intent-filter>
170-
<action android:name="android.intent.action.PHONE_STATE" />
171-
</intent-filter>
172-
</receiver>
173174
</application>
174175
</manifest>

‎android/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 28
4+
compileSdkVersion 30
55
defaultConfig {
66
applicationId "org.coolreader"
77
minSdkVersion 3

‎android/app/src/main/AndroidManifest.xml

+12-11
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
<uses-permission android:name="android.permission.INTERNET"/>
5252
<!-- Stop TTS on incoming call -->
5353
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
54+
<!-- foreground TTS control service, for API >= 28 -->
55+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
5456
<!-- Hide Android3 soft buttons on Archos -->
5557
<!--uses-permission android:name="archos.permission.FULLSCREEN.FULL"/-->
5658
<!-- Required permission to use in-app billing. -->
@@ -182,20 +184,19 @@
182184
</intent-filter>
183185
</activity>
184186

185-
186187
<!-- Database service -->
187-
<service android:name=".db.CRDBService" />
188+
<service
189+
android:name=".db.CRDBService"
190+
android:enabled="true"
191+
android:exported="false" />
188192

189-
<!-- Donations support -->
190-
<service android:name=".donations.BillingService" />
193+
<!-- TTS control service -->
194+
<service
195+
android:name=".tts.TTSControlService"
196+
android:enabled="true"
197+
android:exported="false"
198+
android:foregroundServiceType="mediaPlayback" />
191199

192-
<receiver android:name="org.coolreader.donations.BillingReceiver">
193-
<intent-filter>
194-
<action android:name="com.android.vending.billing.IN_APP_NOTIFY" />
195-
<action android:name="com.android.vending.billing.RESPONSE_CODE" />
196-
<action android:name="com.android.vending.billing.PURCHASE_STATE_CHANGED" />
197-
</intent-filter>
198-
</receiver>
199200
<!-- Stop TTS on incoming call -->
200201
<receiver android:name="org.coolreader.PhoneStateReceiver">
201202
<intent-filter>

‎android/res/values-ru/strings.xml

+16
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@
102102
<string name="dlg_search_hint">Введите строку для поиска</string>
103103
<string name="dlg_button_ok">Ok</string>
104104
<string name="dlg_button_cancel">Отмена</string>
105+
<string name="dlg_button_yes">Да</string>
106+
<string name="dlg_button_no">Нет</string>
105107
<string name="dlg_button_find">Найти</string>
106108
<string name="options_page_animation">Анимация листания</string>
107109
<string name="options_controls_enable_volume_keys">Листание кнопками громкости</string>
@@ -606,6 +608,7 @@
606608
<string name="options_style_multilang">Поддержка мультиязычных документов</string>
607609
<string name="options_style_enable_hyphenation">Разрешить переносы</string>
608610
<string name="options_app_googledrive_sync_auto">Автоматическая синхронизация с Google Диском</string>
611+
<string name="options_app_cloudsync_confirmations">Запрашивать подтверждение перед обновлением</string>
609612
<string name="options_app_googledrive_sync_settings">Настройки на Диске</string>
610613
<string name="options_app_googledrive_sync_bookmarks">Закладки и текущая позиция чтения на Диске</string>
611614
<string name="options_app_googledrive_sync_currentbook">Информация о читаемой в данный момент книге на Диске</string>
@@ -622,4 +625,17 @@
622625
<string name="googledrive_sync_to">Синх. на Диск</string>
623626
<string name="googledrive_sync_from">Синх. с Диска</string>
624627
<string name="confirmation_title">Подтверждение</string>
628+
<string name="sync_confirmation_other_book">На другом устройстве была открыта другая книга (%s), переключиться на неё?</string>
629+
<string name="sync_confirmation_new_reading_position">Для этой книги найдена новая позиция чтения, обновить?</string>
630+
<string name="autosave_period">Период автосохранения</string>
631+
<string name="autosave_period_off">"Отключено"</string>
632+
<string name="autosave_period_1min">"1 минута"</string>
633+
<string name="autosave_period_2min">"2 минуты"</string>
634+
<string name="autosave_period_3min">"3 минуты"</string>
635+
<string name="autosave_period_4min">"4 минуты"</string>
636+
<string name="autosave_period_5min">"5 минут"</string>
637+
<string name="autosave_period_10min">"10 минут"</string>
638+
<string name="autosave_period_15min">"15 минут"</string>
639+
<string name="autosave_period_20min">"20 минут"</string>
640+
<string name="autosave_period_30min">"30 минут"</string>
625641
</resources>

‎android/res/values/strings.xml

+16
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@
108108
<string name="dlg_search_hint">Type text here</string>
109109
<string name="dlg_button_ok">OK</string>
110110
<string name="dlg_button_cancel">Cancel</string>
111+
<string name="dlg_button_yes">Yes</string>
112+
<string name="dlg_button_no">No</string>
111113
<string name="dlg_button_find">Find</string>
112114
<string name="options_page_animation">Page animation</string>
113115
<string name="options_controls_enable_volume_keys">Use volume keys for navigation</string>
@@ -641,6 +643,7 @@
641643
<string name="options_style_multilang">Support for multilingual documents</string>
642644
<string name="options_style_enable_hyphenation">Enable hyphenation</string>
643645
<string name="options_app_googledrive_sync_auto">Auto synchronization with Google Drive</string>
646+
<string name="options_app_cloudsync_confirmations">Ask for confirmation before updating</string>
644647
<string name="options_app_googledrive_sync_settings">Settings on Drive</string>
645648
<string name="options_app_googledrive_sync_bookmarks">Bookmarks and reading position on Drive</string>
646649
<string name="options_app_googledrive_sync_currentbook">Current reading book info on Drive</string>
@@ -657,4 +660,17 @@
657660
<string name="googledrive_sync_to">Sync to Drive</string>
658661
<string name="googledrive_sync_from">Sync from Drive</string>
659662
<string name="confirmation_title">Confirmation</string>
663+
<string name="sync_confirmation_other_book">Another book (%s) was opened on another device, switch to it?</string>
664+
<string name="sync_confirmation_new_reading_position">New reading position found for this book, update?</string>
665+
<string name="autosave_period">Autosave period</string>
666+
<string name="autosave_period_off">"Off"</string>
667+
<string name="autosave_period_1min">"1 minute"</string>
668+
<string name="autosave_period_2min">"2 minutes"</string>
669+
<string name="autosave_period_3min">"3 minutes"</string>
670+
<string name="autosave_period_4min">"4 minutes"</string>
671+
<string name="autosave_period_5min">"5 minutes"</string>
672+
<string name="autosave_period_10min">"10 minutes"</string>
673+
<string name="autosave_period_15min">"15 minutes"</string>
674+
<string name="autosave_period_20min">"20 minutes"</string>
675+
<string name="autosave_period_30min">"30 minutes"</string>
660676
</resources>

0 commit comments

Comments
 (0)