Commit: 5f02698dbf16aa11983da58dec22baaeea94f29a - android_battery_logger (git)

Commit MetaInfo

• Revision: 5f02698dbf16aa11983da58dec22baaeea94f29a (tree)
• Time: 2014-05-28 04:52:52
• Author: Masahiko, SAWAI <say@user...>
• Commiter: Masahiko, SAWAI

Log Message

Added init preferences function

Change Summary

• modified: simple-battery-logger/simple-battery-logger-app/AndroidManifest.xml
• modified: simple-battery-logger/simple-battery-logger-app/res/layout/delete_all_csv_file_activity.xml
• add: simple-battery-logger/simple-battery-logger-app/res/layout/initialize_preference_activity.xml
• modified: simple-battery-logger/simple-battery-logger-app/res/values-ja/strings.xml
• modified: simple-battery-logger/simple-battery-logger-app/res/values-ja/strings_preferences.xml
• modified: simple-battery-logger/simple-battery-logger-app/res/values/strings.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
• add: simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/InitializePreferenceActivity.java
• modified: simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/service/AllCsvFileMediaScanService.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/AndroidManifest.xml
+++ b/simple-battery-logger/simple-battery-logger-app/AndroidManifest.xml
@@ -69,6 +69,13 @@
 			android:theme="@android:style/Theme.Dialog"
 		/>
 
+		<!-- Initialize Preference Activity -->
+		<activity
+			android:name=".InitializePreferenceActivity"
+			android:label="@string/delete_data"
+			android:theme="@android:style/Theme.Dialog"
+		/>
+
 		<!-- Debug Function Activity -->
 		<activity android:name=".debug.DebugActivity" />
 

--- a/simple-battery-logger/simple-battery-logger-app/res/layout/delete_all_csv_file_activity.xml
+++ b/simple-battery-logger/simple-battery-logger-app/res/layout/delete_all_csv_file_activity.xml
@@ -13,8 +13,8 @@
 		android:layout_weight="1"
 		android:padding="4dip"
 		android:gravity="center"
-		android:textColor="?android:textColorPrimary"
 		android:text="@string/delete_csv_file_no_file_message"
+		android:textColor="?android:textColorPrimary"
 		android:textSize="18sp"
 	/>
 
@@ -41,5 +41,4 @@
 			android:text="@android:string/ok"
 		/>
 	</LinearLayout>
-</LinearLayout>
-
+</LinearLayout>
\ No newline at end of file

--- /dev/null
+++ b/simple-battery-logger/simple-battery-logger-app/res/layout/initialize_preference_activity.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	style="@style/body"
+	android:orientation="vertical"
+>
+	<View style="@style/hline" />
+
+	<TextView
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:padding="4dip"
+		android:gravity="center"
+		android:text="@string/initialize_preference_confirm_message"
+		android:textColor="?android:textColorPrimary"
+		android:textSize="18sp"
+	/>
+
+	<View style="@style/hline" />
+
+	<LinearLayout 
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="0"
+	>
+		<Button
+			android:id="@+id/cancel_button"
+			android:layout_width="0dip"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:text="@android:string/cancel"
+		/>
+		<Button
+			android:id="@+id/ok_button"
+			android:layout_width="0dip"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:text="@android:string/ok"
+		/>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file

--- a/simple-battery-logger/simple-battery-logger-app/res/values-ja/strings.xml
+++ b/simple-battery-logger/simple-battery-logger-app/res/values-ja/strings.xml
@@ -4,7 +4,6 @@
 	<!-- common-->
 	<string name="no_data">データがありません</string>
 	<string name="quit">終了</string>
-	<string name="etc">その他</string>
 	<string name="send">送信</string>
 
 	<string name="export_csv_file">CSV ファイルに出力</string>

--- 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
@@ -38,4 +38,12 @@
 	<string name="csv_dropbox_uploader_title">Dropbox アップローダ</string>
 	<string name="csv_dropbox_uploader_summary">CSV ファイルを Dropbox へアップロードする設定をします。</string>
 
+	<!-- Etc Category -->
+	<string name="etc_category_title">その他</string>
+	<!-- Initialize Preferences -->
+	<string name="initialize_preference">設定を初期化</string>
+	<string name="initialize_preference_title">設定を初期化</string>
+	<string name="initialize_preference_summary">すべての設定を初期化します。</string>
+	<string name="initialize_preference_confirm_message">すべての設定は規定の値に初期化されます。</string>
+
 </resources>

--- a/simple-battery-logger/simple-battery-logger-app/res/values/strings.xml
+++ b/simple-battery-logger/simple-battery-logger-app/res/values/strings.xml
@@ -4,7 +4,6 @@
 	<!-- common-->
 	<string name="no_data">No Data</string>
 	<string name="quit">Quit</string>
-	<string name="etc">Etc</string>
 	<string name="send">Send</string>
 
 	<string name="export_csv_file">Export CSV File</string>

--- 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
@@ -36,4 +36,12 @@
 	<string name="csv_dropbox_uploader_title">Dropbox Uploader</string>
 	<string name="csv_dropbox_uploader_summary">Set up to upload CSV file to Dropbox.</string>
 
+	<!-- Etc Category -->
+	<string name="etc_category_title">Etc</string>
+	<!-- Initialize Preferences -->
+	<string name="initialize_preference">Initialize Preferences</string>
+	<string name="initialize_preference_title">Initialize Preferences</string>
+	<string name="initialize_preference_summary">All preference values are initialized.</string>
+	<string name="initialize_preference_confirm_message">All the preference values will be initialized by default value. The current data are deleted.</string>
+
 </resources>

