From d8d79e85f1ae1a3dd77c0d2b0f94ed88e50390a1 Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Wed, 26 Jun 2013 01:45:33 +0400
Subject: [PATCH] history improvements

---
 .../res/drawable-xhdpi/kb_clock.png           | Bin 0 -> 2069 bytes
 .../res/drawable-xhdpi/kb_remove.png          | Bin 0 -> 679 bytes
 android-app-core/res/values/colors.xml        |   1 +
 android-app-core/res/values/text_strings.xml  |   1 +
 android-app-core/res/values/theme_gray.xml    |  11 +++-
 .../calculator/CalculatorPreferences.java     |   2 +
 android-app/res/layout/history_item.xml       |   4 +-
 android-app/res/layout/saved_history_item.xml |   4 +-
 android-app/res/menu/history_menu.xml         |   7 +++
 .../AbstractCalculatorHistoryFragment.java    |  58 +++++++++++++++---
 .../history/CalculatorHistoryFragment.java    |   9 ++-
 .../history/HistoryArrayAdapter.java          |  28 ++++++---
 12 files changed, 96 insertions(+), 29 deletions(-)
 create mode 100644 android-app-core/res/drawable-xhdpi/kb_clock.png
 create mode 100644 android-app-core/res/drawable-xhdpi/kb_remove.png

diff --git a/android-app-core/res/drawable-xhdpi/kb_clock.png b/android-app-core/res/drawable-xhdpi/kb_clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e933e686fa57c1fcccd8f8a0a8a1a1d9e07f936
GIT binary patch
literal 2069
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

literal 0
HcmV?d00001

