Skip to content

Commit e4548c4

Browse files
plotnplotn
committed
Dic works, KOReader merging, etc.
1 parent 9aade42 commit e4548c4

File tree

79 files changed

+178205
-47512
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+178205
-47512
lines changed

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ android {
1313
multiDexEnabled true
1414
// When new version released, version code must be incremented at least by 8
1515
// for compatibility with ABI versioning of split apk (see below).
16-
versionCode 202203261
17-
versionName "2022.03.26.1"
16+
versionCode 202204071
17+
versionName "2022.04.07.1"
1818
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1919
externalNativeBuild {
2020
cmake {

‎android/res/layout/ext_dic_dlg.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,18 @@
129129
android:layout_marginRight="4dip"
130130
>
131131
</org.coolreader.crengine.MaxHeightLinearLayout>
132+
133+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
134+
android:id="@+id/items_list2"
135+
android:orientation="vertical"
136+
android:layout_weight="8"
137+
android:layout_width="fill_parent"
138+
android:layout_height="fill_parent"
139+
android:baselineAligned="false"
140+
android:layout_marginTop="8dip"
141+
android:layout_marginBottom="8dip"
142+
android:layout_marginLeft="4dip"
143+
android:layout_marginRight="4dip"
144+
>
145+
</LinearLayout>
132146
</LinearLayout>

‎android/res/layout/selection_toolbar_wide_buttons_row.xml‎

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:id="@+id/ll_buttons_row"
5+
android:orientation="vertical"
6+
android:layout_width="fill_parent"
7+
android:layout_height="wrap_content"
8+
android:baselineAligned="true"
9+
>
10+
<LinearLayout
11+
android:id="@+id/ll_first_buttons_row"
12+
android:orientation="horizontal"
13+
android:layout_width="fill_parent"
14+
android:layout_height="wrap_content"
15+
android:baselineAligned="true"
16+
>
17+
18+
<ImageButton android:id="@+id/selection_copy"
19+
android:layout_width="0dip" android:layout_weight="3"
20+
android:layout_height="match_parent"
21+
android:src="?attr/attr_icons8_copy"
22+
android:tag="tint"
23+
android:minHeight="?android:attr/listPreferredItemHeight"
24+
android:minWidth="?android:attr/listPreferredItemHeight"
25+
android:layout_marginTop="2dip"
26+
android:layout_marginBottom="2dip"
27+
android:layout_marginLeft="1dip"
28+
android:layout_marginRight="1dip"
29+
android:contentDescription="@string/options_selection_action_copy"/>
30+
<ImageButton android:id="@+id/selection_dict"
31+
android:layout_width="0dip" android:layout_weight="3"
32+
android:layout_height="match_parent"
33+
android:src="?attr/attr_icons8_google_translate"
34+
android:tag="tint"
35+
android:minHeight="?android:attr/listPreferredItemHeight"
36+
android:minWidth="?android:attr/listPreferredItemHeight"
37+
android:layout_marginTop="2dip"
38+
android:layout_marginBottom="2dip"
39+
android:layout_marginLeft="1dip"
40+
android:layout_marginRight="1dip"
41+
android:contentDescription="@string/options_selection_action_dictionary"/>
42+
<ImageButton android:id="@+id/btn_quick_bookmark"
43+
android:layout_width="0dip" android:layout_weight="3"
44+
android:layout_height="match_parent"
45+
android:src="?attr/attr_icons8_bookmark_simple_fast_add"
46+
android:tag="tint"
47+
android:minHeight="?android:attr/listPreferredItemHeight"
48+
android:minWidth="?android:attr/listPreferredItemHeight"
49+
android:layout_marginTop="2dip"
50+
android:layout_marginBottom="2dip"
51+
android:layout_marginLeft="1dip"
52+
android:layout_marginRight="1dip"
53+
android:contentDescription="@string/save_bookmark_quick"/>
54+
<ImageButton android:id="@+id/selection_cite"
55+
android:layout_width="0dip" android:layout_weight="3"
56+
android:layout_height="match_parent"
57+
android:src="?attr/attr_icons8_quote_2"
58+
android:tag="tint"
59+
android:minHeight="?android:attr/listPreferredItemHeight"
60+
android:minWidth="?android:attr/listPreferredItemHeight"
61+
android:layout_marginTop="2dip"
62+
android:layout_marginBottom="2dip"
63+
android:layout_marginLeft="1dip"
64+
android:layout_marginRight="1dip"/>
65+
<ImageButton android:id="@+id/selection_find"
66+
android:layout_width="0dip" android:layout_weight="3"
67+
android:layout_height="match_parent"
68+
android:minHeight="?android:attr/listPreferredItemHeight"
69+
android:minWidth="?android:attr/listPreferredItemHeight"
70+
android:layout_marginTop="2dip"
71+
android:layout_marginBottom="2dip"
72+
android:layout_marginLeft="1dip"
73+
android:layout_marginRight="1dip"
74+
android:src="?attr/cr3_viewer_find_drawable"
75+
android:tag="tint"
76+
android:contentDescription="@string/dlg_button_find"/>
77+
<ImageButton android:id="@+id/selection_email"
78+
android:layout_width="0dip" android:layout_weight="3"
79+
android:layout_height="match_parent"
80+
android:minHeight="?android:attr/listPreferredItemHeight"
81+
android:minWidth="?android:attr/listPreferredItemHeight"
82+
android:layout_marginTop="2dip"
83+
android:layout_marginBottom="2dip"
84+
android:layout_marginLeft="1dip"
85+
android:layout_marginRight="1dip"
86+
android:src="?attr/attr_icons8_share"
87+
android:tag="tint"
88+
android:contentDescription="@string/options_selection_action_mail"/>
89+
<ImageButton android:id="@+id/btn_correction"
90+
android:layout_width="0dip" android:layout_weight="3"
91+
android:layout_height="match_parent"
92+
android:src="?attr/attr_icons8_edit_row_2"
93+
android:tag="tint"
94+
android:minHeight="?android:attr/listPreferredItemHeight"
95+
android:minWidth="?android:attr/listPreferredItemHeight"
96+
android:layout_marginTop="2dip"
97+
android:layout_marginBottom="2dip"
98+
android:layout_marginLeft="1dip"
99+
android:layout_marginRight="1dip"/>
100+
<ImageButton android:id="@+id/btn_dic_list"
101+
android:layout_width="0dip" android:layout_weight="3"
102+
android:layout_height="match_parent"
103+
android:minHeight="?android:attr/listPreferredItemHeight"
104+
android:minWidth="?android:attr/listPreferredItemHeight"
105+
android:layout_marginTop="2dip"
106+
android:layout_marginBottom="2dip"
107+
android:layout_marginLeft="1dip"
108+
android:layout_marginRight="1dip"
109+
android:src="?attr/attr_icons8_dic_list"
110+
android:tag="tint"/>
111+
<ImageButton android:id="@+id/selection_bookmark"
112+
android:layout_width="0dip" android:layout_weight="3"
113+
android:layout_height="match_parent"
114+
android:layout_marginTop="2dip"
115+
android:layout_marginBottom="2dip"
116+
android:layout_marginLeft="1dip"
117+
android:layout_marginRight="1dip"
118+
android:src="?attr/attr_icons8_bookmark_simple_add"
119+
android:tag="tint"
120+
android:contentDescription="@string/options_selection_action_bookmark"/>
121+
<ImageButton android:id="@+id/btn_user_dic"
122+
android:layout_width="0dip" android:layout_weight="3"
123+
android:layout_height="match_parent"
124+
android:layout_marginTop="2dip"
125+
android:layout_marginBottom="2dip"
126+
android:layout_marginLeft="1dip"
127+
android:layout_marginRight="1dip"
128+
android:src="?attr/attr_icons8_google_translate_user"
129+
android:tag="tint"
130+
android:contentDescription="@string/options_selection_action_bookmark"/>
131+
<ImageButton android:id="@+id/btn_web_search"
132+
android:layout_width="0dip" android:layout_weight="3"
133+
android:layout_height="match_parent"
134+
android:minHeight="?android:attr/listPreferredItemHeight"
135+
android:minWidth="?android:attr/listPreferredItemHeight"
136+
android:layout_marginTop="2dip"
137+
android:layout_marginBottom="2dip"
138+
android:layout_marginLeft="1dip"
139+
android:layout_marginRight="1dip"
140+
android:src="?attr/attr_icons8_web_search"
141+
android:tag="tint"/>
142+
<ImageButton android:id="@+id/btn_combo"
143+
android:layout_width="0dip" android:layout_weight="3"
144+
android:layout_height="match_parent"
145+
android:minHeight="?android:attr/listPreferredItemHeight"
146+
android:minWidth="?android:attr/listPreferredItemHeight"
147+
android:layout_marginTop="2dip"
148+
android:layout_marginBottom="2dip"
149+
android:layout_marginLeft="1dip"
150+
android:layout_marginRight="1dip"
151+
android:src="?attr/attr_icons8_combo"
152+
android:tag="tint"/>
153+
<ImageButton android:id="@+id/btn_super_combo"
154+
android:layout_width="0dip" android:layout_weight="3"
155+
android:layout_height="match_parent"
156+
android:minHeight="?android:attr/listPreferredItemHeight"
157+
android:minWidth="?android:attr/listPreferredItemHeight"
158+
android:layout_marginTop="2dip"
159+
android:layout_marginBottom="2dip"
160+
android:layout_marginLeft="1dip"
161+
android:layout_marginRight="1dip"
162+
android:src="?attr/attr_icons8_super_combo"
163+
android:tag="tint"/>
164+
</LinearLayout>
165+
</LinearLayout>

‎android/res/menu/cr3_file_browser_recent_context_menu.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<item android:title="@string/mi_book_shortcut" android:titleCondensed="@string/mi_book_shortcut" android:id="@+id/book_shortcut"></item>
1414
<item android:title="@string/mi_book_to_cloud" android:titleCondensed="@string/mi_book_to_cloud" android:id="@+id/book_to_gd"></item>
1515
<item android:title="@string/mi_book_to_email" android:titleCondensed="@string/mi_book_to_email" android:id="@+id/book_to_email"></item>
16-
<item android:title="@string/mi_book_no_mark" android:titleCondensed="@string/mi_book_no_mark" android:id="@+id/book_no_mark"></item>
1716
<item android:title="@string/mi_book_to_read" android:titleCondensed="@string/mi_book_to_read" android:id="@+id/book_to_read"></item>
1817
<item android:title="@string/mi_book_reading" android:titleCondensed="@string/mi_book_reading" android:id="@+id/book_reading"></item>
1918
<item android:title="@string/mi_book_finished" android:titleCondensed="@string/mi_book_finished" android:id="@+id/book_finished"></item>
19+
<item android:title="@string/mi_book_no_mark" android:titleCondensed="@string/mi_book_no_mark" android:id="@+id/book_no_mark"></item>
2020
<item android:title="@string/mi_book_rate_5" android:titleCondensed="@string/mi_book_rate_5" android:id="@+id/book_rate_5"></item>
2121
<item android:title="@string/mi_book_rate_4" android:titleCondensed="@string/mi_book_rate_4" android:id="@+id/book_rate_4"></item>
2222
<item android:title="@string/mi_book_rate_3" android:titleCondensed="@string/mi_book_rate_3" android:id="@+id/book_rate_3"></item>

0 commit comments

Comments
 (0)