From c57eeca23fefdf2eaf04f59fa033e680435b6a51 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Sun, 9 Jun 2013 00:45:53 +0100
Subject: [PATCH] AmbilWarna library + new color picker + style editing

Conflicts:
	AndroidManifest.xml
---
 AndroidManifest.xml                           |   3 +-
 AndroidManifest.xml.pattern                   |   3 +-
 ChangeLog                                     |   3 +-
 assets/resources/application/en.xml           |  11 +-
 project.properties                            |   1 +
 res/layout/color_preference.xml               |  33 +++
 res/layout/style_item.xml                     |  19 +-
 .../fbreader/ProcessHyperlinkAction.java      |   2 +-
 .../fbreader/SelectionBookmarkAction.java     |   1 +
 .../fbreader/image/ImageViewActivity.java     |   2 +-
 .../libraryService/BookCollectionShadow.java  |  14 +-
 .../libraryService/LibraryInterface.aidl      |   1 +
 .../libraryService/LibraryService.java        |   4 +
 .../libraryService/SQLiteBooksDatabase.java   |  28 ++-
 .../fbreader/preferences/ColorPreference.java |  72 +++++++
 .../preferences/ZLCheckBoxPreference.java     |   4 +-
 .../preferences/ZLColorPreference.java        | 185 +---------------
 .../preferences/ZLStringPreference.java       |   4 +-
 .../fbreader/style/EditStyleActivity.java     | 137 ++++++++++++
 .../{ => style}/StyleListActivity.java        |  79 +++++--
 .../fbreader/book/BookCollection.java         |   6 +
 .../geometerplus/fbreader/book/BookEvent.java |   3 +-
 .../fbreader/book/BooksDatabase.java          |   5 +-
 .../fbreader/book/HighlightingStyle.java      |  33 ++-
 .../fbreader/book/IBookCollection.java        |   1 +
 .../fbreader/book/XMLSerializer.java          |  39 ++--
 .../fbreader/BookmarkHighlighting.java        |   2 +-
 .../fbreader/fbreader/FBReaderApp.java        |   3 +-
 .../zlibrary/core/options/ZLColorOption.java  |   4 +-
 .../zlibrary/core/util/ZLColor.java           |   4 +-
 .../zlibrary/text/view/ZLTextView.java        |   8 +-
 third-party/AmbilWarna/AmbilWarna.iml         |  30 +++
 third-party/AmbilWarna/AndroidManifest.xml    |  13 ++
 third-party/AmbilWarna/build.xml              |  92 ++++++++
 third-party/AmbilWarna/project.properties     |  14 ++
 .../drawable-hdpi/ambilwarna_arrow_down.png   | Bin 0 -> 1032 bytes
 .../drawable-hdpi/ambilwarna_arrow_right.png  | Bin 0 -> 1041 bytes
 .../res/drawable-hdpi/ambilwarna_cursor.png   | Bin 0 -> 666 bytes
 .../res/drawable-hdpi/ambilwarna_target.png   | Bin 0 -> 983 bytes
 .../drawable-ldpi/ambilwarna_arrow_down.png   | Bin 0 -> 748 bytes
 .../drawable-ldpi/ambilwarna_arrow_right.png  | Bin 0 -> 751 bytes
 .../res/drawable-ldpi/ambilwarna_cursor.png   | Bin 0 -> 480 bytes
 .../res/drawable-ldpi/ambilwarna_target.png   | Bin 0 -> 607 bytes
 .../drawable-xhdpi/ambilwarna_arrow_down.png  | Bin 0 -> 1097 bytes
 .../drawable-xhdpi/ambilwarna_arrow_right.png | Bin 0 -> 1151 bytes
 .../res/drawable-xhdpi/ambilwarna_cursor.png  | Bin 0 -> 782 bytes
 .../res/drawable-xhdpi/ambilwarna_target.png  | Bin 0 -> 1526 bytes
 .../res/drawable/ambilwarna_arrow_down.png    | Bin 0 -> 889 bytes
 .../res/drawable/ambilwarna_arrow_right.png   | Bin 0 -> 814 bytes
 .../res/drawable/ambilwarna_cursor.png        | Bin 0 -> 579 bytes
 .../res/drawable/ambilwarna_hue.png           | Bin 0 -> 455 bytes
 .../res/drawable/ambilwarna_target.png        | Bin 0 -> 816 bytes
 .../res/layout-land/ambilwarna_dialog.xml     |  85 ++++++++
 .../res/layout/ambilwarna_dialog.xml          |  78 +++++++
 .../res/layout/ambilwarna_pref_widget.xml     |  10 +
 .../AmbilWarna/res/values-land/dimen.xml      |   5 +
 .../res/values-xlarge-land/dimen.xml          |   5 +
 third-party/AmbilWarna/res/values/dimen.xml   |   7 +
 .../src/yuku/ambilwarna/AmbilWarnaDialog.java | 198 ++++++++++++++++++
 .../src/yuku/ambilwarna/AmbilWarnaKotak.java  |  46 ++++
 .../widget/AmbilWarnaPrefWidgetView.java      |  45 ++++
 .../widget/AmbilWarnaPreference.java          | 129 ++++++++++++
 62 files changed, 1222 insertions(+), 249 deletions(-)
 create mode 100644 res/layout/color_preference.xml
 create mode 100644 src/org/geometerplus/android/fbreader/preferences/ColorPreference.java
 create mode 100644 src/org/geometerplus/android/fbreader/style/EditStyleActivity.java
 rename src/org/geometerplus/android/fbreader/{ => style}/StyleListActivity.java (61%)
 create mode 100644 third-party/AmbilWarna/AmbilWarna.iml
 create mode 100644 third-party/AmbilWarna/AndroidManifest.xml
 create mode 100644 third-party/AmbilWarna/build.xml
 create mode 100644 third-party/AmbilWarna/project.properties
 create mode 100644 third-party/AmbilWarna/res/drawable-hdpi/ambilwarna_arrow_down.png
 create mode 100644 third-party/AmbilWarna/res/drawable-hdpi/ambilwarna_arrow_right.png
 create mode 100644 third-party/AmbilWarna/res/drawable-hdpi/ambilwarna_cursor.png
 create mode 100644 third-party/AmbilWarna/res/drawable-hdpi/ambilwarna_target.png
 create mode 100644 third-party/AmbilWarna/res/drawable-ldpi/ambilwarna_arrow_down.png
 create mode 100644 third-party/AmbilWarna/res/drawable-ldpi/ambilwarna_arrow_right.png
 create mode 100644 third-party/AmbilWarna/res/drawable-ldpi/ambilwarna_cursor.png
 create mode 100644 third-party/AmbilWarna/res/drawable-ldpi/ambilwarna_target.png
 create mode 100644 third-party/AmbilWarna/res/drawable-xhdpi/ambilwarna_arrow_down.png
 create mode 100644 third-party/AmbilWarna/res/drawable-xhdpi/ambilwarna_arrow_right.png
 create mode 100644 third-party/AmbilWarna/res/drawable-xhdpi/ambilwarna_cursor.png
 create mode 100644 third-party/AmbilWarna/res/drawable-xhdpi/ambilwarna_target.png
 create mode 100644 third-party/AmbilWarna/res/drawable/ambilwarna_arrow_down.png
 create mode 100644 third-party/AmbilWarna/res/drawable/ambilwarna_arrow_right.png
 create mode 100644 third-party/AmbilWarna/res/drawable/ambilwarna_cursor.png
 create mode 100644 third-party/AmbilWarna/res/drawable/ambilwarna_hue.png
 create mode 100644 third-party/AmbilWarna/res/drawable/ambilwarna_target.png
 create mode 100644 third-party/AmbilWarna/res/layout-land/ambilwarna_dialog.xml
 create mode 100644 third-party/AmbilWarna/res/layout/ambilwarna_dialog.xml
 create mode 100644 third-party/AmbilWarna/res/layout/ambilwarna_pref_widget.xml
 create mode 100644 third-party/AmbilWarna/res/values-land/dimen.xml
 create mode 100644 third-party/AmbilWarna/res/values-xlarge-land/dimen.xml
 create mode 100644 third-party/AmbilWarna/res/values/dimen.xml
 create mode 100644 third-party/AmbilWarna/src/yuku/ambilwarna/AmbilWarnaDialog.java
 create mode 100644 third-party/AmbilWarna/src/yuku/ambilwarna/AmbilWarnaKotak.java
 create mode 100644 third-party/AmbilWarna/src/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java
 create mode 100644 third-party/AmbilWarna/src/yuku/ambilwarna/widget/AmbilWarnaPreference.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2f05bfade..8cf468a0b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -112,7 +112,8 @@
 			<meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
 		</activity>
 		<activity android:name="org.geometerplus.android.fbreader.CancelActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
-		<activity android:name="org.geometerplus.android.fbreader.StyleListActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
+		<activity android:name="org.geometerplus.android.fbreader.style.StyleListActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
+		<activity android:name="org.geometerplus.android.fbreader.style.EditStyleActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
 		<activity android:name="org.geometerplus.android.fbreader.image.ImageViewActivity" android:process=":imageView" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize"/>
 		<service android:name="org.geometerplus.android.fbreader.libraryService.LibraryService" android:launchMode="singleTask" android:process=":libraryService">
 			<intent-filter>
diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern
index 81071efb7..22aedb2a3 100644
--- a/AndroidManifest.xml.pattern
+++ b/AndroidManifest.xml.pattern
@@ -112,7 +112,8 @@
 			<meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
 		</activity>
 		<activity android:name="org.geometerplus.android.fbreader.CancelActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
-		<activity android:name="org.geometerplus.android.fbreader.StyleListActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
+		<activity android:name="org.geometerplus.android.fbreader.style.StyleListActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
+		<activity android:name="org.geometerplus.android.fbreader.style.EditStyleActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
 		<activity android:name="org.geometerplus.android.fbreader.image.ImageViewActivity" android:process=":imageView" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize"/>
 		<service android:name="org.geometerplus.android.fbreader.libraryService.LibraryService" android:launchMode="singleTask" android:process=":libraryService">
 			<intent-filter>
