diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..9a54521 --- /dev/null +++ b/NOTICE @@ -0,0 +1,190 @@ + + Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + diff --git a/res/layout/datetime_picker_dialog.xml b/res/layout/datetime_picker_dialog.xml deleted file mode 100644 index f65ed33..0000000 --- a/res/layout/datetime_picker_dialog.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 194e84f..24ca731 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -21,4 +21,11 @@ 20sp 17sp 14sp + + 140dip + 120dip + 70dip + 50dip + 70dip + 50dip \ No newline at end of file diff --git a/src/hw/micode/widget/DateTimePicker.java b/src/hw/micode/widget/DateTimePicker.java index 955e1e8..dc281fc 100644 --- a/src/hw/micode/widget/DateTimePicker.java +++ b/src/hw/micode/widget/DateTimePicker.java @@ -8,7 +8,6 @@ import net.micode.notes.R; import android.content.Context; import android.text.format.DateFormat; -import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; import android.widget.LinearLayout; @@ -22,47 +21,41 @@ public class DateTimePicker extends FrameLayout { private static final int HOURS_IN_ALL_DAY = 24; private static final int DAYS_IN_ALL_WEEK = 7; - private static final int WIDTH_DATE_SPINNER_24_HOURVIEW = 140; - private static final int WIDTH_HOUR_SPINNER_24_HOURVIEW = 70; - private static final int WIDTH_MINUTE_SPINNER_24_HOURVIEW = 70; - private static final int WIDTH_DATE_SPINNER_12_HOURVIEW = 120; - private static final int WIDTH_HOUR_SPINNER_12_HOURVIEW = 50; - private static final int WIDTH_MINUTE_SPINNER_12_HOURVIEW = 50; + private final int WIDTH_DATE_SPINNER_24_HOURVIEW; + private final int WIDTH_HOUR_SPINNER_24_HOURVIEW; + private final int WIDTH_MINUTE_SPINNER_24_HOURVIEW; + private final int WIDTH_DATE_SPINNER_12_HOURVIEW; + private final int WIDTH_HOUR_SPINNER_12_HOURVIEW; + private final int WIDTH_MINUTE_SPINNER_12_HOURVIEW; private final NumberPicker mDateSpinner; private final NumberPicker mHourSpinner; private final NumberPicker mMinuteSpinner; private final NumberPicker mAmPmSpinner; - Calendar mDate = Calendar.getInstance(); + private Calendar mDate; - String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK]; - - /*private final EditText mHourSpinnerInput; - private final EditText mMinuteSpinnerInput; - private final EditText mAmPmSpinnerInput;*/ + private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK]; private boolean mIsAm; - boolean mIs24HourView; + private boolean mIs24HourView; - boolean mIsEnabled = DEFAULT_ENABLE_STATE; + private boolean mIsEnabled = DEFAULT_ENABLE_STATE; - boolean mInitialising; + private boolean mInitialising; private OnDateTimeChangedListener mOnDateTimeChangedListener; private NumberPicker.OnValueChangeListener mOnPickerValueChangedListener = new NumberPicker.OnValueChangeListener() { public void onValueChange(NumberPicker picker, int oldVal, int newVal) { if (picker == mDateSpinner) { - int offset = newVal - oldVal; - mDate.add(Calendar.DAY_OF_YEAR, offset); + mDate.add(Calendar.DAY_OF_YEAR, newVal - oldVal); updateDateControl(); onDateTimeChanged(); } else if (picker == mHourSpinner) { - /*updateInputState();*/ boolean isDateChanged = false; Calendar cal = Calendar.getInstance(); - if (!is24HourView()) { + if (!mIs24HourView) { if (!mIsAm && oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, 1); @@ -97,7 +90,6 @@ public class DateTimePicker extends FrameLayout { setCurrentDay(cal.get(Calendar.DAY_OF_MONTH)); } } else if (picker == mMinuteSpinner) { - /*updateInputState();*/ int minValue = mMinuteSpinner.getMinValue(); int maxValue = mMinuteSpinner.getMaxValue(); int offset = 0; @@ -122,9 +114,6 @@ public class DateTimePicker extends FrameLayout { mDate.set(Calendar.MINUTE, newVal); onDateTimeChanged(); } else if (picker == mAmPmSpinner) { - /* - updateInputState(); - picker.requestFocus();*/ mIsAm = !mIsAm; if (mIsAm) { mDate.add(Calendar.HOUR_OF_DAY, -HOURS_IN_HALF_DAY); @@ -152,10 +141,17 @@ public class DateTimePicker extends FrameLayout { public DateTimePicker(Context context, long date, boolean is24HourView) { super(context); + mDate = Calendar.getInstance(); mInitialising = true; mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY; - LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - inflater.inflate(R.layout.datetime_picker, this, true); + inflate(context, R.layout.datetime_picker, this); + + WIDTH_DATE_SPINNER_24_HOURVIEW = getResources().getDimensionPixelSize(R.dimen.width_date_spinner_24_hourview); + WIDTH_DATE_SPINNER_12_HOURVIEW = getResources().getDimensionPixelSize(R.dimen.width_date_spinner_12_houwview); + WIDTH_HOUR_SPINNER_24_HOURVIEW = getResources().getDimensionPixelSize(R.dimen.width_hour_spinner_24_hourview); + WIDTH_HOUR_SPINNER_12_HOURVIEW = getResources().getDimensionPixelSize(R.dimen.width_hour_spinner_12_hourview); + WIDTH_MINUTE_SPINNER_24_HOURVIEW = getResources().getDimensionPixelSize(R.dimen.width_hour_spinner_24_hourview); + WIDTH_MINUTE_SPINNER_12_HOURVIEW = getResources().getDimensionPixelSize(R.dimen.width_hour_spinner_12_hourview); mDateSpinner = (NumberPicker) findViewById(R.id.date); mDateSpinner.setMinValue(0); @@ -164,23 +160,11 @@ public class DateTimePicker extends FrameLayout { mHourSpinner = (NumberPicker) findViewById(R.id.hour); mHourSpinner.setOnValueChangedListener(mOnPickerValueChangedListener); - /* - mHourSpinnerInput = (EditText) mHourSpinner.findViewById(R.id.numberpicker_input); - mHourSpinnerInput.setImeOptions(EditorInfo.IME_ACTION_NEXT);*/ - /* - mDivider = (TextView) findViewById(R.id.divider); - if (mDivider != null) { - mDivider.setText(R.string.time_picker_separator); - }*/ mMinuteSpinner = (NumberPicker) findViewById(R.id.minute); mMinuteSpinner.setMinValue(0); mMinuteSpinner.setMaxValue(59); mMinuteSpinner.setOnLongPressUpdateInterval(100); - /*mMinuteSpinner.setFormatter(NumberPicker.TWO_DIGIT_FORMATTER);*/ mMinuteSpinner.setOnValueChangedListener(mOnPickerValueChangedListener); - /* - mMinuteSpinnerInput = (EditText) mMinuteSpinner.findViewById(R.id.numberpicker_input); - mMinuteSpinnerInput.setImeOptions(EditorInfo.IME_ACTION_NEXT);*/ String[] stringsForAmPm = new DateFormatSymbols().getAmPmStrings(); mAmPmSpinner = (NumberPicker) findViewById(R.id.amPm); @@ -188,16 +172,13 @@ public class DateTimePicker extends FrameLayout { mAmPmSpinner.setMaxValue(1); mAmPmSpinner.setDisplayedValues(stringsForAmPm); mAmPmSpinner.setOnValueChangedListener(mOnPickerValueChangedListener); - /* - mAmPmSpinnerInput = (EditText) mAmPmSpinner.findViewById(R.id.numberpicker_input); - mAmPmSpinnerInput.setImeOptions(EditorInfo.IME_ACTION_DONE);*/ // update controls to initial state updateDateControl(); updateHourControl(); updateAmPmControl(); - setIs24HourView(is24HourView); + set24HourView(is24HourView); // set to current time setCurrentDate(date); @@ -207,7 +188,6 @@ public class DateTimePicker extends FrameLayout { } // set the content descriptions - /*setContentDescriptions();*/ mInitialising = false; } @@ -219,10 +199,6 @@ public class DateTimePicker extends FrameLayout { super.setEnabled(enabled); mDateSpinner.setEnabled(enabled); mMinuteSpinner.setEnabled(enabled); - /* - if (mDivider != null) { - mDivider.setEnabled(enabled); - }*/ mHourSpinner.setEnabled(enabled); mAmPmSpinner.setEnabled(enabled); mIsEnabled = enabled; @@ -233,7 +209,7 @@ public class DateTimePicker extends FrameLayout { return mIsEnabled; } - public long getCurrentDate() { + public long getCurrentDateInTimeMillis() { return mDate.getTimeInMillis(); } @@ -297,7 +273,7 @@ public class DateTimePicker extends FrameLayout { } public int getCurrentHour() { - if (is24HourView()){ + if (mIs24HourView){ return getCurrentHourOfDay(); } else { int hour = getCurrentHourOfDay(); @@ -314,7 +290,7 @@ public class DateTimePicker extends FrameLayout { return; } mDate.set(Calendar.HOUR_OF_DAY, hourOfDay); - if (!is24HourView()) { + if (!mIs24HourView) { if (hourOfDay >= HOURS_IN_HALF_DAY) { mIsAm = false; if (hourOfDay > HOURS_IN_HALF_DAY) { @@ -349,7 +325,7 @@ public class DateTimePicker extends FrameLayout { return mIs24HourView; } - public void setIs24HourView(boolean is24HourView) { + public void set24HourView(boolean is24HourView) { if (mIs24HourView == is24HourView) { return; } @@ -377,13 +353,12 @@ public class DateTimePicker extends FrameLayout { private void updateDateControl() { Calendar cal = Calendar.getInstance(); - final String fomater = "MM.dd EEEE"; cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, -DAYS_IN_ALL_WEEK / 2 - 1); mDateSpinner.setDisplayedValues(null); for (int i = 0; i < DAYS_IN_ALL_WEEK; ++i) { cal.add(Calendar.DAY_OF_YEAR, 1); - mDateDisplayValues[i] = (String) DateFormat.format(fomater, cal); + mDateDisplayValues[i] = (String) DateFormat.format("MM.dd EEEE", cal); } mDateSpinner.setDisplayedValues(mDateDisplayValues); mDateSpinner.setValue(DAYS_IN_ALL_WEEK / 2); @@ -391,7 +366,7 @@ public class DateTimePicker extends FrameLayout { } private void updateAmPmControl() { - if (is24HourView()) { + if (mIs24HourView) { mAmPmSpinner.setVisibility(View.GONE); } else { int index = mIsAm ? Calendar.AM : Calendar.PM; @@ -401,14 +376,12 @@ public class DateTimePicker extends FrameLayout { } private void updateHourControl() { - if (is24HourView()) { + if (mIs24HourView) { mHourSpinner.setMinValue(0); mHourSpinner.setMaxValue(23); - /*mHourSpinner.setFormatter(NumberPicker.TWO_DIGIT_FORMATTER);*/ } else { mHourSpinner.setMinValue(1); mHourSpinner.setMaxValue(12); - /*mHourSpinner.setFormatter(null)*/ } } @@ -417,7 +390,6 @@ public class DateTimePicker extends FrameLayout { } private void onDateTimeChanged() { - /*sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);*/ if (mOnDateTimeChangedListener != null) { mOnDateTimeChangedListener.onDateTimeChanged(this, getCurrentYear(), getCurrentMonth(), getCurrentDay(), getCurrentHourOfDay(), getCurrentMinute()); diff --git a/src/hw/micode/widget/DateTimePickerDialog.java b/src/hw/micode/widget/DateTimePickerDialog.java index 5f6e085..4259fdc 100644 --- a/src/hw/micode/widget/DateTimePickerDialog.java +++ b/src/hw/micode/widget/DateTimePickerDialog.java @@ -13,17 +13,13 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.text.format.DateFormat; import android.text.format.DateUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.LinearLayout; public class DateTimePickerDialog extends AlertDialog implements OnClickListener { - LinearLayout mLayout; - Calendar mDate = Calendar.getInstance(); + private Calendar mDate = Calendar.getInstance(); private boolean mIs24HourView; - OnDateTimeSetListener mOnDateTimeSetListener; - DateTimePicker mDateTimePicker; + private OnDateTimeSetListener mOnDateTimeSetListener; + private DateTimePicker mDateTimePicker; public interface OnDateTimeSetListener { void OnDateTimeSet(AlertDialog dialog, int year, int month, int dayOfMonth, int hourOfDay, int minute); @@ -40,11 +36,8 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener public DateTimePickerDialog(Context context, Date date) { super(context); - LayoutInflater inflater = LayoutInflater.from(context); - View view = inflater.inflate(R.layout.datetime_picker_dialog, null); - mLayout = (LinearLayout) view.findViewById(R.id.datetime_picker_dialog_Layout); - setView(view); mDateTimePicker = new DateTimePicker(context); + setView(mDateTimePicker); mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() { public void onDateTimeChanged(DateTimePicker view, int year, int month, int dayOfMonth, int hourOfDay, int minute) { @@ -56,17 +49,16 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener updateTitle(mDate.getTimeInMillis()); } }); - mLayout.addView(mDateTimePicker); mDate.setTime(date); mDate.set(Calendar.SECOND, 0); mDateTimePicker.setCurrentDate(mDate.getTimeInMillis()); setButton(context.getString(R.string.datetime_dialog_ok), this); setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null); - setIs24HourView(DateFormat.is24HourFormat(this.getContext())); + set24HourView(DateFormat.is24HourFormat(this.getContext())); updateTitle(mDate.getTimeInMillis()); } - public void setIs24HourView(boolean is24HourView) { + public void set24HourView(boolean is24HourView) { mIs24HourView = is24HourView; } @@ -81,17 +73,11 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME; - if (mIs24HourView) { - flag |= DateUtils.FORMAT_24HOUR; - } else { - flag |= DateUtils.FORMAT_12HOUR; - } - String s = DateUtils.formatDateTime(this.getContext(), date, flag); - setTitle(s); + flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR; + setTitle(DateUtils.formatDateTime(this.getContext(), date, flag)); } public void onClick(DialogInterface arg0, int arg1) { - // TODO Auto-generated method stub if (mOnDateTimeSetListener != null) { mOnDateTimeSetListener.OnDateTimeSet(this, mDate.get(Calendar.YEAR), diff --git a/src/net/micode/notes/ui/NotesPreferenceActivity.java b/src/net/micode/notes/ui/NotesPreferenceActivity.java index 99db68b..8fd25ef 100644 --- a/src/net/micode/notes/ui/NotesPreferenceActivity.java +++ b/src/net/micode/notes/ui/NotesPreferenceActivity.java @@ -18,7 +18,6 @@ package net.micode.notes.ui; import android.accounts.Account; import android.accounts.AccountManager; -import android.app.ActionBar; import android.app.AlertDialog; import android.content.BroadcastReceiver; import android.content.ContentValues; @@ -372,10 +371,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { - ActionBar ab = getActionBar(); - if (ab != null) { - ab.setHomeButtonEnabled(true); - } return true; }