Added more icons for 'High Contrast' theme.

buggins · Mar 9, 2018 · 62d7ab3 · 62d7ab3
1 parent 0e266d4
commit 62d7ab3
Show file tree

Hide file tree

Showing 39 changed files with 1,288 additions and 271 deletions.
diff --git a/android/res/drawable-hdpi/cr3_browser_folder_current_book_hc.png b/android/res/drawable-hdpi/cr3_browser_folder_current_book_hc.png
diff --git a/android/res/drawable-hdpi/cr3_browser_folder_opds_hc.png b/android/res/drawable-hdpi/cr3_browser_folder_opds_hc.png
diff --git a/android/res/drawable-hdpi/cr3_button_book_open_hc.png b/android/res/drawable-hdpi/cr3_button_book_open_hc.png
diff --git a/android/res/drawable-hdpi/cr3_button_go_percent_hc.png b/android/res/drawable-hdpi/cr3_button_go_percent_hc.png
diff --git a/android/res/drawable-hdpi/cr3_logo_button_hc.png b/android/res/drawable-hdpi/cr3_logo_button_hc.png
diff --git a/android/res/drawable-hdpi/cr3_viewer_exit_hc.png b/android/res/drawable-hdpi/cr3_viewer_exit_hc.png
diff --git a/android/res/drawable-ldpi/cr3_browser_folder_current_book_hc.png b/android/res/drawable-ldpi/cr3_browser_folder_current_book_hc.png
diff --git a/android/res/drawable-ldpi/cr3_browser_folder_opds_hc.png b/android/res/drawable-ldpi/cr3_browser_folder_opds_hc.png
diff --git a/android/res/drawable-ldpi/cr3_button_book_open_hc.png b/android/res/drawable-ldpi/cr3_button_book_open_hc.png
diff --git a/android/res/drawable-ldpi/cr3_button_go_percent_hc.png b/android/res/drawable-ldpi/cr3_button_go_percent_hc.png
diff --git a/android/res/drawable-ldpi/cr3_logo_button_hc.png b/android/res/drawable-ldpi/cr3_logo_button_hc.png
diff --git a/android/res/drawable-ldpi/cr3_viewer_exit_hc.png b/android/res/drawable-ldpi/cr3_viewer_exit_hc.png
diff --git a/android/res/drawable-mdpi/cr3_browser_folder_current_book_hc.png b/android/res/drawable-mdpi/cr3_browser_folder_current_book_hc.png
diff --git a/android/res/drawable-mdpi/cr3_browser_folder_opds_hc.png b/android/res/drawable-mdpi/cr3_browser_folder_opds_hc.png
diff --git a/android/res/drawable-mdpi/cr3_button_book_open_hc.png b/android/res/drawable-mdpi/cr3_button_book_open_hc.png
diff --git a/android/res/drawable-mdpi/cr3_button_go_percent_hc.png b/android/res/drawable-mdpi/cr3_button_go_percent_hc.png
diff --git a/android/res/drawable-mdpi/cr3_logo_button_hc.png b/android/res/drawable-mdpi/cr3_logo_button_hc.png
diff --git a/android/res/drawable-mdpi/cr3_viewer_exit_hc.png b/android/res/drawable-mdpi/cr3_viewer_exit_hc.png
diff --git a/android/res/drawable-xhdpi/cr3_browser_folder_current_book_hc.png b/android/res/drawable-xhdpi/cr3_browser_folder_current_book_hc.png
diff --git a/android/res/drawable-xhdpi/cr3_browser_folder_opds_hc.png b/android/res/drawable-xhdpi/cr3_browser_folder_opds_hc.png
diff --git a/android/res/drawable-xhdpi/cr3_button_book_open_hc.png b/android/res/drawable-xhdpi/cr3_button_book_open_hc.png
diff --git a/android/res/drawable-xhdpi/cr3_button_go_percent_hc.png b/android/res/drawable-xhdpi/cr3_button_go_percent_hc.png
diff --git a/android/res/drawable-xhdpi/cr3_logo_button_hc.png b/android/res/drawable-xhdpi/cr3_logo_button_hc.png
diff --git a/android/res/drawable-xhdpi/cr3_viewer_exit_hc.png b/android/res/drawable-xhdpi/cr3_viewer_exit_hc.png
diff --git a/android/res/layout/book_info_edit_dialog.xml b/android/res/layout/book_info_edit_dialog.xml
@@ -25,7 +25,7 @@
 	        android:layout_height="wrap_content"
 	        android:minHeight="?android:attr/listPreferredItemHeight"
 	        android:gravity="center_vertical"
-	        android:background="#60404040"
+	        android:background="?attr/tabbarBackground"
 	        >
 	        <ImageButton android:id="@+id/base_dlg_btn_back"
 	            android:layout_width="wrap_content"
