Skip to content

Commit 90aede9

Browse files
plotnplotn
committed
Stability, Onyx fixes, database fixes
2 parents cca7a90 + bc00843 commit 90aede9

17 files changed

Lines changed: 659 additions & 182 deletions

‎android/AndroidManifest.xml‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@
5050
<intent-filter>
5151
<action android:name="android.intent.action.VIEW" />
5252
<category android:name="android.intent.category.DEFAULT" />
53-
<data android:host="*" android:scheme="file" />
53+
<category android:name="android.intent.category.BROWSABLE" />
54+
<data android:scheme="file" android:host="*" />
55+
<data android:scheme="content" />
5456
<data android:mimeType="application/octet-stream" />
5557
<data android:pathPattern=".*\\.fb2\\.zip"/>
5658
<data android:pathPattern=".*\\..*\\.fb2\\.zip"/>
@@ -61,6 +63,14 @@
6163
<data android:pathPattern=".*\\..*\\.fb2"/>
6264
<data android:pathPattern=".*\\..*\\..*\\.fb2"/>
6365
<data android:pathPattern=".*\\..*\\..*\\..*\\.fb2"/>
66+
<!-- for inner files in archive opened from system file manager -->
67+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.fb2"/>
68+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.fb2"/>
69+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.fb2"/>
70+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fb2"/>
71+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fb2"/>
72+
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fb2"/>
73+
<!-- end of inner files in archive -->
6474
<data android:pathPattern=".*\\.txt"/>
6575
<data android:pathPattern=".*\\.html"/>
6676
<data android:pathPattern=".*\\.xhtml"/>
@@ -92,23 +102,30 @@
92102
<intent-filter>
93103
<action android:name="android.intent.action.VIEW" />
94104
<category android:name="android.intent.category.DEFAULT" />
95-
<data android:host="" android:scheme="file" />
105+
<category android:name="android.intent.category.BROWSABLE" />
106+
<data android:scheme="file" android:host="*" />
107+
<data android:scheme="content" />
96108
<data android:mimeType="text/plain"/>
97109
<data android:mimeType="text/html"/>
110+
<data android:mimeType="text/richtext"/>
111+
<data android:mimeType="application/x-cbr"/>
112+
<data android:mimeType="application/x-cbz"/>
113+
98114
<data android:mimeType="application/zip"/>
99115
<data android:mimeType="application/rtf"/>
100-
<data android:mimeType="application/msword"/>
101116
<data android:mimeType="application/x-rtf"/>
102-
<data android:mimeType="text/richtext"/>
103-
<data android:mimeType="application/epub+zip"/>
104117
<data android:mimeType="application/x-chm"/>
105-
<data android:mimeType="application/msword"/>
106118
<data android:mimeType="application/fb2"/>
107119
<data android:mimeType="application/fb2.zip"/>
108120
<data android:mimeType="application/epub"/>
121+
<data android:mimeType="application/epub+zip"/>
109122
<data android:mimeType="application/x-fictionbook"/>
123+
<data android:mimeType="application/x-fictionbook+xml"/>
124+
<data android:mimeType="application/x-pilot-prc"/>
125+
<data android:mimeType="application/x-mobipocket-ebook"/>
126+
<data android:mimeType="application/msword"/>
110127
<data android:mimeType="application/doc"/>
111-
<data android:mimeType="application/vnd.msword"/>
128+
<data android:mimeType="application/vnd.msword"/>
112129
<data android:mimeType="application/vnd.ms-word"/>
113130
<data android:mimeType="application/winword"/>
114131
<data android:mimeType="application/word"/>
@@ -118,8 +135,6 @@
118135
</activity>
119136

120137

121-
<!-- Sync support -->
122-
<service android:name=".sync.SyncService" />
123138
<!-- Database service -->
124139
<service android:name=".db.CRDBService" />
125140

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

Lines changed: 16 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="org.coolreader"
4-
android:installLocation="auto">
3+
package="org.coolreader"
4+
android:installLocation="auto">
55

66
<supports-screens
77
android:xlargeScreens="true"
@@ -34,25 +34,25 @@
3434
>
3535

3636
<meta-data
37-
android:name="com.google.android.geo.API_KEY"
38-
android:value="AIzaSyCr_nWVRATHYaPyTn0wxpjpy4QR2eTEvB0" />
37+
android:name="com.google.android.geo.API_KEY"
38+
android:value="AIzaSyCr_nWVRATHYaPyTn0wxpjpy4QR2eTEvB0" />
3939

4040
<meta-data android:name="android.max_aspect" android:value="2.1" />
4141