diff --git a/ChangeLog b/ChangeLog
index 06b939ae3..93c30401e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
-===== 1.8.2 (May ??, 2013) =====
+===== 1.8.2 (Jun ??, 2013) =====
+* New color picker dialog (AmbilWarna library http://code.google.com/p/android-color-picker/ is used)
 * Updated Spanish loading (by Diego Bernardi, sponsored by Panacea Supplies)
 * Updated Czech localization (by Marek Pavelka)
 * Updated Dutch localization (by Frank Fesevur)
diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml
index 123c1b39e..d3af951f0 100644
--- a/assets/resources/application/en.xml
+++ b/assets/resources/application/en.xml
@@ -221,10 +221,19 @@
 		<node name="forward" value="Forward"/>
 		<node name="close" value="Close FBReader"/>
 	</node>
+	<node name="style" value="Style %s"/>
 	<node name="highlightingStyleMenu">
-		<node name="style" value="Style %s"/>
+		<node name="editStyle" value="Edit style…"/>
 		<node name="deleteBookmark" value="Delete bookmark"/>
 	</node>
+	<node name="editStyle">
+		<node name="name" value="Style name"/>
+		<node name="invisible" value="Invisible">
+			<node name="summaryOn" value="Do not highlight bookmarks"/>
+			<node name="summaryOff" value="Highlight bookmarks"/>
+		</node>
+		<node name="bgColor" value="Background color"/>
+	</node>
 	<node name="selection" value="Selection">
 		<node name="copyToClipboard" value="Copy to clipboard"/>
 		<node name="openInDictionary" value="Open in dictionary"/>
diff --git a/project.properties b/project.properties
index be2a2e9df..8926bf025 100644
--- a/project.properties
+++ b/project.properties
@@ -11,3 +11,4 @@ java.encoding=utf-8
 # proguard.config=proguard.cfg
 # Project target.
 target=android-14
+android.library.reference.1=third-party/AmbilWarna
diff --git a/res/layout/color_preference.xml b/res/layout/color_preference.xml
new file mode 100644
index 000000000..ed242fa03
--- /dev/null
+++ b/res/layout/color_preference.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:minHeight="?android:attr/listPreferredItemHeight"
+	android:paddingRight="10dip"
+	android:paddingTop="10dip"
+	android:paddingBottom="10dip"
+	android:orientation="horizontal"
+>
+	<yuku.ambilwarna.widget.AmbilWarnaPrefWidgetView 
+		android:id="@+id/color_preference_widget" 
+		android:layout_width="24dp"
+		android:layout_height="24dp"
+		android:layout_gravity="center_vertical|left"
+		android:focusable="false"
+		android:clickable="false"
+	/>
+	<TextView
+		android:id="@+id/color_preference_title" 
+		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"
+	/>
+	<View
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:layout_weight="3"
+	/>
+</LinearLayout>
diff --git a/res/layout/style_item.xml b/res/layout/style_item.xml
index 22785bdb3..176920eb2 100644
--- a/res/layout/style_item.xml
+++ b/res/layout/style_item.xml
@@ -9,12 +9,13 @@
 	android:paddingBottom="10dip"
 	android:orientation="horizontal"
 >
-	<ImageView
+	<yuku.ambilwarna.widget.AmbilWarnaPrefWidgetView 
 		android:id="@+id/style_item_color"
-		android:layout_width="wrap_content"
-		android:layout_height="fill_parent"
-		android:minHeight="?android:attr/listPreferredItemHeight"
-		android:minWidth="?android:attr/listPreferredItemHeight"
+		android:layout_width="24dp"
+		android:layout_height="24dp"
+		android:layout_gravity="center_vertical|left"
+		android:focusable="false"
+		android:clickable="false"
 	/>
 	<TextView
 		android:id="@+id/style_item_title"
@@ -28,5 +29,13 @@
 	<View
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
+		android:layout_weight="3"
+	/>
+	<Button
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:id="@+id/style_item_edit_button"
+		android:focusable="false"
+		android:focusableInTouchMode="false"
 	/>
 </LinearLayout>
diff --git a/src/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java b/src/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java
index de3b9c84c..291236067 100644
--- a/src/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java
+++ b/src/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java
@@ -77,7 +77,7 @@ class ProcessHyperlinkAction extends FBAndroidAction {
 					intent.setData(Uri.parse(url));
 					intent.putExtra(
 						ImageViewActivity.BACKGROUND_COLOR_KEY,
-						Reader.ImageViewBackgroundOption.getValue().getIntValue()
+						Reader.ImageViewBackgroundOption.getValue().intValue()
 					);
 					OrientationUtil.startActivity(BaseActivity, intent);
 				} catch (Exception e) {
diff --git a/src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java b/src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java
index cefa6747c..c30c96a72 100644
--- a/src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java
+++ b/src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java
@@ -27,6 +27,7 @@ import org.geometerplus.fbreader.book.Bookmark;
 import org.geometerplus.fbreader.book.SerializerUtil;
 import org.geometerplus.fbreader.fbreader.FBReaderApp;
 
+import org.geometerplus.android.fbreader.style.StyleListActivity;
 import org.geometerplus.android.util.UIUtil;
 
 public class SelectionBookmarkAction extends FBAndroidAction {
diff --git a/src/org/geometerplus/android/fbreader/image/ImageViewActivity.java b/src/org/geometerplus/android/fbreader/image/ImageViewActivity.java
index aee95b7c1..5ca508b6f 100644
--- a/src/org/geometerplus/android/fbreader/image/ImageViewActivity.java
+++ b/src/org/geometerplus/android/fbreader/image/ImageViewActivity.java
@@ -65,7 +65,7 @@ public class ImageViewActivity extends Activity {
 		final Intent intent = getIntent();
 
 		myBgColor = new ZLColor(
-			intent.getIntExtra(BACKGROUND_COLOR_KEY, new ZLColor(127, 127, 127).getIntValue())
+			intent.getIntExtra(BACKGROUND_COLOR_KEY, new ZLColor(127, 127, 127).intValue())
 		);
 
 		final Uri uri = intent.getData();
diff --git a/src/org/geometerplus/android/fbreader/libraryService/BookCollectionShadow.java b/src/org/geometerplus/android/fbreader/libraryService/BookCollectionShadow.java
index 5ec7f4daf..fe46e8d5a 100644
--- a/src/org/geometerplus/android/fbreader/libraryService/BookCollectionShadow.java
+++ b/src/org/geometerplus/android/fbreader/libraryService/BookCollectionShadow.java
@@ -416,7 +416,7 @@ public class BookCollectionShadow extends AbstractBookCollection implements Serv
 		}
 	}
 
-	public HighlightingStyle getHighlightingStyle(int styleId) {
+	public synchronized HighlightingStyle getHighlightingStyle(int styleId) {
 		if (myInterface == null) {
 			return null;
 		}
@@ -427,7 +427,7 @@ public class BookCollectionShadow extends AbstractBookCollection implements Serv
 		}
 	}
 
-	public List<HighlightingStyle> highlightingStyles() {
+	public synchronized List<HighlightingStyle> highlightingStyles() {
 		if (myInterface == null) {
 			return Collections.emptyList();
 		}
@@ -438,6 +438,16 @@ public class BookCollectionShadow extends AbstractBookCollection implements Serv
 		}
 	}
 
+	public synchronized void saveHighlightingStyle(HighlightingStyle style) {
+		if (myInterface != null) {
+			try {
+				myInterface.saveHighlightingStyle(SerializerUtil.serialize(style));
+			} catch (RemoteException e) {
+				// ignore
+			}
+		}
+	}
+
 	// method from ServiceConnection interface
 	public synchronized void onServiceConnected(ComponentName name, IBinder service) {
 		myInterface = LibraryInterface.Stub.asInterface(service);
diff --git a/src/org/geometerplus/android/fbreader/libraryService/LibraryInterface.aidl b/src/org/geometerplus/android/fbreader/libraryService/LibraryInterface.aidl
index 40f83b69d..354e308f8 100644
--- a/src/org/geometerplus/android/fbreader/libraryService/LibraryInterface.aidl
+++ b/src/org/geometerplus/android/fbreader/libraryService/LibraryInterface.aidl
@@ -47,4 +47,5 @@ interface LibraryInterface {
 
 	String getHighlightingStyle(in int styleId);
 	List<String> highlightingStyles();
+	void saveHighlightingStyle(in String style);
 }
diff --git a/src/org/geometerplus/android/fbreader/libraryService/LibraryService.java b/src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
index 713287a52..d438c4b36 100644
--- a/src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
+++ b/src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
@@ -269,6 +269,10 @@ public class LibraryService extends Service {
 		public List<String> highlightingStyles() {
 			return SerializerUtil.serializeStyleList(myCollection.highlightingStyles());
 		}
+
+		public void saveHighlightingStyle(String style) {
+			myCollection.saveHighlightingStyle(SerializerUtil.deserializeStyle(style));
+		}
 	}
 
 	private volatile LibraryImplementation myLibrary;
diff --git a/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java b/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
index e327a54f2..bd4b9a9a1 100644
--- a/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
+++ b/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
@@ -28,10 +28,11 @@ import android.database.sqlite.SQLiteStatement;
 import android.database.SQLException;
 import android.database.Cursor;
 
+import org.geometerplus.zlibrary.core.config.ZLConfig;
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 import org.geometerplus.zlibrary.core.options.ZLStringOption;
 import org.geometerplus.zlibrary.core.options.ZLIntegerOption;
-import org.geometerplus.zlibrary.core.config.ZLConfig;
+import org.geometerplus.zlibrary.core.util.ZLColor;
 import org.geometerplus.zlibrary.text.view.ZLTextPosition;
 import org.geometerplus.zlibrary.text.view.ZLTextFixedPosition;
 
@@ -883,15 +884,34 @@ final class SQLiteBooksDatabase extends BooksDatabase {
 	@Override
 	protected List<HighlightingStyle> loadStyles() {
 		final LinkedList<HighlightingStyle> list = new LinkedList<HighlightingStyle>();
-		final String sql = "SELECT style_id,bg_color FROM HighlightingStyle";
+		final String sql = "SELECT style_id,name,bg_color FROM HighlightingStyle";
 		final Cursor cursor = myDatabase.rawQuery(sql, null);
 		while (cursor.moveToNext()) {
-			list.add(createStyle((int)cursor.getLong(0), (int)cursor.getLong(1)));
+			list.add(createStyle(
+				(int)cursor.getLong(0),
+				cursor.getString(1),
+				(int)cursor.getLong(2)
+			));
 		}
 		cursor.close();
 		return list;
 	}
 
+	private SQLiteStatement myInsertStyleStatement;
+	protected void saveStyle(HighlightingStyle style) {
+		if (myInsertStyleStatement == null) {
+			myInsertStyleStatement = myDatabase.compileStatement(
+				"INSERT OR REPLACE INTO HighlightingStyle (style_id,name,bg_color) VALUES (?,?,?)"
+			);
+		}
+		myInsertStyleStatement.bindLong(1, style.Id);
+		final String name = style.getName();
+		myInsertStyleStatement.bindString(2, name != null ? name : "");
+		final ZLColor bgColor = style.getBackgroundColor();
+		myInsertStyleStatement.bindLong(3, bgColor != null ? bgColor.intValue() : -1);
+		myInsertStyleStatement.executeInsert();
+	}
+
 	private SQLiteStatement myInsertBookmarkStatement;
 	private SQLiteStatement myUpdateBookmarkStatement;
 	@Override
@@ -1410,7 +1430,7 @@ final class SQLiteBooksDatabase extends BooksDatabase {
 		myDatabase.execSQL(
 			"CREATE TABLE IF NOT EXISTS HighlightingStyle(" +
 				"style_id INTEGER PRIMARY KEY," +
-				"name TEXT," +
+				"name TEXT NOT NULL," +
 				"bg_color INTEGER NOT NULL)");
 		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)");
diff --git a/src/org/geometerplus/android/fbreader/preferences/ColorPreference.java b/src/org/geometerplus/android/fbreader/preferences/ColorPreference.java
new file mode 100644
index 000000000..02fdccc07
--- /dev/null
+++ b/src/org/geometerplus/android/fbreader/preferences/ColorPreference.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2010-2013 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+package org.geometerplus.android.fbreader.preferences;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.view.View;
+import android.widget.TextView;
+
+import yuku.ambilwarna.AmbilWarnaDialog;
+
+import org.geometerplus.zlibrary.core.util.ZLColor;
+
+import org.geometerplus.zlibrary.ui.android.R;
+import org.geometerplus.zlibrary.ui.android.util.ZLAndroidColorUtil;
+
+public abstract class ColorPreference extends Preference {
+	protected ColorPreference(Context context) {
+		super(context);
+		setWidgetLayoutResource(R.layout.color_preference);
+	}
+
+	public abstract String getTitle();
+	protected abstract ZLColor getSavedColor();
+	protected abstract void saveColor(ZLColor color);
+
+	@Override
+	protected void onBindView(View view) {
+		super.onBindView(view);
+
+		((TextView)view.findViewById(R.id.color_preference_title)).setText(getTitle());
+		final ZLColor color = getSavedColor();
+		view.findViewById(R.id.color_preference_widget).setBackgroundColor(
+			color != null ? ZLAndroidColorUtil.rgb(color) : 0
+		);
+	}
+
+	@Override
+	protected void onClick() {
+		new AmbilWarnaDialog(getContext(), ZLAndroidColorUtil.rgb(getSavedColor()), new AmbilWarnaDialog.OnAmbilWarnaListener() {
+			@Override
+			public void onOk(AmbilWarnaDialog dialog, int color) {
+				if (!callChangeListener(color)) {
+					return;
+				}
+				saveColor(new ZLColor(color));
+				notifyChanged();
+			}
+
+			@Override
+			public void onCancel(AmbilWarnaDialog dialog) {
+			}
+		}).show();
+	}
+}
diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLCheckBoxPreference.java b/src/org/geometerplus/android/fbreader/preferences/ZLCheckBoxPreference.java
index e2a8c6977..65766aff7 100644
--- a/src/org/geometerplus/android/fbreader/preferences/ZLCheckBoxPreference.java
+++ b/src/org/geometerplus/android/fbreader/preferences/ZLCheckBoxPreference.java
@@ -24,8 +24,8 @@ import android.preference.CheckBoxPreference;
 
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 
-abstract class ZLCheckBoxPreference extends CheckBoxPreference {
-	ZLCheckBoxPreference(Context context, ZLResource rootResource, String resourceKey) {
+public abstract class ZLCheckBoxPreference extends CheckBoxPreference {
+	protected ZLCheckBoxPreference(Context context, ZLResource rootResource, String resourceKey) {
 		super(context);
 
 		ZLResource resource = rootResource.getResource(resourceKey);
diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLColorPreference.java b/src/org/geometerplus/android/fbreader/preferences/ZLColorPreference.java
index 53bd95214..b1ad18be8 100644
--- a/src/org/geometerplus/android/fbreader/preferences/ZLColorPreference.java
+++ b/src/org/geometerplus/android/fbreader/preferences/ZLColorPreference.java
@@ -20,12 +20,6 @@
 package org.geometerplus.android.fbreader.preferences;
 
 import android.content.Context;
-import android.content.DialogInterface;
-import android.graphics.*;
-import android.graphics.drawable.*;
-import android.preference.DialogPreference;
-import android.view.View;
-import android.widget.SeekBar;
 
 import org.geometerplus.zlibrary.core.util.ZLColor;
 import org.geometerplus.zlibrary.core.options.ZLColorOption;
@@ -34,184 +28,27 @@ import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.ui.android.R;
 import org.geometerplus.zlibrary.ui.android.util.ZLAndroidColorUtil;
 
-class ZLColorPreference extends DialogPreference {
+class ZLColorPreference extends ColorPreference {
 	private final ZLColorOption myOption;
-
-	private SeekBar myRedSlider;
-	private SeekBar myGreenSlider;
-	private SeekBar myBlueSlider;
-	private final GradientDrawable myPreviewDrawable = new GradientDrawable();
+	private final String myTitle;
 
 	ZLColorPreference(Context context, ZLResource resource, String resourceKey, ZLColorOption option) {
-		super(context, null);
+		super(context);
 		myOption = option;
-		final String title = resource.getResource(resourceKey).getValue();
-		setTitle(title);
-		setDialogTitle(title);
-		setDialogLayoutResource(R.layout.color_dialog);
+		setWidgetLayoutResource(R.layout.color_preference);
 
-		final ZLResource buttonResource = ZLResource.resource("dialog").getResource("button");
-		setPositiveButtonText(buttonResource.getResource("ok").getValue());
-		setNegativeButtonText(buttonResource.getResource("cancel").getValue());
+		myTitle = resource.getResource(resourceKey).getValue();
 	}
 
-	private SeekBar createSlider(View view, int id, int value, String resourceKey) {
-		final SeekBar slider = (SeekBar)view.findViewById(id);
-		slider.setProgressDrawable(new SeekBarDrawable(
-			slider.getProgressDrawable(),
-			ZLResource.resource("color").getResource(resourceKey).getValue(),
-			slider
-		));
-		slider.setProgress(value);
-		return slider;
+	public String getTitle() {
+		return myTitle;
 	}
 
-	@Override
-	protected void onBindDialogView(View view) {
-		final ZLColor color = myOption.getValue();
-
-		myRedSlider = createSlider(view, R.id.color_red, color.Red, "red");
-		myGreenSlider = createSlider(view, R.id.color_green, color.Green, "green");
-		myBlueSlider = createSlider(view, R.id.color_blue, color.Blue, "blue");
-
-		final View colorBox = view.findViewById(R.id.color_box);
-		colorBox.setBackgroundDrawable(myPreviewDrawable);
-		myPreviewDrawable.setCornerRadius(7);
-		myPreviewDrawable.setColor(ZLAndroidColorUtil.rgb(color));
-
-		final SeekBar.OnSeekBarChangeListener listener = new SeekBar.OnSeekBarChangeListener() {
-			public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-				myPreviewDrawable.setColor(Color.rgb(
-					myRedSlider.getProgress(),
-					myGreenSlider.getProgress(),
-					myBlueSlider.getProgress()
-				));
-				myPreviewDrawable.invalidateSelf();
-			}
-
-			public void onStartTrackingTouch(SeekBar seekBar) {
-			}
-
-			public void onStopTrackingTouch(SeekBar seekBar) {
-				myPreviewDrawable.setColor(Color.rgb(
-					myRedSlider.getProgress(),
-					myGreenSlider.getProgress(),
-					myBlueSlider.getProgress()
-				));
-				myPreviewDrawable.invalidateSelf();
-			}
-		};
-		myRedSlider.setOnSeekBarChangeListener(listener);
-		myGreenSlider.setOnSeekBarChangeListener(listener);
-		myBlueSlider.setOnSeekBarChangeListener(listener);
-
-		super.onBindDialogView(view);
+	protected ZLColor getSavedColor() {
+		return myOption.getValue();
 	}
 
-	@Override
-	public void onClick(DialogInterface dialog, int which) {
-		if (which == DialogInterface.BUTTON_POSITIVE) {
-			myOption.setValue(new ZLColor(
-				myRedSlider.getProgress(),
-				myGreenSlider.getProgress(),
-				myBlueSlider.getProgress()
-			));
-		}
-	}
-
-	/*
-	@Override
-	protected void onBindView(View view) {
-		final ImageView colorView = (ImageView)view.findViewById(R.id.color_preference_color);
-		//colorView.setImageResource(R.drawable.fbreader);
-		final Drawable drawable = new ColorDrawable(0x00FF00);
-		colorView.setImageDrawable(drawable);
-
-		super.onBindView(view);
-	}
-	*/
-
-	static class SeekBarDrawable extends Drawable {
-		private final SeekBar mySlider;
-		private final Drawable myBase;
-		private final String myText;
-		private final Paint myPaint;
-		private final Paint myOutlinePaint;
-		private boolean myLabelOnRight;
-
-		public SeekBarDrawable(Drawable base, String text, SeekBar slider) {
-			mySlider = slider;
-			myBase = base;
-			myText = text;
-
-			myPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-			myPaint.setTypeface(Typeface.DEFAULT_BOLD);
-			myPaint.setColor(Color.BLACK);
-			myPaint.setAlpha(255);
-
-			myOutlinePaint = new Paint(myPaint);
-			myOutlinePaint.setStyle(Paint.Style.STROKE);
-			myOutlinePaint.setStrokeWidth(3);
-			myOutlinePaint.setColor(0xFFAAAAAA);
-
-			myLabelOnRight = mySlider.getProgress() < 128;
-		}
-
-		@Override
-		protected void onBoundsChange(Rect bounds) {
-			myBase.setBounds(bounds);
-		}
-
-		@Override
-		protected boolean onStateChange(int[] state) {
-			invalidateSelf();
-			return false;
-		}
-
-		@Override
-		public boolean isStateful() {
-			return true;
-		}
-
-		@Override
-		protected boolean onLevelChange(int level) {
-			if (level < 4000) {
-				myLabelOnRight = true;
-			} else if (level > 6000) {
-				myLabelOnRight = false;
-			}
-			return myBase.setLevel(level);
-		}
-
-		@Override
-		public void draw(Canvas canvas) {
-			myBase.draw(canvas);
-
-			final Rect bounds = getBounds();
-			final int textSize = bounds.height() * 2 / 3;
-			myPaint.setTextSize(textSize);
-			myOutlinePaint.setTextSize(textSize);
-			final Rect textBounds = new Rect();
-			myPaint.getTextBounds("a", 0, 1, textBounds);
-			final String text = myText + ": " + mySlider.getProgress();
-			final float textWidth = myOutlinePaint.measureText(text);
-			final float x = myLabelOnRight ? bounds.width() - textWidth - 6 : 6;
-			final float y = bounds.height() / 2 + textBounds.height();
-			canvas.drawText(text, x, y, myOutlinePaint);
-			canvas.drawText(text, x, y, myPaint);
-		}
-
-		@Override
-		public int getOpacity() {
-			return PixelFormat.TRANSLUCENT;
-		}
-
-		@Override
-		public void setAlpha(int alpha) {
-		}
-
-		@Override
-		public void setColorFilter(ColorFilter cf) {
-		}
+	protected void saveColor(ZLColor color) {
+		myOption.setValue(color);
 	}
 }
diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLStringPreference.java b/src/org/geometerplus/android/fbreader/preferences/ZLStringPreference.java
index 2bf239c7f..f5702da97 100644
--- a/src/org/geometerplus/android/fbreader/preferences/ZLStringPreference.java
+++ b/src/org/geometerplus/android/fbreader/preferences/ZLStringPreference.java
@@ -24,10 +24,10 @@ import android.preference.EditTextPreference;
 
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 
-abstract class ZLStringPreference extends EditTextPreference {
+public abstract class ZLStringPreference extends EditTextPreference {
 	private String myValue;
 
-	ZLStringPreference(Context context, ZLResource rootResource, String resourceKey) {
+	protected ZLStringPreference(Context context, ZLResource rootResource, String resourceKey) {
 		super(context);
 
 		ZLResource resource = rootResource.getResource(resourceKey);
diff --git a/src/org/geometerplus/android/fbreader/style/EditStyleActivity.java b/src/org/geometerplus/android/fbreader/style/EditStyleActivity.java
new file mode 100644
index 000000000..6f23daa6f
--- /dev/null
+++ b/src/org/geometerplus/android/fbreader/style/EditStyleActivity.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2010-2013 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+package org.geometerplus.android.fbreader.style;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceScreen;
+import android.view.Window;
+
+import org.geometerplus.zlibrary.core.resources.ZLResource;
+import org.geometerplus.zlibrary.core.util.ZLColor;
+
+import org.geometerplus.fbreader.book.HighlightingStyle;
+
+import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow;
+import org.geometerplus.android.fbreader.preferences.*;
+
+public class EditStyleActivity extends PreferenceActivity {
+	static final String STYLE_ID_KEY = "style.id";
+
+	private final ZLResource myRootResource = ZLResource.resource("editStyle");
+	private final BookCollectionShadow myCollection = new BookCollectionShadow();
+	private HighlightingStyle myStyle;
+	private BgColorPreference myBgColorPreference;
+
+	@Override
+	protected void onCreate(Bundle bundle) {
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+		super.onCreate(bundle);
+		Thread.setDefaultUncaughtExceptionHandler(new org.geometerplus.zlibrary.ui.android.library.UncaughtExceptionHandler(this));
+
+		final PreferenceScreen screen = getPreferenceManager().createPreferenceScreen(this);
+		setPreferenceScreen(screen);
+
+		myCollection.bindToService(this, new Runnable() {
+			public void run() {
+				myStyle = myCollection.getHighlightingStyle(getIntent().getIntExtra(STYLE_ID_KEY, -1));
+				if (myStyle == null) {
+					finish();
+					return;
+				}
+				screen.addPreference(new NamePreference());
+				screen.addPreference(new InvisiblePreference());
+				myBgColorPreference = new BgColorPreference();
+				screen.addPreference(myBgColorPreference);
+			}
+		});
+	}
+
+	@Override
+	protected void onDestroy() {
+		myCollection.unbind();
+
+		super.onDestroy();
+	}
+
+	private class NamePreference extends ZLStringPreference {
+		NamePreference() {
+			super(EditStyleActivity.this, myRootResource, "name");
+			super.setValue(myStyle.getName());
+		}
+
+		@Override
+		protected void setValue(String value) {
+			super.setValue(value);
+			myStyle.setName(value);
+			myCollection.saveHighlightingStyle(myStyle);
+		}
+	}
+
+	private class InvisiblePreference extends ZLCheckBoxPreference {
+		private ZLColor mySavedBgColor;
+
+		InvisiblePreference() {
+			super(EditStyleActivity.this, myRootResource, "invisible");
+			setChecked(myStyle.getBackgroundColor() == null);
+		}
+
+		@Override
+		protected void onClick() {
+			super.onClick();
+			if (isChecked()) {
+				mySavedBgColor = myStyle.getBackgroundColor();
+				myStyle.setBackgroundColor(null);
+				myBgColorPreference.setEnabled(false);
+			} else {
+				myStyle.setBackgroundColor(
+					mySavedBgColor != null ? mySavedBgColor : new ZLColor(127, 127, 127)
+				);
+				myBgColorPreference.setEnabled(true);
+			}
+			myCollection.saveHighlightingStyle(myStyle);
+		}
+	}
+
+	private class BgColorPreference extends ColorPreference {
+		BgColorPreference() {
+			super(EditStyleActivity.this);
+			setEnabled(getSavedColor() != null);
+		}
+
+		@Override
+		public String getTitle() {
+			return myRootResource.getResource("bgColor").getValue();
+		}
+
+		@Override
+		protected ZLColor getSavedColor() {
+			return myStyle.getBackgroundColor();
+		}
+
+		@Override
+		protected void saveColor(ZLColor color) {
+			myStyle.setBackgroundColor(color);
+			myCollection.saveHighlightingStyle(myStyle);
+		}
+	}
+}
diff --git a/src/org/geometerplus/android/fbreader/StyleListActivity.java b/src/org/geometerplus/android/fbreader/style/StyleListActivity.java
similarity index 61%
rename from src/org/geometerplus/android/fbreader/StyleListActivity.java
rename to src/org/geometerplus/android/fbreader/style/StyleListActivity.java
index fb0db70a3..b34f2d518 100644
--- a/src/org/geometerplus/android/fbreader/StyleListActivity.java
+++ b/src/org/geometerplus/android/fbreader/style/StyleListActivity.java
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.android.fbreader;
+package org.geometerplus.android.fbreader.style;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,16 +30,20 @@ import android.graphics.drawable.ColorDrawable;
 import android.widget.*;
 import android.view.*;
 
+import yuku.ambilwarna.widget.AmbilWarnaPrefWidgetView;
+
 import org.geometerplus.zlibrary.core.resources.ZLResource;
+import org.geometerplus.zlibrary.core.util.ZLColor;
 import org.geometerplus.zlibrary.ui.android.R;
 import org.geometerplus.zlibrary.ui.android.util.ZLAndroidColorUtil;
 
 import org.geometerplus.fbreader.book.*;
 
+import org.geometerplus.android.fbreader.FBReader;
 import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow;
 
-public class StyleListActivity extends ListActivity {
-	static final String EXISTING_BOOKMARK_KEY = "existing.bookmark";
+public class StyleListActivity extends ListActivity implements IBookCollection.Listener {
+	public static final String EXISTING_BOOKMARK_KEY = "existing.bookmark";
 
 	private final BookCollectionShadow myCollection = new BookCollectionShadow();
 	private boolean myExistingBookmark;
@@ -72,6 +76,7 @@ public class StyleListActivity extends ListActivity {
 				final ActionListAdapter adapter = new ActionListAdapter(styles);
 				setListAdapter(adapter);
 				getListView().setOnItemClickListener(adapter);
+				myCollection.addListener(StyleListActivity.this);
 			}
 		});
 	}
@@ -82,6 +87,17 @@ public class StyleListActivity extends ListActivity {
 		super.onDestroy();
 	}
 
+	// method from IBookCollection.Listener
+	public void onBookEvent(BookEvent event, Book book) {
+		if (event == BookEvent.BookmarkStyleChanged) {
+			((ActionListAdapter)getListAdapter()).setStyleList(myCollection.highlightingStyles());
+		}
+	}
+
+	// method from IBookCollection.Listener
+	public void onBuildEvent(IBookCollection.Status status) {
+	}
+
 	private class ActionListAdapter extends BaseAdapter implements AdapterView.OnItemClickListener {
 		private final List<HighlightingStyle> myStyles;
 
@@ -89,11 +105,17 @@ public class StyleListActivity extends ListActivity {
 			myStyles = new ArrayList<HighlightingStyle>(styles);
 		}
 
-		public final int getCount() {
+		public synchronized void setStyleList(List<HighlightingStyle> styles) {
+			myStyles.clear();
+			myStyles.addAll(styles);
+			notifyDataSetChanged();
+		}
+
+		public final synchronized int getCount() {
 			return myExistingBookmark ? myStyles.size() + 1 : myStyles.size();
 		}
 
-		public final HighlightingStyle getItem(int position) {
+		public final synchronized HighlightingStyle getItem(int position) {
 			return position < myStyles.size() ? myStyles.get(position) : null;
 		}
 
@@ -101,27 +123,54 @@ public class StyleListActivity extends ListActivity {
 			return position;
 		}
 
-		public View getView(int position, View convertView, final ViewGroup parent) {
+		public final synchronized View getView(int position, View convertView, final ViewGroup parent) {
 			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);
+			final AmbilWarnaPrefWidgetView colorView = (AmbilWarnaPrefWidgetView)view.findViewById(R.id.style_item_color);
 			final TextView titleView = (TextView)view.findViewById(R.id.style_item_title);
+			final Button button = (Button)view.findViewById(R.id.style_item_edit_button);
+
+			final ZLResource resource = ZLResource.resource("highlightingStyleMenu");
 
 			if (style != null) {
-				colorView.setVisibility(View.VISIBLE);
-				colorView.setImageDrawable(new ColorDrawable(ZLAndroidColorUtil.rgb(style.BackgroundColor)));
-				titleView.setText(
-					ZLResource.resource("highlightingStyleMenu")
+				String name = style.getName();
+				if (name == null || "".equals(name)) {
+					name = resource
 						.getResource("style").getValue()
-						.replace("%s", String.valueOf(style.Id))
-				);
+						.replace("%s", String.valueOf(style.Id));
+				}
+				final ZLColor color = style.getBackgroundColor();
+				final int rgb = color != null ? ZLAndroidColorUtil.rgb(color) : -1;
+
+				colorView.setVisibility(View.VISIBLE);
+				if (rgb != -1) {
+					colorView.showCross(false);
+					colorView.setBackgroundColor(rgb);
+				} else {
+					colorView.showCross(true);
+					colorView.setBackgroundColor(0);
+				}
+				titleView.setText(name);
+
+				button.setVisibility(View.VISIBLE);
+				button.setText(resource.getResource("editStyle").getValue());
+				button.setOnClickListener(new Button.OnClickListener() {
+					@Override
+					public void onClick(View view) {
+						startActivity(
+							new Intent(StyleListActivity.this, EditStyleActivity.class)
+								.putExtra(EditStyleActivity.STYLE_ID_KEY, style.Id)
+						);
+					}
+				});
 			} else {
 				colorView.setVisibility(View.GONE);
+				button.setVisibility(View.GONE);
 				titleView.setText(
-					ZLResource.resource("highlightingStyleMenu")
+					resource
 						.getResource("deleteBookmark").getValue()
 				);
 			}
@@ -129,7 +178,7 @@ public class StyleListActivity extends ListActivity {
 			return view;
 		}
 
-		public final void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+		public final synchronized void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 			final HighlightingStyle style = getItem(position);
 			myCollection.bindToService(StyleListActivity.this, new Runnable() {
 				public void run() {
diff --git a/src/org/geometerplus/fbreader/book/BookCollection.java b/src/org/geometerplus/fbreader/book/BookCollection.java
index 0a90e086f..9b16badf2 100644
--- a/src/org/geometerplus/fbreader/book/BookCollection.java
+++ b/src/org/geometerplus/fbreader/book/BookCollection.java
@@ -674,4 +674,10 @@ public class BookCollection extends AbstractBookCollection {
 		initStylesTable();
 		return new ArrayList<HighlightingStyle>(myStyles.values());
 	}
+
+	public void saveHighlightingStyle(HighlightingStyle style) {
+		myStyles.put(style.Id, style);
+		myDatabase.saveStyle(style);
+		fireBookEvent(BookEvent.BookmarkStyleChanged, null);
+	}
 }
diff --git a/src/org/geometerplus/fbreader/book/BookEvent.java b/src/org/geometerplus/fbreader/book/BookEvent.java
index 9115d4670..f7f4757b5 100644
--- a/src/org/geometerplus/fbreader/book/BookEvent.java
+++ b/src/org/geometerplus/fbreader/book/BookEvent.java
@@ -23,5 +23,6 @@ public enum BookEvent {
 	Added,
 	Updated,
 	Removed,
-	BookmarksUpdated
+	BookmarksUpdated,
+	BookmarkStyleChanged,
 }
diff --git a/src/org/geometerplus/fbreader/book/BooksDatabase.java b/src/org/geometerplus/fbreader/book/BooksDatabase.java
index a33aabf0e..57167d188 100644
--- a/src/org/geometerplus/fbreader/book/BooksDatabase.java
+++ b/src/org/geometerplus/fbreader/book/BooksDatabase.java
@@ -111,10 +111,11 @@ public abstract class BooksDatabase {
 	protected abstract long saveBookmark(Bookmark bookmark);
 	protected abstract void deleteBookmark(Bookmark bookmark);
 
-	protected HighlightingStyle createStyle(int id, int color) {
-		return new HighlightingStyle(id, new ZLColor(color));
+	protected HighlightingStyle createStyle(int id, String name, int color) {
+		return new HighlightingStyle(id, name, color != -1 ? new ZLColor(color) : null);
 	}
 	protected abstract List<HighlightingStyle> loadStyles();
+	protected abstract void saveStyle(HighlightingStyle style);
 
 	protected abstract ZLTextPosition getStoredPosition(long bookId);
 	protected abstract void storePosition(long bookId, ZLTextPosition position);
diff --git a/src/org/geometerplus/fbreader/book/HighlightingStyle.java b/src/org/geometerplus/fbreader/book/HighlightingStyle.java
index c6c36689b..d9f607808 100644
--- a/src/org/geometerplus/fbreader/book/HighlightingStyle.java
+++ b/src/org/geometerplus/fbreader/book/HighlightingStyle.java
@@ -22,14 +22,41 @@ package org.geometerplus.fbreader.book;
 import java.util.Map;
 import java.util.HashMap;
 
+import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.core.util.ZLColor;
 
 public class HighlightingStyle {
 	public final int Id;
-	public final ZLColor BackgroundColor;
 
-	HighlightingStyle(int id, ZLColor bgColor) {
+	private String myName;
+	private ZLColor myBackgroundColor;
+
+	HighlightingStyle(int id, String name, ZLColor bgColor) {
 		Id = id;
-		BackgroundColor = bgColor;
+		myName = name;
+		myBackgroundColor = bgColor;
+	}
+
+	private String defaultName() {
+		return ZLResource.resource("style").getValue().replace("%s", String.valueOf(Id));
+	}
+
+	public String getName() {
+		if (myName == null || "".equals(myName)) {
+			return defaultName();
+		}
+		return myName;
+	}
+
+	public void setName(String name) {
+		myName = defaultName().equals(name) ? "" : name;
+	}
+
+	public ZLColor getBackgroundColor() {
+		return myBackgroundColor;
+	}
+
+	public void setBackgroundColor(ZLColor bgColor) {
+		myBackgroundColor = bgColor;
 	}
 }
diff --git a/src/org/geometerplus/fbreader/book/IBookCollection.java b/src/org/geometerplus/fbreader/book/IBookCollection.java
index d13152308..905307b78 100644
--- a/src/org/geometerplus/fbreader/book/IBookCollection.java
+++ b/src/org/geometerplus/fbreader/book/IBookCollection.java
@@ -85,4 +85,5 @@ public interface IBookCollection {
 
 	HighlightingStyle getHighlightingStyle(int styleId);
 	List<HighlightingStyle> highlightingStyles();
+	void saveHighlightingStyle(HighlightingStyle style);
 }
diff --git a/src/org/geometerplus/fbreader/book/XMLSerializer.java b/src/org/geometerplus/fbreader/book/XMLSerializer.java
index f3e526227..ed88c9bcd 100644
--- a/src/org/geometerplus/fbreader/book/XMLSerializer.java
+++ b/src/org/geometerplus/fbreader/book/XMLSerializer.java
@@ -309,13 +309,12 @@ class XMLSerializer extends AbstractSerializer {
 	@Override
 	public String serialize(HighlightingStyle style) {
 		final StringBuilder buffer = new StringBuilder();
-		appendTag(buffer, "style", false,
-			"id", String.valueOf(style.Id)
+		final ZLColor bgColor = style.getBackgroundColor();
+		appendTag(buffer, "style", true,
+			"id", String.valueOf(style.Id),
+			"name", style.getName(),
+			"bg-color", bgColor != null ? String.valueOf(bgColor.intValue()) : "-1"
 		);
-		appendTag(buffer, "bg-color", true,
-			"value", String.valueOf(style.BackgroundColor.getIntValue())
-		);
-		closeTag(buffer, "style");
 		return buffer.toString();
 	}
 
@@ -961,9 +960,6 @@ class XMLSerializer extends AbstractSerializer {
 	private static final class StyleDeserializer extends DefaultHandler {
 		private HighlightingStyle myStyle;
 
-		private int myId = -1;
-		private int myColor;
-
 		public HighlightingStyle getStyle() {
 			return myStyle;
 		}
@@ -971,29 +967,22 @@ class XMLSerializer extends AbstractSerializer {
 		@Override
 		public void startDocument() {
 			myStyle = null;
-			myId = -1;
-		}
-
-		@Override
-		public void endDocument() {
-			if (myId != -1) {
-				myStyle = new HighlightingStyle(myId, new ZLColor(myColor));
-			}
 		}
 
 		@Override
 		public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
 			if ("style".equals(localName)) {
 				try {
-					myId = Integer.parseInt(attributes.getValue("id"));
+					final int id = Integer.parseInt(attributes.getValue("id"));
+					if (id != -1) {
+						final int rgb = Integer.parseInt(attributes.getValue("bg-color"));
+						final ZLColor color = rgb != -1 ? new ZLColor(rgb) : null;
+						myStyle = new HighlightingStyle(
+							id, attributes.getValue("name"), color
+						);
+					}
 				} catch (Exception e) {
-					throw new SAXException("XML parsing error", e);
-				}
-			} else if ("bg-color".equals(localName)) {
-				try {
-					myColor = Integer.parseInt(attributes.getValue("value"));
-				} catch (Exception e) {
-					throw new SAXException("XML parsing error", e);
+					// ignore
 				}
 			}
 		}
diff --git a/src/org/geometerplus/fbreader/fbreader/BookmarkHighlighting.java b/src/org/geometerplus/fbreader/fbreader/BookmarkHighlighting.java
index c7da0541d..566b5b890 100644
--- a/src/org/geometerplus/fbreader/fbreader/BookmarkHighlighting.java
+++ b/src/org/geometerplus/fbreader/fbreader/BookmarkHighlighting.java
@@ -51,6 +51,6 @@ public final class BookmarkHighlighting extends ZLTextSimpleHighlighting {
 	@Override
 	public ZLColor getBackgroundColor() {
 		final HighlightingStyle bmStyle = Collection.getHighlightingStyle(Bookmark.getStyleId());
-		return bmStyle != null ? bmStyle.BackgroundColor : new ZLColor(255, 255, 255);
+		return bmStyle != null ? bmStyle.getBackgroundColor() : null;
 	}
 }
diff --git a/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java b/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
index 8e70fbb06..dffa78b92 100644
--- a/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
+++ b/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
@@ -118,8 +118,9 @@ public final class FBReaderApp extends ZLApplication {
 		collection.addListener(new IBookCollection.Listener() {
 			public void onBookEvent(BookEvent event, Book book) {
 				switch (event) {
+					case BookmarkStyleChanged:
 					case BookmarksUpdated:
-						if (Model != null && book.equals(Model.Book)) {
+						if (Model != null && (book == null || book.equals(Model.Book))) {
 							if (BookTextView.getModel() != null) { 
 								setBookmarkHighlightings(BookTextView, null);
 							}
diff --git a/src/org/geometerplus/zlibrary/core/options/ZLColorOption.java b/src/org/geometerplus/zlibrary/core/options/ZLColorOption.java
index 68673e9a7..ceaf258d6 100644
--- a/src/org/geometerplus/zlibrary/core/options/ZLColorOption.java
+++ b/src/org/geometerplus/zlibrary/core/options/ZLColorOption.java
@@ -37,7 +37,7 @@ public final class ZLColorOption extends ZLOption {
 			if (value != null) {
 				try {
 					int intValue = Integer.parseInt(value);
-					if (myValue.getIntValue() != intValue) {
+					if (myValue.intValue() != intValue) {
 						myValue = new ZLColor(intValue);
 					}
 				} catch (NumberFormatException e) {
@@ -61,7 +61,7 @@ public final class ZLColorOption extends ZLOption {
 			if (colorValue.equals(myDefaultValue)) {
 				unsetConfigValue();
 			} else {
-				setConfigValue("" + colorValue.getIntValue());
+				setConfigValue(String.valueOf(colorValue.intValue()));
 			}
 		}
 	}
diff --git a/src/org/geometerplus/zlibrary/core/util/ZLColor.java b/src/org/geometerplus/zlibrary/core/util/ZLColor.java
index 7d0b59355..324cb5487 100644
--- a/src/org/geometerplus/zlibrary/core/util/ZLColor.java
+++ b/src/org/geometerplus/zlibrary/core/util/ZLColor.java
@@ -40,7 +40,7 @@ public final class ZLColor {
 		Blue = (short)(intValue & 0xFF);
 	}
 
-	public int getIntValue() {
+	public int intValue() {
 		return (Red << 16) + (Green << 8) + Blue;
 	}
 
@@ -60,7 +60,7 @@ public final class ZLColor {
 
 	@Override
 	public int hashCode() {
-		return getIntValue();
+		return intValue();
 	}
 
 	@Override
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java
index 8acb412cf..23a4dc293 100644
--- a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java
+++ b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java
@@ -837,6 +837,10 @@ public abstract class ZLTextView extends ZLTextViewBase {
 		final ZLTextElementArea fromArea = page.TextElementMap.get(from);
 		final ZLTextElementArea toArea = page.TextElementMap.get(to - 1);
 		for (ZLTextHighlighting h : hilites) {
+			final ZLColor bgColor = h.getBackgroundColor();
+			if (bgColor == null) {
+				continue;
+			}
 			final ZLTextElementArea selectionStartArea = h.getStartArea(page);
 			if (selectionStartArea == null || selectionStartArea.compareTo(toArea) > 0) {
 				continue;
@@ -859,7 +863,7 @@ public abstract class ZLTextView extends ZLTextViewBase {
 			} else {
 				right = selectionEndArea.XEnd;
 			}
-			getContext().setFillColor(h.getBackgroundColor());
+			getContext().setFillColor(bgColor);
 			getContext().fillRectangle(left, top, right, bottom);
 		}
 	}
@@ -1587,7 +1591,7 @@ public abstract class ZLTextView extends ZLTextViewBase {
 		}
 		synchronized (myHighlightings) {
 			for (ZLTextHighlighting h : myHighlightings) {
-				if (h.intersects(region)) {
+				if (h.getBackgroundColor() != null && h.intersects(region)) {
 					return h;
 				}
 			}
diff --git a/third-party/AmbilWarna/AmbilWarna.iml b/third-party/AmbilWarna/AmbilWarna.iml
new file mode 100644
index 000000000..a74440d60
--- /dev/null
+++ b/third-party/AmbilWarna/AmbilWarna.iml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager" forced_jdk="true">
+    <conelement value="com.android.ide.eclipse.adt.DEPENDENCIES" />
+    <src_description expected_position="1">
+      <src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
+      <src_folder value="file://$MODULE_DIR$/gen" expected_position="1" />
+      <src_folder value="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK" expected_position="2" />
+      <src_folder value="com.android.ide.eclipse.adt.LIBRARIES" expected_position="3" />
+    </src_description>
+  </component>
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="LIBRARY_PROJECT" value="true" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/bin/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android 4.2.2 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/third-party/AmbilWarna/AndroidManifest.xml b/third-party/AmbilWarna/AndroidManifest.xml
new file mode 100644
index 000000000..20917f639
--- /dev/null
+++ b/third-party/AmbilWarna/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	package="yuku.ambilwarna"
+	android:versionCode="1"
+	android:versionName="1.0">
+	
+	<application>
+	</application>
+	<uses-sdk
+		android:minSdkVersion="3" />
+
+</manifest> 
\ No newline at end of file
diff --git a/third-party/AmbilWarna/build.xml b/third-party/AmbilWarna/build.xml
new file mode 100644
index 000000000..86c2b053f
--- /dev/null
+++ b/third-party/AmbilWarna/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="AmbilWarna" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/third-party/AmbilWarna/project.properties b/third-party/AmbilWarna/project.properties
new file mode 100644
index 000000000..ce256fda4
--- /dev/null
+++ b/third-party/AmbilWarna/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+android.library=true
+# Indicates whether an apk should be generated for each density.
+split.density=false
+# Project target.
+target=android-11
diff --git a/third-party/AmbilWarna/res/drawable-hdpi/ambilwarna_arrow_down.png b/third-party/AmbilWarna/res/drawable-hdpi/ambilwarna_arrow_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2aa1b09fe98c5d8e837e01248b5301a2e31562d
GIT binary patch
literal 1032
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zaJ>a#My3wWgFr#a64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1SfK#Cko
zOEU6{7`##w^K`>9lS}f86r2)sGV|Ve3HkulsDsqFq!uR^WfqiV=I1eF0Tt?%ffec{
zffPEV=O$+6=q2ap-njKV5N51%QEDPcy+TN4ZYqP3fq|*6p`osU;p(`lSwJ<OAY+~L
z3o45;(=$pK0!ou|GLsct@_|O>DP)wC6j<r&CxeYBO9h&oo1a$<a=1QFRcc;wYO#I+
zSVsz2gMQ@Uf2SB2n6`SlIEHw1uDy29@3w;g+k^V>faBAbuxt5wur#v>PB+VpQ@9YF
zZ~Oh4bKIecMGW^A?mfV}GC!b#;ntRki@ao-8r>Nds`&cY>`hse7-?O0$V2;hpY8o~
zDO>xLlx`%Imwyjkf4!QU!Ao<JJHwQczaKwNoDx)0T>N=@$FXgHyu(Bt_TT>>r8U*=
z`RB?HPZnt~2{v{l*?+F6sA#zMOS(aSW&%TN)!x3MojhwzrvwG7bSd>5Pk#Mi$BrEb
z4jw!>d&d*c50eAD95qdC&9!?LWmxSrnaGtEa){^Sg{bC^c_DiR&WJKLT&t?;RV-%8
zbYAZGbV5h&hbLl9m5MW0hqrMq?+sb|tjy@h4ql&b^+Pcmee%}jaHg%a5i}F;=hPQ6
zPK;i?^KQ}6{TgT1rUe`-O4>F}pQU)~r#ajGh134Hmgz-q<hgxqChOco^PXR2s9}Hb
zNnBf7`*e18_R7RgA;D|cuLo*~*j3H@?r&qo@IjNK>9Z=sg{b>hea!d2&jo_?Q1ydq
z=Y%6-V~?IZ*~#{R!D08^V;3)8RNy%rov^96bobo^3z=)P&OW>Q^yyRMj_7mioh#4n
zp83;nnxW(SLk4Sr3K$rs?8(f|em(cG#q)jd_nT?YFFCd=aK?J~nU@{@`|M6Tmsec8
zdCuvl=N^5qn9=`fd18r))Z5tD*uQm?j&BoE|FQG^Z&qnN^#h69cHGT-{Ncj~JD$U{
zI*%R7{J3LAtJ)!k2bFP0OYd&hu~@wLVun6PQ`nu_&i9WMIHH;lCak}ibMJQ8?>#Sk
zA|CwST+sOLyi=p(+G!6f@BNO^E5DXu@+s{$@0ajZE!+Nw7A}s^3G-fh>F>*znx$5<
zuS%>+YHECL-@aXbG-=~3)o`^NN1nTOYSgYy&B@6LiM{?;&{dGP{V@Oa>(}i!KbyhL
n*5I{t6A#1MFzq?dfByfV{`Ij{#rxa9T*2V!>gTe~DWM4fd5Fvf

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/drawable-hdpi/ambilwarna_arrow_right.png b/third-party/AmbilWarna/res/drawable-hdpi/ambilwarna_arrow_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..faf1bd757278081d8ea66f18b0f3cd5935d8da06
GIT binary patch
literal 1041
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zaJ>a#My3wWgFr#a64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1SfK#D>#
zOL9^f9E*zb%N6{K67$ki6@oI;GfM6rVweI`<5*gfkzd5%m718R8<v?|l3%3Yl$ev5
z_r^=m2dG9JWR6Q}adJ^+K}lwQ9zzyTp<WqSp<WV5p+kCZVrGtBa(?cOTh9Yw#yS_J
zCW6!}gk<KXG8h>cnCcoD>KYiXj+>eVRO1OU);YhRvIyiJhJezfoXlhemwcd6c?uaN
zB?VUc`pIA;%2I(Q=jP`XgFL4XRF#@noLa130M?NL)}SAG_}?i82Buk_E{-7{okyqd
z&%f*-a(w^uUm+8A1&F392hR11jF=Q*;1-aO@+AI6{e*A)1(#$sokch`>sh4NC@2(W
zSt+RcxumtZ#YROxKkjhu(|e1pA@jaW+5LI%?>+DDTHj1`Y5AY%HSxjX#fzsc%k+OI
z>*FGC`CQre^1OT6Gm8Ixc=P5>L-D`L=n6#xhAXd2@36*6oRQcqJZEc^Zt2dLed>$c
zZ##J}y|nva0)rBhV4{uO;@fZk6~=yV&An}Jd~mAQ)5xt+f2)d$njT!8)b07*M&E2%
zrqs9Z-<{99Efzd?{=E62$fZG*>t6qw9=D$TSOkxnxNnyFSH>qz+N)L>9g|q1-6iz-
zK}AX47Ji0aH|Doxza2ua`e&xU6Q6$P*%sF3zrMu`3vT8-`ts#Vp;U~b(lH6{-062V
zJ#Y#vnC5-D>35gy`DOv7vbv3nJUrD_&Swp0FyK7LJ$=HOl%{JrW*76eJAat)$Ygrx
zJoUyUW(+TOy*te4psK{i;KZ@tVG<K#i%^G}()y$=vRm%njRgip0Yku3mz6p%=QKUg
zFwt&Y5IK$Yu)(^R>$Q?WZz|)GHl`fBd@J(8%Mz<^qV5NUX0iA+=QmmP72C`{d#ott
z=&n_*0-fItx%YYgJ$jVYYHnXkU(?6VuFnmd8yE~``XopkJ5_pDLd3%|ne)tIt6$zO
z2EM{=iECtzTW-s>X8S4{A0Pkt(<h@Z3j8}_fax+{pJl4o^$YTyjX%Ce)hy6B#eVEY
ztR2g}FTZQ!H)hUyQDUWiyfE(Ow!gN<7Qc$_AIsh<6*<jyTI$6DizQKO%StOMRy^+v
zHQszGb6Mu1+i#x*@7i`KfphQPy|uRU&lfu~Hi-V@4qh9UZ}Hqb`^EO$ByLSHr#+%h
mf8un+_HXOeU9zL&FROP)!*iQM7iIvHK7*&LpUXO@geCxR6TQU%

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/drawable-hdpi/ambilwarna_cursor.png b/third-party/AmbilWarna/res/drawable-hdpi/ambilwarna_cursor.png
new file mode 100644
index 0000000000000000000000000000000000000000..28cebc3263ffb9ac4e234b8cd7f7e51fcb9d4fa0
GIT binary patch
literal 666
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmSQK*5Dp-y;YjHK@;M7UB8!2-
z@gU52^G4z&prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt&QDMUJH<
z8TmyFUa5(Bx?!2gCHX}PPKi00d2hS~eSm7zL26u5i<65o3raHc^BA&#3iZms3iXme
z3LVmO6Ek!4lJj$K+<G1eGuF8%H4&s<AtW<5mBGlsz*N`JP}jh4b==e}pc+q*vCjDg
zl|`B986^w>rAaxN$qFv{K%?>$GD=Dctn~Gh!A6v&0!_}%&npHwTpy?^HLp0eSib<Q
zBL%EMKl1RuQw$7@?w&4=AsQ27Cmzf?<RIeuezv5uxRbrZlx5b6_b<q6PT?wB-~Gq^
zf@@(Y_g}8$sEkbeL#}T;nxw_^WFJ@GRmuEvNGDCM-TZr;kf6Xs&ZdNGSzFgl2|99S
z%l-HBFPr>5vebozVclVaGuv*jjmS>j8g(+kAfkNtU28$d&ojD`(<<h%GbE(7Bvv@P
ze2!cHeaFq5SH7kJBCLMPg|}S05Or9h`C`VC?i1dewWf?Bu8hxRwp>$C(pb7+>#+)(
zeXIuWORV@S=he^8EjV{jqS=T;K#(Ei!s_?Gzxz7ywKLC<bYV%`$J0Ki_|~8Mtj8Y<
zDlsh$$(3VRq!D$z(B{nNKg+)zI1^I2a-Wh?$D$YJo|6)%rOKykdPaIImiAE--W{XY
ze(l!xtYx!oO-$$dy-nI!vFV!H*>Wx6z`u3>*WS&mzM8Q8_Ss7&y@d<yRhJ#p|B@AZ
Q9~e&zp00i_>zopr0HoOjUH||9

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/drawable-hdpi/ambilwarna_target.png b/third-party/AmbilWarna/res/drawable-hdpi/ambilwarna_target.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f7bf906fb84d06e773412663651c2ebfc0f7ad5
GIT binary patch
literal 983
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VOR<w@2nP_<aHMnq`J4qFk;M!Q
z?4BUZsGK;_9VjSS;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6i|@_NReY{
zNk)DVgI8)|o^DuXa!G!Xf>UBnX5JewK_8$Rb&wjD)Z*l#%z~24{5*y%phCSeutL2g
zkV1#_+{DZrz2yAd8@HYZ!i;q;N=*c*R|v_>O=U1LFfi3MG}JXPTpc$x3#i5uWUO<3
zL1j^9dPWIDKxtA=X0n1yKG3K<g^ZGt0xNy}WUvussX&u+^Ye;94%Y{&O3f=yE!Hmp
z>qr4>(2qR)?-T<AQ;VmIV~9oX(y8bDr5r_$-{;AGyl`pIjfCF7g6q><q+%P7c;Eh#
zb;)@#yN%h$Yst1-*w6dUx;N{es9M|>aR<Gna#1NaH>6&DtHyg|+lEaOmUVLN{=G+o
z@lWFm?|mmz(mtJ>J@flMX8}PyZYK^|S=rhX20hM~O;`ojdVinK&cnh~?sK`OxuajQ
zZRh*4-K!ZGrg|N{oMG}W$ZNlxtn6NGv2M3;h4Y`!b12F$zL=4kmzQ_sWr>*XX`$TP
z+kj+A?DwNd8xNg2#g!d-ZPK#L`L`K5ZipN&JpHiXN43@5u<zf##VIOf#@bI+@$8nC
zmbPEMeEDXX<Fy&F*?cv2_b&%%YzftyzP%*2zCdn8=pv0@DxSCI%$)i2+4tY`w==4%
zspWmP(f6LTM54{`5^vcmAGO13lTYT(dtT1e*dQ&~$iyHcBcr3Mqa$(n@ZtBddf^W*
zrRQ@x3Y1Jsz3;a8V$|Na_`G`$Z`_Dbntk?NjOk{-r9qlAAMYqJc5X}jqjUP-uB^1V
z4@<1-zkL0Amz%A5`->kxES?wb{C9JkZk#v=!=mf2@7mkg)VTQf`TAVm!^qFTz`?)}
z8XCI#YF4>m;0{I~jj3Ka_4W0AObj!YtrX>A{a>1SHOuryhKbfDo$D`8#$@H@u3fU~
z)#<pzO*;EKjz9h{_>r4oi+Guh-2H1NYnLDLQxUSZIsbm1SXuOIUq8Q7n{?7eTwmU*
z>RR-pXy=_Y6(Pa%TjEw*`uO^$CT+ZtXE%TU1({Dj|0EgB3~^pK;YKE(_|5CfZ{EE5
z>Cc}(3ywe56n1iP>HtQ~g4e$;{QC9l{ne{i9bIbfX2##;`PO;(p@fu##Es=s79~o=
mT{ijuC1pdp*_R)zGR*9Iz1YvjWL*Fzat2RVKbLh*2~7ZGC!+QM

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/drawable-ldpi/ambilwarna_arrow_down.png b/third-party/AmbilWarna/res/drawable-ldpi/ambilwarna_arrow_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..19d6d4ef24db4bfa4b71aaa0e6ec7dc6014301a5
GIT binary patch
literal 748
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11|+SoP4xm&EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zu$F@`<B9W{3xI->C9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6c|fD}2F
zmSp4?F?gjW=IMrICYR(FDL5tOWaho`67&J8Q3t7UNi9w;$}A|!%+F)U0xHxi11r=^
z0x5Jz&rQtC(M!(Hy>aV#Ak0|jqSQo?dWDe8+*Af50|QfCLqlBy!_{$9vw&(mLB=}g
z7gQEyre~Be1e7M_WF{-P<O7Y$Q^+VODX`MlPX-%NmI^dEH$Sf!<ZykUs?@yV)MEVt
zu#Ob42K~sx|4uP5FwXRJaSYLzSUb@$Tgy?T_52$R8<(c@uS&U^&g!uoRGT2)Z4!0s
zm-M}6lcd>cqPrV@8h;ZDGwd=mTU>uIR%Ms*_hl0%&dn%#AZC2${hiZ0n`S14uD@P=
zG-)GWLq|tv$BdahhG)*~x&8Luv(G=f-=0@k>bCgfmA7U8Jv0|?b(^GOA;V`O*RP<|
z<F?qH;d-LBrfPu{zozPvDGH0a?eza9qzMRiaLjvdS?YT(MXAY<E$X$gLQ8|dqg4l4
z*KD;jziqJgV84N}^@hLR@kbiHmtK0GWA?j$X6o|GJ1<5tTePaR6g+TR7_cHl>%0@k
zWR;VvHKw25pSAVYmg}$YJ}cTeIa#f^jq!j4b23i{N1==|&*AS^vr3<9F15S%`s?2U
zi#hMVS2HwRyQNv(Xwi4^{rB|QXP>PPdgXj$YLmi=@YPp6tC*$5jFr2Tc-Wd}2E9t$
z8FP$5;ZkBvx`3<TA%i)&+ix4cSdw}A``?<~ckAZ+E#DKNQ(-i-VD;6i&$agdw|-~x
zlkPd5oM$#W+%c`}x}P>j(;mZT`==B=Su^XBy2@vRm}fW7I00jx!PC{xWt~$(696Et
BG}r(D

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/drawable-ldpi/ambilwarna_arrow_right.png b/third-party/AmbilWarna/res/drawable-ldpi/ambilwarna_arrow_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..ace7986bf67e937d2780b5edeb43a2092f79cad5
GIT binary patch
literal 751
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11|+SoP4xm&EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zu$F@`<B9W{3xI->C9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6c|fE0yf
zmgJ-|I2IM<mn--eCFZ54Dg<SwXO!GM#4rV>#<8>{Bfp5jD>X4sH!L%`B)>?(DKRHA
z?~RwB4^WLd$Q+l{;^d;tf|AVqJccZwLcKDuLcJuALWlI+#LOJM<ow(lx1I;WjCC$b
zO$4b|2+7P%WiT=@Fx53Q)HN_%9XB-#sKygytaE-rWf90d3<0G{Ihn}{F8M&C@)R;k
zN(!v>^^?Iyl%)bq&dtv&26;{&s46wDIJH>60IVYgtU*8W@V`?G42%_?E{-7@6PHfj
zo5d6;(0cw(Z1;&Qp^e{`M}H6#T&=LAteX3z^%13)As&yD^10+4J}GrB@%Guc*M9GV
zEQQAEyPkq&H)og%7#a8&)})`C`%uXEaezqo(O|_RzjMrfd%WsyR%s})y1Om+x2IR;
zUr94x<EyW~u4;99sOZ^{we?o%-njjY3~B$S?TmT1<Z9N^>#t2?uFut*ewzFI=X**w
z3g`U(SW&~tu=_4w)axU!e%pa0#kxHl42%tpJ2;#;B-$oMY`&?p>u%oG7(I7?fwsg6
z*QBDdSsXv4wrdD=U-waK_FEpTJJqW{$jjScbAXqlrf6i(e0>omC5DF7$c*i`)4f(|
zPww!@mR;E{7#|apviok5h0MNXK`X6|=g1stXPF^6`z%}Y!33-M=k;yQSN~>v@6X<#
zz@b!7fBRY1)+)JPx91DDRy_Iq^Kshd$|t|=e*OK|Z~cFRn7?Lfz0u4Kk1h14dL6y>
r{y*34ZMC;EOoSZM*#15buVuRVS#uGStac_aVi`PL{an^LB{Ts5;Y=wc

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/drawable-ldpi/ambilwarna_cursor.png b/third-party/AmbilWarna/res/drawable-ldpi/ambilwarna_cursor.png
new file mode 100644
index 0000000000000000000000000000000000000000..539eeeb960c846169a959942008859d2687f44b8
GIT binary patch
literal 480
zcmeAS@N?(olHy`uVBq!ia0vp^Y#_`5A|IT2?*XJ(ik&<|IDnvrBc%h#=PdAuEM{O}
z(g$J2Su<jCfr64Ht`Q}{`DrEPiAAXl<>lpinR(g8$%zH2dih1^v)|cB0ToGr6gifb
zWaJkyc%>%h>4s${m*f{II3?y}=DqO}^Z}|-2dQyMElw`VEGWs$&tu2}D%2|jE7VH@
zDRfBBP0Y;EOU}=|aqD>?%vk55)I^Yag^<kLR0bmh15;f?LtO*I)p1j^fNDHJ#yaO0
zR2F5XXOu7mlqTh5CM&q)1C7d4$S5f(u+rC01{+b93N$%4Kd%_%aDAYv)V$)<V*LWJ
zjufy4{m8@rP5}+=^>lFz;h3p=T9NONfe71!{bvspHm{6bd6RY7i5mTl!aO@$mT=CU
zAzdXt!!;qgRq1i+tG^sS{-iU=?D_tElg`;qI@=3ns{hC?&#YQH#p3+u+m_{OolFf~
z9g|!_Lzgeh+_h_6CS!n$f|3Gf_FBdd(yLbe-lzQhk7V1y;}ZI;p4)PN-`Mtc=epOX
dEf<&%h=>02zT)!wv=h)_44$rjF6*2UngDgtugL%a

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/drawable-ldpi/ambilwarna_target.png b/third-party/AmbilWarna/res/drawable-ldpi/ambilwarna_target.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fdf59778394585d3d6f1b266b15f1ad066f99a0
GIT binary patch
literal 607
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u@pObhHwBu4M$1`kk47*5n0T@
zz`O*687Jz_C<O{imbgZg1m~xflqVLYGL)B>>t*I;7bhncr0V4trO$q6BL!3>0aD~x
zT9T1p#Nd^hn5P?-nOu@zq~Mg8lbQF%OV9_XMjfQaCAB!YD6^m>Ge3_Z3#d@946INu
z38c^=JvT8kM=v=)_r|T~fiPp8i&7Io>J>sVb5j|N3=B+l4Gnb-3|GfZ%>t_N1R3j`
zUr<?;nVwO?5Kx+wlbNjGk`FX0Pa&hEq`*pFKN)O9St`)v-2A*^ki+$Xs#5ccQ;YQr
zz&cXE8uTL%|2xINz{un2;us<^wRgfs@0J7^hx+-~AL%r8AJc5on9*o*gq3eC+oc;X
z9@PgH=sNxo-*LjXPj{W()*UGd-!tzC&gtI4;mcJNAADSp!?xn~Y&oSCpfjB^)I2Zo
zp5A1{uwYxRd6U8(6;C531_dXMjztx#UjN$rywW;y+U7!;@0IhU6D7_W9_tSc&1GcJ
zI9?c*ds~k~u^?w!s`$3t^*X1m7(FM=vFMxs-)+BJ;1&_rkJBDmoHO8gEUFeD^0fE)
zPh&2I1c|nl?-;I{_)c5)GD%CL>(Qolulpmfm(H)fe}Cq(pJxruTrb=bw|;%i{r$@_
zf4$t`9(tAidTIHrWqXC4zNJRaV|O$-E}_4A)vZPU`TjFz&7XQ`@6r8{KwmI;y85}S
Ib4q9e02D~*F8}}l

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/drawable-xhdpi/ambilwarna_arrow_down.png b/third-party/AmbilWarna/res/drawable-xhdpi/ambilwarna_arrow_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..592dd7ca6e5daef6f14b057036f838e9092970af
GIT binary patch
literal 1097
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z@J#|?#>KMo%0NNM64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1SfK#Cko
zOEU6{7`##w^K`>9lS}f86r2)sGV|Ve3HkulsDsqFq!uR^WfqiV=I1eF0Tt?%ffec{
zffPEV=O$+6=q2ap-njKV5N51%QEDPcy+TN4ZYqP3fq|*6p`osU;p(`lSwJ<OAY+~L
z3o45;(=$pK0!ou|GLsct@_|O>DP)wC6j<r&CxeYBO9h&oo1a$<a=1QFRcc;wYO#I+
zSVsz2gMQ@Uf2SB2n7(<sIEF;Dp1on1f6GCH{lov=E)#bx&<ot1cxH;CfXWdu&ETn9
zWtoztr!IV@&T;YpTl|9PC9C2a`X`i~nJ_^$n1xBj&OubuK;?(kmULUb+vR3um(=I>
zoM-?3*tSMy!W5zZ#W}OscC7o|*HOn%!RxSzZFaHdQk6vuUhnUGaXP`^$4;>c9rxb9
zd$%vwMCw({SsqPQoAaOhSLupz@AtP2n;O(#z4zYimnBs!3APFhx9;6L_V1rvi-3R=
zi_+I^5jtT9Z1nW>4CeZsG}*a<VO>|JgNt35?Bb|P9xN;ynoe_N^78DuT{?wxrltW$
zW_Q&#o=?l1E!)1c#(K-Hc>H7TYG>aEI}$gaX;C`7Ns{%PjKs998c({X%$RPeG22Q_
z^O9CGm$Qqvg<?zn+<sHVVD_RVT#7CI&*E!eNo?~D$~O{T5EmEBcKODsqgsaj3wTy-
z%zS4koEnh$^=O3t$L`dCRR5_Fy%+EI+?y{s!T*$f{hlL^sea5anY)iZGG~~-VV7Cn
zu64VoxCXNwo>0^C*kZ@ty?<kL#O$*^S2FD5Z$G@=+kv4qM(_Kon>k6@*{9#1d0KSi
z=FP}iC#E>cN|dC_%gZkgTb+C6`DfnJw+|mOK7amv#@RI1tM0EjTb&LHI{nd_>h*K;
z=FO@q{I%UnH%V-jd$m8l$;)o`*$a8w3(L#RKia%cFp=t=-tb!Cuo-h=eE+r`q6+TQ
zPCxzg@@1yVr7hXdZgQQD6VVfxA+qw^*9-Q$3kw!H^xe6A`}FpxwE-ytCOjveZ#wA8
z^jJxBiu~bgj?r@jPfVQZrCMK9l;ko?iH~o?jSYQni#I;6WH&cApX|51`S|hU>4zg3
zFFUCnjAXXlbpQQvH?^ZjnO>d9+n(JT!!9m;V&e7d*C*#~?_R!q`I&;whHWQI3OXBQ
zDoabZHu-R~EBumYp8d?C@A0m8JL1-#uG_B<1WzA6Tv!rY{>Gwj^Sjs5;#so;x+}Lv
zoxOkm{_@E?>nCyv{ODF$B*);PX}_eAIfx}qw4PxXGb>;Hg3I54*^0r_)z4*}Q$iB}
Dwc^we

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/drawable-xhdpi/ambilwarna_arrow_right.png b/third-party/AmbilWarna/res/drawable-xhdpi/ambilwarna_arrow_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..04f655adcbbc391d697236c5182354c87ad61e6e
GIT binary patch
literal 1151
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z@J#|?#>KMo%0NNM64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1SfK#D>#
zOL9^f9E*zb%N6{K67$ki6@oI;GfM6rVweI`<5*gfkzd5%m718R8<v?|l3%3Yl$ev5
z_r^=m2dG9JWR6Q}adJ^+K}lwQ9zzyTp<WqSp<WV5p+kCZVrGtBa(?cOTh9Yw#yS_J
zCW6!}gk<KXG8h>cnCcoD>KYiXj+>eVRO1OU);YhRvIyiJhJezfoXlhemwcd6c?uaN
zB?VUc`pIA;%2I(Q=jP`XgFL4XRF#@noLa130M?NL)}SAG_}?i824)UV7srr@*0VQk
z^KKi6uz#@URCY*SZ2DlSvvtH5ceVQq9GEIz#4HJJ@MC3S-rKCB%>F`jSJ`RKP0!di
z3ZL-W)|abrI?}65bE<l$(NYhmPYj1PsZ6ln?|y09j36$3%OAzeITu&$c2+!6&hUQ8
zl>1EzKSH<Khn07>3e<o9{=HJf)m!svU}%c4>a)!^d7L_!&;4}Wf4@F@<>p->CRTI#
zY|gJ{y?H}vCHGB^35IM7<Wjg9WRCwlAn}`};VNU!_S+BUID1Jd$6mMnQ2T$;{rA(O
zEPOOsj~D*AnDOLG)!s9_B~!&M<@nkyEG-*@xPngoh>~b4h!x)lRCpJtQ1Qt7&6_uy
zUw&y~tRdTBR;5>ax8&_g4_kK0WS$<wf^(0j*)6~Sx_H^+J#03)erXM6D|my<jo4mI
z`g7gvQpprYwQZ7C{TVjuMuADTD@%=Q{VzMdSdiM^tt6~^O@r&q=@)ui-ZEd<pqQ*M
z;ZD${nLgV~o*c}%o^zstZ&pC%@5s0tM%kwp@XkD;!1_+BJWlNNBHa`74?Na?b;NA(
zlv8KqWxvS%&2oOtI>T+&yZo(DH*Vi%ZU~oLFvX}XGv(fLKj+sS?d|Lp^V(OhUTv-U
zG@Z*u%41>)v;ShBnQIu!C0GvXvL0JKW14xdF>l_fl$$?y-Obw=p<}dzWkOm2zmxZz
zbBj1#3tf}N^%z+uXly(-<z$jn#_308yIY@EM(9m<lVMe}Iuot2P3O{gH3?gB*NLL;
zjXv+oMW$^J_~eywtI6kv(#+Egj1k*sF8UoQC%~{sqv`doh_zv1F>D^*YZzU(OG^td
zn9b&W_PH`q=EINqPtI4^)ZKksw%Pp6k1V636*k8{ek^2@aGiMUuGUh%>#x7YPW%_e
zaKQ5arl_@ci`w?joj!f~^2sMznhz@2ZNHiGpmN^1JAnc$tp$c3o;`aebD%O*hJi!T
z@BRDt!o__LxTa2ZTYR2<^`i#1dHk;~6u<lR>(@z(1q*pzU5yfDH~GvETxKOJ)|Qwm
wbHS&xz9sQToY&8-T6`G_&85e?>regXFY}yuAnevNPzl1|>FVdQ&MBb@0H6fpzyJUM

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/drawable-xhdpi/ambilwarna_cursor.png b/third-party/AmbilWarna/res/drawable-xhdpi/ambilwarna_cursor.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddea316742142eea2926b9909f8c22ec52b8cf4f
GIT binary patch
literal 782
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK@;M7UB8wRq
z*!n=2k*8_CBT!JX#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD<=kRr#@
zl8pQ!2Cvk_Jl(L&<dXa%1*gQE%)B>Vf<8bs>L4{Psl~}fnFS@8`FRXkK!ti`V1;@~
zAcYR;xrv!Mddc~@H*P%-gc<8xl$r=quMm=%o62BhU|_0iXsByoxH@iX7Ep~R$XMt6
zg36-I^o$aQfYPL#%wz?Ze4tTz3K=CO1y=g{$zUVOQh_Gt=I0fI9Ig*km6}(aTC86H
z){z3%pdWeo-zf$L#@(JSjv*GkwO8!d-Et6M`;dPvOr-0&i{R}EPh1a(z7Ps}Dx^8_
zN4XrAhQ)#GK(1LHCk-_YG|Wj~Y!YI!=DYXft=DcCTsk$)=2vA}S*{|dxY8%t1Hugo
z@ml-;Dg6}ZSNbAwH*0GgTl2waLBUB*LdPT`^`@^^x};vYLwll2T<GTOulLULQ(u;O
z%A!xwRnUAkZ}@7_t=9w_{Pq5qt=#0Pu~eW<u}Q%}fQ93*z}-CY?xT+)v;RiB*j*D1
zX<V~4z)N((?)N2DGtNIhANAV4G=kOW*a3;h&)AlRG;Y0}EC2h0z^P3<$0Q=MxzEJ&
zWt+`beUs<<-GG7b_nhRlyDxmLYBgkwoOUpZdy*=LgW+bGYWZIivRB^-T6#zNfqaa<
zi{@9hhA9dRq8=_;3*VM?zbuhjp82cw$$l;thRA7C6~d>^zL~fEaEejk3Aqn;g7QoZ
z*|~+w{(M`caj3$k@3P6?R};8G%-O?P8Qy%aZvW!xRu`9fU8_sH{V?O=iyD5DmiQNy
z|K79dZ)u^8oS_WgV-?SRR}~NVW<USDb7S0kZ_Z;9XVQ$@bKZyQ)QR@GJ#O#VqpjL;
j<Mh){pC9h$I8eV+Gq~=Q?f!?rw87x%>gTe~DWM4fN9#8g

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/drawable-xhdpi/ambilwarna_target.png b/third-party/AmbilWarna/res/drawable-xhdpi/ambilwarna_target.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb4b1eb728185e72015928835b5848e0698e503e
GIT binary patch
literal 1526
zcmXw(3pCVO7{D(|69(f*Ls&`3V`e<I@>pdWH6tS;j~L91p_$C1d8VPX!jMQ03cW_L
z2x*$*QHrclDXnImP+4kQYcrzJ5VHH{oW19K_dEBV-}gJ;x#xU0HzaruT+c!e001Z8
zar>ccy&N!IX!pU?OQE!ihb4r=pp^zoltAaT9DFnn06o=mXlY9b9nhsYKOl-9#!ljk
z$Xpr_i9{$m>oAW>=Fm`VZgSbAuLT4lmmz-v{}7uC0%>HHYXqIjXLD_^<P<t<A`lS-
zF%HWNj>e;M=^Q?t%>oPvL<v_w6lEFQnam{9Q&3bkb6{vJ^ndLxE{(j*+l14ZG~kZG
z{OIcD=8AEvjl0Nz7{ao47n_sHr6(WagAf5Fg-*4>u^|=9<`AFH@kXPmD+(bEGBepM
z-g4t;h@!E0G#;9>Qjxe)fR655dImjA1p((Dj?e8XiBAbTVA=g>Y<L~%_3D7I!8<V`
z7FC9I<dE`=S`%@w!19;+zn-15vCrFRzddb+5U+8tpynHTCMCL=BTt?>`-G2gKO+~t
zmCNqInN}BG-MdSXeH~V-wGQ5Y(Vh_S=xJ)pnCP>^BR2QtXE72n`ftb!uKqjLtg@0m
zX)9&syRAXg>9m9A0IxmQ66LaFT-cplto}*(sDOkj$&~o%OzCBmMbv(c<?&=A<!|f=
zlp=iMR_nq|*Iq6FU;PmmgzEI}3Z)S|!jy*2xZ2v<dN{|>>e+mnUzTJ7EAay7v9L~0
zVuP_X0#-D=@ICUFSX|c<+q-(C^N{Dz9vo#bp-MSu)AOYyzft8QoIv^<ow{D=CJcfd
zIVVwgT+XkrVNA1HEDdyHvW#o!rEkE5U)tPM*N5&xvDTtJ;ngr_yJZV{KqYMOFz95<
z53;|`&c+;!iHSt?#lYe4?nxSnP+BPfbKaMO>i?OX?ER=tU6bKjgtvQe{j9{yrT1Gd
ze8bjL$w^818@90w?9V@~GJE}&orS$|jHrAFTcwRX&=1BIEkX6&qz?T&>4OfhYa6Vr
z+De}$>ROvNA0-9{Yp#0n?CTt#)fE>P&pOZE3_P9tOOs5-d;DP<qZknPG-~4R4yODt
zpwg6)NTiL5fjz-hGC^*Cx%zWk92;{nFgM6v{Uz{z-QV-6L}gw~6U%C>ybyJ#wYqwo
z(3?8_q-fJpxYJjn{QA17eFfG(S^QZZ#^dq!4l<&PMOt&UZEf!exT*-oG{sF3oa$@6
zp6Y_?`EnRcW|&h|Tgz0^E=n}B^sift%+p=(SAjuRQ@r-neshEC9itp1Rx+qiDE_F0
z58tDQ8SV@ZH8mF%^t&IelRC<Ao?0WJXKIg>^vHGFTLY(d?9iOJX)<@r&ScA_$`*6c
z?spYuEevyHV97Dloa&K_qpU;pcT*b2YKSun-}ix$B0LV@FLdDe8jb1=6YBYdNnbG|
z)77je2_$)68Ger3uq89g*a7(Zxw~@@z#3&k3ARJkpXS%ua*^57)NwL>rvdYA^ARVc
zLFp*xs8}9c*HeOSqL)U@d`qL2tBW@8dhGc^r2e+(k)EEu{*-ZiKt*4_vubAXn_7;Q
zuyeAr70PkGbH=v4Vj9QA?7rd16=l`FTBTA+Iez@%iCZJ{^Yeva)xVc^bod)lZ;Snr
zb0s#I2gkq9b8L(;*c-ozTI(B9L&O47(|GGrOC`Osrba6uwD&!0D4HT5U?u5USh658
z@^ycR<BZgfa14V?OK%|s6Nv(FDag*`idZwTmL?lC>%?eYNtNSQ$wuv(f`Wp^?+ddF
z3<jeB(MPbgK%46AeQZq)+AL*aCGT`}bk=9*<g@`rv6aT@Kwc9xe?upA)^M3jW^6Id
zCj*))U;yHP9CzXJrAy7PluC8f)-u5d@_Xj3SX7BldlhcR3GwlE#HR)#k*F?LdlSw@
zxtR4hn5<0|3N@>N5bQwoy>Zr?x#&b91HN(SrVM$$Tdt&Dr&)KTq$ZAReQ`-Q*<y6O
T7w>f+`U3$WAQ)GVP5AjgY?8C2

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/drawable/ambilwarna_arrow_down.png b/third-party/AmbilWarna/res/drawable/ambilwarna_arrow_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f43455232aa50083dc43cfebd627223a0550a6d
GIT binary patch
literal 889
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VOR<w@2nP_<aHMnq`J4qFk;M!Q
z>{cMmxa#N;S)ia~iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0u#AVrR)
zB^mie3|^^;dAebl$tC$k3QmbRnR#!#1bu*N)In-oQj3#|G7CyF^Ya+8fC}}>zzX$}
zKnfkwa}zUj^pf*)Z`^tw2s75XC^ZqJULhniH<iK2z`#`3&`{UFaCO|&ET9@skg?AB
z1(ija=@}&q0i{VfnaK(+`9P!c6f#Om3as??lfg!mr2<XP&Ce?aIb0v8DmAY-wOGFZ
ztRn@iK|k{Fzf%khOlqDkjv*Gky_0umNjr+P{Wsn{N&fH#<%JW}CNvn{SSmF;Cg;1>
z(o<%~T!VITu9zgJDxRXQxN2)Fcjw(>3fa$1d2Y_M)O-_}wsq1QdA`%<&is6Kr)`Gh
zz9m!MGwxwN;PS-mX4Gj035I#sX3kvhwQ~Qy`VLjo*=N^>hll642qdIMWG~#RH`9=f
z;llgx%Nfj=w{P2a<l8s1Lk2AZOvfZL)=qq0`I4JqYm~3f@9>6-Gpq~>M;=#Z>$V8A
z3JOm1ej2j#AmiGt326d>oKOB;U%BaV!nG)g<SvgI3Bk3j>wIoX1T)Oo$?|o-KGUuf
zH4D1$tiNsb;uJ^i3jUf-Er&F{XFLo|3L3FrWM<5eTpRW}FFpNvr~u22yLXTN`)Ajr
z;2^-_+Ae#+HNWRzg^k-Jl?zdizkU0bXE%Sp7{i3;Kc83aU8k?Fzj6EaaF?Aqd@o+z
z%-ddASjeb!DeASp>nX35fg-NzE??gM`D0VEwK)0l@|Oz^JT~EBW44{?<2NN}aS-p+
zAZ5*`hJv;B*4C>X{z~osdN5(ZV+*@5uh{iDUei*q2c1%8u$Q^w`t)?OY-(iL<M*Mv
z=A_>2o$^Uo@UM-nE${T_XC;~+7R<0eSQmQhO;E%(jV`|3ck||{a4ye0l{xEEj@e_s
z<)8Jt79B3F%WgcwqxsZv{q@t6RWuWVPBr`5X~%b6PTKh6Zia~+gM_V(O@YjDdGYR}
u^L_2UOj5s^V|JhEz~8@rzwF%npK+V{sZ(>fmnH#|A%mx@pUXO@geCwg19El%

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/drawable/ambilwarna_arrow_right.png b/third-party/AmbilWarna/res/drawable/ambilwarna_arrow_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..23d5461928d81cc53ece317f2215a791d6903a63
GIT binary patch
literal 814
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VOR<w@2nP_<aHMnq`J4qFk;M!Q
z?4BUZsGK;_9VjSS;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6i|@_NKr^;
zNlq$*V^L9lxq^RDVqSWxLQrOUM#<en3{zlg97{_w@{1U}QWNuZ!!nag@{1Il5_2;1
z-gpW60M)32%yCIAPA<wUD9OyvW5@z3)GGrk)Jp;>bV$!l%*@eC&d<GZ>v<r|Sm&bD
zM38!gkj&gv1|tIlQ(Z$tT?50_aZ|H^YCJ*4I_DQu7J=Nu5Kx+wlbNjGk`FX0Pa&hE
zq`*pFKN)O9St`)v-2A*^kmvM)s#5ccQ;YQrz&cXE8uTL%|2xINz_{Jh#WBR9ckPtZ
zS&t1w+Rjf5wRhoYiRhb|`ciE(2g|bAaW7j_B$+B1_Pfk1^@vNYT4=0WcrDgscb?Ky
z+hr5|&8J#w_`PyvbuyB%t9`ybM@8w!ImK0CYM!5@j(=RA&%EvS+rN3+e=nF~bthDP
zHB+-fgNd&*!;WyTxfyHcdp8!!$Y0IcdOyhP;q#O8fB&`f(6sy#lKpoJqspScA1i7u
zWSBH`D4Z|ea4m05-g%$*i!`i^kNx=^?dH;=z|qjbAZUK;!Lq#b3zo}hb#ioatl6s2
z!r;Q<!lK9`5V&#L+sh_*lb6-cO}sd5{=&_r?NemGaqi7EoBe$C)mMQ`44?MM9GN-g
z;N4e_|F=Y~ogc)}cr7Yo{dL#VHtRR(uhe<&zj48p3DLVewjG`L+|p<H<*zwryUmX6
z5t01WR`)vf^1)3yyN!<B5zC)>-&k(neXIG`qS$v|iMlU({n*wsytUr)S!-KQrhJ;0
zdQ-HWks(3E_4?PUziK>(=h}D0t^dCG^2>r7ORxQ^TU-$CR>Rls9Hk>>BGvm(duiYH
ztBF_T-y|3;FyOiW{PWMFMLTP5L`7UR@SJ46^vcEX(y6?w`}o6>cdS^*HSH)cT`+jM
L`njxgN@xNATe?qp

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/drawable/ambilwarna_cursor.png b/third-party/AmbilWarna/res/drawable/ambilwarna_cursor.png
new file mode 100644
index 0000000000000000000000000000000000000000..c336e883c482fdfd67815f56294ec4aa082a2486
GIT binary patch
literal 579
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VEX7WqAsj$Z!;#Vfk}U9uEM{O}
zb_Zd`l68S)Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQlqQiX2Nz
zGV+TUyiybMbi*=}OY(~poDy>~^WJy~`T*6agVeaB7AF^F7L;V>=P_gf73!6N73w8{
z6gs5mCT8a7CFkefxb-{`W~_5jY9dIzLP%zADua=MfvK*cp{{}9>bR*{KsBBqW1aI0
zDvL7HGfEf&N|SOjlNDU@fkx#iWR#Q?Sn2C0gN-Ol1)7|jpH~cWxIR!-YF=?_v3>zq
zM+#Vje&peQr+|ij@N{tuk(e6WWADclD8c@`x^lgu;?01_paO>Is7LeLE>y7eZd|@O
zVns)_Y%ar8>jJhF3pRhK<=Sm8oiV2>%}1#D;De3VU*9$HO`d)BS@q5sJC9!vU07a}
zSWVx2^Ub-tH{X9>GDYu9PKB7VL+tfQE?%9BG&D|s^15`}^G`2>@8uJBI}L@L7TnDX
zp7wO>%)PU2YB0(4yWg2RMQD<NanxF|#~*)`?Y_Hjj{gqp(pX_92O-P!RjaDv*Iz#`
zc;F06frSji2}|RdK6YZ=M?EI7|9kk(XZhvxKWpqJJz-GmtlR(p%G<JbhTV7HWp9nT
e>wW6^2Y!intvW8Y$8Q1s&fw|l=d#Wzp$PyR#^RL#

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/drawable/ambilwarna_hue.png b/third-party/AmbilWarna/res/drawable/ambilwarna_hue.png
new file mode 100644
index 0000000000000000000000000000000000000000..09d28397f49c662413f17c5f83fb96936ceeac43
GIT binary patch
literal 455
zcmV;&0XY7NP)<h;3K|Lk000e1NJLTq00031009690ssI2{alOB0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzX-PyuRCwBaQbCf#FbEU0cDk4S!oFnx
z|C~MBY0L^t+)NKWFhWAcgjoN6e-r{WgG!(gMS;pFjE(h5y-?rOT$4KMGQ%SG`XkWZ
z>d=cfYohEWWobf>Y2L*<7T210-g$1$=;-qr=WN4tXWkf&oi*3Gb4cI}i`stj@IjxL
zd5<1OF4LFV{+2(JKQH`9Zk%lpkKCv473?|K)8{^@4fo)cJ2vmhFU7|1tJDk66O|lg
z>dw6udKLX9elZ>!H%0U)m$)yK$b-{+D;DUw+<d-61v{gwSm$mTL_rH3)>a+iX%`Q5
znK|Hk`W8>$^7Peb)x(2$a|Vll3;6rvJH$(ioV%Pm&E2LR@8R@^M`G`RA9{Lh<QuWd
z%&X^@2u-G^1V?fqH~$q=JI}Juji^53&U@NWbc@^?qYs8<jL=6*t&KcGt)J%*y4PLD
x^=!lH8{UrT!Q7F>e&%<cd$W_r4&+~e0RS7E_e&~=abExc002ovPDHLkV1jaR*0}%x

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/drawable/ambilwarna_target.png b/third-party/AmbilWarna/res/drawable/ambilwarna_target.png
new file mode 100644
index 0000000000000000000000000000000000000000..56fa0de9c4b9335b5120935ff8a1e8aaaec46bae
GIT binary patch
literal 816
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11|+SoP4xm&EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zu$F@`<B9W{3xI->C9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6c|fD}2F
zmSp4?F?gjW=IMrICYR(FDL5tOWaho`67&J8Q3t7UNi9w;$}A|!%+F)U0xHxi11r=^
z0x5Jz&rQtC(M!(Hy>aV#Ak0|jqSQo?dWDe8+*Af50|QfCLqlBy!_{$9vw&(mLB=}g
z7gQEyre~Be1e7M_WF{-P<O7Y$Q^+VODX`MlPX-%NmI^dEH$Sf!<ZykUs?@yV)MEVt
zu#Ob42K~sx|4uP5Fy8faaSYLz*n8Qr`&NJe`-kbvg?dE25;H|&CZ*?O^I5itO|6*V
zRQ+oD%Z(R`xoxNZ6|l{CxpJvud+4cGnVGd-DuF^%BeXScH;3>`EnnX8de<7};;PTP
z_x$8%X2{rIF|WT+W_eQ2=6&yP>zw|#MJIco{qZ+Rfg+XDQti`>W(vCoIta8pO)%)#
z7Nz^d;@s5tzt`v9{<oKvp@D&+bJ35W%UeEI?aiy07yijcpNnC|_17DhWr~%?{*TiU
z%Wjzv-pKjju+zc<!`WxgF(?Sxyer!o!x!jvKXcZ%W`UwzM{nkQ3toKj2N%Oa=Yr*u
zhYj|f*z`w|LEu@Xoto#Rl`5X{0#5&W@9&PA;G=fmd(sq-r9u1!Hge%1p{-x5YAe}Y
zI229h`qgW8J#tr?xLkrkPS8oL(<P~pM{lZEwxhtmq#pU?w!~d`^QKGpx?M~zSQ^Cn
z_4nW3v(Fwo_W9?Yt2t&Di+0wO@k~pNTsoyKeDzh;c|L0YWsZN0xn3K*`s$(bh%_6y
z{iU(r`=3{a-?n{Tw3GYxw)3m5X8o9E`mk(wZSi@>L!W;B*}3ku+w#kmiL;*BGB`}R
zG$S?gJn!Kj+vaa*zNywSN29Ch(#tPN7BWRsf-I)I&9+$aV3mNAKf{9R+o6BiZ}s@G
U-Q?LM3rsx>p00i_>zopr02oJ9wg3PC

literal 0
HcmV?d00001

diff --git a/third-party/AmbilWarna/res/layout-land/ambilwarna_dialog.xml b/third-party/AmbilWarna/res/layout-land/ambilwarna_dialog.xml
new file mode 100644
index 000000000..236e10eef
--- /dev/null
+++ b/third-party/AmbilWarna/res/layout-land/ambilwarna_dialog.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:id="@+id/ambilwarna_viewContainer"
+	android:paddingTop="@dimen/ambilwarna_spacer"
+	android:paddingRight="@dimen/ambilwarna_spacer"
+	android:paddingBottom="0dp"
+	android:paddingLeft="@dimen/ambilwarna_spacer"
+	android:clipToPadding="false"
+	android:layout_gravity="center"
+>
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:id="@+id/ambilwarna_state"
+		android:orientation="vertical"
+		android:paddingRight="@dimen/ambilwarna_spacer"
+		android:gravity="center"
+		android:layout_centerVertical="true"
+	>
+		<View
+			android:layout_width="60dp"
+			android:layout_height="30dp"
+			android:id="@+id/ambilwarna_warnaLama"
+			android:background="#faa"
+		/>
+		<ImageView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:src="@drawable/ambilwarna_arrow_down"
+			android:paddingTop="@dimen/ambilwarna_spacer"
+			android:paddingBottom="@dimen/ambilwarna_spacer"
+		/>
+		<View
+			android:layout_width="60dp"
+			android:layout_height="30dp"
+			android:id="@+id/ambilwarna_warnaBaru"
+			android:background="#aaf"
+		/>
+	</LinearLayout>
+	<yuku.ambilwarna.AmbilWarnaKotak
+		android:id="@+id/ambilwarna_viewSatBri"
+		android:layout_width="@dimen/ambilwarna_hsvWidth"
+		android:layout_height="@dimen/ambilwarna_hsvHeight"
+		android:layout_toRightOf="@id/ambilwarna_state"
+		android:layerType="software"
+	/>
+	<!-- needed because i can't get parent keeping its bottom layout
+	and its wrap_content height. This view will serve as a bottom spacer. -->
+	<View
+		android:layout_width="@dimen/ambilwarna_spacer"
+		android:layout_height="@dimen/ambilwarna_spacer"
+		android:layout_below="@id/ambilwarna_viewSatBri"
+	/>
+	<ImageView
+		android:id="@+id/ambilwarna_viewHue"
+		android:layout_width="@dimen/ambilwarna_hueWidth"
+		android:layout_height="@dimen/ambilwarna_hsvHeight"
+		android:layout_toRightOf="@id/ambilwarna_viewSatBri"
+		android:layout_marginLeft="@dimen/ambilwarna_spacer"
+		android:src="@drawable/ambilwarna_hue"
+		android:scaleType="fitXY"
+	/>
+
+	<ImageView
+		android:id="@+id/ambilwarna_cursor"
+		android:layout_width="9dp"
+		android:layout_height="9dp"
+		android:src="@drawable/ambilwarna_cursor"
+		android:scaleType="matrix" 
+		/>
+
+	<ImageView
+		android:id="@+id/ambilwarna_target"
+		android:layout_width="15dp"
+		android:layout_height="15dp"
+		android:src="@drawable/ambilwarna_target"
+		android:scaleType="matrix"
+		 />
+		
+
+</RelativeLayout>
diff --git a/third-party/AmbilWarna/res/layout/ambilwarna_dialog.xml b/third-party/AmbilWarna/res/layout/ambilwarna_dialog.xml
new file mode 100644
index 000000000..5cb275593
--- /dev/null
+++ b/third-party/AmbilWarna/res/layout/ambilwarna_dialog.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ambilwarna_dialogView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center" >
+
+    <RelativeLayout
+        android:id="@+id/ambilwarna_viewContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        android:paddingBottom="@dimen/ambilwarna_spacer"
+        android:paddingLeft="@dimen/ambilwarna_spacer"
+        android:paddingRight="@dimen/ambilwarna_spacer"
+        android:paddingTop="@dimen/ambilwarna_spacer" android:layout_gravity="center">
+
+        <yuku.ambilwarna.AmbilWarnaKotak
+            android:id="@+id/ambilwarna_viewSatBri"
+            android:layout_width="@dimen/ambilwarna_hsvWidth"
+            android:layout_height="@dimen/ambilwarna_hsvHeight"
+            android:layerType="software" />
+
+        <ImageView
+            android:id="@+id/ambilwarna_viewHue"
+            android:layout_width="@dimen/ambilwarna_hueWidth"
+            android:layout_height="@dimen/ambilwarna_hsvHeight"
+            android:layout_marginLeft="@dimen/ambilwarna_spacer"
+            android:layout_toRightOf="@id/ambilwarna_viewSatBri"
+            android:scaleType="fitXY"
+            android:src="@drawable/ambilwarna_hue" />
+
+        <ImageView
+            android:id="@+id/ambilwarna_cursor"
+            android:layout_width="9dp"
+            android:layout_height="9dp"
+            android:scaleType="matrix"
+            android:src="@drawable/ambilwarna_cursor" />
+
+        <ImageView
+            android:id="@+id/ambilwarna_target"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:scaleType="matrix"
+            android:src="@drawable/ambilwarna_target" />
+
+        <LinearLayout
+            android:id="@+id/ambilwarna_state"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/ambilwarna_viewSatBri"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/ambilwarna_spacer"
+            android:gravity="center"
+            android:orientation="horizontal" >
+
+            <View
+                android:id="@+id/ambilwarna_warnaLama"
+                android:layout_width="60dp"
+                android:layout_height="30dp"
+                android:background="#faa" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/ambilwarna_spacer"
+                android:paddingRight="@dimen/ambilwarna_spacer"
+                android:src="@drawable/ambilwarna_arrow_right" />
+
+            <View
+                android:id="@+id/ambilwarna_warnaBaru"
+                android:layout_width="60dp"
+                android:layout_height="30dp"
+                android:background="#aaf" />
+        </LinearLayout>
+    </RelativeLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/third-party/AmbilWarna/res/layout/ambilwarna_pref_widget.xml b/third-party/AmbilWarna/res/layout/ambilwarna_pref_widget.xml
new file mode 100644
index 000000000..667b15e49
--- /dev/null
+++ b/third-party/AmbilWarna/res/layout/ambilwarna_pref_widget.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<yuku.ambilwarna.widget.AmbilWarnaPrefWidgetView 
+	xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ambilwarna_pref_widget_kotak" 
+    android:layout_width="24dp"
+    android:layout_height="24dp"
+    android:layout_gravity="center_vertical"
+    android:layout_marginRight="6dp"
+    android:focusable="false"
+    android:clickable="false" />
diff --git a/third-party/AmbilWarna/res/values-land/dimen.xml b/third-party/AmbilWarna/res/values-land/dimen.xml
new file mode 100644
index 000000000..f1c483268
--- /dev/null
+++ b/third-party/AmbilWarna/res/values-land/dimen.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<dimen name="ambilwarna_hsvWidth">240dp</dimen>
+	<dimen name="ambilwarna_hsvHeight">120dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/third-party/AmbilWarna/res/values-xlarge-land/dimen.xml b/third-party/AmbilWarna/res/values-xlarge-land/dimen.xml
new file mode 100644
index 000000000..1e72cca59
--- /dev/null
+++ b/third-party/AmbilWarna/res/values-xlarge-land/dimen.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<dimen name="ambilwarna_hsvWidth">240dp</dimen>
+	<dimen name="ambilwarna_hsvHeight">240dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/third-party/AmbilWarna/res/values/dimen.xml b/third-party/AmbilWarna/res/values/dimen.xml
new file mode 100644
index 000000000..92f53a2ea
--- /dev/null
+++ b/third-party/AmbilWarna/res/values/dimen.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<dimen name="ambilwarna_hsvHeight">240dp</dimen>
+	<dimen name="ambilwarna_hsvWidth">240dp</dimen>
+	<dimen name="ambilwarna_hueWidth">30dp</dimen>
+	<dimen name="ambilwarna_spacer">8dp</dimen>
+</resources>
diff --git a/third-party/AmbilWarna/src/yuku/ambilwarna/AmbilWarnaDialog.java b/third-party/AmbilWarna/src/yuku/ambilwarna/AmbilWarnaDialog.java
new file mode 100644
index 000000000..968aff4cc
--- /dev/null
+++ b/third-party/AmbilWarna/src/yuku/ambilwarna/AmbilWarnaDialog.java
@@ -0,0 +1,198 @@
+package yuku.ambilwarna;
+
+import android.app.*;
+import android.content.*;
+import android.content.DialogInterface.OnCancelListener;
+import android.graphics.*;
+import android.view.*;
+import android.widget.*;
+
+public class AmbilWarnaDialog {
+	public interface OnAmbilWarnaListener {
+		void onCancel(AmbilWarnaDialog dialog);
+		void onOk(AmbilWarnaDialog dialog, int color);
+	}
+
+	final AlertDialog dialog;
+	final OnAmbilWarnaListener listener;
+	final View viewHue;
+	final AmbilWarnaKotak viewSatVal;
+	final ImageView viewCursor;
+	final View viewOldColor;
+	final View viewNewColor;
+	final ImageView viewTarget;
+	final ViewGroup viewContainer;
+	final float[] currentColorHsv = new float[3];
+
+	/**
+	 * create an AmbilWarnaDialog. call this only from OnCreateDialog() or from a background thread.
+	 * 
+	 * @param context
+	 *            current context
+	 * @param color
+	 *            current color
+	 * @param listener
+	 *            an OnAmbilWarnaListener, allowing you to get back error or
+	 */
+	public AmbilWarnaDialog(final Context context, int color, OnAmbilWarnaListener listener) {
+		this.listener = listener;
+		Color.colorToHSV(color, currentColorHsv);
+
+		final View view = LayoutInflater.from(context).inflate(R.layout.ambilwarna_dialog, null);
+		viewHue = view.findViewById(R.id.ambilwarna_viewHue);
+		viewSatVal = (AmbilWarnaKotak) view.findViewById(R.id.ambilwarna_viewSatBri);
+		viewCursor = (ImageView) view.findViewById(R.id.ambilwarna_cursor);
+		viewOldColor = view.findViewById(R.id.ambilwarna_warnaLama);
+		viewNewColor = view.findViewById(R.id.ambilwarna_warnaBaru);
+		viewTarget = (ImageView) view.findViewById(R.id.ambilwarna_target);
+		viewContainer = (ViewGroup) view.findViewById(R.id.ambilwarna_viewContainer);
+
+		viewSatVal.setHue(getHue());
+		viewOldColor.setBackgroundColor(color);
+		viewNewColor.setBackgroundColor(color);
+
+		viewHue.setOnTouchListener(new View.OnTouchListener() {
+			@Override public boolean onTouch(View v, MotionEvent event) {
+				if (event.getAction() == MotionEvent.ACTION_MOVE
+						|| event.getAction() == MotionEvent.ACTION_DOWN
+						|| event.getAction() == MotionEvent.ACTION_UP) {
+
+					float y = event.getY();
+					if (y < 0.f) y = 0.f;
+					if (y > viewHue.getMeasuredHeight()) y = viewHue.getMeasuredHeight() - 0.001f; // to avoid looping from end to start.
+					float hue = 360.f - 360.f / viewHue.getMeasuredHeight() * y;
+					if (hue == 360.f) hue = 0.f;
+					setHue(hue);
+
+					// update view
+					viewSatVal.setHue(getHue());
+					moveCursor();
+					viewNewColor.setBackgroundColor(getColor());
+
+					return true;
+				}
+				return false;
+			}
+		});
+		viewSatVal.setOnTouchListener(new View.OnTouchListener() {
+			@Override public boolean onTouch(View v, MotionEvent event) {
+				if (event.getAction() == MotionEvent.ACTION_MOVE
+						|| event.getAction() == MotionEvent.ACTION_DOWN
+						|| event.getAction() == MotionEvent.ACTION_UP) {
+
+					float x = event.getX(); // touch event are in dp units.
+					float y = event.getY();
+
+					if (x < 0.f) x = 0.f;
+					if (x > viewSatVal.getMeasuredWidth()) x = viewSatVal.getMeasuredWidth();
+					if (y < 0.f) y = 0.f;
+					if (y > viewSatVal.getMeasuredHeight()) y = viewSatVal.getMeasuredHeight();
+
+					setSat(1.f / viewSatVal.getMeasuredWidth() * x);
+					setVal(1.f - (1.f / viewSatVal.getMeasuredHeight() * y));
+
+					// update view
+					moveTarget();
+					viewNewColor.setBackgroundColor(getColor());
+
+					return true;
+				}
+				return false;
+			}
+		});
+
+		dialog = new AlertDialog.Builder(context)
+			.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+				@Override public void onClick(DialogInterface dialog, int which) {
+					if (AmbilWarnaDialog.this.listener != null) {
+						AmbilWarnaDialog.this.listener.onOk(AmbilWarnaDialog.this, getColor());
+					}
+				}
+			})
+			.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+				@Override public void onClick(DialogInterface dialog, int which) {
+					if (AmbilWarnaDialog.this.listener != null) {
+						AmbilWarnaDialog.this.listener.onCancel(AmbilWarnaDialog.this);
+					}
+				}
+			})
+			.setOnCancelListener(new OnCancelListener() {
+				// if back button is used, call back our listener.
+				@Override public void onCancel(DialogInterface paramDialogInterface) {
+					if (AmbilWarnaDialog.this.listener != null) {
+						AmbilWarnaDialog.this.listener.onCancel(AmbilWarnaDialog.this);
+					}
+
+				}
+			})
+			.create();
+		// kill all padding from the dialog window
+		dialog.setView(view, 0, 0, 0, 0);
+
+		// move cursor & target on first draw
+		ViewTreeObserver vto = view.getViewTreeObserver();
+		vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+			@Override public void onGlobalLayout() {
+				moveCursor();
+				moveTarget();
+				view.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+			}
+		});
+	}
+
+	protected void moveCursor() {
+		float y = viewHue.getMeasuredHeight() - (getHue() * viewHue.getMeasuredHeight() / 360.f);
+		if (y == viewHue.getMeasuredHeight()) y = 0.f;
+		RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) viewCursor.getLayoutParams();
+		layoutParams.leftMargin = (int) (viewHue.getLeft() - Math.floor(viewCursor.getMeasuredWidth() / 2) - viewContainer.getPaddingLeft());
+		;
+		layoutParams.topMargin = (int) (viewHue.getTop() + y - Math.floor(viewCursor.getMeasuredHeight() / 2) - viewContainer.getPaddingTop());
+		;
+		viewCursor.setLayoutParams(layoutParams);
+	}
+
+	protected void moveTarget() {
+		float x = getSat() * viewSatVal.getMeasuredWidth();
+		float y = (1.f - getVal()) * viewSatVal.getMeasuredHeight();
+		RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) viewTarget.getLayoutParams();
+		layoutParams.leftMargin = (int) (viewSatVal.getLeft() + x - Math.floor(viewTarget.getMeasuredWidth() / 2) - viewContainer.getPaddingLeft());
+		layoutParams.topMargin = (int) (viewSatVal.getTop() + y - Math.floor(viewTarget.getMeasuredHeight() / 2) - viewContainer.getPaddingTop());
+		viewTarget.setLayoutParams(layoutParams);
+	}
+
+	private int getColor() {
+		return Color.HSVToColor(currentColorHsv);
+	}
+
+	private float getHue() {
+		return currentColorHsv[0];
+	}
+
+	private float getSat() {
+		return currentColorHsv[1];
+	}
+
+	private float getVal() {
+		return currentColorHsv[2];
+	}
+
+	private void setHue(float hue) {
+		currentColorHsv[0] = hue;
+	}
+
+	private void setSat(float sat) {
+		currentColorHsv[1] = sat;
+	}
+
+	private void setVal(float val) {
+		currentColorHsv[2] = val;
+	}
+
+	public void show() {
+		dialog.show();
+	}
+
+	public AlertDialog getDialog() {
+		return dialog;
+	}
+}
diff --git a/third-party/AmbilWarna/src/yuku/ambilwarna/AmbilWarnaKotak.java b/third-party/AmbilWarna/src/yuku/ambilwarna/AmbilWarnaKotak.java
new file mode 100644
index 000000000..37959376d
--- /dev/null
+++ b/third-party/AmbilWarna/src/yuku/ambilwarna/AmbilWarnaKotak.java
@@ -0,0 +1,46 @@
+package yuku.ambilwarna;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ComposeShader;
+import android.graphics.LinearGradient;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.Shader;
+import android.graphics.Shader.TileMode;
+import android.util.AttributeSet;
+import android.view.View;
+
+public class AmbilWarnaKotak extends View {
+	Paint paint;
+	Shader luar;
+	final float[] color = { 1.f, 1.f, 1.f };
+
+	public AmbilWarnaKotak(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	public AmbilWarnaKotak(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+	}
+
+	@SuppressLint("DrawAllocation") @Override protected void onDraw(Canvas canvas) {
+		super.onDraw(canvas);
+		if (paint == null) {
+			paint = new Paint();
+			luar = new LinearGradient(0.f, 0.f, 0.f, this.getMeasuredHeight(), 0xffffffff, 0xff000000, TileMode.CLAMP);
+		}
+		int rgb = Color.HSVToColor(color);
+		Shader dalam = new LinearGradient(0.f, 0.f, this.getMeasuredWidth(), 0.f, 0xffffffff, rgb, TileMode.CLAMP);
+		ComposeShader shader = new ComposeShader(luar, dalam, PorterDuff.Mode.MULTIPLY);
+		paint.setShader(shader);
+		canvas.drawRect(0.f, 0.f, this.getMeasuredWidth(), this.getMeasuredHeight(), paint);
+	}
+
+	void setHue(float hue) {
+		color[0] = hue;
+		invalidate();
+	}
+}
diff --git a/third-party/AmbilWarna/src/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java b/third-party/AmbilWarna/src/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java
new file mode 100644
index 000000000..2d315c8ee
--- /dev/null
+++ b/third-party/AmbilWarna/src/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java
@@ -0,0 +1,45 @@
+package yuku.ambilwarna.widget;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Paint.Style;
+import android.util.AttributeSet;
+import android.util.FloatMath;
+import android.view.View;
+
+public class AmbilWarnaPrefWidgetView extends View {
+	Paint paint;
+	float rectSize;
+	float strokeWidth;
+
+	boolean drawCross;
+
+	public AmbilWarnaPrefWidgetView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		
+		float density = context.getResources().getDisplayMetrics().density;
+		rectSize = FloatMath.floor(24.f * density + 0.5f);
+		strokeWidth = FloatMath.floor(1.f * density + 0.5f);
+
+		paint = new Paint();
+		paint.setColor(0xffffffff);
+		paint.setStyle(Style.STROKE);
+		paint.setStrokeWidth(strokeWidth);
+	}
+
+	public void showCross(boolean show) {
+		drawCross = show;
+	}
+
+	@Override
+	protected void onDraw(Canvas canvas) {
+		super.onDraw(canvas);
+
+		canvas.drawRect(strokeWidth, strokeWidth, rectSize - strokeWidth, rectSize - strokeWidth, paint);
+		if (drawCross) {
+			canvas.drawLine(strokeWidth, strokeWidth, rectSize - strokeWidth, rectSize - strokeWidth, paint);
+			canvas.drawLine(strokeWidth, rectSize - strokeWidth, rectSize - strokeWidth, strokeWidth, paint);
+		}
+	}
+}
diff --git a/third-party/AmbilWarna/src/yuku/ambilwarna/widget/AmbilWarnaPreference.java b/third-party/AmbilWarna/src/yuku/ambilwarna/widget/AmbilWarnaPreference.java
new file mode 100644
index 000000000..d9daecdbf
--- /dev/null
+++ b/third-party/AmbilWarna/src/yuku/ambilwarna/widget/AmbilWarnaPreference.java
@@ -0,0 +1,129 @@
+package yuku.ambilwarna.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.View;
+
+import yuku.ambilwarna.AmbilWarnaDialog;
+import yuku.ambilwarna.R;
+
+public class AmbilWarnaPreference extends Preference {
+	int value;
+
+	public AmbilWarnaPreference(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		setWidgetLayoutResource(R.layout.ambilwarna_pref_widget);
+	}
+
+	@Override protected void onBindView(View view) {
+		super.onBindView(view);
+
+		// Set our custom views inside the layout
+		final View kotak = view.findViewById(R.id.ambilwarna_pref_widget_kotak);
+		if (kotak != null) {
+			kotak.setBackgroundColor(value);
+		}
+	}
+
+	@Override protected void onClick() {
+		new AmbilWarnaDialog(getContext(), value, new AmbilWarnaDialog.OnAmbilWarnaListener() {
+			@Override public void onOk(AmbilWarnaDialog dialog, int color) {
+				if (!callChangeListener(color)) return; // They don't want the value to be set
+				value = color;
+				persistInt(value);
+				notifyChanged();
+			}
+
+			@Override public void onCancel(AmbilWarnaDialog dialog) {
+				// nothing to do
+			}
+		}).show();
+	}
+
+	public void forceSetValue(int value) {
+		this.value = value;
+		persistInt(value);
+		notifyChanged();
+	}
+
+	@Override protected Object onGetDefaultValue(TypedArray a, int index) {
+		// This preference type's value type is Integer, so we read the default value from the attributes as an Integer.
+		return a.getInteger(index, 0);
+	}
+
+	@Override protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
+		if (restoreValue) { // Restore state
+			value = getPersistedInt(value);
+		} else { // Set state
+			int value = (Integer) defaultValue;
+			this.value = value;
+			persistInt(value);
+		}
+	}
+
+	/*
+	 * Suppose a client uses this preference type without persisting. We
+	 * must save the instance state so it is able to, for example, survive
+	 * orientation changes.
+	 */
+	@Override protected Parcelable onSaveInstanceState() {
+		final Parcelable superState = super.onSaveInstanceState();
+		if (isPersistent()) return superState; // No need to save instance state since it's persistent
+
+		final SavedState myState = new SavedState(superState);
+		myState.value = value;
+		return myState;
+	}
+
+	@Override protected void onRestoreInstanceState(Parcelable state) {
+		if (!state.getClass().equals(SavedState.class)) {
+			// Didn't save state for us in onSaveInstanceState
+			super.onRestoreInstanceState(state);
+			return;
+		}
+
+		// Restore the instance state
+		SavedState myState = (SavedState) state;
+		super.onRestoreInstanceState(myState.getSuperState());
+		this.value = myState.value;
+		notifyChanged();
+	}
+
+	/**
+	 * SavedState, a subclass of {@link BaseSavedState}, will store the state
+	 * of MyPreference, a subclass of Preference.
+	 * <p>
+	 * It is important to always call through to super methods.
+	 */
+	private static class SavedState extends BaseSavedState {
+		int value;
+
+		public SavedState(Parcel source) {
+			super(source);
+			value = source.readInt();
+		}
+
+		@Override public void writeToParcel(Parcel dest, int flags) {
+			super.writeToParcel(dest, flags);
+			dest.writeInt(value);
+		}
+
+		public SavedState(Parcelable superState) {
+			super(superState);
+		}
+
+		@SuppressWarnings("unused") public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.Creator<SavedState>() {
+			public SavedState createFromParcel(Parcel in) {
+				return new SavedState(in);
+			}
+
+			public SavedState[] newArray(int size) {
+				return new SavedState[size];
+			}
+		};
+	}
+}