From 0ca0b2a9bc9ea6d5af8b90da7fd14d2ce0cc6bc4 Mon Sep 17 00:00:00 2001
From: Yuku on yuku8 <yukuku@gmail.com>
Date: Wed, 24 Aug 2016 20:50:36 +0800
Subject: [PATCH 01/15] Fix material-dialogs item adapter does not dismiss the
 dialog

---
 .../java/yuku/alkitab/base/IsiActivity.java   | 24 +++++-------
 .../base/dialog/TypeBookmarkDialog.java       | 37 +++++++------------
 .../widget/MaterialDialogAdapterHelper.java   | 30 +++++++++++++++
 .../base/widget/TextAppearancePanel.java      |  8 ++--
 4 files changed, 57 insertions(+), 42 deletions(-)
 create mode 100644 Alkitab/src/main/java/yuku/alkitab/base/widget/MaterialDialogAdapterHelper.java

diff --git a/Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.java
index a06580c87..0558df793 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.java
@@ -94,6 +94,7 @@
 import yuku.alkitab.base.widget.GotoButton;
 import yuku.alkitab.base.widget.LabeledSplitHandleButton;
 import yuku.alkitab.base.widget.LeftDrawer;
+import yuku.alkitab.base.widget.MaterialDialogAdapterHelper;
 import yuku.alkitab.base.widget.ScrollbarSetter;
 import yuku.alkitab.base.widget.SingleViewVerseAdapter;
 import yuku.alkitab.base.widget.SplitHandleButton;
