style choice UI

assets/resources/application/be.xml

@@ -227,6 +227,9 @@
 		<node name="forward" value="Наперад"/>
 		<node name="close" value="Зачыніць FBReader"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Вылучэньне">
 		<node name="copyToClipboard" value="Скапіяваць у кішэню"/>
 		<node name="openInDictionary" value="Адчыніць у слоўніку"/>

assets/resources/application/bg.xml

@@ -226,6 +226,9 @@
 		<node name="forward" value="Напред"/>
 		<node name="close" value="Затвори FBReader"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Етикет">
 		<node name="copyToClipboard" value="Копирай в буфера"/>
 		<node name="openInDictionary" value="Отвори в речника"/>

assets/resources/application/ca.xml

@@ -225,6 +225,9 @@
 		<node name="forward" value="Avant"/>
 		<node name="close" value="Tancar FBReader"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Selección" toBeTranslated="true">
 		<node name="copyToClipboard" value="Copiar al portapapeles" toBeTranslated="true"/>
 		<node name="openInDictionary" value="Obrir al diccionari"/>

assets/resources/application/cs.xml

@@ -230,6 +230,9 @@
 		<node name="forward" value="Vpřed"/>
 		<node name="close" value="Zavřít FBReader"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Výběr">
 		<node name="copyToClipboard" value="Kopírovat do schránky"/>
 		<node name="openInDictionary" value="Otevřít ve slovníku"/>

assets/resources/application/de.xml

@@ -215,6 +215,9 @@
 		<node name="forward" value="Vorwärts"/>
 		<node name="close" value="FBReader schließen"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Auswahl">
 		<node name="copyToClipboard" value="In die Zwischenablage kopieren"/>
 		<node name="openInDictionary" value="Im Wörterbuch nachschlagen"/>

assets/resources/application/en.xml

@@ -221,6 +221,9 @@
 		<node name="forward" value="Forward"/>
 		<node name="close" value="Close FBReader"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s"/>
+	</node>
 	<node name="selection" value="Selection">
 		<node name="copyToClipboard" value="Copy to clipboard"/>
 		<node name="openInDictionary" value="Open in dictionary"/>

assets/resources/application/es.xml

@@ -225,6 +225,9 @@
 		<node name="forward" value="Adelante"/>
 		<node name="close" value="Cerrar FBReader"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Selección">
 		<node name="copyToClipboard" value="Copiar al portapapeles"/>
 		<node name="openInDictionary" value="Abrir en diccionario"/>

assets/resources/application/fr.xml

@@ -214,6 +214,9 @@
 		<node name="forward" value="Suivant"/>
 		<node name="close" value="Fermer FBReader"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Sélection">
 		<node name="copyToClipboard" value="Copier dans le presse-papiers"/>
 		<node name="openInDictionary" value="Ouvrir dans le dictionnaire"/>

assets/resources/application/gl.xml

@@ -211,6 +211,9 @@
 		<node name="forward" value="Forward" toBeTranslated="true"/>
 		<node name="close" value="Close FBReader" toBeTranslated="true"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Selección">
 		<node name="copyToClipboard" value="Copiar no portapapeis"/>
 		<node name="openInDictionary" value="Abrir no dicionario"/>

assets/resources/application/hu.xml

@@ -211,6 +211,9 @@
 		<node name="forward" value="Előre"/>
 		<node name="close" value="FBReader bezárása"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Kijelölés">
 		<node name="copyToClipboard" value="Vágólapra másol"/>
 		<node name="openInDictionary" value="Megnyitás szótárban"/>

assets/resources/application/it.xml

@@ -212,6 +212,9 @@
 		<node name="forward" value="Avanti"/>
 		<node name="close" value="Chiudi FBReader"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Selezione">
 		<node name="copyToClipboard" value="Copia negli Appunti"/>
 		<node name="openInDictionary" value="Apri nel Dizionario"/>

assets/resources/application/ka.xml

@@ -226,6 +226,9 @@
 		<node name="forward" value="წინ"/>
 		<node name="close" value="FBReader დახურვა"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="ნიშნული">
 		<node name="copyToClipboard" value="ბუფერში დაკოპირება"/>
 		<node name="openInDictionary" value="ლექსიკონში ნახვა"/>

assets/resources/application/nb.xml

@@ -221,6 +221,9 @@
 		<node name="forward" value="Fram"/>
 		<node name="close" value="Lukk FBReader"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Utvalg">
 		<node name="copyToClipboard" value="Kopier til utklippstavle"/>
 		<node name="openInDictionary" value="Åpne i ordbok"/>

