Commit: 33c43ca8019d3de907239f940664cd0866c55220 - android_battery_logger (git)

Commit MetaInfo

• Revision: 33c43ca8019d3de907239f940664cd0866c55220 (tree)
• Time: 2014-06-02 05:06:27
• Author: Masahiko, SAWAI <say@user...>
• Commiter: Masahiko, SAWAI

Log Message

Changed date and datetime format

Change Summary

• modified: simple-battery-logger/simple-battery-logger-app/res/values-ja/strings_preferences.xml
• modified: 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/src/org/routine_work/simple_battery_logger/BatteryUtils.java
• modified: simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/DatabaseDateListActivity.java
• modified: simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/DatabaseDateViewerActivity.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
@@ -18,7 +18,7 @@
 	<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_raw">書式なし</string>
 	<string name="date_format_system">システム書式</string>
 
 	<string name="preferences_csv_category_title">CSV</string>

--- a/simple-battery-logger/simple-battery-logger-app/res/values/arrays_date_format.xml
+++ b/simple-battery-logger/simple-battery-logger-app/res/values/arrays_date_format.xml
@@ -1,11 +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_raw</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>
+		<item>@string/date_format_value_raw</item>
+		<item>@string/date_format_value_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
@@ -11,7 +11,9 @@
 	<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="date_format_default_value">@string/date_format_value_raw</string>
+	<string name="date_format_value_raw">DATE_FORMAT_RAW</string>
+	<string name="date_format_value_system">DATE_FORMAT_SYSTEM</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
@@ -18,7 +18,7 @@
 	<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_raw">Raw Format</string>
 	<string name="date_format_system">System Format</string>
 
 	<string name="preferences_csv_category_title">CSV</string>

--- a/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/BatteryUtils.java
+++ b/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/BatteryUtils.java
@@ -24,8 +24,15 @@
 package org.routine_work.simple_battery_logger;
 
 import android.content.Context;
