Skip to content

Commit 83ae6a1

Browse files
committed
Book info fixes, minor interface improvements
2 parents c624be5 + 102407e commit 83ae6a1

58 files changed

Lines changed: 1716 additions & 169 deletions

Some content is hidden

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

android/AndroidManifest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
55
package="org.coolreader"
66
android:installLocation="auto"
7-
android:versionName="3.2.10-1" android:versionCode="2101">
7+
android:versionName="3.2.11-1" android:versionCode="2111">
88
<supports-screens
99
android:xlargeScreens="true"
1010
android:largeScreens="true"
@@ -28,8 +28,7 @@
2828
<!-- Required permission to use in-app billing. -->
2929
<uses-permission android:name="com.android.vending.BILLING" />
3030
<application android:label="@string/app_name"
31-
<!--android:name="android.support.multidex.MultiDexApplication" -->
32-
android:icon="@drawable/cr3_logo"
31+
android:icon="@mipmap/cr3_logo"
3332
android:allowClearUserData="true"
3433
android:process="org.coolreader"
3534
>

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
targetSdkVersion 26
99
// When new version released, version code must be incremented at least by 8
1010
// for compatibility with ABI versioning of split apk (see below).
11-
versionCode 2101
12-
versionName "3.2.10-1"
11+
versionCode 2111
12+
versionName "3.2.11-1"
1313
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1414
externalNativeBuild {
1515
cmake {
4.84 KB
Loading
1.83 KB
Loading
2.68 KB
Loading
7.43 KB
Loading
13.9 KB
Loading
21.7 KB
Loading

android/res/layout/about_dialog_app.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ImageView android:layout_width="wrap_content" android:layout_height="wrap_content"
77
android:layout_margin="8dip"
88
android:id="@+id/logo"
9-
android:src="?attr/attr_cr3_logo" android:layout_gravity="center_vertical|left">
9+
android:src="@mipmap/cr3_logo" android:layout_gravity="center_vertical|left">
1010
</ImageView>
1111
<LinearLayout android:orientation="vertical" android:id="@+id/LinearLayout03" android:layout_height="wrap_content" android:layout_width="fill_parent">
1212
<TextView android:text="Cool Reader 3.1" android:id="@+id/version" android:layout_width="fill_parent"

android/res/layout/book_info_edit_dialog.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,19 @@
9292
android:focusableInTouchMode="false"
9393
android:background="@null"
9494
android:contentDescription="@string/btn_shortcut"/>
95-
</LinearLayout>
95+
<ImageButton android:id="@+id/base_dlg_btn_positive"
96+
android:layout_width="wrap_content"
97+
android:layout_height="wrap_content"
98+
android:layout_marginTop="5dip"
99+
android:layout_marginBottom="5dip"
100+
android:layout_marginLeft="5dip"
101+
android:layout_marginRight="5dip"
102+
android:src="?attr/cr3_button_ok_drawable"
103+
android:focusable="false"
104+
android:focusableInTouchMode="false"
105+
android:background="@null"
106+
android:contentDescription="@string/dlg_button_ok"/>
107+
</LinearLayout>
96108
<LinearLayout
97109
android:orientation="horizontal"
98110
android:layout_width="fill_parent"

0 commit comments

Comments
 (0)