4242
<meta-data
43-
android:name="com.google.android.gms.version"
44-
android:value="@integer/google_play_services_version" />
45-
<!--
46-
android:configChanges="orientation|keyboardHidden|locale|screenSize"
47-
-->
43+
android:name="com.google.android.gms.version"
44+
android:value="@integer/google_play_services_version" />
45+
<!--
46+
android:configChanges="orientation|keyboardHidden|locale|screenSize"
47+
-->
4848
<meta-data android:name="android.max_aspect" android:value="2.1" />
4949
<activity android:name=".CoolReader"
50-
android:label="@string/app_name_fork"
51-
android:configChanges="orientation|keyboardHidden|locale|screenSize|screenLayout|layoutDirection"
52-
android:theme="@android:style/Theme.NoTitleBar"
53-
android:launchMode="singleInstance"
54-
android:windowSoftInputMode="stateHidden"
55-
android:screenOrientation="sensor">
50+
android:label="@string/app_name_fork"
51+
android:configChanges="orientation|keyboardHidden|locale|screenSize|screenLayout|layoutDirection"
52+
android:theme="@android:style/Theme.NoTitleBar"
53+
android:launchMode="singleInstance"
54+
android:windowSoftInputMode="stateHidden"
55+
android:screenOrientation="sensor">
5656
<intent-filter>
5757
<action android:name="android.intent.action.MAIN" />
5858
<category android:name="android.intent.category.LAUNCHER" />
@@ -1155,87 +1155,6 @@
11551155
</intent-filter>
11561156
</activity-alias>
11571157

1158-
<!-- alias activity to disable PIC -->
1159-
<activity-alias
1160-
android:name=".CoolReaderForPIC"
1161-
android:targetActivity=".CoolReader" >
1162-
<!-- intent-filter with recognized extensions and */* mimeType -->
1163-
<intent-filter>
1164-
<action android:name="android.intent.action.MAIN" />
1165-
<action android:name="android.intent.action.VIEW" />
1166-
<action android:name="android.intent.action.GET_CONTENT" />
1167-
1168-
<category android:name="android.intent.category.BROWSABLE" />
1169-
<category android:name="android.intent.category.DEFAULT" />
1170-
1171-
<data android:host="*" />
1172-
<data android:scheme="file" />
1173-
<data android:scheme="content" />
1174-
<data android:mimeType="*/*" />
1175-
1176-
<data android:pathPattern="/.*\\.jpg" />
1177-
<data android:pathPattern="/.*\\..*\\.jpg" />
1178-
<data android:pathPattern="/.*\\..*\\..*\\.jpg" />
1179-
<data android:pathPattern="/.*\\.jpeg" />
1180-
<data android:pathPattern="/.*\\..*\\.jpeg" />
1181-
<data android:pathPattern="/.*\\..*\\..*\\.jpeg" />
1182-
<data android:pathPattern="/.*\\.png" />
1183-
<data android:pathPattern="/.*\\..*\\.png" />
1184-
<data android:pathPattern="/.*\\..*\\..*\\.png" />
1185-
</intent-filter>
1186-
<!-- intent-filter with recognized extensions and null mimeType -->
1187-
<intent-filter>
1188-
<action android:name="android.intent.action.MAIN" />
1189-
<action android:name="android.intent.action.VIEW" />
1190-
<action android:name="android.intent.action.GET_CONTENT" />
1191-
1192-
<category android:name="android.intent.category.BROWSABLE" />
1193-
<category android:name="android.intent.category.DEFAULT" />
1194-
1195-
<data android:host="*" android:scheme="file" />
1196-
<data android:host="*" android:scheme="content" />
1197-
1198-
<data android:pathPattern="/.*\\.jpg" />
1199-
<data android:pathPattern="/.*\\..*\\.jpg" />
1200-
<data android:pathPattern="/.*\\..*\\..*\\.jpg" />
1201-
<data android:pathPattern="/.*\\.jpeg" />
1202-
<data android:pathPattern="/.*\\..*\\.jpeg" />
1203-
<data android:pathPattern="/.*\\..*\\..*\\.jpeg" />
1204-
<data android:pathPattern="/.*\\.png" />
1205-
<data android:pathPattern="/.*\\..*\\.png" />
1206-
<data android:pathPattern="/.*\\..*\\..*\\.png" />
1207-
</intent-filter>
1208-
<!-- intent-filter with no extensions and recognized mime-types -->
1209-
<intent-filter>
1210-
<action android:name="android.intent.action.MAIN" />
1211-
<action android:name="android.intent.action.VIEW" />
1212-
<action android:name="android.intent.action.GET_CONTENT" />
1213-
1214-
<category android:name="android.intent.category.DEFAULT" />
1215-
<category android:name="android.intent.category.BROWSABLE" />
1216-
1217-
<data android:scheme="file" />
1218-
<data android:scheme="content" />
1219-
<data android:mimeType="image/jpeg" />
1220-
<data android:mimeType="image/png" />
1221-
<data android:mimeType="image/*" />
1222-
</intent-filter>
1223-
<intent-filter>
1224-
<action android:name="android.intent.action.SEND" />
1225-
<category android:name="android.intent.category.DEFAULT" />
1226-
<data android:mimeType="image/jpeg" />
1227-
<data android:mimeType="image/png" />
1228-
<data android:mimeType="image/*" />
1229-
</intent-filter>
1230-
<intent-filter>
1231-
<action android:name="android.intent.action.SEND_MUTIPLE" />
1232-
<category android:name="android.intent.category.DEFAULT" />
1233-
<data android:mimeType="image/jpeg" />
1234-
<data android:mimeType="image/png" />
1235-
<data android:mimeType="image/*" />
1236-
</intent-filter>
1237-
</activity-alias>
1238-
12391158
<!-- Sync support -->
12401159
<service android:name=".sync.SyncService" />
12411160
<!-- Database service -->
@@ -1259,4 +1178,4 @@
12591178
</receiver>
12601179
</application>
12611180

