Skip to content

Commit

Permalink
Merge branch 'master' of github.com:buggins/coolreader
Browse files Browse the repository at this point in the history
  • Loading branch information
@buggins
buggins committed Sep 11, 2020
2 parents af112a7 + 3ecaba1 commit 02c2e22
Show file tree
Hide file tree
Showing 25 changed files with 986 additions and 149 deletions.
35 changes: 18 additions & 17 deletions android/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<uses-permission android:name="android.permission.INTERNET"/>
<!-- Stop TTS on incoming call -->
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<!-- foreground TTS control service, for API >= 28 -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<!-- Hide Android3 soft buttons on Archos -->
<!--uses-permission android:name="archos.permission.FULLSCREEN.FULL"/-->
<!-- Required permission to use in-app billing. -->
Expand Down Expand Up @@ -149,26 +151,25 @@
<data android:mimeType="application/vnd.oasis.opendocument.text"/>
</intent-filter>
</activity>



<!-- Database service -->
<service android:name=".db.CRDBService" />

<!-- Donations support -->
<service android:name=".donations.BillingService" />

<receiver android:name="org.coolreader.donations.BillingReceiver">
<service
android:name=".db.CRDBService"
android:enabled="true"
android:exported="false" />

<!-- TTS control service -->
<service
android:name=".tts.TTSControlService"
android:enabled="true"
android:exported="false"
android:foregroundServiceType="mediaPlayback" />

