Skip to content

Commit 7fb23bd

Browse files
plotnplotn
committed
opds search, etc
1 parent 00711c4 commit 7fb23bd

32 files changed

Lines changed: 1244 additions & 248 deletions

‎android/res/drawable-hdpi/icons8_play_ell.png‎

996 Bytes
Loading

‎android/res/drawable-ldpi/icons8_play_ell.png‎

552 Bytes
Loading

‎android/res/drawable-mdpi/icons8_play_ell.png‎

697 Bytes
Loading

‎android/res/drawable-xhdpi/icons8_play_ell.png‎

1.27 KB
Loading

‎android/res/drawable-xxhdpi/icons8_play_ell.png‎

1.85 KB
Loading

‎android/res/drawable-xxxhdpi/icons8_play_ell.png‎

2.5 KB
Loading

‎android/res/layout/book_info_dialog.xml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,55 @@
1010
android:layout_height="match_parent"
1111
android:orientation="vertical">
1212

13+
<TableLayout
14+
android:id="@+id/tl_action_info"
15+
style="@style/TextAppearance.Small"
16+
android:layout_width="fill_parent"
17+
android:layout_height="wrap_content"
18+
android:stretchColumns="1"
19+
android:layout_weight="10"
20+
android:layout_margin="2dp"
21+
>
22+
<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
23+
android:layout_margin="2dip"
24+
android:layout_width="fill_parent"
25+
android:layout_height="wrap_content"
26+
android:layout_weight="1"
27+
>
28+
<LinearLayout
29+
android:layout_width="0dip"
30+
android:layout_height="fill_parent"
31+
android:gravity="left|center_vertical"
32+
android:layout_weight="2"
33+
android:orientation="horizontal">
34+
<TextView
35+
android:id="@+id/lbl_action"
36+
style="@style/TextAppearance.Medium"
37+
android:layout_width="wrap_content"
38+
android:layout_height="wrap_content"
39+
android:layout_margin="4dip"
40+
android:singleLine="false"
41+
android:maxLines="5"
42+
android:textColor="?attr/colorIcon"
43+
android:text="action..." />
44+
</LinearLayout>
45+
<LinearLayout
46+
android:layout_width="0dip"
47+
android:layout_height="fill_parent"
48+
android:gravity="left"
49+
android:layout_weight="1"
50+
android:orientation="horizontal">
51+
<Button
52+
android:id="@+id/ib_action"
53+
android:layout_width="wrap_content"
54+
android:layout_height="wrap_content"
55+
android:layout_margin="2dip"
56+
android:tag="tint"
57+
android:contentDescription="@null"
58+
android:text="action..." />
59+
</LinearLayout>
60+
</TableRow>
61+
</TableLayout>
1362
<uk.co.deanwild.flowtextview.FlowTextView
1463
android:id="@+id/lbl_annotation"
1564
style="@style/TextAppearance.Small"