assets/resources/application/nl.xml

@@ -221,6 +221,9 @@
 		<node name="forward" value="Volgende"/>
 		<node name="close" value="FBReader afsluiten"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Selectie">
 		<node name="copyToClipboard" value="Kopieer naar klembord"/>
 		<node name="openInDictionary" value="Openen in woordenboek"/>

assets/resources/application/pl.xml

@@ -211,6 +211,9 @@
 		<node name="forward" value="Do przodu"/>
 		<node name="close" value="Zamknij FBReadera"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Zaznaczenie">
 		<node name="copyToClipboard" value="Skopiuj do schowka"/>
 		<node name="openInDictionary" value="Sprawdź w słowniku"/>

assets/resources/application/pt.xml

@@ -223,6 +223,9 @@
 		<node name="forward" value="Adiantar"/>
 		<node name="close" value="Feche o FBReader"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Seleção">
 		<node name="copyToClipboard" value="Copiar para o clipboard"/>
 		<node name="openInDictionary" value="Abrir em dicionário"/>

assets/resources/application/ro.xml

@@ -211,6 +211,9 @@
 		<node name="forward" value="Înainte"/>
 		<node name="close" value="Inchide Aplicatia"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Selectie">
 		<node name="copyToClipboard" value="Copiati în clipboard"/>
 		<node name="openInDictionary" value="Open in dictionar"/>

assets/resources/application/ru.xml

@@ -226,6 +226,9 @@
 		<node name="forward" value="Вперед"/>
 		<node name="close" value="Закрыть FBReader"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Стиль %s"/>
+	</node>
 	<node name="selection" value="Пометка">
 		<node name="copyToClipboard" value="Скопировать в буфер"/>
 		<node name="openInDictionary" value="Посмотреть в словаре"/>

assets/resources/application/sr.xml

@@ -221,6 +221,9 @@
 		<node name="forward" value="Напред"/>
 		<node name="close" value="Затвори FBReader"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Одабир">
 		<node name="copyToClipboard" value="Умножи"/>
 		<node name="openInDictionary" value="Отвори у речнику"/>

assets/resources/application/th.xml

@@ -211,6 +211,9 @@
 		<node name="forward" value="Forward" toBeTranslated="true"/>
 		<node name="close" value="ปิด FBReader"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="เลือก">
 		<node name="copyToClipboard" value="คัดลอกไปที่คลิปบอร์ด"/>
 		<node name="openInDictionary" value="เปิดในพจนานุกรม"/>

assets/resources/application/tr.xml

@@ -221,6 +221,9 @@
 		<node name="forward" value="İleri"/>
 		<node name="close" value="FBReader\'i kapat"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Seçenekler">
 		<node name="copyToClipboard" value="Panoya kopyala"/>
 		<node name="openInDictionary" value="Sözlükte bul"/>

assets/resources/application/uk.xml

@@ -211,6 +211,9 @@
 		<node name="forward" value="Вперед"/>
 		<node name="close" value="Закрити FBReader"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Позначка">
 		<node name="copyToClipboard" value="Скопіювати до буфера"/>
 		<node name="openInDictionary" value="Подивитись в словнику"/>

assets/resources/application/vi.xml

@@ -211,6 +211,9 @@
 		<node name="forward" value="Forward" toBeTranslated="true"/>
 		<node name="close" value="Close FBReader" toBeTranslated="true"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="Lựa chọn">
 		<node name="copyToClipboard" value="Chép vào Clipboard"/>
 		<node name="openInDictionary" value="Mở trong Từ điển"/>

assets/resources/application/zh.xml

@@ -211,6 +211,9 @@
 		<node name="forward" value="前进"/>
 		<node name="close" value="关闭FBReader"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="选择">
 		<node name="copyToClipboard" value="复制到剪贴板"/>
 		<node name="openInDictionary" value="打开字典"/>

assets/resources/application/zh_TW.xml

@@ -211,6 +211,9 @@
 		<node name="forward" value="前進"/>
 		<node name="close" value="開閉 FBReader"/>
 	</node>
+	<node name="highlightingStyleMenu">
+		<node name="style" value="Style %s" toBeTranslated="true"/>
+	</node>
 	<node name="selection" value="選擇">
 		<node name="copyToClipboard" value="複製"/>
 		<node name="openInDictionary" value="查詢字典"/>

res/layout/style_item.xml

@@ -3,8 +3,10 @@
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
 	android:minHeight="?android:attr/listPreferredItemHeight"