1262-
</manifest>
1181+
</manifest>

‎android/res/layout-v21/goto_page_dlg.xml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:orientation="vertical"
5+
android:layout_width="fill_parent"
6+
android:layout_height="wrap_content"
7+
android:minWidth="1200dip"
8+
android:layout_marginTop="5dip"
9+
android:layout_marginBottom="5dip"
10+
android:layout_marginLeft="5dip"
11+
android:layout_marginRight="5dip"
12+
>
13+
<TextView
14+
android:id="@+id/lbl_prompt"
15+
style="@style/TextAppearance.Medium"
16+
android:singleLine="false"
17+
android:maxLines="3"
18+
android:layout_margin="3dip"
19+
android:text="Page 34/1024 (25%) Chapter 1"
20+
android:layout_width="wrap_content"
21+
android:layout_height="wrap_content"/>
22+
<EditText
23+
android:id="@+id/input_field"
24+
android:layout_width="fill_parent"
25+
android:layout_height="wrap_content"
26+
android:layout_marginTop="3dip"
27+
android:layout_marginBottom="3dip"
28+
android:layout_marginLeft="3dip"
29+
android:layout_marginRight="3dip"
30+
style="@style/TextAppearance.Widget.EditText"
31+
android:singleLine="true"
32+
/>
33+
<SeekBar android:id="@+id/goto_position_seek_bar"
34+
android:layout_width="fill_parent"
35+
android:layout_height="wrap_content"
36+
android:layout_marginTop="2dip"
37+
android:layout_marginBottom="2dip"
38+
android:layout_marginLeft="2dip"
39+
android:layout_marginRight="2dip"
40+
android:padding="10dip"
41+
android:max="100"
42+
android:progress="50"
43+
android:progressDrawable="@drawable/seekbar_progressbar"
44+
android:thumb="@drawable/seekbar_thumb"
45+
/>
46+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
47+
android:id="@+id/pages_list"
48+
android:orientation="vertical"
49+
android:layout_weight="8"
50+
android:layout_width="fill_parent"
51+
android:layout_height="fill_parent"
52+
android:baselineAligned="false"
53+
android:layout_marginTop="8dip"
54+
android:layout_marginBottom="8dip"
55+
android:layout_marginLeft="4dip"
56+
android:layout_marginRight="4dip"
57+
>
58+
59+
</LinearLayout>
60+
</LinearLayout>

‎android/res/layout-v21/line_edit_dlg.xml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:orientation="vertical"
5+
android:layout_width="fill_parent"
6+
android:layout_height="wrap_content"
7+
android:minWidth="1200dip"
8+
android:layout_marginTop="20dip"
9+
android:layout_marginBottom="20dip"
10+
android:layout_marginLeft="20dip"
11+
android:layout_marginRight="20dip"
12+
>
13+
<TextView
14+
android:id="@+id/lbl_prompt"
15+
style="@style/TextAppearance.Medium"
16+
android:singleLine="false"
17+
android:maxLines="3"
18+
android:layout_margin="5dip"
19+
android:text="Page 34/1024 (25%) Chapter 1"
20+
android:layout_width="wrap_content"
21+
android:layout_height="wrap_content"/>
22+
<EditText
23+
android:id="@+id/input_field"
24+
android:layout_width="fill_parent"
25+
android:layout_height="wrap_content"
26+
android:layout_marginTop="10dip"
27+
android:layout_marginBottom="10dip"
28+
android:layout_marginLeft="10dip"
29+
android:layout_marginRight="10dip"
30+
style="@style/TextAppearance.Widget.EditText"
31+
android:singleLine="true"
32+
/>
33+
<SeekBar android:id="@+id/goto_position_seek_bar"
34+
android:layout_width="fill_parent"
35+
android:layout_height="wrap_content"
36+
android:layout_marginTop="8dip"
37+
android:layout_marginBottom="8dip"
38+
android:layout_marginLeft="2dip"
39+
android:layout_marginRight="8dip"
40+
android:padding="10dip"
41+
android:max="100"
42+
android:progress="50"
43+
android:progressDrawable="@drawable/seekbar_progressbar"
44+
android:thumb="@drawable/seekbar_thumb"
45+
/>
46+
</LinearLayout>

0 commit comments

Comments
 (0)