--- a/simple-battery-logger/simple-battery-logger-app/res/xml/preferences.xml
+++ b/simple-battery-logger/simple-battery-logger-app/res/xml/preferences.xml
@@ -102,8 +102,19 @@
 	</PreferenceCategory>
 
 	<PreferenceCategory
-		android:title="@string/etc"
+		android:title="@string/etc_category_title"
 	>
+		<PreferenceScreen
+			android:title="@string/initialize_preference_title"
+			android:summary="@string/initialize_preference_summary"
+		>
+			<intent
+				android:action="android.intent.action.MAIN"
+				android:targetPackage="org.routine_work.simple_battery_logger"
+				android:targetClass="org.routine_work.simple_battery_logger.InitializePreferenceActivity"
+			/>
+		</PreferenceScreen>
+
 		<PreferenceScreen 
 			android:key="about_app_screen"
 			android:title="@string/about_app_title"

--- 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
@@ -44,6 +44,7 @@ import android.widget.Toast;
 import java.io.File;
 import java.util.List;
 import org.routine_work.simple_battery_logger.db.DBConstants;
+import org.routine_work.simple_battery_logger.service.AllCsvFileMediaScanService;
 import org.routine_work.simple_battery_logger.service.ServiceUtils;
 import org.routine_work.simple_battery_logger.util.PreferenceUtils;
 import org.routine_work.util.SystemResourceUtils;
@@ -179,6 +180,11 @@ public class BatteryLoggerPreferenceActivity extends PreferenceActivity
 		else if (csvExportDirectoryKey.equals(key))
 		{
 			PreferenceUtils.exportCsvExportDirectoryName(this);
+
+			// Scan new export csv directory
+			PreferenceUtils.putCsvMediaScanCompleted(this, false);
+			Intent intent = new Intent(getApplicationContext(), AllCsvFileMediaScanService.class);
+			startService(intent);
 		}
 
 		updateSummary(key);
@@ -188,11 +194,17 @@ public class BatteryLoggerPreferenceActivity extends PreferenceActivity
 
 	private void updateAllSummary()
 	{
+		Log.v(LOG_TAG, "Hello");
+
 		updateSummary(null);
+
+		Log.v(LOG_TAG, "Bye");
 	}
 
 	private void updateSummary(String key)
 	{
+		Log.v(LOG_TAG, "Hello");
+
 		if (key == null || key.equals(dataKeepingPeriodKey))
 		{
 			ListPreference dataKeepingPeriodPreference = (ListPreference) getPreferenceScreen().findPreference(dataKeepingPeriodKey);
@@ -224,6 +236,8 @@ public class BatteryLoggerPreferenceActivity extends PreferenceActivity
 			}
 			csvSortOrderListPreference.setSummary(summary);
 		}
+
+		Log.v(LOG_TAG, "Bye");
 	}
 
 	private void updateDropboxUploaderPreference()

--- /dev/null
+++ b/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/InitializePreferenceActivity.java
@@ -0,0 +1,70 @@
+/*
+ *  The MIT License
+ *
+ *  Copyright 2014 Masahiko, SAWAI <[e-mail]>.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+package org.routine_work.simple_battery_logger;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import org.routine_work.simple_battery_logger.util.PreferenceUtils;
+import org.routine_work.util.Log;
+
+public class InitializePreferenceActivity extends Activity implements OnClickListener
+{
+
+	private static final String LOG_TAG = "simple-battery-logger";
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.initialize_preference_activity);
+
+		Button okButton = (Button) findViewById(R.id.ok_button);
+		okButton.setOnClickListener(this);
+		Button cancelButton = (Button) findViewById(R.id.cancel_button);
+		cancelButton.setOnClickListener(this);
+	}
+
+	@Override
+	public void onClick(View view)
+	{
+		int id = view.getId();
+		switch (id)
+		{
+			case R.id.ok_button:
+				Log.d(LOG_TAG, "ok_button is clicked");
+				PreferenceUtils.reset(this);
+				setResult(RESULT_OK);
+				finish();
+				break;
+			case R.id.cancel_button:
+				Log.d(LOG_TAG, "cancel_button is clicked");
+				finish();
+				setResult(RESULT_CANCELED);
+				break;
+		}
+	}
+}

--- a/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/service/AllCsvFileMediaScanService.java
+++ b/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/service/AllCsvFileMediaScanService.java
@@ -59,7 +59,7 @@ public class AllCsvFileMediaScanService extends IntentService
 		Log.i(LOG_TAG, "AllCsvFileMediaScanService : Start at " + new Date());
 
 		Context context = this.getApplicationContext();
-		if (PreferenceUtils.isCsvAutoExportEnabled(context) == false)
+		if (PreferenceUtils.isCsvMediaScanCompleted(context) == false)
 		{
 			String csvExportDirectoryName = PreferenceUtils.getCsvExportDirectoryName(context);
 			File externalStorageDirectory = Environment.getExternalStorageDirectory();

--- 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
@@ -209,4 +209,16 @@ public class PreferenceUtils
 		editor.putBoolean(key, value);
 		editor.commit();
 	}
+
+	public static void reset(Context context)
+	{
+		Log.v(LOG_TAG, "Hello");
+
+		SharedPreferences sharedPreferences = getPrivateSharedPreferences(context);
+		SharedPreferences.Editor edit = sharedPreferences.edit();
+		edit.clear();
+		edit.commit();
+
+		Log.v(LOG_TAG, "Bye");
+	}
 }