@@ -43,7 +43,7 @@
                 android:layout_centerVertical="true"
                 android:layout_alignParentRight="true"
                 android:minWidth="?android:attr/listPreferredItemHeight"
-                android:src="@drawable/cr3_button_book_open"
+                android:src="?attr/cr3_button_book_open_drawable"
                 android:focusable="false"
                 android:focusableInTouchMode="false"
                 android:background="@null"

diff --git a/android/res/values-v4/styles.xml b/android/res/values-v4/styles.xml
@@ -84,6 +84,10 @@
         <item name="cr3_button_scroll_go_drawable">@drawable/cr3_button_scroll_go</item>
         <item name="cr3_btn_books_swap_drawable">@drawable/cr3_btn_books_swap</item>
         <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
+        <item name="cr3_viewer_exit_drawable">@drawable/cr3_viewer_exit</item>
+        <item name="cr3_button_book_open_drawable">@drawable/cr3_button_book_open</item>
+        <item name="cr3_browser_folder_current_book_drawable">@drawable/cr3_browser_folder_current_book</item>
+        <item name="cr3_browser_folder_opds_drawable">@drawable/cr3_browser_folder_opds</item>
     </style>
     <style name="Theme.Dark" parent="@android:style/Theme">
         <item name="android:windowBackground">@drawable/background_tiled_dark</item>
@@ -114,6 +118,10 @@
         <item name="cr3_button_scroll_go_drawable">@drawable/cr3_button_scroll_go</item>
         <item name="cr3_btn_books_swap_drawable">@drawable/cr3_btn_books_swap</item>
         <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
+        <item name="cr3_viewer_exit_drawable">@drawable/cr3_viewer_exit</item>
+        <item name="cr3_button_book_open_drawable">@drawable/cr3_button_book_open</item>
+        <item name="cr3_browser_folder_current_book_drawable">@drawable/cr3_browser_folder_current_book</item>
+        <item name="cr3_browser_folder_opds_drawable">@drawable/cr3_browser_folder_opds</item>
     </style>
     <style name="Theme.White" parent="@android:style/Theme.Light">
         <item name="android:windowBackground">@android:color/white</item>
@@ -144,6 +152,10 @@
         <item name="cr3_button_scroll_go_drawable">@drawable/cr3_button_scroll_go</item>
         <item name="cr3_btn_books_swap_drawable">@drawable/cr3_btn_books_swap</item>
         <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
+        <item name="cr3_viewer_exit_drawable">@drawable/cr3_viewer_exit</item>
+        <item name="cr3_button_book_open_drawable">@drawable/cr3_button_book_open</item>
+        <item name="cr3_browser_folder_current_book_drawable">@drawable/cr3_browser_folder_current_book</item>
+        <item name="cr3_browser_folder_opds_drawable">@drawable/cr3_browser_folder_opds</item>
     </style>
     <style name="Theme.Black" parent="@android:style/Theme">
         <item name="android:windowBackground">@android:color/black</item>
@@ -174,6 +186,10 @@
         <item name="cr3_button_scroll_go_drawable">@drawable/cr3_button_scroll_go</item>
         <item name="cr3_btn_books_swap_drawable">@drawable/cr3_btn_books_swap</item>
         <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
+        <item name="cr3_viewer_exit_drawable">@drawable/cr3_viewer_exit</item>
+        <item name="cr3_button_book_open_drawable">@drawable/cr3_button_book_open</item>
+        <item name="cr3_browser_folder_current_book_drawable">@drawable/cr3_browser_folder_current_book</item>
+        <item name="cr3_browser_folder_opds_drawable">@drawable/cr3_browser_folder_opds</item>
     </style>
 
     <style name="Theme.HiContrast" parent="@android:style/Theme.Light">
@@ -207,6 +223,10 @@
         <item name="cr3_button_scroll_go_drawable">@drawable/cr3_button_scroll_go_hc</item>
         <item name="cr3_btn_books_swap_drawable">@drawable/cr3_btn_books_swap_hc</item>
         <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button_hc</item>
+        <item name="cr3_viewer_exit_drawable">@drawable/cr3_viewer_exit_hc</item>
+        <item name="cr3_button_book_open_drawable">@drawable/cr3_button_book_open_hc</item>
+        <item name="cr3_browser_folder_current_book_drawable">@drawable/cr3_browser_folder_current_book_hc</item>
+        <item name="cr3_browser_folder_opds_drawable">@drawable/cr3_browser_folder_opds_hc</item>
     </style>
 
     <style name="Theme.Light.Dialog.Normal" parent="@style/Theme.Light">

diff --git a/android/res/values/attrs.xml b/android/res/values/attrs.xml
@@ -30,4 +30,8 @@
     <attr name="cr3_button_scroll_go_drawable" format="reference" />
     <attr name="cr3_btn_books_swap_drawable" format="reference" />
     <attr name="cr3_logo_button_drawable" format="reference" />
