Skip to content

Commit bc76d4e

Browse files
committed
OPDS, manifest, bug fixes work
1 parent 251d87a commit bc76d4e

37 files changed

Lines changed: 1915 additions & 188 deletions

android/app/src/main/AndroidManifest.xml

Lines changed: 341 additions & 2 deletions
Large diffs are not rendered by default.

android/jni/cr3engine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ static bool GetBookProperties(const char *name, BookProperties * pBookProps)
273273
#endif
274274
lString16 authors = extractDocAuthors( &doc, lString16("|"), false );
275275
lString16 title = extractDocTitle( &doc );
276-
lString16 language = extractDocLanguage( &doc );
276+
lString16 language = extractDocLanguage( &doc ).lowercase();
277277
lString16 series = extractDocSeries( &doc, &pBookProps->seriesNumber );
278278
lString16 genre = extractDocGenre( &doc, lString16("|") );
279279
lString16 annotation = extractDocAnnotation( &doc );

android/res/layout/about_dialog_app.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
style="@style/TextAppearance.Small"
2525
android:gravity="left"
2626
android:layout_margin="2dip"
27+
android:textColor="?attr/colorIcon"
2728
android:layout_width="fill_parent" android:layout_height="wrap_content"/>
2829
</LinearLayout>
2930
</LinearLayout>
@@ -45,29 +46,35 @@
4546
android:layout_margin="4dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web"/>
4647
<TextView android:text="@string/third_party_components_used"
4748
android:id="@+id/thirdparty"
49+
android:textColor="?attr/colorIcon"
4850
style="@style/TextAppearance.Small"
4951
android:layout_margin="4dip" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
5052
<TextView android:text="@string/fontconfig_language_orthography_database"
5153
android:id="@+id/thirdparty2"
54+
android:textColor="?attr/colorIcon"
5255
style="@style/TextAppearance.Small"
5356
android:layout_margin="4dip" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
5457
<TextView android:text="@string/third_party_farm_fresh_icon_set"
5558
android:id="@+id/thirdparty3"
5659
style="@style/TextAppearance.Small"
60+
android:textColor="?attr/colorIcon"
5761
android:layout_margin="2dip" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
5862
<TextView android:text="CoffeeCatch> library: https://github.com/xroche/coffeecatch"
5963
android:id="@+id/thirdparty4"
64+
android:textColor="?attr/colorIcon"
6065
style="@style/TextAppearance.Small"
6166
android:layout_margin="2dip" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
6267
<TextView android:text="Metro vector icon set by"
6368
android:id="@+id/thirdparty6"
69+
android:textColor="?attr/colorIcon"
6470
style="@style/TextAppearance.Small"
6571
android:layout_margin="2dip" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
6672
<TextView android:text="https://icons8.com" android:id="@+id/www_icons8"
6773
style="@style/TextAppearance.Small"
6874
android:layout_margin="2dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web"/>
6975
<TextView android:text="With the help of code examples from projects (dic popup windows, shortcuts, intents): FBReader, Librera, AlReader, PocketBook"
7076
android:id="@+id/thirdparty7"
77+
android:textColor="?attr/colorIcon"
7178
style="@style/TextAppearance.Small"
7279
android:layout_margin="2dip" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
7380
</LinearLayout>

android/res/layout/about_dialog_dirs.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
android:layout_margin="4dip" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
1111
<TextView android:text="fonts_dir"
1212
android:id="@+id/fonts_dirs"
13+
android:textColor="?attr/colorIcon"
1314
style="@style/TextAppearance.Small"
1415
android:layout_margin="4dip" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
1516
<TextView android:text="@string/dlg_about_textures_dirs"
1617
android:id="@+id/textures_dir_header"
1718
style="@style/TextAppearance.Large"
1819
android:layout_margin="4dip" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
1920
<TextView android:text="textures_dir"
21+
android:textColor="?attr/colorIcon"
2022
android:id="@+id/textures_dirs"
2123
style="@style/TextAppearance.Small"
2224
android:layout_margin="4dip" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
@@ -25,6 +27,7 @@
2527
style="@style/TextAppearance.Large"
2628
android:layout_margin="4dip" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
2729
<TextView android:text="backgrounds_dir"
30+
android:textColor="?attr/colorIcon"
2831
android:id="@+id/backgrounds_dirs"
2932
style="@style/TextAppearance.Small"
3033
android:layout_margin="4dip" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
@@ -33,6 +36,7 @@
3336
style="@style/TextAppearance.Large"
3437
android:layout_margin="4dip" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
3538
<TextView android:text="hyph_dir"
39+
android:textColor="?attr/colorIcon"
3640
android:id="@+id/hyph_dirs"
3741
style="@style/TextAppearance.Small"
3842
android:layout_margin="4dip" android:layout_width="fill_parent" android:layout_height="wrap_content"/>

android/res/layout/about_dialog_donation.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
<LinearLayout android:orientation="vertical" android:id="@+id/LinearLayout01" android:layout_height="wrap_content" android:layout_width="fill_parent">
88
<TextView android:text="@string/dlg_about_donation"
99
style="@style/TextAppearance.Small"
10-
android:maxLines="6"
10+
android:maxLines="6"
11+
android:textColor="?attr/colorIcon"
1112
android:layout_margin="4dip"
1213
android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
1314
<LinearLayout android:orientation="horizontal" android:layout_height="wrap_content" android:layout_width="fill_parent">

android/res/layout/about_dialog_donation2.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
android:layout_height="wrap_content"
55
android:orientation="vertical">
66

7+
78
<LinearLayout
89
android:id="@+id/LinearLayout01"
910
android:layout_width="fill_parent"

android/res/layout/about_dialog_license.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
android:layout_width="match_parent"
99
android:layout_height="wrap_content"
1010
android:singleLine="false"
11+
android:textColor="?attr/colorIcon"
1112
android:text="Sample text"></TextView>
1213
</ScrollView>

0 commit comments

Comments
 (0)