‎android/res/layout/book_info_edit_dialog.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@
480480
<TableRow >
481481
<EditText
482482
android:id="@+id/book_series_name"
483-
android:layout_width="fill_parent"
483+
android:layout_width="0dip"
484484
android:layout_height="wrap_content"
485485
android:layout_weight="4"
486486
android:text="Series"
@@ -497,11 +497,11 @@
497497
android:gravity="right"
498498
android:textColor="?attr/colorIcon"
499499
android:layout_weight="1"
500-
android:layout_width="wrap_content"
500+
android:layout_width="0dip"
501501
android:layout_height="wrap_content"/>
502502
<EditText
503503
android:id="@+id/book_series_number"
504-
android:layout_width="fill_parent"
504+
android:layout_width="0dip"
505505
android:layout_height="wrap_content"
506506
android:layout_weight="2"
507507
android:text="10"
@@ -548,7 +548,7 @@
548548
<TableRow >
549549
<EditText
550550
android:id="@+id/book_lang_from"
551-
android:layout_width="fill_parent"
551+
android:layout_width="0dip"
552552
android:layout_height="wrap_content"
553553
android:layout_weight="3"
554554
android:text="en"
@@ -565,11 +565,11 @@
565565
android:gravity="center"
566566
android:textColor="?attr/colorIcon"
567567
android:layout_weight="1"
568-
android:layout_width="fill_parent"
568+
android:layout_width="0dip"
569569
android:layout_height="wrap_content"/>
570570
<EditText
571571
android:id="@+id/book_lang_to"
572-
android:layout_width="fill_parent"
572+
android:layout_width="0dip"
573573
android:layout_height="wrap_content"
574574
android:layout_weight="3"
575575
android:text="ru"
@@ -1264,7 +1264,7 @@
12641264
android:text="@string/book_info_book_publseries_name"
12651265
android:textColor="?attr/colorIcon"
12661266
android:layout_weight="3"
1267-
android:layout_width="wrap_content"
1267+
android:layout_width="0dip"
12681268
android:layout_height="wrap_content"/>
12691269
</LinearLayout>
12701270
<LinearLayout
@@ -1279,7 +1279,7 @@
12791279
<TableRow >
12801280
<EditText
12811281
android:id="@+id/book_publseries_name"
1282-
android:layout_width="fill_parent"
1282+
android:layout_width="0dip"
12831283
android:layout_height="wrap_content"
12841284
android:layout_weight="4"
12851285
android:text="publseries"
@@ -1296,11 +1296,11 @@
12961296
android:gravity="right"
12971297
android:textColor="?attr/colorIcon"
12981298
android:layout_weight="1"
1299-
android:layout_width="wrap_content"
1299+
android:layout_width="0dip"
13001300
android:layout_height="wrap_content"/>
13011301
<EditText
13021302
android:id="@+id/book_publseries_number"
1303-
android:layout_width="fill_parent"
1303+
android:layout_width="0dip"
13041304
android:layout_height="wrap_content"
13051305
android:layout_weight="2"
13061306
android:text="10"

‎android/res/layout/book_opds_search_dialog.xml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TableLayout
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:layout_width="fill_parent"
5+
android:layout_height="wrap_content"
6+
android:layout_marginLeft="4dip"
7+
android:layout_marginRight="4dip"
8+
android:stretchColumns="1"
9+
>
10+
<TextView
11+
android:id="@+id/search_status"
12+
android:layout_width="fill_parent"
13+
android:layout_height="wrap_content"
14+
android:textColor="?attr/colorIcon"
15+
style="@style/TextAppearance.Small"
16+
android:text="@string/dlg_book_search_prompt"
17+
android:layout_marginLeft="4dip"
18+
android:layout_marginRight="4dip"
19+
/>
20+
<TableRow>
21+
<TextView
22+
android:textColor="?attr/colorIcon"
23+
android:layout_width="wrap_content"
24+
android:layout_height="wrap_content"
25+
style="@style/TextAppearance.Small"
26+
android:text="@string/dlg_book_search_terms"
27+
android:layout_marginLeft="4dip"
28+
android:layout_marginRight="4dip"
29+
/>
30+
<EditText
31+
android:id="@+id/search_text_terms"
32+
android:layout_width="fill_parent"
33+
android:layout_height="wrap_content"
34+
android:text=""
35+
android:layout_marginLeft="4dip"
36+
android:layout_marginRight="4dip"
37+
style="@style/TextAppearance.Widget.EditText"
38+
android:editable="true" android:hint="@string/dlg_search_hint" android:singleLine="true"
39+
/>
40+
</TableRow>
41+
</TableLayout>

‎android/res/layout/picture_came_dialog.xml‎