<!-- Stop TTS on incoming call -->
<receiver android:name="org.coolreader.PhoneStateReceiver">
<intent-filter>
<action android:name="com.android.vending.billing.IN_APP_NOTIFY" />
<action android:name="com.android.vending.billing.RESPONSE_CODE" />
<action android:name="com.android.vending.billing.PURCHASE_STATE_CHANGED" />
<action android:name="android.intent.action.PHONE_STATE" />
</intent-filter>
</receiver>
<!-- Stop TTS on incoming call -->
<receiver android:name="org.coolreader.PhoneStateReceiver">
<intent-filter>
<action android:name="android.intent.action.PHONE_STATE" />
</intent-filter>
</receiver>
</application>
</manifest>
2 changes: 1 addition & 1 deletion android/app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 28
compileSdkVersion 30
defaultConfig {
applicationId "org.coolreader"
minSdkVersion 3
Expand Down
23 changes: 12 additions & 11 deletions android/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
<uses-permission android:name="android.permission.INTERNET"/>
<!-- Stop TTS on incoming call -->
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<!-- foreground TTS control service, for API >= 28 -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<!-- Hide Android3 soft buttons on Archos -->
<!--uses-permission android:name="archos.permission.FULLSCREEN.FULL"/-->
<!-- Required permission to use in-app billing. -->
Expand Down Expand Up @@ -182,20 +184,19 @@
</intent-filter>
</activity>


<!-- Database service -->
<service android:name=".db.CRDBService" />
<service
android:name=".db.CRDBService"
android:enabled="true"
android:exported="false" />

<!-- Donations support -->
<service android:name=".donations.BillingService" />
<!-- TTS control service -->
<service
android:name=".tts.TTSControlService"
android:enabled="true"
android:exported="false"
android:foregroundServiceType="mediaPlayback" />

<receiver android:name="org.coolreader.donations.BillingReceiver">
<intent-filter>
<action android:name="com.android.vending.billing.IN_APP_NOTIFY" />
<action android:name="com.android.vending.billing.RESPONSE_CODE" />
<action android:name="com.android.vending.billing.PURCHASE_STATE_CHANGED" />
</intent-filter>
</receiver>
<!-- Stop TTS on incoming call -->
<receiver android:name="org.coolreader.PhoneStateReceiver">
<intent-filter>
Expand Down
16 changes: 16 additions & 0 deletions android/res/values-ru/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@
<string name="dlg_search_hint">Введите строку для поиска</string>
<string name="dlg_button_ok">Ok</string>
<string name="dlg_button_cancel">Отмена</string>
<string name="dlg_button_yes">Да</string>
<string name="dlg_button_no">Нет</string>
<string name="dlg_button_find">Найти</string>
<string name="options_page_animation">Анимация листания</string>
<string name="options_controls_enable_volume_keys">Листание кнопками громкости</string>
Expand Down Expand Up @@ -606,6 +608,7 @@
<string name="options_style_multilang">Поддержка мультиязычных документов</string>
<string name="options_style_enable_hyphenation">Разрешить переносы</string>
<string name="options_app_googledrive_sync_auto">Автоматическая синхронизация с Google Диском</string>
<string name="options_app_cloudsync_confirmations">Запрашивать подтверждение перед обновлением</string>
<string name="options_app_googledrive_sync_settings">Настройки на Диске</string>
<string name="options_app_googledrive_sync_bookmarks">Закладки и текущая позиция чтения на Диске</string>
<string name="options_app_googledrive_sync_currentbook">Информация о читаемой в данный момент книге на Диске</string>
Expand All @@ -622,4 +625,17 @@
<string name="googledrive_sync_to">Синх. на Диск</string>
<string name="googledrive_sync_from">Синх. с Диска</string>
<string name="confirmation_title">Подтверждение</string>
<string name="sync_confirmation_other_book">На другом устройстве была открыта другая книга (%s), переключиться на неё?</string>
<string name="sync_confirmation_new_reading_position">Для этой книги найдена новая позиция чтения, обновить?</string>
<string name="autosave_period">Период автосохранения</string>
<string name="autosave_period_off">"Отключено"</string>
<string name="autosave_period_1min">"1 минута"</string>
<string name="autosave_period_2min">"2 минуты"</string>
<string name="autosave_period_3min">"3 минуты"</string>
<string name="autosave_period_4min">"4 минуты"</string>
<string name="autosave_period_5min">"5 минут"</string>
<string name="autosave_period_10min">"10 минут"</string>
<string name="autosave_period_15min">"15 минут"</string>
<string name="autosave_period_20min">"20 минут"</string>
<string name="autosave_period_30min">"30 минут"</string>
</resources>
16 changes: 16 additions & 0 deletions android/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@
<string name="dlg_search_hint">Type text here</string>
<string name="dlg_button_ok">OK</string>
<string name="dlg_button_cancel">Cancel</string>
<string name="dlg_button_yes">Yes</string>
<string name="dlg_button_no">No</string>
<string name="dlg_button_find">Find</string>
<string name="options_page_animation">Page animation</string>
<string name="options_controls_enable_volume_keys">Use volume keys for navigation</string>
Expand Down Expand Up @@ -641,6 +643,7 @@
<string name="options_style_multilang">Support for multilingual documents</string>
<string name="options_style_enable_hyphenation">Enable hyphenation</string>
<string name="options_app_googledrive_sync_auto">Auto synchronization with Google Drive</string>
<string name="options_app_cloudsync_confirmations">Ask for confirmation before updating</string>
<string name="options_app_googledrive_sync_settings">Settings on Drive</string>
<string name="options_app_googledrive_sync_bookmarks">Bookmarks and reading position on Drive</string>
<string name="options_app_googledrive_sync_currentbook">Current reading book info on Drive</string>
Expand All @@ -657,4 +660,17 @@
<string name="googledrive_sync_to">Sync to Drive</string>
<string name="googledrive_sync_from">Sync from Drive</string>
<string name="confirmation_title">Confirmation</string>
<string name="sync_confirmation_other_book">Another book (%s) was opened on another device, switch to it?</string>
<string name="sync_confirmation_new_reading_position">New reading position found for this book, update?</string>
<string name="autosave_period">Autosave period</string>
<string name="autosave_period_off">"Off"</string>
<string name="autosave_period_1min">"1 minute"</string>
<string name="autosave_period_2min">"2 minutes"</string>
<string name="autosave_period_3min">"3 minutes"</string>
<string name="autosave_period_4min">"4 minutes"</string>
<string name="autosave_period_5min">"5 minutes"</string>
<string name="autosave_period_10min">"10 minutes"</string>
<string name="autosave_period_15min">"15 minutes"</string>
<string name="autosave_period_20min">"20 minutes"</string>
<string name="autosave_period_30min">"30 minutes"</string>
</resources>
Loading

0 comments on commit 02c2e22

Please sign in to comment.