• R/O
  • SSH
  • HTTPS

fuel-checker: Commit


Commit MetaInfo

Revisão64 (tree)
Hora2011-11-08 02:58:05
Autorkmotoki

Mensagem de Log

(mensagem de log vazia)

Mudança Sumário

Diff

--- jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/UpdateActivity.java (revision 63)
+++ jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/UpdateActivity.java (revision 64)
@@ -16,10 +16,10 @@
1616 */
1717 package jp.ne.motoki.android.fuelchecker;
1818
19+import android.content.Intent;
20+import android.database.Cursor;
1921 import android.os.Bundle;
2022
21-
22-
2323 /**
2424 * @author kiyoshi.motoki
2525 *
@@ -26,7 +26,9 @@
2626 */
2727 public class UpdateActivity extends FuelCheckerActivity {
2828
29- private long originalDatetime = -1;
29+ private static final long NO_DATA = -1;
30+
31+ private long originalDatetime = NO_DATA;
3032
3133 /** Called when the activity is first created. */
3234 @Override
@@ -45,4 +47,26 @@
4547 adapter.close();
4648 }
4749 }
50+
51+ /* (non-Javadoc)
52+ * @see jp.ne.motoki.android.fuelchecker.FuelCheckerActivity#createData()
53+ */
54+ @Override
55+ protected FuelData createData() {
56+ Intent intent = getIntent();
57+ originalDatetime = intent.getLongExtra(Utils.EXTRA_DATETIME, NO_DATA);
58+
59+ if (originalDatetime == NO_DATA) {
60+ throw new IllegalStateException("Intent hasn't content extra.");
61+ }
62+
63+ FuelDbAdapter adapter = new FuelDbAdapter(this);
64+ try {
65+ adapter.open();
66+ Cursor cursor = adapter.fetchData(originalDatetime);
67+ return FuelData.Factory.createInstance(cursor);
68+ } finally {
69+ adapter.close();
70+ }
71+ }
4872 }
--- jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/InsertActivity.java (revision 63)
+++ jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/InsertActivity.java (revision 64)
@@ -42,4 +42,12 @@
4242 adapter.close();
4343 }
4444 }
45+
46+ /* (non-Javadoc)
47+ * @see jp.ne.motoki.android.fuelchecker.FuelCheckerActivity#createData()
48+ */
49+ @Override
50+ protected FuelData createData() {
51+ return new FuelData();
52+ }
4553 }
--- jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/FuelListActivity.java (revision 63)
+++ jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/FuelListActivity.java (revision 64)
@@ -17,7 +17,6 @@
1717 package jp.ne.motoki.android.fuelchecker;
1818
1919 import jp.ne.motoki.android.fuelchecker.DBConstants.Column;
20-import android.app.Activity;
2120 import android.app.AlertDialog;
2221 import android.app.ListActivity;
2322 import android.content.DialogInterface;
@@ -137,18 +136,6 @@
137136 adapter.close();
138137 }
139138
140- @Override
141- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
142- // TODO Auto-generated method stub
143- switch (requestCode) {
144- case REQUEST_UPDATE:
145- Toast.makeText(this, "resultCode = " + (resultCode == Activity.RESULT_CANCELED ? "RESULT_CANCELED" : "Othre"), Toast.LENGTH_LONG).show();
146- break;
147- default:
148- throw new AssertionError("requestCode = " + requestCode);
149- }
150- }
151-
152139 private void update(long datetime) {
153140 Intent intent = new Intent(this, UpdateActivity.class);
154141 intent.putExtra(Utils.EXTRA_DATETIME, datetime);
--- jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/FuelCheckerActivity.java (revision 63)
+++ jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/FuelCheckerActivity.java (revision 64)
@@ -50,7 +50,7 @@
5050
5151 private final Intent INTENT_CALL_LIST = new Intent();
5252
53- private FuelData fuelData = new FuelData();
53+ private FuelData fuelData = null;
5454
5555 private DatePickerDialogPreference datePreference = null;
5656 private TimePickerDialogPreference timePreference = null;
@@ -133,6 +133,8 @@
133133 distancePreference =
134134 (NumericPickerDialogPreference) findPreference(PREF_KEY_DISTANCE);
135135
136+ fuelData = createData();
137+
136138 Calendar calendar = fuelData.getDatetime();
137139 datePreference.setValue(calendar);
138140 timePreference.setValue(calendar);
@@ -197,6 +199,8 @@
197199 throw new AssertionError("id = " + id);
198200 }
199201 }
202+
203+ protected abstract FuelData createData();
200204
201205 protected void onClickButtonRegister() {
202206 if (!isValidData()) {
--- jp.ne.motoki.android.fuelchecker/res/values-ja/strings.xml (revision 63)
+++ jp.ne.motoki.android.fuelchecker/res/values-ja/strings.xml (nonexistent)
@@ -1,69 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<!-- Copyright (C) 2011 kiyoshi.motoki
3-
4- This program is free software: you can redistribute it and/or modify
5- it under the terms of the GNU General Public License as published by
6- the Free Software Foundation, either version 3 of the License, or
7- any later version.
8-
9- This program is distributed in the hope that it will be useful,
10- but WITHOUT ANY WARRANTY; without even the implied warranty of
11- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12- GNU General Public License for more details.
13-
14- You should have received a copy of the GNU General Public License
15- along with this program. If not, see <http://www.gnu.org/licenses/>.
16--->
17-<resources>
18- <string name="app_name">燃費チェッカー</string>
19-
20- <string name="title_date_and_time">日時</string>
21-
22- <string name="title_date">給油日</string>
23- <string name="summary_date">給油した日付を\nセットしてください。</string>
24-
25- <string name="title_time">時間</string>
26- <string name="summary_time">給油した時間を\nセットしてください。</string>
27-
28- <string name="title_fuel_information">給油情報</string>
29-
30- <string name="title_quantity">給油量</string>
31- <string name="summary_quantity">給油量をセットしてください。</string>
32- <string name="unit_quantity">ℓ</string>
33-
34- <string name="title_distance">走行距離</string>
35- <string name="summary_distance">前回、給油してからの走行距離を\nセットしてください。</string>
36- <string name="unit_distance">km</string>
37-
38- <string name="title_efficiency">燃費</string>
39- <string name="unit_efficiency">km/ℓ</string>
40-
41- <string name="text_button_save">保存</string>
42- <string name="text_button_update">編集</string>
43- <string name="text_button_delete">削除</string>
44- <string name="text_button_cancel">キャンセル</string>
45-
46- <string name="title_confirm_dialog">確認</string>
47- <string name="text_confirm_dialog_insert">以下のデータを登録します。よろしいですか?</string>
48- <string name="text_confirm_dialog_delete">以下のデータを削除します。よろしいですか?</string>
49-
50- <string name="text_complete_registration">登録が完了しました。</string>
51- <string name="text_registration_failed">同一日時のデータを重複して登録することはできません。</string>
52-
53- <string name="title_menu_graph">グラフ</string>
54- <string name="title_menu_list">リスト</string>
55-
56- <string name="message_0_quantity">給油量は0ℓより多くなければなりません。</string>
57-
58- <string name="message_no_data">データが登録されていません。</string>
59-
60- <string name="title_chart">燃費チェッカー</string>
61- <string name="key_fuel_efficiency">燃費(km/ℓ)</string>
62-
63- <string name="message_no_data">データがありません。</string>
64-
65- <string name="text_confirm_connect_market">この機能を使うにはChartExpertが必要です。</string>
66- <string name="text_button_connect">マーケットを開く</string>
67-
68- <string name="text_delete_complete">データを削除しました。</string>
69-</resources>
--- jp.ne.motoki.android.fuelchecker/res/values-ja/arrays.xml (revision 63)
+++ jp.ne.motoki.android.fuelchecker/res/values-ja/arrays.xml (nonexistent)
@@ -1,7 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<resources>
3- <string-array name="text_button_execute">
4- <item>保存</item>
5- <item>変更</item>
6- </string-array>
7-</resources>
--- jp.ne.motoki.android.fuelchecker/res/values/arrays.xml (revision 63)
+++ jp.ne.motoki.android.fuelchecker/res/values/arrays.xml (revision 64)
@@ -1,7 +1,5 @@
11 <?xml version="1.0" encoding="utf-8"?>
22 <resources>
33 <string-array name="text_button_execute">
4- <item>save</item>
5- <item>update</item>
64 </string-array>
75 </resources>
--- jp.ne.motoki.android.fuelchecker/res/values/strings.xml (revision 63)
+++ jp.ne.motoki.android.fuelchecker/res/values/strings.xml (revision 64)
@@ -15,58 +15,57 @@
1515 along with this program. If not, see <http://www.gnu.org/licenses/>.
1616 -->
1717 <resources>
18- <string name="app_name">Fuel Checker</string>
18+ <string name="app_name">燃費チェッカー</string>
1919
20- <string name="title_date_and_time">Date and Time</string>
20+ <string name="title_date_and_time">日時</string>
2121
22- <string name="title_date">Date</string>
23- <string name="summary_date">Please set a date that fueling.</string>
22+ <string name="title_date">給油日</string>
23+ <string name="summary_date">給油した日付を\nセットしてください。</string>
2424
25- <string name="title_time">Time</string>
26- <string name="summary_time">Please set a time that fueling.</string>
25+ <string name="title_time">時間</string>
26+ <string name="summary_time">給油した時間を\nセットしてください。</string>
2727
28- <string name="title_fuel_information">Fuel Information</string>
28+ <string name="title_fuel_information">給油情報</string>
2929
30- <string name="title_quantity">Quantity</string>
31- <string name="summary_quantity">Please set a quantity of oil.</string>
32- <string name="unit_quantity">gal</string>
30+ <string name="title_quantity">給油量</string>
31+ <string name="summary_quantity">給油量をセットしてください。</string>
32+ <string name="unit_quantity">ℓ</string>
3333
34- <string name="title_distance">Distance</string>
35- <string name="summary_distance">Please set a distance\n that your car ran\n duaring the previous fueling.</string>
36- <string name="unit_distance">mi</string>
34+ <string name="title_distance">走行距離</string>
35+ <string name="summary_distance">前回、給油してからの走行距離を\nセットしてください。</string>
36+ <string name="unit_distance">km</string>
3737
38- <string name="title_efficiency">Fuel Efficiency</string>
39- <string name="unit_efficiency">mi/gal</string>
38+ <string name="title_efficiency">燃費</string>
39+ <string name="unit_efficiency">km/ℓ</string>
4040
4141 <string name="text_button_ok">OK</string>
4242
43- <string name="text_button_save">Save</string>
44- <string name="text_button_update">Update</string>
45- <string name="text_button_delete">Delete</string>
46- <string name="text_button_cancel">Cancel</string>
43+ <string name="text_button_save">保存</string>
44+ <string name="text_button_update">編集</string>
45+ <string name="text_button_delete">削除</string>
46+ <string name="text_button_cancel">キャンセル</string>
4747
48- <string name="title_confirm_dialog">Confirm</string>
49- <string name="text_confirm_dialog_insert">Are you sure to register to below data?</string>
50- <string name="text_confirm_dialog_delete">Are you sure to delete to below data?</string>
51- <string name="text_confirm_dialog_body">\t%1$s\t=\t%2$s</string>
48+ <string name="title_confirm_dialog">確認</string>
49+ <string name="text_confirm_dialog_insert">以下のデータを登録します。よろしいですか?</string>
50+ <string name="text_confirm_dialog_delete">以下のデータを削除します。よろしいですか?</string>
5251
53- <string name="text_complete_registration">Registration is complete.</string>
54- <string name="text_registration_failed">You cannot register the data at the same date and time.</string>
52+ <string name="text_complete_registration">登録が完了しました。</string>
53+ <string name="text_registration_failed">同一日時のデータを重複して登録することはできません。</string>
5554
56- <string name="title_menu_graph">Graph</string>
57- <string name="title_menu_list">List</string>
55+ <string name="title_menu_graph">グラフ</string>
56+ <string name="title_menu_list">リスト</string>
5857
58+ <string name="message_0_quantity">給油量は0ℓより多くなければなりません。</string>
5959
60- <string name="message_0_quantity">Amount of oil must be greater than 0gal.</string>
61- <string name="message_no_data">No data registered.</string>
60+ <string name="message_no_data">データが登録されていません。</string>
6261
63- <string name="title_chart">Fuel-Checker</string>
64- <string name="key_fuel_efficiency">Fuel efficiency(mi/gal)</string>
62+ <string name="title_chart">燃費チェッカー</string>
63+ <string name="key_fuel_efficiency">燃費(km/ℓ)</string>
6564
66- <string name="message_no_data">No data.</string>
65+ <string name="message_no_data">データがありません。</string>
6766
68- <string name="text_confirm_connect_market">To use this feature, you must have ChartExpert.</string>
69- <string name="text_button_connect">Open Market</string>
67+ <string name="text_confirm_connect_market">この機能を使うにはChartExpertが必要です。</string>
68+ <string name="text_button_connect">マーケットを開く</string>
7069
71- <string name="text_delete_complete">Removed the data.</string>
70+ <string name="text_delete_complete">データを削除しました。</string>
7271 </resources>
Show on old repository browser