Lines changed: 74 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -67,49 +67,89 @@
6767
android:layout_width="0dip"
6868
android:layout_weight="2"
6969
android:layout_height="wrap_content">
70-
<Button
71-
android:id="@+id/ib_copy_to_texture"
72-
android:layout_width="fill_parent"
70+
<TextView
71+
android:id="@+id/lbl_this_is"
72+
style="@style/TextAppearance.Medium"
73+
android:layout_width="wrap_content"
7374
android:layout_height="wrap_content"
74-
android:layout_marginBottom="2dip"
75-
android:drawableLeft="?attr/attr_icons8_texture"
76-
android:tag="tint"
77-
android:contentDescription="@null"
78-
android:text="@string/pic_copy_texture" />
79-
<Button
80-
android:id="@+id/ib_copy_to_texture_act"
81-
android:layout_width="fill_parent"
75+
android:layout_margin="5dip"
76+
android:singleLine="true"
77+
android:textColor="?attr/colorIcon"
78+
android:text="@string/pic_came_this_is" />
79+
<TableLayout
80+
android:id="@+id/tl_pic_type"
81+
android:layout_width="match_parent"
8282
android:layout_height="wrap_content"
83-
android:layout_marginBottom="2dip"
84-
android:drawableLeft="?attr/attr_icons8_texture"
85-
android:tag="tint"
86-
android:contentDescription="@null"
87-
android:text="@string/pic_copy_texture_activate" />
88-
<Button
89-
android:id="@+id/ib_copy_to_background"
90-
android:layout_width="fill_parent"
83+
android:stretchColumns="1"
84+
android:orientation="vertical">
85+
<TableRow
86+
android:layout_weight="1"
87+
>
88+
<Button
89+
android:id="@+id/ib_texture"
90+
android:layout_width="0dip"
91+
android:layout_weight="1"
92+
android:layout_height="fill_parent"
93+
android:layout_marginBottom="2dip"
94+
android:tag="tint"
95+
android:contentDescription="@null"
96+
android:text="@string/pic_came_texture" />
97+
<Button
98+
android:id="@+id/ib_background"
99+
android:layout_width="0dip"
100+
android:layout_weight="1"
101+
android:layout_height="fill_parent"
102+
android:layout_marginBottom="2dip"
103+
android:tag="tint"
104+
android:contentDescription="@null"
105+
android:text="@string/pic_came_background" />
106+
</TableRow>
107+
</TableLayout>
108+
<TextView
109+
android:id="@+id/lbl_do_an_action"
110+
style="@style/TextAppearance.Medium"
111+
android:layout_width="wrap_content"
91112
android:layout_height="wrap_content"
92-
android:layout_marginBottom="2dip"
93-
android:drawableLeft="?attr/attr_icons8_texture"
94-
android:tag="tint"
95-
android:contentDescription="@null"
96-
android:text="@string/pic_copy_background" />
97-
<Button
98-
android:id="@+id/ib_copy_to_background_act"
99-
android:layout_width="fill_parent"
113+
android:layout_margin="5dip"
114+
android:singleLine="true"
115+
android:textColor="?attr/colorIcon"
116+
android:text="@string/pic_do_an_action" />
117+
<TableLayout
118+
android:id="@+id/tl_pic_apply"
119+
android:layout_width="match_parent"
100120
android:layout_height="wrap_content"
101-
android:layout_marginBottom="2dip"
102-
android:drawableLeft="?attr/attr_icons8_texture"
103-
android:tag="tint"
104-
android:contentDescription="@null"
105-
android:text="@string/pic_copy_background_activate" />
121+
android:stretchColumns="1"
122+
android:orientation="vertical">
123+
<TableRow
124+
android:layout_weight="1"
125+
>
126+
<Button
127+
android:id="@+id/ib_copy"
128+
android:layout_width="0dip"
129+
android:layout_weight="1"
130+
android:layout_height="fill_parent"
131+
android:layout_marginBottom="2dip"
132+
android:tag="tint"
133+
android:contentDescription="@null"
134+
android:text="@string/pic_copy" />
135+
<Button
136+
android:id="@+id/ib_copy_activate"
137+
android:layout_width="0dip"
138+
android:layout_weight="1"
139+
android:layout_height="fill_parent"
140+
android:layout_marginBottom="2dip"
141+
android:tag="tint"
142+
android:contentDescription="@null"
143+
android:text="@string/pic_copy_activate" />
144+
</TableRow>
145+
</TableLayout>
146+
106147
<Button
107148
android:id="@+id/ib_save_for_later"
108149
android:layout_width="fill_parent"
109150
android:layout_height="wrap_content"
110151
android:layout_marginBottom="2dip"
111-
android:drawableLeft="?attr/attr_icons8_texture"
112-
android:tag="tint"
152+
android:tag="tint"
113153
android:contentDescription="@null"
114154
android:text="@string/pic_remember_for_later" />
115155
</LinearLayout>

0 commit comments

Comments
 (0)