+import android.text.format.DateFormat;
+import android.util.Log;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import org.routine_work.simple_battery_logger.db.DBConstants;
+import org.routine_work.simple_battery_logger.util.PreferenceUtils;
 
 /**
  *
@@ -34,6 +41,7 @@ import java.util.Map;
 public class BatteryUtils
 {
 
+	private static final String LOG_TAG = "simple-battery-logger";
 	private static final Map<Integer, Integer> STATUS_CODE_AND_RESOURCE_MAP = new HashMap<Integer, Integer>();
 	private static final Map<Integer, Integer> HEALTH_CODE_AND_RESOURCE_MAP = new HashMap<Integer, Integer>();
 	private static final Map<Integer, Integer> PLUGGED_CODE_AND_RESOURCE_MAP = new HashMap<Integer, Integer>();
@@ -110,4 +118,63 @@ public class BatteryUtils
 		}
 		return pluggedText;
 	}
+
+	public static String getFormattedDate(Context context, String rawDateString)
+	{
+		String formattedDate = null;
+
+		String dateFormatValueSystem = context.getString(R.string.date_format_value_system);
+		if (dateFormatValueSystem.equals(PreferenceUtils.getDateFormat(context)))
+		{
+			SimpleDateFormat rawDateFormat = new SimpleDateFormat(DBConstants.DATE_FORMAT);
+			try
+			{
+				Date datetime = rawDateFormat.parse(rawDateString);
+
+				java.text.DateFormat dateFormat = DateFormat.getLongDateFormat(context);
+				formattedDate = dateFormat.format(datetime);
+			}
+			catch (ParseException ex)
+			{
+				Log.e(LOG_TAG, "Parse date failed.", ex);
+			}
+		}
+
+		if (formattedDate == null)
+		{
+			formattedDate = rawDateString;
+		}
+
+		return formattedDate;
+	}
+
+	public static String getFormattedDatetime(Context context, String rawDatetimeString)
+	{
+		String formattedDatetime = null;
+
+		String dateFormatValueSystem = context.getString(R.string.date_format_value_system);
+		if (dateFormatValueSystem.equals(PreferenceUtils.getDateFormat(context)))
+		{
+			SimpleDateFormat rawDatetimeFormat = new SimpleDateFormat(DBConstants.DATETIME_FORMAT);
+			try
+			{
+				Date datetime = rawDatetimeFormat.parse(rawDatetimeString);
+
+				java.text.DateFormat dateFormat = DateFormat.getDateFormat(context);
+				java.text.DateFormat timeFormat = DateFormat.getTimeFormat(context);
+				formattedDatetime = dateFormat.format(datetime) + " " + timeFormat.format(datetime);
+			}
+			catch (ParseException ex)
+			{
+				Log.e(LOG_TAG, "Parse datetime failed.", ex);
+			}
+		}
+
+		if (formattedDatetime == null)
+		{
+			formattedDatetime = rawDatetimeString;
+		}
+
+		return formattedDatetime;
+	}
 }

--- a/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/DatabaseDateListActivity.java
+++ b/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/DatabaseDateListActivity.java
@@ -32,6 +32,7 @@ import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Menu;
@@ -54,18 +55,20 @@ import org.routine_work.util.SystemResourceUtils;
 
 public class DatabaseDateListActivity extends ListActivity
 	implements SharedPreferences.OnSharedPreferenceChangeListener,
+	SimpleCursorAdapter.ViewBinder,
 	OnItemClickListener, DBConstants
 {
 
-	private static final int REQUEST_CODE_BATTERY_HISTORY_LIST_ACTIVITY = 100;
 	private static final String LOG_TAG = "simple-battery-logger";
 	private static final String[] MAPPING_FROM = new String[]
 	{
 		BatteryHistoryDate.Columns.DATE,
+		BatteryHistoryDate.Columns.DATE,
 	};
 	private static final int[] MAPPING_TO = new int[]
 	{
-		android.R.id.text1
+		android.R.id.text1, // for formatted date text
+		android.R.id.text2 // for raw date text
 	};
 	private BatteryHistoryDBHelper dbHelper;
 	private SQLiteDatabase db;
@@ -155,15 +158,17 @@ public class DatabaseDateListActivity extends ListActivity
 	public void onItemClick(AdapterView<?> parentView, View itemView, int position, long id)
 	{
 		Log.v(LOG_TAG, "Hello");
-		if (itemView instanceof TextView)
+		View text2View = itemView.findViewById(android.R.id.text2);
+		if (text2View instanceof TextView)
 		{
-			TextView dateTextView = (TextView) itemView;
-			String dateTextString = dateTextView.getText().toString();
-			Log.d(LOG_TAG, "clicked date text => " + dateTextString);
-			if (dateTextString != null && dateTextString.length() > 0)
+			TextView dateTextView = (TextView) text2View;
+			String rawDateText = dateTextView.getText().toString();
+			Log.d(LOG_TAG, "clicked date text => " + rawDateText);
+
+			if (TextUtils.isEmpty(rawDateText) == false)
 			{
 				Intent intent = new Intent(this, DatabaseDateViewerActivity.class);
-				intent.putExtra(DatabaseDateViewerActivity.EXTRA_DATE, dateTextString);
+				intent.putExtra(DatabaseDateViewerActivity.EXTRA_DATE, rawDateText);
 				startActivity(intent);
 			}
 		}
@@ -244,11 +249,12 @@ public class DatabaseDateListActivity extends ListActivity
 		switch (itemId)
 		{
 			case R.id.export_csv_menuitem:
-				if (menuInfo.targetView instanceof TextView)
+				View text2View = menuInfo.targetView.findViewById(android.R.id.text2);
+				if (text2View instanceof TextView)
 				{
-					TextView textView = (TextView) menuInfo.targetView;
-					String dateText = textView.getText().toString();
-					exportCsvFile(dateText);
+					TextView textView = (TextView) text2View;
+					String rawDateText = textView.getText().toString();
+					exportCsvFile(rawDateText);
 				}
 				result = true;
 				break;
@@ -260,6 +266,36 @@ public class DatabaseDateListActivity extends ListActivity
 		return result;
 	}
 
+	@Override
+	public boolean setViewValue(View view, Cursor cursor, int columnIndex)
+	{
+
+		String textValue = null;
+		if (columnIndex == cursor.getColumnIndex(BatteryHistoryDate.Columns.DATE))
+		{
+			if (android.R.id.text1 == view.getId())
+			{
+				String rawDateString = cursor.getString(columnIndex);
+				textValue = BatteryUtils.getFormattedDate(this, rawDateString);
+			}
+		}
+
+		if (textValue == null)
+		{
+			textValue = cursor.getString(columnIndex);
+		}
+
+		TextView textView = (TextView) view;
+		textView.setText(textValue);
+
+//		if (android.R.id.text2 == view.getId())
+//		{
+//			view.setVisibility(View.GONE);
+//		}
+
+		return true;
+	}
+
 	private void initializeListData()
 	{
 		Log.v(LOG_TAG, "Hello");
@@ -273,9 +309,11 @@ public class DatabaseDateListActivity extends ListActivity
 		cursor = dbHelper.getBatteryHistoryDateListCursor(db);
 
 		adapter = new SimpleCursorAdapter(this,
-			android.R.layout.simple_list_item_1,
+			android.R.layout.simple_list_item_2,
 			cursor, MAPPING_FROM, MAPPING_TO);
+		adapter.setViewBinder(this);
 		setListAdapter(adapter);
+
 		Log.v(LOG_TAG, "Bye");
 	}
 
@@ -308,15 +346,15 @@ public class DatabaseDateListActivity extends ListActivity
 		Log.v(LOG_TAG, " Bye");
 	}
 
-	private void exportCsvFile(String dateText)
+	private void exportCsvFile(String rawDateText)
 	{
 		Log.v(LOG_TAG, "Hello");
+		Log.d(LOG_TAG, "rawDateText => " + rawDateText);
 
-		Log.d(LOG_TAG, "dateText => " + dateText);
-		if (dateText != null)
+		if (TextUtils.isEmpty(rawDateText) == false)
 		{
 			Intent intent = new Intent(this, ExportOneDayDataCsvFileService.class);
-			intent.putExtra(ExportOneDayDataCsvFileService.EXTRA_DATE, dateText);
+			intent.putExtra(ExportOneDayDataCsvFileService.EXTRA_DATE, rawDateText);
 			startService(intent);
 		}
 

--- a/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/DatabaseDateViewerActivity.java
+++ b/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/DatabaseDateViewerActivity.java
@@ -199,7 +199,7 @@ public class DatabaseDateViewerActivity extends ListActivity
 	public boolean setViewValue(View view, Cursor cursor, int columnIndex)
 	{
 
-		String textValue = "?";
+		String textValue;
 		if (columnIndex == cursor.getColumnIndex(BatteryHistory.Columns.STATUS))
 		{
 			int statusCode = cursor.getInt(columnIndex);
@@ -210,6 +210,11 @@ public class DatabaseDateViewerActivity extends ListActivity
 			int pluggedCode = cursor.getInt(columnIndex);
 			textValue = BatteryUtils.getPluggedText(this, pluggedCode);
 		}
+		else if (columnIndex == cursor.getColumnIndex(BatteryHistory.Columns.DATETIME))
+		{
+			String datetimeString = cursor.getString(columnIndex);
+			textValue = BatteryUtils.getFormattedDatetime(this, datetimeString);
+		}
 		else if (columnIndex == cursor.getColumnIndex(BatteryHistory.Columns.TEMPERATURE))
 		{
 			int temperature = cursor.getInt(columnIndex);
@@ -243,6 +248,7 @@ public class DatabaseDateViewerActivity extends ListActivity
 			R.layout.battery_history_list_item, cursor, MAPPING_FROM, MAPPING_TO);
 		adapter.setViewBinder(this);
 		setListAdapter(adapter);
+
 		Log.v(LOG_TAG, "Bye");
 	}