Skip to content

Commit cfe5b61

Browse files
plotnplotn
committed
internal links
1 parent 44a55bb commit cfe5b61

6 files changed

Lines changed: 382 additions & 187 deletions

File tree

‎android/res/layout/open_book_from_gd_dialog.xml‎

Lines changed: 66 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,91 @@
77
xmlns:android="http://schemas.android.com/apk/res/android"
88
android:orientation="vertical"
99
android:layout_width="fill_parent"
10-
android:layout_height="wrap_content">
10+
android:layout_height="wrap_content"
11+
android:layout_marginTop="3dip"
12+
android:layout_marginBottom="3dip"
13+
android:layout_marginLeft="2dip"
14+
android:layout_marginRight="2dip"
15+
>
1116

17+
<TextView
18+
android:id="@+id/lbl_folder_text"
19+
style="@style/TextAppearance.Medium"
20+
android:layout_width="match_parent"
21+
android:layout_height="wrap_content"
22+
android:singleLine="true"
23+
android:ellipsize="middle"
24+
android:text="folder text text text text text text text text text text text" />
25+
26+
27+
<LinearLayout
28+
xmlns:android="http://schemas.android.com/apk/res/android"
29+
android:orientation="horizontal"
30+
android:layout_width="fill_parent"
31+
android:layout_height="wrap_content">
32+
<TextView
33+
android:id="@+id/lbl_find_text"
34+
style="@style/TextAppearance.Medium"
35+
android:layout_width="wrap_content"
36+
android:layout_height="wrap_content"
37+
android:maxLines="3"
38+
android:singleLine="false"
39+
android:text="@string/lbl_find" />
40+
41+
<EditText
42+
android:id="@+id/find_text"
43+
style="@style/TextAppearance.Widget.EditText"
44+
android:layout_width="fill_parent"
45+
android:layout_height="wrap_content"
46+
android:inputType="none"
47+
android:singleLine="false"
48+
android:text="find text" />
49+
</LinearLayout>
1250
<RadioGroup
1351
android:id="@+id/rg_scope"
1452
android:layout_width="fill_parent"
1553
android:layout_height="wrap_content"
1654
android:orientation="horizontal">
17-
55+
<ImageButton android:id="@+id/goto_root"
56+
android:layout_width="wrap_content"
57+
android:layout_height="wrap_content"
58+
android:layout_marginTop="5dip"
59+
android:layout_marginBottom="5dip"
60+
android:layout_marginLeft="5dip"
61+
android:layout_marginRight="5dip"
62+
android:src="?attr/cr3_browser_folder_root_drawable"
63+
android:focusable="false"
64+
android:focusableInTouchMode="false"
65+
android:background="@null"
66+
android:contentDescription="root"/>
1867
<RadioButton
19-
android:id="@+id/rb_page"
68+
android:id="@+id/rb_whole"
2069
android:layout_width="wrap_content"
2170
android:layout_height="wrap_content"
2271
android:checked="true"
2372
android:layout_weight="1"
24-
android:text="@string/dlg_userdic_page" />
73+
android:text="@string/dlg_whole_gd" />
2574
<RadioButton
26-
android:id="@+id/rb_book"
75+
android:id="@+id/rb_folder"
2776
android:layout_width="wrap_content"
2877
android:layout_height="wrap_content"
2978
android:checked="false"
3079
android:layout_weight="1"
31-
android:text="@string/dlg_userdic_book" />
32-
<RadioButton
33-
android:id="@+id/rb_userdic_all"
80+
android:text="@string/dlg_folder_gd" />
81+
<ImageButton android:id="@+id/do_find"
3482
android:layout_width="wrap_content"
3583
android:layout_height="wrap_content"
36-
android:checked="false"
37-
android:layout_weight="1"
38-
android:text="@string/dlg_userdic_all" />
84+
android:layout_marginTop="5dip"
85+
android:layout_marginBottom="5dip"
86+
android:layout_marginLeft="5dip"
87+
android:layout_marginRight="5dip"
88+
android:src="?attr/cr3_button_ok_drawable"
89+
android:focusable="true"
90+
android:focusableInTouchMode="true"
91+
android:background="@null"
92+
android:contentDescription="@string/lbl_find"/>
3993

4094
</RadioGroup>
41-
42-
4395
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
4496
android:id="@+id/layout_clear_hist"
4597
android:orientation="horizontal"
@@ -53,7 +105,7 @@
53105
>
54106

55107
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
56-
android:id="@+id/userdic_list"
108+
android:id="@+id/book_list"
57109
android:orientation="vertical"
58110
android:layout_weight="8"
59111
android:layout_width="fill_parent"

‎android/res/layout/open_book_from_gd_item.xml‎

Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,46 @@
1515
android:layout_marginRight="2dip"
1616
>
1717

