Book info fixes, minor interface improvements

android/AndroidManifest.xml

@@ -4,7 +4,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.coolreader"
       android:installLocation="auto"
-      android:versionName="3.2.10-1" android:versionCode="2101">
+      android:versionName="3.2.11-1" android:versionCode="2111">
     <supports-screens
         android:xlargeScreens="true"
         android:largeScreens="true"
@@ -28,8 +28,7 @@
     <!-- Required permission to use in-app billing. -->
     <uses-permission android:name="com.android.vending.BILLING" />
     <application android:label="@string/app_name"
-        <!--android:name="android.support.multidex.MultiDexApplication" -->
-        android:icon="@drawable/cr3_logo"
+        android:icon="@mipmap/cr3_logo"
         android:allowClearUserData="true"
         android:process="org.coolreader"
         >

android/app/build.gradle

@@ -8,8 +8,8 @@ android {
         targetSdkVersion 26
         // When new version released, version code must be incremented at least by 8
         // for compatibility with ABI versioning of split apk (see below).
-        versionCode 2101
-        versionName "3.2.10-1"
+        versionCode 2111
+        versionName "3.2.11-1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

android/res/layout/about_dialog_app.xml

@@ -6,7 +6,7 @@
 		<ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" 
 	        android:layout_margin="8dip"
 			android:id="@+id/logo" 
-			android:src="?attr/attr_cr3_logo" android:layout_gravity="center_vertical|left">
+			android:src="@mipmap/cr3_logo" android:layout_gravity="center_vertical|left">
 		</ImageView>
 		<LinearLayout android:orientation="vertical" android:id="@+id/LinearLayout03" android:layout_height="wrap_content" android:layout_width="fill_parent">
 			<TextView android:text="Cool Reader 3.1" android:id="@+id/version" android:layout_width="fill_parent" 

android/res/layout/book_info_edit_dialog.xml

@@ -92,7 +92,19 @@
 				android:focusableInTouchMode="false"
 				android:background="@null"
 				android:contentDescription="@string/btn_shortcut"/>
-	    </LinearLayout>
+            <ImageButton android:id="@+id/base_dlg_btn_positive"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dip"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="5dip"
+                android:layout_marginRight="5dip"
+                android:src="?attr/cr3_button_ok_drawable"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
+                android:background="@null"
+                android:contentDescription="@string/dlg_button_ok"/>
+        </LinearLayout>
         <LinearLayout 
             android:orientation="horizontal"
             android:layout_width="fill_parent"

android/res/layout/selection_toolbar.xml

@@ -7,6 +7,11 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
+	android:background="?attr/colorThemeGray2"
+	android:layout_marginTop="3dip"
+	android:layout_marginBottom="3dip"
+	android:layout_marginLeft="3dip"
+	android:layout_marginRight="3dip"
     android:baselineAligned="true"
     >
 

android/res/layout/tts_toolbar.xml

@@ -9,7 +9,9 @@
     android:background="?attr/colorThemeGray2"
     android:layout_marginTop="3dip"
     android:layout_marginBottom="3dip"
-    android:baselineAligned="true" android:layout_height="wrap_content">
+	android:layout_marginLeft="3dip"
+	android:layout_marginRight="3dip"
+	android:baselineAligned="true" android:layout_height="wrap_content">
 
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	    android:id="@+id/tts_toolbar_buttons"

android/res/menu/cr3_file_browser_file_context_menu.xml

@@ -2,7 +2,20 @@
 <!-- Context menu for physical folder -->
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:title="@string/mi_folder_open" android:titleCondensed="@string/mi_folder_open" android:id="@+id/folder_open"></item>
-<item android:title="@string/mi_folder_to_favorites" android:titleCondensed="@string/mi_folder_to_favorites" android:id="@+id/folder_to_favorites"></item>
-<item android:title="@string/mi_book_root" android:titleCondensed="@string/mi_book_root" android:id="@+id/book_root"></item>
+    <item android:title="@string/mi_book_open" android:titleCondensed="@string/mi_book_open" android:id="@+id/book_open"></item>
+    <item android:title="@string/mi_book_info" android:titleCondensed="@string/mi_book_info" android:id="@+id/book_info"></item>
+    <item android:title="@string/mi_book_edit" android:titleCondensed="@string/mi_book_edit" android:id="@+id/book_edit"></item>
+    <item android:title="@string/mi_book_delete" android:titleCondensed="@string/mi_book_delete" android:id="@+id/book_delete"></item>
+    <item android:title="@string/mi_book_shortcut" android:titleCondensed="@string/mi_book_shortcut" android:id="@+id/book_shortcut"></item>
+    <item android:title="@string/mi_book_to_gd" android:titleCondensed="@string/mi_book_to_gd" android:id="@+id/book_to_gd"></item>
+    <item android:title="@string/mi_book_no_mark" android:titleCondensed="@string/mi_book_no_mark" android:id="@+id/book_no_mark"></item>
+    <item android:title="@string/mi_book_to_read" android:titleCondensed="@string/mi_book_to_read" android:id="@+id/book_to_read"></item>
+    <item android:title="@string/mi_book_reading" android:titleCondensed="@string/mi_book_reading" android:id="@+id/book_reading"></item>
+    <item android:title="@string/mi_book_finished" android:titleCondensed="@string/mi_book_finished" android:id="@+id/book_finished"></item>
+    <item android:title="@string/mi_book_rate_5" android:titleCondensed="@string/mi_book_rate_5" android:id="@+id/book_rate_5"></item>
+    <item android:title="@string/mi_book_rate_4" android:titleCondensed="@string/mi_book_rate_4" android:id="@+id/book_rate_4"></item>
+    <item android:title="@string/mi_book_rate_3" android:titleCondensed="@string/mi_book_rate_3" android:id="@+id/book_rate_3"></item>
+    <item android:title="@string/mi_book_rate_2" android:titleCondensed="@string/mi_book_rate_2" android:id="@+id/book_rate_2"></item>
+    <item android:title="@string/mi_book_rate_1" android:titleCondensed="@string/mi_book_rate_1" android:id="@+id/book_rate_1"></item>
+    <item android:title="@string/mi_book_rate_0" android:titleCondensed="@string/mi_book_rate_0" android:id="@+id/book_rate_0"></item>
 </menu>

android/res/mipmap-anydpi-v26/cr3_logo.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/cr3_logo_background" />
+    <background android:drawable="@color/cr3_logo_background" />
+    <!-- background android:drawable="@drawable/cr3_logo_background" / -->
     <foreground android:drawable="@mipmap/cr3_logo_foreground" />
 </adaptive-icon>