mirror of
https://github.com/ankidroid/Anki-Android.git
synced 2024-09-20 12:02:16 +02:00
Changed font size behavior to include font family and font size is now calculated absolutely from CardModel/FieldModel sizes with a general display size factor in preferences.
This commit is contained in:
vanosten
parent
d932a91b83
commit
f4c0042d05
@ -55,12 +55,12 @@
|
||||
android:summary="@string/use_ruby_support_summ"
|
||||
android:key="useRubySupport" />
|
||||
<ListPreference
|
||||
android:title="@string/qa_font_size"
|
||||
android:summary="@string/qa_font_size_summ"
|
||||
android:key="qaFontSize"
|
||||
android:title="@string/display_font_size"
|
||||
android:summary="@string/display_font_size_summ"
|
||||
android:key="displayFontSize"
|
||||
android:defaultValue="0"
|
||||
android:entries="@array/qaFontSizeLabels"
|
||||
android:entryValues="@array/qaFontSizeVals" />
|
||||
android:entries="@array/displayFontSizeLabels"
|
||||
android:entryValues="@array/displayFontSizeVals" />
|
||||
<ListPreference
|
||||
android:title="@string/hide_question_in_answer"
|
||||
android:summary="@string/hide_question_in_answer_summ"
|
||||
|
||||
@ -68,37 +68,39 @@
|
||||
<item>4</item>
|
||||
</string-array>
|
||||
|
||||
<!-- The values below match MIN_QA_FONT_SIZE and MAX_QA_FONT_SIZE in AnkiDroid.java.
|
||||
This is a convenience, not at requirement -->
|
||||
<string-array name="qaFontSizeLabels">
|
||||
<item>Relative</item>
|
||||
<item>3</item>
|
||||
<item>4</item>
|
||||
<item>5</item>
|
||||
<item>6</item>
|
||||
<item>7</item>
|
||||
<item>8</item>
|
||||
<item>9</item>
|
||||
<item>10</item>
|
||||
<item>11</item>
|
||||
<item>12</item>
|
||||
<item>13</item>
|
||||
<item>14</item>
|
||||
<string-array name="displayFontSizeLabels">
|
||||
<item>10 %</item>
|
||||
<item>20 %</item>
|
||||
<item>30 %</item>
|
||||
<item>40 %</item>
|
||||
<item>50 %</item>
|
||||
<item>60 %</item>
|
||||
<item>70 %</item>
|
||||
<item>80 %</item>
|
||||
<item>90 %</item>
|
||||
<item>100 %</item>
|
||||
<item>110 %</item>
|
||||
<item>120 %</item>
|
||||
<item>130 %</item>
|
||||
<item>140 %</item>
|
||||
<item>150 %</item>
|
||||
</string-array>
|
||||
<string-array name="qaFontSizeVals">
|
||||
<item>0</item>
|
||||
<item>3</item>
|
||||
<item>4</item>
|
||||
<item>5</item>
|
||||
<item>6</item>
|
||||
<item>7</item>
|
||||
<item>8</item>
|
||||
<item>9</item>
|
||||
<string-array name="displayFontSizeVals">
|
||||
<item>10</item>
|
||||
<item>11</item>
|
||||
<item>12</item>
|
||||
<item>13</item>
|
||||
<item>14</item>
|
||||
<item>20</item>
|
||||
<item>30</item>
|
||||
<item>40</item>
|
||||
<item>50</item>
|
||||
<item>60</item>
|
||||
<item>70</item>
|
||||
<item>80</item>
|
||||
<item>90</item>
|
||||
<item>100</item>
|
||||
<item>110</item>
|
||||
<item>120</item>
|
||||
<item>130</item>
|
||||
<item>140</item>
|
||||
<item>150</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="hideQuestionInAnswerLabels">
|
||||
|
||||
@ -100,8 +100,8 @@
|
||||
<string name="write_answers_summ">Lets you write the answer and compare it with the correct one</string>
|
||||
<string name="use_ruby_support">Provide ruby annotation support</string>
|
||||
<string name="use_ruby_support_summ">If the characters '[' and ']' are found, then the enclosed text is handled as a ruby annotation</string>
|
||||
<string name="qa_font_size">Font size</string>
|
||||
<string name="qa_font_size_summ">Default font size. Using 'Relative' changes the font dynamically based on space</string>
|
||||
<string name="display_font_size">Relative display font size</string>
|
||||
<string name="display_font_size_summ">The font size to use in the display relative to the definitions in the deck</string>
|
||||
<string name="hide_question_in_answer">Hide question in answer?</string>
|
||||
<string name="hide_question_in_answer_summ">Determines whether the question should be hidden when the answer is shown.</string>
|
||||
<string name="deck_path">Deck path</string>
|
||||
|
||||
@ -78,15 +78,9 @@ public class AnkiDroid extends Activity
|
||||
* Tag for logging messages
|
||||
*/
|
||||
private static final String TAG = "AnkiDroid";
|
||||
|
||||
/** Max size of the font of the questions and answers for relative calculation */
|
||||
protected static final int MAX_QA_FONT_SIZE = 14;
|
||||
|
||||
/** Min size of the font of the questions and answers for relative calculation */
|
||||
protected static final int MIN_QA_FONT_SIZE = 3;
|
||||
|
||||
/** The font size specified in shared preferences. If 0 then font is calculated with MAX/MIN_FONT_SIZE */
|
||||
private int qaFontSize = 0;
|
||||
/** The percentage of the absolute font size specified in the deck. */
|
||||
private int displayFontSize = 0;
|
||||
|
||||
/**
|
||||
* Menus
|
||||
@ -945,13 +939,6 @@ public class AnkiDroid extends Activity
|
||||
content = Sound.extractSounds(deckFilename, content);
|
||||
content = Image.loadImages(deckFilename, content);
|
||||
|
||||
// Calculate the size of the font if relative font size is chosen in preferences
|
||||
int fontSize = qaFontSize;
|
||||
if (0 == qaFontSize) {
|
||||
fontSize = calculateDynamicFontSize(content);
|
||||
}
|
||||
mCard.getSettings().setDefaultFontSize(fontSize);
|
||||
|
||||
// In order to display the bold style correctly, we have to change font-weight to 700
|
||||
content = content.replaceAll("font-weight:600;", "font-weight:700;");
|
||||
|
||||
@ -962,7 +949,7 @@ public class AnkiDroid extends Activity
|
||||
|
||||
// Add CSS for font colour and font size
|
||||
Model myModel = Model.getModel(currentCard.cardModelId, false);
|
||||
content = myModel.getCSSForFontColorSize(currentCard.cardModelId) + content;
|
||||
content = myModel.getCSSForFontColorSize(currentCard.cardModelId, displayFontSize) + content;
|
||||
|
||||
Log.i(TAG, "content card = \n" + content);
|
||||
String card = cardTemplate.replace("::content::", content);
|
||||
@ -970,22 +957,6 @@ public class AnkiDroid extends Activity
|
||||
Sound.playSounds();
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculates a dynamic font size depending on the length of the contents
|
||||
* taking into account that the input string contains html-tags, which will not
|
||||
* be displayed and therefore should not be taken into account.
|
||||
* @param htmlContents
|
||||
* @return font size respecting MIN_QA_FONT_SIZE and MAX_QA_FONT_SIZE
|
||||
*/
|
||||
protected final static int calculateDynamicFontSize(String htmlContent) {
|
||||
// Replace each <br> with 15 spaces, each <hr> with 30 spaces, then remove all html tags and spaces
|
||||
String realContent = htmlContent.replaceAll("\\<br.*?\\>", " ");
|
||||
realContent = realContent.replaceAll("\\<hr.*?\\>", " ");
|
||||
realContent = realContent.replaceAll("\\<.*?\\>", "");
|
||||
realContent = realContent.replaceAll(" ", " ");
|
||||
return Math.max(MIN_QA_FONT_SIZE, MAX_QA_FONT_SIZE - (int)(realContent.length()/5));
|
||||
}
|
||||
|
||||
/** Constant for class attribute signalling answer */
|
||||
protected final static String ANSWER_CLASS = "answer";
|
||||
|
||||
@ -1049,8 +1020,8 @@ public class AnkiDroid extends Activity
|
||||
writeAnswers = preferences.getBoolean("writeAnswers", false);
|
||||
useRubySupport = preferences.getBoolean("useRubySupport", false);
|
||||
//A little hack to get int values from ListPreference. there should be an easier way ...
|
||||
String qaFontSizeString = preferences.getString("qaFontSize", "0");
|
||||
qaFontSize = Integer.parseInt(qaFontSizeString);
|
||||
String displayFontSizeString = preferences.getString("displayFontSize", "100");
|
||||
displayFontSize = Integer.parseInt(displayFontSizeString);
|
||||
hideQuestionInAnswer = Integer.parseInt(preferences.getString("hideQuestionInAnswer", "0"));
|
||||
updateNotifications = preferences.getBoolean("enabled", true);
|
||||
|
||||
|
||||
@ -101,8 +101,8 @@ public class CardModel implements Comparator<CardModel> {
|
||||
private final static String SELECT_STRING = "SELECT id, ordinal, modelId, name, description, active, qformat, aformat" //lformat left out
|
||||
//qedformat, aedformat left out
|
||||
+ ", questionInAnswer"
|
||||
+ ", questionFontSize, questionFontColour" //questionFontFamily, questionAlign left out
|
||||
+ ", answerFontSize, answerFontColour" //same as for question
|
||||
+ ", questionFontFamily, questionFontSize, questionFontColour" //questionAlign left out
|
||||
+ ", answerFontFamily, answerFontSize, answerFontColour" //same as for question
|
||||
+ ", lastFontColour" //lastFontFamily, lastFontSize left out
|
||||
//rest left out
|
||||
+ " FROM cardModels";
|
||||
@ -136,11 +136,13 @@ public class CardModel implements Comparator<CardModel> {
|
||||
myCardModel.qformat = cursor.getString(6);
|
||||
myCardModel.aformat = cursor.getString(7);
|
||||
myCardModel.questionInAnswer = cursor.getInt(8);
|
||||
myCardModel.questionFontSize = cursor.getInt(9);
|
||||
myCardModel.questionFontColour = cursor.getString(10);
|
||||
myCardModel.answerFontSize = cursor.getInt(11);
|
||||
myCardModel.answerFontColour = cursor.getString(12);
|
||||
myCardModel.lastFontColour = cursor.getString(13);
|
||||
myCardModel.questionFontFamily = cursor.getString(9);
|
||||
myCardModel.questionFontSize = cursor.getInt(10);
|
||||
myCardModel.questionFontColour = cursor.getString(11);
|
||||
myCardModel.answerFontFamily = cursor.getString(12);
|
||||
myCardModel.answerFontSize = cursor.getInt(13);
|
||||
myCardModel.answerFontColour = cursor.getString(14);
|
||||
myCardModel.lastFontColour = cursor.getString(15);
|
||||
models.put(myCardModel.id, myCardModel);
|
||||
} while (cursor.moveToNext());
|
||||
}
|
||||
|
||||
@ -66,9 +66,6 @@ public class Model {
|
||||
*/
|
||||
private static HashMap<Long,Model> cardModelToModelMap = new HashMap<Long, Model>();
|
||||
|
||||
// TODO: Javadoc.
|
||||
// TODO: Methods for reading/writing from/to DB.
|
||||
|
||||
// BEGIN SQL table entries
|
||||
long id; // Primary key
|
||||
long deckId; // Foreign key
|
||||
@ -83,7 +80,6 @@ public class Model {
|
||||
int source = 0;
|
||||
// BEGIN SQL table entries
|
||||
|
||||
|
||||
/** Map for convenience and speed which contains CardModels from current model */
|
||||
private TreeMap<Long, CardModel> cardModelsMap = new TreeMap<Long, CardModel>();
|
||||
|
||||
@ -92,6 +88,12 @@ public class Model {
|
||||
|
||||
/** Map for convenience and speed which contains the CSS code related to a CardModel */
|
||||
private HashMap<Long, String> cssCardModelMap = new HashMap<Long, String>();
|
||||
|
||||
/**
|
||||
* The percentage chosen in preferences for font sizing at the time when the css for the CardModels
|
||||
* related to this Model was calcualted in prepareCSSForCardModels.
|
||||
*/
|
||||
private transient int displayPercentage = 0;
|
||||
|
||||
private Model(String name) {
|
||||
this.name = name;
|
||||
@ -163,9 +165,6 @@ public class Model {
|
||||
//load related field models
|
||||
FieldModel.fromDb(modelId, currentModel.fieldModelsMap);
|
||||
|
||||
//prepare CSS for each card model in stead of doing it again and again
|
||||
currentModel.prepareCSSForCardModels();
|
||||
|
||||
//make relations to maps
|
||||
models.put(currentModel.id, currentModel);
|
||||
CardModel myCardModel = null;
|
||||
@ -221,7 +220,7 @@ public class Model {
|
||||
String cssString = null;
|
||||
for (Map.Entry<Long, CardModel> entry : cardModelsMap.entrySet()) {
|
||||
myCardModel = entry.getValue();
|
||||
cssString = createCSSForFontColorSize(myCardModel.id);
|
||||
cssString = createCSSForFontColorSize(myCardModel.id, displayPercentage);
|
||||
this.cssCardModelMap.put(myCardModel.id, cssString);
|
||||
}
|
||||
}
|
||||
@ -229,45 +228,40 @@ public class Model {
|
||||
/**
|
||||
* Returns a cached CSS for the font color and font size of a given CardModel taking into account the included fields
|
||||
* @param myCardModelId
|
||||
* @param percentage the preference factor to use for calculating the display font size from the cardmodel and fontmodel font size
|
||||
* @return the html contents surrounded by a css style which contains class styles for answer/question and fields
|
||||
*/
|
||||
protected final String getCSSForFontColorSize(long myCardModelId) {
|
||||
protected final String getCSSForFontColorSize(long myCardModelId, int percentage) {
|
||||
//tjek whether the percentage is this the same as last time
|
||||
if (this.displayPercentage != percentage) {
|
||||
this.displayPercentage = percentage;
|
||||
prepareCSSForCardModels();
|
||||
}
|
||||
return this.cssCardModelMap.get(myCardModelId);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param myCardModelId
|
||||
* @param percentage the factor to apply to the font size in card model to the display size (in %)
|
||||
* @return the html contents surrounded by a css style which contains class styles for answer/question and fields
|
||||
*/
|
||||
private final String createCSSForFontColorSize(long myCardModelId) {
|
||||
private final String createCSSForFontColorSize(long myCardModelId, int percentage) {
|
||||
StringBuffer sb = new StringBuffer();
|
||||
sb.append("<!-- ").append(percentage).append(" % display font size-->");
|
||||
sb.append("<style type=\"text/css\">\n");
|
||||
CardModel myCardModel = cardModelsMap.get(myCardModelId);
|
||||
|
||||
int referenceFontSize = 20; //this is the default in Anki. Only used if the question font for some reason is not set
|
||||
if (0 < myCardModel.questionFontSize) {
|
||||
referenceFontSize = myCardModel.questionFontSize;
|
||||
}
|
||||
|
||||
//body background
|
||||
if (null != myCardModel.lastFontColour && 0 < myCardModel.lastFontColour.trim().length()) {
|
||||
sb.append("body {background-color:").append(myCardModel.lastFontColour).append(";}\n");
|
||||
}
|
||||
//question font size and color
|
||||
//question
|
||||
sb.append(".").append(AnkiDroid.QUESTION_CLASS).append(" {\n");
|
||||
if (null != myCardModel.questionFontColour && 0 < myCardModel.questionFontColour.trim().length()) {
|
||||
sb.append("color:").append(myCardModel.questionFontColour).append(";\n");
|
||||
}
|
||||
sb.append("font-size:100%;\n");
|
||||
sb.append(calculateDisplay(percentage, myCardModel.questionFontFamily, myCardModel.questionFontSize, myCardModel.questionFontColour));
|
||||
sb.append("}\n");
|
||||
//answer font size and color
|
||||
//answer
|
||||
sb.append(".").append(AnkiDroid.ANSWER_CLASS).append(" {\n");
|
||||
if (null != myCardModel.answerFontColour && 0 < myCardModel.answerFontColour.trim().length()) {
|
||||
sb.append("color:").append(myCardModel.answerFontColour).append(";\n");
|
||||
}
|
||||
if (0 < myCardModel.answerFontSize) {
|
||||
sb.append(calculateRelativeFontSize(referenceFontSize, myCardModel.answerFontSize));
|
||||
}
|
||||
sb.append(calculateDisplay(percentage, myCardModel.answerFontFamily, myCardModel.answerFontSize, myCardModel.answerFontColour));
|
||||
sb.append("}\n");
|
||||
//css for fields. Gets css for all fields no matter whether they actually are used in a given card model
|
||||
FieldModel myFieldModel = null;
|
||||
@ -276,12 +270,7 @@ public class Model {
|
||||
myFieldModel = entry.getValue();
|
||||
hexId = "fm" + Long.toHexString(myFieldModel.id);
|
||||
sb.append(".").append(hexId).append(" {\n");
|
||||
if (null != myFieldModel.quizFontColour && 0 < myFieldModel.quizFontColour.trim().length()) {
|
||||
sb.append("color: ").append(myFieldModel.quizFontColour).append(";\n");
|
||||
}
|
||||
if (0 < myFieldModel.quizFontSize) {
|
||||
sb.append(calculateRelativeFontSize(referenceFontSize, myFieldModel.quizFontSize));
|
||||
}
|
||||
sb.append(calculateDisplay(percentage, myFieldModel.quizFontFamily, myFieldModel.quizFontSize, myFieldModel.quizFontColour));
|
||||
sb.append("}\n");
|
||||
}
|
||||
|
||||
@ -289,18 +278,20 @@ public class Model {
|
||||
sb.append("</style>");
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param reference
|
||||
* @param current
|
||||
* @return a css entry for relative font size as a percentage of the current in relation to the reference
|
||||
*/
|
||||
private final static String calculateRelativeFontSize(int reference, int current) {
|
||||
|
||||
private final static String calculateDisplay(int percentage, String fontFamily, int fontSize, String fontColour) {
|
||||
StringBuffer sb = new StringBuffer();
|
||||
sb.append("font-size:");
|
||||
sb.append((100 * current)/reference);
|
||||
sb.append("%;\n");
|
||||
if (null != fontFamily && 0 < fontFamily.trim().length()) {
|
||||
sb.append("font-family:\"").append(fontFamily).append("\";\n");
|
||||
}
|
||||
if (null != fontColour && 0 < fontColour.trim().length()) {
|
||||
sb.append("color:").append(fontColour).append(";\n");
|
||||
}
|
||||
if (0 < fontSize) {
|
||||
sb.append("font-size:");
|
||||
sb.append((percentage * fontSize)/100);
|
||||
sb.append("px;\n");
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user