+    <attr name="cr3_viewer_exit_drawable" format="reference" />
+    <attr name="cr3_button_book_open_drawable" format="reference" />
+    <attr name="cr3_browser_folder_current_book_drawable" format="reference" />
+    <attr name="cr3_browser_folder_opds_drawable" format="reference" />
 </resources>
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
@@ -85,6 +85,10 @@
         <item name="cr3_button_scroll_go_drawable">@drawable/cr3_button_scroll_go</item>
         <item name="cr3_btn_books_swap_drawable">@drawable/cr3_btn_books_swap</item>
         <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
+        <item name="cr3_viewer_exit_drawable">@drawable/cr3_viewer_exit</item>
+        <item name="cr3_button_book_open_drawable">@drawable/cr3_button_book_open</item>
+        <item name="cr3_browser_folder_current_book_drawable">@drawable/cr3_browser_folder_current_book</item>
+        <item name="cr3_browser_folder_opds_drawable">@drawable/cr3_browser_folder_opds</item>
     </style>
     <style name="Theme.Dark" parent="@android:style/Theme">
         <item name="android:windowBackground">@drawable/background_tiled_dark_v3</item>
@@ -116,6 +120,10 @@
         <item name="cr3_button_scroll_go_drawable">@drawable/cr3_button_scroll_go</item>
         <item name="cr3_btn_books_swap_drawable">@drawable/cr3_btn_books_swap</item>
         <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
+        <item name="cr3_viewer_exit_drawable">@drawable/cr3_viewer_exit</item>
+        <item name="cr3_button_book_open_drawable">@drawable/cr3_button_book_open</item>
+        <item name="cr3_browser_folder_current_book_drawable">@drawable/cr3_browser_folder_current_book</item>
+        <item name="cr3_browser_folder_opds_drawable">@drawable/cr3_browser_folder_opds</item>
     </style>
     <style name="Theme.White" parent="@android:style/Theme.Light">
         <item name="android:windowBackground">@android:color/white</item>
@@ -148,6 +156,10 @@
         <item name="cr3_button_scroll_go_drawable">@drawable/cr3_button_scroll_go</item>
         <item name="cr3_btn_books_swap_drawable">@drawable/cr3_btn_books_swap</item>
         <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
+        <item name="cr3_viewer_exit_drawable">@drawable/cr3_viewer_exit</item>
+        <item name="cr3_button_book_open_drawable">@drawable/cr3_button_book_open</item>
+        <item name="cr3_browser_folder_current_book_drawable">@drawable/cr3_browser_folder_current_book</item>
+        <item name="cr3_browser_folder_opds_drawable">@drawable/cr3_browser_folder_opds</item>
     </style>
     <style name="Theme.Black" parent="@android:style/Theme">
         <item name="android:windowBackground">@android:color/black</item>
@@ -180,6 +192,10 @@
         <item name="cr3_button_scroll_go_drawable">@drawable/cr3_button_scroll_go</item>
         <item name="cr3_btn_books_swap_drawable">@drawable/cr3_btn_books_swap</item>
         <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
+        <item name="cr3_viewer_exit_drawable">@drawable/cr3_viewer_exit</item>
+        <item name="cr3_button_book_open_drawable">@drawable/cr3_button_book_open</item>
+        <item name="cr3_browser_folder_current_book_drawable">@drawable/cr3_browser_folder_current_book</item>
+        <item name="cr3_browser_folder_opds_drawable">@drawable/cr3_browser_folder_opds</item>
     </style>
 
     <style name="Theme.HiContrast" parent="@android:style/Theme.Light">
@@ -213,6 +229,10 @@
         <item name="cr3_button_scroll_go_drawable">@drawable/cr3_button_scroll_go_hc</item>
         <item name="cr3_btn_books_swap_drawable">@drawable/cr3_btn_books_swap_hc</item>
         <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button_hc</item>
+        <item name="cr3_viewer_exit_drawable">@drawable/cr3_viewer_exit_hc</item>
+        <item name="cr3_button_book_open_drawable">@drawable/cr3_button_book_open_hc</item>
+        <item name="cr3_browser_folder_current_book_drawable">@drawable/cr3_browser_folder_current_book_hc</item>
+        <item name="cr3_browser_folder_opds_drawable">@drawable/cr3_browser_folder_opds_hc</item>
     </style>
 
     <style name="Theme.Light.Dialog.Normal" parent="@style/Theme.Light">

