Commit: 719b93dcc613c694ca6363ca5b7bfbd943e55692 - android_battery_logger (git)

Commit MetaInfo

• Revision: 719b93dcc613c694ca6363ca5b7bfbd943e55692 (tree)
• Time: 2014-06-02 03:11:42
• Author: Masahiko, SAWAI <say@user...>
• Commiter: Masahiko, SAWAI

Log Message

Added date format preference

Change Summary

• modified: simple-battery-logger/simple-battery-logger-app/res/values-ja/strings_preferences.xml
• add: simple-battery-logger/simple-battery-logger-app/res/values/arrays_date_format.xml
• modified: simple-battery-logger/simple-battery-logger-app/res/values/preferences_key_value.xml
• modified: simple-battery-logger/simple-battery-logger-app/res/values/strings_preferences.xml
• modified: simple-battery-logger/simple-battery-logger-app/res/xml/preferences.xml
• modified: simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/BatteryLoggerPreferenceActivity.java
• modified: simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/util/PreferenceUtils.java

Incremental Difference

--- a/simple-battery-logger/simple-battery-logger-app/res/values-ja/strings_preferences.xml
+++ b/simple-battery-logger/simple-battery-logger-app/res/values-ja/strings_preferences.xml
@@ -15,6 +15,12 @@
 	<string name="data_keeping_period">データ保管期間</string>
 	<string name="data_keeping_period_title">データ保管期間</string>
 
+	<string name="preferences_view_category_title">表示</string>
+	<string name="date_format">日付フォーマット</string>
+	<string name="date_format_title">日付フォーマット</string>
+	<string name="date_format_row">書式なし</string>
+	<string name="date_format_system">システム書式</string>
+
 	<string name="preferences_csv_category_title">CSV</string>
 	<string name="csv_auto_export_enabled_title">CSV 自動出力</string>
 	<string name="csv_auto_export_enabled_summary_on">CSV ファイルを毎日、自動的に出力します。</string>

--- /dev/null
+++ b/simple-battery-logger/simple-battery-logger-app/res/values/arrays_date_format.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string-array name="date_format_entries" >
+		<item>@string/date_format_row</item>
+		<item>@string/date_format_system</item>
+	</string-array>
+	<string-array name="date_format_values" >
+		<item>DATE_FORMAT_ROW</item>
+		<item>DATE_FORMAT_SYSTEM</item>
+	</string-array>
+</resources>

--- a/simple-battery-logger/simple-battery-logger-app/res/values/preferences_key_value.xml
+++ b/simple-battery-logger/simple-battery-logger-app/res/values/preferences_key_value.xml
@@ -10,6 +10,9 @@
 	<string name="data_keeping_period_key">data_keeping_period</string>
 	<string name="data_keeping_period_default_value">30</string>
 
+	<string name="date_format_key">date_format</string>
+	<string name="date_format_default_value">DATE_FORMAT_ROW</string>
+
 	<string name="csv_auto_export_enabled_key">csv_auto_export_enabled</string>
 	<bool name="csv_auto_export_enabled_default_value">true</bool>
 

--- a/simple-battery-logger/simple-battery-logger-app/res/values/strings_preferences.xml
+++ b/simple-battery-logger/simple-battery-logger-app/res/values/strings_preferences.xml
@@ -15,6 +15,12 @@
 	<string name="data_keeping_period">Data Keeping Period</string>
 	<string name="data_keeping_period_title">Data Keeping Period</string>
 
+	<string name="preferences_view_category_title">View</string>
+	<string name="date_format">Date Format</string>
+	<string name="date_format_title">Date Format</string>
+	<string name="date_format_row">Row Format</string>
+	<string name="date_format_system">System Format</string>
+
 	<string name="preferences_csv_category_title">CSV</string>
 	<string name="csv_auto_export_enabled_title">CSV Auto Export</string>
 	<string name="csv_auto_export_enabled_summary_on">The CSV file is automatically exported every day.</string>

--- a/simple-battery-logger/simple-battery-logger-app/res/xml/preferences.xml
+++ b/simple-battery-logger/simple-battery-logger-app/res/xml/preferences.xml
@@ -31,6 +31,18 @@
 	</PreferenceCategory>
 
 	<!-- CSV -->
+	<PreferenceCategory android:title="@string/preferences_view_category_title" >
+		<ListPreference
+			android:key="@string/date_format_key"
+			android:defaultValue="@string/date_format_default_value"
+			android:title="@string/date_format"
+			android:dialogTitle="@string/date_format_title"
+			android:entries="@array/date_format_entries"
+			android:entryValues="@array/date_format_values"
+		/>
+	</PreferenceCategory>
+
+	<!-- CSV -->
 	<PreferenceCategory android:title="@string/preferences_csv_category_title" >
 
 		<CheckBoxPreference

--- a/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/BatteryLoggerPreferenceActivity.java
+++ b/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/BatteryLoggerPreferenceActivity.java
@@ -62,6 +62,7 @@ public class BatteryLoggerPreferenceActivity extends PreferenceActivity
 	private String loggingServiceEnabledKey;
 	private String ignoreVoltageChangeOnlyKey;
 	private String dataKeepingPeriodKey;
+	private String dateFormatKey;
 	private String csvAutoExportEnabledKey;
 	private String csvExportDirectoryKey;
 	private String csvSortOrderKey;
@@ -79,6 +80,7 @@ public class BatteryLoggerPreferenceActivity extends PreferenceActivity
 		loggingServiceEnabledKey = getString(R.string.logging_service_enabled_key);
 		ignoreVoltageChangeOnlyKey = getString(R.string.ignore_voltage_change_only_key);
 		dataKeepingPeriodKey = getString(R.string.data_keeping_period_key);
+		dateFormatKey = getString(R.string.date_format_key);
 		csvAutoExportEnabledKey = getString(R.string.csv_auto_export_enabled_key);
 		csvExportDirectoryKey = getString(R.string.csv_export_directory_key);
 		csvSortOrderKey = getString(R.string.csv_sort_order_key);
@@ -212,6 +214,13 @@ public class BatteryLoggerPreferenceActivity extends PreferenceActivity
 			dataKeepingPeriodPreference.setSummary(entry);
 		}
 
+		if (key == null || key.equals(dateFormatKey))
+		{
+			ListPreference dateFormatPreference = (ListPreference) getPreferenceScreen().findPreference(dateFormatKey);
+			CharSequence entry = dateFormatPreference.getEntry();
+			dateFormatPreference.setSummary(entry);
+		}
+
 		if (key == null || key.equals(csvExportDirectoryKey))
 		{
 			EditTextPreference csvExportDirectoryPreference = (EditTextPreference) getPreferenceScreen().findPreference(csvExportDirectoryKey);

--- a/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/util/PreferenceUtils.java
+++ b/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/util/PreferenceUtils.java
@@ -122,6 +122,19 @@ public class PreferenceUtils
 		return dataKeepingPeriod;
 	}
 
+	public static String getDateFormat(Context context)
+	{
+		SharedPreferences sharedPreferences = getPrivateSharedPreferences(context);
+		Resources resources = context.getResources();
+
+		String key = resources.getString(R.string.date_format_key);
+		String defaultValue = resources.getString(R.string.date_format_default_value);
+		String value = sharedPreferences.getString(key, defaultValue);
+
+		Log.v(LOG_TAG, "dateFormat => " + value);
+		return value;
+	}
+
 	public static boolean isCsvAutoExportEnabled(Context context)
 	{
 		SharedPreferences sharedPreferences = getPrivateSharedPreferences(context);