-	android:paddingLeft="5dip"
+	android:paddingLeft="10dip"
-	android:paddingRight="8dp"
+	android:paddingRight="10dip"
+	android:paddingTop="10dip"
+	android:paddingBottom="10dip"
 	android:orientation="horizontal"
 >
 	<ImageView
@@ -19,6 +21,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="fill_parent"
 		android:gravity="center_vertical|left"
+		android:layout_marginLeft="13dip"
 		android:singleLine="true"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 	/>

res/layout/toc_tree_item.xml

@@ -4,7 +4,7 @@
 	android:layout_height="wrap_content"
 	android:minHeight="?android:attr/listPreferredItemHeight"
 	android:paddingLeft="5dip"
-	android:paddingRight="8dp"
+	android:paddingRight="8dip"
 	android:orientation="horizontal"
 >
 	<ImageView

src/org/geometerplus/android/fbreader/StyleListActivity.java

@@ -25,10 +25,14 @@ import java.util.List;
 import android.app.ListActivity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.widget.*;
 import android.view.*;
 
+import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.ui.android.R;
+import org.geometerplus.zlibrary.ui.android.util.ZLAndroidColorUtil;
 
 import org.geometerplus.fbreader.book.*;
 
@@ -97,9 +101,17 @@ public class StyleListActivity extends ListActivity {
 			final View view = convertView != null
 				? convertView
 				: LayoutInflater.from(parent.getContext()).inflate(R.layout.style_item, parent, false);
+			final HighlightingStyle style = getItem(position);
+
+			final ImageView colorView = (ImageView)view.findViewById(R.id.style_item_color);
+			colorView.setImageDrawable(new ColorDrawable(ZLAndroidColorUtil.rgb(style.BackgroundColor)));
+
 			final TextView titleView = (TextView)view.findViewById(R.id.style_item_title);
-			final String title = "Style " + getItem(position).Id;
+			String title = ZLResource.resource("highlightingStyleMenu")
+				.getResource("style").getValue();
+			title = title.replace("%s", String.valueOf(style.Id));
 			titleView.setText(title);
+
 			return view;
 		}
 

src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java

@@ -77,7 +77,7 @@ final class SQLiteBooksDatabase extends BooksDatabase {
 
 	private void migrate() {
 		final int version = myDatabase.getVersion();
-		final int currentVersion = 24;
+		final int currentVersion = 25;
 		if (version >= currentVersion) {
 			return;
 		}
@@ -133,6 +133,8 @@ final class SQLiteBooksDatabase extends BooksDatabase {
 				updateTables22();
 			case 23:
 				updateTables23();
+			case 24:
+				updateTables24();
 		}
 		myDatabase.setTransactionSuccessful();
 		myDatabase.setVersion(currentVersion);
@@ -1410,10 +1412,13 @@ final class SQLiteBooksDatabase extends BooksDatabase {
 				"style_id INTEGER PRIMARY KEY," +
 				"name TEXT," +
 				"bg_color INTEGER NOT NULL)");
-		myDatabase.execSQL("INSERT OR REPLACE INTO HighlightingStyle (style_id, name, bg_color) VALUES (1, 'default', 136*256*256 + 138*256 + 133)"); // #888a85
-		myDatabase.execSQL("INSERT OR REPLACE INTO HighlightingStyle (style_id, name, bg_color) VALUES (2, 'orange', 245*256*256 + 121*256 + 0)"); // #f57900
-		myDatabase.execSQL("INSERT OR REPLACE INTO HighlightingStyle (style_id, name, bg_color) VALUES (3, 'blue', 114*160*256 + 159*256 + 207)"); // #729fcf
 		myDatabase.execSQL("ALTER TABLE Bookmarks ADD COLUMN style_id INTEGER NOT NULL REFERENCES HighlightingStyle(style_id) DEFAULT 1");
 		myDatabase.execSQL("UPDATE Bookmarks SET end_paragraph = LENGTH(bookmark_text)");
 	}
+
+	private void updateTables24() {
+		myDatabase.execSQL("INSERT OR REPLACE INTO HighlightingStyle (style_id, name, bg_color) VALUES (1, '', 136*256*256 + 138*256 + 133)"); // #888a85
+		myDatabase.execSQL("INSERT OR REPLACE INTO HighlightingStyle (style_id, name, bg_color) VALUES (2, '', 245*256*256 + 121*256 + 0)"); // #f57900
+		myDatabase.execSQL("INSERT OR REPLACE INTO HighlightingStyle (style_id, name, bg_color) VALUES (3, '', 114*256*256 + 159*256 + 207)"); // #729fcf
+	}
 }