@@ -1164,10 +1165,7 @@ void bGoto_click() {
 	void bGoto_longClick() {
 		App.trackEvent("nav_goto_button_long_click");
 		if (history.getSize() > 0) {
-			new MaterialDialog.Builder(this)
-				.adapter(historyAdapter, null)
-				.autoDismiss(true)
-				.show();
+			MaterialDialogAdapterHelper.show(new MaterialDialog.Builder(this), new HistoryAdapter());
 		} else {
 			Snackbar.make(root, R.string.recentverses_not_available, Snackbar.LENGTH_SHORT).show();
 		}
@@ -1183,7 +1181,7 @@ public HistoryEntryHolder(final View itemView) {
 		}
 	}
 
-	private RecyclerView.Adapter<RecyclerView.ViewHolder> historyAdapter = new RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+	class HistoryAdapter extends MaterialDialogAdapterHelper.Adapter {
 		private final java.text.DateFormat timeFormat = DateFormat.getTimeFormat(App.context);
 		private final java.text.DateFormat mediumDateFormat = DateFormat.getMediumDateFormat(App.context);
 
@@ -1222,6 +1220,8 @@ public void onBindViewHolder(final RecyclerView.ViewHolder _holder_, final int p
 			}
 
 			holder.itemView.setOnClickListener(v -> {
+				dismissDialog();
+
 				final int which = holder.getAdapterPosition();
 
 				final int ari = history.getAri(which);
@@ -1813,10 +1813,7 @@ public void onBookmarkAttributeClick(final Version version, final String version
 			if (markers.size() == 1) {
 				openBookmarkDialog(markers.get(0)._id);
 			} else {
-				final MaterialDialog dialog = new MaterialDialog.Builder(IsiActivity.this)
-					.title(R.string.edit_bookmark)
-					.adapter(new MultipleMarkerSelectAdapter(version, versionId, markers, Marker.Kind.bookmark), null)
-					.show();
+				MaterialDialogAdapterHelper.show(new MaterialDialog.Builder(IsiActivity.this).title(R.string.edit_bookmark), new MultipleMarkerSelectAdapter(version, versionId, markers, Marker.Kind.bookmark));
 			}
 		}
 
@@ -1830,10 +1827,7 @@ public void onNoteAttributeClick(final Version version, final String versionId,
 			if (markers.size() == 1) {
 				openNoteDialog(markers.get(0)._id);
 			} else {
-                final MaterialDialog dialog = new MaterialDialog.Builder(IsiActivity.this)
-                    .title(R.string.edit_note)
-                    .adapter(new MultipleMarkerSelectAdapter(version, versionId, markers, Marker.Kind.note), null)
-                    .show();
+				MaterialDialogAdapterHelper.show(new MaterialDialog.Builder(IsiActivity.this).title(R.string.edit_note), new MultipleMarkerSelectAdapter(version, versionId, markers, Marker.Kind.note));
 			}
         }
 
@@ -1853,7 +1847,7 @@ public MarkerHolder(final View itemView) {
 			}
 		}
 
-		class MultipleMarkerSelectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+		class MultipleMarkerSelectAdapter extends MaterialDialogAdapterHelper.Adapter {
 			final Version version;
 			final float textSizeMult;
 			final List<Marker> markers;
@@ -1923,6 +1917,8 @@ public void onBindViewHolder(final RecyclerView.ViewHolder _holder_, final int p
 				}
 
 				holder.itemView.setOnClickListener(v -> {
+					dismissDialog();
+
 					final int which = holder.getAdapterPosition();
 					final Marker marker = markers.get(which);
 					if (kind == Marker.Kind.bookmark) {
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/dialog/TypeBookmarkDialog.java b/Alkitab/src/main/java/yuku/alkitab/base/dialog/TypeBookmarkDialog.java
index 1f683015b..dca13afd4 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/dialog/TypeBookmarkDialog.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/dialog/TypeBookmarkDialog.java
@@ -15,6 +15,7 @@
 import yuku.afw.V;
 import yuku.alkitab.base.S;
 import yuku.alkitab.base.U;
+import yuku.alkitab.base.widget.MaterialDialogAdapterHelper;
 import yuku.alkitab.debug.R;
 import yuku.alkitab.model.Label;
 import yuku.alkitab.model.Marker;
@@ -34,7 +35,6 @@ public interface Listener {
 	final Context context;
 	final Dialog dialog;
 	FlowLayout panelLabels;
-	LabelAdapter adapter;
 	EditText tCaption;
 
 	Marker marker;
@@ -81,16 +81,7 @@ private TypeBookmarkDialog(final Context context, final Marker marker, String re
 		tCaption = V.get(dialogView, R.id.tCaption);
 		final Button bAddLabel = V.get(dialogView, R.id.bAddLabel);
 
-		bAddLabel.setOnClickListener(v -> {
-			adapter = new LabelAdapter();
-
-			final MaterialDialog dialog = new MaterialDialog.Builder(context)
-				.title(R.string.add_label_title)
-				.adapter(adapter, null)
-				.build();
-
-			dialog.show();
-		});
+		bAddLabel.setOnClickListener(v -> MaterialDialogAdapterHelper.show(new MaterialDialog.Builder(context).title(R.string.add_label_title), new LabelAdapter()));
 
 		if (marker != null) {
 			labels = new TreeSet<>();
@@ -185,13 +176,13 @@ void setLabelsText() {
 		
 		int pos = 1;
 		for (Label label: labels) {
-			panelLabels.addView(getLabelView(label), pos++);
+			panelLabels.addView(getLabelView(label, panelLabels), pos++);
 		}
 	}
 	
-	private View getLabelView(Label label) {
-		TextView res = (TextView) LayoutInflater.from(context).inflate(R.layout.label_x, null);
-		res.setLayoutParams(panelLabels.generateDefaultLayoutParams());
+	private View getLabelView(Label label, final ViewGroup parent) {
+		TextView res = (TextView) LayoutInflater.from(context).inflate(R.layout.label_x, parent, false);
+		res.setLayoutParams(this.panelLabels.generateDefaultLayoutParams());
 		res.setText(label.title);
 		res.setTag(R.id.TAG_label, label);
 		res.setOnClickListener(label_click);
@@ -214,16 +205,12 @@ public LabelHolder(final View itemView) {
 		}
 	}
 
-	class LabelAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-		private List<Label> labels;
-
-		public LabelAdapter() {
-			labels = S.getDb().listAllLabels();
-		}
+	class LabelAdapter extends MaterialDialogAdapterHelper.Adapter {
+		private List<Label> availableLabels = S.getDb().listAllLabels();
 
 		@Override
 		public int getItemCount() {
-			return 1 + labels.size();
+			return 1 + availableLabels.size();
 		}
 
 		@Override
@@ -239,7 +226,7 @@ public void onBindViewHolder(final RecyclerView.ViewHolder _holder_, final int p
 
 			{
 				if (type == 0) {
-					final Label label = labels.get(position - 1);
+					final Label label = availableLabels.get(position - 1);
 					holder.text1.setText(label.title);
 					U.applyLabelColor(label, holder.text1);
 				} else {
@@ -248,6 +235,8 @@ public void onBindViewHolder(final RecyclerView.ViewHolder _holder_, final int p
 			}
 
 			holder.itemView.setOnClickListener(v -> {
+				dismissDialog();
+
 				final int which = holder.getAdapterPosition();
 				if (which == 0) { // new label
 					LabelEditorDialog.show(context, "", context.getString(R.string.create_label_title), title -> {
@@ -258,7 +247,7 @@ public void onBindViewHolder(final RecyclerView.ViewHolder _holder_, final int p
 						}
 					});
 				} else {
-					final Label label = labels.get(position - 1);
+					final Label label = availableLabels.get(which - 1);
 					labels.add(label);
 					setLabelsText();
 				}
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/widget/MaterialDialogAdapterHelper.java b/Alkitab/src/main/java/yuku/alkitab/base/widget/MaterialDialogAdapterHelper.java
new file mode 100644
index 000000000..2f0ab18ed
--- /dev/null
+++ b/Alkitab/src/main/java/yuku/alkitab/base/widget/MaterialDialogAdapterHelper.java
@@ -0,0 +1,30 @@
+package yuku.alkitab.base.widget;
+
+import android.support.v7.widget.RecyclerView;
+import com.afollestad.materialdialogs.MaterialDialog;
+
+public class MaterialDialogAdapterHelper {
+	public static abstract class Adapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+		private MaterialDialog dialog;
+
+		public void setDialog(MaterialDialog dialog) {
+			this.dialog = dialog;
+		}
+
+		public void dismissDialog() {
+			this.dialog.dismiss();
+		}
+	}
+
+	public static MaterialDialog show(MaterialDialog.Builder builder, Adapter adapter) {
+		final MaterialDialog dialog = builder
+			.adapter(adapter, null)
+			.build();
+
+		adapter.setDialog(dialog);
+
+		dialog.show();
+
+		return dialog;
+	}
+}
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/widget/TextAppearancePanel.java b/Alkitab/src/main/java/yuku/alkitab/base/widget/TextAppearancePanel.java
index e7bd46765..5351dd903 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/widget/TextAppearancePanel.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/widget/TextAppearancePanel.java
@@ -182,9 +182,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
 		public void onClick(final View v) {
 			final ColorThemeAdapter adapter = new ColorThemeAdapter();
 
-			final MaterialDialog dialog = new MaterialDialog.Builder(activity)
-				.adapter(adapter, null)
-				.show();
+			final MaterialDialog dialog = MaterialDialogAdapterHelper.show(new MaterialDialog.Builder(activity), adapter);
 
 			final RecyclerView recyclerView = dialog.getRecyclerView();
 
@@ -359,7 +357,7 @@ public ColorThemeHolder(final View itemView) {
 		}
 	}
 
-	class ColorThemeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+	class ColorThemeAdapter extends MaterialDialogAdapterHelper.Adapter {
 		List<int[]> themes;
 		List<String> themeNames;
 
@@ -407,6 +405,8 @@ public void onBindViewHolder(final RecyclerView.ViewHolder _holder_, final int p
 			}
 
 			holder.itemView.setOnClickListener(v -> {
+				dismissDialog();
+
 				final int which = holder.getAdapterPosition();
 
 				if (which == getPositionOfCustomColors()) {

From c9ea5cfec5e4433c4244fea1ce3443cfd126dff5 Mon Sep 17 00:00:00 2001
From: Yuku on yuku8 <yukuku@gmail.com>
Date: Tue, 30 Aug 2016 20:30:32 +0800
Subject: [PATCH 02/15] Fix search book filter not showing

---
 .../java/yuku/alkitab/base/ac/SearchBookFilterActivity.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/SearchBookFilterActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/SearchBookFilterActivity.java
index a2088115a..bb34003d5 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/SearchBookFilterActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/SearchBookFilterActivity.java
@@ -168,7 +168,7 @@ public VH onCreateViewHolder(final ViewGroup parent, final int viewType) {
 				return new VH(getLayoutInflater().inflate(R.layout.search_book_filter_categories, parent, false), viewType);
 			} else {
 				final TextView res = new TextView(SearchBookFilterActivity.this);
-				res.setLayoutParams(new GridLayoutManager.LayoutParams(0 /* will be ignored */, getResources().getDimensionPixelSize(R.dimen.goto_grid_cell_height)));
+				res.setLayoutParams(new GridLayoutManager.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, getResources().getDimensionPixelSize(R.dimen.goto_grid_cell_height)));
 				res.setGravity(Gravity.CENTER);
 				res.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
 				return new VH(res, viewType);

From adc6fc1a3063294cc1b5dd27fb408dc44996dfd7 Mon Sep 17 00:00:00 2001
From: Yuku on yuku8 <yukuku@gmail.com>
Date: Wed, 31 Aug 2016 01:26:05 +0800
Subject: [PATCH 03/15] Remove all automatic toolbar from theme and use layout
 toolbar instead. Remove deprecated usage of TabLayout methods. Use
 preference-v7-fix.

---
 Alkitab/build.gradle                          |   2 +-
 Alkitab/src/main/AndroidManifest.xml          |  42 +--
 .../yuku/alkitab/base/ac/AboutActivity.java   |  12 +-
 .../base/ac/ColorSettingsActivity.java        |  10 +-
 ...lyVerseAppWidgetConfigurationActivity.java |  10 +-
 .../alkitab/base/ac/FontManagerActivity.java  |  11 +-
 .../yuku/alkitab/base/ac/GotoActivity.java    |   4 +-
 .../yuku/alkitab/base/ac/HelpActivity.java    |   9 +-
 .../alkitab/base/ac/MarkerListActivity.java   |  10 +-
 .../yuku/alkitab/base/ac/MarkersActivity.java |  13 +-
 .../yuku/alkitab/base/ac/NoteActivity.java    |   8 +-
 .../alkitab/base/ac/PatchTextActivity.java    |  62 ++--
 .../yuku/alkitab/base/ac/SearchActivity.java  |   8 +-
 .../base/ac/SearchBookFilterActivity.java     |   8 +
 .../base/ac/SecretSettingsActivity.java       |  10 +-
 .../alkitab/base/ac/SettingsActivity.java     |   9 +-
 .../yuku/alkitab/base/ac/ShareActivity.java   |   9 +-
 .../alkitab/base/ac/SongListActivity.java     |  12 +-
 .../alkitab/base/ac/SongViewActivity.java     |   8 +-
 .../alkitab/base/ac/VersionsActivity.java     |  12 +-
 .../alkitab/base/ac/base/BaseActivity.java    |  22 +-
 .../alkitab/base/sync/SyncLogActivity.java    |   8 +
 .../alkitab/base/sync/SyncLoginActivity.java  |   9 +-
 .../base/sync/SyncSettingsActivity.java       |  10 +-
 .../reminder/ac/DevotionReminderActivity.java |  10 +-
 .../yuku/filechooser/FileChooserActivity.java |  14 +-
 .../res/layout/activity_color_settings.xml    |  20 +-
 .../activity_daily_verse_configuration.xml    |   7 +-
 .../res/layout/activity_devotion_reminder.xml |  18 +-
 .../main/res/layout/activity_font_manager.xml |  36 ++-
 Alkitab/src/main/res/layout/activity_help.xml |  42 ++-
 .../main/res/layout/activity_marker_list.xml  | 110 ++++---
 .../src/main/res/layout/activity_markers.xml  |   7 +-
 .../main/res/layout/activity_patch_text.xml   |  32 +-
 .../activity_patch_text_actionbar_custom.xml  |  33 --
 .../layout/activity_search_book_filter.xml    |   7 +
 .../res/layout/activity_secret_settings.xml   |  19 +-
 .../src/main/res/layout/activity_settings.xml |  30 +-
 .../src/main/res/layout/activity_share.xml    |  22 +-
 .../src/main/res/layout/activity_sync_log.xml |  20 +-
 .../main/res/layout/activity_sync_login.xml   | 287 +++++++++---------
 .../res/layout/activity_sync_settings.xml     |  19 +-
 .../filechooser_activity_filechooser.xml      |  19 +-
 .../src/main/res/menu/activity_patch_text.xml |  18 ++
 Alkitab/src/main/res/values/strings.xml       |   6 +-
 Alkitab/src/main/res/values/themes.xml        |   8 +-
 46 files changed, 672 insertions(+), 430 deletions(-)
 delete mode 100644 Alkitab/src/main/res/layout/activity_patch_text_actionbar_custom.xml
 create mode 100644 Alkitab/src/main/res/menu/activity_patch_text.xml

diff --git a/Alkitab/build.gradle b/Alkitab/build.gradle
index 53906e32a..fc64a6111 100644
--- a/Alkitab/build.gradle
+++ b/Alkitab/build.gradle
@@ -103,5 +103,5 @@ dependencies {
     compile 'com.android.support:multidex:1.0.1'
     compile "com.android.support:design:$supportLibVersion"
     compile "com.android.support:percent:$supportLibVersion"
-    compile "com.android.support:preference-v14:$supportLibVersion"
+    compile "com.takisoft.fix:preference-v7:$supportLibVersion.0"
 }
diff --git a/Alkitab/src/main/AndroidManifest.xml b/Alkitab/src/main/AndroidManifest.xml
index 2602cddc0..62ceadee1 100644
--- a/Alkitab/src/main/AndroidManifest.xml
+++ b/Alkitab/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-	package="yuku.alkitab.debug"
+<manifest package="yuku.alkitab.debug"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:installLocation="auto">
@@ -72,21 +71,17 @@
 		<activity
 			android:name="yuku.alkitab.base.ac.SettingsActivity"
 			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
-			android:label="@string/pengaturan_alkitab"
-			android:theme="@style/Theme.Alkitab.WithActionBar.AppCompat" />
+			android:label="@string/pengaturan_alkitab" />
 		<activity
 			android:name="yuku.alkitab.base.ac.ColorSettingsActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
-			android:theme="@style/Theme.Alkitab.WithActionBar.AppCompat" />
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection" />
 		<activity
 			android:name="yuku.alkitab.base.ac.MarkersActivity"
 			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
-			android:label="@string/activity_title_markers"
-			android:theme="@style/Theme.Alkitab.WithActionBar.AppCompat" />
+			android:label="@string/activity_title_markers" />
 		<activity
 			android:name="yuku.alkitab.base.ac.MarkerListActivity"
 			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
-			android:theme="@style/Theme.Alkitab.WithActionBar.AppCompat"
 			android:windowSoftInputMode="adjustResize|stateHidden" />
 		<activity
 			android:name="yuku.alkitab.base.ac.VersionsActivity"
@@ -265,8 +260,7 @@
 		</activity>
 		<activity
 			android:name="yuku.alkitab.base.ac.HelpActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
-			android:theme="@style/Theme.Alkitab.WithActionBar.AppCompat">
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value="yuku.alkitab.base.ac.AboutActivity" />
@@ -281,12 +275,11 @@
 		</activity>
 		<activity
 			android:name="yuku.alkitab.base.ac.ShareActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
-			android:theme="@style/Theme.Alkitab.WithActionBar.AppCompat" />
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection" />
 		<activity
 			android:name="yuku.alkitab.base.ac.FontManagerActivity"
 			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
-			android:theme="@style/Theme.Alkitab.WithActionBar.AppCompat" />
+			android:label="@string/fm_activity_title" />
 		<activity
 			android:name="yuku.alkitab.base.ac.SongListActivity"
 			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
@@ -295,12 +288,12 @@
 			android:windowSoftInputMode="adjustResize|stateHidden" />
 		<activity
 			android:name="yuku.alkitab.base.ac.SongViewActivity"
+			android:label="@string/sn_songs_activity_title"
 			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection" />
 		<activity
 			android:name="yuku.alkitab.base.ac.SecretSettingsActivity"
 			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
-			android:label="Secret settings"
-			android:theme="@style/Theme.Alkitab.WithActionBar.AppCompat" />
+			android:label="Secret settings" />
 		<activity
 			android:name="yuku.alkitab.base.ac.SecretSyncDebugActivity"
 			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
@@ -311,26 +304,22 @@
 		<activity
 			android:name="yuku.alkitab.base.ac.PatchTextActivity"
 			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
-			android:theme="@style/Theme.Alkitab.WithActionBar.AppCompat"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="yuku.alkitab.base.sync.SyncSettingsActivity"
 			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
-			android:theme="@style/Theme.Alkitab.WithActionBar.AppCompat" />
+			android:label="@string/sync_status_activity_title" />
 		<activity
 			android:name="yuku.alkitab.base.sync.SyncLogActivity"
 			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
-			android:label="@string/sync_log_activity_title"
-			android:theme="@style/Theme.Alkitab.WithActionBar.AppCompat" />
+			android:label="@string/sync_log_activity_title"/>
 		<activity
 			android:name="yuku.alkitab.base.sync.SyncLoginActivity"
 			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
-			android:label="@string/sync_login_activity_title"
-			android:theme="@style/Theme.Alkitab.WithActionBar.AppCompat" />
+			android:label="@string/sync_login_activity_title" />
 		<activity
 			android:name="yuku.filechooser.FileChooserActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
-			android:theme="@style/Theme.Alkitab.WithActionBar.AppCompat" />
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection" />
 		<activity
 			android:name="com.example.android.wizardpager.MainActivity"
 			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
@@ -348,7 +337,7 @@
 		<activity
 			android:name="yuku.alkitab.base.ac.DailyVerseAppWidgetConfigurationActivity"
 			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
-			android:theme="@style/Theme.Alkitab.WithActionBar.AppCompat">
+			android:label="@string/dv_activity_title">
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
 			</intent-filter>
@@ -496,8 +485,7 @@
 		<activity
 			android:name="yuku.alkitab.reminder.ac.DevotionReminderActivity"
 			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
-			android:label="@string/dr_app_name"
-			android:theme="@style/Theme.Alkitab.WithActionBar.AppCompat" />
+			android:label="@string/dr_app_name" />
 
 		<receiver android:name="yuku.alkitab.reminder.br.DevotionReminderReceiver" />
 		<receiver android:name="yuku.alkitab.reminder.br.BootCompleteReceiver">
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/AboutActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/AboutActivity.java
index 6ed4f9e68..5538c0aa8 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/AboutActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/AboutActivity.java
@@ -9,6 +9,7 @@
 import android.os.Bundle;
 import android.support.v4.content.res.ResourcesCompat;
 import android.support.v4.widget.ContentLoadingProgressBar;
+import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.text.method.LinkMovementMethod;
 import android.util.DisplayMetrics;
@@ -23,11 +24,8 @@
 import yuku.alkitab.base.util.Announce;
 import yuku.alkitab.debug.R;
 
-import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.afollestad.materialdialogs.MaterialDialog.Builder;
-import static yuku.alkitab.base.util.Literals.Array;
 import static yuku.alkitab.base.util.Literals.List;
 
 public class AboutActivity extends BaseActivity {
@@ -109,10 +107,10 @@ public void onLoaderReset(final Loader<long[]> loader) {
 		setContentView(R.layout.activity_about);
 
 		final Toolbar toolbar = V.get(this, R.id.toolbar);
-		setSupportActionBar(toolbar); // must be done first before below lines
-		toolbar.setTitle(null);
-		toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_material);
-		toolbar.setNavigationOnClickListener(v -> navigateUp());
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
 
 		root = V.get(this, R.id.root);
 		tVersion = V.get(this, R.id.tVersion);
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/ColorSettingsActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/ColorSettingsActivity.java
index 42012400e..3be663869 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/ColorSettingsActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/ColorSettingsActivity.java
@@ -2,8 +2,11 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
 import android.support.v7.preference.PreferenceFragmentCompat;
+import android.support.v7.widget.Toolbar;
 import yuku.afw.App;
+import yuku.afw.V;
 import yuku.alkitab.base.ac.base.BaseActivity;
 import yuku.alkitab.debug.R;
 
@@ -19,10 +22,15 @@ public static Intent createIntent(final boolean nightMode) {
 	}
 	
 	@Override protected void onCreate(Bundle savedInstanceState) {
-		enableNonToolbarUpButton();
 		super.onCreate(savedInstanceState);
 		nightMode = getIntent().getBooleanExtra(EXTRA_nightMode, false);
 		setContentView(R.layout.activity_color_settings);
+
+		final Toolbar toolbar = V.get(this, R.id.toolbar);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
 	}
 
 	public static class ColorSettingsFragment extends PreferenceFragmentCompat {
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/DailyVerseAppWidgetConfigurationActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/DailyVerseAppWidgetConfigurationActivity.java
index 8915b9a79..932651021 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/DailyVerseAppWidgetConfigurationActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/DailyVerseAppWidgetConfigurationActivity.java
@@ -7,6 +7,8 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -52,10 +54,16 @@ public void onReceive(final Context context, final Intent intent) {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-
 		setResult(RESULT_CANCELED);
 		setContentView(R.layout.activity_daily_verse_configuration);
 
+		final Toolbar toolbar = V.get(this, R.id.toolbar);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
+		ab.setHomeAsUpIndicator(R.drawable.ic_action_remove);
+
 		final ListView lsVersionsAppWidget = V.get(this, R.id.lsVersionsAppWidget);
 		final Button bOk = V.get(this, R.id.bOk);
 		final Button bCancel = V.get(this, R.id.bCancel);
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/FontManagerActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/FontManagerActivity.java
index 58607039d..5d379e083 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/FontManagerActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/FontManagerActivity.java
@@ -6,6 +6,8 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -65,12 +67,15 @@ public static Intent createIntent() {
 	};
 
 	@Override protected void onCreate(Bundle savedInstanceState) {
-		enableNonToolbarUpButton();
 		super.willNeedStoragePermission();
 		super.onCreate(savedInstanceState);
-
 		setContentView(R.layout.activity_font_manager);
-		setTitle(R.string.fm_activity_title);
+
+		final Toolbar toolbar = V.get(this, R.id.toolbar);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
 
 		lsFont = V.get(this, R.id.lsFont);
 		lEmptyError = V.get(this, R.id.lEmptyError);
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/GotoActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/GotoActivity.java
index 4f0b56324..8b131d117 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/GotoActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/GotoActivity.java
@@ -102,9 +102,7 @@ public void onPageSelected(int position) {
 
 		tablayout = V.get(this, R.id.tablayout);
 		tablayout.setTabMode(TabLayout.MODE_SCROLLABLE);
-		tablayout.setTabsFromPagerAdapter(pagerAdapter);
-		tablayout.setOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(viewPager));
-		viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tablayout));
+		tablayout.setupWithViewPager(viewPager);
 
 		if (savedInstanceState == null) {
 			// get from preferences
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/HelpActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/HelpActivity.java
index 2a6823bda..3e63d61a1 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/HelpActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/HelpActivity.java
@@ -5,6 +5,8 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -64,10 +66,15 @@ public static Intent createViewAnnouncementIntent(final long[] announcementIds)
 	@SuppressLint("SetJavaScriptEnabled")
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
-		enableNonToolbarUpButton();
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_help);
 
+		final Toolbar toolbar = V.get(this, R.id.toolbar);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
+
 		webview = V.get(this, R.id.webview);
 		progress = V.get(this, R.id.progress);
 
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/MarkerListActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/MarkerListActivity.java
index c28b71355..80fda103f 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/MarkerListActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/MarkerListActivity.java
@@ -7,6 +7,8 @@
 import android.os.Bundle;
 import android.support.annotation.IdRes;
 import android.support.annotation.Nullable;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.text.SpannableStringBuilder;
 import android.text.style.BackgroundColorSpan;
 import android.view.LayoutInflater;
@@ -101,11 +103,15 @@ public static Intent createIntent(Context context, Marker.Kind filter_kind, long
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
-		enableNonToolbarUpButton();
 		super.onCreate(savedInstanceState);
-
 		setContentView(R.layout.activity_marker_list);
 
+		final Toolbar toolbar = V.get(this, R.id.toolbar);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
+
 		root = V.get(this, R.id.root);
 		empty = V.get(this, android.R.id.empty);
 		tEmpty = V.get(this, R.id.tEmpty);
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/MarkersActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/MarkersActivity.java
index 146ad5a53..9353aa57c 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/MarkersActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/MarkersActivity.java
@@ -7,6 +7,8 @@
 import android.content.IntentFilter;
 import android.graphics.Point;
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
@@ -68,12 +70,15 @@ public static Intent createIntent() {
 	}
 
 	@Override protected void onCreate(Bundle savedInstanceState) {
-		enableNonToolbarUpButton();
 		super.onCreate(savedInstanceState);
-		
 		setContentView(R.layout.activity_markers);
-		setTitle(R.string.activity_title_markers);
-		
+
+		final Toolbar toolbar = V.get(this, R.id.toolbar);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
+
 		adapter = new MarkerFilterAdapter();
 		adapter.reload();
 
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/NoteActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/NoteActivity.java
index 55fccca12..1ee529374 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/NoteActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/NoteActivity.java
@@ -3,6 +3,7 @@
 import android.content.Intent;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.text.Layout;
 import android.text.SpannableStringBuilder;
@@ -101,9 +102,10 @@ protected void onCreate(final Bundle savedInstanceState) {
 		tCaption = V.get(this, R.id.tCaption);
 
 		final Toolbar toolbar = V.get(this, R.id.toolbar);
-		setSupportActionBar(toolbar); // must be done first before below lines
-		toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_material);
-		toolbar.setNavigationOnClickListener(v -> navigateUp());
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
 
 		if (marker != null) {
 			tCaptionReadOnly.setText(marker.caption);
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/PatchTextActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/PatchTextActivity.java
index 8defb3572..a468c8e21 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/PatchTextActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/PatchTextActivity.java
@@ -4,8 +4,10 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.util.TypedValue;
-import android.view.View;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.widget.EditText;
 import android.widget.TextView;
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -26,11 +28,10 @@ public class PatchTextActivity extends BaseActivity {
 	public static final int REQCODE_send = 1;
 
 	EditText tBody;
-	View bReference;
-	View bSend;
 
 	CharSequence baseBody;
 	String extraInfo;
+	String referenceUrl;
 
 	public static Intent createIntent(final CharSequence baseBody, final String extraInfo, final String referenceUrl) {
 		final Intent res = new Intent(App.context, PatchTextActivity.class);
@@ -45,6 +46,13 @@ protected void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_patch_text);
 
+		final Toolbar toolbar = V.get(this, R.id.toolbar);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
+		ab.setDisplayShowTitleEnabled(false);
+
 		tBody = V.get(this, R.id.tBody);
 		tBody.setTextColor(S.applied.fontColor);
 		tBody.setBackgroundColor(S.applied.backgroundColor);
@@ -52,29 +60,11 @@ protected void onCreate(final Bundle savedInstanceState) {
 		tBody.setTextSize(TypedValue.COMPLEX_UNIT_DIP, S.applied.fontSize2dp);
 		tBody.setLineSpacing(0, S.applied.lineSpacingMult);
 
-		final ActionBar actionBar = getSupportActionBar();
-		actionBar.setDisplayShowCustomEnabled(true);
-		actionBar.setDisplayHomeAsUpEnabled(false);
-		actionBar.setDisplayShowTitleEnabled(false);
-		actionBar.setCustomView(R.layout.activity_patch_text_actionbar_custom);
-
-		final View customView = actionBar.getCustomView();
-		bReference = V.get(customView, R.id.bReference);
-		bSend = V.get(customView, R.id.bSend);
-
 		baseBody = getIntent().getCharSequenceExtra(EXTRA_baseBody);
 		tBody.setText(baseBody, TextView.BufferType.EDITABLE);
 
 		extraInfo = getIntent().getStringExtra(EXTRA_extraInfo);
-		final String referenceUrl = getIntent().getStringExtra(EXTRA_referenceUrl);
-
-		if (referenceUrl != null) {
-			bReference.setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(referenceUrl))));
-		} else {
-			bReference.setVisibility(View.GONE);
-		}
-
-		bSend.setOnClickListener(v -> bSend_click());
+		referenceUrl = getIntent().getStringExtra(EXTRA_referenceUrl);
 
 		new MaterialDialog.Builder(this)
 			.content(R.string.patch_text_intro)
@@ -82,7 +72,33 @@ protected void onCreate(final Bundle savedInstanceState) {
 			.show();
 	}
 
-	void bSend_click() {
+	@Override
+	public boolean onCreateOptionsMenu(final Menu menu) {
+		getMenuInflater().inflate(R.menu.activity_patch_text, menu);
+		return true;
+	}
+
+	@Override
+	public boolean onPrepareOptionsMenu(final Menu menu) {
+		final MenuItem menuReference = menu.findItem(R.id.menuReference);
+		menuReference.setVisible(referenceUrl != null);
+
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(final MenuItem item) {
+		if (item.getItemId() == R.id.menuReference) {
+			startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(referenceUrl)));
+			return true;
+		} else if (item.getItemId() == R.id.menuSend) {
+			menuSend_click();
+		}
+
+		return super.onOptionsItemSelected(item);
+	}
+
+	void menuSend_click() {
 		final String baseText = baseBody.toString();
 		final String currentText = tBody.getText().toString();
 
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/SearchActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/SearchActivity.java
index 2ce723f17..88b3c7452 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/SearchActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/SearchActivity.java
@@ -12,6 +12,7 @@
 import android.support.design.widget.Snackbar;
 import android.support.v4.graphics.ColorUtils;
 import android.support.v4.widget.CursorAdapter;
+import android.support.v7.app.ActionBar;
 import android.support.v7.view.ActionMode;
 import android.support.v7.widget.SearchView;
 import android.support.v7.widget.Toolbar;
@@ -285,9 +286,10 @@ public static Intent createIntent(int openedBookId) {
 		bEditFilter = V.get(this, R.id.bEditFilter);
 
 		final Toolbar toolbar = V.get(this, R.id.toolbar);
-		setSupportActionBar(toolbar); // must be done first before below lines
-		toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_material);
-		toolbar.setNavigationOnClickListener(v -> navigateUp());
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
 
 		bVersion = V.get(this, R.id.bVersion);
 
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/SearchBookFilterActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/SearchBookFilterActivity.java
index bb34003d5..7b9d12ac4 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/SearchBookFilterActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/SearchBookFilterActivity.java
@@ -5,8 +5,10 @@
 import android.graphics.drawable.InsetDrawable;
 import android.os.Bundle;
 import android.os.Parcelable;
+import android.support.v7.app.ActionBar;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
 import android.util.SparseBooleanArray;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -93,6 +95,12 @@ public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_search_book_filter);
 
+		final Toolbar toolbar = V.get(this, R.id.toolbar);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
+
 		selectedBookIds = intArrayToSparseBooleanArray(getIntent().getIntArrayExtra(EXTRA_selectedBookIds));
 		final Parcelable[] booksParcelable = getIntent().getParcelableArrayExtra(EXTRA_books);
 		final Book[] books = new Book[booksParcelable.length];
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/SecretSettingsActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/SecretSettingsActivity.java
index 773a10858..5e76c7c91 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/SecretSettingsActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/SecretSettingsActivity.java
@@ -2,11 +2,14 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceFragmentCompat;
+import android.support.v7.widget.Toolbar;
 import android.widget.Toast;
 import com.afollestad.materialdialogs.MaterialDialog;
 import gnu.trove.set.TLongSet;
+import yuku.afw.V;
 import yuku.afw.storage.Preferences;
 import yuku.alkitab.base.App;
 import yuku.alkitab.base.S;
@@ -97,9 +100,14 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
-		enableNonToolbarUpButton();
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_secret_settings);
+
+		final Toolbar toolbar = V.get(this, R.id.toolbar);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
 	}
 
 	public static Intent createIntent() {
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/SettingsActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/SettingsActivity.java
index 35666d2d8..d5c4d19a3 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/SettingsActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/SettingsActivity.java
@@ -6,12 +6,14 @@
 import android.os.Handler;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.ActionBar;
 import android.support.v7.preference.CheckBoxPreference;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceFragmentCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
@@ -65,10 +67,15 @@ private static Intent createSubIntent(Class<? extends PreferenceFragmentCompat>
 
 	@Override
 	protected void onCreate(final Bundle savedInstanceState) {
-		super.enableNonToolbarUpButton();
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_settings);
 
+		final Toolbar toolbar = V.get(this, R.id.toolbar);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
+
 		final String subClassName = getIntent().getStringExtra(EXTRA_subClassName);
 		if (subClassName == null) {
 			lsHeaders = V.get(this, R.id.lsHeaders);
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/ShareActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/ShareActivity.java
index 4dbc397d2..7d58e8c34 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/ShareActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/ShareActivity.java
@@ -10,6 +10,8 @@
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -58,10 +60,15 @@ public static Result obtainResult(Intent data) {
 	}
 	
 	@Override protected void onCreate(Bundle savedInstanceState) {
-		enableNonToolbarUpButton();
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_share);
 
+		final Toolbar toolbar = V.get(this, R.id.toolbar);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
+
 		String title = getIntent().getStringExtra(Intent.EXTRA_TITLE);
 		setTitle(title);
 		
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/SongListActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/SongListActivity.java
index cedd36f23..21c052b67 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/SongListActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/SongListActivity.java
@@ -8,12 +8,12 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.Nullable;
+import android.support.v7.app.ActionBar;
 import android.support.v7.widget.SearchView;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
@@ -127,18 +127,16 @@ public static Result obtainResult(Intent data) {
 	}
 	
 	@Override protected void onCreate(Bundle savedInstanceState) {
-		supportRequestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_song_list);
 
 		circular_progress = V.get(this, R.id.progress_circular);
 
 		final Toolbar toolbar = V.get(this, R.id.toolbar);
-		setSupportActionBar(toolbar); // must be done first before below lines
-		toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_material);
-		toolbar.setNavigationOnClickListener(v -> navigateUp());
-
-		setSupportProgressBarIndeterminate(true);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
 
 		searchView = V.get(this, R.id.searchView);
 		lsSong = V.get(this, R.id.lsSong);
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/SongViewActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/SongViewActivity.java
index a290758ac..cde025664 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/SongViewActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/SongViewActivity.java
@@ -28,7 +28,6 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -165,7 +164,7 @@ static class MediaState {
 
 	/** This method might be called from non-UI thread. Be careful when manipulating UI. */
 	@Override
-	public void setMediaState(final MediaPlayerController.ControllerState state) {
+	public void setMediaState(@NonNull final MediaPlayerController.ControllerState state) {
 		if (state == MediaPlayerController.ControllerState.reset) {
 			mediaState.enabled = false;
 			mediaState.icon = R.drawable.ic_action_hollowplay;
@@ -399,7 +398,6 @@ public static Intent createIntent() {
 	}
 
 	@Override protected void onCreate(Bundle savedInstanceState) {
-		supportRequestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_song_view);
 
@@ -407,8 +405,6 @@ public static Intent createIntent() {
 
 		setCustomProgressBarIndeterminateVisible(false);
 
-		setTitle(R.string.sn_songs_activity_title);
-
 		drawerLayout = V.get(this, R.id.drawerLayout);
 		leftDrawer = V.get(this, R.id.left_drawer);
 		leftDrawer.configure(this, drawerLayout);
@@ -421,7 +417,7 @@ public static Intent createIntent() {
 		actionBar.setDisplayHomeAsUpEnabled(true);
 		actionBar.setHomeAsUpIndicator(R.drawable.ic_menu_white_24dp);
 
-		drawerLayout.setDrawerListener(new DrawerLayout.SimpleDrawerListener() {
+		drawerLayout.addDrawerListener(new DrawerLayout.SimpleDrawerListener() {
 			@Override
 			public void onDrawerOpened(final View drawerView) {
 				drawer_opened();
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/VersionsActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/VersionsActivity.java
index b1c8fa49b..4267bd23c 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/VersionsActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/VersionsActivity.java
@@ -23,6 +23,7 @@
 import android.support.v4.view.MenuItemCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.app.ActionBar;
 import android.support.v7.widget.SearchView;
 import android.support.v7.widget.Toolbar;
 import android.text.SpannableStringBuilder;
@@ -118,9 +119,10 @@ protected void onCreate(Bundle savedInstanceState) {
 		setTitle(R.string.kelola_versi);
 
 		final Toolbar toolbar = V.get(this, R.id.toolbar);
-		setSupportActionBar(toolbar); // must be done first before below lines
-		toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_material);
-		toolbar.setNavigationOnClickListener(v -> navigateUp());
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
 
 		// Create the adapter that will return a fragment for each of the three
 		// primary sections of the activity.
@@ -132,9 +134,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
 		tablayout = V.get(this, R.id.tablayout);
 		tablayout.setTabMode(TabLayout.MODE_SCROLLABLE);
-		tablayout.setTabsFromPagerAdapter(sectionsPagerAdapter);
-		tablayout.setOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(viewPager));
-		viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tablayout));
+		tablayout.setupWithViewPager(viewPager);
 
 		processIntent(getIntent(), "onCreate");
 
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/base/BaseActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/base/BaseActivity.java
index 93e3f7e89..060a13e3f 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/base/BaseActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/base/BaseActivity.java
@@ -9,6 +9,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.support.annotation.CallSuper;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.NavUtils;
 import android.support.v4.app.TaskStackBuilder;
@@ -37,7 +38,6 @@ public abstract class BaseActivity extends AppCompatActivity implements Activity
 	private static final int REQCODE_PERMISSION_storage = 1;
 	private static final int REQCODE_permissionSettings = 9970;
 
-	private boolean enableNonToolbarUpButton;
 	private boolean willNeedStoragePermission;
 
 	private int lastKnownLocaleSerialNumber;
@@ -82,13 +82,6 @@ protected void applyActionBarAndStatusBarColors() {
 		}
 	}
 
-	/**
-	 * Call this from subclasses before super.onCreate() to enable up button.
-	 */
-	protected void enableNonToolbarUpButton() {
-		this.enableNonToolbarUpButton = true;
-	}
-
 	/**
 	 * Call this from subclasses before super.onCreate() to make
 	 * the activity ask for storage permission and do not proceed
@@ -104,13 +97,6 @@ protected void onCreate(final Bundle savedInstanceState) {
 
 		lastKnownLocaleSerialNumber = ChangeLanguageHelper.getLocaleSerialCounter();
 
-		if (this.enableNonToolbarUpButton) {
-			final ActionBar actionBar = getSupportActionBar();
-			if (actionBar != null) {
-				actionBar.setDisplayHomeAsUpEnabled(true);
-			}
-		}
-
 		if (willNeedStoragePermission) {
 			askStoragePermission();
 		}
@@ -213,8 +199,10 @@ protected void onActivityResult(final int requestCode, final int resultCode, fin
 		super.onActivityResult(requestCode, resultCode, data);
 	}
 
-	@Override public boolean onOptionsItemSelected(MenuItem item) {
-		if (enableNonToolbarUpButton && item.getItemId() == android.R.id.home) {
+	@CallSuper
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == android.R.id.home) {
 			navigateUp();
 			return true;
 		}
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncLogActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncLogActivity.java
index ed644c55f..ad14d9118 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncLogActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncLogActivity.java
@@ -3,6 +3,8 @@
 import android.content.Intent;
 import android.graphics.Typeface;
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.text.SpannableStringBuilder;
 import android.text.style.BackgroundColorSpan;
 import android.text.style.LeadingMarginSpan;
@@ -41,6 +43,12 @@ protected void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_sync_log);
 
+		final Toolbar toolbar = V.get(this, R.id.toolbar);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
+
 		lsLog = V.get(this, R.id.lsLog);
 		lsLog.setAdapter(adapter = new LogAdapter());
 	}
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncLoginActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncLoginActivity.java
index 99e558509..d9486404f 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncLoginActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncLoginActivity.java
@@ -2,6 +2,8 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.text.method.LinkMovementMethod;
 import android.util.Log;
 import android.util.Patterns;
@@ -58,10 +60,15 @@ public static Result obtainResult(final Intent data) {
 
 	@Override
 	protected void onCreate(final Bundle savedInstanceState) {
-		enableNonToolbarUpButton();
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_sync_login);
 
+		final Toolbar toolbar = V.get(this, R.id.toolbar);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
+
 		tIntro = V.get(this, R.id.tIntro);
 		tEmail = V.get(this, R.id.tEmail);
 		tPassword = V.get(this, R.id.tPassword);
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncSettingsActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncSettingsActivity.java
index 5fb430151..bf6d1cd0a 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncSettingsActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncSettingsActivity.java
@@ -5,11 +5,14 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceFragmentCompat;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import com.afollestad.materialdialogs.MaterialDialog;
+import yuku.afw.V;
 import yuku.afw.storage.Preferences;
 import yuku.alkitab.base.App;
 import yuku.alkitab.base.S;
@@ -29,9 +32,14 @@ public class SyncSettingsActivity extends BaseActivity {
 
 	@Override
 	protected void onCreate(final Bundle savedInstanceState) {
-		enableNonToolbarUpButton();
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_sync_settings);
+
+		final Toolbar toolbar = V.get(this, R.id.toolbar);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
 	}
 
 	public static class SyncSettingsFragment extends PreferenceFragmentCompat {
diff --git a/Alkitab/src/main/java/yuku/alkitab/reminder/ac/DevotionReminderActivity.java b/Alkitab/src/main/java/yuku/alkitab/reminder/ac/DevotionReminderActivity.java
index 075123dcc..3512234c7 100644
--- a/Alkitab/src/main/java/yuku/alkitab/reminder/ac/DevotionReminderActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/reminder/ac/DevotionReminderActivity.java
@@ -7,12 +7,15 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.support.v7.app.ActionBar;
 import android.support.v7.preference.EditTextPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceFragmentCompat;
 import android.support.v7.preference.PreferenceManager;
+import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
+import yuku.afw.V;
 import yuku.afw.storage.Preferences;
 import yuku.alkitab.base.App;
 import yuku.alkitab.base.ac.base.BaseActivity;
@@ -32,9 +35,14 @@ public static Intent createIntent() {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
-		enableNonToolbarUpButton();
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_devotion_reminder);
+
+		final Toolbar toolbar = V.get(this, R.id.toolbar);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
 	}
 
 	public static class DevotionReminderFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
diff --git a/Alkitab/src/main/java/yuku/filechooser/FileChooserActivity.java b/Alkitab/src/main/java/yuku/filechooser/FileChooserActivity.java
index f832f79d1..3bdcad45b 100644
--- a/Alkitab/src/main/java/yuku/filechooser/FileChooserActivity.java
+++ b/Alkitab/src/main/java/yuku/filechooser/FileChooserActivity.java
@@ -5,6 +5,7 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,6 +13,7 @@
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
+import yuku.afw.V;
 import yuku.alkitab.base.ac.base.BaseActivity;
 import yuku.alkitab.debug.R;
 
@@ -47,18 +49,18 @@ public static FileChooserResult obtainResult(Intent data) {
     public void onCreate(Bundle savedInstanceState) {
 		super.willNeedStoragePermission();
         super.onCreate(savedInstanceState);
+		setContentView(R.layout.filechooser_activity_filechooser);
 
-		final ActionBar actionBar = getSupportActionBar();
-		if (actionBar != null) {
-			actionBar.setDisplayHomeAsUpEnabled(true);
-		}
+		final Toolbar toolbar = V.get(this, R.id.toolbar);
+		setSupportActionBar(toolbar);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
 
         config = getIntent().getParcelableExtra(EXTRA_config);
         
 		Utils.configureTitles(this, config.title, config.subtitle);
 
-        setContentView(R.layout.filechooser_activity_filechooser);
-        
         lsFile = (ListView) findViewById(R.id.filechooser_lsFile);
         lsFile.setAdapter(adapter = new FileAdapter());
         lsFile.setOnItemClickListener(lsFile_itemClick);
diff --git a/Alkitab/src/main/res/layout/activity_color_settings.xml b/Alkitab/src/main/res/layout/activity_color_settings.xml
index 19a9bca43..16ee32e03 100644
--- a/Alkitab/src/main/res/layout/activity_color_settings.xml
+++ b/Alkitab/src/main/res/layout/activity_color_settings.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<fragment android:name="yuku.alkitab.base.ac.ColorSettingsActivity$ColorSettingsFragment"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:tag="settings" />
\ No newline at end of file
+	android:layout_height="match_parent">
+
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?actionBarSize"
+		android:background="@color/primary" />
+
+	<fragment
+		android:name="yuku.alkitab.base.ac.ColorSettingsActivity$ColorSettingsFragment"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:tag="settings" />
+</LinearLayout>
diff --git a/Alkitab/src/main/res/layout/activity_daily_verse_configuration.xml b/Alkitab/src/main/res/layout/activity_daily_verse_configuration.xml
index 5db07a259..f89fa235e 100644
--- a/Alkitab/src/main/res/layout/activity_daily_verse_configuration.xml
+++ b/Alkitab/src/main/res/layout/activity_daily_verse_configuration.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?actionBarSize"
+		android:background="@color/primary" />
+
 	<ListView
 		android:id="@+id/lsVersionsAppWidget"
 		android:layout_width="fill_parent"
diff --git a/Alkitab/src/main/res/layout/activity_devotion_reminder.xml b/Alkitab/src/main/res/layout/activity_devotion_reminder.xml
index b491eb402..3e8bbd61f 100644
--- a/Alkitab/src/main/res/layout/activity_devotion_reminder.xml
+++ b/Alkitab/src/main/res/layout/activity_devotion_reminder.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<fragment android:name="yuku.alkitab.reminder.ac.DevotionReminderActivity$DevotionReminderFragment"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:tag="settings" />
\ No newline at end of file
+	android:orientation="vertical">
+
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?actionBarSize"
+		android:background="@color/primary" />
+
+	<fragment
+		android:name="yuku.alkitab.reminder.ac.DevotionReminderActivity$DevotionReminderFragment"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:tag="settings" />
+</LinearLayout>
\ No newline at end of file
diff --git a/Alkitab/src/main/res/layout/activity_font_manager.xml b/Alkitab/src/main/res/layout/activity_font_manager.xml
index bceea5d9c..ef879ab31 100644
--- a/Alkitab/src/main/res/layout/activity_font_manager.xml
+++ b/Alkitab/src/main/res/layout/activity_font_manager.xml
@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
 
-    <ListView
-        android:id="@+id/lsFont"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?actionBarSize"
+		android:background="@color/primary" />
 
-    <TextView
-        android:id="@+id/lEmptyError"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="@string/fm_loading_ellipsis"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:visibility="gone" />
+	<ListView
+		android:id="@+id/lsFont"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent" />
+
+	<TextView
+		android:id="@+id/lEmptyError"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:gravity="center"
+		android:text="@string/fm_loading_ellipsis"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:visibility="gone" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Alkitab/src/main/res/layout/activity_help.xml b/Alkitab/src/main/res/layout/activity_help.xml
index 5a94f5579..d3f71ce94 100644
--- a/Alkitab/src/main/res/layout/activity_help.xml
+++ b/Alkitab/src/main/res/layout/activity_help.xml
@@ -1,20 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:orientation="vertical">
 
-	<WebView
-		android:id="@+id/webview"
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:padding="16dp"
-		android:scrollbarStyle="outsideOverlay" />
+		android:layout_height="?actionBarSize"
+		android:background="@color/primary" />
 
-	<ProgressBar
-		android:id="@+id/progress"
-		style="?android:progressBarStyleLarge"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center" />
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1">
+
+		<WebView
+			android:id="@+id/webview"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:padding="16dp"
+			android:scrollbarStyle="outsideOverlay" />
+
+		<ProgressBar
+			android:id="@+id/progress"
+			style="?android:progressBarStyleLarge"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center" />
+
+	</FrameLayout>
 
-</FrameLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/Alkitab/src/main/res/layout/activity_marker_list.xml b/Alkitab/src/main/res/layout/activity_marker_list.xml
index df72e8221..bc5bc0fb0 100644
--- a/Alkitab/src/main/res/layout/activity_marker_list.xml
+++ b/Alkitab/src/main/res/layout/activity_marker_list.xml
@@ -1,53 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	android:id="@+id/root"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<ListView
-		android:id="@android:id/list"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:fastScrollEnabled="true"
-		tools:visibility="gone" />
-
-	<LinearLayout
-		android:id="@android:id/empty"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:gravity="center"
-		android:orientation="vertical"
-		tools:visibility="visible">
-
-		<TextView
-			android:id="@+id/tEmpty"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?actionBarSize"
+		android:background="@color/primary" />
+
+	<FrameLayout
+		android:id="@+id/root"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1">
+
+		<ListView
+			android:id="@android:id/list"
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:fastScrollEnabled="true"
+			tools:visibility="gone" />
+
+		<LinearLayout
+			android:id="@android:id/empty"
 			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:paddingLeft="12dp"
-			android:paddingRight="12dp"
-			android:text="@string/belum_ada_pembatas_buku"
-			android:textSize="16sp"
-			android:visibility="gone"
-			tools:visibility="visible" />
-
-		<Button
-			android:id="@+id/bClearFilter"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
-			android:text="@string/bl_clear_filter"
-			android:visibility="gone"
-			tools:visibility="visible" />
-
-		<ProgressBar
-			android:id="@+id/progress"
-			style="?android:attr/progressBarStyleLarge"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal" />
-	</LinearLayout>
-
-</FrameLayout>
\ No newline at end of file
+			android:layout_height="fill_parent"
+			android:gravity="center"
+			android:orientation="vertical"
+			tools:visibility="visible">
+
+			<TextView
+				android:id="@+id/tEmpty"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center_horizontal"
+				android:paddingLeft="12dp"
+				android:paddingRight="12dp"
+				android:text="@string/belum_ada_pembatas_buku"
+				android:textSize="16sp"
+				android:visibility="gone"
+				tools:visibility="visible" />
+
+			<Button
+				android:id="@+id/bClearFilter"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="8dp"
+				android:text="@string/bl_clear_filter"
+				android:visibility="gone"
+				tools:visibility="visible" />
+
+			<ProgressBar
+				android:id="@+id/progress"
+				style="?android:attr/progressBarStyleLarge"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal" />
+		</LinearLayout>
+
+	</FrameLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/Alkitab/src/main/res/layout/activity_markers.xml b/Alkitab/src/main/res/layout/activity_markers.xml
index c776022c7..c905a9c26 100644
--- a/Alkitab/src/main/res/layout/activity_markers.xml
+++ b/Alkitab/src/main/res/layout/activity_markers.xml
@@ -4,6 +4,12 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?actionBarSize"
+		android:background="@color/primary" />
+
 	<com.mobeta.android.dslv.DragSortListView
 		android:id="@android:id/list"
 		android:layout_width="fill_parent"
@@ -29,5 +35,4 @@
 			android:textColor="#fff" />
 	</RelativeLayout>
 
-
 </LinearLayout>
\ No newline at end of file
diff --git a/Alkitab/src/main/res/layout/activity_patch_text.xml b/Alkitab/src/main/res/layout/activity_patch_text.xml
index 0f3ec3883..9bf6ba281 100644
--- a/Alkitab/src/main/res/layout/activity_patch_text.xml
+++ b/Alkitab/src/main/res/layout/activity_patch_text.xml
@@ -1,12 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<EditText
-	android:id="@+id/tBody"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:background="@null"
-	android:gravity="top"
-	android:inputType="text|textAutoCorrect|textCapSentences|textMultiLine"
-	android:paddingLeft="8dp"
-	android:paddingRight="8dp" />
+	android:orientation="vertical">
+
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?actionBarSize"
+		android:background="@color/primary" />
+
+	<EditText
+		android:id="@+id/tBody"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1"
+		android:background="@null"
+		android:gravity="top"
+		android:inputType="text|textAutoCorrect|textCapSentences|textMultiLine"
+		android:paddingLeft="8dp"
+		android:paddingRight="8dp"
+		tools:ignore="LabelFor" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Alkitab/src/main/res/layout/activity_patch_text_actionbar_custom.xml b/Alkitab/src/main/res/layout/activity_patch_text_actionbar_custom.xml
deleted file mode 100644
index 197f339b2..000000000
--- a/Alkitab/src/main/res/layout/activity_patch_text_actionbar_custom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout
-	style="?buttonBarStyle"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:gravity="right"
-	android:orientation="horizontal">
-
-	<Button
-		android:id="@+id/bReference"
-		style="?buttonBarButtonStyle"
-		android:layout_width="wrap_content"
-		android:layout_height="match_parent"
-		android:paddingLeft="16dp"
-		android:paddingRight="16dp"
-		android:text="@string/patch_text_menu_reference"
-		android:textAllCaps="true"
-		android:textSize="14sp" />
-
-	<Button
-		android:id="@+id/bSend"
-		style="?buttonBarButtonStyle"
-		android:layout_width="wrap_content"
-		android:layout_height="match_parent"
-		android:paddingLeft="16dp"
-		android:paddingRight="16dp"
-		android:text="@string/patch_text_menu_send"
-		android:textAllCaps="true"
-		android:textSize="14sp" />
-
-</LinearLayout>
diff --git a/Alkitab/src/main/res/layout/activity_search_book_filter.xml b/Alkitab/src/main/res/layout/activity_search_book_filter.xml
index 6681f27dc..d52814e38 100644
--- a/Alkitab/src/main/res/layout/activity_search_book_filter.xml
+++ b/Alkitab/src/main/res/layout/activity_search_book_filter.xml
@@ -5,6 +5,13 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?actionBarSize"
+		android:layout_weight="0"
+		android:background="@color/primary" />
+
 	<android.support.v7.widget.RecyclerView
 		android:id="@+id/gridBook"
 		android:layout_width="match_parent"
diff --git a/Alkitab/src/main/res/layout/activity_secret_settings.xml b/Alkitab/src/main/res/layout/activity_secret_settings.xml
index c06fbc71a..e53aa37c1 100644
--- a/Alkitab/src/main/res/layout/activity_secret_settings.xml
+++ b/Alkitab/src/main/res/layout/activity_secret_settings.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<fragment android:name="yuku.alkitab.base.ac.SecretSettingsActivity$SecretSettingsFragment"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:tag="settings" />
\ No newline at end of file
+	android:orientation="vertical">
+
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?actionBarSize"
+		android:background="@color/primary" />
+
+	<fragment
+		android:name="yuku.alkitab.base.ac.SecretSettingsActivity$SecretSettingsFragment"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:tag="settings" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Alkitab/src/main/res/layout/activity_settings.xml b/Alkitab/src/main/res/layout/activity_settings.xml
index 43a1ebb32..f91c86690 100644
--- a/Alkitab/src/main/res/layout/activity_settings.xml
+++ b/Alkitab/src/main/res/layout/activity_settings.xml
@@ -1,15 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:orientation="vertical">
 
-	<android.support.v7.widget.RecyclerView
-		android:id="@+id/lsHeaders"
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent" />
+		android:layout_height="?actionBarSize"
+		android:background="@color/primary" />
 
 	<FrameLayout
-		android:id="@+id/fragment_container"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent" />
-</FrameLayout>
+		android:layout_height="0dp"
+		android:layout_weight="1">
+
+		<android.support.v7.widget.RecyclerView
+			android:id="@+id/lsHeaders"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent" />
+
+		<FrameLayout
+			android:id="@+id/fragment_container"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent" />
+	</FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Alkitab/src/main/res/layout/activity_share.xml b/Alkitab/src/main/res/layout/activity_share.xml
index 0978baaa1..0343f953c 100644
--- a/Alkitab/src/main/res/layout/activity_share.xml
+++ b/Alkitab/src/main/res/layout/activity_share.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
 
-    <ListView
-        android:id="@+id/lsIntent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-        <!-- Preview: listitem=@layout/item_share_intent -->
-    </ListView>
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?actionBarSize"
+		android:background="@color/primary" />
+
+	<ListView
+		android:id="@+id/lsIntent"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Alkitab/src/main/res/layout/activity_sync_log.xml b/Alkitab/src/main/res/layout/activity_sync_log.xml
index 528deefb2..b3e1e0fff 100644
--- a/Alkitab/src/main/res/layout/activity_sync_log.xml
+++ b/Alkitab/src/main/res/layout/activity_sync_log.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/lsLog"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent" />
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?actionBarSize"
+		android:background="@color/primary" />
+
+	<ListView
+		android:id="@+id/lsLog"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Alkitab/src/main/res/layout/activity_sync_login.xml b/Alkitab/src/main/res/layout/activity_sync_login.xml
index 1d60957a0..1f23cbeba 100644
--- a/Alkitab/src/main/res/layout/activity_sync_login.xml
+++ b/Alkitab/src/main/res/layout/activity_sync_login.xml
@@ -1,170 +1,183 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:clipToPadding="false"
-	android:paddingBottom="@dimen/padding_medium"
-	android:paddingTop="@dimen/padding_medium">
+	android:orientation="vertical">
 
-	<LinearLayout
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/padding_medium"
-		android:layout_marginRight="@dimen/padding_medium"
-		android:animateLayoutChanges="true"
-		android:orientation="vertical">
+		android:layout_height="?actionBarSize"
+		android:background="@color/primary" />
 
-
-		<ImageView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:adjustViewBounds="true"
-			android:scaleType="fitStart"
-			android:src="@drawable/sync_intro"
-			tools:ignore="ContentDescription"
-			android:paddingLeft="@dimen/padding_large"
-			android:paddingRight="@dimen/padding_large" />
-
-		<TextView
-			android:id="@+id/tIntro"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:layout_marginTop="@dimen/padding_medium"
-			android:fontFamily="sans-serif-light"
-			android:gravity="center_horizontal"
-			android:text="@string/sync_login_form_intro_text"
-			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:textColor="#fff" />
-
-		<EditText
-			android:id="@+id/tEmail"
-			android:layout_width="match_parent"
-			android:layout_height="48dp"
-			android:layout_marginTop="@dimen/padding_large"
-			android:hint="@string/sync_login_form_email_hint"
-			android:inputType="textEmailAddress" />
-
-		<FrameLayout
-			android:layout_width="match_parent"
-			android:layout_height="48dp">
-
-			<EditText
-				android:id="@+id/tPassword"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:fontFamily="sans-serif"
-				android:hint="@string/sync_login_form_password_hint"
-				android:inputType="textPassword" />
-
-			<Button
-				android:id="@+id/bForgot"
-				android:layout_width="wrap_content"
-				android:layout_height="match_parent"
-				android:layout_gravity="end"
-				android:background="@null"
-				android:focusable="false"
-				android:paddingLeft="@dimen/padding_medium"
-				android:paddingRight="@dimen/padding_medium"
-				android:text="@string/sync_login_form_forgot_button"
-				android:textAppearance="?android:textAppearanceSmall" />
-
-		</FrameLayout>
-
-		<EditText
-			android:id="@+id/tPasswordNew"
-			android:layout_width="match_parent"
-			android:layout_height="48dp"
-			android:fontFamily="sans-serif"
-			android:hint="@string/sync_login_form_new_password_hint"
-			android:inputType="textPassword"
-			android:visibility="gone" />
+	<android.support.v4.widget.NestedScrollView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1"
+		android:clipToPadding="false"
+		android:paddingBottom="@dimen/padding_medium"
+		android:paddingTop="@dimen/padding_medium">
 
 		<LinearLayout
-			android:id="@+id/panelRegister"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:layout_marginLeft="@dimen/padding_medium"
+			android:layout_marginRight="@dimen/padding_medium"
+			android:animateLayoutChanges="true"
 			android:orientation="vertical">
 
-			<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="46dp"
-				android:gravity="bottom"
-				android:paddingBottom="2dp"
-				android:paddingLeft="4dp"
-				android:text="@string/sync_login_form_optional_header"
-				android:textAllCaps="true"
-				android:textSize="14sp"
-				android:textStyle="bold" />
 
 			<ImageView
-				android:layout_width="match_parent"
-				android:layout_height="2dp"
-				android:src="#666"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:adjustViewBounds="true"
+				android:paddingLeft="@dimen/padding_large"
+				android:paddingRight="@dimen/padding_large"
+				android:scaleType="fitStart"
+				android:src="@drawable/sync_intro"
 				tools:ignore="ContentDescription" />
 
+			<TextView
+				android:id="@+id/tIntro"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginTop="@dimen/padding_medium"
+				android:fontFamily="sans-serif-light"
+				android:gravity="center_horizontal"
+				android:text="@string/sync_login_form_intro_text"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:textColor="#fff" />
+
 			<EditText
-				android:id="@+id/tChurch"
+				android:id="@+id/tEmail"
 				android:layout_width="match_parent"
 				android:layout_height="48dp"
-				android:hint="@string/sync_login_form_church"
-				android:inputType="textPersonName" />
+				android:layout_marginTop="@dimen/padding_large"
+				android:hint="@string/sync_login_form_email_hint"
+				android:inputType="textEmailAddress" />
 
-			<EditText
-				android:id="@+id/tCity"
+			<FrameLayout
 				android:layout_width="match_parent"
-				android:layout_height="48dp"
-				android:hint="@string/sync_login_form_city"
-				android:inputType="textPersonName" />
+				android:layout_height="48dp">
+
+				<EditText
+					android:id="@+id/tPassword"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:fontFamily="sans-serif"
+					android:hint="@string/sync_login_form_password_hint"
+					android:inputType="textPassword" />
+
+				<Button
+					android:id="@+id/bForgot"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:layout_gravity="end"
+					android:background="@null"
+					android:focusable="false"
+					android:paddingLeft="@dimen/padding_medium"
+					android:paddingRight="@dimen/padding_medium"
+					android:text="@string/sync_login_form_forgot_button"
+					android:textAppearance="?android:textAppearanceSmall" />
+
+			</FrameLayout>
 
-			<Spinner
-				android:id="@+id/cbReligion"
+			<EditText
+				android:id="@+id/tPasswordNew"
 				android:layout_width="match_parent"
 				android:layout_height="48dp"
-				android:spinnerMode="dropdown"
-				tools:listitem="@android:layout/simple_dropdown_item_1line" />
-		</LinearLayout>
-
-		<TextView
-			android:id="@+id/tPrivacy"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
-			android:fontFamily="sans-serif-light"
-			android:text="@string/sync_login_form_privacy_text"
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
-			android:orientation="horizontal">
+				android:fontFamily="sans-serif"
+				android:hint="@string/sync_login_form_new_password_hint"
+				android:inputType="textPassword"
+				android:visibility="gone" />
 
-			<Button
-				android:id="@+id/bRegister"
-				android:layout_width="0dp"
+			<LinearLayout
+				android:id="@+id/panelRegister"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_weight="1"
-				android:text="@string/sync_login_form_register_button" />
+				android:orientation="vertical">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="46dp"
+					android:gravity="bottom"
+					android:paddingBottom="2dp"
+					android:paddingLeft="4dp"
+					android:text="@string/sync_login_form_optional_header"
+					android:textAllCaps="true"
+					android:textSize="14sp"
+					android:textStyle="bold" />
+
+				<ImageView
+					android:layout_width="match_parent"
+					android:layout_height="2dp"
+					android:src="#666"
+					tools:ignore="ContentDescription" />
+
+				<EditText
+					android:id="@+id/tChurch"
+					android:layout_width="match_parent"
+					android:layout_height="48dp"
+					android:hint="@string/sync_login_form_church"
+					android:inputType="textPersonName" />
+
+				<EditText
+					android:id="@+id/tCity"
+					android:layout_width="match_parent"
+					android:layout_height="48dp"
+					android:hint="@string/sync_login_form_city"
+					android:inputType="textPersonName" />
+
+				<Spinner
+					android:id="@+id/cbReligion"
+					android:layout_width="match_parent"
+					android:layout_height="48dp"
+					android:spinnerMode="dropdown"
+					tools:listitem="@android:layout/simple_dropdown_item_1line" />
+			</LinearLayout>
 
-			<Button
-				android:id="@+id/bLogin"
-				android:layout_width="0dp"
+			<TextView
+				android:id="@+id/tPrivacy"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_gravity="center_horizontal"
-				android:layout_weight="1"
-				android:text="@string/sync_login_form_login_button" />
+				android:layout_marginTop="8dp"
+				android:fontFamily="sans-serif-light"
+				android:text="@string/sync_login_form_privacy_text"
+				android:textAppearance="?android:attr/textAppearanceSmall" />
 
-			<Button
-				android:id="@+id/bChangePassword"
-				android:layout_width="0dp"
+			<LinearLayout
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_weight="1"
-				android:text="@string/sync_login_change_password_button"
-				android:visibility="gone" />
+				android:layout_marginTop="8dp"
+				android:orientation="horizontal">
+
+				<Button
+					android:id="@+id/bRegister"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:text="@string/sync_login_form_register_button" />
+
+				<Button
+					android:id="@+id/bLogin"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_horizontal"
+					android:layout_weight="1"
+					android:text="@string/sync_login_form_login_button" />
+
+				<Button
+					android:id="@+id/bChangePassword"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:text="@string/sync_login_change_password_button"
+					android:visibility="gone" />
+			</LinearLayout>
 		</LinearLayout>
-	</LinearLayout>
 
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
+	</android.support.v4.widget.NestedScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/Alkitab/src/main/res/layout/activity_sync_settings.xml b/Alkitab/src/main/res/layout/activity_sync_settings.xml
index 554cbdd85..2947ea475 100644
--- a/Alkitab/src/main/res/layout/activity_sync_settings.xml
+++ b/Alkitab/src/main/res/layout/activity_sync_settings.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<fragment android:name="yuku.alkitab.base.sync.SyncSettingsActivity$SyncSettingsFragment"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:tag="settings" />
\ No newline at end of file
+	android:orientation="vertical">
+
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?actionBarSize"
+		android:background="@color/primary" />
+
+	<fragment android:name="yuku.alkitab.base.sync.SyncSettingsActivity$SyncSettingsFragment"
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:tag="settings" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Alkitab/src/main/res/layout/filechooser_activity_filechooser.xml b/Alkitab/src/main/res/layout/filechooser_activity_filechooser.xml
index a025344d2..36869ac86 100644
--- a/Alkitab/src/main/res/layout/filechooser_activity_filechooser.xml
+++ b/Alkitab/src/main/res/layout/filechooser_activity_filechooser.xml
@@ -1,4 +1,19 @@
 <?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="fill_parent" android:orientation="vertical">
-	<ListView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" android:id="@+id/filechooser_lsFile"></ListView>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?actionBarSize"
+		android:background="@color/primary" />
+
+	<ListView
+		android:id="@+id/filechooser_lsFile"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1" />
+
 </LinearLayout>
diff --git a/Alkitab/src/main/res/menu/activity_patch_text.xml b/Alkitab/src/main/res/menu/activity_patch_text.xml
new file mode 100644
index 000000000..a57d6f5fb
--- /dev/null
+++ b/Alkitab/src/main/res/menu/activity_patch_text.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools">
+
+	<item
+		android:id="@+id/menuReference"
+		android:title="@string/patch_text_menu_reference"
+		app:showAsAction="always|withText"
+		tools:ignore="AlwaysShowAction" />
+
+	<item
+		android:id="@+id/menuSend"
+		android:title="@string/patch_text_menu_send"
+		app:showAsAction="always|withText"
+		tools:ignore="AlwaysShowAction" />
+
+</menu>
\ No newline at end of file
diff --git a/Alkitab/src/main/res/values/strings.xml b/Alkitab/src/main/res/values/strings.xml
index cb606fdd2..b54bdc8bc 100644
--- a/Alkitab/src/main/res/values/strings.xml
+++ b/Alkitab/src/main/res/values/strings.xml
@@ -331,6 +331,7 @@
     <string name="dr_reminder">Reminder</string>
     <string name="dr_error_contact_reminder">Error while contacting Reminder app.</string>
 
+    <string name="dv_activity_title">Daily Verse Widget</string>
     <string name="dv_option_transparent_background">Transparent background</string>
     <string name="dv_option_dark_text">Dark text</string>
     <string name="dv_option_text_size">Text size</string>
@@ -472,9 +473,10 @@
 	<string name="sync_sync_set_pref_summary_last_synced">Last synced %1$s, %2$s (r%3$s)</string>
 	<string name="sync_sync_set_pref_summary_never">Not synced yet</string>
 	<string name="sync_sync_set_pref_summary_syncing">Syncing now…</string>
-	<string name="sync_log_activity_title">Sync log</string>
+	<string name="sync_log_activity_title">Sync Log</string>
+	<string name="sync_status_activity_title">Sync Status</string>
 
-	<string name="sync_login_activity_title">Login or create account</string>
+	<string name="sync_login_activity_title">Login or Create Account</string>
 	<string name="sync_login_survey_religion_select_one">Select religion</string>
 	<string name="sync_login_survey_religion_christianity">Christianity</string>
 	<string name="sync_login_survey_religion_christianity_protestant">Protestant</string>
diff --git a/Alkitab/src/main/res/values/themes.xml b/Alkitab/src/main/res/values/themes.xml
index a73c666ca..07b03ae24 100644
--- a/Alkitab/src/main/res/values/themes.xml
+++ b/Alkitab/src/main/res/values/themes.xml
@@ -8,6 +8,7 @@
         <item name="android:textColorLink">@color/accent</item>
         <item name="android:windowBackground">@color/window</item>
 		<item name="actionModeStyle">@style/SmallerTitleActionModeStyle</item>
+		<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 	</style>
 
 	<style name="Theme.Alkitab.DialogWhenLarge.Base" parent="Theme.AppCompat.DialogWhenLarge">
@@ -20,13 +21,6 @@
         <item name="android:windowBackground">@color/window</item>
 	</style>
 
-	<!-- for appcompat activities -->
-	<style name="Theme.Alkitab.WithActionBar.AppCompat" parent="Theme.Alkitab.Base">
-		<item name="windowActionBar">true</item>
-		<item name="windowNoTitle">false</item>
-		<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-	</style>
-
 	<style name="StandardWidthIndeterminateProgress" parent="@android:style/Widget.Holo.ProgressBar.Small">
 		<item name="android:minWidth">48dp</item>
 		<item name="android:maxWidth">48dp</item>

From 0ca38d15243c56dced8a22f6bba046ca63f16015 Mon Sep 17 00:00:00 2001
From: Yuku on yuku8 <yukuku@gmail.com>
Date: Wed, 31 Aug 2016 02:16:11 +0800
Subject: [PATCH 04/15] Force widget text to be black or white, don't rely on
 system default

---
 .../yuku/alkitab/base/br/DailyVerseAppWidgetReceiver.java  | 7 +++++--
 .../java/yuku/alkitab/base/widget/DailyVerseFactory.java   | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Alkitab/src/main/java/yuku/alkitab/base/br/DailyVerseAppWidgetReceiver.java b/Alkitab/src/main/java/yuku/alkitab/base/br/DailyVerseAppWidgetReceiver.java
index a9c371ee4..4b49435ec 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/br/DailyVerseAppWidgetReceiver.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/br/DailyVerseAppWidgetReceiver.java
@@ -9,6 +9,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
@@ -79,9 +80,11 @@ public static void buildUpdate(final Context context, final int appWidgetId, fin
 		}
 
 		if (savedState.darkText) {
-			rv.setTextColor(R.id.tReference, 0xff000000);
+			rv.setTextColor(R.id.tReference, Color.BLACK);
 			rv.setImageViewResource(R.id.bPrev, R.drawable.ic_nav_left_dark);
 			rv.setImageViewResource(R.id.bNext, R.drawable.ic_nav_right_dark);
+		} else {
+			rv.setTextColor(R.id.tReference, Color.WHITE);
 		}
 
 		rv.setFloat(R.id.tReference, "setTextSize", savedState.textSize);
@@ -160,7 +163,7 @@ public void onReceive(final Context context, final Intent intent) {
 			}
 
 			final String appWidgetAction = bundle.getString("app_widget_action");
-			if (appWidgetAction == null || !appWidgetAction.equals("update_widget")) {
+			if (!"update_widget".equals(appWidgetAction)) {
 				return;
 			}
 
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/widget/DailyVerseFactory.java b/Alkitab/src/main/java/yuku/alkitab/base/widget/DailyVerseFactory.java
index 3d8c4ea1e..be245ea43 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/widget/DailyVerseFactory.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/widget/DailyVerseFactory.java
@@ -2,6 +2,7 @@
 
 import android.appwidget.AppWidgetManager;
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.Spannable;
@@ -85,7 +86,9 @@ public RemoteViews getViewAt(final int position) {
 
 		row.setTextViewText(R.id.text1, getText(version, aris[position], showVerseNumber));
 		if (savedState.darkText) {
-			row.setTextColor(R.id.text1, 0xff000000);
+			row.setTextColor(R.id.text1, Color.BLACK);
+		} else {
+			row.setTextColor(R.id.text1, Color.WHITE);
 		}
 		row.setFloat(R.id.text1, "setTextSize", savedState.textSize);
 

From 31fd95334d8b6289e6b9a3ce5e2584d2873ab835 Mon Sep 17 00:00:00 2001
From: Yuku on yuku8 <yukuku@gmail.com>
Date: Wed, 31 Aug 2016 02:17:49 +0800
Subject: [PATCH 05/15] Fix font preview images not shown

---
 Alkitab/build.gradle                          |   1 +
 .../src/main/java/yuku/alkitab/base/App.java  | 106 ++++++++++++------
 .../alkitab/base/ac/FontManagerActivity.java  |  89 ++++++++-------
 .../java/yuku/alkitab/base/util/Announce.java |   4 +-
 .../java/yuku/alkitab/base/util/ShareUrl.java |   2 +-
 5 files changed, 125 insertions(+), 77 deletions(-)

diff --git a/Alkitab/build.gradle b/Alkitab/build.gradle
index fc64a6111..e06683400 100644
--- a/Alkitab/build.gradle
+++ b/Alkitab/build.gradle
@@ -93,6 +93,7 @@ dependencies {
     debugCompile "com.facebook.stetho:stetho-okhttp3:$stethoVersion"
     compile "com.android.support:support-v4:$supportLibVersion"
     compile "com.squareup.picasso:picasso:$picassoVersion"
+    compile "com.jakewharton.picasso:picasso2-okhttp3-downloader:1.0.2"
     compile "com.squareup.okhttp3:okhttp:$okhttpVersion"
     compile "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"
     compile 'net.sf.trove4j:trove4j:3.0.3'
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/App.java b/Alkitab/src/main/java/yuku/alkitab/base/App.java
index 4b20e9443..d8ae30881 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/App.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/App.java
@@ -2,7 +2,9 @@
 
 import android.content.Context;
 import android.content.res.Configuration;
+import android.graphics.Bitmap;
 import android.os.Build;
+import android.support.annotation.NonNull;
 import android.support.multidex.MultiDex;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.preference.PreferenceManager;
@@ -12,7 +14,10 @@
 import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;
 import com.google.gson.Gson;
+import com.jakewharton.picasso.OkHttp3Downloader;
 import com.squareup.leakcanary.LeakCanary;
+import com.squareup.picasso.Picasso;
+import okhttp3.Cache;
 import okhttp3.Call;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
@@ -25,6 +30,7 @@
 import yuku.alkitab.base.storage.Prefkey;
 import yuku.alkitab.base.sync.Gcm;
 import yuku.alkitab.base.sync.Sync;
+import yuku.alkitab.debug.BuildConfig;
 import yuku.alkitab.debug.R;
 import yuku.alkitab.reminder.util.DevotionReminder;
 import yuku.alkitabfeedback.FeedbackSender;
@@ -32,6 +38,7 @@
 import yuku.kirimfidbek.CrashReporter;
 import yuku.stethoshim.StethoShim;
 
+import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.Locale;
@@ -45,39 +52,29 @@ public class App extends yuku.afw.App {
 	private static boolean initted = false;
 	private static Tracker APP_TRACKER;
 
+	static final Interceptor userAgent = chain -> {
+		final Request originalRequest = chain.request();
+		final Request requestWithUserAgent = originalRequest.newBuilder()
+			.removeHeader("User-Agent")
+			.addHeader("User-Agent", Version.userAgent() + " " + App.context.getPackageName() + "/" + App.getVersionName())
+			.build();
+		return chain.proceed(requestWithUserAgent);
+	};
+
 	enum OkHttpClientWrapper {
 		INSTANCE;
 
-		final OkHttpClient defaultClient;
 		final OkHttpClient longTimeoutClient;
 
 		{
-			final Interceptor userAgent = chain -> {
-				final Request originalRequest = chain.request();
-				final Request requestWithUserAgent = originalRequest.newBuilder()
-					.removeHeader("User-Agent")
-					.addHeader("User-Agent", Version.userAgent() + " " + App.context.getPackageName() + "/" + App.getVersionName())
-					.build();
-				return chain.proceed(requestWithUserAgent);
-			};
-
-			{
-				final OkHttpClient.Builder builder = new OkHttpClient.Builder();
-				builder.addNetworkInterceptor(userAgent);
-				StethoShim.addNetworkInterceptor(builder);
-				defaultClient = builder.build();
-			}
-
-			{
-				final OkHttpClient.Builder builder = new OkHttpClient.Builder();
-				builder
-					.addNetworkInterceptor(userAgent)
-					.connectTimeout(300, TimeUnit.SECONDS)
-					.readTimeout(300, TimeUnit.SECONDS)
-					.writeTimeout(600, TimeUnit.SECONDS);
-				StethoShim.addNetworkInterceptor(builder);
-				longTimeoutClient = builder.build();
-			}
+			final OkHttpClient.Builder builder = new OkHttpClient.Builder();
+			builder
+				.addNetworkInterceptor(userAgent)
+				.connectTimeout(300, TimeUnit.SECONDS)
+				.readTimeout(300, TimeUnit.SECONDS)
+				.writeTimeout(600, TimeUnit.SECONDS);
+			StethoShim.addNetworkInterceptor(builder);
+			longTimeoutClient = builder.build();
 		}
 	}
 
@@ -88,19 +85,15 @@ enum GsonWrapper {
 	}
 
 	public static String downloadString(String url) throws IOException {
-		return OkHttpClientWrapper.INSTANCE.defaultClient.newCall(new Request.Builder().url(url).build()).execute().body().string();
+		return downloadCall(url).execute().body().string();
 	}
 
 	public static byte[] downloadBytes(String url) throws IOException {
-		return OkHttpClientWrapper.INSTANCE.defaultClient.newCall(new Request.Builder().url(url).build()).execute().body().bytes();
+		return downloadCall(url).execute().body().bytes();
 	}
 
 	public static Call downloadCall(String url) {
-		return OkHttpClientWrapper.INSTANCE.defaultClient.newCall(new Request.Builder().url(url).build());
-	}
-
-	public static OkHttpClient getOkHttpClient() {
-		return OkHttpClientWrapper.INSTANCE.defaultClient;
+		return okhttp().newCall(new Request.Builder().url(url).build());
 	}
 
 	public static OkHttpClient getLongTimeoutOkHttpClient() {
@@ -268,4 +261,49 @@ public static void trackEvent(final String category, final String action) {
 			eventSubmitter.submit(() -> tracker.send(new HitBuilders.EventBuilder(category, action).build()));
 		}
 	}
+
+	private static OkHttpClient okhttp;
+
+	@NonNull
+	public static synchronized OkHttpClient okhttp() {
+		OkHttpClient res = okhttp;
+		if (res == null) {
+			final File cacheDir = new File(context.getCacheDir(), "okhttp-cache");
+			if (!cacheDir.exists()) {
+				//noinspection ResultOfMethodCallIgnored
+				cacheDir.mkdirs();
+			}
+
+			final OkHttpClient.Builder builder = new OkHttpClient.Builder()
+				.cache(new Cache(cacheDir, 50 * 1024 * 1024))
+				.connectTimeout(30, TimeUnit.SECONDS)
+				.readTimeout(30, TimeUnit.SECONDS)
+				.writeTimeout(30, TimeUnit.SECONDS)
+				.addNetworkInterceptor(userAgent);
+
+			if (BuildConfig.DEBUG) {
+				builder.hostnameVerifier((hostname, session) -> true);
+			}
+
+			StethoShim.addNetworkInterceptor(builder);
+
+			okhttp = res = builder.build();
+		}
+		return res;
+	}
+
+	static Picasso picasso;
+
+	@NonNull
+	public static synchronized Picasso picasso() {
+		Picasso res;
+		if (picasso == null) {
+			picasso = res = new Picasso.Builder(context)
+				.defaultBitmapConfig(Bitmap.Config.RGB_565)
+				.downloader(new OkHttp3Downloader(okhttp()))
+				.build();
+			return res;
+		}
+		return picasso;
+	}
 }
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/FontManagerActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/FontManagerActivity.java
index 5d379e083..c30db787e 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/FontManagerActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/FontManagerActivity.java
@@ -18,7 +18,6 @@
 import android.widget.TextView;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.squareup.picasso.Callback;
-import com.squareup.picasso.Picasso;
 import yuku.afw.V;
 import yuku.alkitab.base.App;
 import yuku.alkitab.base.ac.base.BaseActivity;
@@ -40,7 +39,7 @@
 
 public class FontManagerActivity extends BaseActivity implements DownloadService.DownloadListener {
 	public static final String TAG = FontManagerActivity.class.getSimpleName();
-	
+
 	private static final String URL_fontList = BuildConfig.SERVER_HOST + "addon/fonts/v1/list-v2.txt";
 	private static final String URL_fontData = BuildConfig.SERVER_HOST + "addon/fonts/v1/data/%s.zip";
 	private static final String URL_fontPreview = BuildConfig.SERVER_HOST + "addon/fonts/v1/preview/%s-384x84.png";
@@ -53,20 +52,23 @@ public static Intent createIntent() {
 	FontAdapter adapter;
 	TextView lEmptyError;
 	DownloadService dls;
-	
+
 	private ServiceConnection serviceConnection = new ServiceConnection() {
-		@Override public void onServiceDisconnected(ComponentName name) {
+		@Override
+		public void onServiceDisconnected(ComponentName name) {
 			dls = null;
 		}
-		
-		@Override public void onServiceConnected(ComponentName name, IBinder service) {
+
+		@Override
+		public void onServiceConnected(ComponentName name, IBinder service) {
 			dls = ((DownloadService.DownloadBinder) service).getService();
 			dls.setDownloadListener(FontManagerActivity.this);
 			runOnUiThread(() -> loadFontList());
 		}
 	};
 
-	@Override protected void onCreate(Bundle savedInstanceState) {
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
 		super.willNeedStoragePermission();
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_font_manager);
@@ -79,10 +81,10 @@ public static Intent createIntent() {
 
 		lsFont = V.get(this, R.id.lsFont);
 		lEmptyError = V.get(this, R.id.lEmptyError);
-		
+
 		lsFont.setAdapter(adapter = new FontAdapter());
 		lsFont.setEmptyView(lEmptyError);
-		
+
 		bindService(new Intent(App.context, DownloadService.class), serviceConnection, BIND_AUTO_CREATE);
 	}
 
@@ -95,9 +97,10 @@ protected void onNeededPermissionsGranted(final boolean immediatelyGranted) {
 		}
 	}
 
-	@Override protected void onDestroy() {
+	@Override
+	protected void onDestroy() {
 		super.onDestroy();
-		
+
 		if (dls != null) {
 			unbindService(serviceConnection);
 		}
@@ -106,8 +109,9 @@ protected void onNeededPermissionsGranted(final boolean immediatelyGranted) {
 	void loadFontList() {
 		new AsyncTask<Void, Void, List<FontItem>>() {
 			String errorMsg;
-			
-			@Override protected List<FontItem> doInBackground(Void... params) {
+
+			@Override
+			protected List<FontItem> doInBackground(Void... params) {
 				try {
 					final String listString = App.downloadString(URL_fontList);
 					final List<FontItem> list = new ArrayList<>();
@@ -128,8 +132,9 @@ void loadFontList() {
 					return null;
 				}
 			}
-			
-			@Override protected void onPostExecute(List<FontItem> result) {
+
+			@Override
+			protected void onPostExecute(List<FontItem> result) {
 				if (result != null) {
 					lEmptyError.setText(null);
 					adapter.setData(result);
@@ -139,11 +144,11 @@ void loadFontList() {
 			}
 		}.execute();
 	}
-	
+
 	String getFontDownloadKey(String name) {
 		return "FontManager/" + name;
 	}
-	
+
 	private String getFontNameFromDownloadKey(String key) {
 		if (!key.startsWith("FontManager/")) return null;
 		return key.substring("FontManager/".length());
@@ -152,32 +157,36 @@ private String getFontNameFromDownloadKey(String key) {
 	String getFontDownloadDestination(String name) {
 		return new File(FontManager.getFontsPath(), "download-" + name + ".zip").getAbsolutePath();
 	}
-	
+
 	public static class FontItem {
 		public String name;
 	}
-	
+
 	public class FontAdapter extends BaseAdapter {
 		List<FontItem> list;
-		
+
 		public void setData(List<FontItem> list) {
 			this.list = list;
 			notifyDataSetChanged();
 		}
 
-		@Override public int getCount() {
-			return list == null? 0: list.size();
+		@Override
+		public int getCount() {
+			return list == null ? 0 : list.size();
 		}
 
-		@Override public FontItem getItem(int position) {
+		@Override
+		public FontItem getItem(int position) {
 			return list.get(position);
 		}
 
-		@Override public long getItemId(int position) {
+		@Override
+		public long getItemId(int position) {
 			return position;
 		}
 
-		@Override public View getView(int position, View convertView, ViewGroup parent) {
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent) {
 			View res = convertView != null ? convertView : getLayoutInflater().inflate(R.layout.item_font_download, parent, false);
 
 			final ImageView imgPreview = V.get(res, R.id.imgPreview);
@@ -186,13 +195,13 @@ public void setData(List<FontItem> list) {
 			final View bDelete = V.get(res, R.id.bDelete);
 			final ProgressBar progressbar = V.get(res, R.id.progressbar);
 			final TextView lErrorMsg = V.get(res, R.id.lErrorMsg);
-			
+
 			final FontItem item = getItem(position);
 			final String dlkey = getFontDownloadKey(item.name);
-			
+
 			lFontName.setText(item.name);
 			lFontName.setVisibility(View.VISIBLE);
-			Picasso.with(FontManagerActivity.this).load(String.format(URL_fontPreview, item.name)).into(imgPreview, new Callback.EmptyCallback() {
+			App.picasso().load(String.format(URL_fontPreview, item.name)).into(imgPreview, new Callback.EmptyCallback() {
 				@Override
 				public void onSuccess() {
 					lFontName.setVisibility(View.GONE);
@@ -204,7 +213,7 @@ public void onSuccess() {
 			bDownload.setOnClickListener(bDownload_click);
 			bDelete.setTag(R.id.TAG_fontItem, item);
 			bDelete.setOnClickListener(bDelete_click);
-			
+
 			if (FontManager.isInstalled(item.name)) {
 				progressbar.setIndeterminate(false);
 				progressbar.setMax(100);
@@ -260,10 +269,10 @@ public void onSuccess() {
 					}
 				}
 			}
-			
+
 			return res;
 		}
-		
+
 		private View.OnClickListener bDownload_click = v -> {
 			FontItem item = (FontItem) v.getTag(R.id.TAG_fontItem);
 
@@ -281,7 +290,7 @@ public void onSuccess() {
 
 			notifyDataSetChanged();
 		};
-		
+
 		private View.OnClickListener bDelete_click = v -> {
 			final FontItem item = (FontItem) v.getTag(R.id.TAG_fontItem);
 
@@ -307,22 +316,23 @@ public void onSuccess() {
 		};
 	}
 
-	@Override public void onStateChanged(DownloadService.DownloadEntry entry, DownloadService.State originalState) {
+	@Override
+	public void onStateChanged(DownloadService.DownloadEntry entry, DownloadService.State originalState) {
 		adapter.notifyDataSetChanged();
-		
+
 		if (originalState == DownloadService.State.finished) {
 			String fontName = getFontNameFromDownloadKey(entry.key);
 			if (fontName == null) { // this download doesn't belong to font manager.
 				return;
 			}
-			
+
 			try {
 				String downloadedZip = getFontDownloadDestination(fontName);
 				File fontDir = FontManager.getFontDir(fontName);
 				fontDir.mkdirs();
-				
+
 				Log.d(TAG, "Going to unzip " + downloadedZip, new Throwable().fillInStackTrace());
-				
+
 				ZipInputStream zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(downloadedZip)));
 				try {
 					ZipEntry ze;
@@ -344,7 +354,7 @@ public void onSuccess() {
 				} finally {
 					zis.close();
 				}
-				
+
 				new File(downloadedZip).delete();
 			} catch (Exception e) {
 				new MaterialDialog.Builder(FontManagerActivity.this)
@@ -355,7 +365,8 @@ public void onSuccess() {
 		}
 	}
 
-	@Override public void onProgress(DownloadService.DownloadEntry entry, DownloadService.State originalState) {
+	@Override
+	public void onProgress(DownloadService.DownloadEntry entry, DownloadService.State originalState) {
 		adapter.notifyDataSetChanged();
 	}
 }
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/util/Announce.java b/Alkitab/src/main/java/yuku/alkitab/base/util/Announce.java
index 5a1e0d16f..b878bdaab 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/util/Announce.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/util/Announce.java
@@ -12,7 +12,6 @@
 import gnu.trove.set.hash.TLongHashSet;
 import okhttp3.Call;
 import okhttp3.FormBody;
-import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import yuku.afw.storage.Preferences;
 import yuku.alkitab.base.App;
@@ -128,8 +127,7 @@ private static void checkAnnouncements_worker() throws Exception {
 	}
 
 	private static AnnounceCheckResult getAnnouncements() throws IOException {
-		final OkHttpClient client = App.getOkHttpClient();
-		final Call call = client.newCall(
+		final Call call = App.okhttp().newCall(
 			new Request.Builder()
 				.url(BuildConfig.SERVER_HOST + "announce/check")
 				.post(
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/util/ShareUrl.java b/Alkitab/src/main/java/yuku/alkitab/base/util/ShareUrl.java
index 2bcd5324a..6b7696570 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/util/ShareUrl.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/util/ShareUrl.java
@@ -62,7 +62,7 @@ public static void make(@NonNull final Activity activity, final boolean immediat
 			form.add("versionShortName", versionShortName);
 		}
 
-		final Call call = App.getOkHttpClient().newCall(
+		final Call call = App.okhttp().newCall(
 			new Request.Builder()
 				.url(BuildConfig.SERVER_HOST + "v/create")
 				.post(form.build())

From 08bfaea5a8d2d4d72dcddb3a7865dd7183e073e8 Mon Sep 17 00:00:00 2001
From: Yuku on yuku8 <yukuku@gmail.com>
Date: Wed, 31 Aug 2016 02:34:26 +0800
Subject: [PATCH 06/15] Process downloaded version in background thread

---
 .../br/VersionDownloadCompleteReceiver.java   | 141 ++++++++++--------
 .../yuku/alkitab/base/util/Background.java    |  14 ++
 .../yuku/alkitab/base/util/Foreground.java    |  13 ++
 3 files changed, 102 insertions(+), 66 deletions(-)
 create mode 100644 Alkitab/src/main/java/yuku/alkitab/base/util/Background.java
 create mode 100644 Alkitab/src/main/java/yuku/alkitab/base/util/Foreground.java

diff --git a/Alkitab/src/main/java/yuku/alkitab/base/br/VersionDownloadCompleteReceiver.java b/Alkitab/src/main/java/yuku/alkitab/base/br/VersionDownloadCompleteReceiver.java
index d1808c3d5..0b07f2c56 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/br/VersionDownloadCompleteReceiver.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/br/VersionDownloadCompleteReceiver.java
@@ -16,7 +16,9 @@
 import yuku.alkitab.base.model.MVersionDb;
 import yuku.alkitab.base.storage.YesReaderFactory;
 import yuku.alkitab.base.util.AddonManager;
+import yuku.alkitab.base.util.Background;
 import yuku.alkitab.base.util.DownloadMapper;
+import yuku.alkitab.base.util.Foreground;
 import yuku.alkitab.debug.R;
 import yuku.alkitab.io.BibleReader;
 import yuku.alkitab.io.OptionalGzipInputStream;
@@ -31,10 +33,10 @@ public class VersionDownloadCompleteReceiver extends BroadcastReceiver {
 	private static final String TAG = VersionDownloadCompleteReceiver.class.getSimpleName();
 
 	public VersionDownloadCompleteReceiver() {
-    }
+	}
 
-    @Override
-    public void onReceive(Context context, Intent intent) {
+	@Override
+	public void onReceive(Context context, Intent intent) {
 		if (!DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(intent.getAction())) return;
 
 		final long id = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1);
@@ -59,8 +61,8 @@ public void onReceive(Context context, Intent intent) {
 
 		final String download_type = attrs.get("download_type");
 
-		String preset_name = null;
-		int modifyTime = (int) (System.currentTimeMillis() / 1000L);
+		final String preset_name;
+		final int modifyTime;
 
 		final String destPath;
 		if ("preset".equals(download_type)) {
@@ -87,81 +89,88 @@ public void onReceive(Context context, Intent intent) {
 
 			final String filename_last_segment = attrs.get("filename_last_segment");
 			destPath = AddonManager.getVersionPath(filename_last_segment);
+
+			preset_name = null;
+			modifyTime = (int) (System.currentTimeMillis() / 1000L);
 		} else {
 			Log.w(TAG, "unknown download_type for " + id + ": " + download_type);
 			return;
 		}
 
-		// transfer from dm to the actual file
-		final DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-
-		try {
-			final ParcelFileDescriptor pfd = dm.openDownloadedFile(id);
-			final FileInputStream fis = new FileInputStream(pfd.getFileDescriptor());
-			final OptionalGzipInputStream ogis = new OptionalGzipInputStream(fis);
-			final AtomicFile af = new AtomicFile(new File(destPath));
-			final FileOutputStream fos = af.startWrite();
-			final byte[] buf = new byte[4096];
-			while (true) {
-				final int read = ogis.read(buf);
-				if (read < 0) break;
-				fos.write(buf, 0, read);
+		// transfer from dm to the actual file in the background
+		Background.run(() -> {
+			final DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+
+			try {
+				final ParcelFileDescriptor pfd = dm.openDownloadedFile(id);
+				final FileInputStream fis = new FileInputStream(pfd.getFileDescriptor());
+				final OptionalGzipInputStream ogis = new OptionalGzipInputStream(fis);
+				final AtomicFile af = new AtomicFile(new File(destPath));
+				final FileOutputStream fos = af.startWrite();
+				final byte[] buf = new byte[4096];
+				while (true) {
+					final int read = ogis.read(buf);
+					if (read < 0) break;
+					fos.write(buf, 0, read);
+				}
+				af.finishWrite(fos);
+				pfd.close();
+			} catch (IOException e) {
+				Log.e(TAG, "I/O error when saving downloaded version", e);
+				Foreground.run(() -> context.startActivity(
+					AlertDialogActivity.createOkIntent(null, context.getString(R.string.version_download_saving_io_error))
+						.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+				));
+				App.getLbm().sendBroadcast(new Intent(VersionsActivity.VersionListFragment.ACTION_RELOAD));
+				return;
+			} finally {
+				DownloadMapper.instance.remove(id);
 			}
-			af.finishWrite(fos);
-			pfd.close();
-		} catch (IOException e) {
-			Log.e(TAG, "I/O error when saving downloaded version", e);
-			context.startActivity(
-				AlertDialogActivity.createOkIntent(null, context.getString(R.string.version_download_saving_io_error))
-					.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-			);
-			App.getLbm().sendBroadcast(new Intent(VersionsActivity.VersionListFragment.ACTION_RELOAD));
-			return;
-		} finally {
-			DownloadMapper.instance.remove(id);
-		}
 
-		final BibleReader reader = YesReaderFactory.createYesReader(destPath);
-		if (reader == null) {
-			new File(destPath).delete();
+			final BibleReader reader = YesReaderFactory.createYesReader(destPath);
+			if (reader == null) {
+				new File(destPath).delete();
 
-			context.startActivity(
-				AlertDialogActivity.createOkIntent(null, context.getString(R.string.version_download_corrupted_file))
-					.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-			);
-			App.getLbm().sendBroadcast(new Intent(VersionsActivity.VersionListFragment.ACTION_RELOAD));
-			return;
-		}
+				Foreground.run(() -> context.startActivity(
+					AlertDialogActivity.createOkIntent(null, context.getString(R.string.version_download_corrupted_file))
+						.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+				));
+				App.getLbm().sendBroadcast(new Intent(VersionsActivity.VersionListFragment.ACTION_RELOAD));
+				return;
+			}
 
-		// success!
+			// success!
 
-		int maxOrdering = S.getDb().getVersionMaxOrdering();
-		if (maxOrdering == 0) maxOrdering = MVersionDb.DEFAULT_ORDERING_START;
+			int maxOrdering = S.getDb().getVersionMaxOrdering();
+			if (maxOrdering == 0) maxOrdering = MVersionDb.DEFAULT_ORDERING_START;
 
-		final MVersionDb mvDb = new MVersionDb();
-		mvDb.locale = reader.getLocale();
-		mvDb.shortName = reader.getShortName();
-		mvDb.longName = reader.getLongName();
-		mvDb.description = reader.getDescription();
-		mvDb.filename = destPath;
-		if ("preset".equals(download_type)) {
-			mvDb.preset_name = preset_name;
-		}
-		mvDb.modifyTime = modifyTime;
-		mvDb.ordering = maxOrdering + 1;
+			final MVersionDb mvDb = new MVersionDb();
+			mvDb.locale = reader.getLocale();
+			mvDb.shortName = reader.getShortName();
+			mvDb.longName = reader.getLongName();
+			mvDb.description = reader.getDescription();
+			mvDb.filename = destPath;
+			if ("preset".equals(download_type)) {
+				mvDb.preset_name = preset_name;
+			}
+			mvDb.modifyTime = modifyTime;
+			mvDb.ordering = maxOrdering + 1;
 
-		S.getDb().insertOrUpdateVersionWithActive(mvDb, true);
-		MVersionDb.clearVersionImplCache();
+			S.getDb().insertOrUpdateVersionWithActive(mvDb, true);
+			MVersionDb.clearVersionImplCache();
 
-		Toast.makeText(App.context, TextUtils.expandTemplate(context.getText(R.string.version_download_complete), mvDb.longName), Toast.LENGTH_LONG).show();
+			Foreground.run(() -> {
+				Toast.makeText(App.context, TextUtils.expandTemplate(context.getText(R.string.version_download_complete), mvDb.longName), Toast.LENGTH_LONG).show();
 
-		if ("ta".equals(mvDb.locale) || "te".equals(mvDb.locale) || "my".equals(mvDb.locale) || "el".equals(mvDb.locale)) {
-			context.startActivity(
-				AlertDialogActivity.createOkIntent(null, context.getString(R.string.version_download_need_fonts))
-					.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-			);
-		}
+				if ("ta".equals(mvDb.locale) || "te".equals(mvDb.locale) || "my".equals(mvDb.locale) || "el".equals(mvDb.locale)) {
+					context.startActivity(
+						AlertDialogActivity.createOkIntent(null, context.getString(R.string.version_download_need_fonts))
+							.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+					);
+				}
+			});
 
-		App.getLbm().sendBroadcast(new Intent(VersionsActivity.VersionListFragment.ACTION_RELOAD));
+			App.getLbm().sendBroadcast(new Intent(VersionsActivity.VersionListFragment.ACTION_RELOAD));
+		});
 	}
 }
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/util/Background.java b/Alkitab/src/main/java/yuku/alkitab/base/util/Background.java
new file mode 100644
index 000000000..f0c3a4106
--- /dev/null
+++ b/Alkitab/src/main/java/yuku/alkitab/base/util/Background.java
@@ -0,0 +1,14 @@
+package yuku.alkitab.base.util;
+
+import android.support.annotation.NonNull;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+public abstract class Background {
+	static final Executor executor = Executors.newCachedThreadPool();
+
+	public static void run(@NonNull Runnable r) {
+		executor.execute(r);
+	}
+}
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/util/Foreground.java b/Alkitab/src/main/java/yuku/alkitab/base/util/Foreground.java
new file mode 100644
index 000000000..af9cd4898
--- /dev/null
+++ b/Alkitab/src/main/java/yuku/alkitab/base/util/Foreground.java
@@ -0,0 +1,13 @@
+package yuku.alkitab.base.util;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.support.annotation.NonNull;
+
+public abstract class Foreground {
+	static final Handler handler = new Handler(Looper.getMainLooper());
+
+	public static void run(@NonNull Runnable r) {
+		handler.post(r);
+	}
+}

From a699ab39a1f9a1f4c15ffb2e564c715da19791d1 Mon Sep 17 00:00:00 2001
From: Yuku on yuku8 <yukuku@gmail.com>
Date: Wed, 31 Aug 2016 02:46:33 +0800
Subject: [PATCH 07/15] Change new Thread(r).start() to Background.run(r) to
 use thread pool

---
 .../alkitab/base/ac/ReadingPlanActivity.java  | 77 ++++++++-----------
 .../base/ac/SecretSyncDebugActivity.java      |  5 +-
 .../alkitab/base/ac/SongViewActivity.java     | 16 ++--
 .../main/java/yuku/alkitab/base/sync/Gcm.java |  5 +-
 .../java/yuku/alkitab/base/sync/Sync.java     |  3 +-
 .../alkitab/base/sync/SyncLoginActivity.java  |  5 +-
 .../java/yuku/alkitab/base/util/Announce.java |  4 +-
 .../yuku/alkitab/base/util/SearchEngine.java  | 22 +++---
 .../yuku/alkitab/base/util/SongBookUtil.java  | 10 +--
 Alkitab/src/main/res/values/strings.xml       |  1 +
 10 files changed, 69 insertions(+), 79 deletions(-)

diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/ReadingPlanActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/ReadingPlanActivity.java
index 214288224..24bb40db4 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/ReadingPlanActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/ReadingPlanActivity.java
@@ -37,7 +37,9 @@
 import yuku.alkitab.base.ac.base.BaseLeftDrawerActivity;
 import yuku.alkitab.base.model.ReadingPlan;
 import yuku.alkitab.base.storage.Prefkey;
+import yuku.alkitab.base.util.Background;
 import yuku.alkitab.base.util.CurrentReading;
+import yuku.alkitab.base.util.Foreground;
 import yuku.alkitab.base.util.ReadingPlanManager;
 import yuku.alkitab.base.util.Sqlitil;
 import yuku.alkitab.base.widget.LeftDrawer;
@@ -406,7 +408,7 @@ private int calculateDaysDiff(Calendar startCalendar, Calendar endCalendar) {
 	public boolean prepareDropDownNavigation() {
 		if (downloadedReadingPlanInfos.size() == 0) {
 			actionBar.setDisplayShowTitleEnabled(true);
-			actionBar.setTitle(R.string.rp_menuReadingPlan);
+			actionBar.setTitle(R.string.rp_activity_title);
 			actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
 			return true;
 		}
@@ -588,59 +590,42 @@ void downloadReadingPlanFromServer(final String name) {
 			.dismissListener(dialog -> cancelled.set(true))
 			.show();
 
-		new Thread() {
-			@Override
-			public void run() {
-				try {
-					download();
-				} catch (Exception e) {
-					if (cancelled.get()) {
-						Log.e(TAG, "downloading reading plan data", e);
+		Background.run(() -> {
+			try {
+				final byte[] data = App.downloadBytes(BuildConfig.SERVER_HOST + "rp/get_rp?name=" + name);
+				if (cancelled.get()) return;
+				Foreground.run(() -> {
+					final long id = ReadingPlanManager.insertReadingPlanToDb(data, name);
+
+					if (id == 0) {
 						new MaterialDialog.Builder(ReadingPlanActivity.this)
-							.content(getString(R.string.rp_download_reading_plan_failed))
+							.content(getString(R.string.rp_download_reading_plan_data_corrupted))
 							.positiveText(R.string.ok)
 							.show();
+						return;
 					}
-				} finally {
-					pd.dismiss();
-				}
-			}
-
-			/**
-			 * run on bg thread
-			 */
-			void download() throws Exception {
-				final byte[] bytes = App.downloadBytes(BuildConfig.SERVER_HOST + "rp/get_rp?name=" + name);
-
-				if (cancelled.get()) return;
-				runOnUiThread(() -> onReadingPlanDownloadFinished(bytes));
-			}
-
-			/**
-			 * run on ui thread
-			 */
-			void onReadingPlanDownloadFinished(final byte[] data) {
-				if (cancelled.get()) return;
 
-				final long id = ReadingPlanManager.insertReadingPlanToDb(data, name);
-
-				if (id == 0) {
-					new MaterialDialog.Builder(ReadingPlanActivity.this)
-						.content(getString(R.string.rp_download_reading_plan_data_corrupted))
+					Preferences.setLong(Prefkey.active_reading_plan_id, id);
+					loadReadingPlan(id);
+					loadReadingPlanProgress();
+					loadDayNumber();
+					prepareDropDownNavigation();
+					prepareDisplay();
+					supportInvalidateOptionsMenu();
+				});
+			} catch (Exception e) {
+				if (!cancelled.get()) {
+					Log.e(TAG, "downloading reading plan data", e);
+					Foreground.run(() -> new MaterialDialog.Builder(ReadingPlanActivity.this)
+						.content(getString(R.string.rp_download_reading_plan_failed))
 						.positiveText(R.string.ok)
-						.show();
-					return;
+						.show()
+					);
 				}
-
-				Preferences.setLong(Prefkey.active_reading_plan_id, id);
-				loadReadingPlan(id);
-				loadReadingPlanProgress();
-				loadDayNumber();
-				prepareDropDownNavigation();
-				prepareDisplay();
-				supportInvalidateOptionsMenu();
+			} finally {
+				pd.dismiss();
 			}
-		}.start();
+		});
 	}
 
 	private float getActualPercentage() {
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/SecretSyncDebugActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/SecretSyncDebugActivity.java
index ba64904d7..8999e908e 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/SecretSyncDebugActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/SecretSyncDebugActivity.java
@@ -33,6 +33,7 @@
 import yuku.alkitab.base.sync.Sync_Mabel;
 import yuku.alkitab.base.sync.Sync_Pins;
 import yuku.alkitab.base.sync.Sync_Rp;
+import yuku.alkitab.base.util.Background;
 import yuku.alkitab.base.util.Highlights;
 import yuku.alkitab.debug.BuildConfig;
 import yuku.alkitab.debug.R;
@@ -442,7 +443,7 @@ public void onResponse(final Call call, final Response response) throws IOExcept
 			.content("getting entities…")
 			.show();
 
-		new Thread(() -> {
+		Background.run(() -> {
 			switch (syncSetName) {
 				case SyncShadow.SYNC_SET_MABEL:
 					entities.addAll(Sync_Mabel.getEntitiesFromCurrent());
@@ -480,6 +481,6 @@ public void onResponse(final Call call, final Response response) throws IOExcept
 				.content("entities.size=" + entities.size() + " hash=" + String.format(Locale.US, "0x%08x", finalHashCode))
 				.positiveText("OK")
 				.show());
-		}).start();
+		});
 	};
 }
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/SongViewActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/SongViewActivity.java
index cde025664..9b7ed14b8 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/SongViewActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/SongViewActivity.java
@@ -41,7 +41,9 @@
 import yuku.alkitab.base.storage.Prefkey;
 import yuku.alkitab.base.storage.SongDb;
 import yuku.alkitab.base.util.AlphanumComparator;
+import yuku.alkitab.base.util.Background;
 import yuku.alkitab.base.util.FontManager;
+import yuku.alkitab.base.util.Foreground;
 import yuku.alkitab.base.util.OsisBookNames;
 import yuku.alkitab.base.util.SongBookUtil;
 import yuku.alkitab.base.util.Sqlitil;
@@ -281,7 +283,7 @@ void playOrPause(final boolean playInLoop) {
 				if (isMidiFile) {
 					final Handler handler = new Handler();
 
-					new Thread(() -> {
+					Background.run(() -> {
 						try {
 							setState(ControllerState.preparing);
 
@@ -305,7 +307,7 @@ void playOrPause(final boolean playInLoop) {
 							Log.e(TAG, "buffering to local cache", e);
 							setState(ControllerState.error);
 						}
-					}).start();
+					});
 				} else {
 					mediaPlayerPrepare(false, url, playInLoop);
 				}
@@ -528,7 +530,7 @@ void checkAudioExistance() {
 		final String checkedBookName = currentBookName;
 		final String checkedCode = currentSong.code;
 
-		new Thread(() -> {
+		Background.run(() -> {
 			try {
 				final String filename = getAudioFilename(checkedBookName, checkedCode);
 				final String response = App.downloadString(BuildConfig.SERVER_HOST + "addon/audio/exists?filename=" + Uri.encode(filename));
@@ -555,7 +557,7 @@ void checkAudioExistance() {
 			} catch (IOException e) {
 				Log.e(TAG, "@@checkAudioExistance", e);
 			}
-		}).start();
+		});
 	}
 
 	@Override public boolean onCreateOptionsMenu(Menu menu) {
@@ -714,10 +716,10 @@ protected void deleteSongBook() {
 
 		final String bookName = currentBookName;
 
-		new Thread(() -> {
+		Background.run(() -> {
 			final int count = S.getSongDb().deleteSongBook(bookName);
 
-			runOnUiThread(() -> {
+			Foreground.run(() -> {
 				pd.dismiss();
 
 				new MaterialDialog.Builder(this)
@@ -726,7 +728,7 @@ protected void deleteSongBook() {
 					.dismissListener(dialog -> displayAnySongOrFinish())
 					.show();
 			});
-		}).start();
+		});
     }
 
 	private StringBuilder convertSongToText(Song song) {
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/sync/Gcm.java b/Alkitab/src/main/java/yuku/alkitab/base/sync/Gcm.java
index b4b621830..fb715aae0 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/sync/Gcm.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/sync/Gcm.java
@@ -10,6 +10,7 @@
 import yuku.alkitab.base.App;
 import yuku.alkitab.base.storage.NoBackupSharedPreferences;
 import yuku.alkitab.base.storage.Prefkey;
+import yuku.alkitab.base.util.Background;
 
 import java.io.IOException;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -128,7 +129,7 @@ private static String readGcmRegistrationId() {
 	}
 
 	private static void registerInBackground() {
-		new Thread(() -> {
+		Background.run(() -> {
 			try {
 				final GoogleCloudMessaging gcm = GoogleCloudMessaging.getInstance(App.context);
 				final String registrationId = gcm.register(SENDER_ID);
@@ -150,7 +151,7 @@ private static void registerInBackground() {
 				// Require the user to click a button again, or perform exponential back-off.
 				Log.e(TAG, "Error :" + ex.getMessage(), ex);
 			}
-		}).start();
+		});
 	}
 
 	private static void writeGcmRegistrationId(final String registrationId) {
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/sync/Sync.java b/Alkitab/src/main/java/yuku/alkitab/base/sync/Sync.java
index b9a7eb292..ba828431a 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/sync/Sync.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/sync/Sync.java
@@ -18,6 +18,7 @@
 import yuku.alkitab.base.U;
 import yuku.alkitab.base.model.SyncShadow;
 import yuku.alkitab.base.storage.Prefkey;
+import yuku.alkitab.base.util.Background;
 import yuku.alkitab.debug.BuildConfig;
 import yuku.alkitab.debug.R;
 
@@ -301,7 +302,7 @@ public static void notifyNewGcmRegistrationId(final String newRegistrationId) {
 			return;
 		}
 
-		new Thread(() -> sendGcmRegistrationId(simpleToken, newRegistrationId)).start();
+		Background.run(() -> sendGcmRegistrationId(simpleToken, newRegistrationId));
 	}
 
 	public static boolean sendGcmRegistrationId(final String simpleToken, final String registration_id) {
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncLoginActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncLoginActivity.java
index d9486404f..90dcbbdb5 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncLoginActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncLoginActivity.java
@@ -21,6 +21,7 @@
 import yuku.alkitab.base.App;
 import yuku.alkitab.base.U;
 import yuku.alkitab.base.ac.base.BaseActivity;
+import yuku.alkitab.base.util.Background;
 import yuku.alkitab.debug.R;
 
 public class SyncLoginActivity extends BaseActivity {
@@ -291,13 +292,13 @@ void startThreadWithProgressDialog(final String message, final Runnable task) {
 			.progress(true, 0)
 			.show();
 
-		new Thread(() -> {
+		Background.run(() -> {
 			try {
 				task.run();
 			} finally {
 				pd.dismiss();
 			}
-		}).start();
+		});
 	}
 
 	void confirmPassword(final String correctPassword, final Runnable whenCorrect) {
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/util/Announce.java b/Alkitab/src/main/java/yuku/alkitab/base/util/Announce.java
index b878bdaab..940148ba5 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/util/Announce.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/util/Announce.java
@@ -39,14 +39,14 @@ public static void checkAnnouncements() {
 			return;
 		}
 
-		new Thread(() -> {
+		Background.run(() -> {
 			try {
 				SystemClock.sleep(10000); // wait 10 seconds
 				checkAnnouncements_worker();
 			} catch (Exception e) { // handle all exceptions, because we don't want the main app to crash because of this.
 				Log.d(TAG, "@@checkAnnouncements", e);
 			}
-		}).start();
+		});
 	}
 
 	static class Announcement {
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/util/SearchEngine.java b/Alkitab/src/main/java/yuku/alkitab/base/util/SearchEngine.java
index 22a4a3bb9..746ccddac 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/util/SearchEngine.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/util/SearchEngine.java
@@ -519,19 +519,17 @@ public static IntArrayList searchByRevIndex(final Version version, final Query q
 	}
 
 	public static void preloadRevIndex() {
-		new Thread() {
-			@Override public void run() {
-				TimingLogger timing = new TimingLogger("RevIndex", "preloadRevIndex");
-				revIndexLoading.acquireUninterruptibly();
-				try {
-					loadRevIndex();
-					timing.addSplit("loadRevIndex");
-				} finally {
-					revIndexLoading.release();
-					timing.dumpToLog();
-				}
+		Background.run(() -> {
+			TimingLogger timing = new TimingLogger("RevIndex", "preloadRevIndex");
+			revIndexLoading.acquireUninterruptibly();
+			try {
+				loadRevIndex();
+				timing.addSplit("loadRevIndex");
+			} finally {
+				revIndexLoading.release();
+				timing.dumpToLog();
 			}
-		}.start();
+		});
 	}
 
 	/**
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/util/SongBookUtil.java b/Alkitab/src/main/java/yuku/alkitab/base/util/SongBookUtil.java
index c2279b702..370819e12 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/util/SongBookUtil.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/util/SongBookUtil.java
@@ -188,13 +188,13 @@ public NotOkException(final int code) {
 	public static void downloadSongBook(final Activity activity, final SongBookInfo songBookInfo, final int dataFormatVersion, final OnDownloadSongBookListener listener) {
 		final AtomicBoolean cancelled = new AtomicBoolean();
 
-		MaterialDialog pd = new MaterialDialog.Builder(activity)
+		final MaterialDialog pd = new MaterialDialog.Builder(activity)
 			.content(R.string.sn_downloading_ellipsis)
 			.progress(true, 0)
 			.dismissListener(dialog -> cancelled.set(true))
 			.show();
 
-		new Thread(() -> {
+		Background.run(() -> {
 			try {
 				final Call call = App.downloadCall(BuildConfig.SERVER_HOST + "addon/songs/get_songs?name=" + songBookInfo.name + "&dataFormatVersion=" + dataFormatVersion);
 
@@ -217,15 +217,15 @@ public static void downloadSongBook(final Activity activity, final SongBookInfo
 				S.getSongDb().insertSongBookInfo(songBookInfo);
 				S.getSongDb().storeSongs(songBookInfo.name, songs, dataFormatVersion);
 
-				activity.runOnUiThread(() -> listener.onDownloadedAndInserted(songBookInfo));
+				Foreground.run(() -> listener.onDownloadedAndInserted(songBookInfo));
 
 			} catch (IOException | ClassNotFoundException e) {
-				activity.runOnUiThread(() -> listener.onFailedOrCancelled(songBookInfo, e));
+				Foreground.run(() -> listener.onFailedOrCancelled(songBookInfo, e));
 
 			} finally {
 				pd.dismiss();
 			}
-		}).start();
+		});
 	}
 
 	public static CharSequence escapeSongBookName(final String name) {
diff --git a/Alkitab/src/main/res/values/strings.xml b/Alkitab/src/main/res/values/strings.xml
index b54bdc8bc..874d3c121 100644
--- a/Alkitab/src/main/res/values/strings.xml
+++ b/Alkitab/src/main/res/values/strings.xml
@@ -337,6 +337,7 @@
     <string name="dv_option_text_size">Text size</string>
 
 	<!-- Reading plan -->
+    <string name="rp_activity_title">Reading Plan</string>
     <string name="rp_menuReadingPlan">Reading plan</string>
     <string name="rp_commentActual">Finished: %s%%</string>
     <string name="rp_commentTarget">Target: %s%%</string>

From ff0358338a614722ea507427f1365b550b26ff2a Mon Sep 17 00:00:00 2001
From: Yuku on yuku8 <yukuku@gmail.com>
Date: Wed, 31 Aug 2016 02:59:45 +0800
Subject: [PATCH 08/15] Fix feedback form crash when submitting

---
 .../android/wizardpager/MainActivity.java     | 463 +++++++++---------
 1 file changed, 230 insertions(+), 233 deletions(-)

diff --git a/AlkitabFeedback/src/main/java/com/example/android/wizardpager/MainActivity.java b/AlkitabFeedback/src/main/java/com/example/android/wizardpager/MainActivity.java
index 206d95f5a..1a8e299f0 100644
--- a/AlkitabFeedback/src/main/java/com/example/android/wizardpager/MainActivity.java
+++ b/AlkitabFeedback/src/main/java/com/example/android/wizardpager/MainActivity.java
@@ -16,17 +16,17 @@
 
 package com.example.android.wizardpager;
 
-import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.content.res.ResourcesCompat;
 import android.support.v4.view.ViewPager;
+import android.support.v4.widget.TextViewCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -48,23 +48,23 @@
 import java.util.List;
 
 public class MainActivity extends FragmentActivity implements
-        PageFragmentCallbacks,
-        ReviewFragment.Callbacks,
-        ModelCallbacks {
-    private ViewPager mPager;
-    private MyPagerAdapter mPagerAdapter;
+	PageFragmentCallbacks,
+	ReviewFragment.Callbacks,
+	ModelCallbacks {
+	private ViewPager mPager;
+	private MyPagerAdapter mPagerAdapter;
 
-    private boolean mEditingAfterReview;
+	private boolean mEditingAfterReview;
 
-    private AbstractWizardModel mWizardModel;
+	private AbstractWizardModel mWizardModel;
 
-    private boolean mConsumePageSelectedEvent;
+	private boolean mConsumePageSelectedEvent;
 
-    private Button mNextButton;
-    private Button mPrevButton;
+	private Button mNextButton;
+	private Button mPrevButton;
 
-    private List<Page> mCurrentPageSequence;
-    private StepPagerStrip mStepPagerStrip;
+	private List<Page> mCurrentPageSequence;
+	private StepPagerStrip mStepPagerStrip;
 
 	public static Intent createIntent(Context context) {
 		return new Intent(context, MainActivity.class);
@@ -74,14 +74,15 @@ public static Intent createIntent(Context context, String patchTextMessage) {
 		return new Intent(context, MainActivity.class).putExtra("patchTextMessage", patchTextMessage);
 	}
 
-	@Override public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.alkitabfeedback_activity_main);
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.alkitabfeedback_activity_main);
 
-        mWizardModel = new AlkitabFeedbackModel(this);
-        
-        if (savedInstanceState != null) {
-            mWizardModel.load(savedInstanceState.getBundle("model"));
+		mWizardModel = new AlkitabFeedbackModel(this);
+
+		if (savedInstanceState != null) {
+			mWizardModel.load(savedInstanceState.getBundle("model"));
 		} else {
 			final String patchTextMessage = getIntent().getStringExtra("patchTextMessage");
 			if (patchTextMessage != null) {
@@ -93,16 +94,16 @@ public static Intent createIntent(Context context, String patchTextMessage) {
 			}
 		}
 
-        mWizardModel.registerListener(this);
+		mWizardModel.registerListener(this);
 
-	    mPagerAdapter = new MyPagerAdapter(getSupportFragmentManager());
-	    mPager = (ViewPager) findViewById(R.id.pager);
+		mPagerAdapter = new MyPagerAdapter(getSupportFragmentManager());
+		mPager = (ViewPager) findViewById(R.id.pager);
 
-	    mCurrentPageSequence = mWizardModel.getCurrentPageSequence();
+		mCurrentPageSequence = mWizardModel.getCurrentPageSequence();
 
-	    mPager.setAdapter(mPagerAdapter);
-        mStepPagerStrip = (StepPagerStrip) findViewById(R.id.strip);
-        mStepPagerStrip.setOnPageSelectedListener(new StepPagerStrip.OnPageSelectedListener() {
+		mPager.setAdapter(mPagerAdapter);
+		mStepPagerStrip = (StepPagerStrip) findViewById(R.id.strip);
+		mStepPagerStrip.setOnPageSelectedListener(new StepPagerStrip.OnPageSelectedListener() {
 			@Override
 			public void onPageStripSelected(int position) {
 				position = Math.min(mPagerAdapter.getCount() - 1, position);
@@ -112,67 +113,62 @@ public void onPageStripSelected(int position) {
 			}
 		});
 
-        mNextButton = (Button) findViewById(R.id.next_button);
-        mPrevButton = (Button) findViewById(R.id.prev_button);
+		mNextButton = (Button) findViewById(R.id.next_button);
+		mPrevButton = (Button) findViewById(R.id.prev_button);
 
-        mPager.setOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
-            @Override
-            public void onPageSelected(int position) {
-                mStepPagerStrip.setCurrentPage(position);
+		mPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
+			@Override
+			public void onPageSelected(int position) {
+				mStepPagerStrip.setCurrentPage(position);
 
-                if (mConsumePageSelectedEvent) {
-                    mConsumePageSelectedEvent = false;
-                    return;
-                }
+				if (mConsumePageSelectedEvent) {
+					mConsumePageSelectedEvent = false;
+					return;
+				}
 
-                mEditingAfterReview = false;
-                updateBottomBar();
-            }
-        });
+				mEditingAfterReview = false;
+				updateBottomBar();
+			}
+		});
 
-        mNextButton.setOnClickListener(new View.OnClickListener() {
+		mNextButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(final View v) {
 				if (mPager.getCurrentItem() == mCurrentPageSequence.size()) {
-					DialogFragment dg = new DialogFragment() {
-						@Override public Dialog onCreateDialog(Bundle savedInstanceState) {
-							return new MaterialDialog.Builder(getActivity())
-								.content(R.string.alkitabfeedback_submit_confirm_message)
-								.positiveText(R.string.alkitabfeedback_submit_confirm_button)
-								.onPositive(new MaterialDialog.SingleButtonCallback() {
-									@Override
-									public void onClick(@NonNull final MaterialDialog dialog, @NonNull final DialogAction which) {
-										String feedback_from_name = null;
-										String feedback_from_email = null;
-										String feedback_body = null;
-
-										Bundle saved = mWizardModel.save();
-										Bundle contact = saved.getBundle("contact");
-										if (contact != null) {
-											feedback_from_name = contact.getString(CustomerInfoPage.NAME_DATA_KEY);
-											feedback_from_email = contact.getString(CustomerInfoPage.EMAIL_DATA_KEY);
-										}
-										Bundle message = saved.getBundle("message");
-										if (message != null) {
-											feedback_body = message.getString(TextareaPage.SIMPLE_DATA_KEY);
-										}
-
-										if (feedback_from_name != null && feedback_from_email != null && feedback_body != null) {
-											FeedbackSender sender = FeedbackSender.getInstance(getApplicationContext());
-											sender.addEntry(feedback_from_name, feedback_from_email, feedback_body);
-											sender.trySend();
-										}
-
-										Toast.makeText(MainActivity.this, R.string.alkitabfeedback_submit_thanks, Toast.LENGTH_LONG).show();
-										setResult(RESULT_OK);
-										finish();
-									}
-								})
-								.negativeText(android.R.string.cancel)
-								.build();
-						}
-					};
-					dg.show(getSupportFragmentManager(), "place_order_dialog");
+					new MaterialDialog.Builder(MainActivity.this)
+						.content(R.string.alkitabfeedback_submit_confirm_message)
+						.positiveText(R.string.alkitabfeedback_submit_confirm_button)
+						.onPositive(new MaterialDialog.SingleButtonCallback() {
+							@Override
+							public void onClick(@NonNull final MaterialDialog dialog, @NonNull final DialogAction which) {
+								String feedback_from_name = null;
+								String feedback_from_email = null;
+								String feedback_body = null;
+
+								Bundle saved = mWizardModel.save();
+								Bundle contact = saved.getBundle("contact");
+								if (contact != null) {
+									feedback_from_name = contact.getString(CustomerInfoPage.NAME_DATA_KEY);
+									feedback_from_email = contact.getString(CustomerInfoPage.EMAIL_DATA_KEY);
+								}
+								Bundle message = saved.getBundle("message");
+								if (message != null) {
+									feedback_body = message.getString(TextareaPage.SIMPLE_DATA_KEY);
+								}
+
+								if (feedback_from_name != null && feedback_from_email != null && feedback_body != null) {
+									FeedbackSender sender = FeedbackSender.getInstance(getApplicationContext());
+									sender.addEntry(feedback_from_name, feedback_from_email, feedback_body);
+									sender.trySend();
+								}
+
+								Toast.makeText(MainActivity.this, R.string.alkitabfeedback_submit_thanks, Toast.LENGTH_LONG).show();
+								setResult(RESULT_OK);
+								finish();
+							}
+						})
+						.negativeText(android.R.string.cancel)
+						.show();
 				} else {
 					if (mEditingAfterReview) {
 						mPager.setCurrentItem(mPagerAdapter.getCount() - 1);
@@ -184,163 +180,164 @@ public void onClick(@NonNull final MaterialDialog dialog, @NonNull final DialogA
 			}
 		});
 
-        mPrevButton.setOnClickListener(new View.OnClickListener() {
+		mPrevButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(final View v) {
 				mPager.setCurrentItem(mPager.getCurrentItem() - 1);
 			}
 		});
 
-        onPageTreeChanged();
-        updateBottomBar();
-    }
-
-    @Override
-    public void onPageTreeChanged() {
-        mCurrentPageSequence = mWizardModel.getCurrentPageSequence();
-        recalculateCutOffPage();
-        mStepPagerStrip.setPageCount(mCurrentPageSequence.size() + 1); // + 1 = review step
-        mPagerAdapter.notifyDataSetChanged();
-        updateBottomBar();
-    }
-
-    private void updateBottomBar() {
-        int position = mPager.getCurrentItem();
-        if (position == mCurrentPageSequence.size()) {
-            mNextButton.setText(R.string.alkitabfeedback_finish);
-            
-            mNextButton.setBackgroundResource(R.drawable.alkitabfeedback_finish_background);
-            mNextButton.setTextAppearance(this, R.style.alkitabfeedback_TextAppearanceFinish);
-        } else {
-            mNextButton.setText(mEditingAfterReview
-                    ? R.string.alkitabfeedback_review
-                    : R.string.alkitabfeedback_next);
-
-            mNextButton.setTextColor(getResources().getColorStateList(R.color.alkitabfeedback_button_textcolor));
-            mNextButton.setBackgroundResource(R.drawable.alkitabfeedback_selectable_item_background);
-
-            mNextButton.setEnabled(position != mPagerAdapter.getCutOffPage());
-        }
-
-        mPrevButton.setVisibility(position <= 0 ? View.INVISIBLE : View.VISIBLE);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        mWizardModel.unregisterListener(this);
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putBundle("model", mWizardModel.save());
-    }
-
-    @Override
-    public AbstractWizardModel onGetModel() {
-        return mWizardModel;
-    }
-
-    @Override
-    public void onEditScreenAfterReview(String key) {
-        for (int i = mCurrentPageSequence.size() - 1; i >= 0; i--) {
-            if (mCurrentPageSequence.get(i).getKey().equals(key)) {
-                mConsumePageSelectedEvent = true;
-                mEditingAfterReview = true;
-                mPager.setCurrentItem(i);
-                updateBottomBar();
-                break;
-            }
-        }
-    }
-
-    @Override
-    public void onPageDataChanged(Page page) {
-        if (page.isRequired()) {
-            if (recalculateCutOffPage()) {
-                mPagerAdapter.notifyDataSetChanged();
-                updateBottomBar();
-            }
-        }
-    }
-
-    @Override
-    public Page onGetPage(String key) {
-        return mWizardModel.findByKey(key);
-    }
-
-    private boolean recalculateCutOffPage() {
-        // Cut off the pager adapter at first required page that isn't completed
-        int cutOffPage = mCurrentPageSequence.size() + 1;
-        for (int i = 0; i < mCurrentPageSequence.size(); i++) {
-            Page page = mCurrentPageSequence.get(i);
-            if (page.isRequired() && !page.isCompleted()) {
-                cutOffPage = i;
-                break;
-            }
-        }
-
-        if (mPagerAdapter.getCutOffPage() != cutOffPage) {
-            mPagerAdapter.setCutOffPage(cutOffPage);
-            return true;
-        }
-
-        return false;
-    }
-
-    public class MyPagerAdapter extends FragmentStatePagerAdapter {
-        private int mCutOffPage;
-        private Fragment mPrimaryItem;
-
-        public MyPagerAdapter(FragmentManager fm) {
-            super(fm);
-        }
-
-        @Override
-        public Fragment getItem(int i) {
-            if (i >= mCurrentPageSequence.size()) {
-                return new ReviewFragment();
-            }
-
-            return mCurrentPageSequence.get(i).createFragment();
-        }
-
-        @Override
-        public int getItemPosition(Object object) {
-            // TODO: be smarter about this
-            if (object == mPrimaryItem) {
-                // Re-use the current fragment (its position never changes)
-                return POSITION_UNCHANGED;
-            }
-
-            return POSITION_NONE;
-        }
-
-        @Override
-        public void setPrimaryItem(ViewGroup container, int position, Object object) {
-            super.setPrimaryItem(container, position, object);
-            mPrimaryItem = (Fragment) object;
-        }
-
-        @Override
-        public int getCount() {
-            return Math.min(mCutOffPage + 1, mCurrentPageSequence.size() + 1);
-        }
-
-        public void setCutOffPage(int cutOffPage) {
-            if (cutOffPage < 0) {
-                cutOffPage = Integer.MAX_VALUE;
-            }
-            mCutOffPage = cutOffPage;
-        }
-
-        public int getCutOffPage() {
-            return mCutOffPage;
-        }
-    }
-
-	@Override public Context getContext() {
+		onPageTreeChanged();
+		updateBottomBar();
+	}
+
+	@Override
+	public void onPageTreeChanged() {
+		mCurrentPageSequence = mWizardModel.getCurrentPageSequence();
+		recalculateCutOffPage();
+		mStepPagerStrip.setPageCount(mCurrentPageSequence.size() + 1); // + 1 = review step
+		mPagerAdapter.notifyDataSetChanged();
+		updateBottomBar();
+	}
+
+	private void updateBottomBar() {
+		int position = mPager.getCurrentItem();
+		if (position == mCurrentPageSequence.size()) {
+			mNextButton.setText(R.string.alkitabfeedback_finish);
+
+			mNextButton.setBackgroundResource(R.drawable.alkitabfeedback_finish_background);
+			TextViewCompat.setTextAppearance(mNextButton, R.style.alkitabfeedback_TextAppearanceFinish);
+		} else {
+			mNextButton.setText(mEditingAfterReview
+				? R.string.alkitabfeedback_review
+				: R.string.alkitabfeedback_next);
+
+			mNextButton.setTextColor(ResourcesCompat.getColorStateList(getResources(), R.color.alkitabfeedback_button_textcolor, getTheme()));
+			mNextButton.setBackgroundResource(R.drawable.alkitabfeedback_selectable_item_background);
+
+			mNextButton.setEnabled(position != mPagerAdapter.getCutOffPage());
+		}
+
+		mPrevButton.setVisibility(position <= 0 ? View.INVISIBLE : View.VISIBLE);
+	}
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		mWizardModel.unregisterListener(this);
+	}
+
+	@Override
+	protected void onSaveInstanceState(Bundle outState) {
+		super.onSaveInstanceState(outState);
+		outState.putBundle("model", mWizardModel.save());
+	}
+
+	@Override
+	public AbstractWizardModel onGetModel() {
+		return mWizardModel;
+	}
+
+	@Override
+	public void onEditScreenAfterReview(String key) {
+		for (int i = mCurrentPageSequence.size() - 1; i >= 0; i--) {
+			if (mCurrentPageSequence.get(i).getKey().equals(key)) {
+				mConsumePageSelectedEvent = true;
+				mEditingAfterReview = true;
+				mPager.setCurrentItem(i);
+				updateBottomBar();
+				break;
+			}
+		}
+	}
+
+	@Override
+	public void onPageDataChanged(Page page) {
+		if (page.isRequired()) {
+			if (recalculateCutOffPage()) {
+				mPagerAdapter.notifyDataSetChanged();
+				updateBottomBar();
+			}
+		}
+	}
+
+	@Override
+	public Page onGetPage(String key) {
+		return mWizardModel.findByKey(key);
+	}
+
+	private boolean recalculateCutOffPage() {
+		// Cut off the pager adapter at first required page that isn't completed
+		int cutOffPage = mCurrentPageSequence.size() + 1;
+		for (int i = 0; i < mCurrentPageSequence.size(); i++) {
+			Page page = mCurrentPageSequence.get(i);
+			if (page.isRequired() && !page.isCompleted()) {
+				cutOffPage = i;
+				break;
+			}
+		}
+
+		if (mPagerAdapter.getCutOffPage() != cutOffPage) {
+			mPagerAdapter.setCutOffPage(cutOffPage);
+			return true;
+		}
+
+		return false;
+	}
+
+	public class MyPagerAdapter extends FragmentStatePagerAdapter {
+		private int mCutOffPage;
+		private Fragment mPrimaryItem;
+
+		public MyPagerAdapter(FragmentManager fm) {
+			super(fm);
+		}
+
+		@Override
+		public Fragment getItem(int i) {
+			if (i >= mCurrentPageSequence.size()) {
+				return new ReviewFragment();
+			}
+
+			return mCurrentPageSequence.get(i).createFragment();
+		}
+
+		@Override
+		public int getItemPosition(Object object) {
+			// TODO: be smarter about this
+			if (object == mPrimaryItem) {
+				// Re-use the current fragment (its position never changes)
+				return POSITION_UNCHANGED;
+			}
+
+			return POSITION_NONE;
+		}
+
+		@Override
+		public void setPrimaryItem(ViewGroup container, int position, Object object) {
+			super.setPrimaryItem(container, position, object);
+			mPrimaryItem = (Fragment) object;
+		}
+
+		@Override
+		public int getCount() {
+			return Math.min(mCutOffPage + 1, mCurrentPageSequence.size() + 1);
+		}
+
+		public void setCutOffPage(int cutOffPage) {
+			if (cutOffPage < 0) {
+				cutOffPage = Integer.MAX_VALUE;
+			}
+			mCutOffPage = cutOffPage;
+		}
+
+		public int getCutOffPage() {
+			return mCutOffPage;
+		}
+	}
+
+	@Override
+	public Context getContext() {
 		return this;
 	}
 }

From c503a96cef1c6eecde200eaf0309ab76d67f3d9d Mon Sep 17 00:00:00 2001
From: Yuku on yuku8 <yukuku@gmail.com>
Date: Wed, 31 Aug 2016 02:59:59 +0800
Subject: [PATCH 09/15] Record sync events

---
 Alkitab/src/main/java/yuku/alkitab/base/sync/SyncRecorder.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncRecorder.java b/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncRecorder.java
index 894194740..eb0f5a8ee 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncRecorder.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/sync/SyncRecorder.java
@@ -96,6 +96,7 @@ public static void log(@NonNull final EventKind kind, @Nullable final String syn
 		}
 
 		S.getDb().insertSyncLog(Sqlitil.nowDateTime(), kind, syncSetName, params);
+		App.trackEvent("sync", kind.name());
 	}
 
 	static class LastSyncInfoEntryJson {

From ceabc3257dd1f6d59910f2a2af0d13f67f3ac95d Mon Sep 17 00:00:00 2001
From: Yuku on yuku8 <yukuku@gmail.com>
Date: Wed, 31 Aug 2016 03:25:32 +0800
Subject: [PATCH 10/15] Try to fix weird bug in Levenshtein

---
 .../yuku/alkitab/base/util/Levenshtein.java   | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/Alkitab/src/main/java/yuku/alkitab/base/util/Levenshtein.java b/Alkitab/src/main/java/yuku/alkitab/base/util/Levenshtein.java
index 5c1d198b6..a6d3be8f2 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/util/Levenshtein.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/util/Levenshtein.java
@@ -7,12 +7,16 @@ public class Levenshtein {
 
 	public static int distance(String s, String t) {
 		// d is a table with m+1 rows and n+1 columns
-		int m = s.length();
-		int n = t.length();
+		final int m = s.length();
+		final int n = t.length();
 
-		int[][] d = new int[m + 1][n + 1];
+		final int[][] d = new int[m + 1][n + 1];
 
 		for (int i = 0; i <= m; i++) {
+			// workaround for seemingly bad VM: http://stackoverflow.com/questions/37193263
+			if (d[i] == null) {
+				d[i] = new int[n + 1];
+			}
 			d[i][0] = i * deletion; // deletion
 		}
 
@@ -20,15 +24,15 @@ public static int distance(String s, String t) {
 			d[0][j] = j * insertion; // insertion
 		}
 
-		for (int j = 1; j <= n; j++) { // j adalah index t
-			for (int i = 1; i <= m; i++) { // i adalah index s
+		for (int j = 1; j <= n; j++) { // j is the index to t
+			for (int i = 1; i <= m; i++) { // i is the index to s
 				if (s.charAt(i - 1) == t.charAt(j - 1)) {
-					d[i][j] = d[i - 1][j - 1] + j + j; // makin jauh samanya, makin ga penting
+					d[i][j] = d[i - 1][j - 1] + j + j; // the longer the offset difference between the same character, the less relevant it is
 				} else {
 					d[i][j] = minimum(
-							d[i - 1][j] + deletion, // deletion
-							d[i][j - 1] + insertion + (j - i), // insertion
-							d[i - 1][j - 1] + substitution // substitution
+						d[i - 1][j] + deletion, // deletion
+						d[i][j - 1] + insertion + (j - i), // insertion
+						d[i - 1][j - 1] + substitution // substitution
 					);
 				}
 			}

From b729966eedba75d985d2b417fc74c71e44f32822 Mon Sep 17 00:00:00 2001
From: Yuku on yuku8 <yukuku@gmail.com>
Date: Wed, 31 Aug 2016 03:26:02 +0800
Subject: [PATCH 11/15] Modernize share list item

---
 .../src/main/res/layout/item_share_intent.xml | 105 +++++++++++-------
 1 file changed, 65 insertions(+), 40 deletions(-)

diff --git a/Alkitab/src/main/res/layout/item_share_intent.xml b/Alkitab/src/main/res/layout/item_share_intent.xml
index 931026312..d40f1feb0 100644
--- a/Alkitab/src/main/res/layout/item_share_intent.xml
+++ b/Alkitab/src/main/res/layout/item_share_intent.xml
@@ -1,46 +1,71 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+/* //device/apps/common/res/any/layout/resolve_list_item.xml
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:paddingLeft="10dp"
-    android:paddingRight="15dp" >
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?selectableItemBackground"
+	android:minHeight="?listPreferredItemHeightSmall"
+	android:orientation="horizontal"
+	android:paddingBottom="4dp"
+	android:paddingTop="4dp">
 
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="@android:dimen/app_icon_size"
-        android:layout_height="@android:dimen/app_icon_size"
-        android:scaleType="fitCenter"
-        tools:ignore="ContentDescription" />
+	<!-- Activity icon when presenting dialog
+		 Size will be filled in by ResolverActivity -->
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="24dp"
+		android:layout_height="24dp"
+		android:layout_gravity="start|center_vertical"
+		android:layout_marginBottom="12dp"
+		android:layout_marginStart="?listPreferredItemPaddingLeft"
+		android:layout_marginTop="12dp"
+		android:scaleType="fitCenter" />
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="vertical" >
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="start|center_vertical"
+		android:gravity="start|center_vertical"
+		android:orientation="vertical"
+		android:paddingEnd="?listPreferredItemPaddingRight"
+		android:paddingStart="?listPreferredItemPaddingLeft">
 
-        <!-- Activity name -->
+		<!-- Activity name -->
+		<TextView
+			android:id="@android:id/text1"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ellipsize="marquee"
+			android:maxLines="1"
+			android:minLines="1"
+			android:textAppearance="?android:textAppearanceMedium"
+			android:textColor="?android:textColorPrimary" />
 
-        <TextView
-            android:id="@android:id/text1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="2"
-            android:paddingLeft="10dp"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
+		<!-- Extended activity info to distinguish between duplicate activity names -->
+		<TextView
+			android:id="@android:id/text2"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ellipsize="marquee"
+			android:maxLines="1"
+			android:minLines="1"
+			android:textAppearance="?android:textAppearanceSmall" />
+	</LinearLayout>
+</LinearLayout>
 
-        <!-- Extended activity info to distinguish between duplicate activity names -->
-
-        <TextView
-            android:id="@android:id/text2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="2"
-            android:paddingLeft="10dp"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file

From c33faca90523c00edb87717951e58f22d686f07a Mon Sep 17 00:00:00 2001
From: Yuku on yuku8 <yukuku@gmail.com>
Date: Wed, 31 Aug 2016 03:26:31 +0800
Subject: [PATCH 12/15] Update translations

---
 Alkitab/src/main/res/values-cs/strings.xml | 1 +
 Alkitab/src/main/res/values-da/strings.xml | 1 +
 Alkitab/src/main/res/values-de/strings.xml | 1 +
 Alkitab/src/main/res/values-es/strings.xml | 1 +
 Alkitab/src/main/res/values-in/strings.xml | 8 ++++++--
 Alkitab/src/main/res/values-th/strings.xml | 1 +
 Alkitab/src/main/res/values/strings.xml    | 4 ++--
 7 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Alkitab/src/main/res/values-cs/strings.xml b/Alkitab/src/main/res/values-cs/strings.xml
index e71e38ffa..4349e7d13 100644
--- a/Alkitab/src/main/res/values-cs/strings.xml
+++ b/Alkitab/src/main/res/values-cs/strings.xml
@@ -249,6 +249,7 @@
   <string name="sn_menu_private_song_book">Soukromý zpěvník</string>
   <string name="sn_private_song_book_dialog_desc">Stáhnout neveřejné zpěvníky</string>
   <string name="sn_private_song_book_name_hint">Název zpěvníku</string>
+  <string name="sn_play_in_loop">Chcete přehrát smyčku, dokud se neukončí?</string>
   <!-- Content descriptions, for blind users -->
   <string name="desc_previous_day">Předchozí den</string>
   <string name="desc_next_day">Následující den</string>
diff --git a/Alkitab/src/main/res/values-da/strings.xml b/Alkitab/src/main/res/values-da/strings.xml
index 4033bd118..b67969a17 100644
--- a/Alkitab/src/main/res/values-da/strings.xml
+++ b/Alkitab/src/main/res/values-da/strings.xml
@@ -249,6 +249,7 @@
   <string name="sn_menu_private_song_book">Privat sangbog</string>
   <string name="sn_private_song_book_dialog_desc">Nedtag en privat (skjult) sangbog</string>
   <string name="sn_private_song_book_name_hint">Sangbogens navn</string>
+  <string name="sn_play_in_loop">Ønsker du at køre i ring, indtil du stopper den?</string>
   <!-- Content descriptions, for blind users -->
   <string name="desc_previous_day">Foregående dag</string>
   <string name="desc_next_day">Næste dag</string>
diff --git a/Alkitab/src/main/res/values-de/strings.xml b/Alkitab/src/main/res/values-de/strings.xml
index cafd881b0..462689164 100644
--- a/Alkitab/src/main/res/values-de/strings.xml
+++ b/Alkitab/src/main/res/values-de/strings.xml
@@ -249,6 +249,7 @@
   <string name="sn_menu_private_song_book">Privates Liederbuch</string>
   <string name="sn_private_song_book_dialog_desc">Ein privates (verstecktes) Liederbuch herunterladen</string>
   <string name="sn_private_song_book_name_hint">Liederbuchname</string>
+  <string name="sn_play_in_loop">In einer Endlosschleife abspielen, bis Wiedergabe gestoppt wird?</string>
   <!-- Content descriptions, for blind users -->
   <string name="desc_previous_day">Voriger Tag</string>
   <string name="desc_next_day">Nächster Tag</string>
diff --git a/Alkitab/src/main/res/values-es/strings.xml b/Alkitab/src/main/res/values-es/strings.xml
index d269a2611..982b96d0c 100644
--- a/Alkitab/src/main/res/values-es/strings.xml
+++ b/Alkitab/src/main/res/values-es/strings.xml
@@ -249,6 +249,7 @@
   <string name="sn_menu_private_song_book">Cancionero privado</string>
   <string name="sn_private_song_book_dialog_desc">Descargar un himnario privada (esconder)</string>
   <string name="sn_private_song_book_name_hint">Nombre del cancionero</string>
+  <string name="sn_play_in_loop">¿Quieres jugando bucle hasta que sea detenido?</string>
   <!-- Content descriptions, for blind users -->
   <string name="desc_previous_day">Día anterior</string>
   <string name="desc_next_day">Día siguiente</string>
diff --git a/Alkitab/src/main/res/values-in/strings.xml b/Alkitab/src/main/res/values-in/strings.xml
index adefe2bac..c01b7d1f0 100644
--- a/Alkitab/src/main/res/values-in/strings.xml
+++ b/Alkitab/src/main/res/values-in/strings.xml
@@ -30,8 +30,8 @@
   <string name="menuShareSplit0">Bagikan versi utama</string>
   <string name="menuShareSplit1">Bagikan versi belah</string>
   <string name="menuShareBothSplits">Bagikan keduanya</string>
-  <string name="tulis_catatan">Tulis catatan</string>
-  <string name="tambah_pembatas_buku">Tambah pembatas buku</string>
+  <string name="tulis_catatan">Catatan</string>
+  <string name="tambah_pembatas_buku">Pembatas buku</string>
   <string name="salin_ayat">Salin ayat</string>
   <string name="copy_split0">Salin versi utama</string>
   <string name="copy_split1">Salin versi belah</string>
@@ -249,6 +249,7 @@
   <string name="sn_menu_private_song_book">Buku lagu pribadi</string>
   <string name="sn_private_song_book_dialog_desc">Unduh buku lagu pribadi (tersembunyi)</string>
   <string name="sn_private_song_book_name_hint">Nama buku lagu</string>
+  <string name="sn_play_in_loop">Putar berulang-ulang sampai dihentikan?</string>
   <!-- Content descriptions, for blind users -->
   <string name="desc_previous_day">Hari sebelumnya</string>
   <string name="desc_next_day">Hari berikutnya</string>
@@ -316,10 +317,12 @@
   <string name="recentverses_button_hint">(Sentuh lama: buka riwayat)</string>
   <string name="dr_reminder">Pengingat</string>
   <string name="dr_error_contact_reminder">Kesalahan menghubungi aplikasi Pengingat.</string>
+  <string name="dv_activity_title">Widget Ayat Harian</string>
   <string name="dv_option_transparent_background">Latar belakang transparan</string>
   <string name="dv_option_dark_text">Teks gelap</string>
   <string name="dv_option_text_size">Ukuran teks</string>
   <!-- Reading plan -->
+  <string name="rp_activity_title">Rencana Baca</string>
   <string name="rp_menuReadingPlan">Rencana baca</string>
   <string name="rp_commentActual">Selesai: %s%%</string>
   <string name="rp_commentTarget">Target: %s%%</string>
@@ -445,6 +448,7 @@
   <string name="sync_sync_set_pref_summary_never">Belum pernah sync</string>
   <string name="sync_sync_set_pref_summary_syncing">Sedang sync&#8230;</string>
   <string name="sync_log_activity_title">Log sync</string>
+  <string name="sync_status_activity_title">Status Sync</string>
   <string name="sync_login_activity_title">Login atau buat akun</string>
   <string name="sync_login_survey_religion_select_one">Pilih agama</string>
   <string name="sync_login_survey_religion_christianity">Kristen</string>
diff --git a/Alkitab/src/main/res/values-th/strings.xml b/Alkitab/src/main/res/values-th/strings.xml
index 9d1493db3..d4135450a 100644
--- a/Alkitab/src/main/res/values-th/strings.xml
+++ b/Alkitab/src/main/res/values-th/strings.xml
@@ -249,6 +249,7 @@
   <string name="sn_menu_private_song_book">หนังสือเพลงส่วนตัว</string>
   <string name="sn_private_song_book_dialog_desc">ดาวน์โหลดหนังสือเพลงส่วนตัว (ซึ่งปิดบังอยู่)</string>
   <string name="sn_private_song_book_name_hint">ชื่อหนังสือเพลง</string>
+  <string name="sn_play_in_loop">ต้องการเปิดฟังอย่างวงต่อเนื่องจนกว่าจะกดหยุดหรือไม่?</string>
   <!-- Content descriptions, for blind users -->
   <string name="desc_previous_day">วันก่อน</string>
   <string name="desc_next_day">วันต่อไป</string>
diff --git a/Alkitab/src/main/res/values/strings.xml b/Alkitab/src/main/res/values/strings.xml
index 874d3c121..3e13d9d36 100644
--- a/Alkitab/src/main/res/values/strings.xml
+++ b/Alkitab/src/main/res/values/strings.xml
@@ -29,8 +29,8 @@
     <string name="menuShareSplit0">Share primary version</string>
     <string name="menuShareSplit1">Share secondary version</string>
     <string name="menuShareBothSplits">Share both versions</string>
-    <string name="tulis_catatan">Write note</string>
-    <string name="tambah_pembatas_buku">Add bookmark</string>
+    <string name="tulis_catatan">Note</string>
+    <string name="tambah_pembatas_buku">Bookmark</string>
     <string name="salin_ayat">Copy verse</string>
     <string name="copy_split0">Copy primary version</string>
     <string name="copy_split1">Copy secondary version</string>

From 7259674e678c3521f1aa8df238121349c7fa1b11 Mon Sep 17 00:00:00 2001
From: Yuku on yuku8 <yukuku@gmail.com>
Date: Wed, 31 Aug 2016 03:32:10 +0800
Subject: [PATCH 13/15] Auto-RTL compat support does not work. So editing share
 list item.

---
 .../src/main/res/layout/item_share_intent.xml | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/Alkitab/src/main/res/layout/item_share_intent.xml b/Alkitab/src/main/res/layout/item_share_intent.xml
index d40f1feb0..19916b9f2 100644
--- a/Alkitab/src/main/res/layout/item_share_intent.xml
+++ b/Alkitab/src/main/res/layout/item_share_intent.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-/* //device/apps/common/res/any/layout/resolve_list_item.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
+<?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
@@ -33,6 +16,7 @@
 		android:layout_height="24dp"
 		android:layout_gravity="start|center_vertical"
 		android:layout_marginBottom="12dp"
+		android:layout_marginLeft="?listPreferredItemPaddingLeft"
 		android:layout_marginStart="?listPreferredItemPaddingLeft"
 		android:layout_marginTop="12dp"
 		android:scaleType="fitCenter" />
@@ -44,6 +28,8 @@
 		android:gravity="start|center_vertical"
 		android:orientation="vertical"
 		android:paddingEnd="?listPreferredItemPaddingRight"
+		android:paddingLeft="?listPreferredItemPaddingLeft"
+		android:paddingRight="?listPreferredItemPaddingRight"
 		android:paddingStart="?listPreferredItemPaddingLeft">
 
 		<!-- Activity name -->

From 159fcd7ad9a79a99b909ea1a95fa17655018b860 Mon Sep 17 00:00:00 2001
From: Yuku on yuku8 <yukuku@gmail.com>
Date: Wed, 31 Aug 2016 03:50:01 +0800
Subject: [PATCH 14/15] Remove excessive content inset and title margin from
 Toolbar

---
 .../src/main/java/yuku/alkitab/base/IsiActivity.java  | 11 +++++------
 Alkitab/src/main/res/values/themes.xml                |  7 +++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.java
index 0558df793..dbfb3d414 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.java
@@ -426,12 +426,11 @@ public void onReceive(final Context context, final Intent intent) {
 
 		toolbar = V.get(this, R.id.toolbar);
 		setSupportActionBar(toolbar);
-		setTitle("");
-
-		final ActionBar actionBar = getSupportActionBar();
-		assert actionBar != null;
-		actionBar.setDisplayHomeAsUpEnabled(true);
-		actionBar.setHomeAsUpIndicator(R.drawable.ic_menu_white_24dp);
+		final ActionBar ab = getSupportActionBar();
+		assert ab != null;
+		ab.setDisplayHomeAsUpEnabled(true);
+		ab.setDisplayShowTitleEnabled(false);
+		ab.setHomeAsUpIndicator(R.drawable.ic_menu_white_24dp);
 
 		bGoto = V.get(this, R.id.bGoto);
 		bLeft = V.get(this, R.id.bLeft);
diff --git a/Alkitab/src/main/res/values/themes.xml b/Alkitab/src/main/res/values/themes.xml
index 07b03ae24..44ae620f7 100644
--- a/Alkitab/src/main/res/values/themes.xml
+++ b/Alkitab/src/main/res/values/themes.xml
@@ -9,6 +9,7 @@
         <item name="android:windowBackground">@color/window</item>
 		<item name="actionModeStyle">@style/SmallerTitleActionModeStyle</item>
 		<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+		<item name="toolbarStyle">@style/ToolbarStyle</item>
 	</style>
 
 	<style name="Theme.Alkitab.DialogWhenLarge.Base" parent="Theme.AppCompat.DialogWhenLarge">
@@ -34,6 +35,12 @@
 		<item name="android:textSize">16sp</item>
 	</style>
 
+	<style name="ToolbarStyle" parent="Widget.AppCompat.Toolbar">
+		<item name="contentInsetStart">?actionBarSize</item>
+		<item name="contentInsetStartWithNavigation">?actionBarSize</item>
+		<item name="titleMarginStart">0dp</item>
+	</style>
+
     <style name="Theme.Alkitab.Transparent.Base" parent="Theme.Alkitab">
 		<item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>

From 9c647a1b78ce43c1d5924c7929ab0935d70024ea Mon Sep 17 00:00:00 2001
From: Yuku on yuku8 <yukuku@gmail.com>
Date: Wed, 31 Aug 2016 03:50:52 +0800
Subject: [PATCH 15/15] 4.4.0-beta7

---
 Alkitab/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Alkitab/build.gradle b/Alkitab/build.gradle
index e06683400..834d461e3 100644
--- a/Alkitab/build.gradle
+++ b/Alkitab/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId 'yuku.alkitab.debug'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 14000266
-        versionName '4.4.0-beta6'
+        versionCode 14000267
+        versionName '4.4.0-beta7'
         multiDexEnabled true
         // Keep this synced with build.gradle resConfigs!
         resConfigs 'af', 'bg', 'cs', 'da', 'de', 'es', 'fr', 'in', 'ja', 'lv', 'ms', 'nl', 'pl', 'pt', 'ro', 'ru', 'th', 'uk', 'zh-rCN', 'zh-rTW'