diff --git a/android-app-core/res/drawable-xhdpi/kb_remove.png b/android-app-core/res/drawable-xhdpi/kb_remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..15c28f513dd4385344cd5b235427ed3afff9deae
GIT binary patch
literal 679
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPggqHc3$?K7O~fUknUP>Ygr+Ar-gY
z&f4h5<S62LUsUKXv+kQeg5LI=$%-Owf0ezx>kpkvDLl*{F=69`rluJeD-Rs9-L5h_
z@%dfb_lD)24jhV4w0J)*^U_S!o;{Uq`+ebgjywk#S{S!U$zRyJ&+Ul!)2-J93!52t
zR!#mA^HbZaJ&8e=gV}%~v0?qHzGq9Pc)HjGt+RjWc}bV$LX!Yn0>dE&9tVjAMv$7d
ztDn{$@VPWa$Zbl{JLRNZ-b@<*W~rPl%Vap}Z?=$aqvub-*7X_gtD{1f9#5Y4r$#8O
z{*CqOUHdLw_4bsPwyW>xm{@ss`lNSeSDtxYs_tUkFJau@QC!SyryBd_wT!{?ms_qb
zxY{u9*Y>LnObQH4QC9;0Z<BIhFm8}!U=(=Z?eN;OLPRkBp|rb>@}rPTMfxmj_EjYQ
z`Jx}yHUDDMo!bGQ?-}zH$Q}7Bz|+9M@j>l?W#0>+F*6tifZ9L2Kb-TL=~$slG0#M&
zhC-Q(GR`Sm6|S32+4Nk8S%$sPUWFN`b`NJkkFpg<149}Eivt6TiEN6om|>4{P*R5p
z6VKz0DH2MXS$A$-xMgpe)B}@_--=Qohxs-H%UpD1U@-uhps?Vl!0fFP0%azOIWG}P
z5OH5}RN$uWiKV<t-x=O!Xm`BBf0F@dem;}TqYgeM1+do`7&X~%oH@$#sN;%+(p-jS
z3nkOG8*bcI-^`}$+ny^?aHe^OJqyTizIKKd0jGVx*plB}P+j}Qv>TX;7(8A5T-G@y
GGywqWdj1>$

literal 0
HcmV?d00001

diff --git a/android-app-core/res/values/colors.xml b/android-app-core/res/values/colors.xml
index d9524fbf..8a18c6d2 100644
--- a/android-app-core/res/values/colors.xml
+++ b/android-app-core/res/values/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<color name="cpp_list_divider">#ffffffffff2e2e2e</color>
 	<color name="cpp_default_text_color">#ffffffff</color>
 	<color name="cpp_display_error_text_color">#ff393939</color>
 	<color name="cpp_button_text_color">#ffffffff</color>
diff --git a/android-app-core/res/values/text_strings.xml b/android-app-core/res/values/text_strings.xml
index 48ce605d..5a6e7b25 100644
--- a/android-app-core/res/values/text_strings.xml
+++ b/android-app-core/res/values/text_strings.xml
@@ -113,6 +113,7 @@
 	<string name="c_calc_color_display_summary">Toggles colouring and styling in calculator editor</string>
 	<string name="c_calc_theme_summary">Sets the theme for calculator</string>
 	<string name="c_clear_history">Clear history</string>
+	<string name="c_toggle_datetime">Show/hide date</string>
 	<string name="c_simplify_instead_of_numeric">Next constants are undefined: {0}!</string>
 
 	<string name="p_grouping_separator_no">No grouping separator</string>
diff --git a/android-app-core/res/values/theme_gray.xml b/android-app-core/res/values/theme_gray.xml
index c5adc6ea..55bdb2ee 100644
--- a/android-app-core/res/values/theme_gray.xml
+++ b/android-app-core/res/values/theme_gray.xml
@@ -31,12 +31,17 @@
 		<item name="android:padding">6dp</item>
 	</style>
 
-	<style name="cpp_default_fragment_list_view_item_style"></style>
+	<style name="cpp_default_fragment_list_view_item_style">
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:minHeight">50dp</item>
+		<item name="android:gravity">center_vertical|left</item>
+	</style>
 
 	<style name="cpp_default_fragment_list_view_style">
 		<item name="android:id">@android:id/list</item>
-		<item name="android:divider">@null</item>
-		<item name="android:dividerHeight">0dp</item>
+		<item name="android:dividerHeight">1dp</item>
+		<item name="android:divider">@color/cpp_list_divider</item>
 		<item name="android:cacheColorHint">@android:color/transparent</item>
 		<item name="android:layout_height">match_parent</item>
 		<item name="android:layout_width">match_parent</item>
diff --git a/android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java b/android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
index c6635de5..cb13f9fc 100644
--- a/android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
+++ b/android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
@@ -149,6 +149,7 @@ public final class CalculatorPreferences {
 
 	public static class History {
 		public static final Preference<Boolean> showIntermediateCalculations = BooleanPreference.of("history_show_intermediate_calculations", false);
+		public static final Preference<Boolean> showDatetime = BooleanPreference.of("history_show_datetime", true);
 	}
 
 
@@ -201,6 +202,7 @@ public final class CalculatorPreferences {
 
 		applyDefaultPreference(preferences, Graph.plotImag);
 		applyDefaultPreference(preferences, History.showIntermediateCalculations);
+		applyDefaultPreference(preferences, History.showDatetime);
 		applyDefaultPreference(preferences, Calculations.calculateOnFly);
 		applyDefaultPreference(preferences, Calculations.preferredAngleUnits);
 		applyDefaultPreference(preferences, Calculations.preferredNumeralBase);
diff --git a/android-app/res/layout/history_item.xml b/android-app/res/layout/history_item.xml
index ab21947b..071af8eb 100644
--- a/android-app/res/layout/history_item.xml
+++ b/android-app/res/layout/history_item.xml
@@ -8,9 +8,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:orientation="horizontal"
-			  style="?cpp_fragment_list_view_item_style"
-			  a:layout_width="match_parent"
-			  a:layout_height="wrap_content">
+			  style="?cpp_fragment_list_view_item_style">
 
 
 	<LinearLayout
diff --git a/android-app/res/layout/saved_history_item.xml b/android-app/res/layout/saved_history_item.xml
index 39731472..088407a8 100644
--- a/android-app/res/layout/saved_history_item.xml
+++ b/android-app/res/layout/saved_history_item.xml
@@ -8,9 +8,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 	a:orientation="vertical"
-	style="?cpp_fragment_list_view_item_style"
-	a:layout_width="fill_parent"
-	a:layout_height="fill_parent">
+	style="?cpp_fragment_list_view_item_style">
 
 	<TextView
 		a:id="@+id/history_time"
diff --git a/android-app/res/menu/history_menu.xml b/android-app/res/menu/history_menu.xml
index 85d01a6b..c4e7e913 100644
--- a/android-app/res/menu/history_menu.xml
+++ b/android-app/res/menu/history_menu.xml
@@ -8,8 +8,15 @@
 
 <menu xmlns:a="http://schemas.android.com/apk/res/android">
 
+	<item
+		a:id="@+id/history_menu_toggle_datetime"
+		a:icon="@drawable/kb_clock"
+		a:title="@string/c_toggle_datetime"
+		a:showAsAction="always" />
+
 	<item
 		a:id="@+id/history_menu_clear_history"
+		a:icon="@drawable/kb_remove"
 		a:title="@string/c_clear_history"
 		a:showAsAction="always" />
 
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/history/AbstractCalculatorHistoryFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/history/AbstractCalculatorHistoryFragment.java
index 0edc4e99..12340de3 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/history/AbstractCalculatorHistoryFragment.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/history/AbstractCalculatorHistoryFragment.java
@@ -7,7 +7,9 @@
 package org.solovyev.android.calculator.history;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v4.app.FragmentActivity;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -20,9 +22,8 @@ import com.actionbarsherlock.app.SherlockListFragment;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.solovyev.android.calculator.*;
+import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.jscl.JsclOperation;
 import org.solovyev.android.menu.*;
 import org.solovyev.android.sherlock.menu.SherlockMenuHelper;
@@ -33,10 +34,14 @@ import org.solovyev.common.filter.Filter;
 import org.solovyev.common.filter.FilterRulesChain;
 import org.solovyev.common.text.Strings;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
+import static org.solovyev.android.calculator.CalculatorEventType.clear_history_requested;
+
 /**
  * User: serso
  * Date: 10/15/11
@@ -80,12 +85,15 @@ public abstract class AbstractCalculatorHistoryFragment extends SherlockListFrag
 
 
 	@Nonnull
-	private ArrayAdapter<CalculatorHistoryState> adapter;
+	private HistoryArrayAdapter adapter;
 
 	@Nonnull
 	private CalculatorFragmentHelper fragmentHelper;
 
-	private ActivityMenu<Menu, MenuItem> menu = ListActivityMenu.fromResource(org.solovyev.android.calculator.R.menu.history_menu, HistoryMenu.class, SherlockMenuHelper.getInstance());
+	private ActivityMenu<Menu, MenuItem> menu = ListActivityMenu.fromResource(R.menu.history_menu, HistoryMenu.class, SherlockMenuHelper.getInstance());
+
+	@Nonnull
+	private final SharedPreferences.OnSharedPreferenceChangeListener preferencesListener = new HistoryOnPreferenceChangeListener();
 
 	protected AbstractCalculatorHistoryFragment(@Nonnull CalculatorFragmentType fragmentType) {
 		fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(fragmentType.getDefaultLayoutId(), fragmentType.getDefaultTitleResId(), false);
@@ -115,11 +123,12 @@ public abstract class AbstractCalculatorHistoryFragment extends SherlockListFrag
 	public void onViewCreated(View root, Bundle savedInstanceState) {
 		super.onViewCreated(root, savedInstanceState);
 
-		logDebug("onViewCreated");
+		final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
+		final Boolean showDatetime = CalculatorPreferences.History.showDatetime.getPreference(preferences);
 
 		fragmentHelper.onViewCreated(this, root);
 
-		adapter = new HistoryArrayAdapter(this.getActivity(), getItemLayoutId(), org.solovyev.android.calculator.R.id.history_item, new ArrayList<CalculatorHistoryState>());
+		adapter = new HistoryArrayAdapter(this.getActivity(), getItemLayoutId(), org.solovyev.android.calculator.R.id.history_item, new ArrayList<CalculatorHistoryState>(), showDatetime);
 		setListAdapter(adapter);
 
 		final ListView lv = getListView();
@@ -175,10 +184,13 @@ public abstract class AbstractCalculatorHistoryFragment extends SherlockListFrag
 		this.fragmentHelper.onResume(this);
 
 		updateAdapter();
+		PreferenceManager.getDefaultSharedPreferences(getActivity()).registerOnSharedPreferenceChangeListener(preferencesListener);
 	}
 
 	@Override
 	public void onPause() {
+		PreferenceManager.getDefaultSharedPreferences(getActivity()).unregisterOnSharedPreferenceChangeListener(preferencesListener);
+
 		this.fragmentHelper.onPause(this);
 
 		super.onPause();
@@ -281,7 +293,7 @@ public abstract class AbstractCalculatorHistoryFragment extends SherlockListFrag
 	protected abstract void clearHistory();
 
 	@Nonnull
-	protected ArrayAdapter<CalculatorHistoryState> getAdapter() {
+	protected HistoryArrayAdapter getAdapter() {
 		return adapter;
 	}
 
@@ -297,7 +309,6 @@ public abstract class AbstractCalculatorHistoryFragment extends SherlockListFrag
 					}
 				});
 				break;
-
 			case clear_history_requested:
 				getActivity().runOnUiThread(new Runnable() {
 					@Override
@@ -335,10 +346,19 @@ public abstract class AbstractCalculatorHistoryFragment extends SherlockListFrag
 
 	private static enum HistoryMenu implements IdentifiableMenuItem<MenuItem> {
 
-		clear_history(org.solovyev.android.calculator.R.id.history_menu_clear_history) {
+		clear_history(R.id.history_menu_clear_history) {
 			@Override
 			public void onClick(@Nonnull MenuItem data, @Nonnull Context context) {
-				Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.clear_history_requested, null);
+				Locator.getInstance().getCalculator().fireCalculatorEvent(clear_history_requested, null);
+			}
+		},
+
+		toggle_datetime(R.id.history_menu_toggle_datetime) {
+			@Override
+			public void onClick(@Nonnull MenuItem data, @Nonnull Context context) {
+				final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(CalculatorApplication.getInstance());
+				final Boolean showDatetime = CalculatorPreferences.History.showDatetime.getPreference(preferences);
+				CalculatorPreferences.History.showDatetime.putPreference(preferences, !showDatetime);
 			}
 		};
 
@@ -354,4 +374,22 @@ public abstract class AbstractCalculatorHistoryFragment extends SherlockListFrag
 			return this.itemId;
 		}
 	}
+
+	/*
+	**********************************************************************
+	*
+	*                           STATIC/INNER
+	*
+	**********************************************************************
+	*/
+
+	private final class HistoryOnPreferenceChangeListener implements SharedPreferences.OnSharedPreferenceChangeListener {
+
+		@Override
+		public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
+			if (CalculatorPreferences.History.showDatetime.isSameKey(key)) {
+				getAdapter().setShowDatetime(CalculatorPreferences.History.showDatetime.getPreference(preferences));
+			}
+		}
+	}
 }
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryFragment.java
index 59849f17..dce4e7fc 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryFragment.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryFragment.java
@@ -6,13 +6,14 @@
 
 package org.solovyev.android.calculator.history;
 
+import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import javax.annotation.Nonnull;
 import org.solovyev.android.calculator.CalculatorFragmentType;
 import org.solovyev.android.calculator.CalculatorPreferences;
 import org.solovyev.android.calculator.Locator;
 import org.solovyev.android.calculator.R;
 
+import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -35,8 +36,10 @@ public class CalculatorHistoryFragment extends AbstractCalculatorHistoryFragment
 	@Nonnull
 	@Override
 	protected List<CalculatorHistoryState> getHistoryItems() {
-		final boolean showIntermediateCalculations = CalculatorPreferences.History.showIntermediateCalculations.getPreference(PreferenceManager.getDefaultSharedPreferences(getActivity()));
-		return new ArrayList<CalculatorHistoryState>(Locator.getInstance().getHistory().getStates(showIntermediateCalculations));
+		final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
+		final boolean showIntermediateCalculations = CalculatorPreferences.History.showIntermediateCalculations.getPreference(preferences);
+		final List<CalculatorHistoryState> historyStates = Locator.getInstance().getHistory().getStates(showIntermediateCalculations);
+		return new ArrayList<CalculatorHistoryState>(historyStates);
 	}
 
 	@Override
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java b/android-app/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java
index 20576624..7cf5215a 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java
@@ -12,17 +12,15 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import javax.annotation.Nonnull;
-
-import org.solovyev.android.calculator.CalculatorActivityLauncher;
-import org.solovyev.android.calculator.CalculatorFragmentType;
 import org.solovyev.android.calculator.R;
 import org.solovyev.common.text.Strings;
 
+import javax.annotation.Nonnull;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
+import static android.view.View.GONE;
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 import static org.solovyev.android.calculator.CalculatorFragmentType.saved_history;
@@ -35,8 +33,11 @@ import static org.solovyev.android.calculator.history.AbstractCalculatorHistoryF
  */
 public class HistoryArrayAdapter extends ArrayAdapter<CalculatorHistoryState> {
 
-	HistoryArrayAdapter(Context context, int resource, int textViewResourceId, @Nonnull List<CalculatorHistoryState> historyList) {
+	private boolean showDatetime;
+
+	HistoryArrayAdapter(Context context, int resource, int textViewResourceId, @Nonnull List<CalculatorHistoryState> historyList, boolean showDatetime) {
 		super(context, resource, textViewResourceId, historyList);
+		this.showDatetime = showDatetime;
 	}
 
 	@Override
@@ -46,7 +47,13 @@ public class HistoryArrayAdapter extends ArrayAdapter<CalculatorHistoryState> {
 		final CalculatorHistoryState state = getItem(position);
 
 		final TextView time = (TextView) result.findViewById(R.id.history_time);
-		time.setText(new SimpleDateFormat().format(new Date(state.getTime())));
+		if (showDatetime) {
+			time.setVisibility(VISIBLE);
+			time.setText(new SimpleDateFormat().format(new Date(state.getTime())));
+		} else {
+			time.setVisibility(GONE);
+			time.setText(null);
+		}
 
 		final TextView editor = (TextView) result.findViewById(R.id.history_item);
 		editor.setText(AbstractCalculatorHistoryFragment.getHistoryText(state));
@@ -60,7 +67,7 @@ public class HistoryArrayAdapter extends ArrayAdapter<CalculatorHistoryState> {
 				commentLayout.setVisibility(VISIBLE);
 			} else {
 				commentView.setText(null);
-				commentLayout.setVisibility(INVISIBLE);
+				commentLayout.setVisibility(GONE);
 			}
 		}
 
@@ -94,4 +101,11 @@ public class HistoryArrayAdapter extends ArrayAdapter<CalculatorHistoryState> {
 		this.setNotifyOnChange(true);
 		super.notifyDataSetChanged();
 	}
+
+	public void setShowDatetime(boolean showDatetime) {
+		if (this.showDatetime != showDatetime) {
+			this.showDatetime = showDatetime;
+			notifyDataSetChanged();
+		}
+	}
 }