From d41217e96f912629e7cc86bc4c51a35138719f77 Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sun, 13 Jun 2021 09:21:44 +0400
Subject: [PATCH 01/35] Since new features have been added to the engine (LCD
 subpixel rendering, mathml support, etc), increasing the version of the
 engine.

---
 crengine/include/cr3version.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crengine/include/cr3version.h b/crengine/include/cr3version.h
index 8237f7ee7..328bd4bd2 100644
--- a/crengine/include/cr3version.h
+++ b/crengine/include/cr3version.h
@@ -1,2 +1,2 @@
-#define CR_ENGINE_VERSION "3.2.56-1"
-#define CR_ENGINE_BUILD_DATE "2021-04-02"
+#define CR_ENGINE_VERSION "3.2.58-1"
+#define CR_ENGINE_BUILD_DATE "2021-06-13"

From d3a8014d9910f37fa97aadb7385858c23b6969ee Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sun, 13 Jun 2021 11:07:28 +0400
Subject: [PATCH 02/35] Use gradle plugin 4.1.3.

---
 android/.idea/codeStyles/Project.xml | 18 ++++++++++++++++++
 android/.idea/compiler.xml           |  6 ++++++
 android/build.gradle                 |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 android/.idea/compiler.xml

diff --git a/android/.idea/codeStyles/Project.xml b/android/.idea/codeStyles/Project.xml
index 5781ead32..8dbe5e302 100644
--- a/android/.idea/codeStyles/Project.xml
+++ b/android/.idea/codeStyles/Project.xml
@@ -1,5 +1,23 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />
diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml
new file mode 100644
index 000000000..61a9130cd
--- /dev/null
+++ b/android/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index a67ea57f1..c39e5d07d 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

From 2246988bdec47ea6b5d443c8e5110efe2222fb2a Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sun, 13 Jun 2021 11:44:10 +0400
Subject: [PATCH 03/35] Android: set minimum font size to 5pt (using DPI).
 Reworked default font size calculation (using DPI).

---
 .../org/coolreader/crengine/BaseActivity.java | 61 ++++---------------
 1 file changed, 12 insertions(+), 49 deletions(-)

diff --git a/android/src/org/coolreader/crengine/BaseActivity.java b/android/src/org/coolreader/crengine/BaseActivity.java
index 44d64fd17..c3b194b0c 100644
--- a/android/src/org/coolreader/crengine/BaseActivity.java
+++ b/android/src/org/coolreader/crengine/BaseActivity.java
@@ -137,6 +137,13 @@ else if (DeviceInfo.EINK_ONYX)
 		diagonalInches = (float) Math.sqrt(widthInches * widthInches + heightInches * heightInches);
 		log.i("diagonal=" + diagonalInches + "  isSmartphone=" + isSmartphone());
 
+		int sz = dm.widthPixels;
+		if (sz > dm.heightPixels)
+			sz = dm.heightPixels;
+		minFontSize = 5*densityDpi/72;			// 5pt
+		//maxFontSize = 100*densityDpi/72;		// 100pt
+		maxFontSize = sz/8;
+
 		// create settings
 		mSettingsManager = new SettingsManager(this);
 		// create rest of settings
@@ -404,16 +411,6 @@ public void updateBackground() {
 //				getWindow().setBackgroundDrawable(Utils.solidColorDrawable(clBackground));
 		}
 		a.recycle();
-		Display display = getWindowManager().getDefaultDisplay();
-		int sz = display.getWidth();
-		if (sz > display.getHeight())
-			sz = display.getHeight();
-		minFontSize = sz / 45;
-		maxFontSize = sz / 8;
-		if (maxFontSize > 340)
-			maxFontSize = 340;
-		if (minFontSize < 9)
-			minFontSize = 9;
 	}
 
 	@SuppressLint("ResourceType")
@@ -1518,17 +1515,13 @@ private static class SettingsManager {
 
 		public static final Logger log = L.create("cr");
 
-		private BaseActivity mActivity;
+		private final BaseActivity mActivity;
 		private Properties mSettings;
-
-		private final DisplayMetrics displayMetrics = new DisplayMetrics();
 		private final File defaultSettingsDir;
 
 		public SettingsManager(BaseActivity activity) {
 			this.mActivity = activity;
-			activity.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
 			defaultSettingsDir = activity.getDir("settings", Context.MODE_PRIVATE);
-
 			mSettings = loadSettings();
 		}
 
@@ -1882,40 +1875,10 @@ public Properties loadSettings(BaseActivity activity, File file) {
 			props.applyDefault(ReaderView.PROP_LANDSCAPE_PAGES, DeviceInfo.ONE_COLUMN_IN_LANDSCAPE ? "0" : "1");
 			//props.applyDefault(ReaderView.PROP_TOOLBAR_APPEARANCE, "0");
 			// autodetect best initial font size based on display resolution
-			int screenHeight = displayMetrics.heightPixels;
-			int screenWidth = displayMetrics.widthPixels;//getWindowManager().getDefaultDisplay().getWidth();
-			if (screenWidth > screenHeight)
-				screenWidth = screenHeight;
-			int fontSize = 20;
-			int statusFontSize = 16;
-			String hmargin = "4";
-			String vmargin = "2";
-			if (screenWidth <= 320) {
-				fontSize = 20;
-				statusFontSize = 16;
-				hmargin = "4";
-				vmargin = "2";
-			} else if (screenWidth <= 400) {
-				fontSize = 24;
-				statusFontSize = 20;
-				hmargin = "10";
-				vmargin = "4";
-			} else if (screenWidth <= 600) {
-				fontSize = 28;
-				statusFontSize = 24;
-				hmargin = "20";
-				vmargin = "8";
-			} else if (screenWidth <= 800) {
-				fontSize = 32;
-				statusFontSize = 28;
-				hmargin = "25";
-				vmargin = "15";
-			} else {
-				fontSize = 48;
-				statusFontSize = 32;
-				hmargin = "30";
-				vmargin = "20";
-			}
+			int fontSize = 12*activity.densityDpi/72;			// 12pt
+			int statusFontSize = 8*activity.densityDpi/72;		// 8pt
+			int hmargin = activity.densityDpi/16;
+			int vmargin = activity.densityDpi/32;
 			if (DeviceInfo.DEF_FONT_SIZE != null)
 				fontSize = DeviceInfo.DEF_FONT_SIZE;
 

From b3d8bfa332dd1e0e45255cbb5d1fb6c10e3a4eaa Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sun, 20 Jun 2021 11:09:13 +0400
Subject: [PATCH 04/35] Android: fixed comparison of the main properties of the
 book during cloud sync. Before that, a request to open another book was
 erroneously displayed, even if the book is the same, but is on a different
 path.

---
 .../src/org/coolreader/crengine/FileInfo.java | 29 ++++---------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/android/src/org/coolreader/crengine/FileInfo.java b/android/src/org/coolreader/crengine/FileInfo.java
index 091b10b2c..167b8e8e8 100644
--- a/android/src/org/coolreader/crengine/FileInfo.java
+++ b/android/src/org/coolreader/crengine/FileInfo.java
@@ -1277,13 +1277,12 @@ public boolean equals(Object obj) {
 				return false;
 		} else if (!title.equals(other.title))
 			return false;
-		if (crc32 != other.crc32)
-			return false;
 		if (domVersion != other.domVersion)
 			return false;
 		if (blockRenderingFlags != other.blockRenderingFlags)
 			return false;
-		return true;
+		// Base check: fingerprint (for now only crc32)
+		return crc32 == other.crc32;
 	}
 
 	public boolean baseEquals(FileInfo other) {
@@ -1291,11 +1290,6 @@ public boolean baseEquals(FileInfo other) {
 			return true;
 		if (other == null)
 			return false;
-		if (arcname == null) {
-			if (other.arcname != null)
-				return false;
-		} else if (!arcname.equals(other.arcname))
-			return false;
 		if (arcsize != other.arcsize)
 			return false;
 		if (authors == null) {
@@ -1303,15 +1297,15 @@ public boolean baseEquals(FileInfo other) {
 				return false;
 		} else if (!authors.equals(other.authors))
 			return false;
+		// TODO: potentially filename may not match. Perhaps we need to remove this check.
 		if (filename == null) {
 			if (other.filename != null)
 				return false;
 		} else if (!filename.equals(other.filename))
 			return false;
-		if (flags != other.flags)
-			return false;
 		if (format != other.format)
 			return false;
+		// TODO: potentially isArchive may not match. Perhaps we need to remove this check.
 		if (isArchive != other.isArchive)
 			return false;
 		if (isDirectory != other.isDirectory)
@@ -1332,16 +1326,6 @@ public boolean baseEquals(FileInfo other) {
 				return false;
 		} else if (!description.equals(other.description))
 			return false;
-		if (path == null) {
-			if (other.path != null)
-				return false;
-		} else if (!path.equals(other.path))
-			return false;
-		if (pathname == null) {
-			if (other.pathname != null)
-				return false;
-		} else if (!pathname.equals(other.pathname))
-			return false;
 		if (series == null) {
 			if (other.series != null && other.series.length() != 0)
 				return false;
@@ -1356,9 +1340,8 @@ public boolean baseEquals(FileInfo other) {
 				return false;
 		} else if (!title.equals(other.title))
 			return false;
-		if (crc32 != other.crc32)
-			return false;
-		return true;
+		// Base check: fingerprint (for now only crc32)
+		return crc32 == other.crc32;
 	}
 
 	private static boolean eqGenre(String g1, String g2) {

From 0ef99d46c028e18b1d7da403900178ccd472bd10 Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sun, 11 Jul 2021 09:18:16 +0400
Subject: [PATCH 05/35] Typo fixed

---
 .../src/main/java/org/eink_onyx_reflections/OnyxDevice.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/eink-onyx-reflections/src/main/java/org/eink_onyx_reflections/OnyxDevice.java b/android/eink-onyx-reflections/src/main/java/org/eink_onyx_reflections/OnyxDevice.java
index 0826fda75..37db84e1b 100644
--- a/android/eink-onyx-reflections/src/main/java/org/eink_onyx_reflections/OnyxDevice.java
+++ b/android/eink-onyx-reflections/src/main/java/org/eink_onyx_reflections/OnyxDevice.java
@@ -52,7 +52,7 @@ private static String getBoardPlatform() {
 	private static void bootstrap() {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
 			try {
-				// Allow Private API on Android 10 (API 28)
+				// Allow Private API on Android 10 (API 29)
 				Class<?> aClass = Class.class;
 				Method methodForName = aClass.getDeclaredMethod("forName", String.class);
 				Method methodGetDeclaredMethod = aClass.getDeclaredMethod("getDeclaredMethod", String.class, Class[].class);

From 3c5fcfb18fa2aca9e277e07e9c9d1f513065903b Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sun, 11 Jul 2021 13:43:54 +0400
Subject: [PATCH 06/35] LVDocView::propsApply(): Always set/reset the
 TextLangMan & HyphMan properties, as this is one static instance and when
 using multiple document instances, the settings for one document may not
 match the settings for another document.

---
 crengine/src/lvdocview.cpp | 144 ++++++++++++++++++-------------------
 1 file changed, 71 insertions(+), 73 deletions(-)

diff --git a/crengine/src/lvdocview.cpp b/crengine/src/lvdocview.cpp
index 2034023da..aab7661ca 100644
--- a/crengine/src/lvdocview.cpp
+++ b/crengine/src/lvdocview.cpp
@@ -6659,7 +6659,6 @@ CRPropRef LVDocView::propsApply(CRPropRef props) {
     CRLog::trace("LVDocView::propsApply( %d items )", props->getCount());
     CRPropRef unknown = LVCreatePropsContainer();
     bool needUpdateMargins = false;
-    bool needUpdateHyphenation = false;
     for (int i = 0; i < props->getCount(); i++) {
         lString8 name(props->getName(i));
         lString32 value = props->getValue(i);
@@ -6807,44 +6806,17 @@ CRPropRef LVDocView::propsApply(CRPropRef props) {
                 fontSize = MAX_STATUS_FONT_SIZE;
             setStatusFontSize(fontSize);//cr_font_sizes
             value = lString32::itoa(fontSize);
-        } else if (name == PROP_HYPHENATION_DICT) {
-            needUpdateHyphenation = true;
-        } else if (name == PROP_HYPHENATION_LEFT_HYPHEN_MIN) {
-            int leftHyphenMin = props->getIntDef(PROP_HYPHENATION_LEFT_HYPHEN_MIN, HYPH_DEFAULT_HYPHEN_MIN);
-            if (HyphMan::getLeftHyphenMin() != leftHyphenMin) {
-                HyphMan::setLeftHyphenMin(leftHyphenMin);
-                REQUEST_RENDER("propsApply hyphenation left_hyphen_min")
-            }
-        } else if (name == PROP_HYPHENATION_RIGHT_HYPHEN_MIN) {
-            int rightHyphenMin = props->getIntDef(PROP_HYPHENATION_RIGHT_HYPHEN_MIN, HYPH_DEFAULT_HYPHEN_MIN);
-            if (HyphMan::getRightHyphenMin() != rightHyphenMin) {
-                HyphMan::setRightHyphenMin(rightHyphenMin);
-                REQUEST_RENDER("propsApply hyphenation right_hyphen_min")
-            }
-        } else if (name == PROP_HYPHENATION_TRUST_SOFT_HYPHENS) {
-            int trustSoftHyphens = props->getIntDef(PROP_HYPHENATION_TRUST_SOFT_HYPHENS, HYPH_DEFAULT_TRUST_SOFT_HYPHENS);
-            if (HyphMan::getTrustSoftHyphens() != trustSoftHyphens) {
-                HyphMan::setTrustSoftHyphens(trustSoftHyphens);
-                REQUEST_RENDER("propsApply hyphenation trust_soft_hyphens")
-            }
-        } else if (name == PROP_TEXTLANG_MAIN_LANG) {
-            needUpdateHyphenation = true;
-        } else if (name == PROP_TEXTLANG_EMBEDDED_LANGS_ENABLED) {
-            needUpdateHyphenation = true;
-        } else if (name == PROP_TEXTLANG_HYPHENATION_ENABLED) {
-            needUpdateHyphenation = true;
-        } else if (name == PROP_TEXTLANG_HYPH_SOFT_HYPHENS_ONLY) {
-            bool enabled = props->getIntDef(PROP_TEXTLANG_HYPH_SOFT_HYPHENS_ONLY, TEXTLANG_DEFAULT_HYPH_SOFT_HYPHENS_ONLY);
-            if ( enabled != TextLangMan::getHyphenationSoftHyphensOnly() ) {
-                TextLangMan::setHyphenationSoftHyphensOnly( enabled );
-                REQUEST_RENDER("propsApply textlang hyphenation_soft_hyphens_only")
-            }
-        } else if (name == PROP_TEXTLANG_HYPH_FORCE_ALGORITHMIC) {
-            bool enabled = props->getIntDef(PROP_TEXTLANG_HYPH_FORCE_ALGORITHMIC, TEXTLANG_DEFAULT_HYPH_FORCE_ALGORITHMIC);
-            if ( enabled != TextLangMan::getHyphenationForceAlgorithmic() ) {
-                TextLangMan::setHyphenationForceAlgorithmic( enabled );
-                REQUEST_RENDER("propsApply textlang hyphenation_force_algorithmic")
-            }
+        } else if (name == PROP_HYPHENATION_DICT
+                   || name == PROP_HYPHENATION_LEFT_HYPHEN_MIN
+                   || name == PROP_HYPHENATION_RIGHT_HYPHEN_MIN
+                   || name == PROP_HYPHENATION_TRUST_SOFT_HYPHENS
+                   || name == PROP_TEXTLANG_MAIN_LANG
+                   || name == PROP_TEXTLANG_EMBEDDED_LANGS_ENABLED
+                   || name == PROP_TEXTLANG_HYPHENATION_ENABLED
+                   || name == PROP_TEXTLANG_HYPH_SOFT_HYPHENS_ONLY
+                   || name == PROP_TEXTLANG_HYPH_FORCE_ALGORITHMIC) {
+            // do nothings, see bellow
+            // just to not add this to the list of unknown props
         } else if (name == PROP_INTERLINE_SPACE) {
             int interlineSpace = props->getIntDef(PROP_INTERLINE_SPACE,
                                                   cr_interline_spaces[20]);
@@ -6888,7 +6860,6 @@ CRPropRef LVDocView::propsApply(CRPropRef props) {
             int value = props->getIntDef(PROP_REQUESTED_DOM_VERSION, gDOMVersionCurrent);
             if (m_doc) // not when noDefaultDocument=true
                 if (getDocument()->setDOMVersionRequested(value)) {
-                    needUpdateHyphenation = true;
                     REQUEST_RENDER("propsApply requested dom version")
                 }
         } else if (name == PROP_RENDER_BLOCK_RENDERING_FLAGS) {
@@ -6957,13 +6928,43 @@ CRPropRef LVDocView::propsApply(CRPropRef props) {
     }
     if (needUpdateMargins)
         updatePageMargins();
-    if (needUpdateHyphenation) {
-        bool legacyRendering = m_props->getIntDef(PROP_RENDER_BLOCK_RENDERING_FLAGS, BLOCK_RENDERING_FLAGS_DEFAULT) == 0 ||
-                m_props->getIntDef(PROP_REQUESTED_DOM_VERSION, gDOMVersionCurrent) < 20180524;
-        if (legacyRendering) {
+
+    // Always set/reset the TextLangMan & HyphMan properties, as this is one
+    // static instance and when using multiple document instances, the settings
+    // for one document may not match the settings for another document.
+    bool legacyRendering = m_props->getIntDef(PROP_RENDER_BLOCK_RENDERING_FLAGS, BLOCK_RENDERING_FLAGS_DEFAULT) == 0 ||
+            m_props->getIntDef(PROP_REQUESTED_DOM_VERSION, gDOMVersionCurrent) < 20180524;
+    if (legacyRendering) {
+        // hyphenation dictionary
+        lString32 id = m_props->getStringDef(PROP_HYPHENATION_DICT,
+                                            DEF_HYPHENATION_DICT);
+        CRLog::debug("PROP_HYPHENATION_DICT = %s", LCSTR(id));
+        HyphDictionaryList * list = HyphMan::getDictList();
+        if (list) {
+            CRLog::debug("Changing hyphenation to %s", LCSTR(id));
+            list->activate(id);
+            REQUEST_RENDER("propsApply hyphenation dict")
+        }
+    } else {
+        bool embeddedLang = m_props->getBoolDef(PROP_TEXTLANG_EMBEDDED_LANGS_ENABLED, 0);
+        lString32 mainLang = m_props->getStringDef(PROP_TEXTLANG_MAIN_LANG, TEXTLANG_DEFAULT_MAIN_LANG);
+        bool hyphEnabled = m_props->getBoolDef(PROP_TEXTLANG_HYPHENATION_ENABLED, TEXTLANG_DEFAULT_HYPHENATION_ENABLED);
+        if (embeddedLang != TextLangMan::getEmbeddedLangsEnabled()) {
+            TextLangMan::setEmbeddedLangsEnabled(embeddedLang);
+            REQUEST_RENDER("propsApply textlang embedded_langs_enabled")
+        }
+        if (mainLang != TextLangMan::getMainLang()) {
+            TextLangMan::setMainLang(mainLang);
+            REQUEST_RENDER("propsApply textlang main_lang")
+        }
+        if (hyphEnabled != TextLangMan::getHyphenationEnabled()) {
+            TextLangMan::setHyphenationEnabled(hyphEnabled);
+            REQUEST_RENDER("propsApply textlang hyphenation_enabled")
+        }
+        if (!TextLangMan::getEmbeddedLangsEnabled()) {
             // hyphenation dictionary
             lString32 id = m_props->getStringDef(PROP_HYPHENATION_DICT,
-                                               DEF_HYPHENATION_DICT);
+                                                 DEF_HYPHENATION_DICT);
             CRLog::debug("PROP_HYPHENATION_DICT = %s", LCSTR(id));
             HyphDictionaryList * list = HyphMan::getDictList();
             if (list) {
@@ -6971,36 +6972,33 @@ CRPropRef LVDocView::propsApply(CRPropRef props) {
                 list->activate(id);
                 REQUEST_RENDER("propsApply hyphenation dict")
             }
-        } else {
-            bool embeddedLang = m_props->getBoolDef(PROP_TEXTLANG_EMBEDDED_LANGS_ENABLED, 0) != 0;
-            lString32 mainLang = m_props->getStringDef(PROP_TEXTLANG_MAIN_LANG, TEXTLANG_DEFAULT_MAIN_LANG);
-            bool hyphEnabled = m_props->getIntDef(PROP_TEXTLANG_HYPHENATION_ENABLED, TEXTLANG_DEFAULT_HYPHENATION_ENABLED) != 0;
-            if (embeddedLang != TextLangMan::getEmbeddedLangsEnabled()) {
-                TextLangMan::setEmbeddedLangsEnabled(embeddedLang);
-                REQUEST_RENDER("propsApply textlang embedded_langs_enabled")
-            }
-            if (mainLang != TextLangMan::getMainLang()) {
-                TextLangMan::setMainLang(mainLang);
-                REQUEST_RENDER("propsApply textlang main_lang")
-            }
-            if (hyphEnabled != TextLangMan::getHyphenationEnabled()) {
-                TextLangMan::setHyphenationEnabled(hyphEnabled);
-                REQUEST_RENDER("propsApply textlang hyphenation_enabled")
-            }
-            if (!TextLangMan::getEmbeddedLangsEnabled()) {
-                // hyphenation dictionary
-                lString32 id = m_props->getStringDef(PROP_HYPHENATION_DICT,
-                                                   DEF_HYPHENATION_DICT);
-                CRLog::debug("PROP_HYPHENATION_DICT = %s", LCSTR(id));
-                HyphDictionaryList * list = HyphMan::getDictList();
-                if (list) {
-                    CRLog::debug("Changing hyphenation to %s", LCSTR(id));
-                    list->activate(id);
-                    REQUEST_RENDER("propsApply hyphenation dict")
-                }
-            }
         }
     }
+    bool hyph_soft_only_enabled = m_props->getBoolDef(PROP_TEXTLANG_HYPH_SOFT_HYPHENS_ONLY, TEXTLANG_DEFAULT_HYPH_SOFT_HYPHENS_ONLY);
+    if ( hyph_soft_only_enabled != TextLangMan::getHyphenationSoftHyphensOnly() ) {
+        TextLangMan::setHyphenationSoftHyphensOnly( hyph_soft_only_enabled );
+        REQUEST_RENDER("propsApply textlang hyphenation_soft_hyphens_only")
+    }
+    bool hyph_force_algo_enabled = m_props->getBoolDef(PROP_TEXTLANG_HYPH_FORCE_ALGORITHMIC, TEXTLANG_DEFAULT_HYPH_FORCE_ALGORITHMIC);
+    if ( hyph_force_algo_enabled != TextLangMan::getHyphenationForceAlgorithmic() ) {
+        TextLangMan::setHyphenationForceAlgorithmic( hyph_force_algo_enabled );
+        REQUEST_RENDER("propsApply textlang hyphenation_force_algorithmic")
+    }
+    int leftHyphenMin = m_props->getIntDef(PROP_HYPHENATION_LEFT_HYPHEN_MIN, HYPH_DEFAULT_HYPHEN_MIN);
+    if (HyphMan::getLeftHyphenMin() != leftHyphenMin) {
+        HyphMan::setLeftHyphenMin(leftHyphenMin);
+        REQUEST_RENDER("propsApply hyphenation left_hyphen_min")
+    }
+    int rightHyphenMin = m_props->getIntDef(PROP_HYPHENATION_RIGHT_HYPHEN_MIN, HYPH_DEFAULT_HYPHEN_MIN);
+    if (HyphMan::getRightHyphenMin() != rightHyphenMin) {
+        HyphMan::setRightHyphenMin(rightHyphenMin);
+        REQUEST_RENDER("propsApply hyphenation right_hyphen_min")
+    }
+    int trustSoftHyphens = m_props->getIntDef(PROP_HYPHENATION_TRUST_SOFT_HYPHENS, HYPH_DEFAULT_TRUST_SOFT_HYPHENS);
+    if (HyphMan::getTrustSoftHyphens() != trustSoftHyphens) {
+        HyphMan::setTrustSoftHyphens(trustSoftHyphens);
+        REQUEST_RENDER("propsApply hyphenation trust_soft_hyphens")
+    }
     return unknown;
 }
 

From 71e759259ee74df6feafe33eea5ee0c1c28129da Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Mon, 12 Jul 2021 09:06:01 +0400
Subject: [PATCH 07/35] Android: updated CMakeLists.txt & Android.mk: remove
 obsoleted stuff.

---
 android/app/CMakeLists.txt | 4 ++--
 android/jni/Android.mk     | 4 ++--
 crengine/src/lvmemman.cpp  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt
index 9d41e596a..810e52b74 100644
--- a/android/app/CMakeLists.txt
+++ b/android/app/CMakeLists.txt
@@ -29,7 +29,7 @@ include_directories(${CR3_ROOT}/thirdparty/${REPO_LIBUNIBREAK_SRCDIR}/src)
 include_directories(${CR3_ROOT}/thirdparty/${REPO_ZSTD_SRCDIR}/lib)
 include_directories(${CR3_ROOT}/thirdparty/${REPO_UTF8PROC_SRCDIR})
 
-add_definitions(-DLINUX=1 -D_LINUX=1 -DFOR_ANDROID=1 -DCR3_PATCH)
+add_definitions(-DLINUX=1 -D_LINUX=1)
 add_definitions(-DFT_CONFIG_MODULES_H=<android/config/ftmodule.h> -DFT_CONFIG_OPTIONS_H=<android/config/ftoption.h>)
 add_definitions(-DDOC_DATA_COMPRESSION_LEVEL=1 -DDOC_BUFFER_SIZE=0x1000000)
 add_definitions(-DENABLE_CACHE_FILE_CONTENTS_VALIDATION=1)
@@ -39,7 +39,7 @@ add_definitions(-DLVLONG_FILE_SUPPORT=1)
 add_definitions(-DMAX_IMAGE_SCALE_MUL=2)
 add_definitions(-DUSE_NANOSVG=1)
 add_definitions(-DBUNDLED_FRIBIDI=1)
-add_definitions(-DKO_LIBUNIBREAK_PATCH=1)       # patch "add_lb_get_char_class.patch" for libunibreak from koreader
+add_definitions(-DKO_LIBUNIBREAK_PATCH=1)       # libunibreak patched with "add_lb_get_char_class.patch" file from koreader
 add_definitions(-DUSE_UTF8PROC=1)
 
 #set(LOCAL_CFLAGS "-Wno-psabi -Wno-unused-variable -Wno-sign-compare -Wno-write-strings -Wno-main -Wno-unused-but-set-variable -Wno-unused-function -Wall")
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 53a5e93c1..a47a87dd9 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -5,9 +5,9 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE    := cr3engine-3-2-X
 
-# Generate CREngine blob with statically linked libjpeg, libpng, freetype, harfbuzz, fribidi, libunibreak, chmlib
+# Generate CREngine blob with statically linked libjpeg, libpng, freetype, harfbuzz, fribidi, libunibreak, zstd, utf8proc, antiword, chmlib
 
-CRFLAGS := -DLINUX=1 -D_LINUX=1 -DFOR_ANDROID=1 -DCR3_PATCH \
+CRFLAGS := -DLINUX=1 -D_LINUX=1 \
      -DFT2_BUILD_LIBRARY=1 -DFT_CONFIG_MODULES_H=\<android/config/ftmodule.h\> -DFT_CONFIG_OPTIONS_H=\<android/config/ftoption.h\> \
      -DDOC_DATA_COMPRESSION_LEVEL=1 -DDOC_BUFFER_SIZE=0x1000000 \
      -DENABLE_CACHE_FILE_CONTENTS_VALIDATION=1 \
diff --git a/crengine/src/lvmemman.cpp b/crengine/src/lvmemman.cpp
index 06a67a0f4..111ce7af0 100644
--- a/crengine/src/lvmemman.cpp
+++ b/crengine/src/lvmemman.cpp
@@ -40,7 +40,7 @@ void crSetFileToRemoveOnFatalError(const char * filename) {
 #ifdef _LINUX
 static struct sigaction old_sa[NSIG];
 
-#if FOR_ANDROID == 1
+#ifdef ANDROID
 //#define ANDROID_BACKTRACE
 #endif
 

From 94af32a791cce58f4b91fad35ca167ea21132c3a Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Mon, 12 Jul 2021 15:33:15 +0400
Subject: [PATCH 08/35] Set minimum required versions for thirdparty in
 CMakeLists.txt

---
 CMakeLists.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b62d4d213..233b8c8de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,7 +241,7 @@ endif (NOT JPEG_FOUND)
 
 if (NOT MSVC AND NOT CR3_FREETYPE)
 FIND_PACKAGE(Freetype 2.10.0)
-FIND_PACKAGE(HarfBuzz)
+FIND_PACKAGE(HarfBuzz 2.6.0)
 endif (NOT MSVC AND NOT CR3_FREETYPE)
 
 ADD_SUBDIRECTORY(thirdparty_unman/qimagescale)
@@ -273,7 +273,7 @@ if (NOT HarfBuzz_FOUND)
 endif (NOT HarfBuzz_FOUND)
 
 if (NOT MSVC)
-	find_package(FontConfig)
+	find_package(FontConfig 2.11.0)
 endif(NOT MSVC)
 
 if (FONTCONFIG_FOUND)
@@ -283,7 +283,7 @@ else()
 endif (FONTCONFIG_FOUND)
 
 if (NOT MSVC)
-find_package(FriBidi)
+find_package(FriBidi 1.0.0)
 if (NOT FRIBIDI_FOUND)
   message("System FriBidi not found, will build local one\n")
   ADD_SUBDIRECTORY(thirdparty/${REPO_FRIBIDI_SRCDIR})
@@ -295,7 +295,7 @@ endif(NOT MSVC)
 
 
 if (NOT MSVC)
-	find_package(libunibreak)
+	find_package(libunibreak 4.0)
 endif(NOT MSVC)
 
 if (NOT LIBUNIBREAK_FOUND)
@@ -305,7 +305,7 @@ if (NOT LIBUNIBREAK_FOUND)
   SET(LIBUNIBREAK_LIBRARIES unibreak)
 endif (NOT LIBUNIBREAK_FOUND)
 
-find_package(ZSTD)
+find_package(ZSTD 1.4.0)
 if (NOT ZSTD_FOUND)
     message("\nSystem zstd not found, will build local one\n")
     set(ZSTD_LEGACY_SUPPORT OFF CACHE BOOL "LEGACY SUPPORT" FORCE)

From 277755179bb0998236aabbdc62b236f10c2aa409 Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Wed, 14 Jul 2021 16:03:45 +0400
Subject: [PATCH 09/35] Updated cmake modules: detect version.

---
 CMakeLists.txt                      |   8 +-
 cmake/modules/FindFontConfig.cmake  |  80 ++++++++++------
 cmake/modules/FindFriBidi.cmake     |  60 +++++++++---
 cmake/modules/FindHarfBuzz.cmake    | 137 ++++++++++++++++------------
 cmake/modules/FindZSTD.cmake        |   8 +-
 cmake/modules/Findlibunibreak.cmake |  54 +++++++++--
 cmake/modules/Findutf8proc.cmake    |   2 +-
 7 files changed, 235 insertions(+), 114 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 233b8c8de..18841ca7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -248,10 +248,10 @@ ADD_SUBDIRECTORY(thirdparty_unman/qimagescale)
 
 if (NOT FREETYPE_FOUND)
   message("System FREETYPE not found, will build local one\n")
-  if (NOT HarfBuzz_FOUND)
+  if (NOT HARFBUZZ_FOUND)
 	SET(HARFBUZZ_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE)
 	SET(HARFBUZZ_LIBRARIES harfbuzz)
-  endif (NOT HarfBuzz_FOUND)
+  endif (NOT HARFBUZZ_FOUND)
   SET(FT_WITH_ZLIB ON CACHE BOOL "Use system zlib instead of internal library." FORCE)
   SET(FT_WITH_PNG ON CACHE BOOL "Support PNG compressed OpenType embedded bitmaps." FORCE)
   SET(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
@@ -262,7 +262,7 @@ if (NOT FREETYPE_FOUND)
   SET(FREETYPE_LIBRARIES freetype)
 endif (NOT FREETYPE_FOUND)
 
-if (NOT HarfBuzz_FOUND)
+if (NOT HARFBUZZ_FOUND)
   message("System HarfBuzz not found, will build local one\n")
   SET(HB_HAVE_FREETYPE ON CACHE BOOL "Enable freetype interop helpers" FORCE)
   SET(HB_BUILD_TESTS OFF CACHE BOOL "Build harfbuzz tests" FORCE)
@@ -270,7 +270,7 @@ if (NOT HarfBuzz_FOUND)
   ADD_SUBDIRECTORY(thirdparty/${REPO_HARFBUZZ_SRCDIR})
   SET(HARFBUZZ_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE)
   SET(HARFBUZZ_LIBRARY harfbuzz)
-endif (NOT HarfBuzz_FOUND)
+endif (NOT HARFBUZZ_FOUND)
 
 if (NOT MSVC)
 	find_package(FontConfig 2.11.0)
diff --git a/cmake/modules/FindFontConfig.cmake b/cmake/modules/FindFontConfig.cmake
index b8d6c3a5f..921fc879d 100644
--- a/cmake/modules/FindFontConfig.cmake
+++ b/cmake/modules/FindFontConfig.cmake
@@ -1,25 +1,13 @@
-# - Try to find the  Fontconfig
+# - Try to find the FontConfig
 # Once done this will define
 #
-#  FONTCONFIG_FOUND - system has Fontconfig
-#  FONTCONFIG_INCLUDE_DIR - The include directory to use for the fontconfig headers
-#  FONTCONFIG_LIBRARIES - Link these to use FONTCONFIG
-#  FONTCONFIG_DEFINITIONS - Compiler switches required for using FONTCONFIG
+#  FONTCONFIG_FOUND - system has FontConfig
+#  FONTCONFIG_INCLUDE_DIR - The include directory to use for the FontConfig headers
+#  FONTCONFIG_INCLUDE_DIRS - The same
+#  FONTCONFIG_LIBRARIES - Link these to use FontConfig
+#  FONTCONFIG_DEFINITIONS - Compiler switches required for using FontConfig
+#  FONTCONFIG_VERSION - The version of the FontConfig library which was found.
 
-# Copyright (c) 2006,2007 Laurent Montel, <montel@kde.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products 
-#    derived from this software without specific prior written permission.
-#
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 # OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -32,38 +20,72 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-if (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
+mark_as_advanced(FONTCONFIG_LIBRARY FONTCONFIG_INCLUDE_DIR)
+
+if (FONTCONFIG_LIBRARY AND FONTCONFIG_INCLUDE_DIR)
 
   # in cache already
   set(FONTCONFIG_FOUND TRUE)
 
-else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
+else (FONTCONFIG_LIBRARY AND FONTCONFIG_INCLUDE_DIR)
 
   if (NOT MSVC)
     # use pkg-config to get the directories and then use these values
     # in the FIND_PATH() and FIND_LIBRARY() calls
-    find_package(PkgConfig)
-    pkg_check_modules(PC_FONTCONFIG fontconfig)
+    find_package(PkgConfig QUIET)
+    pkg_check_modules(PC_FONTCONFIG QUIET fontconfig)
 
     set(FONTCONFIG_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER})
+    set(FONTCONFIG_VERSION ${PC_FONTCONFIG_VERSION})
   endif (NOT MSVC)
 
   find_path(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h
     PATHS
     ${PC_FONTCONFIG_INCLUDEDIR}
     ${PC_FONTCONFIG_INCLUDE_DIRS}
-    /usr/X11/include
   )
 
-  find_library(FONTCONFIG_LIBRARIES NAMES fontconfig
+  find_library(FONTCONFIG_LIBRARY NAMES fontconfig
     PATHS
     ${PC_FONTCONFIG_LIBDIR}
     ${PC_FONTCONFIG_LIBRARY_DIRS}
   )
 
+  if (NOT FONTCONFIG_VERSION)
+    if(EXISTS "${FONTCONFIG_INCLUDE_DIR}/fontconfig/fontconfig.h")
+      file(STRINGS "${FONTCONFIG_INCLUDE_DIR}/fontconfig/fontconfig.h"
+        _FONTCONFIG_VERSION_MAJOR REGEX "^#define FC_MAJOR")
+      string(REGEX MATCH "[0-9]+" FONTCONFIG_VERSION_MAJOR "${_FONTCONFIG_VERSION_MAJOR}")
+      file(STRINGS "${FONTCONFIG_INCLUDE_DIR}/fontconfig/fontconfig.h"
+        _FONTCONFIG_VERSION_MINOR REGEX "^#define FC_MINOR")
+      string(REGEX MATCH "[0-9]+" FONTCONFIG_VERSION_MINOR "${_FONTCONFIG_VERSION_MINOR}")
+      file(STRINGS "${FONTCONFIG_INCLUDE_DIR}/fontconfig/fontconfig.h"
+        _FONTCONFIG_VERSION_REVISION REGEX "^#define FC_REVISION")
+      string(REGEX MATCH "[0-9]+" FONTCONFIG_VERSION_REVISION "${_FONTCONFIG_VERSION_REVISION}")
+      set(FONTCONFIG_VERSION ${FONTCONFIG_VERSION_MAJOR}.${FONTCONFIG_VERSION_MINOR}.${FONTCONFIG_VERSION_REVISION})
+    endif()
+  endif()
+
   include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(FontConfig DEFAULT_MSG FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR )
-  
-  mark_as_advanced(FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR)
+  find_package_handle_standard_args(FontConfig
+    FOUND_VAR FONTCONFIG_FOUND
+    REQUIRED_VARS
+      FONTCONFIG_LIBRARY
+      FONTCONFIG_INCLUDE_DIR
+    VERSION_VAR FONTCONFIG_VERSION
+  )
+
+endif (FONTCONFIG_LIBRARY AND FONTCONFIG_INCLUDE_DIR)
 
-endif (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
+if(FONTCONFIG_FOUND)
+  set(FONTCONFIG_LIBRARIES ${FONTCONFIG_LIBRARY})
+  set(FONTCONFIG_INCLUDE_DIRS ${FONTCONFIG_INCLUDE_DIR})
+  if(NOT TARGET FontConfig::FontConfig)
+    add_library(FontConfig::FontConfig UNKNOWN IMPORTED)
+    set_target_properties(FontConfig::FontConfig PROPERTIES
+      IMPORTED_LOCATION "${FONTCONFIG_LIBRARIES}"
+      INTERFACE_COMPILE_DEFINITIONS "${FONTCONFIG_DEFINITIONS}"
+      INTERFACE_INCLUDE_DIRECTORIES "${FONTCONFIG_INCLUDE_DIRS}"
+    )
+  endif()
+endif(FONTCONFIG_FOUND)
diff --git a/cmake/modules/FindFriBidi.cmake b/cmake/modules/FindFriBidi.cmake
index 0ab6544fe..038978f37 100644
--- a/cmake/modules/FindFriBidi.cmake
+++ b/cmake/modules/FindFriBidi.cmake
@@ -1,10 +1,11 @@
-# - Try to find the  FriBidi
+# - Try to find the FriBidi
 # Once done this will define
 #
 #  FRIBIDI_FOUND - system has FriBidi
-#  FRIBIDI_INCLUDE_DIR - The include directory to use for the fribidi headers
+#  FRIBIDI_INCLUDE_DIRS - The include directory to use for the FriBidi headers
 #  FRIBIDI_LIBRARIES - Link these to use FriBidi
 #  FRIBIDI_DEFINITIONS - Compiler switches required for using FriBidi
+#  FRIBIDI_VERSION - The version of the FriBidi library which was found.
 
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -18,37 +19,72 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-if (FRIBIDI_LIBRARIES AND FRIBIDI_INCLUDE_DIR)
+mark_as_advanced(FRIBIDI_LIBRARY FRIBIDI_INCLUDE_DIR)
+
+if (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR)
 
   # in cache already
   set(FRIBIDI_FOUND TRUE)
 
-else (FRIBIDI_LIBRARIES AND FRIBIDI_INCLUDE_DIR)
+else (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR)
 
   if (NOT MSVC)
     # use pkg-config to get the directories and then use these values
     # in the FIND_PATH() and FIND_LIBRARY() calls
-    find_package(PkgConfig)
-    pkg_check_modules(PC_FRIBIDI fribidi)
+    find_package(PkgConfig QUIET)
+    pkg_check_modules(PC_FRIBIDI QUIET fribidi)
 
     set(FRIBIDI_DEFINITIONS ${PC_FRIBIDI_CFLAGS_OTHER})
+    set(FRIBIDI_VERSION ${PC_FRIBIDI_VERSION})
   endif (NOT MSVC)
 
-  find_path(FRIBIDI_INCLUDE_DIR fribidi.h
+  find_path(FRIBIDI_INCLUDE_DIR fribidi/fribidi.h
     PATHS
     ${PC_FRIBIDI_INCLUDEDIR}
     ${PC_FRIBIDI_INCLUDE_DIRS}
   )
 
-  find_library(FRIBIDI_LIBRARIES NAMES fribidi
+  find_library(FRIBIDI_LIBRARY NAMES fribidi
     PATHS
     ${PC_FRIBIDI_LIBDIR}
     ${PC_FRIBIDI_LIBRARY_DIRS}
   )
 
+  if (NOT FRIBIDI_VERSION)
+    if(EXISTS "${FRIBIDI_INCLUDE_DIR}/fribidi/fribidi-config.h")
+      file(STRINGS "${FRIBIDI_INCLUDE_DIR}/fribidi/fribidi-config.h"
+        _FRIBIDI_VERSION_MAJOR REGEX "^#define FRIBIDI_MAJOR_VERSION")
+      string(REGEX MATCH "[0-9]+" FRIBIDI_VERSION_MAJOR "${_FRIBIDI_VERSION_MAJOR}")
+      file(STRINGS "${FRIBIDI_INCLUDE_DIR}/fribidi/fribidi-config.h"
+        _FRIBIDI_VERSION_MINOR REGEX "^#define FRIBIDI_MINOR_VERSION")
+      string(REGEX MATCH "[0-9]+" FRIBIDI_VERSION_MINOR "${_FRIBIDI_VERSION_MINOR}")
+      file(STRINGS "${FRIBIDI_INCLUDE_DIR}/fribidi/fribidi-config.h"
+        _FRIBIDI_VERSION_MICRO REGEX "^#define FRIBIDI_MICRO_VERSION")
+      string(REGEX MATCH "[0-9]+" FRIBIDI_VERSION_MICRO "${_FRIBIDI_VERSION_MICRO}")
+      set(FRIBIDI_VERSION ${FRIBIDI_VERSION_MAJOR}.${FRIBIDI_VERSION_MINOR}.${FRIBIDI_VERSION_MICRO})
+    endif()
+  endif()
+
   include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(FriBidi DEFAULT_MSG FRIBIDI_LIBRARIES FRIBIDI_INCLUDE_DIR )
-  
-  mark_as_advanced(FRIBIDI_LIBRARIES FRIBIDI_INCLUDE_DIR)
+  find_package_handle_standard_args(FriBidi
+    FOUND_VAR FRIBIDI_FOUND
+    REQUIRED_VARS
+      FRIBIDI_LIBRARY
+      FRIBIDI_INCLUDE_DIR
+    VERSION_VAR FRIBIDI_VERSION
+  )
+
+endif (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR)
 
-endif (FRIBIDI_LIBRARIES AND FRIBIDI_INCLUDE_DIR)
+if(FRIBIDI_FOUND)
+  set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
+  set(FRIBIDI_INCLUDE_DIRS ${FRIBIDI_INCLUDE_DIR})
+  if(NOT TARGET FriBidi::FriBidi)
+    add_library(FriBidi::FriBidi UNKNOWN IMPORTED)
+    set_target_properties(FriBidi::FriBidi PROPERTIES
+      IMPORTED_LOCATION "${FRIBIDI_LIBRARIES}"
+      INTERFACE_COMPILE_DEFINITIONS "${FRIBIDI_DEFINITIONS}"
+      INTERFACE_INCLUDE_DIRECTORIES "${FRIBIDI_INCLUDE_DIRS}"
+    )
+  endif()
+endif(FRIBIDI_FOUND)
diff --git a/cmake/modules/FindHarfBuzz.cmake b/cmake/modules/FindHarfBuzz.cmake
index 2a1dba131..7653938c8 100644
--- a/cmake/modules/FindHarfBuzz.cmake
+++ b/cmake/modules/FindHarfBuzz.cmake
@@ -1,66 +1,91 @@
-#.rst:
-# Find HarfBuzz
-# -------------
-#
-# Finds the HarfBuzz library. This module defines:
-#
-#  HarfBuzz_FOUND           - True if HarfBuzz library is found
-#  HarfBuzz::HarfBuzz       - HarfBuzz imported target
-#
-# Additionally these variables are defined for internal usage:
-#
-#  HARFBUZZ_LIBRARY         - HarfBuzz library
-#  HARFBUZZ_LIBRARIES       - Same as HARFBUZZ_LIBRARY
-#  HARFBUZZ_INCLUDE_DIRS    - Include dir
+# - Try to find the HarfBuzz
+# Once done this will define
 #
+#  HARFBUZZ_FOUND - system has HarfBuzz
+#  HARFBUZZ_INCLUDE_DIRS - The include directory to use for the HarfBuzz headers
+#  HARFBUZZ_LIBRARIES - Link these to use HarfBuzz
+#  HARFBUZZ_DEFINITIONS - Compiler switches required for using HarfBuzz
+#  HARFBUZZ_VERSION - The version of the HarfBuzz library which was found.
 
-#
-#   This file is part of Magnum.
-#
-#   Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
-#             Vladimír Vondruš <mosra@centrum.cz>
-#
-#   Permission is hereby granted, free of charge, to any person obtaining a
-#   copy of this software and associated documentation files (the "Software"),
-#   to deal in the Software without restriction, including without limitation
-#   the rights to use, copy, modify, merge, publish, distribute, sublicense,
-#   and/or sell copies of the Software, and to permit persons to whom the
-#   Software is furnished to do so, subject to the following conditions:
-#
-#   The above copyright notice and this permission notice shall be included
-#   in all copies or substantial portions of the Software.
-#
-#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-#   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-#   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-#   DEALINGS IN THE SOFTWARE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-# Library
-find_library(HARFBUZZ_LIBRARY NAMES harfbuzz)
+mark_as_advanced(HARFBUZZ_LIBRARY HARFBUZZ_INCLUDE_DIR)
 
-# Include dir
-find_path(HARFBUZZ_INCLUDE_DIRS
-    NAMES hb.h
-    PATH_SUFFIXES harfbuzz)
+if (HARFBUZZ_LIBRARY AND HARFBUZZ_INCLUDE_DIR)
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(HarfBuzz DEFAULT_MSG
-    HARFBUZZ_LIBRARY
-    HARFBUZZ_INCLUDE_DIRS)
+  # in cache already
+  set(HARFBUZZ_FOUND TRUE)
 
-mark_as_advanced(FORCE
-    HARFBUZZ_LIBRARY
-    HARFBUZZ_INCLUDE_DIRS)
+else (HARFBUZZ_LIBRARY AND HARFBUZZ_INCLUDE_DIR)
 
-if(NOT TARGET HarfBuzz::HarfBuzz)
+  if (NOT MSVC)
+    # use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    find_package(PkgConfig QUIET)
+    pkg_check_modules(PC_HARFBUZZ QUIET harfbuzz)
+
+    set(HARFBUZZ_DEFINITIONS ${PC_HARFBUZZ_CFLAGS_OTHER})
+    set(HARFBUZZ_VERSION ${PC_HARFBUZZ_VERSION})
+  endif (NOT MSVC)
+
+  find_path(HARFBUZZ_INCLUDE_DIR hb.h
+    PATH_SUFFIXES harfbuzz
+    PATHS
+    ${PC_HARFBUZZ_INCLUDEDIR}
+    ${PC_HARFBUZZ_INCLUDE_DIRS}
+  )
+
+  find_library(HARFBUZZ_LIBRARY NAMES harfbuzz
+    PATHS
+    ${PC_HARFBUZZ_LIBDIR}
+    ${PC_HARFBUZZ_LIBRARY_DIRS}
+  )
+
+  if (NOT HARFBUZZ_VERSION)
+    if(EXISTS "${HARFBUZZ_INCLUDE_DIR}/hb-version.h")
+      file(STRINGS "${HARFBUZZ_INCLUDE_DIR}/hb-version.h"
+        _HARFBUZZ_VERSION_MAJOR REGEX "^#define HB_VERSION_MAJOR")
+      string(REGEX MATCH "[0-9]+" HARFBUZZ_VERSION_MAJOR "${_HARFBUZZ_VERSION_MAJOR}")
+      file(STRINGS "${HARFBUZZ_INCLUDE_DIR}/hb-version.h"
+        _HARFBUZZ_VERSION_MINOR REGEX "^#define HB_VERSION_MINOR")
+      string(REGEX MATCH "[0-9]+" HARFBUZZ_VERSION_MINOR "${_HARFBUZZ_VERSION_MINOR}")
+      file(STRINGS "${HARFBUZZ_INCLUDE_DIR}/hb-version.h"
+        _HARFBUZZ_VERSION_MICRO REGEX "^#define HB_VERSION_MICRO")
+      string(REGEX MATCH "[0-9]+" HARFBUZZ_VERSION_MICRO "${_HARFBUZZ_VERSION_MICRO}")
+      set(HARFBUZZ_VERSION ${HARFBUZZ_VERSION_MAJOR}.${HARFBUZZ_VERSION_MINOR}.${HARFBUZZ_VERSION_MICRO})
+    endif()
+  endif()
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(HarfBuzz
+    FOUND_VAR HARFBUZZ_FOUND
+    REQUIRED_VARS
+      HARFBUZZ_LIBRARY
+      HARFBUZZ_INCLUDE_DIR
+    VERSION_VAR HARFBUZZ_VERSION
+  )
+
+endif (HARFBUZZ_LIBRARY AND HARFBUZZ_INCLUDE_DIR)
+
+if(HARFBUZZ_FOUND)
+  set(HARFBUZZ_LIBRARIES ${HARFBUZZ_LIBRARY})
+  set(HARFBUZZ_INCLUDE_DIRS ${HARFBUZZ_INCLUDE_DIR})
+  if(NOT TARGET HarfBuzz::HarfBuzz)
     add_library(HarfBuzz::HarfBuzz UNKNOWN IMPORTED)
     set_target_properties(HarfBuzz::HarfBuzz PROPERTIES
-        IMPORTED_LOCATION ${HARFBUZZ_LIBRARY}
-        INTERFACE_INCLUDE_DIRECTORIES ${HARFBUZZ_INCLUDE_DIRS})
-endif()
-
-set(HARFBUZZ_LIBRARIES ${HARFBUZZ_LIBRARY})
+      IMPORTED_LOCATION "${HARFBUZZ_LIBRARIES}"
+      INTERFACE_COMPILE_DEFINITIONS "${HARFBUZZ_DEFINITIONS}"
+      INTERFACE_INCLUDE_DIRECTORIES "${HARFBUZZ_INCLUDE_DIRS}"
+    )
+  endif()
+endif(HARFBUZZ_FOUND)
diff --git a/cmake/modules/FindZSTD.cmake b/cmake/modules/FindZSTD.cmake
index 273d01924..007bc0ea9 100644
--- a/cmake/modules/FindZSTD.cmake
+++ b/cmake/modules/FindZSTD.cmake
@@ -90,7 +90,7 @@ endif()
 
 # Additionally try and use pkconfig to find libzstd
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_ZSTD QUIET libzstd)
 
 # ------------------------------------------------------------------------
@@ -114,13 +114,13 @@ find_path(ZSTD_INCLUDE_DIR zstd.h
 if(EXISTS "${ZSTD_INCLUDE_DIR}/zstd.h")
   file(STRINGS "${ZSTD_INCLUDE_DIR}/zstd.h" 
     _ZSTD_VERSION_MAJOR REGEX "^#define ZSTD_VERSION_MAJOR")
-  string(REGEX MATCH "[0-9]+" ZSTD_VERSION_MAJOR ${_ZSTD_VERSION_MAJOR})
+  string(REGEX MATCH "[0-9]+" ZSTD_VERSION_MAJOR "${_ZSTD_VERSION_MAJOR}")
   file(STRINGS "${ZSTD_INCLUDE_DIR}/zstd.h" 
     _ZSTD_VERSION_MINOR REGEX "^#define ZSTD_VERSION_MINOR")
-  string(REGEX MATCH "[0-9]+" ZSTD_VERSION_MINOR ${_ZSTD_VERSION_MINOR} )
+  string(REGEX MATCH "[0-9]+" ZSTD_VERSION_MINOR "${_ZSTD_VERSION_MINOR}")
   file(STRINGS "${ZSTD_INCLUDE_DIR}/zstd.h" 
     _ZSTD_VERSION_RELEASE REGEX "^#define ZSTD_VERSION_RELEASE")
-  string(REGEX MATCH "[0-9]+" ZSTD_VERSION_RELEASE ${_ZSTD_VERSION_RELEASE} )
+  string(REGEX MATCH "[0-9]+" ZSTD_VERSION_RELEASE "${_ZSTD_VERSION_RELEASE}")
   set(ZSTD_VERSION ${ZSTD_VERSION_MAJOR}.${ZSTD_VERSION_MINOR}.${ZSTD_VERSION_RELEASE})
 endif()
 
diff --git a/cmake/modules/Findlibunibreak.cmake b/cmake/modules/Findlibunibreak.cmake
index 34bb3b6f3..4a01e646f 100644
--- a/cmake/modules/Findlibunibreak.cmake
+++ b/cmake/modules/Findlibunibreak.cmake
@@ -3,8 +3,10 @@
 #
 #  LIBUNIBREAK_FOUND - system has libunibreak
 #  LIBUNIBREAK_INCLUDE_DIR - The include directory to use for the libunibreak headers
+#  LIBUNIBREAK_INCLUDE_DIRS - The same
 #  LIBUNIBREAK_LIBRARIES - Link these to use libunibreak
 #  LIBUNIBREAK_DEFINITIONS - Compiler switches required for using libunibreak
+#  LIBUNIBREAK_VERSION - The version of the libunibreak library which was found.
 
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -18,20 +20,23 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-if (LIBUNIBREAK_LIBRARIES AND LIBUNIBREAK_INCLUDE_DIR)
+mark_as_advanced(LIBUNIBREAK_LIBRARY LIBUNIBREAK_INCLUDE_DIR)
+
+if (LIBUNIBREAK_LIBRARY AND LIBUNIBREAK_INCLUDE_DIR)
 
   # in cache already
   set(LIBUNIBREAK_FOUND TRUE)
 
-else (LIBUNIBREAK_LIBRARIES AND LIBUNIBREAK_INCLUDE_DIR)
+else (LIBUNIBREAK_LIBRARY AND LIBUNIBREAK_INCLUDE_DIR)
 
   if (NOT MSVC)
     # use pkg-config to get the directories and then use these values
     # in the FIND_PATH() and FIND_LIBRARY() calls
-    find_package(PkgConfig)
-    pkg_check_modules(PC_LIBUNIBREAK libunibreak)
+    find_package(PkgConfig QUIET)
+    pkg_check_modules(PC_LIBUNIBREAK QUIET libunibreak)
 
     set(LIBUNIBREAK_DEFINITIONS ${PC_LIBUNIBREAK_CFLAGS_OTHER})
+    set(LIBUNIBREAK_VERSION ${PC_LIBUNIBREAK_VERSION})
   endif (NOT MSVC)
 
   find_path(LIBUNIBREAK_INCLUDE_DIR linebreak.h
@@ -40,15 +45,48 @@ else (LIBUNIBREAK_LIBRARIES AND LIBUNIBREAK_INCLUDE_DIR)
     ${PC_LIBUNIBREAK_INCLUDE_DIRS}
   )
 
-  find_library(LIBUNIBREAK_LIBRARIES NAMES unibreak
+  find_library(LIBUNIBREAK_LIBRARY NAMES unibreak
     PATHS
     ${PC_LIBUNIBREAK_LIBDIR}
     ${PC_LIBUNIBREAK_LIBRARY_DIRS}
   )
 
+  if (NOT LIBUNIBREAK_VERSION)
+    if(EXISTS "${LIBUNIBREAK_INCLUDE_DIR}/unibreakbase.h")
+      file(STRINGS "${LIBUNIBREAK_INCLUDE_DIR}/unibreakbase.h"
+        _LIBUNIBREAK_VERSION_MAJOR REGEX "^#define UNIBREAK_VERSION")
+      string(REGEX MATCH "0x[0-9]+" _LIBUNIBREAK_VERSION_MAJOR "${_LIBUNIBREAK_VERSION_MAJOR}")
+      string(REGEX REPLACE "0x([0-9][0-9])[0-9]+" "\\1" LIBUNIBREAK_VERSION_MAJOR "${_LIBUNIBREAK_VERSION_MAJOR}")
+      string(REGEX REPLACE "0([0-9])" "\\1" LIBUNIBREAK_VERSION_MAJOR "${LIBUNIBREAK_VERSION_MAJOR}")
+      file(STRINGS "${LIBUNIBREAK_INCLUDE_DIR}/unibreakbase.h"
+        _LIBUNIBREAK_VERSION_MINOR REGEX "^#define UNIBREAK_VERSION")
+      string(REGEX MATCH "0x[0-9]+" _LIBUNIBREAK_VERSION_MINOR "${_LIBUNIBREAK_VERSION_MINOR}")
+      string(REGEX REPLACE "0x[0-9][0-9]([0-9][0-9])" "\\1" LIBUNIBREAK_VERSION_MINOR "${_LIBUNIBREAK_VERSION_MINOR}")
+      string(REGEX REPLACE "0([0-9])" "\\1" LIBUNIBREAK_VERSION_MINOR "${LIBUNIBREAK_VERSION_MINOR}")
+      set(LIBUNIBREAK_VERSION ${LIBUNIBREAK_VERSION_MAJOR}.${LIBUNIBREAK_VERSION_MINOR})
+    endif()
+  endif()
+
   include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(libunibreak DEFAULT_MSG LIBUNIBREAK_LIBRARIES LIBUNIBREAK_INCLUDE_DIR)
+  find_package_handle_standard_args(libunibreak
+    FOUND_VAR LIBUNIBREAK_FOUND
+    REQUIRED_VARS
+      LIBUNIBREAK_LIBRARY
+      LIBUNIBREAK_INCLUDE_DIR
+    VERSION_VAR LIBUNIBREAK_VERSION
+  )
 
-  mark_as_advanced(LIBUNIBREAK_LIBRARIES LIBUNIBREAK_INCLUDE_DIR)
+endif (LIBUNIBREAK_LIBRARY AND LIBUNIBREAK_INCLUDE_DIR)
 
-endif (LIBUNIBREAK_LIBRARIES AND LIBUNIBREAK_INCLUDE_DIR)
+if(LIBUNIBREAK_FOUND)
+  set(LIBUNIBREAK_LIBRARIES ${LIBUNIBREAK_LIBRARY})
+  set(LIBUNIBREAK_INCLUDE_DIRS ${LIBUNIBREAK_INCLUDE_DIR})
+  if(NOT TARGET LIBUNIBREAK::libunibreak)
+    add_library(LIBUNIBREAK::libunibreak UNKNOWN IMPORTED)
+    set_target_properties(LIBUNIBREAK::libunibreak PROPERTIES
+      IMPORTED_LOCATION "${LIBUNIBREAK_LIBRARIES}"
+      INTERFACE_COMPILE_DEFINITIONS "${LIBUNIBREAK_DEFINITIONS}"
+      INTERFACE_INCLUDE_DIRECTORIES "${LIBUNIBREAK_INCLUDE_DIRS}"
+    )
+  endif()
+endif(LIBUNIBREAK_FOUND)
diff --git a/cmake/modules/Findutf8proc.cmake b/cmake/modules/Findutf8proc.cmake
index a1011a6e3..0e022f0bc 100644
--- a/cmake/modules/Findutf8proc.cmake
+++ b/cmake/modules/Findutf8proc.cmake
@@ -37,7 +37,7 @@ endif()
 
 # Additionally try and use pkconfig to find libutf8proc
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_UTF8PROC QUIET libutf8proc)
 
 # ------------------------------------------------------------------------

From fbaa217577b8d262714768e0a90ecaef4b272b98 Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Mon, 12 Jul 2021 15:34:32 +0400
Subject: [PATCH 10/35] Allow to use old FontConfig (older than 2.12.0) to
 support some Debian based distos.

---
 crengine/src/lvfont/lvfreetypefontman.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crengine/src/lvfont/lvfreetypefontman.cpp b/crengine/src/lvfont/lvfreetypefontman.cpp
index 57d6f577e..fb7d5f4c8 100644
--- a/crengine/src/lvfont/lvfreetypefontman.cpp
+++ b/crengine/src/lvfont/lvfreetypefontman.cpp
@@ -393,7 +393,10 @@ bool LVFreeTypeFontManager::initSystemFonts() {
         
         FcObjectSet *os = FcObjectSetBuild(FC_FILE, FC_WEIGHT, FC_FAMILY,
                                            FC_SLANT, FC_SPACING, FC_INDEX,
-                                           FC_STYLE, FC_SCALABLE, FC_COLOR,
+                                           FC_STYLE, FC_SCALABLE,
+#ifdef FC_COLOR
+                                           FC_COLOR,
+#endif
                                            NULL);
         FcPattern *pat = FcPatternCreate();
         //FcBool b = 1;
@@ -445,7 +448,9 @@ bool LVFreeTypeFontManager::initSystemFonts() {
                 weight = 200;
                 break;
             case FC_WEIGHT_LIGHT:         //    50
+#ifdef FC_WEIGHT_DEMILIGHT
             case FC_WEIGHT_DEMILIGHT:     //    55
+#endif
                 weight = 300;
                 break;
             case FC_WEIGHT_BOOK:          //    75

From 731f1ed970a412f199624752386442c71967883b Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Mon, 12 Jul 2021 23:39:39 +0400
Subject: [PATCH 11/35] Desktop (Qt): When parsing a gamma value string, the
 decimal point is always '.' char. So if a different decimal point character
 is used in the current locale, and if we use some library function to convert
 the string to floating point number, then it may fail. Therefore, added its
 own simplified implementation.

---
 crengine/include/lvstring.h |  4 ++
 crengine/src/lvdocview.cpp  |  8 +++-
 crengine/src/lvstring.cpp   | 82 +++++++++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/crengine/include/lvstring.h b/crengine/include/lvstring.h
index 55819b1a4..8cbc9dbee 100644
--- a/crengine/include/lvstring.h
+++ b/crengine/include/lvstring.h
@@ -1042,6 +1042,10 @@ class lString32
     bool atoi( int &n ) const;
     /// converts to 64 bit integer, returns true if success
     bool atoi( lInt64 &n ) const;
+    /// convert to double
+    double atod() const;
+    /// convert to double, returns true if success
+    bool atod( double &d, char dp = '.' ) const;
     /// returns constant c-string pointer
     const value_type * c_str() const { return pchunk->buf32; }
     /// returns constant c-string pointer, same as c_str()
diff --git a/crengine/src/lvdocview.cpp b/crengine/src/lvdocview.cpp
index aab7661ca..892ef5031 100644
--- a/crengine/src/lvdocview.cpp
+++ b/crengine/src/lvdocview.cpp
@@ -6676,10 +6676,14 @@ CRPropRef LVDocView::propsApply(CRPropRef props) {
         } else if (name == PROP_FONT_GAMMA) {
             double gamma = 1.0;
             lString32 s = props->getStringDef(PROP_FONT_GAMMA, "1.0");
-            lString8 s8 = UnicodeToUtf8(s);
-            if ( sscanf(s8.c_str(), "%lf", &gamma)==1 ) {
+            // When parsing a gamma value string, the decimal point is always '.' char.
+            // So if a different decimal point character is used in the current locale,
+            // and if we use some library function to convert the string to floating point number, then it may fail.
+            if (s.atod(gamma, '.')) {
                 fontMan->SetGamma(gamma);
                 clearImageCache();
+            } else {
+                CRLog::error("Invalid gamma value (%s)", LCSTR(s));
             }
         } else if (name == PROP_FONT_HINTING) {
             int mode = props->getIntDef(PROP_FONT_HINTING, (int)HINTING_MODE_AUTOHINT);
diff --git a/crengine/src/lvstring.cpp b/crengine/src/lvstring.cpp
index 9b2b5313c..776f79022 100644
--- a/crengine/src/lvstring.cpp
+++ b/crengine/src/lvstring.cpp
@@ -1541,6 +1541,88 @@ bool lString32::atoi( lInt64 &n ) const
     return *s=='\0' || *s==' ' || *s=='\t';
 }
 
+double lString32::atod() const {
+    double d = 0.0;
+    bool res = atod(d, '.');
+    return res ? d : 0.0;
+}
+
+bool lString32::atod( double &d, char dp ) const {
+    // Simplified implementation without overflow checking
+    int sign = 1;
+    unsigned long intg = 0;
+    unsigned long frac = 0;
+    unsigned long frac_div = 1;
+    unsigned int exp = 0;
+    int exp_sign = 1;
+    bool res = false;
+    const value_type * s = c_str();
+    while (*s == ' ' || *s == '\t')
+        s++;
+    if (*s == '-') {
+        sign = -1;
+        s++;
+    }
+    else if (*s == '+') {
+        s++;
+    }
+    if (*s>='0' && *s<='9') {
+        res = true;
+        while (*s>='0' && *s<='9') {
+            intg = intg * 10 + ( (*s)-'0' );
+            s++;
+        }
+    }
+    if (res && *s == dp) {
+        // decimal point found
+        s++;
+        res = false;
+        if (*s>='0' && *s<='9') {
+            res = true;
+            while (*s>='0' && *s<='9') {
+                frac = frac * 10 + ( (*s)-'0' );
+                s++;
+                frac_div *= 10;
+            }
+        }
+    }
+    if (res && (*s == 'e' || *s == 'E')) {
+        // exponent part
+        s++;
+        if (*s == '-') {
+            exp_sign = -1;
+            s++;
+        }
+        else if (*s == '+') {
+            s++;
+        }
+        res = false;
+        if (*s>='0' && *s<='9') {
+            res = true;
+            while (*s>='0' && *s<='9') {
+                exp = exp * 10 + ( (*s)-'0' );
+                s++;
+            }
+        }
+    }
+    if (res && (*s != '\0' && *s != ' ' && *s != '\t')) {
+        // unprocessed characters left
+        res = false;
+    }
+    d = (double)intg;
+    if (frac_div > 1)
+        d += ((double)frac)/((double)frac_div);
+    if (exp > 1) {
+        double pwr = exp_sign > 0 ? 10.0 : 0.1;
+        for (unsigned int i = 0; i < exp; i++) {
+            d *= pwr;
+        }
+    }
+    if (sign < 0)
+        d = -d;
+    return res;
+}
+
 #define STRING_HASH_MULT 31
 lUInt32 lString32::getHash() const
 {

From ad43e114c702d99cd99a38b2dabc12bf974a6ab5 Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Wed, 14 Jul 2021 22:47:34 +0400
Subject: [PATCH 12/35] Thirdparty repo: bump HarfBuzz to 2.8.2 version.

---
 thirdparty_repo/harfbuzz.meta.sh   | 4 ++--
 thirdparty_repo/repo_srcdirs.cmake | 2 +-
 thirdparty_repo/repo_srcdirs.mk    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/thirdparty_repo/harfbuzz.meta.sh b/thirdparty_repo/harfbuzz.meta.sh
index 7979aa792..da9d20a8a 100644
--- a/thirdparty_repo/harfbuzz.meta.sh
+++ b/thirdparty_repo/harfbuzz.meta.sh
@@ -2,12 +2,12 @@
 # Metadata for deploy script
 
 PN="harfbuzz"
-PV="2.8.0"
+PV="2.8.2"
 # package revision: when patchset is changed (but not version), increase it
 # when version changed, reset to "1".
 REV="1"
 SRCFILE="${PN}-${PV}.tar.xz"
-SHA512="0ece78fa5c18be1fd693f40493ff3689a297ef4d5ad82f31054e8f42c1ba4e8b93afe1ed1ccb9eb9a0f165f8d1343c12c0606f1768a4f85bb041ae65018e6d83"
+SHA512="47f672967ba9e9a1ea21164b9780cbaaad2f4f619811e84d1b6bdb598e5ad60c96e08fadd270460a4ce8e2fb4603fcdd881ba55f2826abc2a4ab439efdc856dc"
 
 URL="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${SRCFILE}"
 
diff --git a/thirdparty_repo/repo_srcdirs.cmake b/thirdparty_repo/repo_srcdirs.cmake
index af24bce47..87d1d6d32 100644
--- a/thirdparty_repo/repo_srcdirs.cmake
+++ b/thirdparty_repo/repo_srcdirs.cmake
@@ -5,7 +5,7 @@
 
 set(REPO_FREETYPE_SRCDIR "freetype-2.10.4")
 set(REPO_FRIBIDI_SRCDIR "fribidi-1.0.10")
-set(REPO_HARFBUZZ_SRCDIR "harfbuzz-2.8.0")
+set(REPO_HARFBUZZ_SRCDIR "harfbuzz-2.8.2")
 set(REPO_LIBJPEG_SRCDIR "jpeg-9d")
 set(REPO_LIBPNG_SRCDIR "libpng-1.6.37")
 set(REPO_LIBUNIBREAK_SRCDIR "libunibreak-4.3")
diff --git a/thirdparty_repo/repo_srcdirs.mk b/thirdparty_repo/repo_srcdirs.mk
index 7fcb636c9..0bfe60ec2 100644
--- a/thirdparty_repo/repo_srcdirs.mk
+++ b/thirdparty_repo/repo_srcdirs.mk
@@ -4,7 +4,7 @@
 
 REPO_FREETYPE_SRCDIR := freetype-2.10.4
 REPO_FRIBIDI_SRCDIR := fribidi-1.0.10
-REPO_HARFBUZZ_SRCDIR := harfbuzz-2.8.0
+REPO_HARFBUZZ_SRCDIR := harfbuzz-2.8.2
 REPO_LIBJPEG_SRCDIR := jpeg-9d
 REPO_LIBPNG_SRCDIR := libpng-1.6.37
 REPO_LIBUNIBREAK_SRCDIR := libunibreak-4.3

From 2d693aedd44c93d25c4d26bd6fe51ce86cc81c6c Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sat, 17 Jul 2021 22:50:52 +0400
Subject: [PATCH 13/35] Desktop/Qt: initial/default settings fixed: font gamma,
 status line visibility. Fixes/improvements in engine settings validations:
 simplifing, removing duplications.

---
 cr3qt/src/cr3widget.cpp    |   4 +
 cr3qt/src/settings.cpp     |   5 +-
 crengine/include/props.h   |   6 +-
 crengine/src/lvdocview.cpp | 247 +++++++++++++++----------------------
 crengine/src/props.cpp     |  43 +++++--
 5 files changed, 139 insertions(+), 166 deletions(-)

diff --git a/cr3qt/src/cr3widget.cpp b/cr3qt/src/cr3widget.cpp
index 67f959fd3..3b347ab7d 100644
--- a/cr3qt/src/cr3widget.cpp
+++ b/cr3qt/src/cr3widget.cpp
@@ -44,7 +44,9 @@ class CR3View::DocViewData
     CRPropRef _props;
 };
 
+#if USE_LIMITED_FONT_SIZES_SET
 DECL_DEF_CR_FONT_SIZES;
+#endif
 
 static void replaceColor( char * str, lUInt32 color )
 {
@@ -329,8 +331,10 @@ CR3View::CR3View( QWidget *parent)
     ldomXPointerEx p2;
     _selRange.setStart(p1);
     _selRange.setEnd(p2);
+#if USE_LIMITED_FONT_SIZES_SET
     LVArray<int> sizes( cr_font_sizes, sizeof(cr_font_sizes)/sizeof(int) );
     _docview->setFontSizes( sizes, false );
+#endif
 
     _docview->setBatteryIcons( getBatteryIcons(0x000000) );
     _docview->setBatteryState(CR_BATTERY_STATE_NO_BATTERY); // don't show battery
diff --git a/cr3qt/src/settings.cpp b/cr3qt/src/settings.cpp
index 6424e5457..9aff7b327 100644
--- a/cr3qt/src/settings.cpp
+++ b/cr3qt/src/settings.cpp
@@ -195,7 +195,6 @@ SettingsDlg::SettingsDlg(QWidget *parent, CR3View * docView ) :
     optionToUi( PROP_EMBEDDED_STYLES, m_ui->cbEnableDocumentStyles );
     optionToUi( PROP_EMBEDDED_FONTS, m_ui->cbEnableEmbeddedFonts );
     m_ui->cbEnableEmbeddedFonts->setEnabled(m_props->getBoolDef(PROP_EMBEDDED_STYLES, true));
-    optionToUi( PROP_TXT_OPTION_PREFORMATTED, m_ui->cbTxtPreFormatted );
     optionToUi( PROP_FONT_KERNING_ENABLED, m_ui->cbFontKerning );
     optionToUi( PROP_FLOATING_PUNCTUATION, m_ui->cbFloatingPunctuation );
     optionToUiIndex( PROP_IMG_SCALING_ZOOMIN_INLINE_MODE, m_ui->cbImageInlineZoominMode );
@@ -447,8 +446,8 @@ void SettingsDlg::on_buttonBox_accepted()
 
 void SettingsDlg::optionToUi( const char * optionName, QCheckBox * cb )
 {
-    int state = ( m_props->getIntDef( optionName, 1 ) != 0 ) ? 1 : 0;
-    CRLog::debug("optionToUI(%s,%d)", optionName, state);
+    bool state = m_props->getBoolDef( optionName, true );
+    CRLog::debug("optionToUI(%s,%d)", optionName, (int)state);
     cb->setCheckState( state ? Qt::Checked : Qt::Unchecked );
 }
 
diff --git a/crengine/include/props.h b/crengine/include/props.h
index 265451d64..f12e7ee46 100644
--- a/crengine/include/props.h
+++ b/crengine/include/props.h
@@ -66,9 +66,9 @@ class CRPropAccessor : public LVRefCounter {
     /// do validation and corrections
     virtual void limitValueList( const char * propName, const char * values[] );
     /// do validation and corrections
-    virtual void limitValueList( const char * propName, int values[], int value_count );
+    virtual void limitValueList( const char * propName, int values[], int valuesCount, int defValueIndex );
     /// do validation and corrections
-    virtual void limitValueList( const char * propName, int values[], int value_count, int defValueIndex );
+    virtual void limitValueMinMax( const char * propName, int minValue, int maxValue, int defValue );
 
     /// get int property by name, returns false if not found
     virtual bool getInt( const char * propName, int &result ) const;
@@ -93,6 +93,8 @@ class CRPropAccessor : public LVRefCounter {
     virtual bool getBoolDef( const char * propName, bool defValue=false ) const;
     /// set bool property by name
     virtual void setBool( const char * propName, bool value );
+    /// set bool property by name, if not exist or incorrect
+    virtual void setBoolDef( const char * propName, bool defValue );
 
     /// get lInt64 property by name, returns false if not found
     virtual bool getInt64( const char * propName, lInt64 &result ) const;
diff --git a/crengine/src/lvdocview.cpp b/crengine/src/lvdocview.cpp
index 892ef5031..bb0d4bd64 100644
--- a/crengine/src/lvdocview.cpp
+++ b/crengine/src/lvdocview.cpp
@@ -6442,141 +6442,115 @@ static const char * def_style_macros[] = {
 
 /// sets default property values if properties not found, checks ranges
 void LVDocView::propsUpdateDefaults(CRPropRef props) {
-	lString32Collection list;
-	fontMan->getFaceList(list);
-	static int def_aa_props[] = { font_aa_none, font_aa_big, font_aa_all, font_aa_gray, font_aa_lcd_rgb, font_aa_lcd_bgr, font_aa_lcd_pentile, font_aa_lcd_pentile_m, font_aa_lcd_v_rgb, font_aa_lcd_v_bgr, font_aa_lcd_v_pentile, font_aa_lcd_v_pentile_m };
-
-	props->setIntDef(PROP_MIN_FILE_SIZE_TO_CACHE,
-            300000); // ~6M
-	props->setIntDef(PROP_FORCED_MIN_FILE_SIZE_TO_CACHE,
-			DOCUMENT_CACHING_MIN_SIZE); // 32K
-	props->setIntDef(PROP_PROGRESS_SHOW_FIRST_PAGE, 1);
-
-	props->limitValueList(PROP_FONT_ANTIALIASING, def_aa_props,
-			sizeof(def_aa_props) / sizeof(int), 2);
-	props->setHexDef(PROP_FONT_COLOR, 0x000000);
-	props->setHexDef(PROP_BACKGROUND_COLOR, 0xFFFFFF);
-	props->setHexDef(PROP_STATUS_FONT_COLOR, 0xFF000000);
-//	props->setIntDef(PROP_TXT_OPTION_PREFORMATTED, 0);
-	props->setIntDef(PROP_AUTOSAVE_BOOKMARKS, 1);
-	props->setIntDef(PROP_DISPLAY_FULL_UPDATE_INTERVAL, 1);
-	props->setIntDef(PROP_DISPLAY_TURBO_UPDATE_MODE, 0);
-
-	lString8 defFontFace;
-	static const char * goodFonts[] = { "DejaVu Sans", "FreeSans",
-			"Liberation Sans", "Arial", "Verdana", NULL };
-	static const char * fallbackFonts = "Noto Color Emoji; Droid Sans Fallback; Noto Sans CJK SC; Noto Sans Arabic UI; Noto Sans Devanagari UI; FreeSans; FreeSerif; Noto Serif; Noto Sans; Arial Unicode MS";
-	for (int i = 0; goodFonts[i]; i++) {
-		if (list.contains(lString32(goodFonts[i]))) {
-			defFontFace = lString8(goodFonts[i]);
-			break;
-		}
-	}
-	if (defFontFace.empty())
-		defFontFace = UnicodeToUtf8(list[0]);
+    lString32Collection list;
+    fontMan->getFaceList(list);
+    static int aa_props[] = { font_aa_none, font_aa_big, font_aa_all, font_aa_gray, font_aa_lcd_rgb, font_aa_lcd_bgr, font_aa_lcd_pentile, font_aa_lcd_pentile_m, font_aa_lcd_v_rgb, font_aa_lcd_v_bgr, font_aa_lcd_v_pentile, font_aa_lcd_v_pentile_m };
+
+    props->setIntDef(PROP_MIN_FILE_SIZE_TO_CACHE,
+                     300000); // ~6M
+    props->setIntDef(PROP_FORCED_MIN_FILE_SIZE_TO_CACHE,
+                     DOCUMENT_CACHING_MIN_SIZE); // 32K
+    props->setIntDef(PROP_PROGRESS_SHOW_FIRST_PAGE, 1);
+
+    props->limitValueList(PROP_FONT_ANTIALIASING, aa_props,
+                          sizeof(aa_props) / sizeof(int), 2);
+    props->setHexDef(PROP_FONT_COLOR, 0x000000);
+    props->setHexDef(PROP_BACKGROUND_COLOR, 0xFFFFFF);
+    props->setHexDef(PROP_STATUS_FONT_COLOR, 0xFF000000);
+    props->setIntDef(PROP_AUTOSAVE_BOOKMARKS, 1);
+
+    lString8 defFontFace;
+    static const char * goodFonts[] = { "DejaVu Sans", "FreeSans",
+                                        "Noto Sans", "Liberation Sans", "Arial", "Verdana", NULL };
+    static const char * fallbackFonts = "Noto Color Emoji; Droid Sans Fallback; Noto Sans CJK SC; Noto Sans Arabic UI; Noto Sans Devanagari UI; FreeSans; FreeSerif; Noto Serif; Noto Sans; Arial Unicode MS";
+    for (int i = 0; goodFonts[i]; i++) {
+        if (list.contains(lString32(goodFonts[i]))) {
+            defFontFace = lString8(goodFonts[i]);
+            break;
+        }
+    }
+    if (defFontFace.empty())
+        defFontFace = UnicodeToUtf8(list[0]);
 
-	lString8 defStatusFontFace(DEFAULT_STATUS_FONT_NAME);
-	props->setStringDef(PROP_FONT_FACE, defFontFace.c_str());
-	props->setStringDef(PROP_STATUS_FONT_FACE, defStatusFontFace.c_str());
-	if (list.length() > 0 && !list.contains(props->getStringDef(PROP_FONT_FACE,
-			defFontFace.c_str())))
-		props->setString(PROP_FONT_FACE, list[0]);
-	props->setStringDef(PROP_FALLBACK_FONT_FACES, fallbackFonts);
+    lString8 defStatusFontFace(DEFAULT_STATUS_FONT_NAME);
+    props->setStringDef(PROP_FONT_FACE, defFontFace.c_str());
+    props->setStringDef(PROP_STATUS_FONT_FACE, defStatusFontFace.c_str());
+    if (list.length() > 0 && !list.contains(props->getStringDef(PROP_FONT_FACE,
+                                                                defFontFace.c_str())))
+        props->setString(PROP_FONT_FACE, list[0]);
+    props->setStringDef(PROP_FALLBACK_FONT_FACES, fallbackFonts);
 
 #if USE_LIMITED_FONT_SIZES_SET
-	props->setIntDef(PROP_FONT_SIZE,
-			m_font_sizes[m_font_sizes.length() * 2 / 3]);
-	props->limitValueList(PROP_FONT_SIZE, m_font_sizes.ptr(),
-			m_font_sizes.length());
+    props->limitValueList(PROP_FONT_SIZE, m_font_sizes.ptr(),
+                          m_font_sizes.length(), m_font_sizes.length() * 2 / 3);
 #else
-	props->setIntDef(PROP_FONT_SIZE, m_min_font_size + (m_min_font_size + m_max_font_size)/7);
+    props->limitValueMinMax(PROP_FONT_SIZE, m_min_font_size, m_max_font_size,
+                            m_min_font_size + (m_min_font_size + m_max_font_size)/7);
 #endif
-	props->limitValueList(PROP_INTERLINE_SPACE, cr_interline_spaces,
-			sizeof(cr_interline_spaces) / sizeof(int), 20);
+    props->limitValueList(PROP_INTERLINE_SPACE, cr_interline_spaces,
+                          sizeof(cr_interline_spaces) / sizeof(int), 20);
 #if CR_INTERNAL_PAGE_ORIENTATION==1
-	static int def_rot_angle[] = {0, 1, 2, 3};
-	props->limitValueList( PROP_ROTATE_ANGLE, def_rot_angle, 4 );
+    props->limitValueMinMax( PROP_ROTATE_ANGLE, 0, 3, 0 );
 #endif
-	static int bool_options_def_true[] = { 1, 0 };
-	static int bool_options_def_false[] = { 0, 1 };
-	static int int_option_weight[] = { 100, 200, 300, 400, 425, 450, 475, 500, 525, 550, 600, 650, 700, 800, 900, 950 };
-
-	props->limitValueList(PROP_FONT_BASE_WEIGHT, int_option_weight, sizeof(int_option_weight) / sizeof(int), 3);
+    static int int_option_weight[] = { 100, 200, 300, 400, 425, 450, 475, 500, 525, 550, 600, 650, 700, 800, 900, 950 };
+    props->limitValueList(PROP_FONT_BASE_WEIGHT, int_option_weight, sizeof(int_option_weight) / sizeof(int), 3);
 #ifndef ANDROID
-	props->limitValueList(PROP_EMBEDDED_STYLES, bool_options_def_true, 2);
-	props->limitValueList(PROP_EMBEDDED_FONTS, bool_options_def_true, 2);
+    props->setBoolDef(PROP_EMBEDDED_STYLES, true);
+    props->setBoolDef(PROP_EMBEDDED_FONTS, true);
+    props->setBoolDef(PROP_TXT_OPTION_PREFORMATTED, false);
 #endif
-	static int int_option_hinting[] = { 0, 1, 2 };
-	props->limitValueList(PROP_FONT_HINTING, int_option_hinting, 3);
-    static int int_option_shaping[] = { 1, 0, 2 };
-    props->limitValueList(PROP_FONT_SHAPING, int_option_shaping, 3);
-    static int int_options_1_2[] = { 2, 1 };
-	props->limitValueList(PROP_LANDSCAPE_PAGES, int_options_1_2, 2);
-	props->limitValueList(PROP_PAGE_VIEW_MODE, bool_options_def_true, 2);
-	props->limitValueList(PROP_FOOTNOTES, bool_options_def_true, 2);
-	props->limitValueList(PROP_SHOW_TIME, bool_options_def_false, 2);
-	props->limitValueList(PROP_DISPLAY_INVERSE, bool_options_def_false, 2);
-	props->limitValueList(PROP_BOOKMARK_ICONS, bool_options_def_false, 2);
-    props->limitValueList(PROP_FONT_KERNING_ENABLED, bool_options_def_false, 2);
-    //props->limitValueList(PROP_FLOATING_PUNCTUATION, bool_options_def_true, 2);
-    static int def_bookmark_highlight_modes[] = { 0, 1, 2 };
-    props->setIntDef(PROP_HIGHLIGHT_COMMENT_BOOKMARKS, highlight_mode_underline);
-    props->limitValueList(PROP_HIGHLIGHT_COMMENT_BOOKMARKS, def_bookmark_highlight_modes, sizeof(def_bookmark_highlight_modes)/sizeof(int));
+    props->limitValueMinMax(PROP_FONT_HINTING, 0, 2, 0);
+    props->limitValueMinMax(PROP_FONT_SHAPING, 0, 2, 1);
+    props->limitValueMinMax(PROP_LANDSCAPE_PAGES, 1, 2, 2);
+    props->setBoolDef(PROP_PAGE_VIEW_MODE, true);
+    props->setBoolDef(PROP_FOOTNOTES, true);
+    props->setBoolDef(PROP_DISPLAY_INVERSE, false);
+    props->setBoolDef(PROP_BOOKMARK_ICONS, false);
+    props->setBoolDef(PROP_FONT_KERNING_ENABLED, false);
+    props->setBoolDef(PROP_FLOATING_PUNCTUATION, true);
+    props->limitValueMinMax(PROP_HIGHLIGHT_COMMENT_BOOKMARKS, 0, 2, (int)highlight_mode_underline);
     props->setColorDef(PROP_HIGHLIGHT_SELECTION_COLOR, 0xC0C0C0); // silver
     props->setColorDef(PROP_HIGHLIGHT_BOOKMARK_COLOR_COMMENT, 0xA08020); // yellow
     props->setColorDef(PROP_HIGHLIGHT_BOOKMARK_COLOR_CORRECTION, 0xA04040); // red
 
-    static int def_status_line[] = { 0, 1, 2 };
-	props->limitValueList(PROP_STATUS_LINE, def_status_line, 3);
-    static int def_margin[] = {8, 0, 1, 2, 3, 4, 5, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 25, 30, 40, 50, 60, 80, 100, 130, 150, 200, 300};
-	props->limitValueList(PROP_PAGE_MARGIN_TOP, def_margin, sizeof(def_margin)/sizeof(int));
-	props->limitValueList(PROP_PAGE_MARGIN_BOTTOM, def_margin, sizeof(def_margin)/sizeof(int));
-	props->limitValueList(PROP_PAGE_MARGIN_LEFT, def_margin, sizeof(def_margin)/sizeof(int));
-	props->limitValueList(PROP_PAGE_MARGIN_RIGHT, def_margin, sizeof(def_margin)/sizeof(int));
-    static int def_rounded_corners_margin[] = {0, 5, 10, 15, 20, 30, 40, 50, 60, 70,80, 90, 100, 120, 140, 160};
-    props->limitValueList(PROP_ROUNDED_CORNERS_MARGIN, def_rounded_corners_margin, sizeof(def_rounded_corners_margin)/sizeof(int));
-
-    static int def_updates[] = { 1, 0, 2, 3, 4, 5, 6, 7, 8, 10, 14 };
-	props->limitValueList(PROP_DISPLAY_FULL_UPDATE_INTERVAL, def_updates, 11);
-	int fs = props->getIntDef(PROP_STATUS_FONT_SIZE, INFO_FONT_SIZE);
-    if (fs < MIN_STATUS_FONT_SIZE)
-        fs = MIN_STATUS_FONT_SIZE;
-    else if (fs > MAX_STATUS_FONT_SIZE)
-        fs = MAX_STATUS_FONT_SIZE;
-	props->setIntDef(PROP_STATUS_FONT_SIZE, fs);
-    props->limitValueList(PROP_TEXTLANG_EMBEDDED_LANGS_ENABLED, bool_options_def_false, 2);
-    props->limitValueList(PROP_TEXTLANG_HYPHENATION_ENABLED, bool_options_def_true, 2);
-	lString32 hyph = props->getStringDef(PROP_HYPHENATION_DICT,
-			DEF_HYPHENATION_DICT);
-	HyphDictionaryList * dictlist = HyphMan::getDictList();
-	if (dictlist) {
-		if (dictlist->find(hyph))
-			props->setStringDef(PROP_HYPHENATION_DICT, hyph);
-		else
-			props->setStringDef(PROP_HYPHENATION_DICT, lString32(
-					HYPH_DICT_ID_ALGORITHM));
-	}
-	props->setIntDef(PROP_STATUS_LINE, 1);
-	props->setIntDef(PROP_SHOW_TITLE, 1);
-	props->setIntDef(PROP_SHOW_TIME, 1);
-	props->setIntDef(PROP_SHOW_TIME_12HOURS, 0);
-	props->setIntDef(PROP_SHOW_BATTERY, 1);
-    props->setIntDef(PROP_SHOW_BATTERY_PERCENT, 0);
-    props->setIntDef(PROP_SHOW_PAGE_COUNT, 1);
-    props->setIntDef(PROP_SHOW_PAGE_NUMBER, 1);
-    props->setIntDef(PROP_SHOW_POS_PERCENT, 0);
-    props->setIntDef(PROP_STATUS_CHAPTER_MARKS, 1);
-    props->setIntDef(PROP_FLOATING_PUNCTUATION, 1);
-
-#ifndef ANDROID
-    props->setIntDef(PROP_EMBEDDED_STYLES, 1);
-    props->setIntDef(PROP_EMBEDDED_FONTS, 1);
-    props->setIntDef(PROP_TXT_OPTION_PREFORMATTED, 0);
-    props->limitValueList(PROP_TXT_OPTION_PREFORMATTED, bool_options_def_false,
-            2);
-#endif
+    props->limitValueMinMax(PROP_STATUS_LINE, 0, 2, 1);
+    props->setBoolDef(PROP_SHOW_TIME, true);
+    props->setBoolDef(PROP_SHOW_TITLE, true);
+    props->setBoolDef(PROP_SHOW_TIME_12HOURS, false);
+    props->setBoolDef(PROP_SHOW_BATTERY, true);
+    props->setBoolDef(PROP_SHOW_BATTERY_PERCENT, false);
+    props->setBoolDef(PROP_SHOW_PAGE_COUNT, true);
+    props->setBoolDef(PROP_SHOW_PAGE_NUMBER, true);
+    props->setBoolDef(PROP_SHOW_POS_PERCENT, false);
+    props->setBoolDef(PROP_STATUS_CHAPTER_MARKS, true);
+
+    static int margin_options[] = {0, 1, 2, 3, 4, 5, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 25, 30, 40, 50, 60, 80, 100, 130, 150, 200, 300};
+    props->limitValueList(PROP_PAGE_MARGIN_TOP, margin_options, sizeof(margin_options)/sizeof(int), 6);
+    props->limitValueList(PROP_PAGE_MARGIN_BOTTOM, margin_options, sizeof(margin_options)/sizeof(int), 6);
+    props->limitValueList(PROP_PAGE_MARGIN_LEFT, margin_options, sizeof(margin_options)/sizeof(int), 6);
+    props->limitValueList(PROP_PAGE_MARGIN_RIGHT, margin_options, sizeof(margin_options)/sizeof(int), 6);
+    static int rounded_corners_margin_options[] = {0, 5, 10, 15, 20, 30, 40, 50, 60, 70,80, 90, 100, 120, 140, 160};
+    props->limitValueList(PROP_ROUNDED_CORNERS_MARGIN, rounded_corners_margin_options, sizeof(rounded_corners_margin_options)/sizeof(int), 0);
+
+    static int screen_updates_options[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 14 };
+    props->limitValueList(PROP_DISPLAY_FULL_UPDATE_INTERVAL, screen_updates_options, sizeof(screen_updates_options)/sizeof(int), 1);
+    props->setBoolDef(PROP_DISPLAY_TURBO_UPDATE_MODE, false);
+    props->limitValueMinMax(PROP_STATUS_FONT_SIZE, MIN_STATUS_FONT_SIZE, MAX_STATUS_FONT_SIZE, INFO_FONT_SIZE);
+
+    props->setBoolDef(PROP_TEXTLANG_EMBEDDED_LANGS_ENABLED, false);
+    props->setBoolDef(PROP_TEXTLANG_HYPHENATION_ENABLED, true);
+    lString32 hyph = props->getStringDef(PROP_HYPHENATION_DICT,
+                                         DEF_HYPHENATION_DICT);
+    HyphDictionaryList * dictlist = HyphMan::getDictList();
+    if (dictlist) {
+        if (dictlist->find(hyph))
+            props->setStringDef(PROP_HYPHENATION_DICT, hyph);
+        else
+            props->setStringDef(PROP_HYPHENATION_DICT, lString32(
+                                    HYPH_DICT_ID_ALGORITHM));
+    }
 
-    props->setStringDef(PROP_FONT_GAMMA, "1.00");
+    props->setStringDef(PROP_FONT_GAMMA, "1.0");
 
     img_scaling_option_t defImgScaling;
     props->setIntDef(PROP_IMG_SCALING_ZOOMOUT_BLOCK_SCALE, defImgScaling.max_scale);
@@ -6588,33 +6562,10 @@ void LVDocView::propsUpdateDefaults(CRPropRef props) {
     props->setIntDef(PROP_IMG_SCALING_ZOOMIN_BLOCK_MODE, defImgScaling.mode);
     props->setIntDef(PROP_IMG_SCALING_ZOOMIN_INLINE_MODE, defImgScaling.mode);
 
-    int p = props->getIntDef(PROP_FORMAT_SPACE_WIDTH_SCALE_PERCENT, DEF_SPACE_WIDTH_SCALE_PERCENT);
-    if (p<10)
-        p = 10;
-    if (p>500)
-        p = 500;
-    props->setInt(PROP_FORMAT_SPACE_WIDTH_SCALE_PERCENT, p);
-
-    p = props->getIntDef(PROP_FORMAT_MIN_SPACE_CONDENSING_PERCENT, DEF_MIN_SPACE_CONDENSING_PERCENT);
-    if (p<25)
-        p = 25;
-    if (p>100)
-        p = 100;
-    props->setInt(PROP_FORMAT_MIN_SPACE_CONDENSING_PERCENT, p);
-
-    p = props->getIntDef(PROP_FORMAT_UNUSED_SPACE_THRESHOLD_PERCENT, DEF_UNUSED_SPACE_THRESHOLD_PERCENT);
-    if (p<0)
-        p = 0;
-    if (p>20)
-        p = 20;
-    props->setInt(PROP_FORMAT_UNUSED_SPACE_THRESHOLD_PERCENT, p);
-
-    p = props->getIntDef(PROP_FORMAT_MAX_ADDED_LETTER_SPACING_PERCENT, DEF_MAX_ADDED_LETTER_SPACING_PERCENT);
-    if (p<0)
-        p = 0;
-    if (p>20)
-        p = 20;
-    props->setInt(PROP_FORMAT_MAX_ADDED_LETTER_SPACING_PERCENT, p);
+    props->limitValueMinMax(PROP_FORMAT_SPACE_WIDTH_SCALE_PERCENT, 10, 500, DEF_SPACE_WIDTH_SCALE_PERCENT);
+    props->limitValueMinMax(PROP_FORMAT_MIN_SPACE_CONDENSING_PERCENT, 25, 100, DEF_MIN_SPACE_CONDENSING_PERCENT);
+    props->limitValueMinMax(PROP_FORMAT_UNUSED_SPACE_THRESHOLD_PERCENT, 0, 20, DEF_UNUSED_SPACE_THRESHOLD_PERCENT);
+    props->limitValueMinMax(PROP_FORMAT_MAX_ADDED_LETTER_SPACING_PERCENT, 0, 20, DEF_MAX_ADDED_LETTER_SPACING_PERCENT);
 
 #ifndef ANDROID
     props->setIntDef(PROP_RENDER_DPI, DEF_RENDER_DPI); // 96 dpi
diff --git a/crengine/src/props.cpp b/crengine/src/props.cpp
index 3e0711278..978a86811 100644
--- a/crengine/src/props.cpp
+++ b/crengine/src/props.cpp
@@ -254,27 +254,37 @@ void CRPropAccessor::limitValueList( const char * propName, const char * values[
     setString( propName, defValue );
 }
 
-void CRPropAccessor::limitValueList( const char * propName, int values[], int value_count )
+void CRPropAccessor::limitValueList(const char * propName, int values[], int valuesCount, int defValueIndex )
 {
-    limitValueList( propName, values, value_count, 0 );
-}
-
-void CRPropAccessor::limitValueList( const char * propName, int values[], int value_count, int defValueIndex )
-{
-    if ( defValueIndex < 0 )
-        defValueIndex = 0;
-    else if ( defValueIndex >= value_count )
-        defValueIndex = value_count - 1;
-    lString32 defValue = lString32::itoa( values[defValueIndex] );
     lString32 value;
     if ( getString( propName, value ) ) {
-        for ( int i=0; i < value_count; i++ ) {
+        for ( int i=0; i < valuesCount; i++ ) {
             lString32 v = lString32::itoa( values[i] );
             if ( v==value )
                 return;
         }
     }
-    setString( propName, defValue );
+    if ( defValueIndex < 0 )
+        defValueIndex = 0;
+    else if ( defValueIndex >= valuesCount )
+        defValueIndex = valuesCount - 1;
+    setInt( propName, values[defValueIndex] );
+}
+
+void CRPropAccessor::limitValueMinMax( const char * propName, int minValue, int maxValue, int defValue )
+{
+    lString32 value;
+    if ( getString( propName, value ) ) {
+        int intValue;
+        if ( value.atoi(intValue) ) {
+            if (intValue < minValue)
+                setInt( propName, minValue );
+            else if (intValue >= maxValue)
+                setInt( propName, maxValue );
+            return;
+        }
+    }
+    setInt( propName, defValue );
 }
 
 //============================================================================
@@ -477,6 +487,13 @@ void CRPropAccessor::setBool( const char * propName, bool value )
     setString( propName, lString32( value ? "1" : "0" ) );
 }
 
+void CRPropAccessor::setBoolDef( const char * propName, bool defValue )
+{
+    bool boolVal;
+    if ( !getBool( propName, boolVal ) )
+        setBool( propName, defValue );
+}
+
 bool CRPropAccessor::getInt64( const char * propName, lInt64 &result ) const
 {
     lString32 value;

From 1aa752b68ae83cca281579b13be9308e065975bf Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sun, 18 Jul 2021 01:43:14 +0400
Subject: [PATCH 14/35] Desktop/Qt: 100% battery icon size fixed.

---
 cr3qt/src/cr3widget.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cr3qt/src/cr3widget.cpp b/cr3qt/src/cr3widget.cpp
index 3b347ab7d..1f4d23744 100644
--- a/cr3qt/src/cr3widget.cpp
+++ b/cr3qt/src/cr3widget.cpp
@@ -92,8 +92,6 @@ static LVRefVec<LVImageSource>& getBatteryIcons( lUInt32 color )
         ".0..0.XXXX.XXXX.XXXX.XXXX.0.",
         ".0..0.XXXX.XXXX.XXXX.XXXX.0.",
         ".0..0.XXXX.XXXX.XXXX.XXXX.0.",
-        ".0..0.XXXX.XXXX.XXXX.XXXX.0.",
-        ".0..0.XXXX.XXXX.XXXX.XXXX.0.",
         ".0000.XXXX.XXXX.XXXX.XXXX.0.",
         "....0.XXXX.XXXX.XXXX.XXXX.0.",
         "   .0.....................0.",

From 436a1b8f5a7a769dcae2e18ddff00f4ab7cbafae Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sun, 18 Jul 2021 01:45:47 +0400
Subject: [PATCH 15/35] Fixed LVDocView::drawPageHeader(): incorrect battery
 icon position fixed, text is vertically centered.

---
 crengine/include/lvdocview.h |  2 +-
 crengine/src/lvdocview.cpp   | 55 ++++++++++++++++++++++--------------
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/crengine/include/lvdocview.h b/crengine/include/lvdocview.h
index f783703de..449fafb64 100644
--- a/crengine/include/lvdocview.h
+++ b/crengine/include/lvdocview.h
@@ -702,7 +702,7 @@ class LVDocView : public CacheLoadingCallback
     /// draw page header to buffer
     virtual void drawPageHeader( LVDrawBuf * drawBuf, const lvRect & headerRc, int pageIndex, int headerInfoFlags, int pageCount );
     /// draw battery state to buffer
-    virtual void drawBatteryState( LVDrawBuf * drawBuf, const lvRect & rc, bool isVertical );
+    virtual void drawBatteryState(LVDrawBuf * drawBuf, const lvRect & rc);
 
     /// returns background color
     lUInt32 getBackgroundColor() const { return m_backgroundColor; }
diff --git a/crengine/src/lvdocview.cpp b/crengine/src/lvdocview.cpp
index bb0d4bd64..482f268e1 100644
--- a/crengine/src/lvdocview.cpp
+++ b/crengine/src/lvdocview.cpp
@@ -1377,8 +1377,8 @@ int LVDocView::getPageHeaderHeight() const {
 	int h = getInfoFont()->getHeight();
 	int navbarh = scaleForRenderDPI(HEADER_NAVBAR_H);
 	int bh = m_batteryIcons.length()>0 ? m_batteryIcons[0]->GetHeight() : 0;
-	if ( bh>h )
-		h = bh;
+	if ( bh + 2 > h )
+		h = bh + 2;
 	return h + (navbarh + HEADER_MARGIN + 1)/2;
 }
 
@@ -1426,8 +1426,7 @@ lString32 LVDocView::getTimeString() const {
 }
 
 /// draw battery state to buffer
-void LVDocView::drawBatteryState(LVDrawBuf * drawbuf, const lvRect & batteryRc,
-		bool /*isVertical*/) {
+void LVDocView::drawBatteryState(LVDrawBuf * drawbuf, const lvRect & batteryRc) {
 	if (m_battery_state == CR_BATTERY_STATE_NO_BATTERY)
 		return;
 	LVDrawStateSaver saver(*drawbuf);
@@ -1793,7 +1792,7 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 			gpos = info.bottom - (markh+1)/2;
 			break;
 		case PAGE_HEADER_POS_BOTTOM:
-			gpos = info.top + (markh+1)/2;
+			gpos = info.top + markh/2;
 			break;
 		default:
 			break;
@@ -1857,13 +1856,13 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 	// draw icons & text info
 	drawbuf->SetTextColor(cl1);
 	lString32 text;
-	int iy = 0;
+	int texty = 0;
 	switch (m_pageHeaderPos) {
 		case PAGE_HEADER_POS_TOP:
-			iy = info.top - HEADER_MARGIN/2;
+			texty = info.top + (gpos - info.top - thinw - m_infoFont->getHeight())/2;
 			break;
 		case PAGE_HEADER_POS_BOTTOM:
-			iy = gpos + 2;
+			texty = gpos + thinw + 2 + (info.bottom - gpos - thinw - m_infoFont->getHeight())/2;
 			break;
 		default:
 			break;
@@ -1873,7 +1872,7 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 	} else {
 		if (getVisiblePageCount() == 1 || !(pageIndex & 1)) {
 			int dwIcons = 0;
-			int icony = iy + m_infoFont->getHeight() / 2;
+			int icony = texty + m_infoFont->getHeight() / 2;
 			for (int ni = 0; ni < m_headerIcons.length(); ni++) {
 				LVImageSourceRef icon = m_headerIcons[ni];
 				int h = icon->GetHeight();
@@ -1891,17 +1890,31 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 				brc.right -= 2;
 				//brc.top += 1;
 				//brc.bottom -= 2;
-				int h = brc.height();
-				int batteryIconWidth = 32;
-				if (m_batteryIcons.length() > 0)
+				switch (m_pageHeaderPos) {
+				default:
+				case PAGE_HEADER_POS_TOP:
+					brc.bottom -= markh;
+					break;
+				case PAGE_HEADER_POS_BOTTOM:
+					brc.top = gpos + thinw + 1;
+					break;
+				}
+				int batteryIconWidth = 28;
+				int batteryIconHeight = 15;
+				if (m_batteryIcons.length() > 0) {
 					batteryIconWidth = m_batteryIcons[0]->GetWidth();
-				bool isVertical = (h > 30);
-				//if ( isVertical )
-				//    brc.left = brc.right - brc.height()/2;
-				//else
+					batteryIconHeight = m_batteryIcons[0]->GetHeight();
+				}
 				brc.left = brc.right - batteryIconWidth - 2;
-				brc.bottom -= markh;
-				drawBatteryState(drawbuf, brc, isVertical);
+				if (brc.height() < batteryIconHeight) {
+					int h_inc = batteryIconHeight - brc.height();
+					if (PAGE_HEADER_POS_TOP == m_pageHeaderPos) {
+						brc.bottom += h_inc;
+					} else if (PAGE_HEADER_POS_BOTTOM == m_pageHeaderPos) {
+						brc.top -= h_inc;
+					}
+				}
+				drawBatteryState(drawbuf, brc);
 				info.right = brc.left - info.height() / 2;
 			}
 		}
@@ -1936,7 +1949,7 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 		int piw = 0;
 		if (!pageinfo.empty()) {
 			piw = m_infoFont->getTextWidth(pageinfo.c_str(), pageinfo.length());
-			m_infoFont->DrawTextString(drawbuf, info.right - piw, iy,
+			m_infoFont->DrawTextString(drawbuf, info.right - piw, texty,
 					pageinfo.c_str(), pageinfo.length(), U' ', NULL, false);
 			info.right -= piw + info.height() / 2;
 		}
@@ -1944,7 +1957,7 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 			lString32 clock = getTimeString();
 			m_last_clock = clock;
 			int w = m_infoFont->getTextWidth(clock.c_str(), clock.length()) + 2;
-			m_infoFont->DrawTextString(drawbuf, info.right - w, iy,
+			m_infoFont->DrawTextString(drawbuf, info.right - w, texty,
 					clock.c_str(), clock.length(), U' ', NULL, false);
 			info.right -= w + info.height() / 2;
 		}
@@ -1987,7 +2000,7 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 	drawbuf->SetClipRect(&newcr);
 	text = fitTextWidthWithEllipsis(text, m_infoFont, newcr.width());
 	if (!text.empty()) {
-		m_infoFont->DrawTextString(drawbuf, info.left, iy, text.c_str(),
+		m_infoFont->DrawTextString(drawbuf, info.left, texty, text.c_str(),
 				text.length(), U' ', NULL, false);
 	}
 	drawbuf->SetClipRect(&oldcr);

From b4c61ccaadeae1b4fb5c2481714bbe42bc1bc390 Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sun, 18 Jul 2021 09:41:41 +0400
Subject: [PATCH 16/35] LVDocView: removed deprecated/unused functions:
 drawNavigationBar(), getNavigationBarRectangle().

---
 crengine/include/lvdocview.h |  7 -------
 crengine/src/lvdocview.cpp   | 28 ----------------------------
 2 files changed, 35 deletions(-)

diff --git a/crengine/include/lvdocview.h b/crengine/include/lvdocview.h
index 449fafb64..788948949 100644
--- a/crengine/include/lvdocview.h
+++ b/crengine/include/lvdocview.h
@@ -391,13 +391,6 @@ class LVDocView : public CacheLoadingCallback
     void updateDocStyleSheet();
 
 protected:
-    // deprecated: ready to remove
-    virtual void drawNavigationBar( LVDrawBuf * drawbuf, int pageIndex, int percent );
-    // deprecated: ready to remove
-    virtual void getNavigationBarRectangle( lvRect & rc );
-    // deprecated: ready to remove
-    virtual void getNavigationBarRectangle( int pageIndex, lvRect & rc );
-
     /// returns document offset for next page
     int getNextPageOffset();
     /// returns document offset for previous page
diff --git a/crengine/src/lvdocview.cpp b/crengine/src/lvdocview.cpp
index 482f268e1..17a7da3cb 100644
--- a/crengine/src/lvdocview.cpp
+++ b/crengine/src/lvdocview.cpp
@@ -1704,34 +1704,6 @@ void LVDocView::getPageRectangle(int pageIndex, lvRect & pageRect) const {
 		pageRect = m_pageRects[1];
 }
 
-// deprecated: ready to remove
-void LVDocView::getNavigationBarRectangle(lvRect & navRect) {
-	getNavigationBarRectangle(getVisiblePageCount() == 2 ? 1 : 2, navRect);
-}
-
-// deprecated: ready to remove
-void LVDocView::getNavigationBarRectangle(int pageIndex, lvRect & navRect) {
-	lvRect headerRect;
-	getPageHeaderRectangle(pageIndex, headerRect);
-	navRect = headerRect;
-	if (headerRect.bottom <= headerRect.top)
-		return;
-	navRect.top = navRect.bottom - 6;
-}
-
-// deprecated: ready to remove
-void LVDocView::drawNavigationBar(LVDrawBuf * drawbuf, int pageIndex,
-		int percent) {
-    CR_UNUSED2(drawbuf, percent);
-	//LVArray<int> & sbounds = getSectionBounds();
-	lvRect navBar;
-	getNavigationBarRectangle(pageIndex, navBar);
-	//bool leftPage = (getVisiblePageCount()==2 && !(pageIndex&1) );
-
-	//lUInt32 cl1 = 0xA0A0A0;
-	//lUInt32 cl2 = getBackgroundColor();
-}
-
 /// sets battery state
 bool LVDocView::setBatteryState(int newState) {
 	if (m_battery_state == newState)

From 4f8c40cbf781bb839a0bc4110b98d1115e5ee6ed Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sun, 18 Jul 2021 13:19:35 +0400
Subject: [PATCH 17/35] crengine: section (chapter) marks on the reading
 (navigation) bar are displayed up to level 3. Previously, only the first
 level sections were displayed. If the number of section marks exceeds the
 maximum possible number, all section marks of maximum nesting are not
 displayed up to the topmost level.

---
 crengine/include/lvdocview.h |   4 +-
 crengine/src/lvdocview.cpp   | 115 +++++++++++++++++++++--------------
 2 files changed, 72 insertions(+), 47 deletions(-)

diff --git a/crengine/include/lvdocview.h b/crengine/include/lvdocview.h
index 788948949..aa1d1edb7 100644
--- a/crengine/include/lvdocview.h
+++ b/crengine/include/lvdocview.h
@@ -403,6 +403,8 @@ class LVDocView : public CacheLoadingCallback
     bool getCursorDocRect( ldomXPointer ptr, lvRect & rc );
     /// load document from stream (internal)
     bool loadDocumentInt( LVStreamRef stream, bool metadataOnly = false );
+    /// get section bounds for specific root node and specific section depth level, in 1/100 of percent
+    void getSectionBoundsInt( LVArray<int>& bounds, ldomNode* node , lUInt16 section_id, int target_level, int level );
 public:
     /// get outer (before margins are applied) page rectangle
     virtual void getPageRectangle( int pageIndex, lvRect & pageRect ) const;
@@ -639,7 +641,7 @@ class LVDocView : public CacheLoadingCallback
     /// returns true if document is opened
     bool isDocumentOpened();
     /// returns section bounds, in 1/100 of percent
-    LVArray<int> & getSectionBounds( bool for_external_update=false );
+    LVArray<int> & getSectionBounds( int max_count, int depth, bool for_external_update=false );
     /// sets battery state
     virtual bool setBatteryState( int newState );
     /// returns battery state
diff --git a/crengine/src/lvdocview.cpp b/crengine/src/lvdocview.cpp
index 17a7da3cb..74c078426 100644
--- a/crengine/src/lvdocview.cpp
+++ b/crengine/src/lvdocview.cpp
@@ -1589,57 +1589,80 @@ void LVDocView::drawBatteryState(LVDrawBuf * drawbuf, const lvRect & batteryRc)
 #endif
 }
 
+/// get section bounds for specific root node and specific section depth level, in 1/100 of percent
+void LVDocView::getSectionBoundsInt( LVArray<int>& bounds, ldomNode* node, lUInt16 section_id , int target_level, int level ) {
+    int pc = getVisiblePageCount();
+    int fh = GetFullHeight();
+    for (int i = 0; i < node->getChildCount(); i++) {
+        ldomNode * section = node->getChildElementNode(i, section_id);
+        if (section) {
+            if (level == target_level) {
+                lvRect rc;
+                section->getAbsRect(rc);
+                if (getViewMode() == DVM_SCROLL) {
+                    int p = (int) (((lInt64) rc.top * 10000) / fh);
+                    bounds.add(p);
+                } else {
+                    int pages_cnt = m_pages.length();
+                    if ( (pc==2 && (pages_cnt&1)) )
+                        pages_cnt++;
+                    int p = m_pages.FindNearestPage(rc.top, 0);
+                    if (pages_cnt > 1)
+                        bounds.add((int) (((lInt64) p * 10000) / pages_cnt));
+                }
+            } else if (level < target_level) {
+                getSectionBoundsInt(bounds, section, section_id, target_level, level + 1);
+            }
+        }
+    }
+}
+
+static int s_int_comparator(const void * n1, const void * n2) {
+    int* i1 = (int*)n1;
+    int* i2 = (int*)n2;
+    return *i1 == *i2 ? 0 : (*i1 < *i2 ? -1 : 1);
+}
+
 /// returns section bounds, in 1/100 of percent
-LVArray<int> & LVDocView::getSectionBounds( bool for_external_update ) {
-	if (for_external_update || m_section_bounds_externally_updated) {
-		// Progress bar markes will be externally updated: we don't care
-		// about m_section_bounds_valid and we never trash it here.
-		// It's the frontend responsability to notice it needs some
-		// update and to update it.
-		m_section_bounds_externally_updated = true;
-		return m_section_bounds;
-	}
-	if (m_section_bounds_valid)
-		return m_section_bounds;
-	m_section_bounds.clear();
-	m_section_bounds.add(0);
+LVArray<int> & LVDocView::getSectionBounds( int max_count, int depth, bool for_external_update ) {
+    if (for_external_update || m_section_bounds_externally_updated) {
+        // Progress bar markes will be externally updated: we don't care
+        // about m_section_bounds_valid and we never trash it here.
+        // It's the frontend responsability to notice it needs some
+        // update and to update it.
+        m_section_bounds_externally_updated = true;
+        return m_section_bounds;
+    }
+    if (m_section_bounds_valid)
+        return m_section_bounds;
     // Get sections from FB2 books
     ldomNode * body = m_doc->nodeFromXPath(cs32("/FictionBook/body[1]"));
-	lUInt16 section_id = m_doc->getElementNameIndex(U"section");
+    lUInt16 section_id = m_doc->getElementNameIndex(U"section");
     if (body == NULL) {
         // Get sections from EPUB books
         body = m_doc->nodeFromXPath(cs32("/body[1]"));
         section_id = m_doc->getElementNameIndex(U"DocFragment");
     }
-	int fh = GetFullHeight();
-    int pc = getVisiblePageCount();
-	if (body && fh > 0) {
-		int cnt = body->getChildCount();
-		for (int i = 0; i < cnt; i++) {
-
-            ldomNode * l1section = body->getChildElementNode(i, section_id);
-            if (!l1section)
-				continue;
-
-            lvRect rc;
-            l1section->getAbsRect(rc);
-            if (getViewMode() == DVM_SCROLL) {
-                int p = (int) (((lInt64) rc.top * 10000) / fh);
-                m_section_bounds.add(p);
-            } else {
-                int fh = m_pages.length();
-                if ( (pc==2 && (fh&1)) )
-                    fh++;
-                int p = m_pages.FindNearestPage(rc.top, 0);
-                if (fh > 1)
-                    m_section_bounds.add((int) (((lInt64) p * 10000) / fh));
-            }
-
-		}
-	}
-	m_section_bounds.add(10000);
-	m_section_bounds_valid = true;
-	return m_section_bounds;
+    LVArray<int> bounds;
+    int fh = GetFullHeight();
+    if (body && fh > 0) {
+        for (int level = 0; level < depth; level++) {
+            LVArray<int> bounds_tmp;
+            getSectionBoundsInt(bounds_tmp, body, section_id, level, 0);
+            if (bounds.length() + bounds_tmp.length() < max_count)
+                bounds.add(bounds_tmp);
+            else
+                break;
+        }
+    }
+    if (bounds.length() > 1)
+        qsort(bounds.get(), (size_t)bounds.length(), sizeof(int), s_int_comparator);
+    m_section_bounds.clear();
+    m_section_bounds.add(0);
+    m_section_bounds.add(bounds);
+    m_section_bounds.add(10000);
+    m_section_bounds_valid = true;
+    return m_section_bounds;
 }
 
 int LVDocView::getPosEndPagePercent() {
@@ -1781,10 +1804,10 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 	bool leftPage = (getVisiblePageCount() == 2 && !(pageIndex & 1));
 	if (leftPage)
 		percent = 10000;
-	int percent_pos = /*info.left + */percent * info.width() / 10000;
-	LVArray<int> & sbounds = getSectionBounds();
+	int percent_pos = percent * info.width() / 10000;
+	LVArray<int> & sbounds = getSectionBounds(info.width()/3, 3);
 	int sbound_index = 0;
-	bool enableMarks = !leftPage && (phi & PGHDR_CHAPTER_MARKS) && sbounds.length()<info.width()/5;
+	bool enableMarks = !leftPage && (phi & PGHDR_CHAPTER_MARKS);
 	for ( int x = info.left; x<info.right; x++ ) {
 		lUInt32 cl = 0xFFFFFFFF;
 		int sz = thinw;

From bcbd6372b4a7d4142b179368b0c67b465b9ac8a4 Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Mon, 19 Jul 2021 15:28:11 +0400
Subject: [PATCH 18/35] Book info dialog: the language of the book is displayed
 in a human readable format (only english).

---
 android/jni/cr3engine.cpp                     |  4 +++-
 android/res/layout/book_info_edit_dialog.xml  | 20 ++++++++++++++++
 .../coolreader/crengine/BookInfoDialog.java   |  2 ++
 .../crengine/BookInfoEditDialog.java          |  4 +++-
 cr3qt/src/cr3widget.cpp                       | 18 ++------------
 cr3qt/src/crqtutil.cpp                        | 24 +++++++++++++++++++
 cr3qt/src/crqtutil.h                          |  2 ++
 cr3qt/src/filepropsdlg.cpp                    |  1 +
 cr3qt/src/i18n/cr3_ru.ts                      | 11 +++++++++
 9 files changed, 68 insertions(+), 18 deletions(-)

diff --git a/android/jni/cr3engine.cpp b/android/jni/cr3engine.cpp
index 3000d24a3..91ecee23b 100644
--- a/android/jni/cr3engine.cpp
+++ b/android/jni/cr3engine.cpp
@@ -1011,7 +1011,9 @@ JNIEXPORT jstring JNICALL Java_org_coolreader_crengine_Engine_getHumanReadableLo
 		(JNIEnv *env, jclass cls, jstring langTag)
 {
 	jstring res = NULL;
-	const char* langTag_ptr = env->GetStringUTFChars(langTag, 0);
+	const char* langTag_ptr = NULL;
+	if (langTag)
+		langTag_ptr = env->GetStringUTFChars(langTag, 0);
 	if (langTag_ptr) {
 		CRLocaleData loc(langTag_ptr);
 		if (loc.isValid()) {
diff --git a/android/res/layout/book_info_edit_dialog.xml b/android/res/layout/book_info_edit_dialog.xml
index a98554552..22d9c2e1b 100644
--- a/android/res/layout/book_info_edit_dialog.xml
+++ b/android/res/layout/book_info_edit_dialog.xml
@@ -318,6 +318,26 @@
                     android:text=""
                     android:visibility="gone" />
 
+            <TextView
+                    android:id="@+id/lbl_book_lang"
+                    style="@style/TextAppearance.Medium"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginStart="4dp"
+                    android:singleLine="true"
+                    android:text="@string/book_info_book_language" />
+
+            <EditText
+                    android:id="@+id/book_lang"
+                    style="@style/TextAppearance.Widget.EditText"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:editable="false"
+                    android:inputType="none"
+                    android:singleLine="true"
+                    android:text="" />
+
             <EditText
                     android:id="@+id/book_description"
                     style="@style/TextAppearance.Widget.EditText"
diff --git a/android/src/org/coolreader/crengine/BookInfoDialog.java b/android/src/org/coolreader/crengine/BookInfoDialog.java
index c6583a48c..e99cb6bfe 100644
--- a/android/src/org/coolreader/crengine/BookInfoDialog.java
+++ b/android/src/org/coolreader/crengine/BookInfoDialog.java
@@ -79,6 +79,8 @@ private void addItem(TableLayout table, String item) {
 			if ( title!=null )
 				name = title;
 		} else {
+			if ("book.language".equals(name))
+				value = Engine.getHumanReadableLocaleName(value);
 			Integer id = mLabelMap.get(name);
 			String title = id!=null ? getContext().getString(id) : name;
 			if ( title!=null )
diff --git a/android/src/org/coolreader/crengine/BookInfoEditDialog.java b/android/src/org/coolreader/crengine/BookInfoEditDialog.java
index 746573056..436f27bd3 100644
--- a/android/src/org/coolreader/crengine/BookInfoEditDialog.java
+++ b/android/src/org/coolreader/crengine/BookInfoEditDialog.java
@@ -29,7 +29,6 @@
 
 import org.coolreader.CoolReader;
 import org.coolreader.R;
-import org.coolreader.genrescollection.GenresCollection;
 
 import java.util.ArrayList;
 
@@ -230,6 +229,7 @@ public void setColorFilter(ColorFilter cf) {
     LinearLayout mainView;
 	ScrollView scrollView;
     EditText edTitle;
+    EditText edLanguage;
     EditText edSeriesName;
     EditText edSeriesNumber;
     TextView lblGenres;
@@ -258,6 +258,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         scrollView = mainView.findViewById(R.id.book_scrollview);
         edTitle = mainView.findViewById(R.id.book_title);
+        edLanguage = mainView.findViewById(R.id.book_lang);
         edSeriesName = mainView.findViewById(R.id.book_series_name);
         edSeriesNumber = mainView.findViewById(R.id.book_series_number);
         lblGenres = mainView.findViewById(R.id.lbl_book_genres);
@@ -307,6 +308,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         edTitle.setText(file.title);
         //edAuthor.setText(file.authors);
+        edLanguage.setText(Engine.getHumanReadableLocaleName(file.language));
         edSeriesName.setText(file.series);
         if (file.series != null && file.series.trim().length() > 0 && file.seriesNumber > 0)
         	edSeriesNumber.setText(String.valueOf(file.seriesNumber));
diff --git a/cr3qt/src/cr3widget.cpp b/cr3qt/src/cr3widget.cpp
index 1f4d23744..5aedaf2e8 100644
--- a/cr3qt/src/cr3widget.cpp
+++ b/cr3qt/src/cr3widget.cpp
@@ -31,10 +31,6 @@
 #include <QDesktopServices>
 #include <QLocale>
 
-#if USE_LOCALE_DATA==1
-#include "crlocaledata.h"
-#endif
-
 /// to hide non-qt implementation, place all crengine-related fields here
 class CR3View::DocViewData
 {
@@ -1111,18 +1107,8 @@ void CR3View::checkFontLanguageCompatibility()
         return;
     }
     if (fontFace_u8.length() > 0) {
-        CRLocaleData loc(langCode_u8);
-        if (loc.isValid()) {
-            QString langDescr = loc.langName().c_str();
-            if (loc.scriptNumeric() > 0) {
-                langDescr.append("-");
-                langDescr.append(loc.scriptName().c_str());
-            }
-            if (loc.regionNumeric() > 0) {
-                langDescr.append(" (");
-                langDescr.append(loc.regionAlpha3().c_str());
-                langDescr.append(")");
-            }
+        QString langDescr = getHumanReadableLocaleName(langCode);
+        if (!langDescr.isEmpty()) {
             font_lang_compat compat = fontMan->checkFontLangCompat(fontFace_u8, langCode_u8);
             CRLog::debug("Checking font \"%s\" for compatibility with language \"%s\": %d", fontFace_u8.c_str(), langCode_u8.c_str(), (int)compat);
             switch (compat) {
diff --git a/cr3qt/src/crqtutil.cpp b/cr3qt/src/crqtutil.cpp
index 20e7dffbb..70b246ad7 100644
--- a/cr3qt/src/crqtutil.cpp
+++ b/cr3qt/src/crqtutil.cpp
@@ -1,5 +1,6 @@
 #include "crqtutil.h"
 #include "../crengine/include/props.h"
+#include "../crengine/include/crlocaledata.h"
 #include <QStringList>
 #include <QWidget>
 #include <QPoint>
@@ -140,6 +141,29 @@ void crGetFontFaceList( QStringList & dst )
     cr2qt( dst, faceList );
 }
 
+QString getHumanReadableLocaleName(lString32 langTag)
+{
+#if USE_LOCALE_DATA==1
+    QString res;
+    CRLocaleData loc(UnicodeToUtf8(langTag));
+    if (loc.isValid()) {
+        res = loc.langName().c_str();
+        if (loc.scriptNumeric() > 0) {
+            res.append("-");
+            res.append(loc.scriptName().c_str());
+        }
+        if (loc.regionNumeric() > 0) {
+            res.append(" (");
+            res.append(loc.regionAlpha3().c_str());
+            res.append(")");
+        }
+    }
+#else
+    QString res = QT_TRANSLATE_NOOP("crqtutils", "Undetermined");
+#endif
+    return res;
+}
+
 QString crpercent( int p )
 {
     return QString("%1.%2%").arg(p/100).arg(p%100,2, 10,QLatin1Char('0'));
diff --git a/cr3qt/src/crqtutil.h b/cr3qt/src/crqtutil.h
index 9076e48eb..4a3f982bc 100644
--- a/cr3qt/src/crqtutil.h
+++ b/cr3qt/src/crqtutil.h
@@ -57,6 +57,8 @@ QString crpercent( int p );
 
 void crGetFontFaceList( QStringList & dst );
 
+QString getHumanReadableLocaleName(lString32 langTag);
+
 class QWidget;
 /// save window position to properties
 void saveWindowPosition( QWidget * window, CRPropRef props, const char * prefix );
diff --git a/cr3qt/src/filepropsdlg.cpp b/cr3qt/src/filepropsdlg.cpp
index 30e9f89d9..7409e55eb 100644
--- a/cr3qt/src/filepropsdlg.cpp
+++ b/cr3qt/src/filepropsdlg.cpp
@@ -198,6 +198,7 @@ void FilePropsDialog::fillItems()
     addPropLine( tr("Series number"), cr2qt(props->getStringDef(DOC_PROP_SERIES_NUMBER)) );
     addPropLine( tr("Date"), getDocText( "/FictionBook/description/title-info/date", ", " ) );
     addPropLine( tr("Genres"), getDocText( "/FictionBook/description/title-info/genre", ", " ) );
+    addPropLine( tr("Language"), getHumanReadableLocaleName(props->getStringDef(DOC_PROP_LANGUAGE)) );
     addPropLine( tr("Translator"), getDocText( "/FictionBook/description/title-info/translator", ", " ) );
     addInfoSection( tr("Book info") );
 
diff --git a/cr3qt/src/i18n/cr3_ru.ts b/cr3qt/src/i18n/cr3_ru.ts
index 876b01345..ab66539e4 100644
--- a/cr3qt/src/i18n/cr3_ru.ts
+++ b/cr3qt/src/i18n/cr3_ru.ts
@@ -485,6 +485,10 @@ p, li { white-space: pre-wrap; }
         <source>Dialog</source>
         <translation>Диалог</translation>
     </message>
+    <message>
+        <source>Language</source>
+        <translation>Язык</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -2035,4 +2039,11 @@ p, li { white-space: pre-wrap; }
         <translation>3</translation>
     </message>
 </context>
+<context>
+    <name>crqtutils</name>
+    <message>
+        <source>Undetermined</source>
+        <translation>Неопределенный</translation>
+    </message>
+</context>
 </TS>

From 252ea968d7013f2dffc921309d1c58389c3dbd60 Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sat, 24 Jul 2021 00:38:12 +0400
Subject: [PATCH 19/35] Added deprecated codes for iso639-3. For now only mol,
 mo, Moldavian.

---
 crengine/src/locale_data/iso-639-3_data.c | 1 +
 crengine/src/locale_data/iso-639-3_data.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/crengine/src/locale_data/iso-639-3_data.c b/crengine/src/locale_data/iso-639-3_data.c
index d7a21f781..ca5a48263 100644
--- a/crengine/src/locale_data/iso-639-3_data.c
+++ b/crengine/src/locale_data/iso-639-3_data.c
@@ -7903,5 +7903,6 @@ const struct iso639_3_rec iso639_3_data[] = {
 	{"zyp", NULL, NULL, NULL, "Zyphe Chin"},
 	{"zza", "zza", "zza", NULL, "Zaza"},
 	{"zzj", NULL, NULL, NULL, "Zuojiang Zhuang"},
+	{"mol", NULL, NULL, "mo", "Moldavian"},
 };
 
diff --git a/crengine/src/locale_data/iso-639-3_data.h b/crengine/src/locale_data/iso-639-3_data.h
index be18eb9f0..14b83030c 100644
--- a/crengine/src/locale_data/iso-639-3_data.h
+++ b/crengine/src/locale_data/iso-639-3_data.h
@@ -12,7 +12,7 @@
 extern "C" {
 #endif
 
-#define ISO639_3_DATA_SZ	7893
+#define ISO639_3_DATA_SZ	7894
 #define ISO639_3_UND_INDEX	6780
 
 struct iso639_3_rec {

From 548309e3b01741a4d582045c59064a0b3013c38e Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sat, 24 Jul 2021 10:20:45 +0400
Subject: [PATCH 20/35] Update Gradle version to 6.7.1. Update AGP dependency
 from 4.1.3 to 4.2.2.

---
 android/build.gradle                             | 2 +-
 android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index c39e5d07d..3e4f14d7c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index baed342c0..e44f58841 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

From a28bacccf6a25a385cd3dffa02195a6a6bd575b0 Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sat, 24 Jul 2021 11:20:21 +0400
Subject: [PATCH 21/35] Fixed incorrect linkage of the JNI functions.

---
 android/jni/cr3engine.cpp | 588 +++++++++++++++++++-------------------
 android/jni/docview.cpp   | 346 +++++++++++-----------
 2 files changed, 469 insertions(+), 465 deletions(-)

diff --git a/android/jni/cr3engine.cpp b/android/jni/cr3engine.cpp
index 91ecee23b..46c6c92b7 100644
--- a/android/jni/cr3engine.cpp
+++ b/android/jni/cr3engine.cpp
@@ -404,6 +404,295 @@ static bool GetBookProperties(const char *name,  BookProperties * pBookProps)
     return true;
 }
 
+class JNICDRLogger : public CRLog {
+public:
+    JNICDRLogger() {
+        curr_level = CRLog::LL_DEBUG;
+    }
+
+protected:
+
+    virtual void log(const char *lvl, const char *msg, va_list args) {
+#define MAX_LOG_MSG_SIZE 1024
+        static char buffer[MAX_LOG_MSG_SIZE + 1];
+        vsnprintf(buffer, MAX_LOG_MSG_SIZE, msg, args);
+        int level = ANDROID_LOG_DEBUG;
+        //LOGD("CRLog::log is called with LEVEL %s, pattern %s", lvl, msg);
+        if (!strcmp(lvl, "FATAL"))
+            level = ANDROID_LOG_FATAL;
+        else if (!strcmp(lvl, "ERROR"))
+            level = ANDROID_LOG_ERROR;
+        else if (!strcmp(lvl, "WARN"))
+            level = ANDROID_LOG_WARN;
+        else if (!strcmp(lvl, "INFO"))
+            level = ANDROID_LOG_INFO;
+        else if (!strcmp(lvl, "DEBUG"))
+            level = ANDROID_LOG_DEBUG;
+        else if (!strcmp(lvl, "TRACE"))
+            level = ANDROID_LOG_VERBOSE;
+        __android_log_write(level, LOG_TAG, buffer);
+    }
+};
+
+void cr3androidFatalErrorHandler(int errorCode, const char *errorText) {
+    LOGE("CoolReader Fatal Error #%d: %s", errorCode, errorText);
+    LOGASSERTFAILED("CoolReader Fatal Error", "CoolReader Fatal Error #%d: %s", errorCode,
+                    errorText);
+    //static char str[1001];
+    //snprintf(str, 1000, "CoolReader Fatal Error #%d: %s", errorCode, errorText);
+    //LOGE("CoolReader Fatal Error #%d: %s", errorCode, errorText);
+    //LOGASSERTFAILED(errorText, "CoolReader Fatal Error #%d: %s", errorCode, errorText);
+}
+
+jboolean initInternal(JNIEnv *penv, jclass obj, jobjectArray fontArray, jint sdk_int) {
+
+    CRJNIEnv::sdk_int = sdk_int;
+
+    CRJNIEnv env(penv);
+
+    // to catch crashes and remove current cache file on crash (SIGSEGV etc.)
+    crSetSignalHandler();
+
+    LOGI("initInternal called");
+    // set fatal error handler
+    crSetFatalErrorHandler(&cr3androidFatalErrorHandler);
+    LOGD("Redirecting CDRLog to Android");
+    CRLog::setLogger(new JNICDRLogger());
+    CRLog::setLogLevel(CRLog::LL_TRACE);
+    CRLog::info("CREngine log redirected");
+    CRLog::info("CRENGINE version %s %s", CR_ENGINE_VERSION, CR_ENGINE_BUILD_DATE);
+
+    CRLog::info("initializing hyphenation manager");
+    HyphMan::initDictionaries(lString32::empty_str); //don't look for dictionaries
+    HyphMan::activateDictionary(lString32(HYPH_DICT_ID_NONE));
+    CRLog::info("creating font manager");
+    InitFontManager(lString8::empty_str);
+    CRLog::debug("converting fonts array: %d items", (int) env->GetArrayLength(fontArray));
+    lString32Collection fonts;
+    env.fromJavaStringArray(fontArray, fonts);
+    int len = fonts.length();
+    CRLog::debug("registering fonts: %d fonts in list", len);
+    for (int i = 0; i < len; i++) {
+        lString8 fontName = UnicodeToUtf8(fonts[i]);
+        CRLog::debug("registering font %s", fontName.c_str());
+        if (!fontMan->RegisterFont(fontName))
+            CRLog::error("cannot load font %s", fontName.c_str());
+    }
+    CRLog::info("%d fonts registered", fontMan->GetFontCount());
+    return fontMan->GetFontCount() ? JNI_TRUE : JNI_FALSE;
+}
+
+void drawBookCoverInternal(JNIEnv * _env, jclass _engine, jobject bitmap, jbyteArray _data, jboolean respectAspectRatio, jstring _fontFace, jstring _title, jstring _authors, jstring _seriesName, jint seriesNumber, jint bpp)
+{
+    CRJNIEnv env(_env);
+    CRLog::debug("drawBookCoverInternal called");
+    lString8 fontFace = UnicodeToUtf8(env.fromJavaString(_fontFace));
+    lString32 title = env.fromJavaString(_title);
+    lString32 authors = env.fromJavaString(_authors);
+    lString32 seriesName = env.fromJavaString(_seriesName);
+    LVStreamRef stream;
+    LVDrawBuf * drawbuf = BitmapAccessorInterface::getInstance()->lock(_env, bitmap);
+    if (drawbuf != NULL) {
+        LVImageSourceRef image;
+        if (_data != NULL && _env->GetArrayLength(_data) > 0) {
+            CRLog::debug("drawBookCoverInternal : cover image from array");
+            stream = env.jbyteArrayToStream(_data);
+            if (!stream.isNull())
+                image = LVCreateStreamImageSource(stream);
+        }
+
+        int factor = 1;
+        int dx = drawbuf->GetWidth();
+        int dy = drawbuf->GetHeight();
+        int MIN_WIDTH = 300;
+        int MIN_HEIGHT = 400;
+        if (dx < MIN_WIDTH || dy < MIN_HEIGHT) {
+            if (dx * 2 < MIN_WIDTH || dy * 2 < MIN_HEIGHT) {
+                dx *= 3;
+                dy *= 3;
+                factor = 3;
+            } else {
+                dx *= 2;
+                dy *= 2;
+                factor = 2;
+            }
+        }
+        LVDrawBuf * drawbuf2 = drawbuf;
+        if (factor > 1)
+            drawbuf2 = new LVColorDrawBuf(dx, dy, drawbuf->GetBitsPerPixel());
+
+        if (bpp >= 16) {
+            // native color resolution
+            CRLog::debug("drawBookCoverInternal : calling LVDrawBookCover");
+            LVDrawBookCover(*drawbuf2, image, respectAspectRatio, fontFace, title, authors, seriesName, seriesNumber);
+            image.Clear();
+        } else {
+            LVGrayDrawBuf grayBuf(drawbuf2->GetWidth(), drawbuf2->GetHeight(), bpp);
+            LVDrawBookCover(grayBuf, image, respectAspectRatio, fontFace, title, authors, seriesName, seriesNumber);
+            image.Clear();
+            grayBuf.DrawTo(drawbuf2, 0, 0, 0, NULL);
+        }
+
+        if (factor > 1) {
+            CRLog::debug("drawBookCoverInternal : rescaling");
+            drawbuf->DrawRescaled(drawbuf2, 0, 0, drawbuf->GetWidth(), drawbuf->GetHeight(), 0);
+            delete drawbuf2;
+        }
+
+        //CRLog::trace("getPageImageInternal calling bitmap->unlock");
+        BitmapAccessorInterface::getInstance()->unlock(_env, bitmap, drawbuf);
+    } else {
+        CRLog::error("bitmap accessor is invalid");
+    }
+    CRLog::debug("drawBookCoverInternal finished");
+}
+
+jbyteArray scanBookCoverInternal(JNIEnv *_env, jclass _class, jstring _path) {
+    CRJNIEnv env(_env);
+    lString32 path = env.fromJavaString(_path);
+    CRLog::debug("scanBookCoverInternal(%s) called", LCSTR(path));
+    lString32 arcname, item;
+    LVStreamRef res;
+    jbyteArray array = NULL;
+    LVContainerRef arc;
+    if (!LVSplitArcName(path, arcname, item)) {
+        // not in archive
+        LVStreamRef stream = LVOpenFileStream(path.c_str(), LVOM_READ);
+        if (!stream.isNull()) {
+            arc = LVOpenArchieve(stream);
+            if (!arc.isNull()) {
+                // ZIP-based format
+                if (DetectEpubFormat(stream)) {
+                    // EPUB
+                    // extract coverpage from epub
+                    res = GetEpubCoverpage(arc);
+                }
+            } else {
+                res = GetFB2Coverpage(stream);
+                if (res.isNull()) {
+                    doc_format_t fmt;
+                    if (DetectPDBFormat(stream, fmt)) {
+                        res = GetPDBCoverpage(stream);
+                    }
+                }
+            }
+        }
+    } else {
+        CRLog::debug("scanBookCoverInternal() : is archive, item=%s, arc=%s", LCSTR(item),
+                     LCSTR(arcname));
+        LVStreamRef arcstream = LVOpenFileStream(arcname.c_str(), LVOM_READ);
+        if (!arcstream.isNull()) {
+            arc = LVOpenArchieve(arcstream);
+            if (!arc.isNull()) {
+                LVStreamRef stream = arc->OpenStream(item.c_str(), LVOM_READ);
+                if (!stream.isNull()) {
+                    CRLog::debug("scanBookCoverInternal() : archive stream opened ok, parsing");
+                    res = GetFB2Coverpage(stream);
+                    if (res.isNull()) {
+                        doc_format_t fmt;
+                        if (DetectPDBFormat(stream, fmt)) {
+                            res = GetPDBCoverpage(stream);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    if (!res.isNull())
+        array = env.streamToJByteArray(res);
+    if (array != NULL)
+        CRLog::debug("scanBookCoverInternal() : returned cover page array");
+    else
+        CRLog::debug("scanBookCoverInternal() : cover page data not found");
+    return array;
+}
+
+class HyphDataLoaderProxy : public HyphDataLoader {
+    JavaVM *mJavaVM;
+public:
+    HyphDataLoaderProxy(JavaVM *jvm) :
+            HyphDataLoader(), mJavaVM(jvm) {
+    }
+
+    virtual ~HyphDataLoaderProxy() {}
+
+    virtual LVStreamRef loadData(lString32 id) {
+        JNIEnv *penv = NULL;
+        bool attached = false;
+        mJavaVM->GetEnv((void **) &penv, JNI_VERSION_1_6);
+        if (NULL == penv) {
+            // caller thread is not attached yet
+            mJavaVM->AttachCurrentThread(&penv, NULL);
+            attached = true;
+        }
+        LVStreamRef stream = LVStreamRef();
+        jclass pjcEngine = penv->FindClass("org/coolreader/crengine/Engine");
+        if (NULL == pjcEngine)
+            return stream;
+        jmethodID pjmEngine_loadHyphDictData = penv->GetStaticMethodID(pjcEngine,
+                                                                       "loadHyphDictData",
+                                                                       "(Ljava/lang/String;)[B");
+        if (NULL == pjmEngine_loadHyphDictData)
+            return stream;
+        CRJNIEnv env(penv);
+        jstring jid = env.toJavaString(id);
+        jbyteArray data = static_cast<jbyteArray>(penv->CallStaticObjectMethod(pjcEngine,
+                                                                               pjmEngine_loadHyphDictData,
+                                                                               jid));
+        stream = env.jbyteArrayToStream(data);
+        if (attached)
+            mJavaVM->DetachCurrentThread();
+        return stream;
+    }
+};
+
+jboolean initDictionaries(JNIEnv *penv, jclass clazz, jobjectArray dictArray) {
+    jclass pjcHyphDict = penv->FindClass("org/coolreader/crengine/Engine$HyphDict");
+    if (NULL == pjcHyphDict)
+        return JNI_FALSE;
+    jfieldID pjfHyphDict_type = penv->GetFieldID(pjcHyphDict, "type", "I");
+    if (NULL == pjfHyphDict_type)
+        return JNI_FALSE;
+    jfieldID pjfHyphDict_code = penv->GetFieldID(pjcHyphDict, "code", "Ljava/lang/String;");
+    if (NULL == pjfHyphDict_code)
+        return JNI_FALSE;
+
+    int len = penv->GetArrayLength(dictArray);
+    HyphDictionary *dict;
+    CRJNIEnv env(penv);
+    HyphDictType dict_type;
+    for (int i = 0; i < len; i++) {
+        jobject obj = penv->GetObjectArrayElement(dictArray, i);
+        int type = penv->GetIntField(obj, pjfHyphDict_type);
+        jstring code = static_cast<jstring>(penv->GetObjectField(obj, pjfHyphDict_code));
+        switch (type) {     // convert org/coolreader/crengine/Engine$HyphDict$type into HyphDictType
+            case 0:         // org/coolreader/crengine/Engine$HYPH_NONE
+                dict_type = HDT_NONE;
+                break;
+            case 1:         // org/coolreader/crengine/Engine$HYPH_ALGO
+                dict_type = HDT_ALGORITHM;
+                break;
+            case 2:         // org/coolreader/crengine/Engine$HYPH_DICT
+                dict_type = HDT_DICT_TEX;
+                break;
+            default:
+                dict_type = HDT_NONE;
+                break;
+        }
+        lString32 dict_code = env.fromJavaString(code);
+        dict = new HyphDictionary(dict_type, dict_code, dict_code, dict_code);
+        if (!HyphMan::addDictionaryItem(dict))
+            delete dict;
+    }
+    JavaVM *jvm;
+    env->GetJavaVM(&jvm);
+    HyphMan::setDataLoader(new HyphDataLoaderProxy(jvm));
+    return JNI_TRUE;
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
  * Class:     org_coolreader_crengine_Engine
@@ -509,72 +798,6 @@ JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_Engine_updateFileCRC32In
 	return JNI_TRUE;
 }
 
-
-void drawBookCoverInternal(JNIEnv * _env, jclass _engine, jobject bitmap, jbyteArray _data, jboolean respectAspectRatio, jstring _fontFace, jstring _title, jstring _authors, jstring _seriesName, jint seriesNumber, jint bpp)
-{
-	CRJNIEnv env(_env);
-	CRLog::debug("drawBookCoverInternal called");
-	lString8 fontFace = UnicodeToUtf8(env.fromJavaString(_fontFace));
-	lString32 title = env.fromJavaString(_title);
-	lString32 authors = env.fromJavaString(_authors);
-	lString32 seriesName = env.fromJavaString(_seriesName);
-	LVStreamRef stream;
-	LVDrawBuf * drawbuf = BitmapAccessorInterface::getInstance()->lock(_env, bitmap);
-	if (drawbuf != NULL) {
-		LVImageSourceRef image;
-		if (_data != NULL && _env->GetArrayLength(_data) > 0) {
-			CRLog::debug("drawBookCoverInternal : cover image from array");
-			stream = env.jbyteArrayToStream(_data);
-			if (!stream.isNull())
-				image = LVCreateStreamImageSource(stream);
-		}
-
-		int factor = 1;
-		int dx = drawbuf->GetWidth();
-		int dy = drawbuf->GetHeight();
-		int MIN_WIDTH = 300;
-		int MIN_HEIGHT = 400;
-		if (dx < MIN_WIDTH || dy < MIN_HEIGHT) {
-			if (dx * 2 < MIN_WIDTH || dy * 2 < MIN_HEIGHT) {
-				dx *= 3;
-				dy *= 3;
-				factor = 3;
-			} else {
-				dx *= 2;
-				dy *= 2;
-				factor = 2;
-			}
-		}
-		LVDrawBuf * drawbuf2 = drawbuf;
-		if (factor > 1)
-			drawbuf2 = new LVColorDrawBuf(dx, dy, drawbuf->GetBitsPerPixel());
-
-		if (bpp >= 16) {
-			// native color resolution
-			CRLog::debug("drawBookCoverInternal : calling LVDrawBookCover");
-			LVDrawBookCover(*drawbuf2, image, respectAspectRatio, fontFace, title, authors, seriesName, seriesNumber);
-			image.Clear();
-		} else {
-			LVGrayDrawBuf grayBuf(drawbuf2->GetWidth(), drawbuf2->GetHeight(), bpp);
-			LVDrawBookCover(grayBuf, image, respectAspectRatio, fontFace, title, authors, seriesName, seriesNumber);
-			image.Clear();
-			grayBuf.DrawTo(drawbuf2, 0, 0, 0, NULL);
-		}
-
-		if (factor > 1) {
-			CRLog::debug("drawBookCoverInternal : rescaling");
-			drawbuf->DrawRescaled(drawbuf2, 0, 0, drawbuf->GetWidth(), drawbuf->GetHeight(), 0);
-			delete drawbuf2;
-		}
-
-		//CRLog::trace("getPageImageInternal calling bitmap->unlock");
-		BitmapAccessorInterface::getInstance()->unlock(_env, bitmap, drawbuf);
-	} else {
-		CRLog::error("bitmap accessor is invalid");
-	}
-	CRLog::debug("drawBookCoverInternal finished");
-}
-
 /*
  * Class:     org_coolreader_crengine_Engine
  * Method:    drawBookCoverInternal
@@ -586,67 +809,6 @@ JNIEXPORT void JNICALL Java_org_coolreader_crengine_Engine_drawBookCoverInternal
 	COFFEE_TRY_JNI(_env, drawBookCoverInternal(_env, _engine, bitmap, _data, respectAspectRatio, _fontFace, _title, _authors, _seriesName, seriesNumber, bpp));
 }
 
-jbyteArray scanBookCoverInternal
-  (JNIEnv * _env, jclass _class, jstring _path)
-{
-	CRJNIEnv env(_env);
-	lString32 path = env.fromJavaString(_path);
-	CRLog::debug("scanBookCoverInternal(%s) called", LCSTR(path));
-	lString32 arcname, item;
-    LVStreamRef res;
-    jbyteArray array = NULL;
-    LVContainerRef arc;
-	if (!LVSplitArcName(path, arcname, item)) {
-		// not in archive
-		LVStreamRef stream = LVOpenFileStream(path.c_str(), LVOM_READ);
-		if (!stream.isNull()) {
-			arc = LVOpenArchieve(stream);
-			if (!arc.isNull()) {
-				// ZIP-based format
-				if (DetectEpubFormat(stream)) {
-					// EPUB
-					// extract coverpage from epub
-					res = GetEpubCoverpage(arc);
-				}
-			} else {
-				res = GetFB2Coverpage(stream);
-				if (res.isNull()) {
-					doc_format_t fmt;
-					if (DetectPDBFormat(stream, fmt)) {
-						res = GetPDBCoverpage(stream);
-					}
-				}
-			}
-		}
-	} else {
-    	CRLog::debug("scanBookCoverInternal() : is archive, item=%s, arc=%s", LCSTR(item), LCSTR(arcname));
-		LVStreamRef arcstream = LVOpenFileStream(arcname.c_str(), LVOM_READ);
-		if (!arcstream.isNull()) {
-			arc = LVOpenArchieve(arcstream);
-			if (!arc.isNull()) {
-				LVStreamRef stream = arc->OpenStream(item.c_str(), LVOM_READ);
-				if (!stream.isNull()) {
-			    	CRLog::debug("scanBookCoverInternal() : archive stream opened ok, parsing");
-					res = GetFB2Coverpage(stream);
-					if (res.isNull()) {
-						doc_format_t fmt;
-						if (DetectPDBFormat(stream, fmt)) {
-							res = GetPDBCoverpage(stream);
-						}
-					}
-				}
-			}
-		}
-	}
-	if (!res.isNull())
-		array = env.streamToJByteArray(res);
-    if (array != NULL)
-    	CRLog::debug("scanBookCoverInternal() : returned cover page array");
-    else
-    	CRLog::debug("scanBookCoverInternal() : cover page data not found");
-    return array;
-}
-
 /*
  * Class:     org_coolreader_crengine_Engine
  * Method:    scanBookCoverInternal
@@ -690,92 +852,6 @@ JNIEXPORT jobjectArray JNICALL Java_org_coolreader_crengine_Engine_getArchiveIte
     return env.toJavaStringArray(list);
 }
 
-
-class JNICDRLogger : public CRLog
-{
-public:
-    JNICDRLogger()
-    {
-    	curr_level = CRLog::LL_DEBUG;
-    }
-protected:
-  
-	virtual void log( const char * lvl, const char * msg, va_list args)
-	{
-	    #define MAX_LOG_MSG_SIZE 1024
-		static char buffer[MAX_LOG_MSG_SIZE+1];
-		vsnprintf(buffer, MAX_LOG_MSG_SIZE, msg, args);
-		int level = ANDROID_LOG_DEBUG;
-		//LOGD("CRLog::log is called with LEVEL %s, pattern %s", lvl, msg);
-		if ( !strcmp(lvl, "FATAL") )
-			level = ANDROID_LOG_FATAL;
-		else if ( !strcmp(lvl, "ERROR") )
-			level = ANDROID_LOG_ERROR;
-		else if ( !strcmp(lvl, "WARN") )
-			level = ANDROID_LOG_WARN;
-		else if ( !strcmp(lvl, "INFO") )
-			level = ANDROID_LOG_INFO;
-		else if ( !strcmp(lvl, "DEBUG") )
-			level = ANDROID_LOG_DEBUG;
-		else if ( !strcmp(lvl, "TRACE") )
-			level = ANDROID_LOG_VERBOSE;
-		__android_log_write(level, LOG_TAG, buffer);
-	}
-};
-
-//typedef void (lv_FatalErrorHandler_t)(int errorCode, const char * errorText );
-
-void cr3androidFatalErrorHandler(int errorCode, const char * errorText )
-{
-	LOGE("CoolReader Fatal Error #%d: %s", errorCode, errorText);
-	LOGASSERTFAILED("CoolReader Fatal Error", "CoolReader Fatal Error #%d: %s", errorCode, errorText);
-	//static char str[1001];
-	//snprintf(str, 1000, "CoolReader Fatal Error #%d: %s", errorCode, errorText);
-	//LOGE("CoolReader Fatal Error #%d: %s", errorCode, errorText);
-	//LOGASSERTFAILED(errorText, "CoolReader Fatal Error #%d: %s", errorCode, errorText);
-}
-
-/// set fatal error handler
-void crSetFatalErrorHandler( lv_FatalErrorHandler_t * handler );
-
-jboolean initInternal(JNIEnv * penv, jclass obj, jobjectArray fontArray, jint sdk_int) {
-
-	CRJNIEnv::sdk_int = sdk_int;
-
-	CRJNIEnv env(penv);
-
-	// to catch crashes and remove current cache file on crash (SIGSEGV etc.)
-	crSetSignalHandler();
-
-	LOGI("initInternal called");
-	// set fatal error handler
-	crSetFatalErrorHandler( &cr3androidFatalErrorHandler );
-	LOGD("Redirecting CDRLog to Android");
-	CRLog::setLogger( new JNICDRLogger() );
-	CRLog::setLogLevel( CRLog::LL_TRACE );
-	CRLog::info("CREngine log redirected");
-	CRLog::info("CRENGINE version %s %s", CR_ENGINE_VERSION, CR_ENGINE_BUILD_DATE);
-	
-	CRLog::info("initializing hyphenation manager");
-    HyphMan::initDictionaries(lString32::empty_str); //don't look for dictionaries
-	HyphMan::activateDictionary(lString32(HYPH_DICT_ID_NONE));
-	CRLog::info("creating font manager");
-    InitFontManager(lString8::empty_str);
-	CRLog::debug("converting fonts array: %d items", (int)env->GetArrayLength(fontArray));
-	lString32Collection fonts;
-	env.fromJavaStringArray(fontArray, fonts);
-	int len = fonts.length();
-	CRLog::debug("registering fonts: %d fonts in list", len);
-	for ( int i=0; i<len; i++ ) {
-		lString8 fontName = UnicodeToUtf8(fonts[i]);
-		CRLog::debug("registering font %s", fontName.c_str());
-		if ( !fontMan->RegisterFont( fontName ) )
-			CRLog::error("cannot load font %s", fontName.c_str());
-	}
-    CRLog::info("%d fonts registered", fontMan->GetFontCount());
-	return fontMan->GetFontCount() ? JNI_TRUE : JNI_FALSE;
-}
-
 /*
  * Class:     org_coolreader_crengine_Engine
  * Method:    initInternal
@@ -789,87 +865,7 @@ JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_Engine_initInternal
 	return res;
 }
 
-class HyphDataLoaderProxy : public HyphDataLoader {
-	JavaVM *mJavaVM;
-public:
-	HyphDataLoaderProxy(JavaVM *jvm) :
-			HyphDataLoader(), mJavaVM(jvm) {
-	}
-
-	virtual ~HyphDataLoaderProxy() {}
-
-	virtual LVStreamRef loadData(lString32 id) {
-		JNIEnv *penv = NULL;
-		bool attached = false;
-		mJavaVM->GetEnv((void **) &penv, JNI_VERSION_1_6);
-		if (NULL == penv) {
-			// caller thread is not attached yet
-			mJavaVM->AttachCurrentThread(&penv, NULL);
-			attached = true;
-		}
-		LVStreamRef stream = LVStreamRef();
-		jclass pjcEngine = penv->FindClass("org/coolreader/crengine/Engine");
-		if (NULL == pjcEngine)
-			return stream;
-		jmethodID pjmEngine_loadHyphDictData = penv->GetStaticMethodID(pjcEngine, "loadHyphDictData", "(Ljava/lang/String;)[B");
-		if (NULL == pjmEngine_loadHyphDictData)
-			return stream;
-		CRJNIEnv env(penv);
-		jstring jid = env.toJavaString(id);
-		jbyteArray data = static_cast<jbyteArray>(penv->CallStaticObjectMethod(pjcEngine, pjmEngine_loadHyphDictData, jid));
-		stream = env.jbyteArrayToStream(data);
-		if (attached)
-			mJavaVM->DetachCurrentThread();
-		return stream;
-	}
-};
-
-jboolean initDictionaries(JNIEnv *penv, jclass clazz, jobjectArray dictArray) {
-	jclass pjcHyphDict = penv->FindClass("org/coolreader/crengine/Engine$HyphDict");
-	if (NULL == pjcHyphDict)
-		return JNI_FALSE;
-	jfieldID pjfHyphDict_type = penv->GetFieldID(pjcHyphDict, "type", "I");
-	if (NULL == pjfHyphDict_type)
-		return JNI_FALSE;
-    jfieldID pjfHyphDict_code = penv->GetFieldID(pjcHyphDict, "code", "Ljava/lang/String;");
-    if (NULL == pjfHyphDict_code)
-        return JNI_FALSE;
-
-	int len = penv->GetArrayLength(dictArray);
-	HyphDictionary *dict;
-	CRJNIEnv env(penv);
-	HyphDictType dict_type;
-	for (int i = 0; i < len; i++) {
-		jobject obj = penv->GetObjectArrayElement(dictArray, i);
-		int type = penv->GetIntField(obj, pjfHyphDict_type);
-		jstring code = static_cast<jstring>(penv->GetObjectField(obj, pjfHyphDict_code));
-		switch (type) {     // convert org/coolreader/crengine/Engine$HyphDict$type into HyphDictType
-			case 0:         // org/coolreader/crengine/Engine$HYPH_NONE
-				dict_type = HDT_NONE;
-				break;
-			case 1:         // org/coolreader/crengine/Engine$HYPH_ALGO
-				dict_type = HDT_ALGORITHM;
-				break;
-			case 2:         // org/coolreader/crengine/Engine$HYPH_DICT
-				dict_type = HDT_DICT_TEX;
-				break;
-			default:
-				dict_type = HDT_NONE;
-				break;
-		}
-		lString32 dict_code = env.fromJavaString(code);
-		dict = new HyphDictionary(dict_type, dict_code, dict_code, dict_code);
-		if (!HyphMan::addDictionaryItem(dict))
-		    delete dict;
-	}
-	JavaVM *jvm;
-	env->GetJavaVM(&jvm);
-	HyphMan::setDataLoader(new HyphDataLoaderProxy( jvm ));
-	return JNI_TRUE;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_org_coolreader_crengine_Engine_initDictionaries
+JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_Engine_initDictionaries
  (JNIEnv * penv, jclass clazz, jobjectArray dictArray)
 {
     jboolean res = JNI_FALSE;
@@ -1165,6 +1161,10 @@ JNIEXPORT jint JNICALL Java_org_coolreader_crengine_Engine_getDomVersionCurrent
 	return gDOMVersionCurrent;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 //=====================================================================
 
 static JNINativeMethod sEngineMethods[] = {
diff --git a/android/jni/docview.cpp b/android/jni/docview.cpp
index d51979d8b..6c0f20569 100644
--- a/android/jni/docview.cpp
+++ b/android/jni/docview.cpp
@@ -1106,6 +1106,178 @@ int DocViewNative::doCommand( int cmd, int param )
    	return 1;
 }
 
+lString32 DocViewNative::getLink( int x, int y, int r )
+{
+	int step = 5;
+	int n = r / step;
+	r = n * step;
+	if ( r==0 )
+		return getLink(x, y);
+	lString32 link;
+	for ( int xx = -r; xx<=r; xx+=step ) {
+		link = getLink( x+xx, y-r );
+		if ( !link.empty() )
+			return link;
+		link = getLink( x+xx, y+r );
+		if ( !link.empty() )
+			return link;
+	}
+	for ( int yy = -r + step; yy<=r - step; yy+=step ) {
+		link = getLink( x+r, y+yy );
+		if ( !link.empty() )
+			return link;
+		link = getLink( x-r, y+yy );
+		if ( !link.empty() )
+			return link;
+	}
+	return lString32::empty_str;
+}
+
+lString32 DocViewNative::getLink( int x, int y )
+{
+	ldomXPointer p = _docview->getNodeByPoint( lvPoint(x, y) );
+	if ( p.isNull() )
+		return lString32::empty_str;
+	lString32 href = p.getHRef();
+	return href;
+}
+
+#define MAX_IMAGE_BUF_SIZE 1200000
+
+// checks whether point belongs to image: if found, returns true, and _currentImage is set to image
+bool DocViewNative::checkImage(int x, int y, int bufWidth, int bufHeight, int &dx, int &dy, bool & needRotate)
+{
+	_currentImage = _docview->getImageByPoint(lvPoint(x, y));
+	if (_currentImage.isNull())
+		return false;
+	dx = _currentImage->GetWidth();
+	dy = _currentImage->GetHeight();
+	if (dx < 8 && dy < 8) {
+		_currentImage.Clear();
+		return false;
+	}
+	needRotate = false;
+	if (bufWidth <= bufHeight) {
+		// screen == portrait
+		needRotate = 8 * dx > 10 * dy;
+	} else {
+		// screen == landscape
+		needRotate = 10 * dx < 8 * dy;
+	}
+	int scale = 1;
+	if (dx * dy > MAX_IMAGE_BUF_SIZE) {
+		scale = dx * dy /  MAX_IMAGE_BUF_SIZE;
+		dx /= scale;
+		dy /= scale;
+	}
+	LVColorDrawBuf * buf = new LVColorDrawBuf(dx, dy);
+	buf->Clear(0xFF000000); // transparent
+	buf->Draw(_currentImage, 0, 0, dx, dy, false);
+	if (needRotate) {
+		int c = dx;
+		dx = dy;
+		dy = c;
+		buf->Rotate(CR_ROTATE_ANGLE_90);
+	}
+	_currentImage = LVCreateDrawBufImageSource(buf, true);
+	return true;
+}
+
+// draws current image to buffer (scaled, panned)
+bool DocViewNative::drawImage(LVDrawBuf * buf, int x, int y, int dx, int dy)
+{
+	if (_currentImage.isNull())
+		return false;
+	return _docview->drawImage(buf, _currentImage, x, y, dx, dy);
+}
+
+// draws icon to buffer
+bool DocViewNative::drawIcon(LVDrawBuf * buf, lvRect & rc, int type) {
+	rc.shrink(rc.width() / 7);
+	lUInt32 light = 0x60C0C0C0;
+	lUInt32 dark = 0x80606060;
+	lUInt32 colors[2];
+	colors[0] = dark;
+	colors[1] = light;
+	// x0  x1  x2  x3
+	int x0 = rc.left;
+	int x1 = rc.left + rc.width() * 4 / 10;
+	int x2 = rc.right -  + rc.width() * 4 / 10;
+	int x3 = rc.right;
+	int y0 = rc.top;
+	int y1 = rc.top + rc.width() * 4 / 10;
+	int y2 = rc.bottom -  + rc.height() * 4 / 10;
+	int y3 = rc.bottom;
+	for (int w = 1; w>=0; w--) {
+		if (type == 1) {
+			// horizontal minus
+			buf->FillRect(x0-w, y1-w, x3+w+1, y1+w+1, colors[w]);
+			buf->FillRect(x0-w, y2-w, x3+w+1, y2+w+1, colors[w]);
+			buf->FillRect(x0-w, y1-w, x0+w+1, y2+w+1, colors[w]);
+			buf->FillRect(x3-w, y1-w, x3+w+1, y2+w+1, colors[w]);
+		} else if (type == 2) {
+			// vertical minus
+			buf->FillRect(x1-w, y0-w, x1+w+1, y3+w+1, colors[w]);
+			buf->FillRect(x2-w, y0-w, x2+w+1, y3+w+1, colors[w]);
+			buf->FillRect(x1-w, y0-w, x2+w+1, y0+w+1, colors[w]);
+			buf->FillRect(x1-w, y3-w, x2+w+1, y3+w+1, colors[w]);
+		} else {
+			// plus
+			buf->FillRect(x0-w, y1-w, x1+w+1, y1+w+1, colors[w]);
+			buf->FillRect(x1-w, y0-w, x1+w+1, y1+w+1, colors[w]);
+			buf->FillRect(x0-w, y1-w, x0+w+1, y2+w+1, colors[w]);
+			buf->FillRect(x1-w, y0-w, x2+w+1, y0+w+1, colors[w]);
+			buf->FillRect(x2-w, y0-w, x2+w+1, y1+w+1, colors[w]);
+			buf->FillRect(x2-w, y1-w, x3+w+1, y1+w+1, colors[w]);
+			buf->FillRect(x3-w, y1-w, x3+w+1, y2+w+1, colors[w]);
+			buf->FillRect(x2-w, y2-w, x3+w+1, y2+w+1, colors[w]);
+			buf->FillRect(x2-w, y2-w, x2+w+1, y3+w+1, colors[w]);
+			buf->FillRect(x1-w, y3-w, x2+w+1, y3+w+1, colors[w]);
+			buf->FillRect(x1-w, y2-w, x1+w+1, y3+w+1, colors[w]);
+			buf->FillRect(x0-w, y2-w, x1+w+1, y2+w+1, colors[w]);
+		}
+	}
+	return true;
+}
+
+// sets current image to null
+bool DocViewNative::closeImage() {
+	if (_currentImage.isNull())
+		return false;
+	_currentImage.Clear();
+	return true;
+}
+
+void DocViewNative::updateBatteryIcons() {
+	CRPropRef props = _docview->propsGetCurrent();
+	lUInt32 textColor = props->getColorDef(PROP_FONT_COLOR, 0x000000);
+	lUInt32 statusColor = props->getColorDef(PROP_STATUS_FONT_COLOR, 0xFF000000);
+	lUInt32 batteryColor = statusColor;
+	if ( batteryColor==0xFF000000 )
+		batteryColor = textColor;
+	int newSize = 28;
+	int w = _docview->GetWidth();
+	int h = _docview->GetHeight();
+	if (w > h)
+		w = h;
+	if (w > 700)
+		newSize = 56;
+	if ( _batteryIconColor != batteryColor || _batteryIconSize != newSize ) { //oldNightMode!=newNightMode
+		_batteryIconColor = batteryColor;
+		_batteryIconSize = newSize;
+		//CRLog::debug("%x->%x, %x->%x: Setting Battery icon color = #%06x", oldTextColor, newTextColor, oldStatusColor, newStatusColor, batteryColor);
+		LVRefVec<LVImageSource> icons;
+		getBatteryIcons(icons, _batteryIconColor, _batteryIconSize);
+		//CRLog::debug("Setting list of Battery icon bitmats");
+		_docview->setBatteryIcons( icons );
+		//CRLog::debug("Setting list of Battery icon bitmats - done");
+	}
+}
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
  * Class:     org_coolreader_crengine_DocView
@@ -1405,8 +1577,7 @@ JNIEXPORT jobject JNICALL Java_org_coolreader_crengine_DocView_getSettingsIntern
  * Method:    getDocPropsInternal
  * Signature: ()Ljava/util/Properties;
  */
-JNIEXPORT jobject JNICALL
-Java_org_coolreader_crengine_DocView_getDocPropsInternal
+JNIEXPORT jobject JNICALL Java_org_coolreader_crengine_DocView_getDocPropsInternal
   (JNIEnv * _env, jobject _this)
 {
     CRLog::trace("DocView_getDocPropsInternal");
@@ -2041,149 +2212,6 @@ JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_DocView_moveSelectionInt
     return JNI_FALSE;
 }
 
-
-lString32 DocViewNative::getLink( int x, int y, int r )
-{
-	int step = 5;
-	int n = r / step;
-	r = n * step;
-	if ( r==0 )
-		return getLink(x, y);
-	lString32 link;
-	for ( int xx = -r; xx<=r; xx+=step ) {
-		link = getLink( x+xx, y-r );
-		if ( !link.empty() )
-			return link;
-		link = getLink( x+xx, y+r );
-		if ( !link.empty() )
-			return link;
-	}
-	for ( int yy = -r + step; yy<=r - step; yy+=step ) {
-		link = getLink( x+r, y+yy );
-		if ( !link.empty() )
-			return link;
-		link = getLink( x-r, y+yy );
-		if ( !link.empty() )
-			return link;
-	}
-	return lString32::empty_str;
-}
-
-lString32 DocViewNative::getLink( int x, int y )
-{
-	ldomXPointer p = _docview->getNodeByPoint( lvPoint(x, y) );
-	if ( p.isNull() )
-		return lString32::empty_str;
-	lString32 href = p.getHRef();
-	return href;
-}
-
-#define MAX_IMAGE_BUF_SIZE 1200000
-
-// checks whether point belongs to image: if found, returns true, and _currentImage is set to image
-bool DocViewNative::checkImage(int x, int y, int bufWidth, int bufHeight, int &dx, int &dy, bool & needRotate)
-{
-	_currentImage = _docview->getImageByPoint(lvPoint(x, y));
-	if (_currentImage.isNull())
-		return false;
-	dx = _currentImage->GetWidth();
-	dy = _currentImage->GetHeight();
-	if (dx < 8 && dy < 8) {
-		_currentImage.Clear();
-		return false;
-	}
-	needRotate = false;
-	if (bufWidth <= bufHeight) {
-		// screen == portrait
-		needRotate = 8 * dx > 10 * dy;
-	} else {
-		// screen == landscape
-		needRotate = 10 * dx < 8 * dy;
-	}
-	int scale = 1;
-	if (dx * dy > MAX_IMAGE_BUF_SIZE) {
-		scale = dx * dy /  MAX_IMAGE_BUF_SIZE;
-		dx /= scale;
-		dy /= scale;
-	}
-	LVColorDrawBuf * buf = new LVColorDrawBuf(dx, dy);
-	buf->Clear(0xFF000000); // transparent
-	buf->Draw(_currentImage, 0, 0, dx, dy, false);
-	if (needRotate) {
-		int c = dx;
-		dx = dy;
-		dy = c;
-		buf->Rotate(CR_ROTATE_ANGLE_90);
-	}
-	_currentImage = LVCreateDrawBufImageSource(buf, true);
-	return true;
-}
-
-// draws current image to buffer (scaled, panned)
-bool DocViewNative::drawImage(LVDrawBuf * buf, int x, int y, int dx, int dy)
-{
-	if (_currentImage.isNull())
-		return false;
-	return _docview->drawImage(buf, _currentImage, x, y, dx, dy);
-}
-
-// draws icon to buffer
-bool DocViewNative::drawIcon(LVDrawBuf * buf, lvRect & rc, int type) {
-	rc.shrink(rc.width() / 7);
-	lUInt32 light = 0x60C0C0C0;
-	lUInt32 dark = 0x80606060;
-	lUInt32 colors[2];
-	colors[0] = dark;
-	colors[1] = light;
-	// x0  x1  x2  x3
-	int x0 = rc.left;
-	int x1 = rc.left + rc.width() * 4 / 10;
-	int x2 = rc.right -  + rc.width() * 4 / 10;
-	int x3 = rc.right;
-	int y0 = rc.top;
-	int y1 = rc.top + rc.width() * 4 / 10;
-	int y2 = rc.bottom -  + rc.height() * 4 / 10;
-	int y3 = rc.bottom;
-	for (int w = 1; w>=0; w--) {
-		if (type == 1) {
-			// horizontal minus
-			buf->FillRect(x0-w, y1-w, x3+w+1, y1+w+1, colors[w]);
-			buf->FillRect(x0-w, y2-w, x3+w+1, y2+w+1, colors[w]);
-			buf->FillRect(x0-w, y1-w, x0+w+1, y2+w+1, colors[w]);
-			buf->FillRect(x3-w, y1-w, x3+w+1, y2+w+1, colors[w]);
-		} else if (type == 2) {
-			// vertical minus
-			buf->FillRect(x1-w, y0-w, x1+w+1, y3+w+1, colors[w]);
-			buf->FillRect(x2-w, y0-w, x2+w+1, y3+w+1, colors[w]);
-			buf->FillRect(x1-w, y0-w, x2+w+1, y0+w+1, colors[w]);
-			buf->FillRect(x1-w, y3-w, x2+w+1, y3+w+1, colors[w]);
-		} else {
-			// plus
-			buf->FillRect(x0-w, y1-w, x1+w+1, y1+w+1, colors[w]);
-			buf->FillRect(x1-w, y0-w, x1+w+1, y1+w+1, colors[w]);
-			buf->FillRect(x0-w, y1-w, x0+w+1, y2+w+1, colors[w]);
-			buf->FillRect(x1-w, y0-w, x2+w+1, y0+w+1, colors[w]);
-			buf->FillRect(x2-w, y0-w, x2+w+1, y1+w+1, colors[w]);
-			buf->FillRect(x2-w, y1-w, x3+w+1, y1+w+1, colors[w]);
-			buf->FillRect(x3-w, y1-w, x3+w+1, y2+w+1, colors[w]);
-			buf->FillRect(x2-w, y2-w, x3+w+1, y2+w+1, colors[w]);
-			buf->FillRect(x2-w, y2-w, x2+w+1, y3+w+1, colors[w]);
-			buf->FillRect(x1-w, y3-w, x2+w+1, y3+w+1, colors[w]);
-			buf->FillRect(x1-w, y2-w, x1+w+1, y3+w+1, colors[w]);
-			buf->FillRect(x0-w, y2-w, x1+w+1, y2+w+1, colors[w]);
-		}
-	}
-	return true;
-}
-
-// sets current image to null
-bool DocViewNative::closeImage() {
-	if (_currentImage.isNull())
-		return false;
-	_currentImage.Clear();
-	return true;
-}
-
 /*
  * Class:     org_coolreader_crengine_DocView
  * Method:    checkLinkInternal
@@ -2257,30 +2285,6 @@ JNIEXPORT void JNICALL Java_org_coolreader_crengine_DocView_hilightBookmarksInte
     p->_docview->setBookmarkList(bookmarks);
 }
 
-
-
-void DocViewNative::updateBatteryIcons() {
-	CRPropRef props = _docview->propsGetCurrent();
-	lUInt32 textColor = props->getColorDef(PROP_FONT_COLOR, 0x000000);
-	lUInt32 statusColor = props->getColorDef(PROP_STATUS_FONT_COLOR, 0xFF000000);
-	lUInt32 batteryColor = statusColor;
-	if ( batteryColor==0xFF000000 )
-		batteryColor = textColor;
-	int newSize = 28;
-	int w = _docview->GetWidth();
-	int h = _docview->GetHeight();
-	if (w > h)
-		w = h;
-	if (w > 700)
-		newSize = 56;
-	if ( _batteryIconColor != batteryColor || _batteryIconSize != newSize ) { //oldNightMode!=newNightMode
-		_batteryIconColor = batteryColor;
-		_batteryIconSize = newSize;
-		//CRLog::debug("%x->%x, %x->%x: Setting Battery icon color = #%06x", oldTextColor, newTextColor, oldStatusColor, newStatusColor, batteryColor);
-	    LVRefVec<LVImageSource> icons;
-	    getBatteryIcons(icons, _batteryIconColor, _batteryIconSize);
-		//CRLog::debug("Setting list of Battery icon bitmats");
-	   _docview->setBatteryIcons( icons );
-		//CRLog::debug("Setting list of Battery icon bitmats - done");
-	}
+#ifdef __cplusplus
 }
+#endif

From a89937007f47195949dc3d69c1e905bbff21d3e7 Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sun, 25 Jul 2021 10:00:06 +0400
Subject: [PATCH 22/35] Thirdparty repo: bump FreeType to 2.11.0 version.

---
 CMakeLists.txt                                |  1 +
 thirdparty_repo/freetype.meta.sh              |  8 +-
 ...l.c-FT_Library_SetLcdGeometry-Fix-re.patch | 39 --------
 .../patches/freetype/01-disable-install.patch | 93 -------------------
 thirdparty_repo/repo_srcdirs.cmake            |  2 +-
 thirdparty_repo/repo_srcdirs.mk               |  2 +-
 6 files changed, 6 insertions(+), 139 deletions(-)
 delete mode 100644 thirdparty_repo/patches/freetype/0001-srd-base-ftlcdfil.c-FT_Library_SetLcdGeometry-Fix-re.patch
 delete mode 100644 thirdparty_repo/patches/freetype/01-disable-install.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18841ca7b..0f51591be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -257,6 +257,7 @@ if (NOT FREETYPE_FOUND)
   SET(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
   SET(PNG_PNG_INCLUDE_DIR ${PNG_INCLUDE_DIR} CACHE PATH "" FORCE)
   SET(PNG_LIBRARY ${PNG_LIBRARIES})
+  SET(SKIP_INSTALL_ALL ON CACHE BOOL "Don't install anything" FORCE)
   ADD_SUBDIRECTORY(thirdparty/${REPO_FREETYPE_SRCDIR})
   SET(FREETYPE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_FREETYPE_SRCDIR}/include CACHE PATH "" FORCE)
   SET(FREETYPE_LIBRARIES freetype)
diff --git a/thirdparty_repo/freetype.meta.sh b/thirdparty_repo/freetype.meta.sh
index f30849d5e..70aedf356 100644
--- a/thirdparty_repo/freetype.meta.sh
+++ b/thirdparty_repo/freetype.meta.sh
@@ -2,16 +2,14 @@
 # Metadata for deploy script
 
 PN="freetype"
-PV="2.10.4"
+PV="2.11.0"
 # package revision: when patchset is changed (but not version), increase it
 # when version changed, reset to "1".
 REV="2"
 SRCFILE="${PN}-${PV}.tar.xz"
-SHA512="827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f"
-
+SHA512="bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d"
 URL="https://download.savannah.gnu.org/releases/${PN}/${SRCFILE}"
 
 SOURCESDIR="${PN}-${PV}"
 
-PATCHES="01-disable-install.patch
-    0001-srd-base-ftlcdfil.c-FT_Library_SetLcdGeometry-Fix-re.patch"
+PATCHES=
diff --git a/thirdparty_repo/patches/freetype/0001-srd-base-ftlcdfil.c-FT_Library_SetLcdGeometry-Fix-re.patch b/thirdparty_repo/patches/freetype/0001-srd-base-ftlcdfil.c-FT_Library_SetLcdGeometry-Fix-re.patch
deleted file mode 100644
index d2bd26827..000000000
--- a/thirdparty_repo/patches/freetype/0001-srd-base-ftlcdfil.c-FT_Library_SetLcdGeometry-Fix-re.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b594cd90bd053061ea8437bd9f219ee1ced956da Mon Sep 17 00:00:00 2001
-From: Alexei Podtelezhnikov <apodtele@gmail.com>
-Date: Tue, 19 Jan 2021 07:35:38 -0500
-Subject: [PATCH] * srd/base/ftlcdfil.c (FT_Library_SetLcdGeometry): Fix return
- value.
-
----
- ChangeLog           | 4 ++++
- src/base/ftlcdfil.c | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-// diff --git a/ChangeLog b/ChangeLog
-// index 6faa683a0..6a72a8918 100644
-// --- a/ChangeLog
-// +++ b/ChangeLog
-// @@ -1,3 +1,7 @@
-// +2021-01-19  Alexei Podtelezhnikov  <apodtele@gmail.com>
-// +
-// +	* srd/base/ftlcdfil.c (FT_Library_SetLcdGeometry): Fix return value.
-// +
-//  2021-01-15  Nikolaus Waxweiler  <madigens@gmail.com>
-//  
-//  	[afshaper] Fix hb_ot_tags_from_script deprecation warning.
-diff --git a/src/base/ftlcdfil.c b/src/base/ftlcdfil.c
-index 1a2e4d4ff..f3725a3d7 100644
---- a/src/base/ftlcdfil.c
-+++ b/src/base/ftlcdfil.c
-@@ -428,7 +428,7 @@
- 
-     ft_memcpy( library->lcd_geometry, sub, 3 * sizeof( FT_Vector ) );
- 
--    return FT_THROW( Unimplemented_Feature );
-+    return FT_Err_Ok;
-   }
- 
- #endif /* !FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
--- 
-2.26.3
-
diff --git a/thirdparty_repo/patches/freetype/01-disable-install.patch b/thirdparty_repo/patches/freetype/01-disable-install.patch
deleted file mode 100644
index d3b0980ac..000000000
--- a/thirdparty_repo/patches/freetype/01-disable-install.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -urBb freetype-2.10.4-orig/CMakeLists.txt freetype-2.10.4/CMakeLists.txt
---- freetype-2.10.4-orig/CMakeLists.txt	2020-10-20 09:03:43.000000000 +0400
-+++ freetype-2.10.4/CMakeLists.txt	2021-01-26 23:46:10.973017007 +0400
-@@ -470,89 +470,6 @@
- endif ()
- 
- 
--# Installation
--include(GNUInstallDirs)
--
--if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
--  install(
--    # Note the trailing slash in the argument to `DIRECTORY'!
--    DIRECTORY ${PROJECT_SOURCE_DIR}/include/
--      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2
--      COMPONENT headers
--      PATTERN "internal" EXCLUDE
--      PATTERN "ftconfig.h" EXCLUDE
--      PATTERN "ftoption.h" EXCLUDE)
--  install(
--    FILES ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h
--          ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h
--      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2/freetype/config
--      COMPONENT headers)
--endif ()
--
--if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
--  # Generate the pkg-config file
--  if (UNIX)
--    file(READ "${PROJECT_SOURCE_DIR}/builds/unix/freetype2.in" FREETYPE2_PC_IN)
--
--    string(REPLACE ";" ", " PKG_CONFIG_REQUIRED_PRIVATE "${PKG_CONFIG_REQUIRED_PRIVATE}")
--
--    string(REPLACE "%prefix%" ${CMAKE_INSTALL_PREFIX}
--           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
--    string(REPLACE "%exec_prefix%" "\${prefix}"
--           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
--    string(REPLACE "%libdir%" "\${prefix}/${CMAKE_INSTALL_LIBDIR}"
--           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
--    string(REPLACE "%includedir%" "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}"
--           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
--    string(REPLACE "%ft_version%" "${LIBTOOL_CURRENT}.${LIBTOOL_REVISION}.${LIBTOOL_AGE}"
--           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
--    string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}"
--           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
--    string(REPLACE "%LIBS_PRIVATE%" ""  # All libs support pkg-config
--           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
--
--    set(FREETYPE2_PC_IN_NAME "${PROJECT_BINARY_DIR}/freetype2.pc")
--    if (EXISTS "${FREETYPE2_PC_IN_NAME}")
--      file(READ "${FREETYPE2_PC_IN_NAME}" ORIGINAL_FREETYPE2_PC_IN)
--    else ()
--      set(ORIGINAL_FREETYPE2_PC_IN "")
--    endif ()
--    if (NOT (ORIGINAL_FREETYPE2_PC_IN STREQUAL FREETYPE2_PC_IN))
--      file(WRITE "${FREETYPE2_PC_IN_NAME}" ${FREETYPE2_PC_IN})
--    endif ()
--
--    install(
--      FILES ${PROJECT_BINARY_DIR}/freetype2.pc
--      DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
--      COMPONENT pkgconfig)
--  endif ()
--
--  include(CMakePackageConfigHelpers)
--  write_basic_package_version_file(
--    ${PROJECT_BINARY_DIR}/freetype-config-version.cmake
--    VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
--    COMPATIBILITY SameMajorVersion)
--
--  install(
--    TARGETS freetype
--      EXPORT freetype-targets
--      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
--      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--      FRAMEWORK DESTINATION Library/Frameworks
--      COMPONENT libraries)
--  install(
--    EXPORT freetype-targets
--      DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype
--      FILE freetype-config.cmake
--      COMPONENT headers)
--  install(
--    FILES ${PROJECT_BINARY_DIR}/freetype-config-version.cmake
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype
--    COMPONENT headers)
--endif ()
--
--
- # Packaging
- set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
- set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The FreeType font rendering library.")
diff --git a/thirdparty_repo/repo_srcdirs.cmake b/thirdparty_repo/repo_srcdirs.cmake
index 87d1d6d32..26e40a35d 100644
--- a/thirdparty_repo/repo_srcdirs.cmake
+++ b/thirdparty_repo/repo_srcdirs.cmake
@@ -3,7 +3,7 @@
 # See <top_srcdir>/CMakeLists.txt
 #     <top_srcdir>/android/app/CMakeLists.txt
 
-set(REPO_FREETYPE_SRCDIR "freetype-2.10.4")
+set(REPO_FREETYPE_SRCDIR "freetype-2.11.0")
 set(REPO_FRIBIDI_SRCDIR "fribidi-1.0.10")
 set(REPO_HARFBUZZ_SRCDIR "harfbuzz-2.8.2")
 set(REPO_LIBJPEG_SRCDIR "jpeg-9d")
diff --git a/thirdparty_repo/repo_srcdirs.mk b/thirdparty_repo/repo_srcdirs.mk
index 0bfe60ec2..9da248224 100644
--- a/thirdparty_repo/repo_srcdirs.mk
+++ b/thirdparty_repo/repo_srcdirs.mk
@@ -2,7 +2,7 @@
 # For ndk-build project file.
 # See <top_srcdir>/android/jni/Android.mk
 
-REPO_FREETYPE_SRCDIR := freetype-2.10.4
+REPO_FREETYPE_SRCDIR := freetype-2.11.0
 REPO_FRIBIDI_SRCDIR := fribidi-1.0.10
 REPO_HARFBUZZ_SRCDIR := harfbuzz-2.8.2
 REPO_LIBJPEG_SRCDIR := jpeg-9d

From c51346a1318f19926590658d9d355ef0e4948c63 Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sun, 25 Jul 2021 10:46:20 +0400
Subject: [PATCH 23/35] Updated HarfBuzz cmake module to be compatible with
 FreeType-2.11.0 source tree.

---
 CMakeLists.txt                                | 25 +++---
 cmake/modules/FindHarfBuzz.cmake              | 68 +++++++--------
 thirdparty_repo/harfbuzz.meta.sh              |  2 +-
 .../patches/harfbuzz/01-disable-install.patch | 83 -------------------
 4 files changed, 50 insertions(+), 128 deletions(-)
 delete mode 100644 thirdparty_repo/patches/harfbuzz/01-disable-install.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f51591be..175e716b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -248,10 +248,14 @@ ADD_SUBDIRECTORY(thirdparty_unman/qimagescale)
 
 if (NOT FREETYPE_FOUND)
   message("System FREETYPE not found, will build local one\n")
-  if (NOT HARFBUZZ_FOUND)
-	SET(HARFBUZZ_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE)
-	SET(HARFBUZZ_LIBRARIES harfbuzz)
-  endif (NOT HARFBUZZ_FOUND)
+  if (NOT HarfBuzz_FOUND)
+    SET(HarfBuzz_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE)
+    SET(HarfBuzz_INCLUDE_DIRS ${HarfBuzz_INCLUDE_DIR} CACHE PATH "" FORCE)
+    SET(HarfBuzz_LIBRARIES harfbuzz CACHE PATH "" FORCE)
+    SET(HARFBUZZ_INCLUDE_DIR ${HarfBuzz_INCLUDE_DIR} CACHE PATH "" FORCE)
+    SET(HARFBUZZ_INCLUDE_DIRS ${HarfBuzz_INCLUDE_DIRS} CACHE PATH "" FORCE)
+    SET(HARFBUZZ_LIBRARIES ${HarfBuzz_LIBRARIES} CACHE PATH "" FORCE)
+  endif (NOT HarfBuzz_FOUND)
   SET(FT_WITH_ZLIB ON CACHE BOOL "Use system zlib instead of internal library." FORCE)
   SET(FT_WITH_PNG ON CACHE BOOL "Support PNG compressed OpenType embedded bitmaps." FORCE)
   SET(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
@@ -263,15 +267,16 @@ if (NOT FREETYPE_FOUND)
   SET(FREETYPE_LIBRARIES freetype)
 endif (NOT FREETYPE_FOUND)
 
-if (NOT HARFBUZZ_FOUND)
+if (NOT HarfBuzz_FOUND)
   message("System HarfBuzz not found, will build local one\n")
   SET(HB_HAVE_FREETYPE ON CACHE BOOL "Enable freetype interop helpers" FORCE)
   SET(HB_BUILD_TESTS OFF CACHE BOOL "Build harfbuzz tests" FORCE)
   SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES})
+  SET(SKIP_INSTALL_ALL ON CACHE BOOL "Don't install anything" FORCE)
   ADD_SUBDIRECTORY(thirdparty/${REPO_HARFBUZZ_SRCDIR})
-  SET(HARFBUZZ_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE)
-  SET(HARFBUZZ_LIBRARY harfbuzz)
-endif (NOT HARFBUZZ_FOUND)
+  SET(HarfBuzz_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE)
+  SET(HarfBuzz_LIBRARY harfbuzz)
+endif (NOT HarfBuzz_FOUND)
 
 if (NOT MSVC)
 	find_package(FontConfig 2.11.0)
@@ -356,7 +361,7 @@ INCLUDE_DIRECTORIES(
   ${JPEG_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
   ${FREETYPE_INCLUDE_DIRS}
-  ${HARFBUZZ_INCLUDE_DIRS}
+  ${HarfBuzz_INCLUDE_DIRS}
   ${ANTIWORD_INCLUDE_DIR}
   ${CHM_INCLUDE_DIR}
   ${FRIBIDI_INCLUDE_DIR}
@@ -372,7 +377,7 @@ else()
 SET(STD_LIBS
   ${JPEG_LIBRARIES}
   ${FREETYPE_LIBRARIES}
-  ${HARFBUZZ_LIBRARY}
+  ${HarfBuzz_LIBRARY}
   ${PNG_LIBRARIES}
   ${ZLIB_LIBRARIES}
   ${CHM_LIBRARIES}
diff --git a/cmake/modules/FindHarfBuzz.cmake b/cmake/modules/FindHarfBuzz.cmake
index 7653938c8..17e77a257 100644
--- a/cmake/modules/FindHarfBuzz.cmake
+++ b/cmake/modules/FindHarfBuzz.cmake
@@ -1,11 +1,11 @@
 # - Try to find the HarfBuzz
 # Once done this will define
 #
-#  HARFBUZZ_FOUND - system has HarfBuzz
-#  HARFBUZZ_INCLUDE_DIRS - The include directory to use for the HarfBuzz headers
-#  HARFBUZZ_LIBRARIES - Link these to use HarfBuzz
-#  HARFBUZZ_DEFINITIONS - Compiler switches required for using HarfBuzz
-#  HARFBUZZ_VERSION - The version of the HarfBuzz library which was found.
+#  HarfBuzz_FOUND - system has HarfBuzz
+#  HarfBuzz_INCLUDE_DIRS - The include directory to use for the HarfBuzz headers
+#  HarfBuzz_LIBRARIES - Link these to use HarfBuzz
+#  HarfBuzz_DEFINITIONS - Compiler switches required for using HarfBuzz
+#  HarfBuzz_VERSION - The version of the HarfBuzz library which was found.
 
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -19,14 +19,14 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-mark_as_advanced(HARFBUZZ_LIBRARY HARFBUZZ_INCLUDE_DIR)
+mark_as_advanced(HarfBuzz_LIBRARY HarfBuzz_INCLUDE_DIR)
 
-if (HARFBUZZ_LIBRARY AND HARFBUZZ_INCLUDE_DIR)
+if (HarfBuzz_LIBRARY AND HarfBuzz_INCLUDE_DIR)
 
   # in cache already
-  set(HARFBUZZ_FOUND TRUE)
+  set(HarfBuzz_FOUND TRUE)
 
-else (HARFBUZZ_LIBRARY AND HARFBUZZ_INCLUDE_DIR)
+else (HarfBuzz_LIBRARY AND HarfBuzz_INCLUDE_DIR)
 
   if (NOT MSVC)
     # use pkg-config to get the directories and then use these values
@@ -34,58 +34,58 @@ else (HARFBUZZ_LIBRARY AND HARFBUZZ_INCLUDE_DIR)
     find_package(PkgConfig QUIET)
     pkg_check_modules(PC_HARFBUZZ QUIET harfbuzz)
 
-    set(HARFBUZZ_DEFINITIONS ${PC_HARFBUZZ_CFLAGS_OTHER})
-    set(HARFBUZZ_VERSION ${PC_HARFBUZZ_VERSION})
+    set(HarfBuzz_DEFINITIONS ${PC_HARFBUZZ_CFLAGS_OTHER})
+    set(HarfBuzz_VERSION ${PC_HARFBUZZ_VERSION})
   endif (NOT MSVC)
 
-  find_path(HARFBUZZ_INCLUDE_DIR hb.h
+  find_path(HarfBuzz_INCLUDE_DIR hb.h
     PATH_SUFFIXES harfbuzz
     PATHS
     ${PC_HARFBUZZ_INCLUDEDIR}
     ${PC_HARFBUZZ_INCLUDE_DIRS}
   )
 
-  find_library(HARFBUZZ_LIBRARY NAMES harfbuzz
+  find_library(HarfBuzz_LIBRARY NAMES harfbuzz
     PATHS
     ${PC_HARFBUZZ_LIBDIR}
     ${PC_HARFBUZZ_LIBRARY_DIRS}
   )
 
-  if (NOT HARFBUZZ_VERSION)
-    if(EXISTS "${HARFBUZZ_INCLUDE_DIR}/hb-version.h")
-      file(STRINGS "${HARFBUZZ_INCLUDE_DIR}/hb-version.h"
+  if (NOT HarfBuzz_VERSION)
+    if(EXISTS "${HarfBuzz_INCLUDE_DIR}/hb-version.h")
+      file(STRINGS "${HarfBuzz_INCLUDE_DIR}/hb-version.h"
         _HARFBUZZ_VERSION_MAJOR REGEX "^#define HB_VERSION_MAJOR")
-      string(REGEX MATCH "[0-9]+" HARFBUZZ_VERSION_MAJOR "${_HARFBUZZ_VERSION_MAJOR}")
-      file(STRINGS "${HARFBUZZ_INCLUDE_DIR}/hb-version.h"
+      string(REGEX MATCH "[0-9]+" HarfBuzz_VERSION_MAJOR "${_HARFBUZZ_VERSION_MAJOR}")
+      file(STRINGS "${HarfBuzz_INCLUDE_DIR}/hb-version.h"
         _HARFBUZZ_VERSION_MINOR REGEX "^#define HB_VERSION_MINOR")
-      string(REGEX MATCH "[0-9]+" HARFBUZZ_VERSION_MINOR "${_HARFBUZZ_VERSION_MINOR}")
-      file(STRINGS "${HARFBUZZ_INCLUDE_DIR}/hb-version.h"
+      string(REGEX MATCH "[0-9]+" HarfBuzz_VERSION_MINOR "${_HARFBUZZ_VERSION_MINOR}")
+      file(STRINGS "${HarfBuzz_INCLUDE_DIR}/hb-version.h"
         _HARFBUZZ_VERSION_MICRO REGEX "^#define HB_VERSION_MICRO")
-      string(REGEX MATCH "[0-9]+" HARFBUZZ_VERSION_MICRO "${_HARFBUZZ_VERSION_MICRO}")
-      set(HARFBUZZ_VERSION ${HARFBUZZ_VERSION_MAJOR}.${HARFBUZZ_VERSION_MINOR}.${HARFBUZZ_VERSION_MICRO})
+      string(REGEX MATCH "[0-9]+" HarfBuzz_VERSION_MICRO "${_HARFBUZZ_VERSION_MICRO}")
+      set(HarfBuzz_VERSION ${HarfBuzz_VERSION_MAJOR}.${HarfBuzz_VERSION_MINOR}.${HarfBuzz_VERSION_MICRO})
     endif()
   endif()
 
   include(FindPackageHandleStandardArgs)
   find_package_handle_standard_args(HarfBuzz
-    FOUND_VAR HARFBUZZ_FOUND
+    FOUND_VAR HarfBuzz_FOUND
     REQUIRED_VARS
-      HARFBUZZ_LIBRARY
-      HARFBUZZ_INCLUDE_DIR
-    VERSION_VAR HARFBUZZ_VERSION
+      HarfBuzz_LIBRARY
+      HarfBuzz_INCLUDE_DIR
+    VERSION_VAR HarfBuzz_VERSION
   )
 
-endif (HARFBUZZ_LIBRARY AND HARFBUZZ_INCLUDE_DIR)
+endif (HarfBuzz_LIBRARY AND HarfBuzz_INCLUDE_DIR)
 
-if(HARFBUZZ_FOUND)
-  set(HARFBUZZ_LIBRARIES ${HARFBUZZ_LIBRARY})
-  set(HARFBUZZ_INCLUDE_DIRS ${HARFBUZZ_INCLUDE_DIR})
+if(HarfBuzz_FOUND)
+  set(HarfBuzz_LIBRARIES ${HarfBuzz_LIBRARY})
+  set(HarfBuzz_INCLUDE_DIRS ${HarfBuzz_INCLUDE_DIR})
   if(NOT TARGET HarfBuzz::HarfBuzz)
     add_library(HarfBuzz::HarfBuzz UNKNOWN IMPORTED)
     set_target_properties(HarfBuzz::HarfBuzz PROPERTIES
-      IMPORTED_LOCATION "${HARFBUZZ_LIBRARIES}"
-      INTERFACE_COMPILE_DEFINITIONS "${HARFBUZZ_DEFINITIONS}"
-      INTERFACE_INCLUDE_DIRECTORIES "${HARFBUZZ_INCLUDE_DIRS}"
+      IMPORTED_LOCATION "${HarfBuzz_LIBRARIES}"
+      INTERFACE_COMPILE_DEFINITIONS "${HarfBuzz_DEFINITIONS}"
+      INTERFACE_INCLUDE_DIRECTORIES "${HarfBuzz_INCLUDE_DIRS}"
     )
   endif()
-endif(HARFBUZZ_FOUND)
+endif(HarfBuzz_FOUND)
diff --git a/thirdparty_repo/harfbuzz.meta.sh b/thirdparty_repo/harfbuzz.meta.sh
index da9d20a8a..83af0602f 100644
--- a/thirdparty_repo/harfbuzz.meta.sh
+++ b/thirdparty_repo/harfbuzz.meta.sh
@@ -13,4 +13,4 @@ URL="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${SRCFILE}"
 
 SOURCESDIR="${PN}-${PV}"
 
-PATCHES="01-disable-install.patch"
+PATCHES=
diff --git a/thirdparty_repo/patches/harfbuzz/01-disable-install.patch b/thirdparty_repo/patches/harfbuzz/01-disable-install.patch
deleted file mode 100644
index 9474bebe3..000000000
--- a/thirdparty_repo/patches/harfbuzz/01-disable-install.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -urBb harfbuzz-2.8.0-orig/CMakeLists.txt harfbuzz-2.8.0/CMakeLists.txt
---- harfbuzz-2.8.0-orig/CMakeLists.txt	2021-03-16 21:32:44.000000000 +0400
-+++ harfbuzz-2.8.0/CMakeLists.txt	2021-03-23 08:26:48.249008717 +0400
-@@ -664,79 +664,3 @@
- 
-   mark_as_advanced(CAIRO_INCLUDE_DIRS CAIRO_LIBRARIESNAMES)
- endif ()
--
--
--## Install
--include (GNUInstallDirs)
--
--if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
--  install(FILES ${project_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/harfbuzz)
--  if (HB_HAVE_GOBJECT)
--    install(FILES ${hb_gobject_headers} ${hb_gobject_gen_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/harfbuzz)
--  endif ()
--endif ()
--
--if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
--  install(TARGETS harfbuzz
--    EXPORT harfbuzzConfig
--    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
--    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    FRAMEWORK DESTINATION Library/Frameworks
--  )
--  install(EXPORT harfbuzzConfig
--      NAMESPACE harfbuzz::
--      DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/harfbuzz
--  )
--  if (HB_HAVE_ICU)
--    install(TARGETS harfbuzz-icu
--      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
--      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--      FRAMEWORK DESTINATION Library/Frameworks
--    )
--  endif ()
--  if (HB_BUILD_UTILS)
--    if (WIN32 AND BUILD_SHARED_LIBS)
--      install(TARGETS harfbuzz-subset
--        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--      )
--    endif ()
--    install(TARGETS hb-view
--      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    )
--    install(TARGETS hb-subset
--      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    )
--
--    install(TARGETS hb-shape
--      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    )
--
--    install(TARGETS hb-ot-shape-closure
--      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    )
--  endif ()
--  if (HB_HAVE_GOBJECT)
--    install(TARGETS harfbuzz-gobject
--      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
--      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    )
--    if (HB_HAVE_INTROSPECTION)
--      if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
--        set (hb_libpath "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
--      else ()
--        set (hb_libpath "$<TARGET_FILE_DIR:harfbuzz-gobject>")
--      endif ()
--
--      install(FILES "${hb_libpath}/HarfBuzz-0.0.gir"
--        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/gir-1.0
--      )
--
--      install(FILES "${hb_libpath}/HarfBuzz-0.0.typelib"
--        DESTINATION ${CMAKE_INSTALL_LIBDIR}/girepository-1.0
--      )
--    endif ()
--  endif ()
--endif ()

From 60c6dbe3d45c4d4d454a9378aa35a8e3955022ce Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Mon, 26 Jul 2021 23:00:14 +0400
Subject: [PATCH 24/35] Android: Experimental feature: an additional filter has
 been added to the settings dialog to display only fonts that support the
 language of the current book.

---
 android/res/layout/option_lang_filter.xml     |  18 ++
 android/res/values-ru/strings.xml             |   3 +
 android/res/values/strings.xml                |   3 +
 .../coolreader/crengine/OptionsDialog.java    | 293 +++++++++++++-----
 crengine/include/lvfntman.h                   |   2 +-
 crengine/include/lvfont.h                     |   2 -
 crengine/include/lvhashtable.h                |   5 +
 crengine/src/lvfont/lvfreetypeface.cpp        |  86 -----
 crengine/src/lvfont/lvfreetypeface.h          |   9 +-
 crengine/src/lvfont/lvfreetypefontman.cpp     | 156 +++++++++-
 crengine/src/lvfont/lvfreetypefontman.h       |   3 +-
 11 files changed, 393 insertions(+), 187 deletions(-)
 create mode 100644 android/res/layout/option_lang_filter.xml

diff --git a/android/res/layout/option_lang_filter.xml b/android/res/layout/option_lang_filter.xml
new file mode 100644
index 000000000..4091d8c95
--- /dev/null
+++ b/android/res/layout/option_lang_filter.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/option_item_body"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:orientation="vertical"
+        android:paddingRight="?android:attr/scrollbarSize">
+
+    <CheckBox
+            android:id="@+id/cb_filter_by_lang"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="0dip"
+            android:text="@string/filter_by_book_language_s" />
+</LinearLayout>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 39e569051..69305617e 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -732,4 +732,7 @@
     <string name="options_disabled_document_styles">отключены встроенные стили документа или неподдерживаемый тип документа</string>
     <string name="options_multilingual_enabled">отключено, так как включена поддежка мультиязычных документов</string>
     <string name="options_multilingual_disabled">отключено, так как отключена поддежка мультиязычных документов или включен устаревший рендеринг</string>
+    <string name="filter_by_book_language_s">Отфильтровать по языку книги (%s)</string>
+    <string name="scanning_font_files">Сканирование файлов шрифтов…</string>
+    <string name="undetermined">Неопределенный</string>
 </resources>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 4bfbaca1f..81cfdc9a5 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -771,4 +771,7 @@
     <string name="options_disabled_document_styles">disabled embedded document styles or unsupported document type</string>
     <string name="options_multilingual_enabled">disabled because support for multilingual documents is enabled</string>
     <string name="options_multilingual_disabled">disabled because support for multilingual documents is disabled or legacy rendering is enabled</string>
+    <string name="filter_by_book_language_s">Filter by book language (%s)</string>
+    <string name="scanning_font_files">Scanning font files…</string>
+    <string name="undetermined">Undetermined</string>
 </resources>
diff --git a/android/src/org/coolreader/crengine/OptionsDialog.java b/android/src/org/coolreader/crengine/OptionsDialog.java
index e0fd32f0f..b6f790e29 100644
--- a/android/src/org/coolreader/crengine/OptionsDialog.java
+++ b/android/src/org/coolreader/crengine/OptionsDialog.java
@@ -16,10 +16,12 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.RadioButton;
@@ -1163,7 +1165,79 @@ public View getView(View convertView, ViewGroup parent) {
 	}
 	
 	public static class ListOption extends OptionBase {
-		private ArrayList<Pair> list = new ArrayList<>();
+		protected ArrayList<Pair> list = new ArrayList<>();
+
+		class ListOptionAdapter extends BaseAdapter {
+
+			private final ListView mListView;
+			private final List<Pair> mList;
+
+			ListOptionAdapter(ListView listView, List<Pair> list) {
+				super();
+				mListView = listView;
+				mList = list;
+			}
+
+			public boolean areAllItemsEnabled() {
+				return true;
+			}
+
+			public boolean isEnabled(int position) {
+				return true;
+			}
+
+			public int getCount() {
+				return mList.size();
+			}
+
+			public Object getItem(int position) {
+				return mList.get(position);
+			}
+
+			public long getItemId(int position) {
+				return position;
+			}
+
+			public int getItemViewType(int position) {
+				return 0;
+			}
+
+			public View getView(final int position, View convertView, ViewGroup parent) {
+				ViewGroup layout;
+				if ( convertView==null ) {
+					layout = (ViewGroup)mInflater.inflate(getItemLayoutId(), null);
+				} else {
+					layout = (ViewGroup)convertView;
+				}
+				final Pair item = mList.get(position);
+				updateItemContents( layout, item, mListView, position );
+				return layout;
+			}
+
+			public int getViewTypeCount() {
+				return 1;
+			}
+
+			public boolean hasStableIds() {
+				return true;
+			}
+
+			public boolean isEmpty() {
+				return mList.size()==0;
+			}
+
+			private ArrayList<DataSetObserver> observers = new ArrayList<>();
+
+			public void registerDataSetObserver(DataSetObserver observer) {
+				observers.add(observer);
+			}
+
+			public void unregisterDataSetObserver(DataSetObserver observer) {
+				observers.remove(observer);
+			}
+
+		};
+
 		public ListOption( OptionOwner owner, String label, String property ) {
 			super(owner, label, property);
 		}
@@ -1275,7 +1349,6 @@ public int getSelectedItemIndex() {
 		}
 
 		protected void closed() {
-			
 		}
 		
 		protected int getItemLayoutId() {
@@ -1292,10 +1365,9 @@ protected void updateItemContents( final View layout, final Pair item, final Lis
 			boolean isSelected = item.value != null && item.value.equals(currValue);//getSelectedItemIndex()==position;
 			cb.setChecked(isSelected);
 			cb.setOnClickListener(v -> {
-				listView.getOnItemClickListener().onItemClick(listView, listView, position, 0);
-//					mProperties.setProperty(property, item.value);
-//					dismiss();
-//					optionsListView.refresh();
+				AdapterView.OnItemClickListener listener = listView.getOnItemClickListener();
+				if (null != listener)
+					listener.onItemClick(listView, listView, position, 0);
 			});
 		}
 		
@@ -1304,82 +1376,9 @@ protected void updateItemContents( final View layout, final Pair item, final Lis
 		public void onSelect() {
 			if (!enabled)
 				return;
-
 			final BaseDialog dlg = new BaseDialog(mActivity, label, false, false);
-
 			final ListView listView = new BaseListView(mActivity, false);
-			
-			
-			ListAdapter listAdapter = new BaseAdapter() {
-
-				public boolean areAllItemsEnabled() {
-					return true;
-				}
-
-				public boolean isEnabled(int position) {
-					return true;
-				}
-
-				public int getCount() {
-					return list.size();
-				}
-
-				public Object getItem(int position) {
-					return list.get(position);
-				}
-
-				public long getItemId(int position) {
-					return position;
-				}
-
-				public int getItemViewType(int position) {
-					return 0;
-				}
-
-				public View getView(final int position, View convertView,
-						ViewGroup parent) {
-					ViewGroup layout;
-					if ( convertView==null ) {
-						layout = (ViewGroup)mInflater.inflate(getItemLayoutId(), null);
-						//view = new TextView(getContext());
-					} else {
-						layout = (ViewGroup)convertView;
-					}
-					final Pair item = list.get(position);
-					updateItemContents( layout, item, listView, position );
-					//cb.setClickable(false);
-//					cb.setOnClickListener(new View.OnClickListener() {
-//						@Override
-//						public void onClick(View v) {
-//							
-//						}
-//					});
-					return layout;
-				}
-
-				public int getViewTypeCount() {
-					return 1;
-				}
-
-				public boolean hasStableIds() {
-					return true;
-				}
-
-				public boolean isEmpty() {
-					return list.size()==0;
-				}
-
-				private ArrayList<DataSetObserver> observers = new ArrayList<>();
-				
-				public void registerDataSetObserver(DataSetObserver observer) {
-					observers.add(observer);
-				}
-
-				public void unregisterDataSetObserver(DataSetObserver observer) {
-					observers.remove(observer);
-				}
-				
-			};
+			ListOptionAdapter listAdapter = new ListOptionAdapter(listView, list);
 			int selItem = getSelectedItemIndex();
 			if ( selItem<0 )
 				selItem = 0;
@@ -1406,6 +1405,138 @@ public void onClick( Pair item ) {
 		}
 	}
 
+	protected interface FontScanCompleted {
+		void onComplete(ArrayList<Pair> list, boolean canceled);
+	}
+
+	protected class FontSelectOption extends ListOption {
+		protected ArrayList<Pair> sourceList;
+		private String langTag;
+		private String langDescr;
+		private ListOptionAdapter listAdapter;
+
+		public FontSelectOption(OptionOwner owner, String label, String property ) {
+			super(owner, label, property);
+			langTag = null;
+			langDescr = null;
+			BookInfo bookInfo = mReaderView.getBookInfo();
+			if (null != bookInfo) {
+				FileInfo fileInfo = bookInfo.getFileInfo();
+				if (null != fileInfo) {
+					langTag = fileInfo.language;
+					langDescr = Engine.getHumanReadableLocaleName(langTag);
+				}
+			}
+		}
+
+		private void asyncFilterFontsByLanguage(String langTag, FontScanCompleted onComplete) {
+			BackgroundThread.ensureGUI();
+			final Scanner.ScanControl control = new Scanner.ScanControl();
+			final Engine.ProgressControl progress = Services.getEngine().createProgress(R.string.scanning_font_files, control);
+			final ArrayList<Pair> filtered = new ArrayList<Pair>();
+			BackgroundThread.instance().postBackground(() -> {
+				int i = 0;
+				for (Pair pair : list) {
+					if (control.isStopped())
+						break;
+					String faceName = pair.value;
+					Engine.font_lang_compat status = Engine.checkFontLanguageCompatibility(faceName, langTag);
+					switch (status) {
+						case font_lang_compat_full:
+						case font_lang_compat_partial:
+							filtered.add(new Pair(faceName, faceName));
+							break;
+						default:
+							break;
+					}
+					i++;
+					progress.setProgress(10000*i/list.size());
+				}
+				onComplete.onComplete(filtered, control.isStopped());
+				progress.hide();
+			});
+		}
+
+		public void onSelect() {
+			if (!enabled)
+				return;
+			final BaseDialog dlg = new BaseDialog(mActivity, label, false, false);
+
+			LinearLayout layout = new LinearLayout(mActivity);
+			layout.setOrientation(LinearLayout.VERTICAL);
+
+			View panel = mInflater.inflate(R.layout.option_lang_filter, null);
+			layout.addView(panel);
+			CheckBox cb_filter_by_lang = panel.findViewById(R.id.cb_filter_by_lang);
+			if (null != langDescr && langDescr.length() > 0) {
+				cb_filter_by_lang.setText(mActivity.getString(R.string.filter_by_book_language_s, langDescr));
+			} else {
+				cb_filter_by_lang.setText(mActivity.getString(R.string.filter_by_book_language_s, mActivity.getString(R.string.undetermined)));
+				cb_filter_by_lang.setEnabled(false);
+			}
+			final ListView listView = new BaseListView(mActivity, false);
+			listAdapter = new ListOptionAdapter(listView, list);
+			int selItem = getSelectedItemIndex();
+			if ( selItem<0 )
+				selItem = 0;
+			listView.setAdapter(listAdapter);
+			listView.setSelection(selItem);
+			layout.addView(listView);
+
+			listView.setOnItemClickListener((adapter, listview, position, id) -> {
+				Pair item = (Pair) listAdapter.getItem(position);
+				onClick(item);
+				dlg.dismiss();
+				closed();
+			});
+
+			cb_filter_by_lang.setOnCheckedChangeListener((buttonView, isChecked) -> {
+				if (isChecked) {
+					asyncFilterFontsByLanguage(langTag, (list, canceled) -> {
+						if (!canceled) {
+							BackgroundThread.instance().executeGUI(() -> {
+								FontSelectOption.this.sourceList = FontSelectOption.this.list;
+								FontSelectOption.this.list = list;
+								listAdapter = new ListOptionAdapter(listView, list);
+								int selindex = getSelectedItemIndex();
+								if ( selindex<0 )
+									selindex = 0;
+								listView.setAdapter(listAdapter);
+								listView.setSelection(selindex);
+							});
+						} else {
+							BackgroundThread.instance().executeGUI(() -> {
+								cb_filter_by_lang.setChecked(false);
+							});
+						}
+					});
+				} else {
+					if (null != sourceList) {
+						list = sourceList;
+						listAdapter = new ListOptionAdapter(listView, list);
+						int selindex = getSelectedItemIndex();
+						if (selindex < 0)
+							selindex = 0;
+						listView.setAdapter(listAdapter);
+						listView.setSelection(selindex);
+					}
+				}
+			});
+
+			dlg.setOnDismissListener(dialog -> closed());
+
+			// TODO: set checked for for cb_filter_by_lang (save in settings)
+
+			dlg.setView(layout);
+			dlg.show();
+		}
+
+		protected void closed() {
+			if (null != sourceList)
+				list = sourceList;
+		}
+	}
+
 	class FallbackFontItemOptions extends ListOption {
 
 		private final FallbackFontsOptions mParentOptions;	// parent option item
@@ -2629,7 +2760,7 @@ private void setupReaderOptions()
 
 		mOptionsStyles = new OptionsListView(getContext());
 		mFontHintingOption = new ListOption(this, getString(R.string.options_font_hinting), PROP_FONT_HINTING).add(mHinting, mHintingTitles).setDefaultValue("2").setIconIdByAttr(R.attr.cr3_option_text_hinting_drawable, R.drawable.cr3_option_text_hinting);
-		OptionBase fontOption = new ListOption(this, getString(R.string.options_font_face), PROP_FONT_FACE).add(mFontFaces).setDefaultValue(mFontFaces[0]).setIconIdByAttr(R.attr.cr3_option_font_face_drawable, R.drawable.cr3_option_font_face);
+		OptionBase fontOption = new FontSelectOption(this, getString(R.string.options_font_face), PROP_FONT_FACE).add(mFontFaces).setDefaultValue(mFontFaces[0]).setIconIdByAttr(R.attr.cr3_option_font_face_drawable, R.drawable.cr3_option_font_face);
 		mOptionsStyles.add(fontOption);
 		mOptionsStyles.add(new NumberPickerOption(this, getString(R.string.options_font_size), PROP_FONT_SIZE).setMinValue(mActivity.getMinFontSize()).setMaxValue(mActivity.getMaxFontSize()).setDefaultValue("24").setIconIdByAttr(R.attr.cr3_option_font_size_drawable, R.drawable.cr3_option_font_size));
 		mFontWeightOption = (ListOption) new ListOption(this, getString(R.string.options_font_weight), PROP_FONT_BASE_WEIGHT).setIconIdByAttr(R.attr.cr3_option_text_bold_drawable, R.drawable.cr3_option_text_bold);
diff --git a/crengine/include/lvfntman.h b/crengine/include/lvfntman.h
index 55fa3e662..cd87b6d45 100644
--- a/crengine/include/lvfntman.h
+++ b/crengine/include/lvfntman.h
@@ -126,7 +126,7 @@ class LVFontManager {
     /// returns available font files
     virtual void getFontFileNameList( lString32Collection & ) { }
     /// check font language compatibility
-    virtual font_lang_compat checkFontLangCompat(const lString8 &typeface, const lString8 &langCode) { return font_lang_compat_invalid_tag; }
+    virtual font_lang_compat checkFontLangCompat(const lString8 &typeface, const lString8 &langTag) { return font_lang_compat_invalid_tag; }
     /// returns first found face from passed list, or return face for font found by family only
     virtual lString8 findFontFace(lString8 commaSeparatedFaceList, css_font_family_t fallbackByFamily);
     /// fills array with list of available gamma levels
diff --git a/crengine/include/lvfont.h b/crengine/include/lvfont.h
index 7dd06e110..eeb9a63fe 100644
--- a/crengine/include/lvfont.h
+++ b/crengine/include/lvfont.h
@@ -419,8 +419,6 @@ class LVFont : public LVRefCounter {
         return 0;
     }
 
-    virtual font_lang_compat checkFontLangCompat(const lString8 &langCode) { return font_lang_compat_invalid_tag; }
-
     /// set fallback font for this font
     virtual void setFallbackFont(LVFontRef font) { CR_UNUSED(font); }
 
diff --git a/crengine/include/lvhashtable.h b/crengine/include/lvhashtable.h
index 13297c4d5..56c0f447a 100644
--- a/crengine/include/lvhashtable.h
+++ b/crengine/include/lvhashtable.h
@@ -217,6 +217,11 @@ template <typename keyT, typename valueT> class LVHashTable
         }
         return false;
     }
+    void compact()
+    {
+        if (_count > 0 && _count < _size)
+            resize(_count);
+    }
 private:
     int _size;
     int _count;
diff --git a/crengine/src/lvfont/lvfreetypeface.cpp b/crengine/src/lvfont/lvfreetypeface.cpp
index ea7beabed..a125fab96 100644
--- a/crengine/src/lvfont/lvfreetypeface.cpp
+++ b/crengine/src/lvfont/lvfreetypeface.cpp
@@ -1600,92 +1600,6 @@ bool LVFreeTypeFace::getGlyphExtraMetric( glyph_extra_metric_t metric, lUInt32 c
     return false;
 }
 
-font_lang_compat LVFreeTypeFace::checkFontLangCompat(const lString8 &langCode) {
-    font_lang_compat res = font_lang_compat_invalid_tag;
-#if USE_LOCALE_DATA==1
-#define FC_LANG_START_INTERVAL_CODE     0xF0F0FFFF
-    // find corresponding fc_lang record
-    CRLocaleData loc(langCode);
-    const struct fc_lang_rec* rec = NULL;
-    if (loc.isValid()) {
-        const struct fc_lang_rec* ptr = get_fc_lang_data();
-        int max_match = 0;
-        for (unsigned int i = 0; i < get_fc_lang_data_size(); i++) {
-            CRLocaleData fc_loc(ptr->lang_code);
-            int match = loc.calcMatch(fc_loc);
-            if (match > max_match) {
-                max_match = match;
-                rec = ptr;
-            }
-            ptr++;
-        }
-    }
-    // Check compatibility
-    bool fullSupport = false;
-    bool partialSupport = false;
-    if (rec) {
-        unsigned int codePoint = 0;
-        unsigned int tmp;
-        unsigned int first, second = 0;
-        unsigned int i;
-        bool inRange = false;
-        FT_UInt glyphIndex;
-        fullSupport = true;
-        for (i = 0;;) {
-            // get next codePoint
-            if (inRange && codePoint < second) {
-                codePoint++;
-            } else {
-                if (i >= rec->char_set_sz)
-                    break;
-                tmp = rec->char_set[i];
-                if (FC_LANG_START_INTERVAL_CODE == tmp) {       // code of start interval
-                    if (i + 2 < rec->char_set_sz) {
-                        i++;
-                        first = rec->char_set[i];
-                        i++;
-                        second = rec->char_set[i];
-                        inRange = true;
-                        codePoint = first;
-                        i++;
-                    } else {
-                        // broken language char set
-                        fullSupport = false;
-                        break;
-                    }
-                } else {
-                    codePoint = tmp;
-                    inRange = false;
-                    i++;
-                }
-            }
-            // check codePoint in this font
-            glyphIndex = FT_Get_Char_Index(_face, codePoint);
-            if (0 == glyphIndex) {
-                fullSupport = false;
-            } else {
-                partialSupport = true;
-            }
-        }
-        if (fullSupport) {
-            res = font_lang_compat_full;
-            CRLog::debug("checkFontLangCompat(): Font have full support of language %s",
-                         langCode.c_str());
-        } else if (partialSupport) {
-            res = font_lang_compat_partial;
-            CRLog::debug("checkFontLangCompat(): Font have partial support of language %s",
-                         langCode.c_str());
-        } else {
-            res = font_lang_compat_none;
-            CRLog::debug("checkFontLangCompat(): Font DON'T have support of language %s",
-                         langCode.c_str());
-        }
-    } else
-        CRLog::debug("checkFontLangCompat(): Unsupported language code: %s", langCode.c_str());
-#endif
-    return res;
-}
-
 lUInt16 LVFreeTypeFace::measureText(const lChar32 *text,
                                     int len,
                                     lUInt16 *widths,
diff --git a/crengine/src/lvfont/lvfreetypeface.h b/crengine/src/lvfont/lvfreetypeface.h
index 42fbb0a5e..77d88c856 100644
--- a/crengine/src/lvfont/lvfreetypeface.h
+++ b/crengine/src/lvfont/lvfreetypeface.h
@@ -273,13 +273,6 @@ class LVFreeTypeFace : public LVFont {
     */
     virtual bool getGlyphExtraMetric( glyph_extra_metric_t metric, lUInt32 code, int & value, bool scaled_to_px=true, lChar32 def_char=0, lUInt32 fallbackPassMask = 0 );
 
-    /**
-     * @brief Check font for compatibility with language with langCode
-     * @param langCode language code, for example, "en" - English, "ru" - Russian
-     * @return true if font contains all glyphs for given language, false otherwise.
-     */
-    virtual font_lang_compat checkFontLangCompat(const lString8 &langCode);
-
     /** \brief measure text
         \param text is text string pointer
         \param len is number of characters to measure
@@ -358,7 +351,7 @@ class LVFreeTypeFace : public LVFont {
 
     /// retrieves font handle
     virtual void *GetHandle() {
-        return NULL;
+        return (void*)_face;
     }
 
     /// returns font typeface name
diff --git a/crengine/src/lvfont/lvfreetypefontman.cpp b/crengine/src/lvfont/lvfreetypefontman.cpp
index fb7d5f4c8..c6473230c 100644
--- a/crengine/src/lvfont/lvfreetypefontman.cpp
+++ b/crengine/src/lvfont/lvfreetypefontman.cpp
@@ -28,6 +28,11 @@
 #include <fontconfig/fontconfig.h>
 #endif
 
+#include "crlocaledata.h"
+#if USE_LOCALE_DATA==1
+#include "fc-lang-data.h"
+#endif
+
 inline int myabs(int n) { return n < 0 ? -n : n; }
 
 lString8 familyName(FT_Face face) {
@@ -85,6 +90,78 @@ int getFontWeight(FT_Face face) {
     return weight;
 }
 
+#if USE_LOCALE_DATA==1
+LVHashTable<lString8, font_lang_compat>* getSupportedLangs(FT_Face face) {
+    LVHashTable<lString8, font_lang_compat>* langs = new LVHashTable<lString8, font_lang_compat>(16);
+#define FC_LANG_START_INTERVAL_CODE     0xF0F0FFFF
+    bool fullSupport;
+    bool partialSupport;
+    unsigned int codePoint = 0;
+    unsigned int tmp;
+    unsigned int first, second;
+    bool inRange;
+    const struct fc_lang_rec* rec = get_fc_lang_data();
+    for (unsigned int l = 0; l < get_fc_lang_data_size(); l++) {
+        CRLocaleData loc(rec->lang_code);
+        if (loc.isValid()) {
+            // Check compatibility
+            codePoint = 0;
+            second = 0;
+            inRange = false;
+            FT_UInt glyphIndex;
+            partialSupport = false;
+            fullSupport = true;
+            for (int i = 0;;) {
+                // get next codePoint
+                if (inRange && codePoint < second) {
+                    codePoint++;
+                } else {
+                    if (i >= rec->char_set_sz)
+                        break;
+                    tmp = rec->char_set[i];
+                    if (FC_LANG_START_INTERVAL_CODE == tmp) {       // code of start interval
+                        if (i + 2 < rec->char_set_sz) {
+                            i++;
+                            first = rec->char_set[i];
+                            i++;
+                            second = rec->char_set[i];
+                            inRange = true;
+                            codePoint = first;
+                            i++;
+                        } else {
+                            // broken language char set
+                            fullSupport = false;
+                            break;
+                        }
+                    } else {
+                        codePoint = tmp;
+                        inRange = false;
+                        i++;
+                    }
+                }
+                // check codePoint in this font
+                glyphIndex = FT_Get_Char_Index(face, codePoint);
+                if (0 == glyphIndex) {
+                    fullSupport = false;
+                } else {
+                    partialSupport = true;
+                }
+            }
+            if (fullSupport)
+                langs->set(loc.langTag(), font_lang_compat_full);
+            else if (partialSupport)
+                langs->set(loc.langTag(), font_lang_compat_partial);
+        } else {
+            CRLog::warn("getSupportedLangs(): invalid lang tag: %s", rec->lang_code);
+        }
+        // to next language
+        rec++;
+    }
+    langs->compact();
+    return langs;
+}
+#endif
+
 lUInt32 LVFreeTypeFontManager::GetFontListHash(int documentId) {
     FONT_MAN_GUARD
     return _cache.GetFontListHash(documentId) * 75 + _fallbackFontFaces.getHash();
@@ -623,6 +700,13 @@ bool LVFreeTypeFontManager::initSystemFonts() {
 
 LVFreeTypeFontManager::~LVFreeTypeFontManager() {
     FONT_MAN_GUARD
+    LVHashTable<lString8, LVHashTable<lString8, font_lang_compat>* >::iterator it = _supportedLangs.forwardIterator();
+    LVHashTable<lString8, LVHashTable<lString8, font_lang_compat>* >::pair* p;
+    while ((p = it.next()) != NULL) {
+        LVHashTable<lString8, font_lang_compat>* langTable = p->value;
+        if (langTable)
+            delete langTable;
+    }
     _globalCache.clear();
     _cache.clear();
     if (_library)
@@ -635,7 +719,7 @@ LVFreeTypeFontManager::~LVFreeTypeFontManager() {
 }
 
 LVFreeTypeFontManager::LVFreeTypeFontManager()
-        : _library(NULL), _globalCache(GLYPH_CACHE_SIZE) {
+        : _library(NULL), _globalCache(GLYPH_CACHE_SIZE), _supportedLangs(16) {
     FONT_MAN_GUARD
     int error = FT_Init_FreeType(&_library);
     if (error) {
@@ -930,12 +1014,25 @@ fprintf(_log, "GetFont(size=%d, weight=%d, italic=%d, family=%d, typeface='%s')\
             ref = LVFontRef( new LVFontBoldTransform( ref, &_globalCache ) );
         }
 #endif
+        // build fallback chain
         for (int i = 0; i < _fallbackFontFaces.length(); i++) {
             if (item->getDef()->getTypeFace() == _fallbackFontFaces[i]) {
                 ref->setFallbackMask(1 << i);
                 break;
             }
         }
+        // filling in the language support table if it is empty
+#if USE_LOCALE_DATA==1
+        LVHashTable<lString8, font_lang_compat>* langTable = NULL;
+        if (!_supportedLangs.get(font->getTypeFace(), langTable) || NULL == langTable) {
+            FT_Face face = (FT_Face) font->GetHandle();
+            if (NULL != face) {
+                langTable = getSupportedLangs(face);
+                _supportedLangs.set(font->getTypeFace(), langTable);
+            }
+        }
+#endif
+        // add to cache
         _cache.update( &newDef, ref );
         //            int rsz = ref->getSize();
         //            if ( rsz!=size ) {
@@ -970,13 +1067,56 @@ bool LVFreeTypeFontManager::checkCharSet(FT_Face face) {
     return true;
 }
 
-font_lang_compat LVFreeTypeFontManager::checkFontLangCompat(const lString8 &typeface, const lString8 &langCode) {
-    LVFontRef fntRef = GetFont(-1, 400, false, css_ff_inherit, typeface, -1);
-    if (!fntRef.isNull())
-        return fntRef->checkFontLangCompat(langCode);
-    else
-        CRLog::debug("checkFontLangCompat(): typeface not found: %s", typeface.c_str());
-    return font_lang_compat_invalid_tag;
+font_lang_compat LVFreeTypeFontManager::checkFontLangCompat(const lString8 &typeface, const lString8 &langTag) {
+    font_lang_compat res = font_lang_compat_invalid_tag;
+#if USE_LOCALE_DATA==1
+    CRLocaleData loc(langTag);
+    if (loc.isValid()) {
+        LVHashTable<lString8, font_lang_compat>* langTable = NULL;
+        res = font_lang_compat_none;
+        if (!_supportedLangs.get(typeface, langTable) || NULL == langTable) {
+            if (NULL != langTable) {
+                delete langTable;
+                langTable = NULL;
+                _supportedLangs.remove(typeface);
+            }
+            LVFontRef fntRef = GetFont(-1, 400, false, css_ff_inherit, typeface, -1);
+            if (!fntRef.isNull()) {
+                FT_Face face = (FT_Face) fntRef->GetHandle();
+                if (NULL != face) {
+                    langTable = getSupportedLangs(face);
+                    _supportedLangs.set(typeface, langTable);
+                }
+            }
+        }
+        if (NULL != langTable) {
+            lString8 best_lang;
+            LVHashTable<lString8, font_lang_compat>::iterator it = langTable->forwardIterator();
+            LVHashTable<lString8, font_lang_compat>::pair* p;
+            int max_match = 0;
+            font_lang_compat compat;
+            while ((p = it.next()) != NULL) {
+                lString8 lang = p->key;
+                compat = p->value;
+                CRLocaleData fc_loc(lang);
+                if (fc_loc.isValid()) {
+                    int match = loc.calcMatch(fc_loc);
+                    if (match > max_match) {
+                        max_match = match;
+                        best_lang = lang;
+                    }
+                }
+            }
+            if (!best_lang.empty()) {
+                if (langTable->get(best_lang, compat))
+                    res = compat;
+            }
+        }
+    } else {
+        CRLog::warn("checkFontLangCompat(): invalid langTag: %s", langTag.c_str());
+    }
+#endif
+    return res;
 }
 
 /*
diff --git a/crengine/src/lvfont/lvfreetypefontman.h b/crengine/src/lvfont/lvfreetypefontman.h
index adbc28cd2..06a5a49f3 100644
--- a/crengine/src/lvfont/lvfreetypefontman.h
+++ b/crengine/src/lvfont/lvfreetypefontman.h
@@ -39,6 +39,7 @@ class LVFreeTypeFontManager : public LVFontManager {
     FT_Library _library;
     LVFontGlobalGlyphCache _globalCache;
     lString32 _requiredChars;
+    LVHashTable<lString8, LVHashTable<lString8, font_lang_compat>* > _supportedLangs;
 #if (DEBUG_FONT_MAN == 1)
     FILE * _log;
 #endif
@@ -122,7 +123,7 @@ class LVFreeTypeFontManager : public LVFontManager {
 
     bool checkCharSet(FT_Face face);
 
-    virtual font_lang_compat checkFontLangCompat(const lString8 &typeface, const lString8 &langCode);
+    virtual font_lang_compat checkFontLangCompat(const lString8 &typeface, const lString8 &langTag);
 
     //bool isMonoSpaced( FT_Face face );
     /// registers document font

From 3670927d8296b7d4c12211caf860ada54002fe98 Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Wed, 28 Jul 2021 11:08:16 +0400
Subject: [PATCH 25/35] SelectionToolbarDlg: removed useless redrawing.

---
 android/src/org/coolreader/crengine/SelectionToolbarDlg.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/android/src/org/coolreader/crengine/SelectionToolbarDlg.java b/android/src/org/coolreader/crengine/SelectionToolbarDlg.java
index 6c0a8565b..c83e5bb55 100644
--- a/android/src/org/coolreader/crengine/SelectionToolbarDlg.java
+++ b/android/src/org/coolreader/crengine/SelectionToolbarDlg.java
@@ -270,7 +270,6 @@ public SelectionToolbarDlg(CoolReader coolReader, ReaderView readerView, Selecti
 				//mReaderView.doEngineCommand(ReaderCommand.DCMD_REQUEST_RENDER, 0);
 				BackgroundThread.instance().postBackground(() -> BackgroundThread.instance().postGUI(() -> {
 					mReaderView.doEngineCommand(ReaderCommand.DCMD_SCROLL_BY, mReaderView.getSurface().getHeight() / 3);
-					mReaderView.redraw();
 				}));
 			});
 		}

From 7f7d734574cc9dd405f2bda3b0386e0d2688a1b6 Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Wed, 28 Jul 2021 13:26:40 +0400
Subject: [PATCH 26/35] Bug fixed: when the charge level changed, it did not
 update in the status bar.

---
 android/src/org/coolreader/crengine/ReaderView.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/android/src/org/coolreader/crengine/ReaderView.java b/android/src/org/coolreader/crengine/ReaderView.java
index 3dde8bf8e..45dc8659c 100644
--- a/android/src/org/coolreader/crengine/ReaderView.java
+++ b/android/src/org/coolreader/crengine/ReaderView.java
@@ -3194,7 +3194,7 @@ public void setBatteryState(int state) {
 			log.i("Battery state changed: " + state);
 			mBatteryState = state;
 			if (!DeviceInfo.EINK_SCREEN && !isAutoScrollActive()) {
-				drawPage();
+				redraw();
 			}
 		}
 	}
@@ -6415,12 +6415,10 @@ public void onFocusChange(View arg0, boolean arg1) {
 	}
 
 	public void redraw() {
-		//BackgroundThread.instance().executeBackground(new Runnable() {
 		BackgroundThread.instance().executeGUI(() -> {
 			surface.invalidate();
 			invalidImages = true;
-			//preparePageImage(0);
-			bookView.draw();
+			drawPage();
 		});
 	}
 

From 85a8cf2afe1459be8e3dd2cf9028739adf5a0aa6 Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Wed, 28 Jul 2021 17:39:14 +0400
Subject: [PATCH 27/35] Android: don't receive battery state change events in
 pause mode.

---
 android/src/org/coolreader/CoolReader.java | 52 ++++++++++++----------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/android/src/org/coolreader/CoolReader.java b/android/src/org/coolreader/CoolReader.java
index 903ab7bed..c3646c1d5 100644
--- a/android/src/org/coolreader/CoolReader.java
+++ b/android/src/org/coolreader/CoolReader.java
@@ -116,7 +116,6 @@ public class CoolReader extends BaseActivity {
 	private boolean isFirstStart = true;
 	private boolean phoneStateChangeHandlerInstalled = false;
 	private int initialBatteryState = -1;
-	private BroadcastReceiver intentReceiver;
 
 	private boolean justCreated = false;
 	private boolean activityIsRunning = false;
@@ -137,6 +136,17 @@ public class CoolReader extends BaseActivity {
 	private static final int ODT_CMD_DEL_FOLDER = 2;
 	private static final int ODT_CMD_SAVE_LOGCAT = 3;
 
+	private final BroadcastReceiver batteryChangeReceiver = new BroadcastReceiver() {
+		@Override
+		public void onReceive(Context context, Intent intent) {
+			int level = intent.getIntExtra("level", 0);
+			if (mReaderView != null)
+				mReaderView.setBatteryState(level);
+			else
+				initialBatteryState = level;
+		}
+	};
+
 	/**
 	 * Called when the activity is first created.
 	 */
@@ -162,29 +172,19 @@ protected void onCreate(Bundle savedInstanceState) {
 
 		//requestWindowFeature(Window.FEATURE_NO_TITLE);
 
-		//==========================================
-		// Battery state listener
-		intentReceiver = new BroadcastReceiver() {
-
-			@Override
-			public void onReceive(Context context, Intent intent) {
-				int level = intent.getIntExtra("level", 0);
-				if (mReaderView != null)
-					mReaderView.setBatteryState(level);
-				else
-					initialBatteryState = level;
-			}
-
-		};
-		registerReceiver(intentReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+		// Get battery level
+		// ACTION_BATTERY_CHANGED is a sticky broadcast & we pass null instead of receiver, then
+		// no receiver is registered -- the function simply returns the sticky Intent that matches filter.
+		Intent intent = registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+		if (null != intent) {
+			// and process this Intent: save received values
+			batteryChangeReceiver.onReceive(null, intent);
+		}
 
 		// For TTS volume control
 		//  See TTSControlService
 		setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
-		if (initialBatteryState >= 0 && mReaderView != null)
-			mReaderView.setBatteryState(initialBatteryState);
-
 		//==========================================
 		// Donations related code
 		try {
@@ -250,10 +250,6 @@ protected void onDestroy() {
 //		}
 
 		//mEngine = null;
-		if (intentReceiver != null) {
-			unregisterReceiver(intentReceiver);
-			intentReceiver = null;
-		}
 
 		//===========================
 		// Donations support code
@@ -787,6 +783,11 @@ protected void onPause() {
 		if (mBrowser != null) {
 			mBrowser.stopCurrentScan();
 		}
+		try {
+			unregisterReceiver(batteryChangeReceiver);
+		} catch (IllegalArgumentException e) {
+			log.e("Failed to unregister receiver: " + e.toString());
+		}
 		Services.getCoverpageManager().removeCoverpageReadyListener(mHomeFrame);
 		if (BuildConfig.GSUITE_AVAILABLE && Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
 			if (mSyncGoogleDriveEnabled && mGoogleDriveSync != null && !mGoogleDriveSync.isBusy()) {
@@ -833,6 +834,11 @@ protected void onResume() {
 
 		if (mReaderView != null)
 			mReaderView.onAppResume();
+		Intent intent = registerReceiver(batteryChangeReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+		if (null != intent) {
+			// process this Intent
+			batteryChangeReceiver.onReceive(null, intent);
+		}
 
 		if (DeviceInfo.EINK_SCREEN) {
 			if (DeviceInfo.EINK_SONY) {

From c47cab44799475a48230312b8e97cd7a71edddb0 Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Wed, 28 Jul 2021 21:47:41 +0400
Subject: [PATCH 28/35] Android: old bug fixed: the battery charge status is
 not displayed in the status bar. The power source is also detected, but for
 now it is not displayed in any way - it is reserved for the future. At the
 moment, there are no ideas how to display it as clearly and compactly as
 possible. U+21AF is used as the charging symbol, if available, otherwise the
 "+" symbol.

---
 android/jni/cr3engine.cpp                     |  2 +-
 android/jni/docview.cpp                       |  6 +-
 android/jni/org_coolreader_crengine_DocView.h |  4 +-
 android/src/org/coolreader/CoolReader.java    | 46 ++++++++++--
 .../src/org/coolreader/crengine/DocView.java  |  6 +-
 .../org/coolreader/crengine/ReaderView.java   | 55 +++++++++++---
 .../org/coolreader/crengine/StatusBar.java    |  5 +-
 cr3qt/src/cr3widget.cpp                       | 52 +++++++++-----
 cr3qt/src/cr3widget.h                         |  4 +-
 cr3qt/src/filepropsdlg.cpp                    |  2 +-
 crengine/include/lvdocview.h                  | 24 +++++--
 crengine/src/lvdocview.cpp                    | 72 +++++++++++--------
 crengine/src/lvfont/lvfreetypeface.cpp        |  5 ++
 13 files changed, 205 insertions(+), 78 deletions(-)

diff --git a/android/jni/cr3engine.cpp b/android/jni/cr3engine.cpp
index 46c6c92b7..a222a24b5 100644
--- a/android/jni/cr3engine.cpp
+++ b/android/jni/cr3engine.cpp
@@ -1212,7 +1212,7 @@ static JNINativeMethod sDocViewMethods[] = {
   {"getTOCInternal", "()Lorg/coolreader/crengine/TOCItem;", (void*)Java_org_coolreader_crengine_DocView_getTOCInternal},
   {"clearSelectionInternal", "()V", (void*)Java_org_coolreader_crengine_DocView_clearSelectionInternal},
   {"findTextInternal", "(Ljava/lang/String;III)Z", (void*)Java_org_coolreader_crengine_DocView_findTextInternal},
-  {"setBatteryStateInternal", "(I)V", (void*)Java_org_coolreader_crengine_DocView_setBatteryStateInternal},
+  {"setBatteryStateInternal", "(III)V", (void*)Java_org_coolreader_crengine_DocView_setBatteryStateInternal},
   {"getCoverPageDataInternal", "()[B", (void*)Java_org_coolreader_crengine_DocView_getCoverPageDataInternal},
   {"setPageBackgroundTextureInternal", "([BI)V", (void*)Java_org_coolreader_crengine_DocView_setPageBackgroundTextureInternal},
   {"updateSelectionInternal", "(Lorg/coolreader/crengine/Selection;)V", (void*)Java_org_coolreader_crengine_DocView_updateSelectionInternal},
diff --git a/android/jni/docview.cpp b/android/jni/docview.cpp
index 6c0f20569..adb2596d9 100644
--- a/android/jni/docview.cpp
+++ b/android/jni/docview.cpp
@@ -2003,10 +2003,10 @@ JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_DocView_findTextInternal
 /*
  * Class:     org_coolreader_crengine_DocView
  * Method:    setBatteryStateInternal
- * Signature: (I)V
+ * Signature: (III)V
  */
 JNIEXPORT void JNICALL Java_org_coolreader_crengine_DocView_setBatteryStateInternal
-  (JNIEnv * _env, jobject _this, jint state)
+  (JNIEnv * _env, jobject _this, jint state, jint chargingConn, jint chargeLevel)
 {
     CRJNIEnv env(_env);
     DocViewNative * p = getNative(_env, _this);
@@ -2014,7 +2014,7 @@ JNIEXPORT void JNICALL Java_org_coolreader_crengine_DocView_setBatteryStateInter
     	CRLog::error("Cannot get native view");
     	return;
     }
-    p->_docview->setBatteryState(state);
+    p->_docview->setBatteryState(state, chargingConn, chargeLevel);
 }
 
 /*
diff --git a/android/jni/org_coolreader_crengine_DocView.h b/android/jni/org_coolreader_crengine_DocView.h
index cbeb8b12a..8c821222f 100644
--- a/android/jni/org_coolreader_crengine_DocView.h
+++ b/android/jni/org_coolreader_crengine_DocView.h
@@ -168,10 +168,10 @@ JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_DocView_findTextInternal
 /*
  * Class:     org_coolreader_crengine_DocView
  * Method:    setBatteryStateInternal
- * Signature: (I)V
+ * Signature: (III)V
  */
 JNIEXPORT void JNICALL Java_org_coolreader_crengine_DocView_setBatteryStateInternal
-  (JNIEnv *, jobject, jint);
+  (JNIEnv *, jobject, jint, jint, jint);
 
 /*
  * Class:     org_coolreader_crengine_DocView
diff --git a/android/src/org/coolreader/CoolReader.java b/android/src/org/coolreader/CoolReader.java
index c3646c1d5..ae16adcac 100644
--- a/android/src/org/coolreader/CoolReader.java
+++ b/android/src/org/coolreader/CoolReader.java
@@ -12,6 +12,7 @@
 import android.content.pm.PackageManager;
 import android.media.AudioManager;
 import android.net.Uri;
+import android.os.BatteryManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Debug;
@@ -115,7 +116,9 @@ public class CoolReader extends BaseActivity {
 
 	private boolean isFirstStart = true;
 	private boolean phoneStateChangeHandlerInstalled = false;
-	private int initialBatteryState = -1;
+	private int initialBatteryState = ReaderView.BATTERY_STATE_NO_BATTERY;
+	private int initialBatteryChargeConn = ReaderView.BATTERY_CHARGER_NO;
+	private int initialBatteryLevel = 0;
 
 	private boolean justCreated = false;
 	private boolean activityIsRunning = false;
@@ -139,11 +142,43 @@ public class CoolReader extends BaseActivity {
 	private final BroadcastReceiver batteryChangeReceiver = new BroadcastReceiver() {
 		@Override
 		public void onReceive(Context context, Intent intent) {
+			// TODO: When minSDK increases to 5 or higher replace string constants:
+			//  "status" -> BatteryManager.EXTRA_STATUS
+			//  "plugged" -> BatteryManager.EXTRA_PLUGGED
+			//  "level" -> BatteryManager.EXTRA_LEVEL
+			int status = intent.getIntExtra("status", 0);
+			int plugged = intent.getIntExtra("plugged", 0);
 			int level = intent.getIntExtra("level", 0);
+			// Translate android values to cr3 values
+			switch (plugged) {
+				case BatteryManager.BATTERY_PLUGGED_AC:
+					plugged = ReaderView.BATTERY_CHARGER_AC;
+					break;
+				case BatteryManager.BATTERY_PLUGGED_USB:
+					plugged = ReaderView.BATTERY_CHARGER_USB;
+					break;
+				case BatteryManager.BATTERY_PLUGGED_WIRELESS:
+					plugged = ReaderView.BATTERY_CHARGER_WIRELESS;
+					break;
+				default:
+					plugged = ReaderView.BATTERY_CHARGER_NO;
+			}
+			switch (status) {
+				case BatteryManager.BATTERY_STATUS_CHARGING:
+					status = ReaderView.BATTERY_STATE_CHARGING;
+					break;
+				case BatteryManager.BATTERY_STATUS_DISCHARGING:
+				default:
+					status = ReaderView.BATTERY_STATE_DISCHARGING;
+					break;
+			}
 			if (mReaderView != null)
-				mReaderView.setBatteryState(level);
-			else
-				initialBatteryState = level;
+				mReaderView.setBatteryState(status, plugged, level);
+			else {
+				initialBatteryState = status;
+				initialBatteryChargeConn = plugged;
+				initialBatteryLevel = level;
+			}
 		}
 	};
 
@@ -1240,8 +1275,7 @@ private void runInReader(final Runnable task) {
 					mReaderView.getSurface().setFocusableInTouchMode(true);
 					mReaderView.getSurface().requestFocus();
 				}
-				if (initialBatteryState >= 0)
-					mReaderView.setBatteryState(initialBatteryState);
+				mReaderView.setBatteryState(initialBatteryState, initialBatteryChargeConn, initialBatteryLevel);
 				mReaderView.doEngineCommand(ReaderCommand.DCMD_SET_ROTATION_INFO_FOR_AA, screenRotation);
 			}
 		});
diff --git a/android/src/org/coolreader/crengine/DocView.java b/android/src/org/coolreader/crengine/DocView.java
index b279a511a..09d04914a 100644
--- a/android/src/org/coolreader/crengine/DocView.java
+++ b/android/src/org/coolreader/crengine/DocView.java
@@ -111,9 +111,9 @@ public boolean moveSelection(Selection sel,
 	 * Send battery state to native object.
 	 * @param state
 	 */
-	public void setBatteryState(int state) {
+	public void setBatteryState(int state, int chargingConn, int chargeLevel) {
 		synchronized(mutex) {
-			setBatteryStateInternal(state);
+			setBatteryStateInternal(state, chargingConn, chargeLevel);
 		}
 	}
 
@@ -478,7 +478,7 @@ private native boolean applySettingsInternal(
 	private native boolean findTextInternal(String pattern, int origin,
 			int reverse, int caseInsensitive);
 
-	private native void setBatteryStateInternal(int state);
+	private native void setBatteryStateInternal(int state, int chargingConn, int chargeLevel);
 
 	private native byte[] getCoverPageDataInternal();
 
diff --git a/android/src/org/coolreader/crengine/ReaderView.java b/android/src/org/coolreader/crengine/ReaderView.java
index 45dc8659c..457e749b4 100644
--- a/android/src/org/coolreader/crengine/ReaderView.java
+++ b/android/src/org/coolreader/crengine/ReaderView.java
@@ -260,6 +260,22 @@ public void invalidate() {
 	private final static int BRIGHTNESS_TYPE_COMMON = 0;
 	private final static int BRIGHTNESS_TYPE_WARM = 1;
 
+	/// Always sync this constants with crengine/include/lvdocview.h!
+	/// Battery state: no battery
+	public static final int BATTERY_STATE_NO_BATTERY = -2;
+	/// Battery state: battery is charging
+	public static final int BATTERY_STATE_CHARGING = -1;
+	/// Battery state: battery is discharging
+	public static final int BATTERY_STATE_DISCHARGING = -3;
+	/// Battery charger connection: no connection
+	public static final int BATTERY_CHARGER_NO = 1;
+	/// Battery charger connection: AC adapter
+	public static final int BATTERY_CHARGER_AC = 2;
+	/// Battery charger connection: USB
+	public static final int BATTERY_CHARGER_USB = 3;
+	/// Battery charger connection: Wireless
+	public static final int BATTERY_CHARGER_WIRELESS = 4;
+
 	private ViewMode viewMode = ViewMode.PAGES;
 
 	private void execute(Engine.EngineTask task) {
@@ -1666,8 +1682,7 @@ public void showReadingPositionPopup() {
 		final StringBuilder buf = new StringBuilder();
 //		if (mActivity.isFullscreen()) {
 		buf.append(Utils.formatTime(mActivity, System.currentTimeMillis()) + " ");
-		if (mBatteryState >= 0)
-			buf.append(" [" + mBatteryState + "%]\n");
+		buf.append(" [" + mBatteryChargeLevel + "%]\n");
 //		}
 		execute(new Task() {
 			Bookmark bm;
@@ -1857,7 +1872,7 @@ public void showBookInfo() {
 		final ArrayList<String> items = new ArrayList<String>();
 		items.add("section=section.system");
 		items.add("system.version=Cool Reader " + mActivity.getVersion());
-		items.add("system.battery=" + mBatteryState + "%");
+		items.add("system.battery=" + mBatteryChargeLevel + "%");
 		items.add("system.time=" + Utils.formatTime(mActivity, System.currentTimeMillis()));
 		final BookInfo bi = mBookInfo;
 		if (bi != null) {
@@ -3187,12 +3202,28 @@ public BookInfo getBookInfo() {
 		return mBookInfo;
 	}
 
-	private int mBatteryState = 100;
+	private int mBatteryState = BATTERY_STATE_DISCHARGING;
+	private int mBatteryChargingConn = BATTERY_CHARGER_NO;
+	private int mBatteryChargeLevel = 0;
 
-	public void setBatteryState(int state) {
+	public void setBatteryState(int state, int chargingConn, int level) {
+		boolean needUpdate = false;
 		if (state != mBatteryState) {
 			log.i("Battery state changed: " + state);
 			mBatteryState = state;
+			needUpdate = true;
+		}
+		if (chargingConn != mBatteryChargingConn) {
+			log.i("Battery charging connection changed: " + chargingConn);
+			mBatteryChargingConn = chargingConn;
+			needUpdate = true;
+		}
+		if (level != mBatteryChargeLevel) {
+			log.i("Battery charging level changed: " + level);
+			mBatteryChargeLevel = level;
+			needUpdate = true;
+		}
+		if (needUpdate) {
 			if (!DeviceInfo.EINK_SCREEN && !isAutoScrollActive()) {
 				redraw();
 			}
@@ -3203,6 +3234,14 @@ public int getBatteryState() {
 		return mBatteryState;
 	}
 
+	public int getBatteryChargingConnection() {
+		return mBatteryChargingConn;
+	}
+
+	public int getBatteryChargeLevel() {
+		return mBatteryChargeLevel;
+	}
+
 	private static final VMRuntimeHack runtime = new VMRuntimeHack();
 
 	private static class BitmapFactory {
@@ -3383,7 +3422,7 @@ else if (mNextPageInfo != null && mNextPageInfo.position != null && mNextPageInf
 			bi.position = currpos;
 			bi.bitmap = factory.get(internalDX > 0 ? internalDX : requestedWidth,
 					internalDY > 0 ? internalDY : requestedHeight);
-			doc.setBatteryState(mBatteryState);
+			doc.setBatteryState(mBatteryState, mBatteryChargingConn, mBatteryChargeLevel);
 			doc.getPageImage(bi.bitmap);
 			mCurrentPageInfo = bi;
 			//log.v("Prepared new current page image " + mCurrentPageInfo);
@@ -3411,7 +3450,7 @@ else if (mNextPageInfo != null && mNextPageInfo.position != null && mNextPageInf
 					BitmapInfo bi = new BitmapInfo();
 					bi.position = nextpos;
 					bi.bitmap = factory.get(internalDX, internalDY);
-					doc.setBatteryState(mBatteryState);
+					doc.setBatteryState(mBatteryState, mBatteryChargingConn, mBatteryChargeLevel);
 					doc.getPageImage(bi.bitmap);
 					mNextPageInfo = bi;
 					nextposBitmap = bi;
@@ -3442,7 +3481,7 @@ else if (mNextPageInfo != null && mNextPageInfo.position != null && mNextPageInf
 					BitmapInfo bi = new BitmapInfo();
 					bi.position = nextpos;
 					bi.bitmap = factory.get(internalDX, internalDY);
-					doc.setBatteryState(mBatteryState);
+					doc.setBatteryState(mBatteryState, mBatteryChargingConn, mBatteryChargeLevel);
 					doc.getPageImage(bi.bitmap);
 					mNextPageInfo = bi;
 					nextposBitmap = bi;
diff --git a/android/src/org/coolreader/crengine/StatusBar.java b/android/src/org/coolreader/crengine/StatusBar.java
index b0f8ed78d..7d0520eb4 100644
--- a/android/src/org/coolreader/crengine/StatusBar.java
+++ b/android/src/org/coolreader/crengine/StatusBar.java
@@ -167,9 +167,8 @@ private void updateViews() {
 				append(pos, Utils.formatTime(activity, System.currentTimeMillis()), " ");
 			}
 			if (showBattery && fullscreen) {
-				int batteryState = activity.getReaderView() != null ? activity.getReaderView().getBatteryState() : 0;
-				if (batteryState >= 0)
-					append(pos, "[" + (batteryState < 10 ? "0" : "") + batteryState + "%]", " ");
+				int batteryLevel = activity.getReaderView() != null ? activity.getReaderView().getBatteryChargeLevel() : 0;
+				append(pos, "[" + (batteryLevel < 10 ? "0" : "") + batteryLevel + "%]", " ");
 			}
 			boolean updated = false;
 			if (!lblPosition.getText().equals(pos)) {
diff --git a/cr3qt/src/cr3widget.cpp b/cr3qt/src/cr3widget.cpp
index 5aedaf2e8..7b9eb644d 100644
--- a/cr3qt/src/cr3widget.cpp
+++ b/cr3qt/src/cr3widget.cpp
@@ -309,7 +309,10 @@ CR3View::CR3View( QWidget *parent)
         : QWidget( parent, Qt::WindowFlags() ), _scroll(NULL), _propsCallback(NULL)
         , _normalCursor(Qt::ArrowCursor), _linkCursor(Qt::PointingHandCursor)
         , _selCursor(Qt::IBeamCursor), _waitCursor(Qt::WaitCursor)
-        , _selecting(false), _selected(false), _editMode(false), _lastBatteryState(CR_BATTERY_STATE_NO_BATTERY)
+        , _selecting(false), _selected(false), _editMode(false)
+        , _lastBatteryState(CR_BATTERY_STATE_NO_BATTERY)
+        , _lastBatteryChargingConn(CR_BATTERY_CHARGER_NO)
+        , _lastBatteryChargeLevel(0)
 {
 #if WORD_SELECTOR_ENABLED==1
     _wordSelector = NULL;
@@ -331,7 +334,7 @@ CR3View::CR3View( QWidget *parent)
 #endif
 
     _docview->setBatteryIcons( getBatteryIcons(0x000000) );
-    _docview->setBatteryState(CR_BATTERY_STATE_NO_BATTERY); // don't show battery
+    _docview->setBatteryState(CR_BATTERY_STATE_NO_BATTERY, CR_BATTERY_CHARGER_NO, 0); // don't show battery
     //_docview->setBatteryState( 75 ); // 75%
 //    LVStreamRef stream;
 //    stream = LVOpenFileStream("/home/lve/.cr3/textures/old_paper.png", LVOM_READ);
@@ -527,21 +530,31 @@ void CR3View::resizeEvent ( QResizeEvent * event )
     _docview->Resize( sz.width(), sz.height() );
 }
 
-int getBatteryState()
+static bool getBatteryState(int& state, int& chargingConn, int& level)
 {
 #ifdef _WIN32
     // update battery state
     SYSTEM_POWER_STATUS bstatus;
     BOOL pow = GetSystemPowerStatus(&bstatus);
-    if (bstatus.BatteryFlag & 128)
-        return CR_BATTERY_STATE_NO_BATTERY; // no system battery
-	if (bstatus.ACLineStatus==8 && bstatus.BatteryLifePercent<100 )
-		return CR_BATTERY_STATE_CHARGING; // charging
-    if (bstatus.BatteryLifePercent>=0 && bstatus.BatteryLifePercent<=100)
-		return bstatus.BatteryLifePercent;
-    return CR_BATTERY_STATE_NO_BATTERY;
+    if (pow) {
+        state = CR_BATTERY_STATE_DISCHARGING;
+        if (bstatus.BatteryFlag & 128)
+            state = CR_BATTERY_STATE_NO_BATTERY;  // no system battery
+        else if (bstatus.BatteryFlag & 8)
+            state = CR_BATTERY_STATE_CHARGING;    // charging
+        chargingConn = CR_BATTERY_CHARGER_NO;
+        if (bstatus.ACLineStatus==1)
+            chargingConn = CR_BATTERY_CHARGER_AC; // AC power charging connected
+        if (bstatus.BatteryLifePercent>=0 && bstatus.BatteryLifePercent<=100)
+            level = bstatus.BatteryLifePercent;
+        return true;
+    }
+    return false;
 #else
-	return CR_BATTERY_STATE_NO_BATTERY;
+    state = CR_BATTERY_STATE_NO_BATTERY;
+    chargingConn = CR_BATTERY_CHARGER_NO;
+    level = 0;
+    return true;
 #endif
 }
 
@@ -549,11 +562,18 @@ void CR3View::paintEvent ( QPaintEvent * event )
 {
     QPainter painter(this);
     QRect rc = rect();
-	int newBatteryState = getBatteryState();
-	if (_lastBatteryState != newBatteryState) {
-		_docview->setBatteryState( newBatteryState );
-		_lastBatteryState = newBatteryState;
-	}
+    int newBatteryState;
+    int newChargingConn;
+    int newChargeLevel;
+    if (getBatteryState(newBatteryState, newChargingConn, newChargeLevel) &&
+            (_lastBatteryState != newBatteryState ||
+             _lastBatteryChargingConn != newChargingConn ||
+             _lastBatteryChargeLevel != newChargeLevel)) {
+        _docview->setBatteryState( newBatteryState, newChargingConn, newChargeLevel );
+        _lastBatteryState = newBatteryState;
+        _lastBatteryChargingConn = newChargingConn;
+        _lastBatteryChargeLevel = newChargeLevel;
+    }
     LVDocImageRef ref = _docview->getPageImage(0);
     if ( ref.isNull() ) {
         //painter.fillRect();
diff --git a/cr3qt/src/cr3widget.h b/cr3qt/src/cr3widget.h
index 8f8a00a42..3fdf20b3c 100644
--- a/cr3qt/src/cr3widget.h
+++ b/cr3qt/src/cr3widget.h
@@ -188,7 +188,9 @@ class CR3View : public QWidget, public LVDocViewCallback
         QString _cssDir;
         QString _bookmarkDir;
         bool _editMode;
-		int _lastBatteryState;
+        int _lastBatteryState;
+        int _lastBatteryChargingConn;
+        int _lastBatteryChargeLevel;
 };
 
 #endif // CR3WIDGET_H
diff --git a/cr3qt/src/filepropsdlg.cpp b/cr3qt/src/filepropsdlg.cpp
index 7409e55eb..3ea3bae39 100644
--- a/cr3qt/src/filepropsdlg.cpp
+++ b/cr3qt/src/filepropsdlg.cpp
@@ -172,7 +172,7 @@ void FilePropsDialog::fillItems()
 
     addPropLine( tr("Current page"), cr2qt(lString32::itoa(_docview->getCurPage())) );
     addPropLine( tr("Total pages"), cr2qt(lString32::itoa(_docview->getPageCount())) );
-    addPropLine( tr("Battery state"), cr2qt(lString32::itoa(_docview->getBatteryState()) + "%") );
+    addPropLine( tr("Battery state"), cr2qt(lString32::itoa(_docview->getBatteryChargeLevel()) + "%") );
     addPropLine( tr("Current Time"), cr2qt(_docview->getTimeString()) );
     // TODO:
     if ( hist ) {
diff --git a/crengine/include/lvdocview.h b/crengine/include/lvdocview.h
index aa1d1edb7..4a8617404 100644
--- a/crengine/include/lvdocview.h
+++ b/crengine/include/lvdocview.h
@@ -33,11 +33,21 @@ typedef enum {
     txt_format_auto  // autodetect format
 } txt_format_t;
 
-/// no battery
+/// Battery state: no battery
 #define CR_BATTERY_STATE_NO_BATTERY -2
-/// battery is charging
+/// Battery state: battery is charging
 #define CR_BATTERY_STATE_CHARGING -1
-// values 0..100 -- battery life percent
+/// Battery state: battery is discharging
+#define CR_BATTERY_STATE_DISCHARGING -3
+
+/// Battery charger connection: no connection
+#define CR_BATTERY_CHARGER_NO 1
+/// Battery charger connection: AC adapter
+#define CR_BATTERY_CHARGER_AC 2
+/// Battery charger connection: USB
+#define CR_BATTERY_CHARGER_USB 3
+/// Battery charger connection: Wireless
+#define CR_BATTERY_CHARGER_WIRELESS 4
 
 #ifndef CR_ENABLE_PAGE_IMAGE_CACHE
 #ifdef ANDROID
@@ -259,6 +269,8 @@ class LVDocView : public CacheLoadingCallback
     ldomXPointer _posBookmark; // bookmark for current position
 
     int m_battery_state;
+    int m_battery_charging_conn;
+    int m_battery_charge_level;
     int m_requested_font_size;
     int m_font_size; // = m_requested_font_size, possibly scaled according to DPI
     int m_status_font_size;
@@ -643,9 +655,13 @@ class LVDocView : public CacheLoadingCallback
     /// returns section bounds, in 1/100 of percent
     LVArray<int> & getSectionBounds( int max_count, int depth, bool for_external_update=false );
     /// sets battery state
-    virtual bool setBatteryState( int newState );
+    virtual bool setBatteryState( int newState, int newChargingConn, int newChargeLevel );
     /// returns battery state
     int getBatteryState() const { return m_battery_state; }
+    /// returns battery charging connection
+    int getBatteryChargingConn() const { return m_battery_charging_conn; }
+    /// returns battery charge level
+    int getBatteryChargeLevel() const { return m_battery_charge_level; }
     /// returns current time representation string
     virtual lString32 getTimeString() const;
     /// returns true if time changed since clock has been last drawed
diff --git a/crengine/src/lvdocview.cpp b/crengine/src/lvdocview.cpp
index 74c078426..bee95336f 100644
--- a/crengine/src/lvdocview.cpp
+++ b/crengine/src/lvdocview.cpp
@@ -156,7 +156,9 @@ static int def_font_sizes[] = { 18, 20, 22, 24, 29, 33, 39, 44 };
 
 LVDocView::LVDocView(int bitsPerPixel, bool noDefaultDocument) :
 	m_bitsPerPixel(bitsPerPixel), m_dx(400), m_dy(200), _pos(0), _page(0),
-			_posIsSet(false), m_battery_state(CR_BATTERY_STATE_NO_BATTERY)
+			_posIsSet(false), m_battery_state(CR_BATTERY_STATE_NO_BATTERY),
+			m_battery_charging_conn(CR_BATTERY_CHARGER_NO),
+			m_battery_charge_level(0)
 #if (LBOOK==1)
 			, m_requested_font_size(32)
 #elif defined(__SYMBIAN32__)
@@ -1450,7 +1452,7 @@ void LVDocView::drawBatteryState(LVDrawBuf * drawbuf, const lvRect & batteryRc)
 		if ( m_batteryIcons.size()==1 )
 			icons.add(m_batteryIcons[0]);
 	}
-	LVDrawBatteryIcon(drawbuf, batteryRc, m_battery_state, m_battery_state
+	LVDrawBatteryIcon(drawbuf, batteryRc, m_battery_charge_level, m_battery_state
 			== CR_BATTERY_STATE_CHARGING, icons, drawPercent ? m_batteryFont.get() : NULL);
 #if 0
 	if ( m_batteryIcons.length()>1 ) {
@@ -1728,11 +1730,13 @@ void LVDocView::getPageRectangle(int pageIndex, lvRect & pageRect) const {
 }
 
 /// sets battery state
-bool LVDocView::setBatteryState(int newState) {
-	if (m_battery_state == newState)
+bool LVDocView::setBatteryState(int newState, int newChargingConn, int newChargeLevel) {
+	if (m_battery_state == newState && newChargingConn == m_battery_charging_conn && m_battery_charge_level == newChargeLevel)
 		return false;
-	CRLog::info("New battery state: %d", newState);
+	CRLog::info("New battery state: %d; chargingConn: %d; chargeLevel: %d", newState, newChargingConn, newChargeLevel);
 	m_battery_state = newState;
+	m_battery_charging_conn = newChargingConn;
+	m_battery_charge_level = newChargeLevel;
 	clearImageCache();
 	return true;
 }
@@ -1878,7 +1882,7 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 			info.left += dwIcons;
 		}
 		bool batteryPercentNormalFont = false; // PROP_SHOW_BATTERY_PERCENT
-		if ((phi & PGHDR_BATTERY) && m_battery_state >= CR_BATTERY_STATE_CHARGING) {
+		if ((phi & PGHDR_BATTERY) && m_battery_state != CR_BATTERY_STATE_NO_BATTERY) {
 			batteryPercentNormalFont = m_props->getBoolDef(PROP_SHOW_BATTERY_PERCENT, true) || m_batteryIcons.size()<=2;
 			if ( !batteryPercentNormalFont ) {
 				lvRect brc = info;
@@ -1916,30 +1920,38 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 		lString32 pageinfo;
 		if (pageCount > 0) {
 			if (phi & PGHDR_PAGE_NUMBER)
-                pageinfo += fmt::decimal(pageIndex + 1);
-            if (phi & PGHDR_PAGE_COUNT) {
-                if ( !pageinfo.empty() )
-                    pageinfo += " / ";
-                pageinfo += fmt::decimal(pageCount);
-            }
-            if (phi & PGHDR_PERCENT) {
-                if ( !pageinfo.empty() )
-                    pageinfo += "  ";
-                //pageinfo += lString32::itoa(percent/100)+U"%"; //+U"."+lString32::itoa(percent/10%10)+U"%";
-                pageinfo += fmt::decimal(percent/100);
-                pageinfo += ",";
-                int pp = percent%100;
-                if ( pp<10 )
-                    pageinfo << "0";
-                pageinfo << fmt::decimal(pp) << "%";
-            }
-            if ( batteryPercentNormalFont ) {
-                if (m_battery_state >= 0)
-                    pageinfo << "  [" << fmt::decimal(m_battery_state) << "%]";
-                else if (m_battery_state == CR_BATTERY_STATE_CHARGING)
-                    pageinfo << "  [ + ]";
-            }
-        }
+				pageinfo += fmt::decimal(pageIndex + 1);
+			if (phi & PGHDR_PAGE_COUNT) {
+				if (!pageinfo.empty())
+					pageinfo += " / ";
+				pageinfo += fmt::decimal(pageCount);
+			}
+			if (phi & PGHDR_PERCENT) {
+				if (!pageinfo.empty())
+					pageinfo += "  ";
+				pageinfo += fmt::decimal(percent / 100);
+				pageinfo += ",";
+				int pp = percent % 100;
+				if (pp < 10)
+					pageinfo << "0";
+				pageinfo << fmt::decimal(pp) << "%";
+			}
+			if (batteryPercentNormalFont) {
+				if (m_battery_charge_level >= 0 && m_battery_charge_level <= 100) {
+					pageinfo << "  [";
+					if (m_battery_state == CR_BATTERY_STATE_CHARGING) {
+						pageinfo << 0x21AF;
+					}
+					pageinfo << fmt::decimal(m_battery_charge_level) << "%]";
+				} else {
+					if (m_battery_state == CR_BATTERY_STATE_CHARGING) {
+						pageinfo << Utf8ToUnicode("  [ ↯ ]");
+					} else {
+						pageinfo << Utf8ToUnicode("  [ ? ]");
+					}
+				}
+			}
+		}
 
 		int piw = 0;
 		if (!pageinfo.empty()) {
diff --git a/crengine/src/lvfont/lvfreetypeface.cpp b/crengine/src/lvfont/lvfreetypeface.cpp
index a125fab96..8fab2fbed 100644
--- a/crengine/src/lvfont/lvfreetypeface.cpp
+++ b/crengine/src/lvfont/lvfreetypeface.cpp
@@ -136,6 +136,11 @@ static lChar32 getReplacementChar(lUInt32 code, bool * can_be_ignored = NULL) {
         case 0x25AA: // css_lst_square:
         case 0x25FE: // css_lst_square:
             return '-';
+        case 0x21AF: // DOWNWARDS ZIGZAG ARROW
+        case 0x26A1: // HIGH VOLTAGE SIGN
+        case 0x2B4D: // DOWNWARDS TRIANGLE-HEADED ZIGZAG ARROW
+        case 0x1F5F2:// LIGHTNING MOOD
+            return '+';
         default:
             break;
     }

From 06779369e512a24351141565e897029c485070ac Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Wed, 28 Jul 2021 22:51:19 +0400
Subject: [PATCH 29/35] Android: implemented updating the current time in the
 status bar when it changes without turning the page. But of course, only if
 the settings are set to display the current time in the status bar and if the
 display of the status bar is enabled. This is disabled on e-ink devices, as
 well as updating the battery status.

---
 android/jni/cr3engine.cpp                        |  3 ++-
 android/jni/docview.cpp                          | 16 ++++++++++++++++
 android/jni/org_coolreader_crengine_DocView.h    |  8 ++++++++
 android/src/org/coolreader/CoolReader.java       | 16 ++++++++++++++++
 android/src/org/coolreader/crengine/DocView.java | 12 ++++++++++--
 .../src/org/coolreader/crengine/ReaderView.java  |  9 +++++++++
 crengine/src/lvdocview.cpp                       |  2 +-
 7 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/android/jni/cr3engine.cpp b/android/jni/cr3engine.cpp
index a222a24b5..674b14170 100644
--- a/android/jni/cr3engine.cpp
+++ b/android/jni/cr3engine.cpp
@@ -1225,7 +1225,8 @@ static JNINativeMethod sDocViewMethods[] = {
   {"closeImageInternal", "()Z", (void*)Java_org_coolreader_crengine_DocView_closeImageInternal},
   {"hilightBookmarksInternal", "([Lorg/coolreader/crengine/Bookmark;)V", (void*)Java_org_coolreader_crengine_DocView_hilightBookmarksInternal},
   {"checkBookmarkInternal", "(IILorg/coolreader/crengine/Bookmark;)Z", (void*)Java_org_coolreader_crengine_DocView_checkBookmarkInternal},
-  {"isRenderedInternal", "()Z", (void*)Java_org_coolreader_crengine_DocView_isRenderedInternal}
+  {"isRenderedInternal", "()Z", (void*)Java_org_coolreader_crengine_DocView_isRenderedInternal},
+  {"isTimeChangedInternal", "()Z", (void*)Java_org_coolreader_crengine_DocView_isTimeChangedInternal}
 };
 
 /*
diff --git a/android/jni/docview.cpp b/android/jni/docview.cpp
index adb2596d9..d404ac066 100644
--- a/android/jni/docview.cpp
+++ b/android/jni/docview.cpp
@@ -2285,6 +2285,22 @@ JNIEXPORT void JNICALL Java_org_coolreader_crengine_DocView_hilightBookmarksInte
     p->_docview->setBookmarkList(bookmarks);
 }
 
+/*
+ * Class:     org_coolreader_crengine_DocView
+ * Method:    isTimeChangedInternal
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_DocView_isTimeChangedInternal
+  (JNIEnv * _env, jobject _this) {
+    ;
+    DocViewNative * p = getNative(_env, _this);
+    if (!p) {
+        CRLog::error("Cannot get native view");
+        return JNI_FALSE;
+    }
+    return p->_docview->isTimeChanged() ? JNI_TRUE : JNI_FALSE;
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/android/jni/org_coolreader_crengine_DocView.h b/android/jni/org_coolreader_crengine_DocView.h
index 8c821222f..2d9117124 100644
--- a/android/jni/org_coolreader_crengine_DocView.h
+++ b/android/jni/org_coolreader_crengine_DocView.h
@@ -277,6 +277,14 @@ JNIEXPORT void JNICALL Java_org_coolreader_crengine_DocView_hilightBookmarksInte
 JNIEXPORT jint JNICALL Java_org_coolreader_crengine_DocView_swapToCacheInternal
   (JNIEnv *, jobject);
 
+/*
+ * Class:     org_coolreader_crengine_DocView
+ * Method:    isTimeChangedInternal
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_DocView_isTimeChangedInternal
+  (JNIEnv *, jobject);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/android/src/org/coolreader/CoolReader.java b/android/src/org/coolreader/CoolReader.java
index ae16adcac..ab5035a2f 100644
--- a/android/src/org/coolreader/CoolReader.java
+++ b/android/src/org/coolreader/CoolReader.java
@@ -181,6 +181,14 @@ public void onReceive(Context context, Intent intent) {
 			}
 		}
 	};
+	private BroadcastReceiver timeTickReceiver = new BroadcastReceiver() {
+		@Override
+		public void onReceive(Context context, Intent intent) {
+			if (activityIsRunning && null != mReaderView) {
+				mReaderView.onTimeTickReceived();
+			}
+		}
+	};
 
 	/**
 	 * Called when the activity is first created.
@@ -823,6 +831,11 @@ protected void onPause() {
 		} catch (IllegalArgumentException e) {
 			log.e("Failed to unregister receiver: " + e.toString());
 		}
+		try {
+			unregisterReceiver(timeTickReceiver);
+		} catch (IllegalArgumentException e) {
+			log.e("Failed to unregister receiver: " + e.toString());
+		}
 		Services.getCoverpageManager().removeCoverpageReadyListener(mHomeFrame);
 		if (BuildConfig.GSUITE_AVAILABLE && Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
 			if (mSyncGoogleDriveEnabled && mGoogleDriveSync != null && !mGoogleDriveSync.isBusy()) {
@@ -869,11 +882,14 @@ protected void onResume() {
 
 		if (mReaderView != null)
 			mReaderView.onAppResume();
+		// ACTION_BATTERY_CHANGED: This is a sticky broadcast containing the charging state, level, and other information about the battery.
 		Intent intent = registerReceiver(batteryChangeReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
 		if (null != intent) {
 			// process this Intent
 			batteryChangeReceiver.onReceive(null, intent);
 		}
+		// ACTION_TIME_TICK: The current time has changed. Sent every minute.
+		registerReceiver(timeTickReceiver, new IntentFilter(Intent.ACTION_TIME_TICK));
 
 		if (DeviceInfo.EINK_SCREEN) {
 			if (DeviceInfo.EINK_SONY) {
diff --git a/android/src/org/coolreader/crengine/DocView.java b/android/src/org/coolreader/crengine/DocView.java
index 09d04914a..c8d8fa95e 100644
--- a/android/src/org/coolreader/crengine/DocView.java
+++ b/android/src/org/coolreader/crengine/DocView.java
@@ -433,10 +433,16 @@ public void hilightBookmarks(Bookmark[] bookmarks) {
 			hilightBookmarksInternal(bookmarks);
 		}
 	}
-	
+
+	public boolean isTimeChanged() {
+		synchronized(mutex) {
+			return isTimeChangedInternal();
+		}
+	}
+
 	//========================================================================================
 	// Native functions
-	/* implementend by libcr3engine.so */
+	/* implemented by libcr3engine.so */
 	//========================================================================================
 	private native void getPageImageInternal(Bitmap bitmap, int bpp);
 
@@ -509,6 +515,8 @@ private native boolean moveSelectionInternal(Selection sel,
 	// / returns either SWAP_DONE, SWAP_TIMEOUT or SWAP_ERROR
 	private native int swapToCacheInternal();
 
+	private native boolean isTimeChangedInternal();
+
 	private long mNativeObject; // used from JNI
 
 	private ReaderCallback readerCallback;  // used from JNI
diff --git a/android/src/org/coolreader/crengine/ReaderView.java b/android/src/org/coolreader/crengine/ReaderView.java
index 457e749b4..87cd1cd00 100644
--- a/android/src/org/coolreader/crengine/ReaderView.java
+++ b/android/src/org/coolreader/crengine/ReaderView.java
@@ -3242,6 +3242,15 @@ public int getBatteryChargeLevel() {
 		return mBatteryChargeLevel;
 	}
 
+	public void onTimeTickReceived() {
+		if (!DeviceInfo.EINK_SCREEN && !isAutoScrollActive()) {
+			if (doc.isTimeChanged()) {
+				log.i("The current time has been changed (minutes), redrawing is scheduled.");
+				redraw();
+			}
+		}
+	}
+
 	private static final VMRuntimeHack runtime = new VMRuntimeHack();
 
 	private static class BitmapFactory {
diff --git a/crengine/src/lvdocview.cpp b/crengine/src/lvdocview.cpp
index bee95336f..e729e81aa 100644
--- a/crengine/src/lvdocview.cpp
+++ b/crengine/src/lvdocview.cpp
@@ -2330,7 +2330,7 @@ bool LVDocView::goToPage(int page, bool updatePosBookmark, bool regulateTwoPages
 
 /// returns true if time changed since clock has been last drawed
 bool LVDocView::isTimeChanged() {
-	if ( m_pageHeaderInfo & PGHDR_CLOCK ) {
+	if ( m_pageHeaderPos != PAGE_HEADER_POS_NONE && m_pageHeaderInfo & PGHDR_CLOCK ) {
 		bool res = (m_last_clock != getTimeString());
 		if (res)
 			clearImageCache();

From a494378ba7d626eefce1b7a83622249d8bac80cf Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Thu, 29 Jul 2021 14:38:56 +0400
Subject: [PATCH 30/35] Android: OptionsDialog: on API24+ use
 android.widget.Switch instead of android.widget.Checkbox.

---
 android/res/color/switch_thumb_tint_black.xml |   6 +
 android/res/color/switch_thumb_tint_dark.xml  |   6 +
 .../res/color/switch_thumb_tint_hc_dark.xml   |   6 +
 .../res/color/switch_thumb_tint_hc_light.xml  |   6 +
 android/res/color/switch_thumb_tint_light.xml |   6 +
 android/res/color/switch_thumb_tint_white.xml |   6 +
 android/res/color/switch_track_tint_dark.xml  |   8 +
 .../res/color/switch_track_tint_hc_dark.xml   |   8 +
 .../res/color/switch_track_tint_hc_light.xml  |   8 +
 android/res/color/switch_track_tint_light.xml |   8 +
 .../res/layout-v24/option_item_boolean.xml    |  61 +++
 android/res/layout-v24/option_lang_filter.xml |  24 +
 android/res/layout/option_lang_filter.xml     |   9 +-
 android/res/values-v24/styles.xml             | 515 ++++++++++++++++++
 .../coolreader/crengine/OptionsDialog.java    |  36 +-
 15 files changed, 691 insertions(+), 22 deletions(-)
 create mode 100644 android/res/color/switch_thumb_tint_black.xml
 create mode 100644 android/res/color/switch_thumb_tint_dark.xml
 create mode 100644 android/res/color/switch_thumb_tint_hc_dark.xml
 create mode 100644 android/res/color/switch_thumb_tint_hc_light.xml
 create mode 100644 android/res/color/switch_thumb_tint_light.xml
 create mode 100644 android/res/color/switch_thumb_tint_white.xml
 create mode 100644 android/res/color/switch_track_tint_dark.xml
 create mode 100644 android/res/color/switch_track_tint_hc_dark.xml
 create mode 100644 android/res/color/switch_track_tint_hc_light.xml
 create mode 100644 android/res/color/switch_track_tint_light.xml
 create mode 100644 android/res/layout-v24/option_item_boolean.xml
 create mode 100644 android/res/layout-v24/option_lang_filter.xml
 create mode 100644 android/res/values-v24/styles.xml

diff --git a/android/res/color/switch_thumb_tint_black.xml b/android/res/color/switch_thumb_tint_black.xml
new file mode 100644
index 000000000..fac24108f
--- /dev/null
+++ b/android/res/color/switch_thumb_tint_black.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#5f5f5f"/>
+    <item android:state_checked="true"  android:color="#d0d0d0"/>
+    <item android:color="#b9b9b9"/>
+</selector>
diff --git a/android/res/color/switch_thumb_tint_dark.xml b/android/res/color/switch_thumb_tint_dark.xml
new file mode 100644
index 000000000..fb2172498
--- /dev/null
+++ b/android/res/color/switch_thumb_tint_dark.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#5f5f5f"/>
+    <item android:state_checked="true"  android:color="#feddb7"/>
+    <item android:color="#b9b9b9"/>
+</selector>
diff --git a/android/res/color/switch_thumb_tint_hc_dark.xml b/android/res/color/switch_thumb_tint_hc_dark.xml
new file mode 100644
index 000000000..a51ebdb49
--- /dev/null
+++ b/android/res/color/switch_thumb_tint_hc_dark.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:state_checked="true"  android:color="@android:color/white"/>
+    <item android:color="@android:color/white"/>
+</selector>
diff --git a/android/res/color/switch_thumb_tint_hc_light.xml b/android/res/color/switch_thumb_tint_hc_light.xml
new file mode 100644
index 000000000..e37642a32
--- /dev/null
+++ b/android/res/color/switch_thumb_tint_hc_light.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:state_checked="true"  android:color="@android:color/black"/>
+    <item android:color="@android:color/black"/>
+</selector>
diff --git a/android/res/color/switch_thumb_tint_light.xml b/android/res/color/switch_thumb_tint_light.xml
new file mode 100644
index 000000000..2be1b2d80
--- /dev/null
+++ b/android/res/color/switch_thumb_tint_light.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#b9b9b9"/>
+    <item android:state_checked="true"  android:color="#6b472f"/>
+    <item android:color="#ececec"/>
+</selector>
diff --git a/android/res/color/switch_thumb_tint_white.xml b/android/res/color/switch_thumb_tint_white.xml
new file mode 100644
index 000000000..cf5941174
--- /dev/null
+++ b/android/res/color/switch_thumb_tint_white.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#b9b9b9"/>
+    <item android:state_checked="true"  android:color="#323232"/>
+    <item android:color="#ececec"/>
+</selector>
diff --git a/android/res/color/switch_track_tint_dark.xml b/android/res/color/switch_track_tint_dark.xml
new file mode 100644
index 000000000..1845f3b1e
--- /dev/null
+++ b/android/res/color/switch_track_tint_dark.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+          android:color="#80000000" />
+    <item android:state_checked="true"
+          android:color="#8d8d8d" />
+    <item android:color="#8d8d8d" />
+</selector>
diff --git a/android/res/color/switch_track_tint_hc_dark.xml b/android/res/color/switch_track_tint_hc_dark.xml
new file mode 100644
index 000000000..50b0ad091
--- /dev/null
+++ b/android/res/color/switch_track_tint_hc_dark.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+          android:color="#808080" />
+    <item android:state_checked="true"
+          android:color="#8d8d8d" />
+    <item android:color="#8d8d8d" />
+</selector>
diff --git a/android/res/color/switch_track_tint_hc_light.xml b/android/res/color/switch_track_tint_hc_light.xml
new file mode 100644
index 000000000..50b0ad091
--- /dev/null
+++ b/android/res/color/switch_track_tint_hc_light.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+          android:color="#808080" />
+    <item android:state_checked="true"
+          android:color="#8d8d8d" />
+    <item android:color="#8d8d8d" />
+</selector>
diff --git a/android/res/color/switch_track_tint_light.xml b/android/res/color/switch_track_tint_light.xml
new file mode 100644
index 000000000..1845f3b1e
--- /dev/null
+++ b/android/res/color/switch_track_tint_light.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+          android:color="#80000000" />
+    <item android:state_checked="true"
+          android:color="#8d8d8d" />
+    <item android:color="#8d8d8d" />
+</selector>
diff --git a/android/res/layout-v24/option_item_boolean.xml b/android/res/layout-v24/option_item_boolean.xml
new file mode 100644
index 000000000..daebcd7c6
--- /dev/null
+++ b/android/res/layout-v24/option_item_boolean.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Boolean option item layout for CR3 options dialog, for API24+
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/option_item_body"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:orientation="horizontal"
+        android:paddingRight="?android:attr/scrollbarSize">
+
+    <ImageView
+            android:id="@+id/option_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+
+    <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="15dip"
+            android:layout_marginTop="6dip"
+            android:layout_marginRight="6dip"
+            android:layout_marginBottom="6dip"
+            android:layout_weight="1">
+
+        <TextView
+                android:id="@+id/option_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="3"
+                android:singleLine="false"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textColor="?attr/textColorOptionLabel" />
+        <!--android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+         -->
+        <TextView
+                android:id="@+id/option_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/option_label"
+                android:layout_alignLeft="@id/option_label"
+                android:maxLines="3"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?attr/textColorOptionValue"
+                android:visibility="gone" />
+
+    </RelativeLayout>
+
+    <Switch
+            android:id="@+id/option_value_cb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="0dip"
+            android:clickable="false"
+            android:focusable="false"
+            android:showText="false" />
+</LinearLayout>
diff --git a/android/res/layout-v24/option_lang_filter.xml b/android/res/layout-v24/option_lang_filter.xml
new file mode 100644
index 000000000..f66aa4766
--- /dev/null
+++ b/android/res/layout-v24/option_lang_filter.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/option_item_body"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:orientation="vertical"
+        android:paddingRight="?android:attr/scrollbarSize">
+
+    <Switch
+            android:id="@+id/filter_by_lang"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dip"
+            android:layout_marginLeft="15dip"
+            android:layout_marginTop="0dip"
+            android:layout_marginEnd="6dip"
+            android:layout_marginRight="6dip"
+            android:layout_marginBottom="0dip"
+            android:showText="false"
+            android:text="@string/filter_by_book_language_s" />
+</LinearLayout>
diff --git a/android/res/layout/option_lang_filter.xml b/android/res/layout/option_lang_filter.xml
index 4091d8c95..3bca0c027 100644
--- a/android/res/layout/option_lang_filter.xml
+++ b/android/res/layout/option_lang_filter.xml
@@ -10,9 +10,14 @@
         android:paddingRight="?android:attr/scrollbarSize">
 
     <CheckBox
-            android:id="@+id/cb_filter_by_lang"
+            android:id="@+id/filter_by_lang"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginRight="0dip"
+            android:layout_marginStart="15dip"
+            android:layout_marginLeft="15dip"
+            android:layout_marginTop="0dip"
+            android:layout_marginEnd="6dip"
+            android:layout_marginRight="6dip"
+            android:layout_marginBottom="0dip"
             android:text="@string/filter_by_book_language_s" />
 </LinearLayout>
diff --git a/android/res/values-v24/styles.xml b/android/res/values-v24/styles.xml
new file mode 100644
index 000000000..033b7ce7d
--- /dev/null
+++ b/android/res/values-v24/styles.xml
@@ -0,0 +1,515 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Switch.Light" parent="@android:style/Widget.Material.Light.CompoundButton.Switch">
+        <item name="android:trackTint">@color/switch_track_tint_light</item>
+        <item name="android:thumbTint">@color/switch_thumb_tint_light</item>
+    </style>
+
+    <style name="Switch.Dark" parent="@android:style/Widget.Material.CompoundButton.Switch">
+        <item name="android:trackTint">@color/switch_track_tint_dark</item>
+        <item name="android:thumbTint">@color/switch_thumb_tint_dark</item>
+    </style>
+
+    <style name="Switch.White" parent="@android:style/Widget.Material.Light.CompoundButton.Switch">
+        <item name="android:trackTint">@color/switch_track_tint_light</item>
+        <item name="android:thumbTint">@color/switch_thumb_tint_white</item>
+    </style>
+
+    <style name="Switch.Black" parent="@android:style/Widget.Material.CompoundButton.Switch">
+        <item name="android:trackTint">@color/switch_track_tint_dark</item>
+        <item name="android:thumbTint">@color/switch_thumb_tint_black</item>
+    </style>
+
+    <style name="Switch.HC.Light" parent="@android:style/Widget.Material.Light.CompoundButton.Switch">
+        <item name="android:trackTint">@color/switch_track_tint_hc_light</item>
+        <item name="android:thumbTint">@color/switch_thumb_tint_hc_light</item>
+    </style>
+
+    <style name="Switch.HC.Dark" parent="@android:style/Widget.Material.CompoundButton.Switch">
+        <item name="android:trackTint">@color/switch_track_tint_hc_dark</item>
+        <item name="android:thumbTint">@color/switch_thumb_tint_hc_dark</item>
+    </style>
+
+    <style name="Theme.Light" parent="@style/Theme.White">
+        <item name="android:windowBackground">@drawable/background_tiled_light</item>
+        <item name="android:colorBackground">#ffe0e0e0</item>
+        <item name="android:switchStyle">@style/Switch.Light</item>
+        <item name="android:listViewStyle">@style/ListView.Light</item>
+        <item name="android:listViewWhiteStyle">@style/ListView.Light</item>
+        <item name="textColorToolBarLabel">?android:attr/textColorPrimary</item>
+        <item name="textColorOptionLabel">@color/label_light</item>
+        <item name="textColorOptionValue">@color/value_light</item>
+    </style>
+
+    <style name="Theme.Dark" parent="@style/Theme.Black">
+        <item name="android:windowBackground">@drawable/background_tiled_dark</item>
+        <item name="android:colorBackground">#ff302030</item>
+        <item name="android:switchStyle">@style/Switch.Dark</item>
+        <item name="android:listViewStyle">@style/ListView.Dark</item>
+        <item name="android:listViewWhiteStyle">@style/ListView.Dark</item>
+        <item name="textColorOptionLabel">@color/label_dark</item>
+        <item name="textColorOptionValue">@color/value_dark</item>
+    </style>
+
+    <style name="Theme.White" parent="@android:style/Theme.Material.Light">
+        <item name="android:windowBackground">@android:color/white</item>
+        <item name="android:colorBackground">@android:color/white</item>
+        <!-- item name="android:textColor">@android:color/black</item-->
+        <item name="android:listViewStyle">@style/ListView.White</item>
+        <item name="android:listViewWhiteStyle">@style/ListView.White</item>
+        <item name="android:checkboxStyle">@android:style/Widget.Material.Light.CompoundButton.CheckBox</item>
+        <item name="android:switchStyle">@style/Switch.White</item>
+        <item name="android:radioButtonStyle">@android:style/Widget.Material.Light.CompoundButton.RadioButton</item>
+        <item name="android:buttonStyle">@android:style/Widget.Material.Light.Button</item>
+        <item name="android:buttonStyleSmall">@android:style/Widget.Material.Light.Button.Small</item>
+        <item name="android:imageButtonStyle">@android:style/Widget.Material.Light.ImageButton</item>
+        <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
+        <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
+        <item name="android:textAppearanceLarge">@style/TextAppearance.MediumLarge</item>
+
+        <!-- toolbar button background -->
+        <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#40404040</item>
+        <item name="textColorToolBarLabel">?android:attr/textColorSecondary</item>
+        <item name="textColorOptionLabel">?android:attr/textColorPrimary</item>
+        <item name="textColorOptionValue">?android:attr/textColorSecondary</item>
+        <item name="tts_toolbar_background">#D0808080</item>
+        <item name="tabIndicatorBackground">@drawable/tab_indicator_material</item>
+
+        <!-- icons -->
+        <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev</item>
+        <item name="cr3_button_next_drawable">@drawable/cr3_button_next</item>
+        <item name="cr3_viewer_toc_drawable">@drawable/cr3_viewer_toc</item>
+        <item name="cr3_viewer_find_drawable">@drawable/cr3_viewer_find</item>
+        <item name="cr3_viewer_settings_drawable">@drawable/cr3_viewer_settings</item>
+        <item name="cr3_button_bookmarks_drawable">@drawable/cr3_button_bookmarks</item>
+        <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root</item>
+        <item name="cr3_option_night_drawable">@drawable/cr3_option_night</item>
+        <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts</item>
+        <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent</item>
+        <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>
+        <item name="cr3_browser_folder_opds_add_drawable">@drawable/cr3_browser_folder_opds_add</item>
+        <item name="cr3_button_folder_go_drawable">@drawable/cr3_button_folder_go</item>
+        <item name="cr3_option_font_face_drawable">@drawable/cr3_option_font_face</item>
+        <item name="cr3_option_font_size_drawable">@drawable/cr3_option_font_size</item>
+        <item name="cr3_option_text_bold_drawable">@drawable/cr3_option_text_bold</item>
+        <item name="cr3_option_text_italic_drawable">@drawable/cr3_option_text_italic</item>
+        <item name="cr3_option_text_underline_drawable">@drawable/cr3_option_text_underline</item>
+        <item name="cr3_option_text_superscript_drawable">@drawable/cr3_option_text_superscript</item>
+        <item name="cr3_option_text_antialias_drawable">@drawable/cr3_option_text_antialias</item>
+        <item name="cr3_option_line_spacing_drawable">@drawable/cr3_option_line_spacing</item>
+        <item name="cr3_option_text_hyphenation_drawable">@drawable/cr3_option_text_hyphenation</item>
+        <item name="cr3_option_text_floating_punct_drawable">@drawable/cr3_option_text_other</item>
+        <item name="cr3_option_text_kerning_drawable">@drawable/cr3_option_text_kerning</item>
+        <item name="cr3_option_text_ligatures_drawable">@drawable/cr3_option_text_ligatures</item>
+        <item name="cr3_option_text_multilang_drawable">@drawable/cr3_option_text_multilang</item>
+        <item name="cr3_option_images_drawable">@drawable/cr3_option_images</item>
+        <item name="cr3_option_font_gamma_drawable">@drawable/cr3_option_font_gamma</item>
+        <item name="cr3_option_text_width_drawable">@drawable/cr3_option_text_width</item>
+        <item name="cr3_option_fullscreen_drawable">@drawable/cr3_option_fullscreen</item>
+        <item name="cr3_option_view_mode_scroll_drawable">@drawable/cr3_option_view_mode_scroll</item>
+        <item name="cr3_option_page_orientation_landscape_drawable">@drawable/cr3_option_page_orientation_landscape</item>
+        <item name="cr3_option_pages_two_drawable">@drawable/cr3_option_pages_two</item>
+        <item name="cr3_option_text_margin_left_drawable">@drawable/cr3_option_text_margin_left</item>
+        <item name="cr3_option_text_margin_right_drawable">@drawable/cr3_option_text_margin_right</item>
+        <item name="cr3_option_text_margin_top_drawable">@drawable/cr3_option_text_margin_top</item>
+        <item name="cr3_option_text_margin_bottom_drawable">@drawable/cr3_option_text_margin_bottom</item>
+        <item name="cr3_option_text_align_drawable">@drawable/cr3_option_text_align</item>
+        <item name="cr3_option_text_indent_drawable">@drawable/cr3_option_text_indent</item>
+        <item name="cr3_option_text_hinting_drawable">@drawable/cr3_option_text_hinting</item>
+        <item name="cr3_option_controls_keys_drawable">@drawable/cr3_option_controls_keys</item>
+        <item name="cr3_option_controls_tapzones_drawable">@drawable/cr3_option_controls_tapzones</item>
+        <item name="cr3_option_other_drawable">@drawable/cr3_option_other</item>
+        <item name="cr3_browser_folder_authors_drawable">@drawable/cr3_browser_folder_authors</item>
+        <item name="cr3_browser_folder_zip_drawable">@drawable/cr3_browser_folder_zip</item>
+        <item name="cr3_browser_find_drawable">@drawable/cr3_browser_find</item>
+        <item name="cr3_browser_back_drawable">@drawable/cr3_browser_back</item>
+        <item name="cr3_button_add_drawable">@drawable/cr3_button_add</item>
+        <item name="cr3_button_ok_drawable">@drawable/cr3_button_ok</item>
+        <item name="cr3_button_cancel_drawable">@drawable/cr3_button_cancel</item>
+        <item name="cr3_button_remove_drawable">@drawable/cr3_button_remove</item>
+        <item name="cr3_button_more_drawable">@drawable/cr3_button_more</item>
+        <item name="cr3_browser_book_drawable">@drawable/cr3_browser_book</item>
+        <item name="cr3_button_info_drawable">@drawable/cr3_button_info</item>
+        <item name="cr3_button_log_drawable">@drawable/cr3_button_log</item>
+        <item name="cr3_button_light_drawable">@drawable/cr3_button_light</item>
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec</item>
+
+        <item name="ic_media_ff_drawable">@drawable/ic_media_ff</item>
+        <item name="ic_media_play_drawable">@drawable/ic_media_play</item>
+        <item name="ic_media_rew_drawable">@drawable/ic_media_rew</item>
+        <item name="ic_media_stop_drawable">@drawable/ic_media_stop</item>
+        <item name="ic_media_pause_drawable">@drawable/ic_media_pause</item>
+        <item name="ic_menu_copy_drawable">@drawable/ic_menu_copy</item>
+        <item name="ic_menu_sort_alphabetically_drawable">@drawable/ic_menu_sort_alphabetically</item>
+        <item name="ic_menu_star_drawable">@drawable/ic_menu_star</item>
+        <item name="ic_menu_compose_drawable">@drawable/ic_menu_compose</item>
+        <item name="ic_menu_search_drawable">@drawable/ic_menu_search</item>
+        <item name="ic_menu_close_clear_cancel_drawable">@drawable/ic_menu_close_clear_cancel</item>
+
+        <item name="google_drive_drawable">@drawable/google_drive</item>
+
+        <item name="folder_big_drawable">@drawable/folder_blue</item>
+        <item name="folder_big_bookmark_drawable">@drawable/folder_bookmark</item>
+        <item name="media_flash_microsd_drawable">@drawable/media_flash_sd_mmc</item>
+    </style>
+
+    <style name="Theme.Black" parent="@android:style/Theme.Material">
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:colorBackground">@android:color/black</item>
+        <!-- item name="android:textColor">@android:color/white</item-->
+        <item name="android:listViewStyle">@style/ListView.Black</item>
+        <item name="android:listViewWhiteStyle">@style/ListView.Black</item>
+        <item name="android:checkboxStyle">@android:style/Widget.Material.CompoundButton.CheckBox</item>
+        <item name="android:switchStyle">@style/Switch.Black</item>
+        <item name="android:radioButtonStyle">@android:style/Widget.Material.CompoundButton.RadioButton</item>
+        <item name="android:buttonStyle">@android:style/Widget.Material.Button</item>
+        <item name="android:buttonStyleSmall">@android:style/Widget.Material.Button.Small</item>
+        <item name="android:imageButtonStyle">@android:style/Widget.Material.ImageButton</item>
+        <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
+        <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
+        <item name="android:textAppearanceLarge">@style/TextAppearance.MediumLarge</item>
+
+        <!-- toolbar button background -->
+        <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#40404040</item>
+        <item name="textColorToolBarLabel">?android:attr/textColorSecondary</item>
+        <item name="textColorOptionLabel">?android:attr/textColorPrimary</item>
+        <item name="textColorOptionValue">?android:attr/textColorSecondary</item>
+        <item name="tts_toolbar_background">#D0808080</item>
+        <item name="tabIndicatorBackground">@drawable/tab_indicator_material</item>
+
+        <!-- icons -->
+        <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev</item>
+        <item name="cr3_button_next_drawable">@drawable/cr3_button_next</item>
+        <item name="cr3_viewer_toc_drawable">@drawable/cr3_viewer_toc</item>
+        <item name="cr3_viewer_find_drawable">@drawable/cr3_viewer_find</item>
+        <item name="cr3_viewer_settings_drawable">@drawable/cr3_viewer_settings</item>
+        <item name="cr3_button_bookmarks_drawable">@drawable/cr3_button_bookmarks</item>
+        <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root</item>
+        <item name="cr3_option_night_drawable">@drawable/cr3_option_night</item>
+        <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts</item>
+        <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent</item>
+        <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>
+        <item name="cr3_browser_folder_opds_add_drawable">@drawable/cr3_browser_folder_opds_add</item>
+        <item name="cr3_button_folder_go_drawable">@drawable/cr3_button_folder_go</item>
+        <item name="cr3_option_font_face_drawable">@drawable/cr3_option_font_face</item>
+        <item name="cr3_option_font_size_drawable">@drawable/cr3_option_font_size</item>
+        <item name="cr3_option_text_bold_drawable">@drawable/cr3_option_text_bold</item>
+        <item name="cr3_option_text_italic_drawable">@drawable/cr3_option_text_italic</item>
+        <item name="cr3_option_text_underline_drawable">@drawable/cr3_option_text_underline</item>
+        <item name="cr3_option_text_superscript_drawable">@drawable/cr3_option_text_superscript</item>
+        <item name="cr3_option_text_antialias_drawable">@drawable/cr3_option_text_antialias</item>
+        <item name="cr3_option_line_spacing_drawable">@drawable/cr3_option_line_spacing</item>
+        <item name="cr3_option_text_hyphenation_drawable">@drawable/cr3_option_text_hyphenation</item>
+        <item name="cr3_option_text_floating_punct_drawable">@drawable/cr3_option_text_other</item>
+        <item name="cr3_option_text_kerning_drawable">@drawable/cr3_option_text_kerning</item>
+        <item name="cr3_option_text_ligatures_drawable">@drawable/cr3_option_text_ligatures</item>
+        <item name="cr3_option_text_multilang_drawable">@drawable/cr3_option_text_multilang</item>
+        <item name="cr3_option_images_drawable">@drawable/cr3_option_images</item>
+        <item name="cr3_option_font_gamma_drawable">@drawable/cr3_option_font_gamma</item>
+        <item name="cr3_option_text_width_drawable">@drawable/cr3_option_text_width</item>
+        <item name="cr3_option_fullscreen_drawable">@drawable/cr3_option_fullscreen</item>
+        <item name="cr3_option_view_mode_scroll_drawable">@drawable/cr3_option_view_mode_scroll</item>
+        <item name="cr3_option_page_orientation_landscape_drawable">@drawable/cr3_option_page_orientation_landscape</item>
+        <item name="cr3_option_pages_two_drawable">@drawable/cr3_option_pages_two</item>
+        <item name="cr3_option_text_margin_left_drawable">@drawable/cr3_option_text_margin_left</item>
+        <item name="cr3_option_text_margin_right_drawable">@drawable/cr3_option_text_margin_right</item>
+        <item name="cr3_option_text_margin_top_drawable">@drawable/cr3_option_text_margin_top</item>
+        <item name="cr3_option_text_margin_bottom_drawable">@drawable/cr3_option_text_margin_bottom</item>
+        <item name="cr3_option_text_align_drawable">@drawable/cr3_option_text_align</item>
+        <item name="cr3_option_text_indent_drawable">@drawable/cr3_option_text_indent</item>
+        <item name="cr3_option_text_hinting_drawable">@drawable/cr3_option_text_hinting</item>
+        <item name="cr3_option_controls_keys_drawable">@drawable/cr3_option_controls_keys</item>
+        <item name="cr3_option_controls_tapzones_drawable">@drawable/cr3_option_controls_tapzones</item>
+        <item name="cr3_option_other_drawable">@drawable/cr3_option_other</item>
+        <item name="cr3_browser_folder_authors_drawable">@drawable/cr3_browser_folder_authors</item>
+        <item name="cr3_browser_folder_zip_drawable">@drawable/cr3_browser_folder_zip</item>
+        <item name="cr3_browser_find_drawable">@drawable/cr3_browser_find</item>
+        <item name="cr3_browser_back_drawable">@drawable/cr3_browser_back</item>
+        <item name="cr3_button_add_drawable">@drawable/cr3_button_add</item>
+        <item name="cr3_button_ok_drawable">@drawable/cr3_button_ok</item>
+        <item name="cr3_button_cancel_drawable">@drawable/cr3_button_cancel</item>
+        <item name="cr3_button_remove_drawable">@drawable/cr3_button_remove</item>
+        <item name="cr3_button_more_drawable">@drawable/cr3_button_more</item>
+        <item name="cr3_browser_book_drawable">@drawable/cr3_browser_book</item>
+        <item name="cr3_button_info_drawable">@drawable/cr3_button_info</item>
+        <item name="cr3_button_log_drawable">@drawable/cr3_button_log</item>
+        <item name="cr3_button_light_drawable">@drawable/cr3_button_light</item>
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec</item>
+
+        <item name="ic_media_ff_drawable">@drawable/ic_media_ff</item>
+        <item name="ic_media_play_drawable">@drawable/ic_media_play</item>
+        <item name="ic_media_rew_drawable">@drawable/ic_media_rew</item>
+        <item name="ic_media_stop_drawable">@drawable/ic_media_stop</item>
+        <item name="ic_media_pause_drawable">@drawable/ic_media_pause</item>
+        <item name="ic_menu_copy_drawable">@drawable/ic_menu_copy</item>
+        <item name="ic_menu_sort_alphabetically_drawable">@drawable/ic_menu_sort_alphabetically</item>
+        <item name="ic_menu_star_drawable">@drawable/ic_menu_star</item>
+        <item name="ic_menu_compose_drawable">@drawable/ic_menu_compose</item>
+        <item name="ic_menu_search_drawable">@drawable/ic_menu_search</item>
+        <item name="ic_menu_close_clear_cancel_drawable">@drawable/ic_menu_close_clear_cancel</item>
+
+        <item name="google_drive_drawable">@drawable/google_drive</item>
+
+        <item name="folder_big_drawable">@drawable/folder_blue</item>
+        <item name="folder_big_bookmark_drawable">@drawable/folder_bookmark</item>
+        <item name="media_flash_microsd_drawable">@drawable/media_flash_sd_mmc</item>
+    </style>
+
+    <style name="Theme.HiContrast1" parent="@android:style/Theme.Material.Light">
+        <item name="android:windowBackground">@android:color/white</item>
+        <item name="android:colorBackground">@android:color/white</item>
+        <!-- item name="android:textColor">@android:color/black</item -->
+        <item name="android:listViewStyle">@style/ListView.White</item>
+        <item name="android:listViewWhiteStyle">@style/ListView.White</item>
+        <item name="android:checkboxStyle">@style/CheckBox.HC.Light</item>
+        <item name="android:switchStyle">@style/Switch.HC.Light</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.HC.Light</item>
+        <item name="android:buttonStyle">@style/Button.HC.Light</item>
+        <item name="android:buttonStyleSmall">@style/Button.HC.Light.Small</item>
+        <item name="android:imageButtonStyle">@style/ImageButton.HC.Light</item>
+        <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
+        <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
+        <item name="android:textAppearanceLarge">@style/TextAppearance.MediumLarge</item>
+
+        <!-- toolbar button background -->
+        <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background_hc</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#FFFFFFFF</item>
+        <item name="textColorToolBarLabel">@color/label_hc_light</item>
+        <item name="textColorOptionLabel">@color/label_hc_light</item>
+        <item name="textColorOptionValue">@color/label_hc_light</item>
+        <item name="tts_toolbar_background">#FFFFFFFF</item>
+        <item name="tabIndicatorBackground">@drawable/tab_indicator_hc_light</item>
+
+        <!-- icons -->
+        <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev_hc</item>
+        <item name="cr3_button_next_drawable">@drawable/cr3_button_next_hc</item>
+        <item name="cr3_viewer_toc_drawable">@drawable/cr3_viewer_toc_hc</item>
+        <item name="cr3_viewer_find_drawable">@drawable/cr3_viewer_find_hc</item>
+        <item name="cr3_viewer_settings_drawable">@drawable/cr3_viewer_settings_hc</item>
+        <item name="cr3_button_bookmarks_drawable">@drawable/cr3_button_bookmarks_hc</item>
+        <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root_hc</item>
+        <item name="cr3_option_night_drawable">@drawable/cr3_option_night_hc</item>
+        <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch_hc</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page_hc</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent_hc</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder_hc</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts_hc</item>
+        <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent_hc</item>
+        <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>
+        <item name="cr3_browser_folder_opds_add_drawable">@drawable/cr3_browser_folder_opds_add_hc</item>
+        <item name="cr3_button_folder_go_drawable">@drawable/cr3_button_folder_go_hc</item>
+        <item name="cr3_option_font_face_drawable">@drawable/cr3_option_font_face_hc</item>
+        <item name="cr3_option_font_size_drawable">@drawable/cr3_option_font_size_hc</item>
+        <item name="cr3_option_text_bold_drawable">@drawable/cr3_option_text_bold_hc</item>
+        <item name="cr3_option_text_italic_drawable">@drawable/cr3_option_text_italic_hc</item>
+        <item name="cr3_option_text_underline_drawable">@drawable/cr3_option_text_underline_hc</item>
+        <item name="cr3_option_text_superscript_drawable">@drawable/cr3_option_text_superscript_hc</item>
+        <item name="cr3_option_text_antialias_drawable">@drawable/cr3_option_text_antialias_hc</item>
+        <item name="cr3_option_line_spacing_drawable">@drawable/cr3_option_line_spacing_hc</item>
+        <item name="cr3_option_text_hyphenation_drawable">@drawable/cr3_option_text_hyphenation_hc</item>
+        <item name="cr3_option_text_floating_punct_drawable">@drawable/cr3_option_text_floating_punct_hc</item>
+        <item name="cr3_option_text_kerning_drawable">@drawable/cr3_option_text_kerning_hc</item>
+        <item name="cr3_option_text_ligatures_drawable">@drawable/cr3_option_text_ligatures_hc</item>
+        <item name="cr3_option_text_multilang_drawable">@drawable/cr3_option_text_multilang_hc</item>
+        <item name="cr3_option_images_drawable">@drawable/cr3_option_images_hc</item>
+        <item name="cr3_option_font_gamma_drawable">@drawable/cr3_option_font_gamma_hc</item>
+        <item name="cr3_option_text_width_drawable">@drawable/cr3_option_text_width_hc</item>
+        <item name="cr3_option_fullscreen_drawable">@drawable/cr3_option_fullscreen_hc</item>
+        <item name="cr3_option_view_mode_scroll_drawable">@drawable/cr3_option_view_mode_scroll_hc</item>
+        <item name="cr3_option_page_orientation_landscape_drawable">@drawable/cr3_option_page_orientation_landscape_hc</item>
+        <item name="cr3_option_pages_two_drawable">@drawable/cr3_option_pages_two_hc</item>
+        <item name="cr3_option_text_margin_left_drawable">@drawable/cr3_option_text_margin_left_hc</item>
+        <item name="cr3_option_text_margin_right_drawable">@drawable/cr3_option_text_margin_right_hc</item>
+        <item name="cr3_option_text_margin_top_drawable">@drawable/cr3_option_text_margin_top_hc</item>
+        <item name="cr3_option_text_margin_bottom_drawable">@drawable/cr3_option_text_margin_bottom_hc</item>
+        <item name="cr3_option_text_align_drawable">@drawable/cr3_option_text_align_hc</item>
+        <item name="cr3_option_text_indent_drawable">@drawable/cr3_option_text_indent_hc</item>
+        <item name="cr3_option_text_hinting_drawable">@drawable/cr3_option_text_hinting_hc</item>
+        <item name="cr3_option_controls_keys_drawable">@drawable/cr3_option_controls_keys_hc</item>
+        <item name="cr3_option_controls_tapzones_drawable">@drawable/cr3_option_controls_tapzones_hc</item>
+        <item name="cr3_option_other_drawable">@drawable/cr3_option_other_hc</item>
+        <item name="cr3_browser_folder_authors_drawable">@drawable/cr3_browser_folder_authors_hc</item>
+        <item name="cr3_browser_folder_zip_drawable">@drawable/cr3_browser_folder_zip_hc</item>
+        <item name="cr3_browser_find_drawable">@drawable/cr3_browser_find_hc</item>
+        <item name="cr3_browser_back_drawable">@drawable/cr3_browser_back_hc</item>
+        <item name="cr3_button_add_drawable">@drawable/cr3_button_add_hc</item>
+        <item name="cr3_button_ok_drawable">@drawable/cr3_button_ok_hc</item>
+        <item name="cr3_button_cancel_drawable">@drawable/cr3_button_cancel_hc</item>
+        <item name="cr3_button_remove_drawable">@drawable/cr3_button_remove_hc</item>
+        <item name="cr3_button_more_drawable">@drawable/cr3_button_more_hc</item>
+        <item name="cr3_browser_book_drawable">@drawable/cr3_browser_book_hc</item>
+        <item name="cr3_button_info_drawable">@drawable/cr3_button_info_hc</item>
+        <item name="cr3_button_log_drawable">@drawable/cr3_button_log_hc</item>
+        <item name="cr3_button_light_drawable">@drawable/cr3_button_light_hc</item>
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_hc</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_hc</item>
+
+        <item name="ic_media_ff_drawable">@drawable/ic_media_ff_hc</item>
+        <item name="ic_media_play_drawable">@drawable/ic_media_play_hc</item>
+        <item name="ic_media_rew_drawable">@drawable/ic_media_rew_hc</item>
+        <item name="ic_media_stop_drawable">@drawable/ic_media_stop_hc</item>
+        <item name="ic_media_pause_drawable">@drawable/ic_media_pause_hc</item>
+        <item name="ic_menu_copy_drawable">@drawable/ic_menu_copy_hc</item>
+        <item name="ic_menu_sort_alphabetically_drawable">@drawable/ic_menu_sort_alphabetically_hc</item>
+        <item name="ic_menu_star_drawable">@drawable/ic_menu_star_hc</item>
+        <item name="ic_menu_compose_drawable">@drawable/ic_menu_compose_hc</item>
+        <item name="ic_menu_search_drawable">@drawable/ic_menu_search_hc</item>
+        <item name="ic_menu_close_clear_cancel_drawable">@drawable/ic_menu_close_clear_cancel_hc</item>
+
+        <item name="google_drive_drawable">@drawable/google_drive_mono</item>
+
+        <item name="folder_big_drawable">@drawable/folder_big_hc</item>
+        <item name="folder_big_bookmark_drawable">@drawable/folder_big_bookmark_hc</item>
+        <item name="media_flash_microsd_drawable">@drawable/media_flash_microsd</item>
+    </style>
+
+    <style name="Theme.HiContrast2" parent="@android:style/Theme.Material">
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:colorBackground">@android:color/black</item>
+        <!-- item name="android:textColor">@android:color/white</item-->
+        <item name="android:listViewStyle">@style/ListView.Black</item>
+        <item name="android:listViewWhiteStyle">@style/ListView.Black</item>
+        <item name="android:checkboxStyle">@style/CheckBox.HC.Dark</item>
+        <item name="android:switchStyle">@style/Switch.HC.Dark</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.HC.Dark</item>
+        <item name="android:buttonStyle">@style/Button.HC.Dark</item>
+        <item name="android:buttonStyleSmall">@style/Button.HC.Dark.Small</item>
+        <item name="android:imageButtonStyle">@style/ImageButton.HC.Dark</item>
+        <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
+        <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
+        <item name="android:textAppearanceLarge">@style/TextAppearance.MediumLarge</item>
+
+        <!-- toolbar button background -->
+        <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background_hc</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#40404040</item>
+        <item name="textColorToolBarLabel">@color/label_hc_dark</item>
+        <item name="textColorOptionLabel">@color/label_hc_dark</item>
+        <item name="textColorOptionValue">@color/label_hc_dark</item>
+        <item name="tts_toolbar_background">#FFFFFFFF</item>
+        <item name="tabIndicatorBackground">@drawable/tab_indicator_hc_dark</item>
+
+        <!-- icons -->
+        <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev_hc</item>
+        <item name="cr3_button_next_drawable">@drawable/cr3_button_next_hc</item>
+        <item name="cr3_viewer_toc_drawable">@drawable/cr3_viewer_toc_hc</item>
+        <item name="cr3_viewer_find_drawable">@drawable/cr3_viewer_find_hc</item>
+        <item name="cr3_viewer_settings_drawable">@drawable/cr3_viewer_settings_hc</item>
+        <item name="cr3_button_bookmarks_drawable">@drawable/cr3_button_bookmarks_hc</item>
+        <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root_hc</item>
+        <item name="cr3_option_night_drawable">@drawable/cr3_option_night_hc</item>
+        <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch_hc</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page_hc</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent_hc</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder_hc</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts_hc</item>
+        <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent_hc</item>
+        <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>
+        <item name="cr3_browser_folder_opds_add_drawable">@drawable/cr3_browser_folder_opds_add_hc</item>
+        <item name="cr3_button_folder_go_drawable">@drawable/cr3_button_folder_go_hc</item>
+        <item name="cr3_option_font_face_drawable">@drawable/cr3_option_font_face_hc</item>
+        <item name="cr3_option_font_size_drawable">@drawable/cr3_option_font_size_hc</item>
+        <item name="cr3_option_text_bold_drawable">@drawable/cr3_option_text_bold_hc</item>
+        <item name="cr3_option_text_italic_drawable">@drawable/cr3_option_text_italic_hc</item>
+        <item name="cr3_option_text_underline_drawable">@drawable/cr3_option_text_underline_hc</item>
+        <item name="cr3_option_text_superscript_drawable">@drawable/cr3_option_text_superscript_hc</item>
+        <item name="cr3_option_text_antialias_drawable">@drawable/cr3_option_text_antialias_hc</item>
+        <item name="cr3_option_line_spacing_drawable">@drawable/cr3_option_line_spacing_hc</item>
+        <item name="cr3_option_text_hyphenation_drawable">@drawable/cr3_option_text_hyphenation_hc</item>
+        <item name="cr3_option_text_floating_punct_drawable">@drawable/cr3_option_text_floating_punct_hc</item>
+        <item name="cr3_option_text_kerning_drawable">@drawable/cr3_option_text_kerning_hc</item>
+        <item name="cr3_option_text_ligatures_drawable">@drawable/cr3_option_text_ligatures_hc</item>
+        <item name="cr3_option_text_multilang_drawable">@drawable/cr3_option_text_multilang_hc</item>
+        <item name="cr3_option_images_drawable">@drawable/cr3_option_images_hc</item>
+        <item name="cr3_option_font_gamma_drawable">@drawable/cr3_option_font_gamma_hc</item>
+        <item name="cr3_option_text_width_drawable">@drawable/cr3_option_text_width_hc</item>
+        <item name="cr3_option_fullscreen_drawable">@drawable/cr3_option_fullscreen_hc</item>
+        <item name="cr3_option_view_mode_scroll_drawable">@drawable/cr3_option_view_mode_scroll_hc</item>
+        <item name="cr3_option_page_orientation_landscape_drawable">@drawable/cr3_option_page_orientation_landscape_hc</item>
+        <item name="cr3_option_pages_two_drawable">@drawable/cr3_option_pages_two_hc</item>
+        <item name="cr3_option_text_margin_left_drawable">@drawable/cr3_option_text_margin_left_hc</item>
+        <item name="cr3_option_text_margin_right_drawable">@drawable/cr3_option_text_margin_right_hc</item>
+        <item name="cr3_option_text_margin_top_drawable">@drawable/cr3_option_text_margin_top_hc</item>
+        <item name="cr3_option_text_margin_bottom_drawable">@drawable/cr3_option_text_margin_bottom_hc</item>
+        <item name="cr3_option_text_align_drawable">@drawable/cr3_option_text_align_hc</item>
+        <item name="cr3_option_text_indent_drawable">@drawable/cr3_option_text_indent_hc</item>
+        <item name="cr3_option_text_hinting_drawable">@drawable/cr3_option_text_hinting_hc</item>
+        <item name="cr3_option_controls_keys_drawable">@drawable/cr3_option_controls_keys_hc</item>
+        <item name="cr3_option_controls_tapzones_drawable">@drawable/cr3_option_controls_tapzones_hc</item>
+        <item name="cr3_option_other_drawable">@drawable/cr3_option_other_hc</item>
+        <item name="cr3_browser_folder_authors_drawable">@drawable/cr3_browser_folder_authors_hc</item>
+        <item name="cr3_browser_folder_zip_drawable">@drawable/cr3_browser_folder_zip_hc</item>
+        <item name="cr3_browser_find_drawable">@drawable/cr3_browser_find_hc</item>
+        <item name="cr3_browser_back_drawable">@drawable/cr3_browser_back_hc</item>
+        <item name="cr3_button_add_drawable">@drawable/cr3_button_add_hc</item>
+        <item name="cr3_button_ok_drawable">@drawable/cr3_button_ok_hc</item>
+        <item name="cr3_button_cancel_drawable">@drawable/cr3_button_cancel_hc</item>
+        <item name="cr3_button_remove_drawable">@drawable/cr3_button_remove_hc</item>
+        <item name="cr3_button_more_drawable">@drawable/cr3_button_more_hc</item>
+        <item name="cr3_browser_book_drawable">@drawable/cr3_browser_book_hc</item>
+        <item name="cr3_button_info_drawable">@drawable/cr3_button_info_hc</item>
+        <item name="cr3_button_log_drawable">@drawable/cr3_button_log_hc</item>
+        <item name="cr3_button_light_drawable">@drawable/cr3_button_light_hc</item>
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_hc</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_hc</item>
+
+        <item name="ic_media_ff_drawable">@drawable/ic_media_ff_hc</item>
+        <item name="ic_media_play_drawable">@drawable/ic_media_play_hc</item>
+        <item name="ic_media_rew_drawable">@drawable/ic_media_rew_hc</item>
+        <item name="ic_media_stop_drawable">@drawable/ic_media_stop_hc</item>
+        <item name="ic_media_pause_drawable">@drawable/ic_media_pause_hc</item>
+        <item name="ic_menu_copy_drawable">@drawable/ic_menu_copy_hc</item>
+        <item name="ic_menu_sort_alphabetically_drawable">@drawable/ic_menu_sort_alphabetically_hc</item>
+        <item name="ic_menu_star_drawable">@drawable/ic_menu_star_hc</item>
+        <item name="ic_menu_compose_drawable">@drawable/ic_menu_compose_hc</item>
+        <item name="ic_menu_search_drawable">@drawable/ic_menu_search_hc</item>
+        <item name="ic_menu_close_clear_cancel_drawable">@drawable/ic_menu_close_clear_cancel_hc</item>
+
+        <item name="google_drive_drawable">@drawable/google_drive_mono</item>
+
+        <item name="folder_big_drawable">@drawable/folder_big_hc</item>
+        <item name="folder_big_bookmark_drawable">@drawable/folder_big_bookmark_hc</item>
+        <item name="media_flash_microsd_drawable">@drawable/media_flash_microsd</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/android/src/org/coolreader/crengine/OptionsDialog.java b/android/src/org/coolreader/crengine/OptionsDialog.java
index b6f790e29..1f6d7dd65 100644
--- a/android/src/org/coolreader/crengine/OptionsDialog.java
+++ b/android/src/org/coolreader/crengine/OptionsDialog.java
@@ -18,7 +18,7 @@
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
-import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -659,7 +659,6 @@ public View getView(View convertView, ViewGroup parent) {
 			View view;
 			convertView = myView;
 			if ( convertView==null ) {
-				//view = new TextView(getContext());
 				view = mInflater.inflate(R.layout.option_item_boolean, null);
 			} else {
 				view = convertView;
@@ -667,7 +666,7 @@ public View getView(View convertView, ViewGroup parent) {
 			myView = view;
 			TextView labelView = view.findViewById(R.id.option_label);
 			TextView commentView = view.findViewById(R.id.option_comment);
-			CheckBox valueView = view.findViewById(R.id.option_value_cb);
+			CompoundButton valueView = view.findViewById(R.id.option_value_cb);
 			labelView.setText(label);
 			labelView.setEnabled(enabled);
 			String commentLabel = null;
@@ -712,7 +711,6 @@ public View getView(View convertView, ViewGroup parent) {
 			View view;
 			convertView = myView;
 			if ( convertView==null ) {
-				//view = new TextView(getContext());
 				view = mInflater.inflate(R.layout.option_item_boolean, null);
 			} else {
 				view = convertView;
@@ -720,9 +718,7 @@ public View getView(View convertView, ViewGroup parent) {
 			myView = view;
 			TextView labelView = view.findViewById(R.id.option_label);
 			TextView commentView = view.findViewById(R.id.option_comment);
-			CheckBox valueView = view.findViewById(R.id.option_value_cb);
-//			valueView.setFocusable(false);
-//			valueView.setClickable(false);
+			CompoundButton valueView = view.findViewById(R.id.option_value_cb);
 			labelView.setText(label);
 			labelView.setEnabled(enabled);
 			String commentLabel = comment;
@@ -740,13 +736,13 @@ public View getView(View convertView, ViewGroup parent) {
 				commentView.setVisibility(View.GONE);
 			}
 			valueView.setChecked(getValueBoolean());
-			valueView.setOnCheckedChangeListener((arg0, checked) -> {
-//						mProperties.setBool(property, checked);
-//						refreshList();
-			});
+			// For this view, the "focusable" and "clickable" properties are
+			// disabled in the layout, so there is no need to set a change listener.
+			//valueView.setOnCheckedChangeListener((arg0, checked) -> {
+			//			mProperties.setBool(property, checked);
+			//			refreshList();
+			//});
 			setupIconView((ImageView)view.findViewById(R.id.option_icon));
-//			view.setClickable(true);
-//			view.setFocusable(true);
 			valueView.setEnabled(enabled);
 			return view;
 		}
@@ -1467,12 +1463,12 @@ public void onSelect() {
 
 			View panel = mInflater.inflate(R.layout.option_lang_filter, null);
 			layout.addView(panel);
-			CheckBox cb_filter_by_lang = panel.findViewById(R.id.cb_filter_by_lang);
+			CompoundButton filter_by_lang = panel.findViewById(R.id.filter_by_lang);
 			if (null != langDescr && langDescr.length() > 0) {
-				cb_filter_by_lang.setText(mActivity.getString(R.string.filter_by_book_language_s, langDescr));
+				filter_by_lang.setText(mActivity.getString(R.string.filter_by_book_language_s, langDescr));
 			} else {
-				cb_filter_by_lang.setText(mActivity.getString(R.string.filter_by_book_language_s, mActivity.getString(R.string.undetermined)));
-				cb_filter_by_lang.setEnabled(false);
+				filter_by_lang.setText(mActivity.getString(R.string.filter_by_book_language_s, mActivity.getString(R.string.undetermined)));
+				filter_by_lang.setEnabled(false);
 			}
 			final ListView listView = new BaseListView(mActivity, false);
 			listAdapter = new ListOptionAdapter(listView, list);
@@ -1490,7 +1486,7 @@ public void onSelect() {
 				closed();
 			});
 
-			cb_filter_by_lang.setOnCheckedChangeListener((buttonView, isChecked) -> {
+			filter_by_lang.setOnCheckedChangeListener((buttonView, isChecked) -> {
 				if (isChecked) {
 					asyncFilterFontsByLanguage(langTag, (list, canceled) -> {
 						if (!canceled) {
@@ -1506,7 +1502,7 @@ public void onSelect() {
 							});
 						} else {
 							BackgroundThread.instance().executeGUI(() -> {
-								cb_filter_by_lang.setChecked(false);
+								filter_by_lang.setChecked(false);
 							});
 						}
 					});
@@ -1525,7 +1521,7 @@ public void onSelect() {
 
 			dlg.setOnDismissListener(dialog -> closed());
 
-			// TODO: set checked for for cb_filter_by_lang (save in settings)
+			// TODO: set checked for for filter_by_lang (save in settings)
 
 			dlg.setView(layout);
 			dlg.show();

From 388b2f63c45100a4bf31eb25409018fdde9a904b Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sat, 31 Jul 2021 06:51:44 +0400
Subject: [PATCH 31/35] Update Gradle version from 6.7.1 to 7.0.2. Update AGP
 dependency from 4.2.2 to 7.0.0.

---
 android/.idea/compiler.xml                       |  2 +-
 android/.idea/gradle.xml                         |  5 ++---
 android/.idea/runConfigurations.xml              | 12 ------------
 android/app/build.gradle                         |  1 -
 android/build.gradle                             |  6 +++---
 android/eink-onyx-reflections/build.gradle       |  2 --
 android/genrescollection/build.gradle            |  2 --
 android/gradle/wrapper/gradle-wrapper.properties |  2 +-
 8 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 android/.idea/runConfigurations.xml

diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml
index 61a9130cd..fb7f4a8a4 100644
--- a/android/.idea/compiler.xml
+++ b/android/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
index 4b3431da5..3a2e8ac71 100644
--- a/android/.idea/gradle.xml
+++ b/android/.idea/gradle.xml
@@ -4,10 +4,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="false" />
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -17,7 +17,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/android/.idea/runConfigurations.xml b/android/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460d8..000000000
--- a/android/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index aadae5b40..59fd4ab64 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -24,7 +24,6 @@ android {
             aidl.srcDirs = ['../../android/src']
             java.srcDirs = ['../../android/src']
             res.srcDirs = ['../../android/res']
-            jni.srcDirs = ['../../android/jni']
         }
     }
     buildTypes {
diff --git a/android/build.gradle b/android/build.gradle
index 3e4f14d7c..755874a72 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -4,10 +4,10 @@ buildscript {
     
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -16,7 +16,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/android/eink-onyx-reflections/build.gradle b/android/eink-onyx-reflections/build.gradle
index e6cbd59c6..073e6ab87 100644
--- a/android/eink-onyx-reflections/build.gradle
+++ b/android/eink-onyx-reflections/build.gradle
@@ -9,8 +9,6 @@ android {
     defaultConfig {
         minSdkVersion 3
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
 
         consumerProguardFiles "consumer-rules.pro"
     }
diff --git a/android/genrescollection/build.gradle b/android/genrescollection/build.gradle
index 5263642bf..bfd1daf31 100644
--- a/android/genrescollection/build.gradle
+++ b/android/genrescollection/build.gradle
@@ -9,8 +9,6 @@ android {
     defaultConfig {
         minSdkVersion 3
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
 
         consumerProguardFiles "consumer-rules.pro"
     }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index e44f58841..ee628ac40 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip

From 19a9bbf15138c5d42e3ab03ac2ffe3817ffa9ff4 Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sat, 31 Jul 2021 09:17:06 +0400
Subject: [PATCH 32/35] Adjust colors for main controls on API21+.

---
 android/res/color-v21/common_tint_black.xml   |   5 +
 android/res/color-v21/common_tint_dark.xml    |   5 +
 android/res/color-v21/common_tint_hc_dark.xml |   5 +
 .../res/color-v21/common_tint_hc_light.xml    |   5 +
 android/res/color-v21/common_tint_light.xml   |   5 +
 android/res/color-v21/common_tint_white.xml   |   5 +
 .../color-v21/compoundbutton_tint_black.xml   |   6 +
 .../color-v21/compoundbutton_tint_dark.xml    |   6 +
 .../compoundbutton_tint_hc_dark.xml}          |   0
 .../compoundbutton_tint_hc_light.xml}         |   0
 .../color-v21/compoundbutton_tint_light.xml   |   6 +
 .../color-v21/compoundbutton_tint_white.xml   |   6 +
 .../switch_thumb_tint_black.xml               |   0
 .../switch_thumb_tint_dark.xml                |   0
 .../color-v24/switch_thumb_tint_hc_dark.xml   |   6 +
 .../color-v24/switch_thumb_tint_hc_light.xml  |   6 +
 .../switch_thumb_tint_light.xml               |   0
 .../switch_thumb_tint_white.xml               |   0
 .../switch_track_tint_dark.xml                |   0
 .../switch_track_tint_hc_dark.xml             |   0
 .../switch_track_tint_hc_light.xml            |   0
 .../switch_track_tint_light.xml               |   0
 .../drawable-v21/tab_indicator_material.xml   |   2 +-
 android/res/values-v21/styles.xml             | 105 ++++++++++++++++--
 android/res/values-v24/styles.xml             |  32 ++++--
 android/res/values/attrs.xml                  |   1 +
 26 files changed, 187 insertions(+), 19 deletions(-)
 create mode 100644 android/res/color-v21/common_tint_black.xml
 create mode 100644 android/res/color-v21/common_tint_dark.xml
 create mode 100644 android/res/color-v21/common_tint_hc_dark.xml
 create mode 100644 android/res/color-v21/common_tint_hc_light.xml
 create mode 100644 android/res/color-v21/common_tint_light.xml
 create mode 100644 android/res/color-v21/common_tint_white.xml
 create mode 100644 android/res/color-v21/compoundbutton_tint_black.xml
 create mode 100644 android/res/color-v21/compoundbutton_tint_dark.xml
 rename android/res/{color/switch_thumb_tint_hc_dark.xml => color-v21/compoundbutton_tint_hc_dark.xml} (100%)
 rename android/res/{color/switch_thumb_tint_hc_light.xml => color-v21/compoundbutton_tint_hc_light.xml} (100%)
 create mode 100644 android/res/color-v21/compoundbutton_tint_light.xml
 create mode 100644 android/res/color-v21/compoundbutton_tint_white.xml
 rename android/res/{color => color-v24}/switch_thumb_tint_black.xml (100%)
 rename android/res/{color => color-v24}/switch_thumb_tint_dark.xml (100%)
 create mode 100644 android/res/color-v24/switch_thumb_tint_hc_dark.xml
 create mode 100644 android/res/color-v24/switch_thumb_tint_hc_light.xml
 rename android/res/{color => color-v24}/switch_thumb_tint_light.xml (100%)
 rename android/res/{color => color-v24}/switch_thumb_tint_white.xml (100%)
 rename android/res/{color => color-v24}/switch_track_tint_dark.xml (100%)
 rename android/res/{color => color-v24}/switch_track_tint_hc_dark.xml (100%)
 rename android/res/{color => color-v24}/switch_track_tint_hc_light.xml (100%)
 rename android/res/{color => color-v24}/switch_track_tint_light.xml (100%)

diff --git a/android/res/color-v21/common_tint_black.xml b/android/res/color-v21/common_tint_black.xml
new file mode 100644
index 000000000..0175c925f
--- /dev/null
+++ b/android/res/color-v21/common_tint_black.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:color="#d0d0d0"/>
+</selector>
diff --git a/android/res/color-v21/common_tint_dark.xml b/android/res/color-v21/common_tint_dark.xml
new file mode 100644
index 000000000..0175c925f
--- /dev/null
+++ b/android/res/color-v21/common_tint_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:color="#d0d0d0"/>
+</selector>
diff --git a/android/res/color-v21/common_tint_hc_dark.xml b/android/res/color-v21/common_tint_hc_dark.xml
new file mode 100644
index 000000000..d1a41512c
--- /dev/null
+++ b/android/res/color-v21/common_tint_hc_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:color="@android:color/white"/>
+</selector>
diff --git a/android/res/color-v21/common_tint_hc_light.xml b/android/res/color-v21/common_tint_hc_light.xml
new file mode 100644
index 000000000..5dbccef04
--- /dev/null
+++ b/android/res/color-v21/common_tint_hc_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:color="@android:color/black"/>
+</selector>
diff --git a/android/res/color-v21/common_tint_light.xml b/android/res/color-v21/common_tint_light.xml
new file mode 100644
index 000000000..5ad99d9ca
--- /dev/null
+++ b/android/res/color-v21/common_tint_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#b9b9b9"/>
+    <item android:color="#6b472f"/>
+</selector>
diff --git a/android/res/color-v21/common_tint_white.xml b/android/res/color-v21/common_tint_white.xml
new file mode 100644
index 000000000..be0c0a3ff
--- /dev/null
+++ b/android/res/color-v21/common_tint_white.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#888888"/>
+    <item android:color="#323232"/>
+</selector>
diff --git a/android/res/color-v21/compoundbutton_tint_black.xml b/android/res/color-v21/compoundbutton_tint_black.xml
new file mode 100644
index 000000000..53a271bbe
--- /dev/null
+++ b/android/res/color-v21/compoundbutton_tint_black.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:state_checked="true"  android:color="#d0d0d0"/>
+    <item android:color="#d0d0d0"/>
+</selector>
diff --git a/android/res/color-v21/compoundbutton_tint_dark.xml b/android/res/color-v21/compoundbutton_tint_dark.xml
new file mode 100644
index 000000000..53a271bbe
--- /dev/null
+++ b/android/res/color-v21/compoundbutton_tint_dark.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:state_checked="true"  android:color="#d0d0d0"/>
+    <item android:color="#d0d0d0"/>
+</selector>
diff --git a/android/res/color/switch_thumb_tint_hc_dark.xml b/android/res/color-v21/compoundbutton_tint_hc_dark.xml
similarity index 100%
rename from android/res/color/switch_thumb_tint_hc_dark.xml
rename to android/res/color-v21/compoundbutton_tint_hc_dark.xml
diff --git a/android/res/color/switch_thumb_tint_hc_light.xml b/android/res/color-v21/compoundbutton_tint_hc_light.xml
similarity index 100%
rename from android/res/color/switch_thumb_tint_hc_light.xml
rename to android/res/color-v21/compoundbutton_tint_hc_light.xml
diff --git a/android/res/color-v21/compoundbutton_tint_light.xml b/android/res/color-v21/compoundbutton_tint_light.xml
new file mode 100644
index 000000000..33e530fbd
--- /dev/null
+++ b/android/res/color-v21/compoundbutton_tint_light.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#b9b9b9"/>
+    <item android:state_checked="true"  android:color="#6b472f"/>
+    <item android:color="#88000000"/>
+</selector>
diff --git a/android/res/color-v21/compoundbutton_tint_white.xml b/android/res/color-v21/compoundbutton_tint_white.xml
new file mode 100644
index 000000000..4dbc26c20
--- /dev/null
+++ b/android/res/color-v21/compoundbutton_tint_white.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#888888"/>
+    <item android:state_checked="true"  android:color="#323232"/>
+    <item android:color="#323232"/>
+</selector>
diff --git a/android/res/color/switch_thumb_tint_black.xml b/android/res/color-v24/switch_thumb_tint_black.xml
similarity index 100%
rename from android/res/color/switch_thumb_tint_black.xml
rename to android/res/color-v24/switch_thumb_tint_black.xml
diff --git a/android/res/color/switch_thumb_tint_dark.xml b/android/res/color-v24/switch_thumb_tint_dark.xml
similarity index 100%
rename from android/res/color/switch_thumb_tint_dark.xml
rename to android/res/color-v24/switch_thumb_tint_dark.xml
diff --git a/android/res/color-v24/switch_thumb_tint_hc_dark.xml b/android/res/color-v24/switch_thumb_tint_hc_dark.xml
new file mode 100644
index 000000000..a51ebdb49
--- /dev/null
+++ b/android/res/color-v24/switch_thumb_tint_hc_dark.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:state_checked="true"  android:color="@android:color/white"/>
+    <item android:color="@android:color/white"/>
+</selector>
diff --git a/android/res/color-v24/switch_thumb_tint_hc_light.xml b/android/res/color-v24/switch_thumb_tint_hc_light.xml
new file mode 100644
index 000000000..e37642a32
--- /dev/null
+++ b/android/res/color-v24/switch_thumb_tint_hc_light.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#808080"/>
+    <item android:state_checked="true"  android:color="@android:color/black"/>
+    <item android:color="@android:color/black"/>
+</selector>
diff --git a/android/res/color/switch_thumb_tint_light.xml b/android/res/color-v24/switch_thumb_tint_light.xml
similarity index 100%
rename from android/res/color/switch_thumb_tint_light.xml
rename to android/res/color-v24/switch_thumb_tint_light.xml
diff --git a/android/res/color/switch_thumb_tint_white.xml b/android/res/color-v24/switch_thumb_tint_white.xml
similarity index 100%
rename from android/res/color/switch_thumb_tint_white.xml
rename to android/res/color-v24/switch_thumb_tint_white.xml
diff --git a/android/res/color/switch_track_tint_dark.xml b/android/res/color-v24/switch_track_tint_dark.xml
similarity index 100%
rename from android/res/color/switch_track_tint_dark.xml
rename to android/res/color-v24/switch_track_tint_dark.xml
diff --git a/android/res/color/switch_track_tint_hc_dark.xml b/android/res/color-v24/switch_track_tint_hc_dark.xml
similarity index 100%
rename from android/res/color/switch_track_tint_hc_dark.xml
rename to android/res/color-v24/switch_track_tint_hc_dark.xml
diff --git a/android/res/color/switch_track_tint_hc_light.xml b/android/res/color-v24/switch_track_tint_hc_light.xml
similarity index 100%
rename from android/res/color/switch_track_tint_hc_light.xml
rename to android/res/color-v24/switch_track_tint_hc_light.xml
diff --git a/android/res/color/switch_track_tint_light.xml b/android/res/color-v24/switch_track_tint_light.xml
similarity index 100%
rename from android/res/color/switch_track_tint_light.xml
rename to android/res/color-v24/switch_track_tint_light.xml
diff --git a/android/res/drawable-v21/tab_indicator_material.xml b/android/res/drawable-v21/tab_indicator_material.xml
index b9ca7800e..268a4a5c1 100644
--- a/android/res/drawable-v21/tab_indicator_material.xml
+++ b/android/res/drawable-v21/tab_indicator_material.xml
@@ -17,7 +17,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true">
         <nine-patch android:src="@drawable/tab_indicator_mtrl_alpha"
-            android:tint="?android:attr/colorControlActivated" />
+            android:tint="?attr/colorControlActivated" />
     </item>
     <item android:drawable="@android:color/transparent" />
 </selector>
diff --git a/android/res/values-v21/styles.xml b/android/res/values-v21/styles.xml
index 1c4f6f747..7b2062499 100644
--- a/android/res/values-v21/styles.xml
+++ b/android/res/values-v21/styles.xml
@@ -7,6 +7,7 @@
 
     <style name="TextAppearance.Widget.EditText" parent="@android:style/TextAppearance.Widget.EditText">
         <item name="android:textColor">?android:attr/editTextColor</item>
+        <item name="android:backgroundTint">?attr/colorControlActivated</item>
     </style>
 
     <style name="ListView">
@@ -18,7 +19,7 @@
         <item name="android:listSelector">@null</item>
         <item name="android:divider">@drawable/divider_dark_tiled</item>
     </style>
-        
+
     <style name="ListView.Light" parent="@style/Theme.Light">
         <!--item name="android:background">@drawable/background_tiled_light</item-->
         <item name="android:scrollbars">vertical</item>
@@ -26,7 +27,7 @@
         <item name="android:listSelector">@null</item>
         <item name="android:divider">@drawable/divider_light_tiled</item>
     </style>
-        
+
     <style name="ListView.Black" parent="@style/Theme.Black">
         <item name="android:scrollbars">vertical</item>
         <item name="android:fadingEdge">vertical</item>
@@ -42,20 +43,52 @@
         <item name="android:divider">@drawable/divider_white_tiled</item>
     </style>
 
+    <style name="CheckBox.Light" parent="@android:style/Widget.Material.Light.CompoundButton.CheckBox">
+        <item name="android:buttonTint">@color/compoundbutton_tint_light</item>
+    </style>
+
+    <style name="CheckBox.Dark" parent="@android:style/Widget.Material.CompoundButton.CheckBox">
+        <item name="android:buttonTint">@color/compoundbutton_tint_dark</item>
+    </style>
+
+    <style name="CheckBox.White" parent="@android:style/Widget.Material.Light.CompoundButton.CheckBox">
+        <item name="android:buttonTint">@color/compoundbutton_tint_white</item>
+    </style>
+
+    <style name="CheckBox.Black" parent="@android:style/Widget.Material.CompoundButton.CheckBox">
+        <item name="android:buttonTint">@color/compoundbutton_tint_black</item>
+    </style>
+
     <style name="CheckBox.HC.Light" parent="@android:style/Widget.Material.Light.CompoundButton.CheckBox">
-        <item name="android:button">@drawable/btn_check_hc_light</item>
+        <item name="android:buttonTint">@color/compoundbutton_tint_hc_light</item>
     </style>
 
     <style name="CheckBox.HC.Dark" parent="@android:style/Widget.Material.CompoundButton.CheckBox">
-        <item name="android:button">@drawable/btn_check_hc_dark</item>
+        <item name="android:buttonTint">@color/compoundbutton_tint_hc_dark</item>
+    </style>
+
+    <style name="RadioButton.Light" parent="@android:style/Widget.Material.Light.CompoundButton.RadioButton">
+        <item name="android:buttonTint">@color/compoundbutton_tint_light</item>
+    </style>
+
+    <style name="RadioButton.Dark" parent="@android:style/Widget.Material.CompoundButton.RadioButton">
+        <item name="android:buttonTint">@color/compoundbutton_tint_dark</item>
+    </style>
+
+    <style name="RadioButton.White" parent="@android:style/Widget.Material.Light.CompoundButton.RadioButton">
+        <item name="android:buttonTint">@color/compoundbutton_tint_white</item>
+    </style>
+
+    <style name="RadioButton.Black" parent="@android:style/Widget.Material.CompoundButton.RadioButton">
+        <item name="android:buttonTint">@color/compoundbutton_tint_black</item>
     </style>
 
     <style name="RadioButton.HC.Light" parent="@android:style/Widget.Material.Light.CompoundButton.RadioButton">
-        <item name="android:button">@drawable/btn_radio_hc_light</item>
+        <item name="android:buttonTint">@color/compoundbutton_tint_hc_light</item>
     </style>
 
     <style name="RadioButton.HC.Dark" parent="@android:style/Widget.Material.CompoundButton.RadioButton">
-        <item name="android:button">@drawable/btn_radio_hc_dark</item>
+        <item name="android:buttonTint">@color/compoundbutton_tint_hc_dark</item>
     </style>
 
     <style name="Button.HC.Light" parent="@android:style/Widget.Material.Light.Button">
@@ -88,15 +121,55 @@
         <item name="android:textColor">@color/btn_default_hc_dark_text</item>
     </style>
 
+    <style name="SeekBar.Light" parent="@android:style/Widget.Material.Light.SeekBar">
+        <item name="android:progressBackgroundTint">#80000000</item>
+        <item name="android:progressTint">@color/common_tint_light</item>
+        <item name="android:thumbTint">@color/common_tint_light</item>
+    </style>
+
+    <style name="SeekBar.Dark" parent="@android:style/Widget.Material.SeekBar">
+        <item name="android:progressBackgroundTint">#80ffffff</item>
+        <item name="android:progressTint">@color/common_tint_dark</item>
+        <item name="android:thumbTint">@color/common_tint_dark</item>
+    </style>
+
+    <style name="SeekBar.White" parent="@android:style/Widget.Material.Light.SeekBar">
+        <item name="android:progressBackgroundTint">#80000000</item>
+        <item name="android:progressTint">@color/common_tint_white</item>
+        <item name="android:thumbTint">@color/common_tint_white</item>
+    </style>
+
+    <style name="SeekBar.Black" parent="@android:style/Widget.Material.SeekBar">
+        <item name="android:progressBackgroundTint">#80ffffff</item>
+        <item name="android:progressTint">@color/common_tint_black</item>
+        <item name="android:thumbTint">@color/common_tint_black</item>
+    </style>
+
+    <style name="SeekBar.HC.Light" parent="@android:style/Widget.Material.Light.SeekBar">
+        <item name="android:progressBackgroundTint">#80000000</item>
+        <item name="android:progressTint">@color/common_tint_hc_light</item>
+        <item name="android:thumbTint">@color/common_tint_hc_light</item>
+    </style>
+
+    <style name="SeekBar.HC.Dark" parent="@android:style/Widget.Material.SeekBar">
+        <item name="android:progressBackgroundTint">#80ffffff</item>
+        <item name="android:progressTint">@color/common_tint_hc_dark</item>
+        <item name="android:thumbTint">@color/common_tint_hc_dark</item>
+    </style>
+
     <style name="Theme.Light" parent="@style/Theme.White">
         <item name="android:windowBackground">@drawable/background_tiled_light</item>
         <item name="android:colorBackground">#ffe0e0e0</item>
         <!-- item name="android:textColor">@android:color/black</item-->
         <item name="android:listViewStyle">@style/ListView.Light</item>
         <item name="android:listViewWhiteStyle">@style/ListView.Light</item>
+        <item name="android:checkboxStyle">@style/CheckBox.Light</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.Light</item>
+        <item name="android:seekBarStyle">@style/SeekBar.Light</item>
         <item name="textColorToolBarLabel">?android:attr/textColorPrimary</item>
         <item name="textColorOptionLabel">@color/label_light</item>
         <item name="textColorOptionValue">@color/value_light</item>
+        <item name="colorControlActivated">@color/common_tint_light</item>
     </style>
     <style name="Theme.Dark" parent="@style/Theme.Black">
         <item name="android:windowBackground">@drawable/background_tiled_dark</item>
@@ -104,8 +177,12 @@
         <!-- item name="android:textColor">@android:color/white</item-->
         <item name="android:listViewStyle">@style/ListView.Dark</item>
         <item name="android:listViewWhiteStyle">@style/ListView.Dark</item>
+        <item name="android:checkboxStyle">@style/CheckBox.Dark</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.Dark</item>
+        <item name="android:seekBarStyle">@style/SeekBar.Dark</item>
         <item name="textColorOptionLabel">@color/label_dark</item>
         <item name="textColorOptionValue">@color/value_dark</item>
+        <item name="colorControlActivated">@color/common_tint_dark</item>
     </style>
     <style name="Theme.White" parent="@android:style/Theme.Material.Light">
         <item name="android:windowBackground">@android:color/white</item>
@@ -113,8 +190,9 @@
         <!-- item name="android:textColor">@android:color/black</item-->
         <item name="android:listViewStyle">@style/ListView.White</item>
         <item name="android:listViewWhiteStyle">@style/ListView.White</item>
-        <item name="android:checkboxStyle">@android:style/Widget.Material.Light.CompoundButton.CheckBox</item>
-        <item name="android:radioButtonStyle">@android:style/Widget.Material.Light.CompoundButton.RadioButton</item>
+        <item name="android:checkboxStyle">@style/CheckBox.White</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.White</item>
+        <item name="android:seekBarStyle">@style/SeekBar.White</item>
         <item name="android:buttonStyle">@android:style/Widget.Material.Light.Button</item>
         <item name="android:buttonStyleSmall">@android:style/Widget.Material.Light.Button.Small</item>
         <item name="android:imageButtonStyle">@android:style/Widget.Material.Light.ImageButton</item>
@@ -131,6 +209,7 @@
         <item name="textColorOptionValue">?android:attr/textColorSecondary</item>
         <item name="tts_toolbar_background">#D0808080</item>
         <item name="tabIndicatorBackground">@drawable/tab_indicator_material</item>
+        <item name="colorControlActivated">@color/common_tint_white</item>
 
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev</item>
@@ -226,14 +305,16 @@
         <!-- item name="android:textColor">@android:color/white</item-->
         <item name="android:listViewStyle">@style/ListView.Black</item>
         <item name="android:listViewWhiteStyle">@style/ListView.Black</item>
-        <item name="android:checkboxStyle">@android:style/Widget.Material.CompoundButton.CheckBox</item>
-        <item name="android:radioButtonStyle">@android:style/Widget.Material.CompoundButton.RadioButton</item>
+        <item name="android:checkboxStyle">@style/CheckBox.Black</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.Black</item>
+        <item name="android:seekBarStyle">@style/SeekBar.Black</item>
         <item name="android:buttonStyle">@android:style/Widget.Material.Button</item>
         <item name="android:buttonStyleSmall">@android:style/Widget.Material.Button.Small</item>
         <item name="android:imageButtonStyle">@android:style/Widget.Material.ImageButton</item>
         <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
         <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
         <item name="android:textAppearanceLarge">@style/TextAppearance.MediumLarge</item>
+        <item name="colorControlActivated">@color/common_tint_black</item>
 
         <!-- toolbar button background -->
         <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background</item>
@@ -367,6 +448,7 @@
         <item name="android:listViewWhiteStyle">@style/ListView.White</item>
         <item name="android:checkboxStyle">@style/CheckBox.HC.Light</item>
         <item name="android:radioButtonStyle">@style/RadioButton.HC.Light</item>
+        <item name="android:seekBarStyle">@style/SeekBar.HC.Light</item>
         <item name="android:buttonStyle">@style/Button.HC.Light</item>
         <item name="android:buttonStyleSmall">@style/Button.HC.Light.Small</item>
         <item name="android:imageButtonStyle">@style/ImageButton.HC.Light</item>
@@ -383,6 +465,7 @@
         <item name="textColorOptionValue">@color/label_hc_light</item>
         <item name="tts_toolbar_background">#FFFFFFFF</item>
         <item name="tabIndicatorBackground">@drawable/tab_indicator_hc_light</item>
+        <item name="colorControlActivated">@color/common_tint_hc_light</item>
 
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev_hc</item>
@@ -480,6 +563,7 @@
         <item name="android:listViewWhiteStyle">@style/ListView.Black</item>
         <item name="android:checkboxStyle">@style/CheckBox.HC.Dark</item>
         <item name="android:radioButtonStyle">@style/RadioButton.HC.Dark</item>
+        <item name="android:seekBarStyle">@style/SeekBar.HC.Dark</item>
         <item name="android:buttonStyle">@style/Button.HC.Dark</item>
         <item name="android:buttonStyleSmall">@style/Button.HC.Dark.Small</item>
         <item name="android:imageButtonStyle">@style/ImageButton.HC.Dark</item>
@@ -496,6 +580,7 @@
         <item name="textColorOptionValue">@color/label_hc_dark</item>
         <item name="tts_toolbar_background">#FFFFFFFF</item>
         <item name="tabIndicatorBackground">@drawable/tab_indicator_hc_dark</item>
+        <item name="colorControlActivated">@color/common_tint_hc_dark</item>
 
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev_hc</item>
diff --git a/android/res/values-v24/styles.xml b/android/res/values-v24/styles.xml
index 033b7ce7d..be793d462 100644
--- a/android/res/values-v24/styles.xml
+++ b/android/res/values-v24/styles.xml
@@ -34,22 +34,30 @@
     <style name="Theme.Light" parent="@style/Theme.White">
         <item name="android:windowBackground">@drawable/background_tiled_light</item>
         <item name="android:colorBackground">#ffe0e0e0</item>
-        <item name="android:switchStyle">@style/Switch.Light</item>
         <item name="android:listViewStyle">@style/ListView.Light</item>
         <item name="android:listViewWhiteStyle">@style/ListView.Light</item>
+        <item name="android:checkboxStyle">@style/CheckBox.Light</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.Light</item>
+        <item name="android:switchStyle">@style/Switch.Light</item>
+        <item name="android:seekBarStyle">@style/SeekBar.Light</item>
         <item name="textColorToolBarLabel">?android:attr/textColorPrimary</item>
         <item name="textColorOptionLabel">@color/label_light</item>
         <item name="textColorOptionValue">@color/value_light</item>
+        <item name="colorControlActivated">@color/common_tint_light</item>
     </style>
 
     <style name="Theme.Dark" parent="@style/Theme.Black">
         <item name="android:windowBackground">@drawable/background_tiled_dark</item>
         <item name="android:colorBackground">#ff302030</item>
-        <item name="android:switchStyle">@style/Switch.Dark</item>
         <item name="android:listViewStyle">@style/ListView.Dark</item>
         <item name="android:listViewWhiteStyle">@style/ListView.Dark</item>
+        <item name="android:checkboxStyle">@style/CheckBox.Dark</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.Dark</item>
+        <item name="android:switchStyle">@style/Switch.Dark</item>
+        <item name="android:seekBarStyle">@style/SeekBar.Dark</item>
         <item name="textColorOptionLabel">@color/label_dark</item>
         <item name="textColorOptionValue">@color/value_dark</item>
+        <item name="colorControlActivated">@color/common_tint_dark</item>
     </style>
 
     <style name="Theme.White" parent="@android:style/Theme.Material.Light">
@@ -58,9 +66,10 @@
         <!-- item name="android:textColor">@android:color/black</item-->
         <item name="android:listViewStyle">@style/ListView.White</item>
         <item name="android:listViewWhiteStyle">@style/ListView.White</item>
-        <item name="android:checkboxStyle">@android:style/Widget.Material.Light.CompoundButton.CheckBox</item>
+        <item name="android:checkboxStyle">@style/CheckBox.White</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.White</item>
         <item name="android:switchStyle">@style/Switch.White</item>
-        <item name="android:radioButtonStyle">@android:style/Widget.Material.Light.CompoundButton.RadioButton</item>
+        <item name="android:seekBarStyle">@style/SeekBar.White</item>
         <item name="android:buttonStyle">@android:style/Widget.Material.Light.Button</item>
         <item name="android:buttonStyleSmall">@android:style/Widget.Material.Light.Button.Small</item>
         <item name="android:imageButtonStyle">@android:style/Widget.Material.Light.ImageButton</item>
@@ -77,6 +86,7 @@
         <item name="textColorOptionValue">?android:attr/textColorSecondary</item>
         <item name="tts_toolbar_background">#D0808080</item>
         <item name="tabIndicatorBackground">@drawable/tab_indicator_material</item>
+        <item name="colorControlActivated">@color/common_tint_white</item>
 
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev</item>
@@ -173,15 +183,17 @@
         <!-- item name="android:textColor">@android:color/white</item-->
         <item name="android:listViewStyle">@style/ListView.Black</item>
         <item name="android:listViewWhiteStyle">@style/ListView.Black</item>
-        <item name="android:checkboxStyle">@android:style/Widget.Material.CompoundButton.CheckBox</item>
+        <item name="android:checkboxStyle">@style/CheckBox.Black</item>
+        <item name="android:radioButtonStyle">@style/RadioButton.Black</item>
         <item name="android:switchStyle">@style/Switch.Black</item>
-        <item name="android:radioButtonStyle">@android:style/Widget.Material.CompoundButton.RadioButton</item>
+        <item name="android:seekBarStyle">@style/SeekBar.Black</item>
         <item name="android:buttonStyle">@android:style/Widget.Material.Button</item>
         <item name="android:buttonStyleSmall">@android:style/Widget.Material.Button.Small</item>
         <item name="android:imageButtonStyle">@android:style/Widget.Material.ImageButton</item>
         <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
         <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
         <item name="android:textAppearanceLarge">@style/TextAppearance.MediumLarge</item>
+        <item name="colorControlActivated">@color/common_tint_black</item>
 
         <!-- toolbar button background -->
         <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background</item>
@@ -289,8 +301,9 @@
         <item name="android:listViewStyle">@style/ListView.White</item>
         <item name="android:listViewWhiteStyle">@style/ListView.White</item>
         <item name="android:checkboxStyle">@style/CheckBox.HC.Light</item>
-        <item name="android:switchStyle">@style/Switch.HC.Light</item>
         <item name="android:radioButtonStyle">@style/RadioButton.HC.Light</item>
+        <item name="android:switchStyle">@style/Switch.HC.Light</item>
+        <item name="android:seekBarStyle">@style/SeekBar.HC.Light</item>
         <item name="android:buttonStyle">@style/Button.HC.Light</item>
         <item name="android:buttonStyleSmall">@style/Button.HC.Light.Small</item>
         <item name="android:imageButtonStyle">@style/ImageButton.HC.Light</item>
@@ -307,6 +320,7 @@
         <item name="textColorOptionValue">@color/label_hc_light</item>
         <item name="tts_toolbar_background">#FFFFFFFF</item>
         <item name="tabIndicatorBackground">@drawable/tab_indicator_hc_light</item>
+        <item name="colorControlActivated">@color/common_tint_hc_light</item>
 
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev_hc</item>
@@ -404,8 +418,9 @@
         <item name="android:listViewStyle">@style/ListView.Black</item>
         <item name="android:listViewWhiteStyle">@style/ListView.Black</item>
         <item name="android:checkboxStyle">@style/CheckBox.HC.Dark</item>
-        <item name="android:switchStyle">@style/Switch.HC.Dark</item>
         <item name="android:radioButtonStyle">@style/RadioButton.HC.Dark</item>
+        <item name="android:switchStyle">@style/Switch.HC.Dark</item>
+        <item name="android:seekBarStyle">@style/SeekBar.HC.Dark</item>
         <item name="android:buttonStyle">@style/Button.HC.Dark</item>
         <item name="android:buttonStyleSmall">@style/Button.HC.Dark.Small</item>
         <item name="android:imageButtonStyle">@style/ImageButton.HC.Dark</item>
@@ -422,6 +437,7 @@
         <item name="textColorOptionValue">@color/label_hc_dark</item>
         <item name="tts_toolbar_background">#FFFFFFFF</item>
         <item name="tabIndicatorBackground">@drawable/tab_indicator_hc_dark</item>
+        <item name="colorControlActivated">@color/common_tint_hc_dark</item>
 
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev_hc</item>
diff --git a/android/res/values/attrs.xml b/android/res/values/attrs.xml
index 51815ac78..52384388e 100644
--- a/android/res/values/attrs.xml
+++ b/android/res/values/attrs.xml
@@ -17,6 +17,7 @@
     <attr name="tabbarBackground" format="reference|color" />
     <attr name="tabIndicatorBackground" format="reference|color" />
     <attr name="tts_toolbar_background" format="reference|color" />
+    <attr name="colorControlActivated" format="reference|color" />
     <attr name="cr3_toolbar_button_background_drawable" format="reference" />
     <attr name="cr3_button_prev_drawable" format="reference" />
     <attr name="cr3_button_next_drawable" format="reference" />

From 59507435b0ad56c20a7146ff884f74d9510a3a0a Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Sun, 8 Aug 2021 16:29:53 +0400
Subject: [PATCH 33/35] Android: added '+', '-' button icons for different
 themes on API 21+. This is necessary so that in each theme their style
 matches the color palette of the controls.

---
 .../res/drawable-hdpi/cr3_button_dec_dark.png | Bin 0 -> 997 bytes
 .../drawable-hdpi/cr3_button_dec_light.png    | Bin 0 -> 912 bytes
 .../drawable-hdpi/cr3_button_dec_white.png    | Bin 0 -> 829 bytes
 .../res/drawable-hdpi/cr3_button_inc_dark.png | Bin 0 -> 2551 bytes
 .../drawable-hdpi/cr3_button_inc_light.png    | Bin 0 -> 2765 bytes
 .../drawable-hdpi/cr3_button_inc_white.png    | Bin 0 -> 2526 bytes
 .../res/drawable-ldpi/cr3_button_dec_dark.png | Bin 0 -> 392 bytes
 .../drawable-ldpi/cr3_button_dec_light.png    | Bin 0 -> 421 bytes
 .../drawable-ldpi/cr3_button_dec_white.png    | Bin 0 -> 367 bytes
 .../res/drawable-ldpi/cr3_button_inc_dark.png | Bin 0 -> 890 bytes
 .../drawable-ldpi/cr3_button_inc_light.png    | Bin 0 -> 991 bytes
 .../drawable-ldpi/cr3_button_inc_white.png    | Bin 0 -> 856 bytes
 .../res/drawable-mdpi/cr3_button_dec_dark.png | Bin 0 -> 536 bytes
 .../drawable-mdpi/cr3_button_dec_light.png    | Bin 0 -> 564 bytes
 .../drawable-mdpi/cr3_button_dec_white.png    | Bin 0 -> 543 bytes
 .../res/drawable-mdpi/cr3_button_inc_dark.png | Bin 0 -> 1370 bytes
 .../drawable-mdpi/cr3_button_inc_light.png    | Bin 0 -> 1491 bytes
 .../drawable-mdpi/cr3_button_inc_white.png    | Bin 0 -> 1394 bytes
 .../drawable-xhdpi/cr3_button_dec_dark.png    | Bin 0 -> 1270 bytes
 .../drawable-xhdpi/cr3_button_dec_light.png   | Bin 0 -> 1477 bytes
 .../drawable-xhdpi/cr3_button_dec_white.png   | Bin 0 -> 1320 bytes
 .../drawable-xhdpi/cr3_button_inc_dark.png    | Bin 0 -> 3597 bytes
 .../drawable-xhdpi/cr3_button_inc_light.png   | Bin 0 -> 4036 bytes
 .../drawable-xhdpi/cr3_button_inc_white.png   | Bin 0 -> 3471 bytes
 .../drawable-xxhdpi/cr3_button_dec_dark.png   | Bin 0 -> 2167 bytes
 .../drawable-xxhdpi/cr3_button_dec_light.png  | Bin 0 -> 2477 bytes
 .../drawable-xxhdpi/cr3_button_dec_white.png  | Bin 0 -> 2060 bytes
 .../drawable-xxhdpi/cr3_button_inc_dark.png   | Bin 0 -> 5996 bytes
 .../drawable-xxhdpi/cr3_button_inc_light.png  | Bin 0 -> 7776 bytes
 .../drawable-xxhdpi/cr3_button_inc_white.png  | Bin 0 -> 6170 bytes
 android/res/values-v21/styles.xml             |  14 ++-
 android/res/values-v24/styles.xml             |  14 ++-
 icons_src/classic/convert_all.pl              |   8 +-
 .../classic/cr3_button_dec_dark-48x48-src.svg | 116 ++++++++++++++++++
 .../cr3_button_dec_light-48x48-src.svg        | 116 ++++++++++++++++++
 .../cr3_button_dec_white-48x48-src.svg        | 116 ++++++++++++++++++
 .../classic/cr3_button_inc_dark-48x48-src.svg | 116 ++++++++++++++++++
 .../cr3_button_inc_light-48x48-src.svg        | 116 ++++++++++++++++++
 .../cr3_button_inc_white-48x48-src.svg        | 116 ++++++++++++++++++
 39 files changed, 723 insertions(+), 9 deletions(-)
 create mode 100644 android/res/drawable-hdpi/cr3_button_dec_dark.png
 create mode 100644 android/res/drawable-hdpi/cr3_button_dec_light.png
 create mode 100644 android/res/drawable-hdpi/cr3_button_dec_white.png
 create mode 100644 android/res/drawable-hdpi/cr3_button_inc_dark.png
 create mode 100644 android/res/drawable-hdpi/cr3_button_inc_light.png
 create mode 100644 android/res/drawable-hdpi/cr3_button_inc_white.png
 create mode 100644 android/res/drawable-ldpi/cr3_button_dec_dark.png
 create mode 100644 android/res/drawable-ldpi/cr3_button_dec_light.png
 create mode 100644 android/res/drawable-ldpi/cr3_button_dec_white.png
 create mode 100644 android/res/drawable-ldpi/cr3_button_inc_dark.png
 create mode 100644 android/res/drawable-ldpi/cr3_button_inc_light.png
 create mode 100644 android/res/drawable-ldpi/cr3_button_inc_white.png
 create mode 100644 android/res/drawable-mdpi/cr3_button_dec_dark.png
 create mode 100644 android/res/drawable-mdpi/cr3_button_dec_light.png
 create mode 100644 android/res/drawable-mdpi/cr3_button_dec_white.png
 create mode 100644 android/res/drawable-mdpi/cr3_button_inc_dark.png
 create mode 100644 android/res/drawable-mdpi/cr3_button_inc_light.png
 create mode 100644 android/res/drawable-mdpi/cr3_button_inc_white.png
 create mode 100644 android/res/drawable-xhdpi/cr3_button_dec_dark.png
 create mode 100644 android/res/drawable-xhdpi/cr3_button_dec_light.png
 create mode 100644 android/res/drawable-xhdpi/cr3_button_dec_white.png
 create mode 100644 android/res/drawable-xhdpi/cr3_button_inc_dark.png
 create mode 100644 android/res/drawable-xhdpi/cr3_button_inc_light.png
 create mode 100644 android/res/drawable-xhdpi/cr3_button_inc_white.png
 create mode 100644 android/res/drawable-xxhdpi/cr3_button_dec_dark.png
 create mode 100644 android/res/drawable-xxhdpi/cr3_button_dec_light.png
 create mode 100644 android/res/drawable-xxhdpi/cr3_button_dec_white.png
 create mode 100644 android/res/drawable-xxhdpi/cr3_button_inc_dark.png
 create mode 100644 android/res/drawable-xxhdpi/cr3_button_inc_light.png
 create mode 100644 android/res/drawable-xxhdpi/cr3_button_inc_white.png
 create mode 100644 icons_src/classic/cr3_button_dec_dark-48x48-src.svg
 create mode 100644 icons_src/classic/cr3_button_dec_light-48x48-src.svg
 create mode 100644 icons_src/classic/cr3_button_dec_white-48x48-src.svg
 create mode 100644 icons_src/classic/cr3_button_inc_dark-48x48-src.svg
 create mode 100644 icons_src/classic/cr3_button_inc_light-48x48-src.svg
 create mode 100644 icons_src/classic/cr3_button_inc_white-48x48-src.svg

diff --git a/android/res/drawable-hdpi/cr3_button_dec_dark.png b/android/res/drawable-hdpi/cr3_button_dec_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9b9de02a8dd7c016e84ea756f9a243581350a9b
GIT binary patch
literal 997
zcmV<B0~-8^P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000id
z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H119C}3
zK~!jg?bf?)>R1#8;I;M*8_cmNph_`{Qt<#OQju2}$&WF0N<^7@9>dZ!^8!>UB1P#a
zqbX<t1tMH*_GPV8oRC8ZGty{sbTrcbD!{`0zrESZ08tc0Q4~c{6h+a`fyW;(GXemX
zWr^qK=OWK@vE6Q!b4~$(PSaFXRb`AZiinhyQWBB$-U}gw001z?fOGEMxwY18tpxx8
zA|j;}2_ZrVAqXM7wbrL;YOAX90N}LNzS(U0<#I_+Pft`71p@#hA|IYt{avAMw~J|-
zVv-~R0OWGH)Ita&gfLp`1^^gD)VtkIODUC<5?>3TwH8AN?+P$8ODXpuh=|xZ=e5@E
zHLw-mSR#UEv&l)4khPY(-7W$EA7p$haa;gKqY(~=Luj|#IGfG(;Z>gJN(f<YZ*PCq
zT5Bn#ky0ulgi=b${nZD6gO~3S5dZ+~?}GO}5Rnfd_z;41&bgbLn?Hz%=JPq_c}}z0
zjN9!t@3S3-KUn|(pe#!)iUOw7Db{r@y!Udm+2}0G^yTH{Z&z1Wzno0?AKl&E{l(0G
zZZ@0Xy${A1adB~hXJ=<nmgR@=9||ykKR%gEu+!<_dc78%PDd!EWK~uA^*{1MFf-P5
zt=sLkOVd=W*K5&gwQw?-U{MqR05BX50r7i;llOW&9wPw2d_G42fZc8<*6X!Ml0+PS
z`LiJ+BuOIH>$TYJcH%I@KGU(&i}ioxWP!n8zyJW<ZkGW78jS{JSw?kT)8R7vY|IRG
zT~n52)Mzy5FvC96v3CU!5k{jClw}G1exE}KoMjm;77JRfRv}3ecf1dOCPd^UN!)6+
z3X8>pvMi$z0{8oUF3S=|qY)f0;gh>iQ55{}@BpjTihI2tDWyWI)pCd^@9*z_e|&uW
zVcY2S^|foYTF!ePthF?qPWk!y8H%Fd(P;Fs^zr-GC4%GeSoC^5@#V`GS=Y5*E|*3K
zVbU};*4hRl8fMncIW47Bi1;?hLI@uQnUwNvkP#6vGlvko*4iPWV`giN*;Q3#iOA-8
zZj&T&FE1})Hk;94Fd+Cg1OfhGknz6Md_L!PyUoTJ+HSW202~nk5s`C_j4_UxRin{(
zdz4`2fAuJ#lnNn)fQa5X=ao{Hh&%we*WaY7s(3!1^HIhqilQirq9}@@=%@P%>=h8R
T)iQ8d00000NkvXXu0mjf&rHFG

literal 0
HcmV?d00001

diff --git a/android/res/drawable-hdpi/cr3_button_dec_light.png b/android/res/drawable-hdpi/cr3_button_dec_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..96e986a32586fd06f1ed4acd9a0f2d0a462a1ab9
GIT binary patch
literal 912
zcmV;B18@9^P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000id
z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H1106|3
zK~!jg?bgd`BS#bl;QySu>1KI4jIx*zFkTEHdYgcsA*(#Y$j^{fo<T61Z1Wn<!UPit
znSp3XJHAL$T~+5~AuArsy-LOmf%>4K5$dY{RCS+jpsK2>s;a80s;c@lsPDH0KxZc>
z)HD|ye*2t5`Q2X0jXlVX+l<&|v-W1gmOWb~V{FQX*m5euyFo<t!PrcsyK`q)RI+4e
z3u!6RNiIXlwv4*rTJp7R)08JUnlEzv@(*d-W0^0Px&Rd0<9^)z@CpEn1?H<2we2z4
z$tAxvYlGal=)`+T1Cz|qz>iUMLMcx><->$BC8DXZbjSwJ`VM31kcg%UW!fnpQp!^l
zof!DBNoMFJ4Wbi|+_<-9ZS3Td+xD2|s}*6f*d>3kFm`|WPXT%b;M<qiG(HDMT$w=#
z)`D#|#s3mV-;lyV)!XDPpcVw9S=j*4j<|Pe<ZgCSDF8@GpeO+43}occDIpz&^=q40
z1`;H$u4IgrzIl1AKip;8-+@O30KoF>jL-m0jFg{69^t?gzj3};*KqpoGus{YUH4!8
znf<T6;K%GYWyHQ<c+Jgaq}yGlz3{-^I_+*B0BGA|x_#b}2@~G9#KPIAB?oBVbMuiX
zsU;_z&Bi4*VZyi1J8IkG?VR_wQGWqDKd)8<0MnQV05}Gw?3jw_{r|^A#V}>Z90Pxt
zVV7y&lLvZgy#;(dn<)TX1*ZTYA&S~0YKlB{AT>qQCXo>3!wkDj`yLcPz(3DG(_HBI
zo!1g?WSE?=*g{#;uG2mZQp%cGY#AmeCEm#Ro!6$h*v`3FJbH2UcA=B`Tz`6Vfi?sk
zZGyzmmC%h+H%O+<?)%H=wrv!+Z=-bAM)hB|QKC)>>CmOb?}up})+NLs*CD7!hm-kS
zPnXL_SsxYf3eZ!4UYsB3*=!~aV)^T4l??{$3w2+G_3H=;COfYtIVfCFwrrG0nAw0-
zmHOVqv`w$dB2q{VNd_TNajDqU1#rxTx(<@xbIjA(tgJATqjTu#i*2^W{+{*i<Klnx
mDN$8bRaI40RaI4eDt`mAT-!*}l9A2;0000<MNUMnLSTY_>9jil

literal 0
HcmV?d00001

diff --git a/android/res/drawable-hdpi/cr3_button_dec_white.png b/android/res/drawable-hdpi/cr3_button_dec_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..3068e463ec2e7715796c1361c3f359face190c42
GIT binary patch
literal 829
zcmV-D1H$}?P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000id
z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10?J85
zK~!jg?bc0d>qrm>@PC#1!&V&dM%g5g!CT*EAp2Zk?%+GjF${0>E|5zkOEH^ltc{5i
z1+}WHW@FEI66Y}t36FvPfj|g#cU4!nT0l`0MNt$*Q4~e-bI=FR=;r2z+P3A3iwk~y
ze01J>2f#D4>-#>`b?u1AiAcrFm8!C;@}Uzm`$ykIWQTiZR%TXJ&Ca=OX43b))ODRy
zRRE0RILhVarEE4ET`U&5Uat+n;rdH;DxuYCMGp@Te06ojo6V+j&N)>Lsv2_6F~&GC
zv#FU)iKr%`8o&g=goq{pru%Dh{G5m)5k+PWL=*vdGjnEEdGA?7XrC-%j5Z8|U0+{Y
z*LAqPy|uf$yLXfBKB~%Yw<7@j^z>8#aCKd~oO7t_`q%xy0e~YSr>YeZ@qXs{M4!i%
z(EWSL%-PHYfDlm%A&h<Be`98SetuQ}+I5}ncDuu@)7uK1N&xrw_XGgLFwkr^<CIeM
z`ugh6&d$7u{3as5{3yu($~pH(jPd)+%S#R+<PZW6!$3zd+1obnW^1)t0RR?@1*Mc|
z7zPd@uyd{g;Bk82d=>)WopaSbcupzNVzD?Z?RO1Mmb>dZ0)TNGX+EDrL^$WnIp-fP
zkI!%zM?`o&pJN<HI*#eBFAwOeolKx<8Uq0Dy=}K!IOnvgDy^zYzdE49IL<lUZnyB>
z+i^^9eYgkOwzUv~#TYfEq#}|5j5x88K9K<!MI@(`G{&eQ1Z&&Yj$=D^@+-7lF0E}_
z#2BsXIt7sHx*msNsOq}@-8uIqpHTo~-}mEmIvxAI&nYEsn#NK}ST2{gUa$XE0tSH2
z&(E!C8XblqtEz|y6H)5>{+n|y?i26;JP|oFqy0%tW=5w@;{9oC%&bIY``||aBM~JL
z8HgyUs?26HVdmU4jpFaBzpMWL{#T+XilQirq9}@@_*wo0GU3To$9(DH00000NkvXX
Hu0mjfc&UM-

literal 0
HcmV?d00001

diff --git a/android/res/drawable-hdpi/cr3_button_inc_dark.png b/android/res/drawable-hdpi/cr3_button_inc_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..631bd4238c97ac96335c37d723c5b14810ff2350
GIT binary patch
literal 2551
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
N002ovPDHLkV1hzz((C{L

literal 0
HcmV?d00001

diff --git a/android/res/drawable-hdpi/cr3_button_inc_light.png b/android/res/drawable-hdpi/cr3_button_inc_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..333859e2ec4b72ca571ab6399a063531a01d0ed3
GIT binary patch
literal 2765
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
TW&^w<00000NkvXXu0mjfTb@vS

literal 0
HcmV?d00001

diff --git a/android/res/drawable-hdpi/cr3_button_inc_white.png b/android/res/drawable-hdpi/cr3_button_inc_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..65d37535a11dcb8a9fb9a48fe11cb2d91d122db0
GIT binary patch
literal 2526
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

literal 0
HcmV?d00001

diff --git a/android/res/drawable-ldpi/cr3_button_dec_dark.png b/android/res/drawable-ldpi/cr3_button_dec_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..f43bc904df630e74439910a534c62b1fe3dfbe8a
GIT binary patch
literal 392
zcmV;30eAk1P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000MJ
z000MJ0hPnJwg3PC8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10ToF^
zK~zYI?U6BV!!Qg*Kc&d9oWW=_*)ZTk1n3EJ1&zI2*Bl^2E)W#RkUIn!1h|cdq=saP
z9a<OYQe<d0z2$Qt3E~k*BocRrretQ?@ApzEm3i-VQ55rG80J#SoSA1K1VKau0L;u%
z%1A_G2w}+c{BpfsFG{Ho@4Z_tmw|{F0MEV$007onQB{@FS{K{x_N6S#2O)$2Aefnc
zUG}vg#u#JY_wTFK>e)FrT5CrDftf)>m@cCAdM%o!$+9e)hY%jSu6wQPy1Yfh>2&HB
zi^Y?a^36GSIUbMB7!!$z#eaDIi`i5dV|cUK#Hy-Bt@W_m?GD!3n-#TfJ2>aY^Z6W&
mG5pgv<-MMKZ$pVh0>CGMHnttxP!1;m0000<MNUMnLSTX&$fGs@

literal 0
HcmV?d00001

diff --git a/android/res/drawable-ldpi/cr3_button_dec_light.png b/android/res/drawable-ldpi/cr3_button_dec_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..1da8297ee528af67be770f7214d1248ee49206a0
GIT binary patch
literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000MJ
z000MJ0hPnJwg3PC8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10WwKM
zK~zYI?a{GL!cY_j;QyT4(pnH9F~$&0*gH7zJo+qs7FV9c!NH+B2?-=d14_BJ^xktE
z5Y!E0bn3VK<A3gdfkvb8=V+H%2Aa)AraP%yx(ScU#I{-Ewup}z6gXC9H3R@cUIQT!
zsAD#zP`Qq6vZhx3_BsqVgTcMeGAIBIKD#nR(>r#_Jk+R6o^0nfB<&L!hJxWiyK59?
z8w61gskO5>KepFoLKjWX90r*OG62B7AkTBUST30(6O@U@9d=hS%gG@#l)^902XVYI
zmZ~M^c}@Tn0Qfii9%BE3G)?unD8xi_7kF0|Rq{}&_KC2a2wx}q2!g0WYNbWT*wXjN
z`Kl*rn(BBw{$2oNs4hp+ok*>l*q$cE%}+i#SS6NPb!~@_vfIDWX#A6R(*B^OQ_6e)
P00000NkvXXu0mjfMK-Ud

literal 0
HcmV?d00001

diff --git a/android/res/drawable-ldpi/cr3_button_dec_white.png b/android/res/drawable-ldpi/cr3_button_dec_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..c84b07d517a529eefd06ae7a1397863b8c5ea556
GIT binary patch
literal 367
zcmV-#0g(QQP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000MJ
z000MJ0hPnJwg3PC8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10Q^Zr
zK~zYI?U6lhgg^|1pKS)QS}7sro?(g<6r3h^;VvmT2?a$8&OjNmVzY>0>=enOl$%I&
ze2tsupZ5&x?Cfj~{i;+Hg@h1N=iEV6k7=47mu1O_C{a~5GXel2GG<mYTaqN1=6Sv_
z^Cg6Eb<WLg+eQEez}5v-RZ-J4uJ8MUh&+hMtC>9kU?N(Fua^;-nJEAzqW2i%ON{Y+
zI-Ra%S%#{r41guKhOX;q7zP%RL_{)GeOA@SdtzYb4-v@#d=A6FUDwf%1MvUTy^qy_
z_uj^F)V}W*0F#Kk5z${FnqrJgp6BYlx4N#sbvHdWdh*r@?d<FT_yTt&qjQRs-5>w}
N002ovPDHLkV1kH?mrVcw

literal 0
HcmV?d00001

diff --git a/android/res/drawable-ldpi/cr3_button_inc_dark.png b/android/res/drawable-ldpi/cr3_button_inc_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd887cc192a1a1a2800bc595fc5cdae07491cef5
GIT binary patch
literal 890
zcmV-=1BLvFP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000MJ
z000MJ0hPnJwg3PC8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10|!Y&
zK~zYIwN<-LBUunV_qk@QS!he{cDHb_9{`D^%?S7iha>HmY%pK4(uDp10te(sPVA7-
zs71FCZ8Y*=Zr#TQxKYE{p4rt<;Z^CJs#A4O0q-2_XY)b`uOAo#fUq_DzYv5FSe-W-
zjTit7hr=2;Fvj+h>?NqdCzFXN%aR`*9dQ6yE|)%zV?P)S+>c1)PgE|HQaVjj<(!iM
zkfy2SoD%>8z=aU7i)3pD&B~Qh+Bx^3)oOh(#{32VTI;9vdi_lZ@r{VgzE1c)@FYnj
z5gkY=KaR)aFL|C{<#~QJ9*@6BDL)d?L6RhLGMNZGFT!^P^L^m+`TT%$-X@|bilQjX
zvcoLP4x=cFh$!Nmx99WuUK05hyw<!Zii1|G)n<%EN~sQGOugvJn9^EzthKJyYN03!
zu9SM*Hj|p*mF7frptb&;h$5v_$2pe((2c^hb1som!Wbj8*1{Nr>2!+5OaLIrP4xhP
zvMhO;riydkzP!BrCyJtIQ@QSTyK#-)?RMkYZ1x#|2_aBbRn^(q*(dM4Ez8n2x_I8A
z5CR*GM*R5rSZl4@Qp!%A=T}*l9ljmfw#f7RA<MEqt+n^YnAOeAjTsJyo-r1_+oE3`
zFGC&<hvDMl!l!9!z4uSo*Vog#ySrBs^?JQF0Nmc*t`>_$iH1bIUhhc=VVBFLZ&=AQ
z0b>jy1jKRdIp;(~tMl{ozlbQ(T6dgt$!s?J-0SuJ0D#3}QJ$Qf{4Inij4}60smd6$
zQc6)A$G*mFb`StyGkr6iPGO7z=iFIqos<%IUcowy5TdZwE*N7q_~Ys6sR7_NcmZg9
zw9VcI0FH=Ek|eA3di^zoP#I(HLkLvoh7f4;R;}0TuSt@ui0B2pX&JAET$2n216LG<
z?f3hS-usnOs;a80%Jcjo&+~_>sw$;a<-K3^`~AnFDC{mjdUvzic@LV_F`Z7e_x{DM
zg%Fl=PEE~s+4atQz!(dgAMS|Alx1n(9-JS6@9khqC%^t=HuL`P(SP^&7hE|1&$>z;
Qg#Z8m07*qoM6N<$f)^pK8UO$Q

literal 0
HcmV?d00001

diff --git a/android/res/drawable-ldpi/cr3_button_inc_light.png b/android/res/drawable-ldpi/cr3_button_inc_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..43679f564d957714488293f5115bbaba4ae847fc
GIT binary patch
literal 991
zcmV<510ei~P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000MJ
z000MJ0hPnJwg3PC8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H118hk|
zK~zYIwN*=Q8%Gd*)xRNUD2j9h85qQXvJC-mbOkTNBLwhHw}{(5iSOV8gxerc7J_NO
zfB*|nKtq%)QbP^N>2DSi6;hHZJArD~=<0e^?{!rHk8Jcm{o+Fp#kU048U$$k-0u?r
zeCTu{prQ4{Abj0r1c<bz!C=D8hp`w8hvM&|;N_PuY|J*P+ue)5_j-8!9|5j|zvIm#
zt57c!?qZFES7;Qxe(LFrAI87Bd$HH+eK!E<rQp?!r(RSWPSS>xp&q;up;X997tZ)$
z?5+X1Pdw5ZG<dhmGo?hCm@E^fIf%8l4d$K$z-15zIn7^|P8C_D%F-B@clW*4h`6N*
zTRy~_%&&r@S=41Z&E^bk#bUe0!e)(yO~qn+&d`?WG()qfXG)2|V3%vHDc(wYnW7cW
zF9|6U(}*@{E6KKIp8b-rumu2B;G>2_&s!0KaA6)9niCuE(_{f~May8qn@3hfBkNw6
zW{m6yCc{<?^t1~6MZ!WG0IJ9*iu|7tJ_g5$k&n`<P`d`{c0b1j#!??>B*%X+mwuL3
zOtbT<@m9syhJgg267t&%&xHK;g_CapX+W?h(uk#(ze<(3<apa5*B;QT0R4WSejJY(
zOSrJ9N*c^Pud%Rs-_J-`$P$E~7UwzG1)vf>=7Op*>t8iwyd&~s*bP9Z(}}Lt3clqX
zV5-X?4vHY(7hZlWy!=!JRxW(2z{<kQPlcBsiy+@$25|tG%D238tybuCIyYZ+MT6?u
zZfG6_%S~E75%ZTIw3&=gDDbBjPQF>tQbj)86!y2s{7G<h4#KE5O-pjtPIrc3!T)jv
zQES9J@A_g#8d7%Vohq1cXVHpN&gcYyS*qM{MkmpVQzqP*cd8&|XT^>*dEQ-VxMdCE
zE3I!pvPzZ8vkA#+WSl<-!QOZhta1LFWHnNrO|nXri{P)cUg_o)kqL-e>zL>JzBI<6
zXwK|3Eo%WI6KFIK>|!3+g$XpO1&r)8Em1UQr7<qg_r2CS(ydYPwMBAg*oBRG3aI3o
zp^8mv)1>aF|I(uG%pqXSxbF3O=yvzw89$6!=>pZHRTEJO%Vw0ZnL?-@3cjua;OYgv
zzOE!W-ezJvW&q$?tx!E1h6U%hY58V=h0mIm`PIz72VkAwgG>L>?H>p135OZ!oX!9M
N002ovPDHLkV1mVu(g6Sf

literal 0
HcmV?d00001

diff --git a/android/res/drawable-ldpi/cr3_button_inc_white.png b/android/res/drawable-ldpi/cr3_button_inc_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a86e3d3627a72d7625f85b2e59b58592e7b6181
GIT binary patch
literal 856
zcmV-e1E>6nP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000MJ
z000MJ0hPnJwg3PC8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10_90W
zK~zYIy;aR>8%YqZu9|M66^<ltoY=>l2XYa_FR<5n1Ve6mi_q+o1o8-a0bR}Fi-`^k
z13rp4u|1hV$nNT{${`~m|4D{ywqOp^Q}ccG)lV0|Z#MIbe!A_)?3v)kdk@p;)BphF
zd9L33XOYl0aPPfonue;X$}TQ0vbwJ6^70aUy`CA3Mmm{Hwnn!Rd^{c#Gdo1IM3eyl
zq?DqFu(dW6MUlMs`jnEV6x;zPqCbo=yIGd)B4S5GGDL(Jqm*T-o0L4JzyN?54u|BN
z%R&fUM0|mWA5%(i0RV{TOhn#`NbQ`PhY;fF>1k?J+);v$MZN^D>$)Q%-IUTmL<S<#
zYo9@T)~)Nh<DAQe!y$R^&HbS9KKL>%A%w1TZdX+YBC-bncFos{$eyYWoO8P&gf26?
z@p$}zWLX0P0H$dgVrFNp?I7X{RsB;{Un1gbMEpxt2LJ$w*Z{yks;Y=+h)5Apm|4rR
z)Y)vdO4E|bc<;^0$%&oKW*uWp&pG!=L<Vi-PE}utNVg@J8)Gg2AOHX(;&lk&SXI9t
z9v&`^j*fWQS*t;tPN$}-DkP$eh;~v+Z$+f{NE1Ly^k(_4s^6`(J1M2Csw!*;QXebw
ze{L&+JkPb??@LN4GV?7Foe|MzBKntz&Jl6G`U!DPMCa|d&qQ>_%(p3}*zflx&+~^h
zfVTJ7i`=&29wNRbqQ6s0ZvX&@=sczLK}5bF;uR5Hi%8AP3u|pypNXXc1pqCIB3Ww#
zGcQD>R@H9+@Kr><z|Vp%EwpD}RrT9Ccu^F025!9u>b+l)v=iDGW3CbL3IKS`ml5&G
z7;_y$Xq<ENr|zZy{i?W=t`I_G=0%LL2_YOK;yXlq7eY9WF*eM+2qDD#X<4@?_rYW`
zfzfEBWm#&BQH(JR0Jo~T5Rrw5-2TdS{ea});2<$`BqHA5-{+f~o45@e;CVZF)5_ck
i{#=4hep{FRZ?_-6VHTp$<KT1v0000<MNUMnLSTaBd4?ze

literal 0
HcmV?d00001

diff --git a/android/res/drawable-mdpi/cr3_button_dec_dark.png b/android/res/drawable-mdpi/cr3_button_dec_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cf5969039ed7411ceb6f4de589c2f34d937f6f3
GIT binary patch
literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000Ts
z000Ts0kLiuw*UYD8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10i{Vq
zK~z|U?bAE18Zi_G;NRo1jWZ8Kkzx=Pf)!9kk=O(kJ75!tO|SzhHbE4nWCb89#1ttI
z^T;qZwo^p+3Zm#1mm*R!U**Q<9RKnG8jVJy@xLQ42j?6CKsK9=*X#ADQi@eo)rz7>
zD5Y9jYXN`>A-tj}C}ZrQkk%Su7@E4SEdb3Jt2yV_JkM(><&|@;kH@1KkH;2(BZN2r
z@PD5uiXsvO0aZ$IYpq-^m!E|YQV1b@-)EFkN(iBz=RMrB*1|bwj4|eRyXpFuYC4^M
z1z>|9uu&A*HxpQ|*IpQge!t)6obwNt%O&3L_uq!Y;m7yHyW8!)4+euz?RGm;O8qz-
z4yq`M+hj7aFA2OpW3gBe0FY9WG)-xiWxjKc-4FQ=#5u>ZEc4SerBX_A-|Jz3zvXp+
z`F!pGpsFgDB#DXR_(llP0NfMx9U(-=aePaX#8g$~?t1}$*n;hLOS|1JJD<<3vMhtu
zYW4Id41%ESbUN45>7+-ak-=MAkmtE8%hCW)p67Y9+3d@+YY0G<Wohy}e<saFqtR&m
aqkaM@{Pv$IM!nhq0000<MNUMnLSTY&De8Ry

literal 0
HcmV?d00001

diff --git a/android/res/drawable-mdpi/cr3_button_dec_light.png b/android/res/drawable-mdpi/cr3_button_dec_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..d420d5b4890c4dd99ae2d14af39fb98b87dd5c8b
GIT binary patch
literal 564
zcmV-40?Yl0P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000Ts
z000Ts0kLiuw*UYD8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10l`T`
zK~z|U?bAz68$l2T;J>T8XQsh6izuLs2+ATN3yy%0xWwEeN0=kz9=-%olq0Y~SwxOx
zOGFm3J<#*$uF3|2?L?6hq->aPRhz1QR29(c^?JSMPOZmf35APunmebXpIC=1<3UJ6
zj9CktCJYN=k`Ofjz}{ze_XUiOVB(h0CFmNXbxoCNJnCAzqwa<G5$6|NmJk2}0A~9}
z)8m!OXDhu(k$7p`*X8gmq3B4dR1sUS(qL#J0O2u@89+b;Nff4z#WpQ#|0Y{~N)>p|
zT=Vo8oNt}Cae>QAsH$2}uv!m;wT4W#pSB-%DZKob@4aR7-H18m7}`l%b+d0V-rRs6
zUJn5D5R_%93KTf-hl<H*5^WlztjI>2{)z}xW0WP)hRNvzf2ax+D9iF^P5M)T|6yYY
zivm<tZ_O*Kli{u15i+AC^yjCvV1#(8I4oDY-QBE<?O^aFjK_~{*qDKn6UcPB$N3C#
zVd}1tP+!;XeM0*8L%4<+0Id(9G%ahtldbC1NOvTIXkLT!95Nn1=KZn-`PES7&c)bF
zT8EV0jqW}^Z4J}Lqi*N4AM-0O*j|HPuh;86dp`gGCgt3oCQ0uA0000<MNUMnLSTa2
CSp2d8

literal 0
HcmV?d00001

diff --git a/android/res/drawable-mdpi/cr3_button_dec_white.png b/android/res/drawable-mdpi/cr3_button_dec_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3e270d2d3c649676a0f73f0bf33aad7c0cb0bdc
GIT binary patch
literal 543
zcmV+)0^t3LP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000Ts
z000Ts0kLiuw*UYD8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10jx<x
zK~z|U?bET&+At6R;Ire{J_#b0GDIRH3nODyiAU-q<PrKFyaZKeMwX00V#q%rkqFy~
zeeU$PK>y({OQrt#CNFnBpYH%hqtR&e(XrceS(a?K+i^rp>bg#~*4lfogb-Q?q58g0
ziHLK~ledx)QQ(}DlydOiJMX;}LO5%!EsA0=#)QpgLuFY;0Ehqp;xWl`xn%qOKFP97
zwrz{k>GTT#AQ34kWy%;!7-Mf15MvB6#sC0=l+sBlP209VvMi&fX=uG((__qC0f)nZ
zbzR51u1jXKSt^9k-urJMgir5p>TgMsya*va6H(uF-Ece}!})xs*Vh98@Yh3GmJ9&E
z7{d@TvDONuR0{Xs^tYH&Dz(-ML`;k^?Dnp^0{)fT4nzO|M2yCmptbhSxdCq4^@Ql0
z8?@Hm7!wdN-rfc9FaxXADxOX!YMLf+&Ij+kMZ~W{2qYo}0Ph|`&bb2sV~nwgI7}v!
zuvjc8&-1w5Zhyu6u?1CC#rb?5>bmZ=*8F<Cet%{S`@VPHd#jXkm&>IuiXv2174tlQ
hrjw)5Xf*nd{RA-{=a&(LIZOZm002ovPDHLkV1gJ&@P+^Y

literal 0
HcmV?d00001

diff --git a/android/res/drawable-mdpi/cr3_button_inc_dark.png b/android/res/drawable-mdpi/cr3_button_inc_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..84003b875a253c82ad1f895f406104773e9a9ccd
GIT binary patch
literal 1370
zcmV-g1*Q6lP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000Ts
z000Ts0kLiuw*UYD8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11m{Ua
zK~z|U<ySp#+ei?d;ZjSkNQqG)0ZJnzNSX+6qtfufZR(smclibP3k3aw`vvY&#h2PG
zae}LZfHX?uK!E_m0;Ix`NNSfWF6W9!I$3gT2f-otF#rJq%eV9P?HkT6!2dn)TLDD0
z#&kLz1ORBa+q9k#k#56%cMuUSAB%{rw{PDvB4R|umhaZ`!A+9)h4s+n%U2A;&;kJF
z`@S89VId5|g75n_0I=m4Zei|>hkS%Y1OR}&UXKMqV9n=q+i@IgG#W7gfO@@d(lpJB
z#bP#{PV-i)WdMK>zi_#0@_Q9nB@e^UilT^VtqV#imvdgMR4QJjQt>$FMWvLhwJt<a
zv{qt?y?b@{B*#^9DJ5$(8U-n(3jjsNm_tMb002Z>7-LcZm<u7)a5!8DA<W_7VZK!2
zt4zK|U@iOU=_xjwO_pU@fphLAN#ebE^X6cGfB)AFJe{AP|8jhM-1R&!(ON6pwio?=
z-y9ts5!|sI_E%QDB8SaplSwIU##kXuQ`d1E&+|O*`Sa)1P2BtU?>)zHyfjS>5g92Z
zHJeQU0JEHzzKC^GjT;^yB3#xshGA%(ot@cPmKCIwjxk0MQ4tY+A%wq8TnOPKqEAFc
zV~mheI$4$#&d$#4l_xr#&Q6K$n6TY$L$B9k0AM#7je=6jEtN_|#+aYyd0A^6xURcH
zz;#_;YaQfyUS^E>rBbP=lyV!5MgaiqUa!a6?e;e8F9Mr}3xdF^)oQks(q)W!#+Why
zJVL|@B33x(I|MlA{%RZm9vNfGj4@A2>DFpBI|u@6qdL|q?0BG5Dxv3jOl!>@#}Owd
zCkLMAc|r)^bzPrx?oTF@C)>EmWb&lj?Sj@iR!YTE$~Z}q<n`;<zXL$-d0t*BmGW)e
znh6o%>FKHE`@a43=~K=*FHWb^^2d)K&$kWt(73p`m^^#-Y(EHsnbvwf7z}hA$Jx=*
zQNA+cdJ9&KMF@eT(TL4vGkaO*-`ub^7f3{f*=%NyMk6MKz|CAY2>hs66IiuWDJ9kG
zbyF^vGelg#J^%81f)H_0E|;@<y>6tGw3!QF%LA}%IFBDcE?i$<yLp~_CnqOA-Dbj9
zuU`GUnd#lTcfVDu)lavX(6X$gQmLq`tE<IEqauJ?svwFYN|M9?fKJoYIzB$`BBEzm
zmQO?hB38QH?#@!H)#|5%gM&Ya=o%5Hd7j5al%#1Yg%CPP5)(zyj+*N&STdr+!^3<!
zo#x~5I1@rBV@$#rn*qRQBDyA`Ypr#>J(1QrUX265XU5pf7?TJg)ObA3rqgMDTXWhm
zVW-o9rA*myI9#}{tD-2H8)IV2vSys~sZwf(fKn>voKG#wni*r_D2nE;>#E^!xB!5x
z)oPher?aEnjV(Y#TJ`W1+YcW;kPw0xV}ytn5!q789RgCyn22IToHNFx5JKCwoxObd
z(!duZQ@h>XIWz8fVEMtCNx$DW&1Ms_EJMz@N|J;nNs?S#Tufl29VbbWq-mOXo~N|d
z3(k4g@Au7%7ccH?$N$&^$*m*+z^>J5b{xk}wOX}jvzZM5P%f9V$z+oGzMqcA;|u_@
zha`Ux0r=5}(v1nI)oPi`%S*Gjx2Fe#fd&8t0BSH8=)Ju?eR+9lR>`-p-yeV1#pK^}
cHT%!TpMfArNayI$OaK4?07*qoM6N<$f>*kNrvLx|

literal 0
HcmV?d00001

diff --git a/android/res/drawable-mdpi/cr3_button_inc_light.png b/android/res/drawable-mdpi/cr3_button_inc_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a8d594e5a1fa605d18bf395754f31032e4f1131
GIT binary patch
literal 1491
zcmV;^1uXiBP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000Ts
z000Ts0kLiuw*UYD8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11z<@;
zK~z|U?N?228_5xU)!p;O8A_IIYGcL{yg*h5`4k|?Wnq9h1v&T@-u)Ny3)KDv`5_E)
zF_3FU37kvLG8Tfd79^O`iYrqjXE<NoT{%dQWzx2kO%{7d-f3olSN*zPO?5T!zYhAL
z90u_G@_7f~Yk~O35<m>#xds6m+k1N-a9=%s%z(y@z7lgQA-5H9xws~zsTgj}C^%Xd
zv!WmXXh#uO8>g<j-)8iBZb$1|i@1$|tHp=I7cw|n7lD1N-i4KLB9Z_gTw(8)fve=t
zO|^0Ay4|Ptwj#t$tG`csD(d~Vw8^1Y*g9<EPAfDVhlb-e?z9S9hc-F%>ixC^Qt@10
z2)_yPrrnbUA?=B??;@$pu@}w5u#hfRhGRjZC7D9h#;d_1&O#<kUHRR8ZoPhp-Dd|#
z)6XyPsSFSR(g1Dm^=Yp&5`lfINZMf5E?Xz2{bUOHa@vU9X(M*0kS|Y6`^l_bwn*9_
zuy55~XC$`w`lK&o;S+X$OaL(etwG!UJ`Di5R))&7glD55RE}an9LK_R5^3%y(%g@Q
z=?LOjIf`u*gr+6DwK7x#KyLT@q~F`IBx2D5(g5vhO-LcWVOIBwH=YqTP_-8c!?A>2
z$*lKPBJFRl6X#Z@Yob1pjkIJXJF3x{pW#~*;=+z+=%p#8H)cQs!{G~g04Q4=dW8)`
zCed=vCJot@T8dQxPL@;2NiD@{Lw3bEn=px1VZ+cChu#68hQk*U`tuf$zAU)lXkD~0
zQW3(ip*$8WS4iTHBCJU(*OZ_o0ZLFJtz1)tHIld^Sgtgb#}UG?g^>!5)&<g@(E7uA
zP>X?vTQlk&&*UV4UvL$j)a@t2axB4#04G9F(pdU(ky%;#as(gFappjo1!a!?T>07G
z0)ksrr*60f*Ig8T{bg?tlw}iPJSp48^OR8GU9b6LEKKLqtP4B{%HJ=3%bgl2R$n`7
z>cb#wj*qMzkKu5wIbB(xwWdD$_@a17PDE0$RIJEj{y_&80Du|9iafzmIT6V(iigxk
zA6o0Hm^XI99~;+qNBurTmi<CK@TA|)y%r0#GKGA(WWg<wJ2hH?{hFMa&f;c%+}Juv
zUYo(-y$v6@`S>w-I9zqzW7vr*n~F{Ot`7fjPHL$L7d=0&!asSE-+Wkvl(+n<3=}t;
zoLIF1*X@D_gZI3pa_a84`7Da8tq$u5f%uu4{apn?>{*vMwyR8X?F|0XZUf10?s@e;
ziS1aBoHSBormFI&4vPY1eJ0jzcfVjP{07%+fVBprm%3`>)XmW`1<KOnICo^HY;kTF
zV=L|0IL;OY7{{5Fc5E19wm5fWryj?7fwG*VW2%i)hhFNm2IFIY!4)*n?LM`S03)N#
zCX!`I?B+tq%wswAt(!Q|k^l$FeCsA2%c&4DBX;vhmZgj~n@51@cAwghb;70NI0f+6
zG{x?-1N>_8Oa4cAp94E(&$nC&CMKq7<3CuD=IM3b#Cm^@gXXnSl&OH{HN5&H`O5sx
z_wDG{f8iaS@^3CP{V5BstRMhdgI^5>+z0G9ERCAGMiy0R1m}(^&z%}&R(+pY^?mNt
z$T8(ca4w6gRCCvi!_xEt`)V*?{h2xOrY3WBKAc67w8fzpAq;1#Y=z_ntjGfZGTfBh
zRBaQ^3tXiAUQyVOdH(MT00VR}lJ&$v3f1b26uq;7idR+TN(BIc2#v`nhVRO1KI)i9
zJs2Q$mlN`THWLzn9SsJ0&fl6@nQb<a^vfB}=cS^&RFuzfK98hd%51aow`LaTxohM3
tjqz`TpL8r=5b@JoOqMwRt*hDp@h@6a_~D|WPZ0nB002ovPDHLkV1mjY$Nc~R

literal 0
HcmV?d00001

diff --git a/android/res/drawable-mdpi/cr3_button_inc_white.png b/android/res/drawable-mdpi/cr3_button_inc_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..90453daddb108328f008695d9e84404d78f439f5
GIT binary patch
literal 1394
zcmV-&1&#WNP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000Ts
z000Ts0kLiuw*UYD8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11pi4y
zK~z|U?N_~S+ei?e*<FfDQ<3GsRADCq65x_TWy&BpbyvB&^yysZ4fqDB?-_iZUO+gP
zhrmUk#zkx>NPHk2nEIi(BzJeNp$uBG6XkM1in{>@Ajp}WZ~ndo0siZP-|4e_rrNvu
z^S=sUX^UYP!e}(Q;oIx=C=A0ofQ^9gZwVfTAp!t<_wF5Y9EVRP6TVn1I1#avlM{UU
z^eMi2^$Lc=VIA;y1Go-87z}v3-R4P>IG2}~!Wh#~N{Kj*86vX#_wU2W$q61F9@3^D
zHU)qHz+BfA7Z(@K*4CEvJkQlyO8{szn@ui+V3(Jdw6n7V=jZ2iety2e(O(CE%d&f(
z$1g4}94V#DvdnKZ8om%>O9&wWz)91TNhxVMo!Z^qU3&1~0o2-Yr-(0P4FG_n(Fo%>
zW}I{3`@Wl|=~lbleo+*~o0=W9+wIp$k{tWKPai*iBx4MXMx)h1TpLXGrQk1LzC-}v
zQcA%XbMicwuIu_*Yu^|X7-M!T4Ybz2>$-lP=aMnzNGSyX@aha)Ir~~xTYyk2I}wSq
zvopsS<2sJx5s^<sEyr<wGRFLJqm)7n%d-3n5e?^@ilTtepFe|?5^C*O1F%+sFbrWZ
z7;pd(<MG&$QcA|ymNBNu7;7QoHW4*f{fMZEh}(>@R%N>-rIh3G*Z}}B7z}vD6L$i@
zFbr`x9I{TQ!{Rs=Qc7uz@j2%$0B94@PNla3Sbhh9Hs`!$jPa$EGLB=>>2%m|IAm3I
zuPd=OgioG4!MAVU@>Z+Wn9XM1_V)G*t+kJc%_>L}5g)DkA>yM(qXCFGN5nZ1&4m!@
zWHR}q)oR%&itMvz&+Mw-4FIFj2<P)To6qOG-EKQV2w4=x8)HncR=X7`%ktONch=fi
z2=UxnTg>P4^23J@=IZLoLTwwaTTqn-vMfW-^SDw<xUTEKKfAD&g0Aa2N-5!a9?!C@
zPU$xR{3xkcfB*nI&!a5MjFeL6d0xUdUau=cd7hV2N}Xky@jQ>}u>e+Ppx5isr%#`3
z6h($HR%)%4@B6QB8^YC|JC5@^5uL3LVU}ge^SrXzY?_A;AKJaWJvur%f?ELq0Gytl
zQm4}~<MFtVQZl8~F%kLJ+GfQ8JB>zTJyoK!qA31E#4942FvjLu>(q7KY&xA5-EP;M
zo}SX)-rfzr`V3GQhScx(Z4^Z|2m-B?Qk?VD7&8Tc1QD+)ov#9@GQUE^D*#B0F;mWY
zs+3Ye5a=k1Y`@>PRr%MqU@2i3!ok6T0RY|Yc1xv{veqs*=W}cAl!zvG0U)A@wRT$B
zE|gNL+wGPBpbriX%xz3~+lsASM(^Lh7si+d5&4|+mg6`t%Ch{e?&LVmVOf^P#+WH0
zrkwNQ@#DuD0L;<RQ9bJ$Lw(yCUK>`9Mk%GOwWaI2D$ny&2$6EmW6t?yrLhnq&GS5U
zT~}FaOQqCTgWm;UX-EJ-y<U%kAh7%U`#Me2TuQk}lH`~%_M9>HbEVIdBsrE+F48p3
z_xJa85Cpc@>rwrz+X8LEatHv}@Anx1h&Yag@B1zy3Z;|)0FY8@BGPG^=0Ol>0MNtX
za7npe<dIF8kox_;oy}%uIhaY3ED$k8#575g>w%liW~Sfo-{AYNWw){2^17bQX4vU;
z*pk~l&!Z@c?7e&UsJ3db35Xy5WAej)&Hk6a0V(q9=a#+ZD*ylh07*qoM6N<$f-}FR
Ai2wiq

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xhdpi/cr3_button_dec_dark.png b/android/res/drawable-xhdpi/cr3_button_dec_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d0f461054fa0bafb82e248f0078618049002c11
GIT binary patch
literal 1270
zcmV<S1PS|zP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000xO
z000xO0b}Nl!vFvP8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11cOOL
zK~#90?bktTTR9K_;2Dji_v}~4U}}>~pp;(RrKkLXTzfA45&H{z489cl3-+)-q4d0m
zz2pz%RJOg8QYgLH<w0Uzo}Z+d*+b%xG)@zi(!xd`7#rD0n$bL20?4u~%d#xXvMkH8
zEX%Si%d+gQ!0Xyo_5AyTg9Ed-w}&4-d@x5xN7U=}ObEd;vn`5(nAtk#=;Y+YT5HLi
zVP=D8VvLB0=i{Z6E{$!i)%9mpRp*?p5s|E=l(^sTrx+s>QR=#mi70vRQ`@#O91i)>
zqepUZaG-m8d$R8GY-ojVY)pWvuG{hT>(}`3;X^Z@&&`u3Pt5W0G0o?5I~WXXuh+9p
z)3~B2tcX}^tyNV^M6_D1s3;1vTCI$84w-qKfa{WeF@7Z?jWKFjmeO^dlx4|$+DS?&
zC1XtLx-L~!72CE=%jGgnCX=+awZ(7WzLm*jA|F3~l;_W%>pE~mypjNO-7IFa83F)|
z$79^x-G%9NigjI^wry#9dz(h15j9QY%CdAZ#)61S5$S~x`XbUt#45&EIp-<>s1Wg<
zwYEaU3K1)7?WNbnc0{}f0F`sDiZND*ScypgtnVHXl`+PmEKAokjT?<dw7tDeZQD{^
z*Je7M;_mJ)jK^cV7|SN#tAH!3-!zR4Ay`#)0N_Ii{?)5jzZ+vLowCLlgNStYe!l96
zi0jHSW^>*}PAm5Gr>g5}P*oKXQB@WZVdlilEF$T}ix+=*?*jk?M2z11R8>{lR0W$V
zz+RV`i+a5t)^%-Sj0OM*0I1*Zld9V3bo%t!vuD5Erk@|}&6_v>IOqO!&hg2~2?2nF
z5Txrm)9dxF1iQ(VrBGG;w)~5tz`CxHh|m~=gTcV0l+G5NesEZ~M?^qGlv1L>U|@_f
zNJLoIH5Ns2<uSOhx1GCo4_JHm?i~UEOePZ`B6QA~5Q1T55)s<e>Cd97C?dqn6hbi0
zIYUG^nM^Lt{d;aq006+w&JK*nV<4jSGmHQLDJAo(6Od9e7w1GoI3AB-XJ_YDecUPm
z|7W+_1V4ZN48!3Nm{}1KL_`4qthKUfXZ=|aQLVKiBIk2rW?d{6aCCG8!{PA8K5ndl
z$B!Q?0Kj}c2WHk7qj>Lyh}amzzd8ZN7$ze2-b;*8m|5rZ`K7sk&y@-|`ws>Hz{O&r
zhlhvQb)AkzBaJaC0O)eLlzzX@Ap~aTA05}NF*7hTd+&L<Tne0?_;fTHX<gTPcz6hl
z#X<o9_V@Sy`#GR(TOEx?(lm{P5Li`BjFDrE>HYinf4zM9^6y`D5Q;G-L}ce2BO-h6
zrK&3V^5u&T27?=8yY?hFo6T^4fB*a<^y$+lIzB$87^AJK$`(aozkdDd%d&JK1n<3f
zs_J5lt|$tMF<L}4<}_Lq5o4_dW?t{sm&ROI5)o-i35+oU0PDcTIhVSwW9M8%#27+|
z-utjxt>XRr_e0lpscD+zoJ(6<Tm0a`172T<X0zF~6>#S-LwEi<oMl;-Wm%SGS(as4
gmStI%W!c^FFUGTRi^E2=zW@LL07*qoM6N<$f+&4w6#xJL

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xhdpi/cr3_button_dec_light.png b/android/res/drawable-xhdpi/cr3_button_dec_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2902e9c3a7ec00f76ca0a313bfcd2948f54184f
GIT binary patch
literal 1477
zcmV;$1v>hPP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000xO
z000xO0b}Nl!vFvP8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11yV^w
zK~#90?blC^9K{j`;9o>!R`s9hVdlwW^blU+g=fhHykNsoI0eNiSiB=}02Z+D1z7eh
zcuONAd61`>?y9b;%!qi4o*C@NwB1O^NRXdYQmd;fGa@=VD+?%!q9}@@D2k#eilQir
zq9}^upMu`@ebaz|26*<2Up!t@{rn*h;iZI0&sB<{TS+h(B)9~dXOS(3NFqs$Ndi+=
z7I!j>B<^Iv@8(nUH|7>5zx~XaT#1}Hxe~btG1qKS*^;a3)H1h0Gihe6b#|h8j49`S
zVs(C~!=sn>(T@wq)29YBXd2v(?f5^uuQKic(BR2(NxS5K<*-_DSnraTm4q<kPzkCK
zyqff}raIQ<G9l%ur!)&hGX>@v(>zC?tNT2eAG!Gv1M}ApH$O_|N9w-2Hm11(^FTE7
zlxCznHJ1t1v7Yp?4#BHRP=y%>SxKl;3}M}KSgp8z{wu$Dyrw71B>~M%F82%jPJH#%
zt_v<MFA1l>diyawSiItF6QQ+;ACsVOqZ`GMV^ujK<rJL}0TxCG3TFja90W^D0f;X9
zx(*S5kvcNK%%*@7V2of+o}H3XMlz3SBuQc;QQjgS&pofja}b|ZtzT_F_6qA=?110o
za&H;-761UAESL2CP3zBx6}>thxK?LPB%Bc4DE@am{(^x3azUyCle4=EK+GU=fQX#n
zARqSr<=#MmgW&Gu1h~N+a3dl$Cj*e-q=rfUq`Lmv($-br65U?O$fxVU^7DuM;_*xS
zY`LV1^ZS#3X8~@lw_AF!XgPF=H6O{Wh9v5Qt128@{`}vuKR;xgKikh~vgC^YV;FTp
zGwE7b2(8JY<*RM&)d6GtZVhmNnx-M3!NvI{0iWV@7^oYSW=F?VPmL&MuErpdWPd-u
z2LvFJNHqqbn7N)B&5n+#8<kFnfq+kMa%j*r4f#Eb{@z9K*45S3-AzMM+K!2bQCUgE
zQWorglDrRODT|WGFe-1y#6!}%cwUcvpLZ7E&KWStM!+1oc0vu12EMPV?~4OO8W=Tp
zF=4)o@$B$14llsp)ZqoV1p2@Zv<L$^2EZj7?RmVs4+OYNHVoLsgmxF><>6zzvjC^3
zr*{d~QG8lOt1B^aRgOXN7Zw13a||l3T32GzDq0=oE}qw8-{*G)Ai$fZ@!c-)%z+<p
zRo6bN#JkP44_kIm!Nw|Ua@D^ydjQE*$11C*V8fQZ+g$ss62Gcz2Y$H8p+VC$eqXm9
zv=3NJr>?8H<+H(R9koxy(WB;M`8tPhH~Hv0kPCpfZ-fq9Fc04dA%8ep4l!!)NoDRj
zNHo2i+u~&E1J>`H>#YU2I6wD~o?ZHj$1iQYUC@KRwrh(PU6d!3NL%`(y8c?ZswzWt
zNfD0dU?ET-cFtxj41yUW0Q{D%F!0+}7|f;y56tF9=I~4~1tF2fG%}LdI1+o}I7>3R
zCR6(tll@ZHUfsM9T|7N^;G4bk?Og-D{BqYWPtML902b4qT-S38x!1TDHC$&!m?mOR
z71F?@y@#+Riya)DA-4jw0<=bG!Exg`v?){Tdyd_?(1PQ}2*2Hr+``e3#m+<6GHG8S
z4aA-hrYT(KT}-)GUC(VX{ppR^Z*%!W1)$vv@vaMgT=?+l1Is5TmKPHnW6FA>Id_&v
z#h5dV{Ui-O+!R7=OEGrYy%V676x)!f6{0pWZHQ@OK>PYZOq<BG5u)9-DYgQ%*}bC}
zI~UtBY41ZC`bipcrg2n^xwEXdufvOp<&zT|9(}O;_0P{8Xl`;TilQirq9}@@D2k#e
filQir;-Bt+?t5HK6q8Xn00000NkvXXu0mjfN{PG2

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xhdpi/cr3_button_dec_white.png b/android/res/drawable-xhdpi/cr3_button_dec_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..a12a33c39469302b8c55cf9c592f7249b9ee9934
GIT binary patch
literal 1320
zcmV+@1=sqCP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000xO
z000xO0b}Nl!vFvP8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11hq*-
zK~#90?bp3-+ei=q;Q84lMM(}23)TaqRcRn~+G`Jp-{IbZZ;|32!N9dwT%&gg)TBro
z#0D%Q3N3MWXC{S6LC!^%eMm0A-G0DA1SxQrv$NzZK$c}$mStI%Wm%SGS(as4mSz7J
zc;r0Rbq(|RoK~w9PN!44y1L@cW<%b4$IQ+-$D7T@Ip;Wp;COqIRF#;S%nbKi-@*Pd
z001J|{_%bj5hWr`DXEA^Q4}eqB!j^qrIbWOQj9ST1_PZ=r*d_5r6(sR_UhFut?L>9
zpue}lSNNd-)OC%E#R5Nm{7BR3lx}Ztsc9PSAD)QZ-Q8V*h#mk6=UhQVg@_c0SoXhW
zR`ks|R}xWisHv(4fL%)|IYe|K!pzJ>M5;<=h9LwjiUJT35D`KMW@a#%OklZOLP`lP
zE-qj`pC8NsckoIVgzM{T1OQmC*Vr@-4F&^dW=2GAn#NaE<yEx+03T!Y9Zo4Z03b8#
zvw*%e^WR`*1^}S2oiQ~t_1-5{m6THS-bZGRM1<@08b+g$F|#qVHBDn>S=!#%t$UWg
z&Hk|fz+$n$KJ{;JZ?SD#GBZL%1^|zUz9@>{0Kl0Umu2bt>)w0nIz~i90Ki8)JOJ#L
zgLRSUo0^%FWvKv=5K#aiZ8n=X>-D<-zlIQ~ZCmY@t1cFcgAac+0KI<p$Kx@<cG<A1
zvZ^{&{iSW&*<<eWy_IFTAfn%iNQj65K#QW#rfI0pf@8iF0Icg80RZOnIi8=N!`ruS
zQACi45D`&TsVE8-kwfp0e+_p+2t-6^W+)=qwk@8YpToO%@35|GgYJb6UuDD53|KCg
zyR;RNel1gsk)3n=*tGr;%nXT$V~i{!BqG!;Hvrg;{lQG2r*t?Tk8v~_ftg`hmY}Nr
zI{#TvRjDjXFf$yDMlc?apERB)1>nEvQ7^&X=g*(b%m5LsZCh~8^`EMr#fV7Twgp7A
zrfKdKRF82q1D-#BzPlkaoA+LsS-tn7s`Athzb8aARTb~ObYoIx-i>E}><91hz<GTA
z`Zd0P|DH}xPWa~LhQ0R=x(ZEI3so(L!{Hx4^D}sNclRq1wL}yEAOb*)F{abgQ(3K6
z^5Vq{y}Z2KuP5$#)Dozw%0{D+-rU@1Q51rR1OQ@YiHQEJs_HK@W7rl%eWCP23L!+i
zR|u(UGBXhoF*6Av=;`UHR#j!I)#_+p4+da1o7wgCwRM{dEX%S_GeN}IG!2Fj-h5pO
z6A`DBoS6|3-7AHe`N1HFh;>2GF2xlQ)j5|`RpPdj2mq0Yf|<qPa2UHFC?aZEmi?G*
zHk;Yy<>fyLfB^uWot@cgwZc9NK7INm-g{(btg0%m*J~gmBO-CmCD^7Q6A^dWu*(E9
z!~O5{p?>#wf&ie1s4+%iW^v9X5lO0=R5evq6}ugw#2Dq-vuC^6KRY`+xC`t(xEq|$
z=Xh~(0Uthmz~yoYlgR|yw#5*F^*gY^U|=F*&N+=S8UUzsPRuOz0oiY67R)TDYTR%A
zc|?qe82ZM{(aZufM-hqrX2{Iaa5#*zwc8F)CKK&v|K-b<)>VI5mStI%Wm%SGS(as4
emStI%W$*<i`!0n+`mOl@0000<MNUMnLSTXt=w3Jg

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xhdpi/cr3_button_inc_dark.png b/android/res/drawable-xhdpi/cr3_button_inc_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3dc12bf2bb588b19a3db68b12ee006fcd033e65
GIT binary patch
literal 3597
zcmW+(dpwihA3s!@k+xC|m9|ieFjOuRX~ZHKOD3fjCAVc3bBRJ$uCd%Nebq)ZLQB%p
zMN?=?3zZCA%q1a(Tz^l$Kh8O?=RBYHdCvKK-sk=KJXa4NI<N|^4hI0Na<C_mpwaqY
zgDF6Lx!-vyG$_*SJ?H?et@_vGr~|1lph>k*+oPeb!M>qkCqsNdSXh|8UywhYdXna&
z9~^Qf|0iA@S~1Uou+J^LVAN9(ys<f>s`BSh?#KT0cQzYgS60B5%f*=+nht7y7#v4w
zI2JZ$|J5{f(uNoIEYlAqZtr~2zhZ7RYy(0}gk8QD@Zo5S?)k(9%LOvy(uJukRV(dJ
zzxM6$mWvK>cVC$8B6oNRK=HTCsEjm^CQaN*<Hl}lGyu}Tak6Yi@ViL%dunPbfgThX
zSZFq$2EK9$hLcytb-fpp+M;;k&^ATOaSOc<PP+K&U)|l^r~Li>r=|-FH_3r}j~_=3
zJWfnZR0j9z>&;wi1cK<x>-M~f*I42Gh!{L1{rC~t+S*#8cTf(DkN5AN=}*)=)V9#~
zY}v)BA8G)+XS{*H_|?nX%y!1lxXK$g&dT@Q{>qcYJp&RGOZsvDo$h4Yov1V58Q9Z$
zS!0=Z(4XFry<$2JrA%Wm$jXWPH>xC-l$Wplx-w2Kw887=g@*feb<Je*b=(yL&~FEx
z<{y4X)adt=MGA^g$_nA3p;`?+l^av+Y9vFiJnMq)pr}Sm^^B3M;ZXAs6ZO|Yb-HP(
zso%T}pB}H;mX)1tt6`<zis`zc;c_A3&)mY^sR+yJy1GP<tbVDqXnuZD+>Y8>NMD1r
z&CuHRbXvL=S>0(qz}y@&JG71B<(1+jc{@D3<Ii05&p#3G4=K`&^&a9B?(0g%rmOW@
zb0=@L+snto(OPW<!1^-l6Y3U^e}}(&m+&m%JxDjCud%TQ)+u&d%~l{<Yg895YRY7f
z6q&)clNF7%wOfxIIYKi;_07(jr$QzuWjBwk^6pXMnBW?&9C0}r*TS?UwUn{1ky_HV
z98fBW)s-WM$>gKQjwLrVG`Nx1jgE~;Og4XpDM^)LB_aa@gQW8E@xeiRioZ4}tI;DD
z$*!^1_#R@}Bd@pAD5v0HAYEp*%V|Fgg}}kkcuWM<v24T~SldfX^mp!j`OMpzzHdUX
z@9>!EPaeBVK@b<WOc{N%ld|3xebru#8k)y_ed|El;-d!-rZx~%OV24FYz&bTlQQvA
zHJ|?{jGFvva^tm<zKQTQhYVV&r2lwTGj!y>lu3Dzll!uPEA*G6eL8Ep?)U7%lld=6
z25(VYTWi>UdF9y#Cv=!a+rUi@d$`r0alS5TAbfsi!b;A%)DQl3B4_M#{R=`9!)x-_
zFQe(X=)pe`=gqf0Te@UeD>F}iNJ11;yzB;A-o!bkthJ_TcSi@K@I9mOv_}?*wQF+2
zGO&F_Yyt}l2K8DqjyUIIAft<o2Bq{bCYEr32&5I%O$+2qy`&HL(Hi5QLfx~p_4V{#
znK=2t_W5{l!IlYWDLP&ikg(r5z_Bs&3W78i4F?WcK0D%XzB9R@q@+}%ckpv}_X~(}
zP*5od?{nR4(u!Cb8l1Une!t>LP0eLyQ4-`&57mTYM~|ipQGbU!DwcDH9Q_O95uwSr
z6r8WSk99IG3CBe*=kbd;V)v@!+Co(Qy?a}dO43)ZTxlexS3}Ft1AytvD`6|VchfF*
zIJ<{K1WawFelKw4{pXRTEixMwI3sbkO>VI3m{TEYfR*Fen2$L%EO0KQM?AU#v7vx|
z4!^mg{cLE^OVb#5f>KRSJt$z@^TYOzO@D`|2r<E7Ob{Zv^ZIlN(nSe<pMNCV=Z@!r
zcmx*dl`BVJze(HKO7isQBW$*o6gldAGAn&Nea_F%p|Yw<{N?$4*4e<uLAzl*IP|_}
zw8biF1~CxV<864@)};(D&cut?qT^N2w@EDl#IMRoV?tYw*@32ma@K@h3qe;{#t`B4
z;?v>iP>T~Ts^<(*Wq<o-AlWgM{h;Y6>6?^sTn^6d{_vfdDl#KyaWI%&o72{!2^yn}
zWSn-1GO~8)+<*=1hq~t$s;>^lnm`jN5>#2+xr!%}o2i#rkc{;g#Noxuz*DJo^K^ve
zIsXJ#&;HTBqS<C<%a0#FST%YtC8f@|R-?AbjVt3WK^GA(zJaq_7Q5c&HcptFOUL?D
z@<kb1uffe1ZGRbRPut8uDD-&0GnZ|2W&khDQACr#TOq1YRu6%ndEfknZ`NxaACi<F
z&En*A!(~BnbgK2i!mL?Hgio1nEWz1H1(EI-8oV3`4tZQfFo>es5pp}tx0c}J-zuU*
zDYM4(3mqn}+D5ZpQ!EK=XT}+vP+6*aP!Xx!6XgC6tWNz#Gi~DYceMv4Fi(gwjF)Z+
zV)4-r&DM=VQL>8oJs3<PYIEF(SZ$8uZ8jX)algy~;o^YppqW0N`_pw|Y0efzP4|Q?
zNk%Wkq~H`VaKg9!uuCkPWLy&}8us4;eP$p(cri0~6EH=`cTo~cwm<hsEUn$qq<iBz
zMC^VVOB%TxC;~{6?PUcNPtUnlpYNlLZ$_~L-(P2LTf&qqy`wb0K8=x!Euf#~y~K;F
z+*BI*D{?#vxG{NL$PaL=k4Cs*{FbZs=r5Y>$IM(2E{N-J^s5>@Br<_bg7U<5?vQ79
z-`$eIccg~`0k0f>n~iZ;6Dm5H?BeTj#hq6lv-+g(bsse$ibGe))Y^yr{^QBS?>Cbk
zA)FU)1(DO<Os3jxwtU~JUjU3U7xxqW_xoqENqPnbFQB)TCW~<v<Ntjpg2&+#@+zxW
zqlK>kAT)vCppc8sUn?=ZRXiu0-CjICeuKgBV}A1-fDa#!m6Lw%Zbp5Kbf)-ckc3>n
zL7fJZu65|;dz|(|(#_WyvwVqS8lnpBEnt|stKewgI$bDV&j0vme3JJ)sIFBSsQ@ZR
z^2`el6$}imRscvGMuFpYcO<Xx%?(sogV$!2f5x>QjpzOSM|ws8RT-L8Piy{Gkkpne
zonx{3|4z!5{x6nRZs>T{vq;TMt*bVyGCsFt`=G2iW}rsT;LqqW@ToGOu~(LovdY}l
z6wyifC3SUC#W}fJZBBdH+1c59k^*l=NwgeDn3f!~{LSZ#d_@U}kJG&|OPbkg?;%z!
z3|CYw=I3gl<B>Kd601F|58-1x_B$e01JFR<hV|<o^LIl+bjp_~Vei?!yR3I?a$rEm
zIl6u`kYxQ1&`?%bcKpPN()P2eF$;gX9>`=VIE<5PI!WHRmY&M*)QjJOUhd&9hujB~
z!wG3>04LlMe-=DNxMXsN;&U~8ABgHZnMy!J8JWaSOE%lwE#IN9umA4nPyMB-?%-{M
zG190r3eSet8H2||9bJq!8X6k!O;)K<%gW2QaFm5P>9YD|pt<b`@gofFnA~nEQy+_7
z1~P|;>X=8W00SSLmh=812ri&ICAY)S$?TewzDht}Oh1#XNNRzyuA%U-#N>W;^*)AI
z@!2ZzTqqXs0)m5=J<U&4TDVy3?(Tl4(%(p!-f8}xu?f+>!L~o=Bd%5(qss}n-)RRs
ziKs@}pnQW^uTIE;-gk|gD)_reEmv52#-6?xY+XzVzZqUDc?{?)UR||&Pc_W)R?A*9
zLBUPYKQGqF|BetG?b@|dUtd^W{yZG7B18ozPqh7DlXeR~*kkkWw68+$>hiI+sO(rv
z4PcY9a=k2i!|_FY(eNYg@v05ouX-yNH!g@jE69wzQ;m!fQ`6Jk`hlN&dN{Xk-OAB&
zcuPq<RQi?m3Rinj^1g#%NnLL2NeHlkWy>RMV5|>qX}pn79KYe5kI3sIq2`DDH)Uuk
z9yoB|d{|gE_syCji$zg@RodbPc|d3JP0r=M9h<H%-$9{Jt|cWURd2s`ldoa}TMeH0
zsaNqYIAk2f<e7z}>@?KK*1Fn3Y2f<d!OUOdr7vGj9fKfb@|&~0<}uf1yOb{T?kBup
z+ZpTpj<EdH+q;db+}jvqmD>C@JSuAABtES!xVK1cxL}fq?c(w(jJ%1F73>g^S+9KL
z+*Dw(jEUd7H}&g;sT2aKQ^R9oiX#Nlt2cu0#CUKb{IF3(IdScOJ!=AK|Li(Hm9gPY
zlI36=+8~F$0z`J0z`zl#Po`G&_!XCZ*mZaL6EicWqLmHI7U#f*PHMR>`7#gVyMEG)
zL8q?;v84;oK8#KG*NXSXX~xXEuziLm@rh7va}6(EfqX_*vnH$u$0R0;qC$(~*zY5c
zQp0|JzS=ndt2Lmp_#*DzdW$Zz;$syS_|k`gX~uvxw98~FLJ&@)0cOzwYO*!KMK$4U
z5(h;M|Ml&4qyD)xXSKe&{3qMt!Ms(%oE#bRerM6he8YogtJ#%n#u#X$J-9lx=cpG|
zCmOjO9UVu>WT@IhQEgmQ^_^TR_z#G8gcN^d`<9aGP725E7XN`?-lvl7$3~*a<dY1>
zt|u24@{(~;nWDx$U{V3%y0~Sayu8dW&!gI{i*c{>3fFJ`w9$FOX~8sfXM`x;^b<73
zBG(Z*p_HOA(7O_<G@($obniy=HhDFbo(UPN@Rp|6id3NLmCf}laMW=j4rOO$6(F8F
zi&bjV5YG*E?li-4iXC-uPLhWW4Us{CF|K=DG#6YyI;U}hZ5(tp=jhDXr9`Wo8Ov|C
z7GJkHjxkrSSq!kso879OA2VG1COX6Um&4wmzbE9QEVfPApWF}q$^i%4Lxf5j@5}!K
DMux*6

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xhdpi/cr3_button_inc_light.png b/android/res/drawable-xhdpi/cr3_button_inc_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..e722d7fe1404d48aa5360d97784ce088413e1053
GIT binary patch
literal 4036
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

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xhdpi/cr3_button_inc_white.png b/android/res/drawable-xhdpi/cr3_button_inc_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..945d738444bf62f67480989db59982f05e3e56f2
GIT binary patch
literal 3471
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

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xxhdpi/cr3_button_dec_dark.png b/android/res/drawable-xxhdpi/cr3_button_dec_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2a8d28cdc94a1e8b3990ccc6152175b8055ff32
GIT binary patch
literal 2167
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
Ib6#=(0)NIiO#lD@

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xxhdpi/cr3_button_dec_light.png b/android/res/drawable-xxhdpi/cr3_button_dec_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc53e925e362b58ff165207181e2ae495044ea6c
GIT binary patch
literal 2477
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
K*=tiw!v6rXP`^n4

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xxhdpi/cr3_button_dec_white.png b/android/res/drawable-xxhdpi/cr3_button_dec_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cfac42fef04cffee3fe5ca449bbb6711eb67dd5
GIT binary patch
literal 2060
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
H^p$@DM(@iv

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xxhdpi/cr3_button_inc_dark.png b/android/res/drawable-xxhdpi/cr3_button_inc_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..905cd48cb970f7167b935c793b25e4c6cee363b5
GIT binary patch
literal 5996
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

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xxhdpi/cr3_button_inc_light.png b/android/res/drawable-xxhdpi/cr3_button_inc_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf7442277e37880fe3a41c15c1b6a5e0dc02763d
GIT binary patch
literal 7776
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

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xxhdpi/cr3_button_inc_white.png b/android/res/drawable-xxhdpi/cr3_button_inc_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c9c61d718506a6df3058e3c32be8ca896e91a69
GIT binary patch
literal 6170
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

literal 0
HcmV?d00001

diff --git a/android/res/values-v21/styles.xml b/android/res/values-v21/styles.xml
index 7b2062499..78853de0f 100644
--- a/android/res/values-v21/styles.xml
+++ b/android/res/values-v21/styles.xml
@@ -170,6 +170,9 @@
         <item name="textColorOptionLabel">@color/label_light</item>
         <item name="textColorOptionValue">@color/value_light</item>
         <item name="colorControlActivated">@color/common_tint_light</item>
+
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_light</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_light</item>
     </style>
     <style name="Theme.Dark" parent="@style/Theme.Black">
         <item name="android:windowBackground">@drawable/background_tiled_dark</item>
@@ -183,6 +186,9 @@
         <item name="textColorOptionLabel">@color/label_dark</item>
         <item name="textColorOptionValue">@color/value_dark</item>
         <item name="colorControlActivated">@color/common_tint_dark</item>
+
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_dark</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_dark</item>
     </style>
     <style name="Theme.White" parent="@android:style/Theme.Material.Light">
         <item name="android:windowBackground">@android:color/white</item>
@@ -278,8 +284,8 @@
         <item name="cr3_button_info_drawable">@drawable/cr3_button_info</item>
         <item name="cr3_button_log_drawable">@drawable/cr3_button_log</item>
         <item name="cr3_button_light_drawable">@drawable/cr3_button_light</item>
-        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc</item>
-        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec</item>
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_white</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_white</item>
 
         <item name="ic_media_ff_drawable">@drawable/ic_media_ff</item>
         <item name="ic_media_play_drawable">@drawable/ic_media_play</item>
@@ -393,8 +399,8 @@
         <item name="cr3_button_info_drawable">@drawable/cr3_button_info</item>
         <item name="cr3_button_log_drawable">@drawable/cr3_button_log</item>
         <item name="cr3_button_light_drawable">@drawable/cr3_button_light</item>
-        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc</item>
-        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec</item>
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_dark</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_dark</item>
 
         <item name="ic_media_ff_drawable">@drawable/ic_media_ff</item>
         <item name="ic_media_play_drawable">@drawable/ic_media_play</item>
diff --git a/android/res/values-v24/styles.xml b/android/res/values-v24/styles.xml
index be793d462..bcd6bf17f 100644
--- a/android/res/values-v24/styles.xml
+++ b/android/res/values-v24/styles.xml
@@ -44,6 +44,9 @@
         <item name="textColorOptionLabel">@color/label_light</item>
         <item name="textColorOptionValue">@color/value_light</item>
         <item name="colorControlActivated">@color/common_tint_light</item>
+
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_light</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_light</item>
     </style>
 
     <style name="Theme.Dark" parent="@style/Theme.Black">
@@ -58,6 +61,9 @@
         <item name="textColorOptionLabel">@color/label_dark</item>
         <item name="textColorOptionValue">@color/value_dark</item>
         <item name="colorControlActivated">@color/common_tint_dark</item>
+
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_dark</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_dark</item>
     </style>
 
     <style name="Theme.White" parent="@android:style/Theme.Material.Light">
@@ -155,8 +161,8 @@
         <item name="cr3_button_info_drawable">@drawable/cr3_button_info</item>
         <item name="cr3_button_log_drawable">@drawable/cr3_button_log</item>
         <item name="cr3_button_light_drawable">@drawable/cr3_button_light</item>
-        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc</item>
-        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec</item>
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_white</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_white</item>
 
         <item name="ic_media_ff_drawable">@drawable/ic_media_ff</item>
         <item name="ic_media_play_drawable">@drawable/ic_media_play</item>
@@ -272,8 +278,8 @@
         <item name="cr3_button_info_drawable">@drawable/cr3_button_info</item>
         <item name="cr3_button_log_drawable">@drawable/cr3_button_log</item>
         <item name="cr3_button_light_drawable">@drawable/cr3_button_light</item>
-        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc</item>
-        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec</item>
+        <item name="cr3_button_inc_drawable">@drawable/cr3_button_inc_dark</item>
+        <item name="cr3_button_dec_drawable">@drawable/cr3_button_dec_dark</item>
 
         <item name="ic_media_ff_drawable">@drawable/ic_media_ff</item>
         <item name="ic_media_play_drawable">@drawable/ic_media_play</item>
diff --git a/icons_src/classic/convert_all.pl b/icons_src/classic/convert_all.pl
index 99bd66ae6..000925f4b 100755
--- a/icons_src/classic/convert_all.pl
+++ b/icons_src/classic/convert_all.pl
@@ -91,7 +91,13 @@
 	'cr3_button_log-48x48-src.svg' => 'cr3_button_log.png',
 	'cr3_button_light-48x48-src.svg' => 'cr3_button_light.png',
 	'cr3_button_inc-48x48-src.svg' => 'cr3_button_inc.png',
-	'cr3_button_dec-48x48-src.svg' => 'cr3_button_dec.png'
+	'cr3_button_inc_light-48x48-src.svg' => 'cr3_button_inc_light.png',
+	'cr3_button_inc_dark-48x48-src.svg' => 'cr3_button_inc_dark.png',
+	'cr3_button_inc_white-48x48-src.svg' => 'cr3_button_inc_white.png',
+	'cr3_button_dec-48x48-src.svg' => 'cr3_button_dec.png',
+	'cr3_button_dec_light-48x48-src.svg' => 'cr3_button_dec_light.png',
+	'cr3_button_dec_dark-48x48-src.svg' => 'cr3_button_dec_dark.png',
+	'cr3_button_dec_white-48x48-src.svg' => 'cr3_button_dec_white.png'
 );
 
 my %ic_tabs_list=(
diff --git a/icons_src/classic/cr3_button_dec_dark-48x48-src.svg b/icons_src/classic/cr3_button_dec_dark-48x48-src.svg
new file mode 100644
index 000000000..25e390472
--- /dev/null
+++ b/icons_src/classic/cr3_button_dec_dark-48x48-src.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="cr3_button_dec_dark-48x48-src.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48">
+  <defs
+     id="defs2">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1621"
+       x="-0.00768"
+       width="1.01536"
+       y="-0.00768"
+       height="1.01536">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.0736"
+         id="feGaussianBlur1623" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter2266"
+       x="-0.4024014"
+       width="1.8048028"
+       y="-0.4024014"
+       height="1.8048028">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.8563467"
+         id="feGaussianBlur2268" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     guidetolerance="2"
+     objecttolerance="2"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="605"
+     inkscape:window-height="1002"
+     inkscape:window-width="1307"
+     units="px"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="22.867931"
+     inkscape:cx="17.131295"
+     inkscape:zoom="5.6568544"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-284.29999)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path919-2"
+       d="m 12.5,305.29999 h 23 v 6 h -23 z"
+       style="opacity:0.777503;fill:#d0d0d0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2266)" />
+    <path
+       style="mix-blend-mode:normal;fill:#3d3d3d;fill-opacity:0.690196;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 12,304.79999 h 24 v 7 H 12 Z"
+       id="path951"
+       sodipodi:nodetypes="ccccc" />
+    <ellipse
+       r="22.514143"
+       cy="308.29999"
+       cx="24"
+       id="path870"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+    <circle
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870-36"
+       cx="-5.1794691"
+       cy="261.4292"
+       r="0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path919"
+       d="m 12.5,305.29999 h 23 v 6 h -23 z"
+       style="fill:#d0d0d0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1621)" />
+  </g>
+</svg>
diff --git a/icons_src/classic/cr3_button_dec_light-48x48-src.svg b/icons_src/classic/cr3_button_dec_light-48x48-src.svg
new file mode 100644
index 000000000..edf1be4f1
--- /dev/null
+++ b/icons_src/classic/cr3_button_dec_light-48x48-src.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="cr3_button_dec_light-48x48-src.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48">
+  <defs
+     id="defs2">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1621"
+       x="-0.00768"
+       width="1.01536"
+       y="-0.00768"
+       height="1.01536">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.0736"
+         id="feGaussianBlur1623" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter2266"
+       x="-0.4024014"
+       width="1.8048028"
+       y="-0.4024014"
+       height="1.8048028">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.8563467"
+         id="feGaussianBlur2268" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     guidetolerance="2"
+     objecttolerance="2"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="59"
+     inkscape:window-height="1002"
+     inkscape:window-width="1292"
+     units="px"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="22.867931"
+     inkscape:cx="17.131295"
+     inkscape:zoom="5.6568544"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-284.29999)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path919-2"
+       d="m 12.5,305.29999 h 23 v 6 h -23 z"
+       style="opacity:0.777503;fill:#6b472f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2266)" />
+    <path
+       style="mix-blend-mode:normal;fill:#3d3d3d;fill-opacity:0.690196;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 12,304.79999 h 24 v 7 H 12 Z"
+       id="path951"
+       sodipodi:nodetypes="ccccc" />
+    <ellipse
+       r="22.514143"
+       cy="308.29999"
+       cx="24"
+       id="path870"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+    <circle
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870-36"
+       cx="-5.1794691"
+       cy="261.4292"
+       r="0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path919"
+       d="m 12.5,305.29999 h 23 v 6 h -23 z"
+       style="fill:#6b472f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1621)" />
+  </g>
+</svg>
diff --git a/icons_src/classic/cr3_button_dec_white-48x48-src.svg b/icons_src/classic/cr3_button_dec_white-48x48-src.svg
new file mode 100644
index 000000000..21a256fb4
--- /dev/null
+++ b/icons_src/classic/cr3_button_dec_white-48x48-src.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="cr3_button_dec_white-48x48-src.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48">
+  <defs
+     id="defs2">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1621"
+       x="-0.00768"
+       width="1.01536"
+       y="-0.00768"
+       height="1.01536">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.0736"
+         id="feGaussianBlur1623" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter2266"
+       x="-0.4024014"
+       width="1.8048028"
+       y="-0.4024014"
+       height="1.8048028">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.8563467"
+         id="feGaussianBlur2268" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     guidetolerance="2"
+     objecttolerance="2"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="574"
+     inkscape:window-height="1002"
+     inkscape:window-width="1338"
+     units="px"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="22.867931"
+     inkscape:cx="17.131295"
+     inkscape:zoom="5.6568544"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-284.29999)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path919-2"
+       d="m 12.5,305.29999 h 23 v 6 h -23 z"
+       style="opacity:0.777503;fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2266)" />
+    <path
+       style="mix-blend-mode:normal;fill:#3d3d3d;fill-opacity:0.690196;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 12,304.79999 h 24 v 7 H 12 Z"
+       id="path951"
+       sodipodi:nodetypes="ccccc" />
+    <ellipse
+       r="22.514143"
+       cy="308.29999"
+       cx="24"
+       id="path870"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+    <circle
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870-36"
+       cx="-5.1794691"
+       cy="261.4292"
+       r="0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path919"
+       d="m 12.5,305.29999 h 23 v 6 h -23 z"
+       style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1621)" />
+  </g>
+</svg>
diff --git a/icons_src/classic/cr3_button_inc_dark-48x48-src.svg b/icons_src/classic/cr3_button_inc_dark-48x48-src.svg
new file mode 100644
index 000000000..bedfded40
--- /dev/null
+++ b/icons_src/classic/cr3_button_inc_dark-48x48-src.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="cr3_button_inc_dark-48x48-src.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48">
+  <defs
+     id="defs2">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1621"
+       x="-0.00768"
+       width="1.01536"
+       y="-0.00768"
+       height="1.01536">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.0736"
+         id="feGaussianBlur1623" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter2266"
+       x="-0.4024014"
+       width="1.8048028"
+       y="-0.4024014"
+       height="1.8048028">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.8563467"
+         id="feGaussianBlur2268" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     guidetolerance="2"
+     objecttolerance="2"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="569"
+     inkscape:window-height="1002"
+     inkscape:window-width="1343"
+     units="px"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="32.198486"
+     inkscape:cx="21.943766"
+     inkscape:zoom="8.0000004"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-284.29999)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path919-2"
+       d="M 12.5,305.29999 H 21 v -8.5 h 6 v 8.5 h 8.5 v 6 H 27 v 8.5 h -6 v -8.5 h -8.5 z"
+       style="fill:#d0d0d0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.77750267;filter:url(#filter2266);stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       style="fill:#3d3d3d;fill-opacity:0.690196;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 12,304.79999 h 8.5 v -8.5 h 7 v 8.5 H 36 v 7 h -8.5 v 8.5 h -7 v -8.5 H 12 Z"
+       id="path951"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <ellipse
+       r="22.514143"
+       cy="308.29999"
+       cx="24"
+       id="path870"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+    <circle
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870-36"
+       cx="-5.1794691"
+       cy="261.4292"
+       r="0" />
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path919"
+       d="m 12.49964,305.29999 h 8.5 v -8.5 h 6 v 8.5 h 8.5 v 6 h -8.5 v 8.5 h -6 v -8.5 h -8.5 z"
+       style="fill:#d0d0d0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1621)" />
+  </g>
+</svg>
diff --git a/icons_src/classic/cr3_button_inc_light-48x48-src.svg b/icons_src/classic/cr3_button_inc_light-48x48-src.svg
new file mode 100644
index 000000000..aaa6335f2
--- /dev/null
+++ b/icons_src/classic/cr3_button_inc_light-48x48-src.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="cr3_button_inc_light-48x48-src.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48">
+  <defs
+     id="defs2">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1621"
+       x="-0.00768"
+       width="1.01536"
+       y="-0.00768"
+       height="1.01536">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.0736"
+         id="feGaussianBlur1623" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter2266"
+       x="-0.4024014"
+       width="1.8048028"
+       y="-0.4024014"
+       height="1.8048028">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.8563467"
+         id="feGaussianBlur2268" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     guidetolerance="2"
+     objecttolerance="2"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="606"
+     inkscape:window-height="1002"
+     inkscape:window-width="1306"
+     units="px"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="32.198486"
+     inkscape:cx="21.943766"
+     inkscape:zoom="8.0000004"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-284.29999)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path919-2"
+       d="M 12.5,305.29999 H 21 v -8.5 h 6 v 8.5 h 8.5 v 6 H 27 v 8.5 h -6 v -8.5 h -8.5 z"
+       style="fill:#6b472f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.77750267;filter:url(#filter2266);stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       style="fill:#3d3d3d;fill-opacity:0.690196;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 12,304.79999 h 8.5 v -8.5 h 7 v 8.5 H 36 v 7 h -8.5 v 8.5 h -7 v -8.5 H 12 Z"
+       id="path951"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <ellipse
+       r="22.514143"
+       cy="308.29999"
+       cx="24"
+       id="path870"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+    <circle
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870-36"
+       cx="-5.1794691"
+       cy="261.4292"
+       r="0" />
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path919"
+       d="m 12.49964,305.29999 h 8.5 v -8.5 h 6 v 8.5 h 8.5 v 6 h -8.5 v 8.5 h -6 v -8.5 h -8.5 z"
+       style="fill:#6b472f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1621)" />
+  </g>
+</svg>
diff --git a/icons_src/classic/cr3_button_inc_white-48x48-src.svg b/icons_src/classic/cr3_button_inc_white-48x48-src.svg
new file mode 100644
index 000000000..e47e46a8e
--- /dev/null
+++ b/icons_src/classic/cr3_button_inc_white-48x48-src.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="cr3_button_inc_white-48x48-src.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48">
+  <defs
+     id="defs2">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1621"
+       x="-0.00768"
+       width="1.01536"
+       y="-0.00768"
+       height="1.01536">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.0736"
+         id="feGaussianBlur1623" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter2266"
+       x="-0.4024014"
+       width="1.8048028"
+       y="-0.4024014"
+       height="1.8048028">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.8563467"
+         id="feGaussianBlur2268" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     guidetolerance="2"
+     objecttolerance="2"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="504"
+     inkscape:window-height="1002"
+     inkscape:window-width="1408"
+     units="px"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="32.198486"
+     inkscape:cx="21.943766"
+     inkscape:zoom="8.0000004"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-284.29999)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path919-2"
+       d="M 12.5,305.29999 H 21 v -8.5 h 6 v 8.5 h 8.5 v 6 H 27 v 8.5 h -6 v -8.5 h -8.5 z"
+       style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.77750267;filter:url(#filter2266);stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       style="fill:#3d3d3d;fill-opacity:0.690196;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 12,304.79999 h 8.5 v -8.5 h 7 v 8.5 H 36 v 7 h -8.5 v 8.5 h -7 v -8.5 H 12 Z"
+       id="path951"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <ellipse
+       r="22.514143"
+       cy="308.29999"
+       cx="24"
+       id="path870"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+    <circle
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870-36"
+       cx="-5.1794691"
+       cy="261.4292"
+       r="0" />
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path919"
+       d="m 12.49964,305.29999 h 8.5 v -8.5 h 6 v 8.5 h 8.5 v 6 h -8.5 v 8.5 h -6 v -8.5 h -8.5 z"
+       style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1621)" />
+  </g>
+</svg>

From 33e2dc5aa8b482d6b81f1d855d9dd8182b6980dc Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Tue, 10 Aug 2021 10:15:00 +0400
Subject: [PATCH 34/35] Small cleanup for
 5d8ade603d935d1a6d812f499ad76c9af477f56f.

---
 android/src/org/coolreader/crengine/OptionsDialog.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/android/src/org/coolreader/crengine/OptionsDialog.java b/android/src/org/coolreader/crengine/OptionsDialog.java
index 1f6d7dd65..f706ba1c8 100644
--- a/android/src/org/coolreader/crengine/OptionsDialog.java
+++ b/android/src/org/coolreader/crengine/OptionsDialog.java
@@ -2766,6 +2766,7 @@ private void setupReaderOptions()
 			String faceName = mProperties.getProperty(PROP_FONT_FACE, "");
 			updateFontWeightValues(mFontWeightOption, faceName);
 		});
+		/*
 		mFontWeightOption.setOnChangeHandler(() -> {
 			// enable/disable font hinting option
 			String faceName = mProperties.getProperty(PROP_FONT_FACE, "");
@@ -2774,10 +2775,11 @@ private void setupReaderOptions()
 				ArrayList<Integer> nativeWeightsArray = new ArrayList<>();    // for search
 				for (int w : nativeWeights)
 					nativeWeightsArray.add(w);
-				//int base_weight = mProperties.getInt(PROP_FONT_BASE_WEIGHT, 400);
-				//mFontHintingOption.setEnabled(nativeWeightsArray.contains(base_weight));
+				int base_weight = mProperties.getInt(PROP_FONT_BASE_WEIGHT, 400);
+				mFontHintingOption.setEnabled(nativeWeightsArray.contains(base_weight));
 			}
 		});
+		 */
 		if ( DeviceInfo.EINK_SCREEN )
 			mOptionsStyles.add(new ListOption(this, getString(R.string.options_font_antialias), PROP_FONT_ANTIALIASING).add(mAntialiasEINK, mAntialiasEINKTitles).setDefaultValue("2").setIconIdByAttr(R.attr.cr3_option_text_antialias_drawable, R.drawable.cr3_option_text_antialias));
 		else

From 85e9f51df74f58394dc85c941cec91ab33cf434c Mon Sep 17 00:00:00 2001
From: Aleksey Chernov <valexlin@gmail.com>
Date: Tue, 10 Aug 2021 10:19:01 +0400
Subject: [PATCH 35/35] Android: Do not display subpixel anti-aliasing options
 for "Font antialiasing" parameter in the preferences dialog. It is quite
 difficult for regular user to choose the correct value, and given the rather
 high resolution of screens of modern devices, there is most likely no need
 for subpixel anti-aliasing. For the desktop version (Qt), this options
 remains, since there the effect of subpixel anti-aliasing is visible to the
 naked eye.

---
 .../coolreader/crengine/OptionsDialog.java    | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/android/src/org/coolreader/crengine/OptionsDialog.java b/android/src/org/coolreader/crengine/OptionsDialog.java
index f706ba1c8..74fcf55c8 100644
--- a/android/src/org/coolreader/crengine/OptionsDialog.java
+++ b/android/src/org/coolreader/crengine/OptionsDialog.java
@@ -289,23 +289,13 @@ public static int findBacklightSettingIndex( int value ) {
 			R.string.options_selection_action_dictionary, 
 			R.string.options_selection_action_bookmark, 
 		};
-	int[] mAntialiasEINK = new int[] {
+	// possible values see in crengine/include/lvfont.h: enum font_antialiasing_t
+	int[] mAntialias = new int[] {
 			0, 1, 2
 	};
-	int[] mAntialiasEINKTitles = new int[] {
+	int[] mAntialiasTitles = new int[] {
 			R.string.options_font_antialias_off, R.string.options_font_antialias_on_for_big, R.string.options_font_antialias_on_for_all
 	};
-	// possible values see in crengine/include/lvfont.h: enum font_antialiasing_t
-	int[] mAntialias = new int[] {
-			0, 1, 2,
-			4, 5,
-			8, 9
-		};
-	int[] mAntialiasTitles = new int[] {
-			R.string.options_font_antialias_off, R.string.options_font_antialias_on_for_big, R.string.options_font_antialias_on_for_all,
-			R.string.options_font_antialias_lcd_rgb, R.string.options_font_antialias_lcd_bgr,
-			R.string.options_font_antialias_lcd_v_rgb, R.string.options_font_antialias_lcd_v_bgr
-		};
 	int[] mLandscapePages = new int[] {
 			1, 2
 		};
@@ -2780,10 +2770,7 @@ private void setupReaderOptions()
 			}
 		});
 		 */
-		if ( DeviceInfo.EINK_SCREEN )
-			mOptionsStyles.add(new ListOption(this, getString(R.string.options_font_antialias), PROP_FONT_ANTIALIASING).add(mAntialiasEINK, mAntialiasEINKTitles).setDefaultValue("2").setIconIdByAttr(R.attr.cr3_option_text_antialias_drawable, R.drawable.cr3_option_text_antialias));
-		else
-			mOptionsStyles.add(new ListOption(this, getString(R.string.options_font_antialias), PROP_FONT_ANTIALIASING).add(mAntialias, mAntialiasTitles).setDefaultValue("2").setIconIdByAttr(R.attr.cr3_option_text_antialias_drawable, R.drawable.cr3_option_text_antialias));
+		mOptionsStyles.add(new ListOption(this, getString(R.string.options_font_antialias), PROP_FONT_ANTIALIASING).add(mAntialias, mAntialiasTitles).setDefaultValue("2").setIconIdByAttr(R.attr.cr3_option_text_antialias_drawable, R.drawable.cr3_option_text_antialias));
 		mOptionsStyles.add(new ListOption(this, getString(R.string.options_interline_space), PROP_INTERLINE_SPACE).addPercents(mInterlineSpaces).setDefaultValue("100").setIconIdByAttr(R.attr.cr3_option_line_spacing_drawable, R.drawable.cr3_option_line_spacing));
 		//
 		mEnableMultiLangOption = new BoolOption(this, getString(R.string.options_style_multilang), PROP_TEXTLANG_EMBEDDED_LANGS_ENABLED).setDefaultValue("0").setIconIdByAttr(R.attr.cr3_option_text_multilang_drawable, R.drawable.cr3_option_text_multilang)