From 20f5428e9e2d4dca46dc28a2c9dac56a0ebd57f4 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Sat, 6 Nov 2010 16:09:17 +0000
Subject: [PATCH] default font size depends on display DPI

---
 ChangeLog                                             |  1 +
 assets/default/styles.xml                             |  2 +-
 .../geometerplus/zlibrary/core/library/ZLibrary.java  |  1 +
 .../zlibrary/text/view/style/ZLTextBaseStyle.java     |  6 ++++--
 .../zlibrary/ui/android/library/ZLAndroidLibrary.java | 11 +++++++++++
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 36a73df26..cb8e7d15a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 ===== 0.7.15 (??? ??, 2010) =====
 * Ukrainian localization (by Dmytro Shevchenko) has been added
+* Default font size depends on display DPI
 
 ===== 0.7.14 (Nov 03, 2010) =====
 * Screen brightness adjustment has been implemented (idea was taken from Aldiko and https://github.com/cujo/FBReaderJ)
diff --git a/assets/default/styles.xml b/assets/default/styles.xml
index ac1694b4b..1a7e74437 100644
--- a/assets/default/styles.xml
+++ b/assets/default/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <DefaultStyles>
-	<base family="DroidSerif" fontSize="18"/>
+	<base family="sans-serif" fontSize="18"/>
 	<style id="0" name="Regular Paragraph" firstLineIndentDelta="20" allowHyphenations="true"/>
 	<style id="1" name="Title" fontSizeDelta="10" bold="true" spaceBefore="2" spaceAfter="7" alignment="center" allowHyphenations="false"/>
 	<style id="3" name="Poem Title" fontSizeDelta="2" bold="true" spaceBefore="6" spaceAfter="6" leftIndent="40" allowHyphenations="false"/>
diff --git a/src/org/geometerplus/zlibrary/core/library/ZLibrary.java b/src/org/geometerplus/zlibrary/core/library/ZLibrary.java
index d05bc1de1..799317099 100644
--- a/src/org/geometerplus/zlibrary/core/library/ZLibrary.java
+++ b/src/org/geometerplus/zlibrary/core/library/ZLibrary.java
@@ -39,5 +39,6 @@ public abstract class ZLibrary {
 	abstract public String getCurrentTimeString();
 	abstract public void setScreenBrightness(int percent);
 	abstract public int getScreenBrightness();
+	abstract public int getDisplayDPI();
 	abstract public void openInBrowser(String reference);
 }
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java
index b6fed9eac..07f93912d 100644
--- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java
+++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java
@@ -20,10 +20,11 @@
 package org.geometerplus.zlibrary.text.view.style;
 
 import org.geometerplus.zlibrary.core.options.*;
-import org.geometerplus.zlibrary.text.view.ZLTextStyle;
-import org.geometerplus.zlibrary.text.view.ZLTextHyperlink;
+import org.geometerplus.zlibrary.core.library.ZLibrary;
 
 import org.geometerplus.zlibrary.text.model.ZLTextAlignmentType;
+import org.geometerplus.zlibrary.text.view.ZLTextStyle;
+import org.geometerplus.zlibrary.text.view.ZLTextHyperlink;
 
 public class ZLTextBaseStyle extends ZLTextStyle {
 	private static final String GROUP = "Style";
@@ -49,6 +50,7 @@ public class ZLTextBaseStyle extends ZLTextStyle {
 	public ZLTextBaseStyle(String fontFamily, int fontSize) {
 		super(null, ZLTextHyperlink.NO_LINK);
 		FontFamilyOption = new ZLStringOption(GROUP, "Base:fontFamily", fontFamily);
+		fontSize = fontSize * ZLibrary.Instance().getDisplayDPI() / 320 * 2;
 		FontSizeOption = new ZLIntegerRangeOption(GROUP, "Base:fontSize", 0, 72, fontSize);
 	}
 	
diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
index 29536a68e..2fedc56ef 100644
--- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
+++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
@@ -28,6 +28,7 @@ import android.content.res.AssetFileDescriptor;
 import android.content.Intent;
 import android.net.Uri;
 import android.text.format.DateFormat;
+import android.util.DisplayMetrics;
 
 import org.geometerplus.zlibrary.core.library.ZLibrary;
 import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile;
@@ -132,6 +133,16 @@ public final class ZLAndroidLibrary extends ZLibrary {
 		return (myActivity != null) ? myActivity.getScreenBrightness() : 0;
 	}
 
+	@Override
+	public int getDisplayDPI() {
+		if (myActivity == null) {
+			return 0;
+		}
+		DisplayMetrics metrics = new DisplayMetrics();
+		myActivity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
+		return (int)(160 * metrics.density);
+	}
+
 	private final class AndroidAssetsFile extends ZLResourceFile {
 		AndroidAssetsFile(String path) {
 			super(path);