diff --git a/android/src/org/coolreader/crengine/BaseActivity.java b/android/src/org/coolreader/crengine/BaseActivity.java
@@ -381,7 +381,8 @@ public void updateActionsIcons() {
 						 R.attr.cr3_browser_folder_root_drawable, R.attr.cr3_option_night_drawable, R.attr.cr3_option_touch_drawable,
 						 R.attr.cr3_button_go_page_drawable, R.attr.cr3_button_go_percent_drawable, R.attr.cr3_browser_folder_drawable,
 						 R.attr.cr3_button_tts_drawable, R.attr.cr3_browser_folder_recent_drawable, R.attr.cr3_button_scroll_go_drawable,
-						 R.attr.cr3_btn_books_swap_drawable, R.attr.cr3_logo_button_drawable };
+						 R.attr.cr3_btn_books_swap_drawable, R.attr.cr3_logo_button_drawable, R.attr.cr3_viewer_exit_drawable,
+						 R.attr.cr3_button_book_open_drawable, R.attr.cr3_browser_folder_current_book_drawable, R.attr.cr3_browser_folder_opds_drawable };
 		TypedArray a = getTheme().obtainStyledAttributes(attrs);
 		int btnPrevDrawableRes = a.getResourceId(0, 0);
 		int btnNextDrawableRes = a.getResourceId(1, 0);
@@ -391,7 +392,7 @@ public void updateActionsIcons() {
 		int btnBookmarksDrawableRes = a.getResourceId(5, 0);
 		int brFolderRootDrawableRes = a.getResourceId(6, 0);
 		int optionNightDrawableRes = a.getResourceId(7, 0);
-        int optionTouchDrawableRes = a.getResourceId(8, 0);
+		int optionTouchDrawableRes = a.getResourceId(8, 0);
 		int btnGoPageDrawableRes = a.getResourceId(9, 0);
 		int btnGoPercentDrawableRes = a.getResourceId(10, 0);
 		int brFolderDrawableRes = a.getResourceId(11, 0);
@@ -400,6 +401,10 @@ public void updateActionsIcons() {
 		int btnScrollGoDrawableRes = a.getResourceId(14, 0);
 		int btnBooksSwapDrawableRes = a.getResourceId(15, 0);
 		int logoBtnDrawableRes = a.getResourceId(16, 0);
+		int viewerExitDrawableRes = a.getResourceId(17, 0);
+		int btnBookOpenDrawableRes = a.getResourceId(18, 0);
+		int brFolderCurrBookDrawableRes = a.getResourceId(19, 0);
+		int brFolderOpdsDrawableRes = a.getResourceId(20, 0);
 		a.recycle();
 		if (btnPrevDrawableRes != 0) {
 			ReaderAction.GO_BACK.setIconId(btnPrevDrawableRes);
@@ -437,6 +442,14 @@ public void updateActionsIcons() {
 			ReaderAction.OPEN_PREVIOUS_BOOK.setIconId(btnBooksSwapDrawableRes);
 		if (logoBtnDrawableRes != 0)
 			ReaderAction.ABOUT.setIconId(logoBtnDrawableRes);
+		if (viewerExitDrawableRes != 0)
+			ReaderAction.EXIT.setIconId(viewerExitDrawableRes);
+		if (btnBookOpenDrawableRes != 0)
+			ReaderAction.CURRENT_BOOK.setIconId(btnBookOpenDrawableRes);
+		if (brFolderCurrBookDrawableRes != 0)
+			ReaderAction.CURRENT_BOOK_DIRECTORY.setIconId(brFolderCurrBookDrawableRes);
+		if (brFolderOpdsDrawableRes != 0)
+			ReaderAction.OPDS_CATALOGS.setIconId(brFolderOpdsDrawableRes);
 	}
 
 	public void setCurrentTheme(InterfaceTheme theme) {

diff --git a/icons_src/convert_all.pl b/icons_src/convert_all.pl
@@ -24,8 +24,11 @@
 	'cr3_browser_folder_recent_hc-48x48-src.svg' => 'cr3_browser_folder_recent_hc.png',
 	'cr3_btn_books_swap_hc-48x48-src.svg' => 'cr3_btn_books_swap_hc.png',
 	'cr3_button_scroll_go_hc-48x48-src.svg' => 'cr3_button_scroll_go_hc.png',
-	'cr3_logo_hc-48x48-src.svg' => 'cr3_logo_button_hc.png'
-	'cr3_button_book_open_hc-256x256-src.svg' => 'cr3_button_book_open_hc.png',
+	'cr3_logo_button_hc-48x48-src.svg' => 'cr3_logo_button_hc.png',
+	'cr3_button_book_open_hc-48x48-src.svg' => 'cr3_button_book_open_hc.png',
+	'cr3_viewer_exit_hc-48x48-src.svg' => 'cr3_viewer_exit_hc.png',
+	'cr3_browser_folder_current_book_hc-48x48-src.svg' => 'cr3_browser_folder_current_book_hc.png',
+	'cr3_browser_folder_opds_hc-48x48-src.svg' => 'cr3_browser_folder_opds_hc.png'
 );
 
 my %ic_menu_list=(