18-
<LinearLayout
19-
android:id="@+id/userdic_item_text"
20-
android:orientation="vertical"
21-
android:layout_width="fill_parent"
22-
android:layout_height="wrap_content"
23-
android:layout_gravity="center_vertical|fill_horizontal"
24-
android:baselineAligned="false"
25-
android:layout_marginTop="3dip"
26-
android:layout_marginBottom="3dip"
27-
android:layout_marginLeft="8dip"
28-
android:layout_marginRight="8dip"
29-
>
30-
31-
32-
<TextView android:id="@+id/userdic_word"
33-
style="@android:style/TextAppearance.Small"
34-
android:layout_width="wrap_content"
18+
<LinearLayout
19+
android:id="@+id/openbook_item_text"
20+
android:orientation="vertical"
21+
android:layout_width="fill_parent"
3522
android:layout_height="wrap_content"
36-
android:text="Position text bla bla bla bla bla more llines more more more lines"
37-
android:singleLine="false"
38-
android:maxLines="3"
39-
android:textStyle="bold"
40-
android:ellipsize="end"
41-
android:layout_gravity="left" />
42-
<TextView android:id="@+id/userdic_word_translate"
43-
style="@android:style/TextAppearance.Small"
44-
android:layout_width="wrap_content"
45-
android:layout_height="wrap_content"
46-
android:text="Position text bla bla bla bla bla..."
47-
android:singleLine="false"
48-
android:maxLines="6"
49-
android:ellipsize="end"
50-
android:layout_gravity="left" />
51-
</LinearLayout>
23+
android:layout_gravity="center_vertical|fill_horizontal"
24+
android:baselineAligned="false"
25+
android:layout_marginTop="3dip"
26+
android:layout_marginBottom="3dip"
27+
android:layout_marginLeft="8dip"
28+
android:layout_marginRight="8dip"
29+
>
30+
31+
<TextView android:id="@+id/file_name"
32+
style="@android:style/TextAppearance.Small"
33+
android:layout_width="wrap_content"
34+
android:layout_height="wrap_content"
35+
android:text="Position text bla bla bla bla bla more llines more more more lines"
36+
android:singleLine="false"
37+
android:maxLines="3"
38+
android:textStyle="bold"
39+
android:ellipsize="end"
40+
android:layout_gravity="left" />
41+
<TextView android:id="@+id/file_time"
42+
style="@android:style/TextAppearance.Small"
43+
android:layout_width="wrap_content"
44+
android:layout_height="wrap_content"
45+
android:text="Position text bla bla bla bla bla..."
46+
android:singleLine="false"
47+
android:maxLines="6"
48+
android:ellipsize="end"
49+
android:layout_gravity="left" />
50+
<TextView android:id="@+id/file_descr"
51+
style="@android:style/TextAppearance.Small"
52+
android:layout_width="wrap_content"
53+
android:layout_height="wrap_content"
54+
android:text="Position text bla bla bla bla bla..."
55+
android:singleLine="false"
56+
android:maxLines="6"
57+
android:ellipsize="end"
58+
android:layout_gravity="left" />
59+
</LinearLayout>
5260
</LinearLayout>

‎android/res/layout/open_book_from_gd_item1.xml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,5 @@
3838
android:textStyle="bold"
3939
android:ellipsize="end"
4040
android:layout_gravity="left" />
41-
<TextView android:id="@+id/file_time"
42-
style="@android:style/TextAppearance.Small"
43-
android:layout_width="wrap_content"
44-
android:layout_height="wrap_content"
45-
android:text="Position text bla bla bla bla bla..."
46-
android:singleLine="false"
47-
android:maxLines="6"
48-
android:ellipsize="end"
49-
android:layout_gravity="left" />
50-
<TextView android:id="@+id/file_descr"
51-
style="@android:style/TextAppearance.Small"
52-
android:layout_width="wrap_content"
53-
android:layout_height="wrap_content"
54-
android:text="Position text bla bla bla bla bla..."
55-
android:singleLine="false"
56-
android:maxLines="6"
57-
android:ellipsize="end"
58-
android:layout_gravity="left" />
5941
</LinearLayout>
6042
</LinearLayout>

‎android/res/layout/open_book_from_gd_item2.xml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@
4747
android:maxLines="6"
4848
android:ellipsize="end"
4949
android:layout_gravity="left" />
50-
<TextView android:id="@+id/file_descr"
51-
style="@android:style/TextAppearance.Small"
52-
android:layout_width="wrap_content"
53-
android:layout_height="wrap_content"
54-
android:text="Position text bla bla bla bla bla..."
55-
android:singleLine="false"
56-
android:maxLines="6"
57-
android:ellipsize="end"
58-
android:layout_gravity="left" />
50+
5951
</LinearLayout>
6052
</LinearLayout>

‎android/res/layout/option_item_2text.xml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,23 @@
3434
android:textAppearance="?android:attr/textAppearanceLarge"
3535
android:maxLines="3"
3636
/>
37+
<TextView android:id="@+id/option_label2"
38+
android:layout_width="wrap_content"
39+
android:layout_height="wrap_content"
40+
android:singleLine="false"
41+
android:layout_below="@id/option_label"
42+
android:layout_alignLeft="@id/option_label"
43+
android:textAppearance="?android:attr/textAppearanceMedium"
44+
android:maxLines="3"
45+
/>
3746
<!--android:ellipsize="marquee"
3847
android:fadingEdge="horizontal"
3948
-->
4049
<TextView android:id="@+id/option_value"
4150
android:layout_width="wrap_content"
4251
android:layout_height="wrap_content"
43-
android:layout_below="@id/option_label"
44-
android:layout_alignLeft="@id/option_label"
52+
android:layout_below="@id/option_label2"
53+
android:layout_alignLeft="@id/option_label2"
4554
android:textAppearance="?android:attr/textAppearanceSmall"
4655
android:textColor="?android:attr/textColorSecondary"
4756
android:maxLines="4" />

0 commit comments

Comments
 (0)