diff --git a/doc/实践资源-开源软件维护方案及成果模板.docx b/doc/实践资源-开源软件维护方案及成果模板.docx deleted file mode 100644 index 998fcec..0000000 Binary files a/doc/实践资源-开源软件维护方案及成果模板.docx and /dev/null differ diff --git a/doc/小米便签开源软件的维护成果报告——魏伊狄、刘杰、郭伟堂、孙熹恒、陈昭龙.pptx b/doc/小米便签开源软件的维护成果报告——魏伊狄、刘杰、郭伟堂、孙熹恒、陈昭龙.pptx new file mode 100644 index 0000000..a22f2b4 Binary files /dev/null and b/doc/小米便签开源软件的维护成果报告——魏伊狄、刘杰、郭伟堂、孙熹恒、陈昭龙.pptx differ diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java deleted file mode 100644 index 0c12e8d..0000000 --- a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ /dev/null @@ -1,894 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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. - */ - -package net.micode.notes.ui; - -import android.annotation.TargetApi; -import android.app.Activity; -import android.app.AlarmManager; -import android.app.AlertDialog; -import android.app.Dialog; -import android.app.PendingIntent; -import android.app.SearchManager; -import android.appwidget.AppWidgetManager; -import android.content.ContentUris; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.SharedPreferences; -import android.graphics.Paint; -import android.os.Build; -import android.os.Bundle; -import android.preference.PreferenceManager; -import android.text.Spannable; -import android.text.SpannableString; -import android.text.TextUtils; -import android.text.format.DateUtils; -import android.text.style.BackgroundColorSpan; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuItem; -import android.view.MotionEvent; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.WindowManager; -import android.view.inputmethod.InputMethodManager; -import android.widget.CheckBox; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; -import android.widget.EditText; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; -import android.widget.Toast; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.TextNote; -import net.micode.notes.model.WorkingNote; -import net.micode.notes.model.WorkingNote.NoteSettingChangedListener; -import net.micode.notes.tool.DataUtils; -import net.micode.notes.tool.ResourceParser; -import net.micode.notes.tool.ResourceParser.TextAppearanceResources; -import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener; -import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener; -import net.micode.notes.widget.NoteWidgetProvider_2x; -import net.micode.notes.widget.NoteWidgetProvider_4x; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - - -public class NoteEditActivity extends Activity implements OnClickListener, - NoteSettingChangedListener, OnTextViewChangeListener { - private class HeadViewHolder { - public TextView tvModified; - - public ImageView ivAlertIcon; - - public TextView tvAlertDate; - - public ImageView ibSetBgColor; - } - - private static final Map sBgSelectorBtnsMap = new HashMap(); - static { - sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW); - sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED); - sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE); - sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN); - sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE); - } - - private static final Map sBgSelectorSelectionMap = new HashMap(); - static { - sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select); - sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select); - sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select); - sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select); - sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select); - } - - private static final Map sFontSizeBtnsMap = new HashMap(); - static { - sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE); - sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL); - sFontSizeBtnsMap.put(R.id.ll_font_normal, ResourceParser.TEXT_MEDIUM); - sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER); - } - - private static final Map sFontSelectorSelectionMap = new HashMap(); - static { - sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select); - sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select); - sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select); - sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select); - } - - private static final String TAG = "NoteEditActivity"; - - private HeadViewHolder mNoteHeaderHolder; - - private View mHeadViewPanel; - - private View mNoteBgColorSelector; - - private View mFontSizeSelector; - - private EditText mNoteEditor; - - private View mNoteEditorPanel; - - private WorkingNote mWorkingNote; - - private SharedPreferences mSharedPrefs; - private int mFontSizeId; - - private static final String PREFERENCE_FONT_SIZE = "pref_font_size"; - - private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10; - - public static final String TAG_CHECKED = String.valueOf('\u221A'); - public static final String TAG_UNCHECKED = String.valueOf('\u25A1'); - - private LinearLayout mEditTextList; - - private String mUserQuery; - private Pattern mPattern; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - this.setContentView(R.layout.note_edit); - - if (savedInstanceState == null && !initActivityState(getIntent())) { - finish(); - return; - } - initResources(); - } - - /** - * Current activity may be killed when the memory is low. Once it is killed, for another time - * user load this activity, we should restore the former state - */ - @Override - protected void onRestoreInstanceState(Bundle savedInstanceState) { - super.onRestoreInstanceState(savedInstanceState); - if (savedInstanceState != null && savedInstanceState.containsKey(Intent.EXTRA_UID)) { - Intent intent = new Intent(Intent.ACTION_VIEW); - intent.putExtra(Intent.EXTRA_UID, savedInstanceState.getLong(Intent.EXTRA_UID)); - if (!initActivityState(intent)) { - finish(); - return; - } - Log.d(TAG, "Restoring from killed activity"); - } - } - - private boolean initActivityState(Intent intent) { - /** - * If the user specified the {@link Intent#ACTION_VIEW} but not provided with id, - * then jump to the NotesListActivity - */ - mWorkingNote = null; - if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) { - long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0); - mUserQuery = ""; - - /** - * Starting from the searched result - */ - if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) { - noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY)); - mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY); - } - - if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) { - Intent jump = new Intent(this, NotesListActivity.class); - startActivity(jump); - showToast(R.string.error_note_not_exist); - finish(); - return false; - } else { - mWorkingNote = WorkingNote.load(this, noteId); - if (mWorkingNote == null) { - Log.e(TAG, "load note failed with note id" + noteId); - finish(); - return false; - } - } - getWindow().setSoftInputMode( - WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN - | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); - } else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) { - // New note - long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0); - int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID, - AppWidgetManager.INVALID_APPWIDGET_ID); - int widgetType = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_TYPE, - Notes.TYPE_WIDGET_INVALIDE); - int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, - ResourceParser.getDefaultBgId(this)); - - // Parse call-record note - String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER); - long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0); - if (callDate != 0 && phoneNumber != null) { - if (TextUtils.isEmpty(phoneNumber)) { - Log.w(TAG, "The call record number is null"); - } - long noteId = 0; - if ((noteId = DataUtils.getNoteIdByPhoneNumberAndCallDate(getContentResolver(), - phoneNumber, callDate)) > 0) { - mWorkingNote = WorkingNote.load(this, noteId); - if (mWorkingNote == null) { - Log.e(TAG, "load call note failed with note id" + noteId); - finish(); - return false; - } - } else { - mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, - widgetType, bgResId); - mWorkingNote.convertToCallNote(phoneNumber, callDate); - } - } else { - mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType, - bgResId); - } - - getWindow().setSoftInputMode( - WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE - | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); - } else { - Log.e(TAG, "Intent not specified action, should not support"); - finish(); - return false; - } - mWorkingNote.setOnSettingStatusChangedListener(this); - return true; - } - - @Override - protected void onResume() { - super.onResume(); - initNoteScreen(); - } - - private void initNoteScreen() { - mNoteEditor.setTextAppearance(this, TextAppearanceResources - .getTexAppearanceResource(mFontSizeId)); - if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { - switchToListMode(mWorkingNote.getContent()); - } else { - mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); - mNoteEditor.setSelection(mNoteEditor.getText().length()); - } - for (Integer id : sBgSelectorSelectionMap.keySet()) { - findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE); - } - mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId()); - mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId()); - - mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this, - mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE - | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME - | DateUtils.FORMAT_SHOW_YEAR)); - - /** - * TODO: Add the menu for setting alert. Currently disable it because the DateTimePicker - * is not ready - */ - showAlertHeader(); - - } - - private void showAlertHeader() { - if (mWorkingNote.hasClockAlert()) { - long time = System.currentTimeMillis(); - if (time > mWorkingNote.getAlertDate()) { - mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired); - } else { - mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString( - mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS)); - } - mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE); - mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE); - } else { - mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE); - mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE); - }; - } - - @Override - protected void onNewIntent(Intent intent) { - super.onNewIntent(intent); - initActivityState(intent); - } - - @Override - protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - /** - * For new note without note id, we should firstly save it to - * generate a id. If the editing note is not worth saving, there - * is no id which is equivalent to create new note - */ - if (!mWorkingNote.existInDatabase()) { - saveNote(); - } - outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId()); - Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState"); - } - - @Override - public boolean dispatchTouchEvent(MotionEvent ev) { - if (mNoteBgColorSelector.getVisibility() == View.VISIBLE - && !inRangeOfView(mNoteBgColorSelector, ev)) { - mNoteBgColorSelector.setVisibility(View.GONE); - return true; - } - - if (mFontSizeSelector.getVisibility() == View.VISIBLE - && !inRangeOfView(mFontSizeSelector, ev)) { - mFontSizeSelector.setVisibility(View.GONE); - return true; - } - return super.dispatchTouchEvent(ev); - } - - private boolean inRangeOfView(View view, MotionEvent ev) { - int []location = new int[2]; - view.getLocationOnScreen(location); - int x = location[0]; - int y = location[1]; - if (ev.getX() < x - || ev.getX() > (x + view.getWidth()) - || ev.getY() < y - || ev.getY() > (y + view.getHeight())) { - return false; - } - return true; - } - - private void initResources() { - mHeadViewPanel = findViewById(R.id.note_title); - mNoteHeaderHolder = new HeadViewHolder(); - mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date); - mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon); - mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date); - mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color); - mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this); - mNoteEditor = (EditText) findViewById(R.id.note_edit_view); - mNoteEditorPanel = findViewById(R.id.sv_note_edit); - mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector); - for (int id : sBgSelectorBtnsMap.keySet()) { - ImageView iv = (ImageView) findViewById(id); - iv.setOnClickListener(this); - } - - mFontSizeSelector = findViewById(R.id.font_size_selector); - for (int id : sFontSizeBtnsMap.keySet()) { - View view = findViewById(id); - view.setOnClickListener(this); - }; - mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); - mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE); - /** - * HACKME: Fix bug of store the resource id in shared preference. - * The id may larger than the length of resources, in this case, - * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE} - */ - if(mFontSizeId >= TextAppearanceResources.getResourcesSize()) { - mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE; - } - mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list); - } - - @Override - protected void onPause() { - super.onPause(); - if(saveNote()) { - Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length()); - } - clearSettingState(); - } - - private void updateWidget() { - Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); - if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) { - intent.setClass(this, NoteWidgetProvider_2x.class); - } else if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_4X) { - intent.setClass(this, NoteWidgetProvider_4x.class); - } else { - Log.e(TAG, "Unspported widget type"); - return; - } - - intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] { - mWorkingNote.getWidgetId() - }); - - sendBroadcast(intent); - setResult(RESULT_OK, intent); - } - - public void onClick(View v) { - int id = v.getId(); - if (id == R.id.btn_set_bg_color) { - mNoteBgColorSelector.setVisibility(View.VISIBLE); - findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( - - View.VISIBLE); - } else if (sBgSelectorBtnsMap.containsKey(id)) { - findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( - View.GONE); - mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id)); - mNoteBgColorSelector.setVisibility(View.GONE); - } else if (sFontSizeBtnsMap.containsKey(id)) { - findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE); - mFontSizeId = sFontSizeBtnsMap.get(id); - mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit(); - findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); - if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { - getWorkingText(); - switchToListMode(mWorkingNote.getContent()); - } else { - mNoteEditor.setTextAppearance(this, - TextAppearanceResources.getTexAppearanceResource(mFontSizeId)); - } - mFontSizeSelector.setVisibility(View.GONE); - } - - } - - @Override - public void onBackPressed() { - if(clearSettingState()) { - return; - } - - saveNote(); - super.onBackPressed(); - } - - private boolean clearSettingState() { - if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) { - mNoteBgColorSelector.setVisibility(View.GONE); - return true; - } else if (mFontSizeSelector.getVisibility() == View.VISIBLE) { - mFontSizeSelector.setVisibility(View.GONE); - return true; - } - return false; - } - - public void onBackgroundColorChanged() { - findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( - View.VISIBLE); - mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId()); - mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId()); - } - - @Override - public boolean onPrepareOptionsMenu(Menu menu) { - if (isFinishing()) { - return true; - } - clearSettingState(); - menu.clear(); - if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) { - getMenuInflater().inflate(R.menu.call_note_edit, menu); - } else { - getMenuInflater().inflate(R.menu.note_edit, menu); - } - if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { - menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_normal_mode); - } else { - menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_list_mode); - } - if (mWorkingNote.hasClockAlert()) { - menu.findItem(R.id.menu_alert).setVisible(false); - } else { - menu.findItem(R.id.menu_delete_remind).setVisible(false); - } - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_new_note: - createNewNote(); - break; - case R.id.menu_count_word://数字统计 - AlertDialog.Builder builder1 = new AlertDialog.Builder(this);//对话框对象 - builder1.setIcon(android.R.drawable.ic_dialog_alert);//对话框图标 - TextView content=(TextView)findViewById(R.id.note_edit_view); - int c =content.length(); - builder1.setMessage("字数统计为："+ c); - builder1.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - finish(); - } - });//确定按钮 - builder1.setNegativeButton(android.R.string.cancel, null);//取消按钮 - builder1.show();//对话框启动 - break; - case R.id.menu_delete: - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(getString(R.string.alert_title_delete)); - builder.setIcon(android.R.drawable.ic_dialog_alert); - builder.setMessage(getString(R.string.alert_message_delete_note)); - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - deleteCurrentNote(); - finish(); - } - }); - builder.setNegativeButton(android.R.string.cancel, null); - builder.show(); - break; - case R.id.menu_font_size: - mFontSizeSelector.setVisibility(View.VISIBLE); - findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); - break; - case R.id.menu_list_mode: - mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? - TextNote.MODE_CHECK_LIST : 0); - break; - case R.id.menu_share: - getWorkingText(); - sendTo(this, mWorkingNote.getContent()); - break; - case R.id.menu_send_to_desktop: - sendToDesktop(); - break; - case R.id.menu_alert: - setReminder(); - break; - case R.id.menu_delete_remind: - mWorkingNote.setAlertDate(0, false); - break; - default: - break; - } - return true; - } - - private void setReminder() { - DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis()); - d.setOnDateTimeSetListener(new OnDateTimeSetListener() { - public void OnDateTimeSet(AlertDialog dialog, long date) { - mWorkingNote.setAlertDate(date , true); - } - }); - d.show(); - } - - /** - * Share note to apps that support {@link Intent#ACTION_SEND} action - * and {@text/plain} type - */ - private void sendTo(Context context, String info) { - Intent intent = new Intent(Intent.ACTION_SEND); - intent.putExtra(Intent.EXTRA_TEXT, info); - intent.setType("text/plain"); - context.startActivity(intent); - } - - private void createNewNote() { - // Firstly, save current editing notes - saveNote(); - - // For safety, start a new NoteEditActivity - finish(); - Intent intent = new Intent(this, NoteEditActivity.class); - intent.setAction(Intent.ACTION_INSERT_OR_EDIT); - intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId()); - startActivity(intent); - } - - private void deleteCurrentNote() { - if (mWorkingNote.existInDatabase()) { - HashSet ids = new HashSet(); - long id = mWorkingNote.getNoteId(); - if (id != Notes.ID_ROOT_FOLDER) { - ids.add(id); - } else { - Log.d(TAG, "Wrong note id, should not happen"); - } - if (!isSyncMode()) { - if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) { - Log.e(TAG, "Delete Note error"); - } - } else { - if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) { - Log.e(TAG, "Move notes to trash folder error, should not happens"); - } - } - } - mWorkingNote.markDeleted(true); - } - - private boolean isSyncMode() { - return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0; - } - - public void onClockAlertChanged(long date, boolean set) { - /** - * User could set clock to an unsaved note, so before setting the - * alert clock, we should save the note first - */ - if (!mWorkingNote.existInDatabase()) { - saveNote(); - } - if (mWorkingNote.getNoteId() > 0) { - Intent intent = new Intent(this, AlarmReceiver.class); - intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId())); - PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0); - AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE)); - showAlertHeader(); - if(!set) { - alarmManager.cancel(pendingIntent); - } else { - alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent); - } - } else { - /** - * There is the condition that user has input nothing (the note is - * not worthy saving), we have no note id, remind the user that he - * should input something - */ - Log.e(TAG, "Clock alert setting error"); - showToast(R.string.error_note_empty_for_clock); - } - } - - public void onWidgetChanged() { - updateWidget(); - } - - public void onEditTextDelete(int index, String text) { - int childCount = mEditTextList.getChildCount(); - if (childCount == 1) { - return; - } - - for (int i = index + 1; i < childCount; i++) { - ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) - .setIndex(i - 1); - } - - mEditTextList.removeViewAt(index); - NoteEditText edit = null; - if(index == 0) { - edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById( - R.id.et_edit_text); - } else { - edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById( - R.id.et_edit_text); - } - int length = edit.length(); - edit.append(text); - edit.requestFocus(); - edit.setSelection(length); - } - - public void onEditTextEnter(int index, String text) { - /** - * Should not happen, check for debug - */ - if(index > mEditTextList.getChildCount()) { - Log.e(TAG, "Index out of mEditTextList boundrary, should not happen"); - } - - View view = getListItem(text, index); - mEditTextList.addView(view, index); - NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); - edit.requestFocus(); - edit.setSelection(0); - for (int i = index + 1; i < mEditTextList.getChildCount(); i++) { - ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) - .setIndex(i); - } - } - - private void switchToListMode(String text) { - mEditTextList.removeAllViews(); - String[] items = text.split("\n"); - int index = 0; - for (String item : items) { - if(!TextUtils.isEmpty(item)) { - mEditTextList.addView(getListItem(item, index)); - index++; - } - } - mEditTextList.addView(getListItem("", index)); - mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus(); - - mNoteEditor.setVisibility(View.GONE); - mEditTextList.setVisibility(View.VISIBLE); - } - - private Spannable getHighlightQueryResult(String fullText, String userQuery) { - SpannableString spannable = new SpannableString(fullText == null ? "" : fullText); - if (!TextUtils.isEmpty(userQuery)) { - mPattern = Pattern.compile(userQuery); - Matcher m = mPattern.matcher(fullText); - int start = 0; - while (m.find(start)) { - spannable.setSpan( - new BackgroundColorSpan(this.getResources().getColor( - R.color.user_query_highlight)), m.start(), m.end(), - Spannable.SPAN_INCLUSIVE_EXCLUSIVE); - start = m.end(); - } - } - return spannable; - } - - private View getListItem(String item, int index) { - View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null); - final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); - edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId)); - CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item)); - cb.setOnCheckedChangeListener(new OnCheckedChangeListener() { - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (isChecked) { - edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); - } else { - edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - } - } - }); - - if (item.startsWith(TAG_CHECKED)) { - cb.setChecked(true); - edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); - item = item.substring(TAG_CHECKED.length(), item.length()).trim(); - } else if (item.startsWith(TAG_UNCHECKED)) { - cb.setChecked(false); - edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - item = item.substring(TAG_UNCHECKED.length(), item.length()).trim(); - } - - edit.setOnTextViewChangeListener(this); - edit.setIndex(index); - edit.setText(getHighlightQueryResult(item, mUserQuery)); - return view; - } - - public void onTextChange(int index, boolean hasText) { - if (index >= mEditTextList.getChildCount()) { - Log.e(TAG, "Wrong index, should not happen"); - return; - } - if(hasText) { - mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE); - } else { - mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE); - } - } - - public void onCheckListModeChanged(int oldMode, int newMode) { - if (newMode == TextNote.MODE_CHECK_LIST) { - switchToListMode(mNoteEditor.getText().toString()); - } else { - if (!getWorkingText()) { - mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", - "")); - } - mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); - mEditTextList.setVisibility(View.GONE); - mNoteEditor.setVisibility(View.VISIBLE); - } - } - - private boolean getWorkingText() { - boolean hasChecked = false; - if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < mEditTextList.getChildCount(); i++) { - View view = mEditTextList.getChildAt(i); - NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); - if (!TextUtils.isEmpty(edit.getText())) { - if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) { - sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n"); - hasChecked = true; - } else { - sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n"); - } - } - } - mWorkingNote.setWorkingText(sb.toString()); - } else { - mWorkingNote.setWorkingText(mNoteEditor.getText().toString()); - } - return hasChecked; - } - - private boolean saveNote() { - getWorkingText(); - boolean saved = mWorkingNote.saveNote(); - if (saved) { - /** - * There are two modes from List view to edit view, open one note, - * create/edit a node. Opening node requires to the original - * position in the list when back from edit view, while creating a - * new node requires to the top of the list. This code - * {@link #RESULT_OK} is used to identify the create/edit state - */ - setResult(RESULT_OK); - } - return saved; - } - - private void sendToDesktop() { - /** - * Before send message to home, we should make sure that current - * editing note is exists in databases. So, for new note, firstly - * save it - */ - if (!mWorkingNote.existInDatabase()) { - saveNote(); - } - - if (mWorkingNote.getNoteId() > 0) { - Intent sender = new Intent(); - Intent shortcutIntent = new Intent(this, NoteEditActivity.class); - shortcutIntent.setAction(Intent.ACTION_VIEW); - shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId()); - sender.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent); - sender.putExtra(Intent.EXTRA_SHORTCUT_NAME, - makeShortcutIconTitle(mWorkingNote.getContent())); - sender.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, - Intent.ShortcutIconResource.fromContext(this, R.drawable.icon_app)); - sender.putExtra("duplicate", true); - sender.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); - showToast(R.string.info_note_enter_desktop); - sendBroadcast(sender); - } else { - /** - * There is the condition that user has input nothing (the note is - * not worthy saving), we have no note id, remind the user that he - * should input something - */ - Log.e(TAG, "Send to desktop error"); - showToast(R.string.error_note_empty_for_send_to_desktop); - } - } - - private String makeShortcutIconTitle(String content) { - content = content.replace(TAG_CHECKED, ""); - content = content.replace(TAG_UNCHECKED, ""); - return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0, - SHORTCUT_ICON_TITLE_MAX_LEN) : content; - } - - private void showToast(int resId) { - showToast(resId, Toast.LENGTH_SHORT); - } - - private void showToast(int resId, int duration) { - Toast.makeText(this, resId, duration).show(); - } -} diff --git a/src/app/src/main/res/values/ids.xml b/src/app/src/main/res/values/ids.xml deleted file mode 100644 index c878215..0000000 --- a/src/app/src/main/res/values/ids.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/main/.scannerwork/.sonar_lock b/src/main/.scannerwork/.sonar_lock new file mode 100644 index 0000000..e69de29 diff --git a/src/main/.scannerwork/report-task.txt b/src/main/.scannerwork/report-task.txt new file mode 100644 index 0000000..fc77250 --- /dev/null +++ b/src/main/.scannerwork/report-task.txt @@ -0,0 +1,6 @@ +projectKey=myNotes +serverUrl=http://127.0.0.1:9000 +serverVersion=9.5.0.56709 +dashboardUrl=http://127.0.0.1:9000/dashboard?id=myNotes +ceTaskId=AYRIh5EzuqDImpFV-sUP +ceTaskUrl=http://127.0.0.1:9000/api/ce/task?id=AYRIh5EzuqDImpFV-sUP diff --git a/src/app/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml similarity index 69% rename from src/app/src/main/AndroidManifest.xml rename to src/main/AndroidManifest.xml index 9d0bb89..ec543b6 100644 --- a/src/app/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -20,41 +20,96 @@ android:versionCode="1" android:versionName="0.1" > - - - + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + android:theme="@style/Theme.AppCompat.Light.DarkActionBar" > diff --git a/src/main/assets/font/FZYTK.TTF b/src/main/assets/font/FZYTK.TTF new file mode 100644 index 0000000..45c8c19 Binary files /dev/null and b/src/main/assets/font/FZYTK.TTF differ diff --git a/src/main/assets/font/STLITI.TTF b/src/main/assets/font/STLITI.TTF new file mode 100644 index 0000000..8ede20e Binary files /dev/null and b/src/main/assets/font/STLITI.TTF differ diff --git a/src/main/assets/font/STXINGKA.TTF b/src/main/assets/font/STXINGKA.TTF new file mode 100644 index 0000000..53439a2 Binary files /dev/null and b/src/main/assets/font/STXINGKA.TTF differ diff --git a/src/main/assets/font/STXINWEI.TTF b/src/main/assets/font/STXINWEI.TTF new file mode 100644 index 0000000..afe13f4 Binary files /dev/null and b/src/main/assets/font/STXINWEI.TTF differ diff --git a/src/main/assets/font/STZHONGS.TTF b/src/main/assets/font/STZHONGS.TTF new file mode 100644 index 0000000..412dfcd Binary files /dev/null and b/src/main/assets/font/STZHONGS.TTF differ diff --git a/src/app/src/main/assets/font/SIMFANG.TTF b/src/main/assets/font/simfang.ttf similarity index 100% rename from src/app/src/main/assets/font/SIMFANG.TTF rename to src/main/assets/font/simfang.ttf diff --git a/src/app/src/main/assets/font/SIMLI.TTF b/src/main/assets/font/simhei.ttf similarity index 55% rename from src/app/src/main/assets/font/SIMLI.TTF rename to src/main/assets/font/simhei.ttf index 67a3d4a..5bd4687 100644 Binary files a/src/app/src/main/assets/font/SIMLI.TTF and b/src/main/assets/font/simhei.ttf differ diff --git a/src/app/src/main/assets/font/SIMKAI.TTF b/src/main/assets/font/simkai.ttf similarity index 100% rename from src/app/src/main/assets/font/SIMKAI.TTF rename to src/main/assets/font/simkai.ttf diff --git a/src/app/src/main/java/net/micode/notes/data/Contact.java b/src/main/java/net/micode/notes/data/Contact.java similarity index 97% rename from src/app/src/main/java/net/micode/notes/data/Contact.java rename to src/main/java/net/micode/notes/data/Contact.java index d97ac5d..4c1d6e2 100644 --- a/src/app/src/main/java/net/micode/notes/data/Contact.java +++ b/src/main/java/net/micode/notes/data/Contact.java @@ -36,9 +36,11 @@ public class Contact { + " FROM phone_lookup" + " WHERE min_match = '+')"; + private Contact(){} + public static String getContact(Context context, String phoneNumber) { if(sContactCache == null) { - sContactCache = new HashMap(); + sContactCache = new HashMap<>(); } if(sContactCache.containsKey(phoneNumber)) { diff --git a/src/app/src/main/java/net/micode/notes/data/Notes.java b/src/main/java/net/micode/notes/data/Notes.java similarity index 93% rename from src/app/src/main/java/net/micode/notes/data/Notes.java rename to src/main/java/net/micode/notes/data/Notes.java index 5f0c6ff..17347a6 100644 --- a/src/app/src/main/java/net/micode/notes/data/Notes.java +++ b/src/main/java/net/micode/notes/data/Notes.java @@ -20,6 +20,7 @@ import android.net.Uri; public class Notes { public static final String AUTHORITY = "micode_notes"; public static final String TAG = "Notes"; + public static final String CONTENT_ = "content://"; public static final int TYPE_NOTE = 0; public static final int TYPE_FOLDER = 1; public static final int TYPE_SYSTEM = 2; @@ -47,6 +48,7 @@ public class Notes { public static final int TYPE_WIDGET_4X = 1; public static class DataConstants { + private DataConstants(){} public static final String NOTE = TextNote.CONTENT_ITEM_TYPE; public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE; } @@ -54,12 +56,12 @@ public class Notes { /** * Uri to query all notes and folders */ - public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note"); + public static final Uri CONTENT_NOTE_URI = Uri.parse(CONTENT_ + AUTHORITY + "/note"); /** * Uri to query data */ - public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data"); + public static final Uri CONTENT_DATA_URI = Uri.parse(CONTENT_ + AUTHORITY + "/data"); public interface NoteColumns { /** @@ -166,8 +168,7 @@ public class Notes { */ public static final String VERSION = "version"; - - String PASSWORD = ""; + public static final String TOP = "top"; } public interface DataColumns { @@ -207,6 +208,8 @@ public class Notes { */ public static final String CONTENT = "content"; + public static final String LOCATION = "location"; + /** * Generic data column, the meaning is {@link #MIMETYPE} specific, used for @@ -249,6 +252,8 @@ public class Notes { * Mode to indicate the text in check list mode or not *

Type: Integer 1:check list mode 0: normal mode

*/ + private TextNote(){} + public static final String MODE = DATA1; public static final int MODE_CHECK_LIST = 1; @@ -257,7 +262,7 @@ public class Notes { public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note"; - public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note"); + public static final Uri CONTENT_URI = Uri.parse(CONTENT_ + AUTHORITY + "/text_note"); } public static final class CallNote implements DataColumns { @@ -265,6 +270,9 @@ public class Notes { * Call date for this record *

Type: INTEGER (long)

*/ + + private CallNote(){} + public static final String CALL_DATE = DATA1; /** @@ -277,6 +285,6 @@ public class Notes { public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note"; - public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note"); + public static final Uri CONTENT_URI = Uri.parse(CONTENT_ + AUTHORITY + "/call_note"); } } diff --git a/src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java similarity index 94% rename from src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java rename to src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index 5aa37c4..5a3ae32 100644 --- a/src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -59,11 +59,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," + NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + - NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT 1," + + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.TOP + " INTEGER NOT NULL DEFAULT 0" + ")"; - private static final String CREATE_DATA_TABLE_SQL = "CREATE TABLE " + TABLE.DATA + "(" + DataColumns.ID + " INTEGER PRIMARY KEY," + @@ -76,7 +76,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { DataColumns.DATA2 + " INTEGER," + DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + - DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + + DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''," + + DataColumns.LOCATION + " TEXT NOT NULL DEFAULT ''" + ")"; private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = @@ -323,6 +324,15 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { oldVersion++; } + if (oldVersion == 4) { + upgradeToV5(db); + oldVersion++; + } + + if (oldVersion == 5) { + upgradeToV6(db); + oldVersion++; + } if (reCreateTriggers) { reCreateNoteTableTriggers(db); @@ -335,8 +345,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { } } - - private void upgradeToV2(SQLiteDatabase db) { db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA); @@ -363,4 +371,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0"); } + + private void upgradeToV5(SQLiteDatabase db) { + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.TOP + + " INTEGER NOT NULL DEFAULT 0"); + } + + private void upgradeToV6(SQLiteDatabase db) { + db.execSQL("ALTER TABLE " + TABLE.DATA + " ADD COLUMN " + DataColumns.LOCATION + + "TEXT NOT NULL DEFAULT ''"); + } } diff --git a/src/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/main/java/net/micode/notes/data/NotesProvider.java similarity index 64% rename from src/app/src/main/java/net/micode/notes/data/NotesProvider.java rename to src/main/java/net/micode/notes/data/NotesProvider.java index edb0a60..1cc63c6 100644 --- a/src/app/src/main/java/net/micode/notes/data/NotesProvider.java +++ b/src/main/java/net/micode/notes/data/NotesProvider.java @@ -33,12 +33,18 @@ import net.micode.notes.R; import net.micode.notes.data.Notes.DataColumns; import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.NotesDatabaseHelper.TABLE; +import net.micode.notes.gtask.data.SqlNote; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.Iterator; public class NotesProvider extends ContentProvider { private static final UriMatcher mMatcher; - private NotesDatabaseHelper mHelper; + private static NotesDatabaseHelper mHelper; private static final String TAG = "NotesProvider"; @@ -302,4 +308,147 @@ public class NotesProvider extends ContentProvider { return null; } + + + + public static JSONObject uploadnote()throws JSONException { + JSONObject js = new JSONObject(); + SQLiteDatabase db; + db = mHelper.getReadableDatabase(); + Cursor cursor = null; + cursor = db.query(NotesDatabaseHelper.TABLE.NOTE, + null, null, null, null, null, null); + //判断游标是否为空 + if (cursor.moveToFirst()) { + for (int index = 1; index <= cursor.getCount(); index++) { + JSONObject note = new JSONObject(); + note.put(NoteColumns.PARENT_ID,cursor.getString(1)); + note.put(NoteColumns.ALERTED_DATE,cursor.getString(2)); + note.put(NoteColumns.BG_COLOR_ID,cursor.getString(3)); + note.put(NoteColumns.CREATED_DATE,cursor.getString(4)); + note.put(NoteColumns.HAS_ATTACHMENT,cursor.getString(5)); + note.put(NoteColumns.MODIFIED_DATE,cursor.getString(6)); + note.put(NoteColumns.NOTES_COUNT,cursor.getString(7)); + note.put(NoteColumns.SNIPPET,cursor.getString(8)); + note.put(NoteColumns.TYPE,cursor.getString(9)); + note.put(NoteColumns.WIDGET_ID,cursor.getString(10)); + note.put(NoteColumns.WIDGET_TYPE,cursor.getString(11)); + note.put(NoteColumns.SYNC_ID,cursor.getString(12)); + note.put(NoteColumns.LOCAL_MODIFIED,cursor.getString(13)); + note.put(NoteColumns.ORIGIN_PARENT_ID,cursor.getString(14)); + note.put(NoteColumns.GTASK_ID,cursor.getString(15)); + note.put(NoteColumns.VERSION,cursor.getString(16)); + note.put(NoteColumns.TOP,cursor.getString(17)); + js.put(cursor.getString(0),note); + if(!cursor.isLast()){ + cursor.moveToNext(); + } + } + } + System.out.println(js); + return js; + } + public static JSONObject uploaddata()throws JSONException { + JSONObject js = new JSONObject(); + SQLiteDatabase db; + db = mHelper.getReadableDatabase(); + Cursor cursor = null; + cursor = db.query(NotesDatabaseHelper.TABLE.DATA, + null, null, null, null, null, null); + //判断游标是否为空 + if (cursor.moveToFirst()) { + for (int index = 1; index <= cursor.getCount(); index++) { + + JSONObject data = new JSONObject(); + data.put(DataColumns.MIME_TYPE,cursor.getString(1)); + data.put(DataColumns.NOTE_ID,cursor.getString(2)); + data.put(DataColumns.CREATED_DATE,cursor.getString(3)); + data.put(DataColumns.MODIFIED_DATE,cursor.getString(4)); + data.put(DataColumns.CONTENT,cursor.getString(5)); + data.put(DataColumns.DATA1,cursor.getString(6)); + data.put(DataColumns.DATA2,cursor.getString(7)); + data.put(DataColumns.DATA3,cursor.getString(8)); + data.put(DataColumns.DATA4,cursor.getString(9)); + data.put(DataColumns.DATA5,cursor.getString(10)); + js.put(cursor.getString(0),data); + if(!cursor.isLast()){ + cursor.moveToNext(); + } + } + } + System.out.println(js); + return js; + } + + public static void syncTABLE(JSONObject JSONInfo) throws JSONException { + SQLiteDatabase db; + db = mHelper.getReadableDatabase(); + String sql; + JSONObject NOTE = null; + JSONObject DATA = null; + try { + NOTE = (JSONObject) JSONInfo.get("NOTE"); + DATA = (JSONObject) JSONInfo.get("DATA"); + } catch (Exception e) { + e.printStackTrace(); + } + + sql = "DELETE FROM" + " " + TABLE.NOTE; + db.execSQL(sql); + + assert NOTE != null; + Iterator NOTEKeys = NOTE.keys(); + while (NOTEKeys.hasNext()){ + String NOTEKey = NOTEKeys.next(); + JSONObject NOTEInfo = (JSONObject) NOTE.get(NOTEKey); + sql = "INSERT INTO note(_id,parent_id,alert_date,bg_color_id,created_date,has_attachment,modified_date," + + "notes_count,snippet,type,widget_id,widget_type,sync_id,local_modified,origin_parent_id,gtask_id," + + "version,top,star,passcode) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + Object bindArgs[] = new Object[] { + NOTEKey, + NOTEInfo.getString("parent_id"), + NOTEInfo.getString("alert_date"), + NOTEInfo.getString("bg_color_id"), + NOTEInfo.getString("created_date"), + NOTEInfo.getString("has_attachment"), + NOTEInfo.getString("modified_date"), + "0",//NOTEInfo.getString("notes_count") + "0", + NOTEInfo.getString("snippet"), + NOTEInfo.getString("type"), + NOTEInfo.getString("widget_id"), + NOTEInfo.getString("widget_type"), + NOTEInfo.getString("sync_id"), + NOTEInfo.getString("local_modified"), + NOTEInfo.getString("origin_parent_id"), + NOTEInfo.getString("gtask_id"), + NOTEInfo.getString("version"), + NOTEInfo.getString("top"), + NOTEInfo.getString("star"), + NOTEInfo.getString("passcode") + }; + db.execSQL(sql,bindArgs); + } + + assert DATA != null; + Iterator DATAKeys = DATA.keys(); + while (DATAKeys.hasNext()){ + String DATAKey = DATAKeys.next(); + JSONObject DATAInfo = (JSONObject) DATA.get(DATAKey); + sql = "INSERT INTO data(_id,mime_type,note_id,created_date,modified_date,content,data3,data4,data5)" + + "values (?,?,?,?,?,?,?,?,?)"; + Object bindArgs[] = new Object[] { + DATAKey, + DATAInfo.getString("mime_type"), + DATAInfo.getString("note_id"), + DATAInfo.getString("created_date"), + DATAInfo.getString("modified_date"), + DATAInfo.getString("content"), + DATAInfo.getString("data3"), + DATAInfo.getString("data4"), + DATAInfo.getString("data5") + }; + db.execSQL(sql,bindArgs); + } + } } diff --git a/src/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/main/java/net/micode/notes/gtask/data/MetaData.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/gtask/data/MetaData.java rename to src/main/java/net/micode/notes/gtask/data/MetaData.java diff --git a/src/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/main/java/net/micode/notes/gtask/data/Node.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/gtask/data/Node.java rename to src/main/java/net/micode/notes/gtask/data/Node.java diff --git a/src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/main/java/net/micode/notes/gtask/data/SqlData.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java rename to src/main/java/net/micode/notes/gtask/data/SqlData.java diff --git a/src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/main/java/net/micode/notes/gtask/data/SqlNote.java similarity index 98% rename from src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java rename to src/main/java/net/micode/notes/gtask/data/SqlNote.java index 79a4095..1dd6ad8 100644 --- a/src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java +++ b/src/main/java/net/micode/notes/gtask/data/SqlNote.java @@ -49,7 +49,7 @@ public class SqlNote { NoteColumns.NOTES_COUNT, NoteColumns.PARENT_ID, NoteColumns.SNIPPET, NoteColumns.TYPE, NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.SYNC_ID, NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID, - NoteColumns.VERSION + NoteColumns.VERSION,NoteColumns.TOP, }; public static final int ID_COLUMN = 0; @@ -86,6 +86,8 @@ public class SqlNote { public static final int VERSION_COLUMN = 16; + public static final int Top_COLUMN = 17; + private Context mContext; private ContentResolver mContentResolver; @@ -118,6 +120,8 @@ public class SqlNote { private long mVersion; + private String mTop; + private ContentValues mDiffNoteValues; private ArrayList mDataList; @@ -139,6 +143,7 @@ public class SqlNote { mWidgetType = Notes.TYPE_WIDGET_INVALIDE; mOriginParent = 0; mVersion = 0; + mTop = getmTop(); mDiffNoteValues = new ContentValues(); mDataList = new ArrayList(); } @@ -152,6 +157,7 @@ public class SqlNote { if (mType == Notes.TYPE_NOTE) loadDataContent(); mDiffNoteValues = new ContentValues(); + mTop = getmTop(); } public SqlNote(Context context, long id) { @@ -163,7 +169,12 @@ public class SqlNote { if (mType == Notes.TYPE_NOTE) loadDataContent(); mDiffNoteValues = new ContentValues(); + mTop = getmTop(); + + } + public String getmTop(){ + return mTop; } private void loadFromCursor(long id) { @@ -198,6 +209,7 @@ public class SqlNote { mWidgetId = c.getInt(WIDGET_ID_COLUMN); mWidgetType = c.getInt(WIDGET_TYPE_COLUMN); mVersion = c.getLong(VERSION_COLUMN); + mTop = c.getString(Top_COLUMN); } private void loadDataContent() { diff --git a/src/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/main/java/net/micode/notes/gtask/data/Task.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/gtask/data/Task.java rename to src/main/java/net/micode/notes/gtask/data/Task.java diff --git a/src/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/main/java/net/micode/notes/gtask/data/TaskList.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/gtask/data/TaskList.java rename to src/main/java/net/micode/notes/gtask/data/TaskList.java diff --git a/src/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java rename to src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java diff --git a/src/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java rename to src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java diff --git a/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java similarity index 96% rename from src/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java rename to src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java index 663d4c0..3f3c358 100644 --- a/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java +++ b/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java @@ -77,9 +77,8 @@ public class GTaskASyncTask extends AsyncTask { pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, NotesListActivity.class), 0); } - /** notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, - pendingIntent); - mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);**/ + + mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); } @Override diff --git a/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java rename to src/main/java/net/micode/notes/gtask/remote/GTaskClient.java diff --git a/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java rename to src/main/java/net/micode/notes/gtask/remote/GTaskManager.java diff --git a/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java rename to src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java diff --git a/src/app/src/main/java/net/micode/notes/model/Note.java b/src/main/java/net/micode/notes/model/Note.java similarity index 97% rename from src/app/src/main/java/net/micode/notes/model/Note.java rename to src/main/java/net/micode/notes/model/Note.java index 6706cf6..0ccf19f 100644 --- a/src/app/src/main/java/net/micode/notes/model/Note.java +++ b/src/main/java/net/micode/notes/model/Note.java @@ -47,6 +47,7 @@ public class Note { long createdTime = System.currentTimeMillis(); values.put(NoteColumns.CREATED_DATE, createdTime); values.put(NoteColumns.MODIFIED_DATE, createdTime); + //values.put(NoteColumns.TOP,"1"); values.put(NoteColumns.TYPE, Notes.TYPE_NOTE); values.put(NoteColumns.LOCAL_MODIFIED, 1); values.put(NoteColumns.PARENT_ID, folderId); @@ -76,6 +77,10 @@ public class Note { mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); } + public void setTopValue(String key, String value) { + mNoteDiffValues.put(key, value); + } + public void setTextData(String key, String value) { mNoteData.setTextData(key, value); } @@ -135,6 +140,8 @@ public class Note { private ContentValues mTextDataValues; + private ContentValues mTopValues; + private long mCallDataId; private ContentValues mCallDataValues; @@ -144,6 +151,7 @@ public class Note { public NoteData() { mTextDataValues = new ContentValues(); mCallDataValues = new ContentValues(); + mTopValues = new ContentValues(); mTextDataId = 0; mCallDataId = 0; } diff --git a/src/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/main/java/net/micode/notes/model/WorkingNote.java similarity index 92% rename from src/app/src/main/java/net/micode/notes/model/WorkingNote.java rename to src/main/java/net/micode/notes/model/WorkingNote.java index 6472aaa..cb16126 100644 --- a/src/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ b/src/main/java/net/micode/notes/model/WorkingNote.java @@ -29,6 +29,7 @@ import net.micode.notes.data.Notes.DataColumns; import net.micode.notes.data.Notes.DataConstants; import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.Notes.TextNote; +import net.micode.notes.data.NotesProvider; import net.micode.notes.tool.ResourceParser.NoteBgResources; @@ -60,6 +61,14 @@ public class WorkingNote { private boolean mIsDeleted; + + /**记录已置顶便签*/ + private String mTop = "0"; + + /**记录便签所属类别*/ + private int mClass; + + private NoteSettingChangedListener mNoteSettingStatusListener; public static final String[] DATA_PROJECTION = new String[] { @@ -78,7 +87,8 @@ public class WorkingNote { NoteColumns.BG_COLOR_ID, NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, - NoteColumns.MODIFIED_DATE + NoteColumns.MODIFIED_DATE, + NoteColumns.TOP, }; private static final int DATA_ID_COLUMN = 0; @@ -101,6 +111,7 @@ public class WorkingNote { private static final int NOTE_MODIFIED_DATE_COLUMN = 5; + private static final int NOTE_TOP_COLUMN = 6; // New note construct private WorkingNote(Context context, long folderId) { @@ -113,6 +124,7 @@ public class WorkingNote { mIsDeleted = false; mMode = 0; mWidgetType = Notes.TYPE_WIDGET_INVALIDE; + mTop = String.valueOf(getTopId()); } // Existing note construct @@ -138,6 +150,7 @@ public class WorkingNote { mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN); mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN); mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN); + mTop = cursor.getString(NOTE_TOP_COLUMN); } cursor.close(); } else { @@ -230,6 +243,16 @@ public class WorkingNote { mNoteSettingStatusListener = l; } + public void setTop(String Top){ + if (!mTop.equals(Top)) { + mTop = Top; + mNote.setTopValue(NoteColumns.TOP,mTop); + } + if (mNoteSettingStatusListener != null) { + mNoteSettingStatusListener.onTopChanged(Top); + } + } + public void setAlertDate(long date, boolean set) { if (date != mAlertDate) { mAlertDate = date; @@ -289,6 +312,10 @@ public class WorkingNote { } } + public void setmContent(String text){ + mContent = text; + } + public void convertToCallNote(String phoneNumber, long callDate) { mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate)); mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber); @@ -299,6 +326,14 @@ public class WorkingNote { return (mAlertDate > 0 ? true : false); } + public int getTopId() { + if (mTop.equals("1")) { + return 1; + } else { + return 0; + } + } + public String getContent() { return mContent; } @@ -349,6 +384,12 @@ public class WorkingNote { */ void onBackgroundColorChanged(); + /** + * Called when user set top + */ + void onTopChanged(String Top); + + /** * Called when user set clock */ @@ -366,7 +407,4 @@ public class WorkingNote { */ void onCheckListModeChanged(int oldMode, int newMode); } - - - } diff --git a/src/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/main/java/net/micode/notes/tool/BackupUtils.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/tool/BackupUtils.java rename to src/main/java/net/micode/notes/tool/BackupUtils.java diff --git a/src/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/main/java/net/micode/notes/tool/DataUtils.java similarity index 96% rename from src/app/src/main/java/net/micode/notes/tool/DataUtils.java rename to src/main/java/net/micode/notes/tool/DataUtils.java index 2a14982..0487afa 100644 --- a/src/app/src/main/java/net/micode/notes/tool/DataUtils.java +++ b/src/main/java/net/micode/notes/tool/DataUtils.java @@ -16,6 +16,7 @@ package net.micode.notes.tool; +import android.app.Activity; import android.content.ContentProviderOperation; import android.content.ContentProviderResult; import android.content.ContentResolver; @@ -25,14 +26,23 @@ import android.content.OperationApplicationException; import android.database.Cursor; import android.os.RemoteException; import android.util.Log; +import android.database.sqlite.SQLiteDatabase; +import android.widget.Toast; +import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.CallNote; import net.micode.notes.data.Notes.NoteColumns; +import net.micode.notes.data.NotesDatabaseHelper; +import net.micode.notes.data.NotesProvider; +import net.micode.notes.gtask.data.SqlNote; +import net.micode.notes.model.Note; +import net.micode.notes.ui.NoteEditActivity; import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute; import java.util.ArrayList; import java.util.HashSet; +import java.util.TreeSet; public class DataUtils { diff --git a/src/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/main/java/net/micode/notes/tool/GTaskStringUtils.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java rename to src/main/java/net/micode/notes/tool/GTaskStringUtils.java diff --git a/src/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/main/java/net/micode/notes/tool/ResourceParser.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/tool/ResourceParser.java rename to src/main/java/net/micode/notes/tool/ResourceParser.java diff --git a/src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java similarity index 99% rename from src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java rename to src/main/java/net/micode/notes/ui/AlarmAlertActivity.java index 85723be..3e6173b 100644 --- a/src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java +++ b/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java @@ -1,3 +1,4 @@ + /* * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) * diff --git a/src/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java rename to src/main/java/net/micode/notes/ui/AlarmInitReceiver.java diff --git a/src/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/main/java/net/micode/notes/ui/AlarmReceiver.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java rename to src/main/java/net/micode/notes/ui/AlarmReceiver.java diff --git a/src/main/java/net/micode/notes/ui/ChangingPassword.java b/src/main/java/net/micode/notes/ui/ChangingPassword.java new file mode 100644 index 0000000..d32712e --- /dev/null +++ b/src/main/java/net/micode/notes/ui/ChangingPassword.java @@ -0,0 +1,69 @@ +package net.micode.notes.ui; + +import android.app.Activity; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.view.View; +import android.view.WindowManager; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +import net.micode.notes.R; + +public class ChangingPassword extends Activity { + EditText OldPassword; + EditText NewPassword; + EditText AckPassword; + Button Acknowledged; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_change_password); + getWindow().setSoftInputMode( + WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE + | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); + OldPassword=(EditText) findViewById(R.id.old_password); + NewPassword=(EditText) findViewById(R.id.new_password); + AckPassword=(EditText) findViewById(R.id.ack_password); + Acknowledged=(Button)findViewById(R.id.Acknowledged); + Acknowledged.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + String old_password = OldPassword.getText().toString(); + String new_password = NewPassword.getText().toString(); + String ack_password = AckPassword.getText().toString(); + SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE); + String login_password=pref.getString("password",""); + if(old_password.equals("")==true || new_password.equals("")==true || ack_password.equals("")==true) { + Toast.makeText(ChangingPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show(); + }else if (new_password.equals(ack_password) == false) { + Toast.makeText(ChangingPassword.this, "新建密码与重复密码不匹配，请重新输入密码", Toast.LENGTH_SHORT).show(); + AckPassword.setText(""); + }else if(old_password.equals(login_password) == false){ + Toast.makeText(ChangingPassword.this, "原有密码错误，请重新输入密码", Toast.LENGTH_SHORT).show(); + OldPassword.setText(""); + } + else if (new_password.equals(ack_password) == true && old_password.equals(login_password) == true){ + SharedPreferences.Editor editor=getSharedPreferences("user management", MODE_PRIVATE).edit(); + editor.putString("password",new_password); + editor.apply(); + Toast.makeText(ChangingPassword.this, "修改密码成功", Toast.LENGTH_SHORT).show(); + Intent intent=new Intent(ChangingPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } + } + }); + } + + @Override + public void onBackPressed() { + Intent intent=new Intent(ChangingPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } +} + diff --git a/src/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/main/java/net/micode/notes/ui/DateTimePicker.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/ui/DateTimePicker.java rename to src/main/java/net/micode/notes/ui/DateTimePicker.java diff --git a/src/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java rename to src/main/java/net/micode/notes/ui/DateTimePickerDialog.java diff --git a/src/main/java/net/micode/notes/ui/DeletingPassword.java b/src/main/java/net/micode/notes/ui/DeletingPassword.java new file mode 100644 index 0000000..0e4dfe2 --- /dev/null +++ b/src/main/java/net/micode/notes/ui/DeletingPassword.java @@ -0,0 +1,63 @@ +package net.micode.notes.ui; + +import android.app.Activity; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.view.View; +import android.view.WindowManager; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +import net.micode.notes.R; + +public class DeletingPassword extends Activity { + EditText Dt_password; + Button Acknowledged; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_delete_password); + getWindow().setSoftInputMode( + WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE + | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); + Dt_password=(EditText) findViewById(R.id.thepassword); + Acknowledged=(Button)findViewById(R.id.Dt_Acknowledged); + Acknowledged.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + String text02 = Dt_password.getText().toString(); + if(text02.equals("")==true) + Toast.makeText(DeletingPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show(); + SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE); + String password = pref.getString("password",""); + if(password.equals("")==false&&password.equals(text02)==true){ + SharedPreferences.Editor editor=getSharedPreferences("user management", + MODE_PRIVATE).edit(); + editor.putBoolean("user",false);//false表示已经设置登录密码 + editor.putString("password",""); + editor.apply(); + + Toast.makeText(DeletingPassword.this, "已经删除登录密码", Toast.LENGTH_SHORT).show(); + Intent intent=new Intent(DeletingPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } + else{ + Toast.makeText(DeletingPassword.this, "密码错误", Toast.LENGTH_SHORT).show(); + Dt_password.setText("");//把密码框内输入过的错误密码清空 + } + } + }); + } + + @Override + public void onBackPressed() { + Intent intent=new Intent(DeletingPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } +} + diff --git a/src/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/main/java/net/micode/notes/ui/DropdownMenu.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/ui/DropdownMenu.java rename to src/main/java/net/micode/notes/ui/DropdownMenu.java diff --git a/src/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/main/java/net/micode/notes/ui/FoldersListAdapter.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java rename to src/main/java/net/micode/notes/ui/FoldersListAdapter.java diff --git a/src/main/java/net/micode/notes/ui/GetLocation.java b/src/main/java/net/micode/notes/ui/GetLocation.java new file mode 100644 index 0000000..02b1d00 --- /dev/null +++ b/src/main/java/net/micode/notes/ui/GetLocation.java @@ -0,0 +1,43 @@ +package net.micode.notes.ui; + +import android.os.Bundle; +import android.speech.tts.TextToSpeech; +import android.support.v7.app.AppCompatActivity; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.Button; +import android.widget.Toast; + +import net.micode.notes.R; + + +public class GetLocation extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + this.setContentView(R.layout.local); + Toast.makeText(GetLocation.this,"init",Toast.LENGTH_SHORT).show(); + Button local_1 = new Button(this); + Button local_2 = new Button(this); + local_1.setOnClickListener(new View.OnClickListener() { + private static final String TAG = "GetLocation"; + + @Override + public void onClick(View v) { + Log.i(TAG, "onClick: button1"); + Toast.makeText(GetLocation.this,"button1",Toast.LENGTH_SHORT).show(); + } + }); + local_2.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Toast.makeText(GetLocation.this, "button2", Toast.LENGTH_SHORT).show(); + } + }); + } + + + +} diff --git a/src/main/java/net/micode/notes/ui/LoginActivity.java b/src/main/java/net/micode/notes/ui/LoginActivity.java new file mode 100644 index 0000000..99bcb19 --- /dev/null +++ b/src/main/java/net/micode/notes/ui/LoginActivity.java @@ -0,0 +1,57 @@ +package net.micode.notes.ui; + +import android.app.Activity; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.view.View; +import android.view.WindowManager; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +import net.micode.notes.R; + +public class LoginActivity extends Activity { + + EditText lg_password; + Button lg_login; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE); + boolean User_boolean = pref.getBoolean("user",false);//获取用户是否设置了密码 + if(!User_boolean) //User_boolean = false时，（没有设置密码），直接跳转到便签主界面 + { + Intent intent=new Intent(LoginActivity.this,NotesListActivity.class); + startActivity(intent); + finish(); + } + + setContentView(R.layout.activity_login); + getWindow().setSoftInputMode( + WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE + | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); + lg_password=(EditText) findViewById(R.id.lg_password); + lg_login=(Button)findViewById(R.id.login); + lg_login.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE); + String password=pref.getString("password",""); + if(password.equals("")==false&&password.equals(lg_password.getText().toString())==true){ + Intent intent=new Intent(LoginActivity.this,NotesListActivity.class); + startActivity(intent); + finish(); + } + else{ + Toast.makeText(LoginActivity.this, "密码错误", Toast.LENGTH_SHORT).show(); + lg_password.setText("");//把密码框内输入过的错误密码清空 + } + } + } + ); + + } +} \ No newline at end of file diff --git a/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/main/java/net/micode/notes/ui/NoteEditActivity.java new file mode 100644 index 0000000..3b8a233 --- /dev/null +++ b/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -0,0 +1,1689 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + +package net.micode.notes.ui; + +import android.Manifest; +import android.app.Activity; +import android.content.ContentResolver; +import android.content.ContentValues; +import android.content.pm.PackageManager; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Typeface; +import android.location.Address; +import android.location.Geocoder; +import android.location.Location; +import android.location.LocationListener; +import android.location.LocationManager; +import android.net.Uri; +import android.os.Build; +import android.provider.DocumentsContract; +import android.provider.MediaStore; +import android.speech.tts.TextToSpeech; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.annotation.RequiresApi; +import android.support.v4.app.ActivityCompat; +import android.support.v4.content.ContextCompat; +import android.support.v7.app.AppCompatActivity; +import android.app.AlarmManager; +import android.app.AlertDialog; +import android.app.PendingIntent; +import android.app.SearchManager; +import android.appwidget.AppWidgetManager; +import android.content.ContentUris; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.SharedPreferences; +import android.graphics.Paint; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.telecom.Call; +import android.text.Editable; +import android.text.Spannable; +import android.text.SpannableString; +import android.text.TextUtils; +import android.text.TextWatcher; +import android.text.format.DateUtils; +import android.text.style.BackgroundColorSpan; +import android.text.style.ImageSpan; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; +import android.view.MotionEvent; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.WindowManager; +import android.widget.Button; +import android.widget.CheckBox; +import android.widget.CompoundButton; +import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.EditText; +import android.widget.ImageButton; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TextView; +import android.widget.Toast; + +import net.micode.notes.R; +import net.micode.notes.data.Notes; +import net.micode.notes.data.Notes.TextNote; +import net.micode.notes.model.WorkingNote; +import net.micode.notes.model.WorkingNote.NoteSettingChangedListener; +import net.micode.notes.tool.DataUtils; +import net.micode.notes.tool.ResourceParser; +import net.micode.notes.tool.ResourceParser.TextAppearanceResources; +import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener; +import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener; +import net.micode.notes.ui.translate_demo.RespondBean; +import net.micode.notes.widget.NoteWidgetProvider_2x; +import net.micode.notes.widget.NoteWidgetProvider_4x; + +import java.io.FileNotFoundException; +import java.net.URI; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Vector; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import net.micode.notes.ui.translate_demo.MD5Utils; +import net.micode.notes.ui.translate_demo.BaiduTranslateService; + +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; + +import retrofit2.converter.gson.GsonConverterFactory; + + + + + +public class NoteEditActivity<关闭> extends AppCompatActivity implements OnClickListener, + NoteSettingChangedListener, OnTextViewChangeListener { + + private class HeadViewHolder { + public TextView tvModified; + + public ImageView ivAlertIcon; + + public TextView tvToptext; + + public TextView tvAlertDate; + + public ImageView ibSetBgColor; + } + + private static final Map sBgSelectorBtnsMap = new HashMap(); + + static { + sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW); + sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED); + sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE); + sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN); + sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE); + } + + private static final Map sBgSelectorSelectionMap = new HashMap(); + + static { + sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select); + sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select); + sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select); + sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select); + sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select); + } + + private static final Map sFontSizeBtnsMap = new HashMap(); + + static { + sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE); + sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL); + sFontSizeBtnsMap.put(R.id.ll_font_normal, ResourceParser.TEXT_MEDIUM); + sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER); + } + + private static final Map sFontSelectorSelectionMap = new HashMap(); + + static { + sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select); + sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select); + sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select); + sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select); + } + + private static final String TAG = "NoteEditActivity"; + + private HeadViewHolder mNoteHeaderHolder; + + private View mHeadViewPanel; + + private View mNoteBgColorSelector; + + private View mFontSizeSelector; + + private EditText mNoteEditor; + + private View mNoteEditorPanel; + + private WorkingNote mWorkingNote; + + private SharedPreferences mSharedPrefs; + private int mFontSizeId; + + + private static final String PREFERENCE_FONT_SIZE = "pref_font_size"; + + private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10; + + public static final String TAG_CHECKED = String.valueOf('\u221A'); + public static final String TAG_UNCHECKED = String.valueOf('\u25A1'); + + public static final int TAKE_PHOTO = 1; + public static final int CHOOSE_PHOTO = 2; + private final int PHOTO_SUCCESS = 3; + private final int CAMERA_SUCCESS = 4; + // TextToSpeech tts; + TextView num_word; + TextView location; + public static final int LOCATION_CODE = 301; + private LocationManager locationManager; + private String locationProvider = null; + private final int PHOTO_REQUEST = 1; + private AlertDialog alertDialog2; + private CharSequence restore_translate = null; + + private boolean mIsRvoke = false; + + + private LinearLayout mEditTextList; + + private String mUserQuery; + private Pattern mPattern; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + this.setContentView(R.layout.note_edit); + + if (savedInstanceState == null && !initActivityState(getIntent())) { + finish(); + return; + } + initResources(); + + + final ImageButton add_img_btn = (ImageButton) findViewById(R.id.add_img_btn); + add_img_btn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Log.d(TAG, "onClick: click add image button"); + Intent loadImage = new Intent(Intent.ACTION_GET_CONTENT); + loadImage.addCategory(Intent.CATEGORY_OPENABLE); + loadImage.setType("image/*"); + startActivityForResult(loadImage, PHOTO_REQUEST); + } + }); + + } + + + /** + * Current activity may be killed when the memory is low. Once it is killed, for another time + * user load this activity, we should restore the former state + */ + @Override + protected void onRestoreInstanceState(Bundle savedInstanceState) { + super.onRestoreInstanceState(savedInstanceState); + if (savedInstanceState != null && savedInstanceState.containsKey(Intent.EXTRA_UID)) { + Intent intent = new Intent(Intent.ACTION_VIEW); + intent.putExtra(Intent.EXTRA_UID, savedInstanceState.getLong(Intent.EXTRA_UID)); + if (!initActivityState(intent)) { + finish(); + return; + } + Log.d(TAG, "Restoring from killed activity"); + } + } + + private boolean initActivityState(Intent intent) { + /** + * If the user specified the {@link Intent#ACTION_VIEW} but not provided with id, + * then jump to the NotesListActivity + */ + mWorkingNote = null; + if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) { + long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0); + mUserQuery = ""; + + /** + * Starting from the searched result + */ + if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) { + noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY)); + mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY); + } + + if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) { + Intent jump = new Intent(this, NotesListActivity.class); + startActivity(jump); + showToast(R.string.error_note_not_exist); + finish(); + return false; + } else { + mWorkingNote = WorkingNote.load(this, noteId); + if (mWorkingNote == null) { + Log.e(TAG, "load note failed with note id" + noteId); + finish(); + return false; + } + } + getWindow().setSoftInputMode( + WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN + | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); + } else if (TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) { + // New note + long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0); + int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID, + AppWidgetManager.INVALID_APPWIDGET_ID); + int widgetType = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_TYPE, + Notes.TYPE_WIDGET_INVALIDE); + int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, + ResourceParser.getDefaultBgId(this)); + + // Parse call-record note + String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER); + long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0); + if (callDate != 0 && phoneNumber != null) { + if (TextUtils.isEmpty(phoneNumber)) { + Log.w(TAG, "The call record number is null"); + } + long noteId = 0; + if ((noteId = DataUtils.getNoteIdByPhoneNumberAndCallDate(getContentResolver(), + phoneNumber, callDate)) > 0) { + mWorkingNote = WorkingNote.load(this, noteId); + if (mWorkingNote == null) { + Log.e(TAG, "load call note failed with note id" + noteId); + finish(); + return false; + } + } else { + mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, + widgetType, bgResId); + mWorkingNote.convertToCallNote(phoneNumber, callDate); + } + } else { + mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType, + bgResId); + } + + getWindow().setSoftInputMode( + WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE + | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); + } else { + Log.e(TAG, "Intent not specified action, should not support"); + finish(); + return false; + } + mWorkingNote.setOnSettingStatusChangedListener(this); + return true; + } + + @Override + protected void onResume() { + super.onResume(); + initNoteScreen(); + } + + private void initNoteScreen() { + mNoteEditor.setTextAppearance(this, TextAppearanceResources + .getTexAppearanceResource(mFontSizeId)); + if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { + switchToListMode(mWorkingNote.getContent()); + } else { + mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); + mNoteEditor.setSelection(mNoteEditor.getText().length()); + } + for (Integer id : sBgSelectorSelectionMap.keySet()) { + findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE); + } + mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId()); + mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId()); + + mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this, + mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE + | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME + | DateUtils.FORMAT_SHOW_YEAR)); + + /** + * TODO: Add the menu for setting alert. Currently disable it because the DateTimePicker + * is not ready + */ + showAlertHeader(); + convertToImage(); + showTopHeader(); + } + + private void showAlertHeader() { + if (mWorkingNote.hasClockAlert()) { + long time = System.currentTimeMillis(); + if (time > mWorkingNote.getAlertDate()) { + mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired); + } else { + mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString( + mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS)); + } + mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE); + mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE); + } else { + mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE); + mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE); + } + } + + private void showTopHeader() { + mNoteHeaderHolder.tvToptext.setText(R.string.menu_set_top); + if (mWorkingNote.getTopId() == 1) { + mNoteHeaderHolder.tvToptext.setVisibility(View.VISIBLE); + } else { + mNoteHeaderHolder.tvToptext.setVisibility(View.GONE); + } + } + + @Override + protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); + initActivityState(intent); + } + + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + /** + * For new note without note id, we should firstly save it to + * generate a id. If the editing note is not worth saving, there + * is no id which is equivalent to create new note + */ + if (!mWorkingNote.existInDatabase()) { + saveNote(); + } + outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId()); + Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState"); + } + + @Override + public boolean dispatchTouchEvent(MotionEvent ev) { + if (mNoteBgColorSelector.getVisibility() == View.VISIBLE + && !inRangeOfView(mNoteBgColorSelector, ev)) { + mNoteBgColorSelector.setVisibility(View.GONE); + return true; + } + + if (mFontSizeSelector.getVisibility() == View.VISIBLE + && !inRangeOfView(mFontSizeSelector, ev)) { + mFontSizeSelector.setVisibility(View.GONE); + return true; + } + return super.dispatchTouchEvent(ev); + } + + private boolean inRangeOfView(View view, MotionEvent ev) { + int[] location = new int[2]; + view.getLocationOnScreen(location); + int x = location[0]; + int y = location[1]; + if (ev.getX() < x + || ev.getX() > (x + view.getWidth()) + || ev.getY() < y + || ev.getY() > (y + view.getHeight())) { + return false; + } + return true; + } + + private void initResources() { + mHeadViewPanel = findViewById(R.id.note_title); + mNoteHeaderHolder = new HeadViewHolder(); + mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date); + mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon); + mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date); + mNoteHeaderHolder.tvToptext = (TextView) findViewById(R.id.tv_set_top); + mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color); + + mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this); + mNoteEditor = (EditText) findViewById(R.id.note_edit_view); + mNoteEditor.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + + @Override + public void afterTextChanged(Editable s) {//文本更改后 + if (!mIsRvoke) { + saveMyChanged(); + } else { + mIsRvoke = false; + } + } + }); + mNoteEditorPanel = findViewById(R.id.sv_note_edit); + mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector); + for (int id : sBgSelectorBtnsMap.keySet()) { + ImageView iv = (ImageView) findViewById(id); + iv.setOnClickListener(this); + } + + mFontSizeSelector = findViewById(R.id.font_size_selector); + for (int id : sFontSizeBtnsMap.keySet()) { + View view = findViewById(id); + view.setOnClickListener(this); + } + ; + mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); + mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE); + /** + * HACKME: Fix bug of store the resource id in shared preference. + * * The id may larger than the length of resources, in this case, + * * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE} + */ + if (mFontSizeId >= TextAppearanceResources.getResourcesSize()) { + mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE; + } + mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list); + + + speech_sum(); + local_sel(); + translate(); + + } + + @Override + protected void onPause() { + super.onPause(); + if (saveNote()) { + Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length()); + } + clearSettingState(); + + } + + + private void updateWidget() { + Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); + if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) { + intent.setClass(this, NoteWidgetProvider_2x.class); + } else if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_4X) { + intent.setClass(this, NoteWidgetProvider_4x.class); + } else { + Log.e(TAG, "Unspported widget type"); + return; + } + + intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[]{ + mWorkingNote.getWidgetId() + }); + + sendBroadcast(intent); + setResult(RESULT_OK, intent); + } + + public void onClick(View v) { + int id = v.getId(); + if (id == R.id.btn_set_bg_color) { + mNoteBgColorSelector.setVisibility(View.VISIBLE); + findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( + View.VISIBLE); + } else if (sBgSelectorBtnsMap.containsKey(id)) { + findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( + View.GONE); + mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id)); + mNoteBgColorSelector.setVisibility(View.GONE); + } else if (sFontSizeBtnsMap.containsKey(id)) { + findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE); + mFontSizeId = sFontSizeBtnsMap.get(id); + mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit(); + findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); + if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { + getWorkingText(); + switchToListMode(mWorkingNote.getContent()); + } else { + mNoteEditor.setTextAppearance(this, + TextAppearanceResources.getTexAppearanceResource(mFontSizeId)); + } + mFontSizeSelector.setVisibility(View.GONE); + } + } + + @Override + public void onBackPressed() { + if (clearSettingState()) { + return; + } + + saveNote(); + super.onBackPressed(); + } + + private boolean clearSettingState() { + if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) { + mNoteBgColorSelector.setVisibility(View.GONE); + return true; + } else if (mFontSizeSelector.getVisibility() == View.VISIBLE) { + mFontSizeSelector.setVisibility(View.GONE); + return true; + } + return false; + } + + public void onBackgroundColorChanged() { + findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( + View.VISIBLE); + mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId()); + mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId()); + } + + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + if (isFinishing()) { + return true; + } + clearSettingState(); + menu.clear(); + if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) { + getMenuInflater().inflate(R.menu.call_note_edit, menu); + } else { + getMenuInflater().inflate(R.menu.note_edit, menu); + } + if (mWorkingNote.getTopId() == 1) { + menu.findItem(R.id.menu_set_top).setVisible(false); + } else if (mWorkingNote.getTopId() == 0) { + menu.findItem(R.id.menu_cancel_top).setVisible(false); + } + if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { + menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_normal_mode); + } else { + menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_list_mode); + } + if (mWorkingNote.hasClockAlert()) { + menu.findItem(R.id.menu_alert).setVisible(false); + } else { + menu.findItem(R.id.menu_delete_remind).setVisible(false); + } + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.menu_new_note: + createNewNote(); + break; + case R.id.menu_revoke: + doRevoke(); + break; + case R.id.menu_set_top: + mWorkingNote.setTop((mWorkingNote.getTopId()) == 1 ? "0" : "1"); + break; + case R.id.menu_cancel_top: + mWorkingNote.setTop((mWorkingNote.getTopId()) == 0 ? "1" : "0"); + break; + case R.id.menu_delete: + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(getString(R.string.alert_title_delete)); + builder.setIcon(android.R.drawable.ic_dialog_alert); + builder.setMessage(getString(R.string.alert_message_delete_note)); + builder.setPositiveButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + deleteCurrentNote(); + finish(); + } + }); + builder.setNegativeButton(android.R.string.cancel, null); + builder.show(); + break; + case R.id.menu_font_size: + mFontSizeSelector.setVisibility(View.VISIBLE); + findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); + break; + case R.id.menu_list_mode: + mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? + TextNote.MODE_CHECK_LIST : 0); + break; + case R.id.menu_share: + getWorkingText(); + sendTo(this, mWorkingNote.getContent()); + break; + case R.id.menu_send_to_desktop: + sendToDesktop(); + break; + case R.id.menu_alert: + setReminder(); + break; + case R.id.menu_delete_remind: + mWorkingNote.setAlertDate(0, false); + break; + case R.id.menu_font_select: + showSingleAlertDiglog(); + break; + case R.id.menu_count_word://数字统计 + AlertDialog.Builder builder1 = new AlertDialog.Builder(this);//对话框对象 + builder1.setIcon(android.R.drawable.ic_dialog_alert);//对话框图标 + TextView content = (TextView) findViewById(R.id.note_edit_view); + int c = content.length(); + builder1.setMessage("带符号字数总和统计为：" + c); + builder1.setPositiveButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + finish(); + } + });//确定按钮 + builder1.setNegativeButton(android.R.string.cancel, null);//取消按钮 + builder1.show();//对话框启动 + break; + default: + break; + } + return true; + } + + private void setReminder() { + DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis()); + d.setOnDateTimeSetListener(new OnDateTimeSetListener() { + public void OnDateTimeSet(AlertDialog dialog, long date) { + mWorkingNote.setAlertDate(date, true); + } + }); + d.show(); + } + + /** + * Share note to apps that support {@link Intent#ACTION_SEND} action + * and {@text/plain} type + */ + private void sendTo(Context context, String info) { + Intent intent = new Intent(Intent.ACTION_SEND); + intent.putExtra(Intent.EXTRA_TEXT, info); + intent.setType("text/plain"); + context.startActivity(intent); + } + + private void createNewNote() { + // Firstly, save current editing notes + saveNote(); + + // For safety, start a new NoteEditActivity + finish(); + Intent intent = new Intent(this, NoteEditActivity.class); + intent.setAction(Intent.ACTION_INSERT_OR_EDIT); + intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId()); + startActivity(intent); + } + + private void deleteCurrentNote() { + if (mWorkingNote.existInDatabase()) { + HashSet ids = new HashSet(); + long id = mWorkingNote.getNoteId(); + if (id != Notes.ID_ROOT_FOLDER) { + ids.add(id); + } else { + Log.d(TAG, "Wrong note id, should not happen"); + } + if (!isSyncMode()) { + if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) { + Log.e(TAG, "Delete Note error"); + } + } else { + if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) { + Log.e(TAG, "Move notes to trash folder error, should not happens"); + } + } + } + mWorkingNote.markDeleted(true); + } + + private boolean isSyncMode() { + return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0; + } + + public void onTopChanged(String Top) { + /** + * User could set clock to an unsaved note, so before setting the + * alert clock, we should save the note first + */ + saveNote(); + if (mWorkingNote.getNoteId() > 0) { + showTopHeader(); + } else { + /** + * There is the condition that user has input nothing (the note is + * not worthy saving), we have no note id, remind the user that he + * should input something + */ + Log.e(TAG, "Top setting error"); + showToast(R.string.error_note_empty_for_top); + } + } + + + public void onClockAlertChanged(long date, boolean set) { + /** + * User could set clock to an unsaved note, so before setting the + * alert clock, we should save the note first + */ + if (!mWorkingNote.existInDatabase()) { + saveNote(); + } + if (mWorkingNote.getNoteId() > 0) { + Intent intent = new Intent(this, AlarmReceiver.class); + intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId())); + PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0); + AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE)); + showAlertHeader(); + if (!set) { + alarmManager.cancel(pendingIntent); + } else { + alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent); + } + } else { + /** + * There is the condition that user has input nothing (the note is + * not worthy saving), we have no note id, remind the user that he + * should input something + */ + Log.e(TAG, "Clock alert setting error"); + showToast(R.string.error_note_empty_for_clock); + } + } + + public void onWidgetChanged() { + updateWidget(); + } + + public void onEditTextDelete(int index, String text) { + int childCount = mEditTextList.getChildCount(); + if (childCount == 1) { + return; + } + + for (int i = index + 1; i < childCount; i++) { + ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) + .setIndex(i - 1); + } + + mEditTextList.removeViewAt(index); + NoteEditText edit = null; + if (index == 0) { + edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById( + R.id.et_edit_text); + } else { + edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById( + R.id.et_edit_text); + } + int length = edit.length(); + edit.append(text); + edit.requestFocus(); + edit.setSelection(length); + } + + public void onEditTextEnter(int index, String text) { + /** + * Should not happen, check for debug + */ + if (index > mEditTextList.getChildCount()) { + Log.e(TAG, "Index out of mEditTextList boundrary, should not happen"); + } + + View view = getListItem(text, index); + mEditTextList.addView(view, index); + NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); + edit.requestFocus(); + edit.setSelection(0); + for (int i = index + 1; i < mEditTextList.getChildCount(); i++) { + ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) + .setIndex(i); + } + } + + private void switchToListMode(String text) { + mEditTextList.removeAllViews(); + String[] items = text.split("\n"); + int index = 0; + for (String item : items) { + if (!TextUtils.isEmpty(item)) { + mEditTextList.addView(getListItem(item, index)); + index++; + } + } + mEditTextList.addView(getListItem("", index)); + mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus(); + + mNoteEditor.setVisibility(View.GONE); + mEditTextList.setVisibility(View.VISIBLE); + } + + private Spannable getHighlightQueryResult(String fullText, String userQuery) { + SpannableString spannable = new SpannableString(fullText == null ? "" : fullText); + if (!TextUtils.isEmpty(userQuery)) { + mPattern = Pattern.compile(userQuery); + Matcher m = mPattern.matcher(fullText); + int start = 0; + while (m.find(start)) { + spannable.setSpan( + new BackgroundColorSpan(this.getResources().getColor( + R.color.user_query_highlight)), m.start(), m.end(), + Spannable.SPAN_INCLUSIVE_EXCLUSIVE); + start = m.end(); + } + } + return spannable; + } + + private View getListItem(String item, int index) { + View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null); + final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); + edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId)); + CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item)); + cb.setOnCheckedChangeListener(new OnCheckedChangeListener() { + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + if (isChecked) { + edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); + } else { + edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); + } + } + }); + + if (item.startsWith(TAG_CHECKED)) { + cb.setChecked(true); + edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); + item = item.substring(TAG_CHECKED.length(), item.length()).trim(); + } else if (item.startsWith(TAG_UNCHECKED)) { + cb.setChecked(false); + edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); + item = item.substring(TAG_UNCHECKED.length(), item.length()).trim(); + } + + edit.setOnTextViewChangeListener(this); + edit.setIndex(index); + edit.setText(getHighlightQueryResult(item, mUserQuery)); + return view; + } + + public void onTextChange(int index, boolean hasText) { + if (index >= mEditTextList.getChildCount()) { + Log.e(TAG, "Wrong index, should not happen"); + return; + } + if (hasText) { + mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE); + } else { + mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE); + } + } + + public void onCheckListModeChanged(int oldMode, int newMode) { + if (newMode == TextNote.MODE_CHECK_LIST) { + switchToListMode(mNoteEditor.getText().toString()); + } else { + if (!getWorkingText()) { + mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", + "")); + } + mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); + mEditTextList.setVisibility(View.GONE); + mNoteEditor.setVisibility(View.VISIBLE); + } + } + + private boolean getWorkingText() { + boolean hasChecked = false; + if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < mEditTextList.getChildCount(); i++) { + View view = mEditTextList.getChildAt(i); + NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); + if (!TextUtils.isEmpty(edit.getText())) { + if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) { + sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n"); + hasChecked = true; + } else { + sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n"); + } + } + } + mWorkingNote.setWorkingText(sb.toString()); + } else { + mWorkingNote.setWorkingText(mNoteEditor.getText().toString()); + } + return hasChecked; + } + + private boolean saveNote() { + getWorkingText(); + boolean saved = mWorkingNote.saveNote(); + if (saved) { + /** + * There are two modes from List view to edit view, open one note, + * create/edit a node. Opening node requires to the original + * position in the list when back from edit view, while creating a + * new node requires to the top of the list. This code + * {@link #RESULT_OK} is used to identify the create/edit state + */ + setResult(RESULT_OK); + } + return saved; + } + + private void sendToDesktop() { + /** + * Before send message to home, we should make sure that current + * editing note is exists in databases. So, for new note, firstly + * save it + */ + if (!mWorkingNote.existInDatabase()) { + saveNote(); + } + + if (mWorkingNote.getNoteId() > 0) { + Intent sender = new Intent(); + Intent shortcutIntent = new Intent(this, NoteEditActivity.class); + shortcutIntent.setAction(Intent.ACTION_VIEW); + shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId()); + sender.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent); + sender.putExtra(Intent.EXTRA_SHORTCUT_NAME, + makeShortcutIconTitle(mWorkingNote.getContent())); + sender.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, + Intent.ShortcutIconResource.fromContext(this, R.drawable.icon_app)); + sender.putExtra("duplicate", true); + sender.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); + showToast(R.string.info_note_enter_desktop); + sendBroadcast(sender); + } else { + /** + * There is the condition that user has input nothing (the note is + * not worthy saving), we have no note id, remind the user that he + * should input something + */ + Log.e(TAG, "Send to desktop error"); + showToast(R.string.error_note_empty_for_send_to_desktop); + } + } + + private String makeShortcutIconTitle(String content) { + content = content.replace(TAG_CHECKED, ""); + content = content.replace(TAG_UNCHECKED, ""); + return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0, + SHORTCUT_ICON_TITLE_MAX_LEN) : content; + } + + private void showToast(int resId) { + showToast(resId, Toast.LENGTH_SHORT); + } + + private void showToast(int resId, int duration) { + Toast.makeText(this, resId, duration).show(); + } + + + private String getLocation() { + //1.获取位置管理器 + String city = null; + locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE); + + + //2.获取位置提供器，GPS或是NetWork + List providers = locationManager.getProviders(true); + + if (providers.contains(LocationManager.GPS_PROVIDER)) { + //如果是GPS + locationProvider = LocationManager.GPS_PROVIDER; + Log.v("TAG", "定位方式GPS"); + } else if (providers.contains(LocationManager.NETWORK_PROVIDER)) { + //如果是Network + locationProvider = LocationManager.NETWORK_PROVIDER; + Log.v("TAG", "定位方式Network"); + } else { + Toast.makeText(this, "没有可用的位置提供器", Toast.LENGTH_SHORT).show(); + return null; + } + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + //获取权限（如果没有开启权限，会弹出对话框，询问是否开启权限） + if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) + != PackageManager.PERMISSION_GRANTED || + ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) + != PackageManager.PERMISSION_GRANTED) { + //请求权限 + ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.ACCESS_COARSE_LOCATION}, LOCATION_CODE); + } else { + //3.获取上次的位置，一般第一次运行，此值为null + Location location = locationManager.getLastKnownLocation(locationProvider); + if (location != null) { + Toast.makeText(this, location.getLongitude() + " " + + location.getLatitude() + "", Toast.LENGTH_SHORT).show(); + Log.v("TAG", "获取上次的位置-经纬度：" + location.getLongitude() + " " + location.getLatitude()); + city = getAddress(location); + + } else { + //监视地理位置变化，第二个和第三个参数分别为更新的最短时间minTime和最短距离minDistace + locationManager.requestLocationUpdates(locationProvider, 3000, 1, locationListener); + } + } + } else { + Location location = locationManager.getLastKnownLocation(locationProvider); + if (location != null) { + Toast.makeText(this, location.getLongitude() + " " + + location.getLatitude() + "", Toast.LENGTH_SHORT).show(); + Log.v("TAG", "获取上次的位置-经纬度：" + location.getLongitude() + " " + location.getLatitude()); + city = getAddress(location); + + } else { + //监视地理位置变化，第二个和第三个参数分别为更新的最短时间minTime和最短距离minDistace + locationManager.requestLocationUpdates(locationProvider, 3000, 1, locationListener); + } + } + return city; + } + + public LocationListener locationListener = new LocationListener() { + // Provider的状态在可用、暂时不可用和无服务三个状态直接切换时触发此函数 + @Override + public void onStatusChanged(String provider, int status, Bundle extras) { + } + + // Provider被enable时触发此函数，比如GPS被打开 + @Override + public void onProviderEnabled(String provider) { + } + + // Provider被disable时触发此函数，比如GPS被关闭 + @Override + public void onProviderDisabled(String provider) { + } + + //当坐标改变时触发此函数，如果Provider传进相同的坐标，它就不会被触发 + @Override + public void onLocationChanged(Location location) { + if (location != null) { + //如果位置发生变化，重新显示地理位置经纬度 + Toast.makeText(NoteEditActivity.this, location.getLongitude() + " " + + location.getLatitude() + "", Toast.LENGTH_SHORT).show(); + Log.v("TAG", "监视地理位置变化-经纬度：" + location.getLongitude() + " " + location.getLatitude()); + } + } + }; + + @Override + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + switch (requestCode) { + case LOCATION_CODE: + if (grantResults.length > 0 && grantResults[0] == getPackageManager().PERMISSION_GRANTED + && grantResults[1] == PackageManager.PERMISSION_GRANTED) { + Toast.makeText(this, "申请权限", Toast.LENGTH_LONG).show(); + try { + List providers = locationManager.getProviders(true); + if (providers.contains(LocationManager.NETWORK_PROVIDER)) { + //如果是Network + locationProvider = LocationManager.NETWORK_PROVIDER; + + } else if (providers.contains(LocationManager.GPS_PROVIDER)) { + //如果是GPS + locationProvider = LocationManager.GPS_PROVIDER; + } + Location location = locationManager.getLastKnownLocation(locationProvider); + if (location != null) { + Toast.makeText(this, location.getLongitude() + " " + + location.getLatitude() + "", Toast.LENGTH_SHORT).show(); + Log.v("TAG", "获取上次的位置-经纬度：" + location.getLongitude() + " " + location.getLatitude()); + } else { + // 监视地理位置变化，第二个和第三个参数分别为更新的最短时间minTime和最短距离minDistace + locationManager.requestLocationUpdates(locationProvider, 0, 0, locationListener); + } + + } catch (SecurityException e) { + e.printStackTrace(); + } + } else { + Toast.makeText(this, "缺少权限", Toast.LENGTH_LONG).show(); + finish(); + } + break; + } + } + + //获取地址信息:城市、街道等信息 + private String getAddress(Location location) { + List
result = null; + String city = null; + try { + if (location != null) { + Geocoder gc = new Geocoder(this, Locale.getDefault()); + result = gc.getFromLocation(location.getLatitude(), + location.getLongitude(), 1); + city = result.get(0).getAddressLine(0).toString(); + Toast.makeText(this, "获取地址信息：" + city, Toast.LENGTH_LONG).show(); + Log.v("TAG", "获取地址信息：" + city); + } + } catch (Exception e) { + e.printStackTrace(); + } + Log.e(TAG, city); + return city; + } + + + private void local_sel() { + final Button get_local = findViewById(R.id.location); + get_local.setOnClickListener(new OnClickListener() { + @Override + public void onClick(final View v) { + Button local1 = new Button(NoteEditActivity.this); + final Button local2 = new Button(NoteEditActivity.this); + local1.setText("获取地理信息"); + local2.setText("清除地理信息"); + LinearLayout linear = new LinearLayout(NoteEditActivity.this); + linear.setOrientation(LinearLayout.VERTICAL); + linear.addView(local1); + linear.addView(local2); + AlertDialog.Builder builder = new AlertDialog.Builder(NoteEditActivity.this); + builder.setView(linear); + builder.setTitle("请选择功能"); + AlertDialog choose_local = builder.create(); + choose_local.show(); + local1.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + Toast.makeText(NoteEditActivity.this, "获取地理信息", Toast.LENGTH_SHORT).show(); + String city = null; + city = getLocation(); + + if (city == null) { + get_local.setText("点击获得地理信息"); + } else { + get_local.setText(city); + } + } + }); + local2.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + Toast.makeText(NoteEditActivity.this, "清除地理信息", Toast.LENGTH_SHORT).show(); + get_local.setText("点击获得地理信息"); + } + }); + + } + +// builder.setTitle("choose"); +// AlertDialog choose_local = builder.create(); +// choose_local.show(); + + }); + } + + public void speech_sum() { + EditText editable = findViewById(R.id.note_edit_view); + //Toast.makeText(NoteEditActivity.this, editable.getText().toString(), Toast.LENGTH_SHORT).show(); + final Button speak = findViewById(R.id.iatBtn); + final int[] tmp = new int[1]; + final TextToSpeech[] tts = new TextToSpeech[1]; + tts[0] = new TextToSpeech(NoteEditActivity.this, new TextToSpeech.OnInitListener() { + @Override + public void onInit(int status) { + tts[0].setLanguage(Locale.US); + } + }); + editable.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + tmp[0] = cutOfimage(operateText(s.toString())).length(); + TextView number_word = findViewById(R.id.num_word); + number_word.setText("字符数：" + tmp[0]); + final String temp = cutOfimage(s.toString()); + speak.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + tts[0].speak(temp.toString(), TextToSpeech.QUEUE_FLUSH, null); + } + }); + } + + @Override + public void afterTextChanged(Editable s) { + } + }); + } + + public String operateText(String str) { + String dest = ""; + Pattern p = Pattern.compile("\\s*|t|r|n"); + Matcher m = p.matcher(str); + dest = m.replaceAll(""); + return dest; + } + + public String cutOfimage(String str) { + String dest = str; + int index1 = dest.indexOf("[local]"); + int index2 = dest.indexOf("[/local]"); + while (index1 != -1 && index2 != -1) { + dest = dest.substring(0, index1) + dest.substring(index2 + 8); + index1 = dest.indexOf("[local]"); + index2 = dest.indexOf("[/local]"); + } + return dest; + } + + + private void convertToImage() { + NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); + Editable editable = noteEditText.getText(); + String noteText = editable.toString(); + int length = editable.length(); + for (int i = 0; i < length; i++) { + for (int j = i; j < length; j++) { + String img_fragment = noteText.substring(i, j + 1); + if (img_fragment.length() > 15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")) { + int limit = 7; + int len = img_fragment.length() - 15; + String path = img_fragment.substring(limit, limit + len); + Bitmap bitmap = null; + Log.d(TAG, "图片的路径是：" + path); + try { + bitmap = BitmapFactory.decodeFile(path); + } catch (Exception e) { + e.printStackTrace(); + } + if (bitmap != null) { + Log.d(TAG, "图片不为null"); + ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); + String ss = "[local]" + path + "[/local]"; + SpannableString spannableString = new SpannableString(ss); + spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + Log.d(TAG, "Create spannable string success!"); + Editable edit_text = noteEditText.getEditableText(); + edit_text.delete(i, i + len + 15); + edit_text.insert(i, spannableString); + } + } + } + } + } + + + @RequiresApi(api = Build.VERSION_CODES.KITKAT) + protected void onActivityResult(int requestCode, int resultCode, Intent intent) { + super.onActivityResult(requestCode, resultCode, intent); + ContentResolver resolver = getContentResolver(); + switch (requestCode) { + case PHOTO_REQUEST: + Uri originalUri = intent.getData(); + Bitmap bitmap = null; + try { + bitmap = BitmapFactory.decodeStream(resolver.openInputStream(originalUri));//2.解码图片 + } catch (FileNotFoundException e) { + Log.d(TAG, "onActivityResult: get file_exception"); + e.printStackTrace(); + } + + if (bitmap != null) { + Log.d(TAG, "onActivityResult: bitmap is not null"); + ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); + String path = getPath(this, originalUri); + String img_fragment = "[local]" + path + "[/local]"; + SpannableString spannableString = new SpannableString(img_fragment); + spannableString.setSpan(imageSpan, 0, img_fragment.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + NoteEditText e = (NoteEditText) findViewById(R.id.note_edit_view); + int index = e.getSelectionStart(); + Log.d(TAG, "Index是: " + index); + Editable edit_text = e.getEditableText(); + edit_text.insert(index, spannableString); + mWorkingNote.setmContent(e.getText().toString()); + ContentResolver contentResolver = getContentResolver(); + ContentValues contentValues = new ContentValues(); + final long id = mWorkingNote.getNoteId(); + contentValues.put("snippet", mWorkingNote.getContent()); + contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues, "_id=?", new String[]{"" + id}); + ContentValues contentValues1 = new ContentValues(); + contentValues1.put("content", mWorkingNote.getContent()); + contentResolver.update(Uri.parse("content://micode_notes/data"), contentValues1, "mime_type=? and note_id=?", new String[]{"vnd.android.cursor.item/text_note", "" + id}); + + } else { + Toast.makeText(NoteEditActivity.this, "获取图片失败", Toast.LENGTH_SHORT).show(); + } + break; + default: + break; + } + } + + + @RequiresApi(api = Build.VERSION_CODES.KITKAT) + public String getPath(final Context context, final Uri uri) { + + final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; + if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) { + if (isMediaDocument(uri)) { + final String docId = DocumentsContract.getDocumentId(uri); + final String[] split = docId.split(":"); + final String type = split[0]; + + Uri contentUri = null; + if ("image".equals(type)) { + contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI; + } + + final String selection = "_id=?"; + final String[] selectionArgs = new String[]{split[1]}; + + return getDataColumn(context, contentUri, selection, selectionArgs); + } + } + // Media + else if ("content".equalsIgnoreCase(uri.getScheme())) { + return getDataColumn(context, uri, null, null); + } + // File + else if ("file".equalsIgnoreCase(uri.getScheme())) { + return uri.getPath(); + } + return null; + } + + public String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) { + + Cursor cursor = null; + final String column = "_data"; + final String[] projection = {column}; + + try { + cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null); + if (cursor != null && cursor.moveToFirst()) { + final int column_index = cursor.getColumnIndexOrThrow(column); + return cursor.getString(column_index); + } + } finally { + if (cursor != null) + cursor.close(); + } + return null; + } + + public boolean isMediaDocument(Uri uri) { + return "com.android.providers.media.documents".equals(uri.getAuthority()); + } + + + public void showSingleAlertDiglog() { + final String[] items = {"默认-普通", "默认-非衬线", "默认-衬线", "默认-等宽", "仿宋", "黑体", "楷体", "姚体", "隶书", "行楷", "新魏", "中宋"}; + AlertDialog.Builder alertBuilder = new AlertDialog.Builder(this); + alertBuilder.setTitle("选择字体"); + alertBuilder.setSingleChoiceItems(items, 0, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + switch (i) { + case 0: + mNoteEditor.setTypeface(Typeface.DEFAULT); + break; + case 1: + mNoteEditor.setTypeface(Typeface.SANS_SERIF); + break; + case 2: + mNoteEditor.setTypeface(Typeface.SERIF); + break; + case 3: + mNoteEditor.setTypeface(Typeface.MONOSPACE); + break; + case 4: + Typeface typeface0 = Typeface.createFromAsset(getAssets(), "font/simfang.ttf"); + mNoteEditor.setTypeface(typeface0); + break; + case 5: + Typeface typeface1 = Typeface.createFromAsset(getAssets(), "font/simhei.ttf"); + mNoteEditor.setTypeface(typeface1); + break; + case 6: + Typeface typeface2 = Typeface.createFromAsset(getAssets(), "font/simkai.ttf"); + mNoteEditor.setTypeface(typeface2); + break; + case 7: + Typeface typeface3 = Typeface.createFromAsset(getAssets(), "font/FZYTK.TTF"); + mNoteEditor.setTypeface(typeface3); + break; + case 8: + Typeface typeface4 = Typeface.createFromAsset(getAssets(), "font/STLITI.TTF"); + mNoteEditor.setTypeface(typeface4); + break; + case 9: + Typeface typeface5 = Typeface.createFromAsset(getAssets(), "font/STXINGKA.TTF"); + mNoteEditor.setTypeface(typeface5); + break; + case 10: + Typeface typeface6 = Typeface.createFromAsset(getAssets(), "font/STXINWEI.TTF"); + mNoteEditor.setTypeface(typeface6); + break; + case 11: + Typeface typeface7 = Typeface.createFromAsset(getAssets(), "font/STZHONGS.TTF"); + mNoteEditor.setTypeface(typeface7); + break; + } + Toast.makeText(NoteEditActivity.this, items[i], Toast.LENGTH_SHORT).show(); + } + }); + alertBuilder.setPositiveButton("确定", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + alertDialog2.dismiss(); + + } + + }); + alertBuilder.setNegativeButton("取消", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + alertDialog2.dismiss(); + } + + }); + alertDialog2 = alertBuilder.create(); + alertDialog2.show(); + } + + public void translate() { + final EditText editable = findViewById(R.id.note_edit_view); + final Button get_local = findViewById(R.id.translate); + get_local.setOnClickListener(new OnClickListener() { + @Override + public void onClick(final View v) { + Button trans1 = new Button(NoteEditActivity.this); + Button trans2 = new Button(NoteEditActivity.this); + Button trans3 = new Button(NoteEditActivity.this); + trans1.setText("中文翻译为英文"); + trans2.setText("英文翻译为中文"); + trans3.setText("还原"); + LinearLayout linear = new LinearLayout(NoteEditActivity.this); + linear.setOrientation(LinearLayout.VERTICAL); + linear.addView(trans1); + linear.addView(trans2); + linear.addView(trans3); + AlertDialog.Builder builder = new AlertDialog.Builder(NoteEditActivity.this); + builder.setView(linear); + builder.setTitle("请选择翻译模式"); + AlertDialog choose_trans = builder.create(); + choose_trans.show(); + trans1.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + restore_translate = editable.getText(); + translate_z2u(); + Toast.makeText(NoteEditActivity.this, "中文翻译为英文", Toast.LENGTH_SHORT).show(); + } + }); + trans2.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + restore_translate = editable.getText(); + translate_u2z(); + Toast.makeText(NoteEditActivity.this, "英文翻译为中文", Toast.LENGTH_SHORT).show(); + } + }); + trans3.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + if (restore_translate == null || restore_translate.toString().equals(editable.getText().toString())) { + Toast.makeText(NoteEditActivity.this, "无可还原内容", Toast.LENGTH_SHORT).show(); + } else { + editable.setText(restore_translate); + Toast.makeText(NoteEditActivity.this, "已还原", Toast.LENGTH_SHORT).show(); + } + } + }); + } + }); + } + + + public void translate_z2u() { + final EditText editable = findViewById(R.id.note_edit_view); + String word = editable.getText().toString(); + word = word.replaceAll("\\n", "//"); + String from = "auto"; + String to = "en"; + String appid = "20221021001406789"; + String salt = (int) (Math.random() * 100 + 1) + ""; + String key = "eWky8SSKgL99Dh4rHMog"; + String secretKey = appid + word + salt + key; + String sign = MD5Utils.getMD5Code(secretKey); + Log.d(TAG, "secretKey：" + secretKey); + Log.d(TAG, "sign: " + sign); + Retrofit retrofitBaidu = new Retrofit.Builder() + .baseUrl("https://fanyi-api.baidu.com/api/trans/vip/") + .addConverterFactory(GsonConverterFactory.create()) + .build(); + BaiduTranslateService baiduTranslateService = retrofitBaidu.create(BaiduTranslateService.class); + retrofit2.Call call = baiduTranslateService.translate(word, from, to, appid, salt, sign); + call.enqueue(new Callback() { + @Override + public void onResponse(retrofit2.Call call, Response response) { + Log.d(TAG, "onResponse: 请求成功"); + RespondBean respondBean = response.body(); + String result = respondBean.getTrans_result().get(0).getDst(); + editable.setText(result); + Log.d(TAG, "中译英结果" + result); + } + + @Override + public void onFailure(retrofit2.Call call, Throwable t) { + Log.d(TAG, "onResponse: 请求失败 " + t); + } + }); + } + + public void translate_u2z() { + final EditText editable = findViewById(R.id.note_edit_view); + String word = editable.getText().toString(); + word = word.replaceAll("\\n", "//"); + Log.d(TAG, word); + String from = "auto"; + String to = "zh"; + String appid = "20221021001406789"; + String salt = (int) (Math.random() * 100 + 1) + ""; + String key = "eWky8SSKgL99Dh4rHMog"; + String secretKey = appid + word + salt + key; + String sign = MD5Utils.getMD5Code(secretKey); + Log.d(TAG, "secretKey：" + secretKey); + Log.d(TAG, "sign: " + sign); + Retrofit retrofitBaidu = new Retrofit.Builder() + .baseUrl("https://fanyi-api.baidu.com/api/trans/vip/") + .addConverterFactory(GsonConverterFactory.create()) + .build(); + BaiduTranslateService baiduTranslateService = retrofitBaidu.create(BaiduTranslateService.class); + retrofit2.Call call = baiduTranslateService.translate(word, from, to, appid, salt, sign); + call.enqueue(new Callback() { + @Override + public void onResponse(retrofit2.Call call, Response response) { + Log.d(TAG, "onResponse: 请求成功"); + RespondBean respondBean = response.body(); + String result = respondBean.getTrans_result().get(0).getDst(); + editable.setText(result); + Log.d(TAG, "中译英结果" + result); + } + + @Override + public void onFailure(retrofit2.Call call, Throwable t) { + Log.d(TAG, "onResponse: 请求失败 " + t); + } + }); + } + + private static final int MAX_TIME_OF_RVOKE_TIME = 100; + private int MAX_OF_RVOKE_TIME = 100; + private Vector mChanged = new Vector(MAX_OF_RVOKE_TIME); + + private void saveMyChanged() { + SpannableString text = new SpannableString(mNoteEditor.getText());//用getText方法获取每次编辑的内容 + if (mChanged.size() >= MAX_TIME_OF_RVOKE_TIME) {//如果栈中的数据大于最大撤销次数，就把第一次修改的内容删除 + mChanged.removeElementAt(0); + } + mChanged.add(text);//然后把本次修改的内容加入栈中 + } + + private void doRevoke() { + int size = mChanged.size();//获取当前栈大小 + AlertDialog.Builder dialog = new AlertDialog.Builder(this);//创建一个alertdialog窗口 + dialog.setTitle(R.string.tips_of_revoke);//设置title信息 + dialog.setCancelable(true);//设置为可取消 + dialog.setPositiveButton("OK", new DialogInterface.OnClickListener() {//只需要设置一个OK键即可 + @Override + public void onClick(DialogInterface dialog, int which) { + } + }); + mIsRvoke = true;//把是否已执行撤销的标记设置为true + if (size <= 1) {//如果栈中元素过少，打印提示信息 + dialog.setMessage(R.string.have_not_input_anything);//提示用户您还没有输入任何信息 + dialog.show();//显示当前alertdialog + return; + } else { + mNoteEditor.setText((CharSequence) mChanged.elementAt(size - 2));//在textview中设置撤销的内容 + mNoteEditor.setSelection(mNoteEditor.length()); + mChanged.removeElementAt(size - 1);//删除元素 + if (size == 2) { + dialog.setMessage(R.string.can_not_revoke);//如果只有一次操作，那么提示用户不能再撤销了 + dialog.show();//显示当前alertdialog + } + } + } +} \ No newline at end of file diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/main/java/net/micode/notes/ui/NoteEditText.java similarity index 98% rename from src/app/src/main/java/net/micode/notes/ui/NoteEditText.java rename to src/main/java/net/micode/notes/ui/NoteEditText.java index 2afe2a8..24278b5 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java +++ b/src/main/java/net/micode/notes/ui/NoteEditText.java @@ -37,7 +37,7 @@ import net.micode.notes.R; import java.util.HashMap; import java.util.Map; -public class NoteEditText extends EditText { +public class NoteEditText extends android.support.v7.widget.AppCompatEditText { private static final String TAG = "NoteEditText"; private int mIndex; private int mSelectionStartBeforeDelete; diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/main/java/net/micode/notes/ui/NoteItemData.java similarity index 95% rename from src/app/src/main/java/net/micode/notes/ui/NoteItemData.java rename to src/main/java/net/micode/notes/ui/NoteItemData.java index 0f5a878..1966e95 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java +++ b/src/main/java/net/micode/notes/ui/NoteItemData.java @@ -40,6 +40,7 @@ public class NoteItemData { NoteColumns.TYPE, NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, + NoteColumns.TOP, }; private static final int ID_COLUMN = 0; @@ -54,6 +55,7 @@ public class NoteItemData { private static final int TYPE_COLUMN = 9; private static final int WIDGET_ID_COLUMN = 10; private static final int WIDGET_TYPE_COLUMN = 11; + private static final int TOP_ID_COLUMN = 12; private long mId; private long mAlertDate; @@ -69,6 +71,7 @@ public class NoteItemData { private int mWidgetType; private String mName; private String mPhoneNumber; + private String mTop; private boolean mIsLastItem; private boolean mIsFirstItem; @@ -91,6 +94,7 @@ public class NoteItemData { mType = cursor.getInt(TYPE_COLUMN); mWidgetId = cursor.getInt(WIDGET_ID_COLUMN); mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN); + mTop = cursor.getString(TOP_ID_COLUMN); mPhoneNumber = ""; if (mParentId == Notes.ID_CALL_RECORD_FOLDER) { @@ -134,6 +138,14 @@ public class NoteItemData { } } + public boolean isTOP() { + if(mTop.equals("1")) { + return true; + }else { + return false; + } + } + public boolean isOneFollowingFolder() { return mIsOneNoteFollowingFolder; } diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/main/java/net/micode/notes/ui/NotesListActivity.java similarity index 94% rename from src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java rename to src/main/java/net/micode/notes/ui/NotesListActivity.java index 7c0365f..61a997f 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -16,7 +16,9 @@ package net.micode.notes.ui; +import android.annotation.SuppressLint; import android.app.Activity; +import android.support.v7.app.AppCompatActivity; import android.app.AlertDialog; import android.app.Dialog; import android.appwidget.AppWidgetManager; @@ -78,7 +80,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.HashSet; -public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { +public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener { public static int secret_mode = 0; private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; @@ -137,10 +139,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private final static int REQUEST_CODE_OPEN_NODE = 102; private final static int REQUEST_CODE_NEW_NODE = 103; + static Activity NoteListActivity; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.note_list); + NoteListActivity = this; + initResources(); /** @@ -413,34 +419,33 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private void startAsyncNotesListQuery() { String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION : NORMAL_SELECTION; - if(secret_mode == 0) { + String str1 = "0123456789"; + String[] PROJECTION = new String[]{ //定义一个新的PROJECTION数组，只换掉SNIPPET + NoteColumns.ID, + NoteColumns.ALERTED_DATE, + NoteColumns.BG_COLOR_ID, + NoteColumns.CREATED_DATE, + NoteColumns.HAS_ATTACHMENT, + NoteColumns.MODIFIED_DATE, + NoteColumns.NOTES_COUNT, + NoteColumns.PARENT_ID, +// NoteColumns.SNIPPET, + str1, + NoteColumns.TYPE, + NoteColumns.WIDGET_ID, + NoteColumns.WIDGET_TYPE, + NoteColumns.TOP, + }; + if (secret_mode == 0) { mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[]{ String.valueOf(mCurrentFolderId) - }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); - } - else{ - String str1 = "5201314"; - String [] PROJECTION = new String [] { //定义一个新的PROJECTION数组，只换掉SNIPPET - NoteColumns.ID, - NoteColumns.ALERTED_DATE, - NoteColumns.BG_COLOR_ID, - NoteColumns.CREATED_DATE, - NoteColumns.HAS_ATTACHMENT, - NoteColumns.MODIFIED_DATE, - NoteColumns.NOTES_COUNT, - NoteColumns.PARENT_ID, -// NoteColumns.SNIPPET, - str1, - NoteColumns.TYPE, - NoteColumns.WIDGET_ID, - NoteColumns.WIDGET_TYPE, - }; + }, NoteColumns.TOP + " DESC," + NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); + } else { mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, Notes.CONTENT_NOTE_URI, PROJECTION, selection, new String[]{ String.valueOf(mCurrentFolderId) - }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); - + }, NoteColumns.TOP + " DESC," + NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); } } @@ -474,6 +479,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt final FoldersListAdapter adapter = new FoldersListAdapter(this, cursor); builder.setAdapter(adapter, new DialogInterface.OnClickListener() { + @SuppressLint("StringFormatInvalid") public void onClick(DialogInterface dialog, int which) { DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter.getSelectedItemIds(), adapter.getItemId(which)); @@ -634,6 +640,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt final Dialog dialog = builder.setView(view).show(); final Button positive = (Button)dialog.findViewById(android.R.id.button1); positive.setOnClickListener(new OnClickListener() { + @SuppressLint("StringFormatInvalid") public void onClick(View v) { hideSoftInput(etName); String name = etName.getText().toString(); @@ -790,8 +797,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt @Override public boolean onPrepareOptionsMenu(Menu menu) { menu.clear(); - - if (mState == ListEditState.NOTE_LIST) { getMenuInflater().inflate(R.menu.note_list, menu); // set sync or sync_cancel @@ -814,6 +819,46 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt showCreateOrModifyFolderDialog(true); break; } + case R.id.menu_export_text: { + exportNoteToText(); + break; + } + case R.id.menu_sync: { + if (isSyncMode()) { + if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) { + GTaskSyncService.startSync(this); + } else { + GTaskSyncService.cancelSync(this); + } + } else { + startPreferenceActivity(); + } + break; + } + case R.id.menu_setting: { + startPreferenceActivity(); + break; + } + case R.id.menu_new_note: { + createNewNote(); + break; + } + case R.id.menu_search: + onSearchRequested(); + break; + case R.id.LoginSetting: { //设置登录密码功能 + SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE); + String password=pref.getString("password",""); + if(password.equals(""))//没有设置密码 + set_the_password(); + else if(!password.equals(""))//已经设置密码 + change_the_password(); + break; + } + case R.id.delete_password:{ + delete_the_password(); + break; + } case R.id.menu_secret: { //进入私密模式 secret_mode = 1; AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this); @@ -856,33 +901,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt dialog.show(); break; } - case R.id.menu_export_text: { - exportNoteToText(); - break; - } - case R.id.menu_sync: { - if (isSyncMode()) { - if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) { - GTaskSyncService.startSync(this); - } else { - GTaskSyncService.cancelSync(this); - } - } else { - startPreferenceActivity(); - } - break; - } - case R.id.menu_setting: { - startPreferenceActivity(); - break; - } - case R.id.menu_new_note: { - createNewNote(); - break; - } - case R.id.menu_search: - onSearchRequested(); - break; default: break; } @@ -1022,4 +1040,20 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } return false; } + + private void set_the_password() { + Intent intent=new Intent(NotesListActivity.this,SettingPassword.class); + startActivity(intent); + finish(); + } + private void change_the_password() { + Intent intent=new Intent(NotesListActivity.this,ChangingPassword.class); + startActivity(intent); + finish(); + } + private void delete_the_password() { + Intent intent=new Intent(NotesListActivity.this,DeletingPassword.class); + startActivity(intent); + finish(); + } } diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/main/java/net/micode/notes/ui/NotesListAdapter.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java rename to src/main/java/net/micode/notes/ui/NotesListAdapter.java diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/main/java/net/micode/notes/ui/NotesListItem.java similarity index 94% rename from src/app/src/main/java/net/micode/notes/ui/NotesListItem.java rename to src/main/java/net/micode/notes/ui/NotesListItem.java index 1221e80..2746619 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java +++ b/src/main/java/net/micode/notes/ui/NotesListItem.java @@ -37,6 +37,7 @@ public class NotesListItem extends LinearLayout { private TextView mCallName; private NoteItemData mItemData; private CheckBox mCheckBox; + private ImageView mTop; public NotesListItem(Context context) { super(context); @@ -46,6 +47,7 @@ public class NotesListItem extends LinearLayout { mTime = (TextView) findViewById(R.id.tv_time); mCallName = (TextView) findViewById(R.id.tv_name); mCheckBox = (CheckBox) findViewById(android.R.id.checkbox); + mTop = (ImageView) findViewById(R.id.iv_top_icon); } public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) { @@ -93,12 +95,20 @@ public class NotesListItem extends LinearLayout { mAlert.setVisibility(View.GONE); } } + if(data.isTOP()){ + mTop.setImageResource(R.drawable.menu_top); + mTop.setVisibility(View.VISIBLE); + } else{ + mTop.setVisibility((View.GONE)); + } } mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate())); setBackground(data); } + + private void setBackground(NoteItemData data) { int id = data.getBgColorId(); if (data.getType() == Notes.TYPE_NOTE) { diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java rename to src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java diff --git a/src/main/java/net/micode/notes/ui/SettingPassword.java b/src/main/java/net/micode/notes/ui/SettingPassword.java new file mode 100644 index 0000000..60f934d --- /dev/null +++ b/src/main/java/net/micode/notes/ui/SettingPassword.java @@ -0,0 +1,67 @@ +package net.micode.notes.ui; + +import static android.content.Context.MODE_PRIVATE; + +import android.app.Activity; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.view.WindowManager; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +import net.micode.notes.R; + +public class SettingPassword extends Activity { + EditText password; + EditText password_ack; + Button acknowledge; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_set_loginpassword); + getWindow().setSoftInputMode( + WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE + | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); + password=(EditText) findViewById(R.id.password); + password_ack=(EditText) findViewById(R.id.password_ack); + acknowledge=(Button)findViewById(R.id.acknowledge); + acknowledge.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + String text02 = password.getText().toString(); + String text03 = password_ack.getText().toString(); + if(text02.equals("")==true) { + Toast.makeText(SettingPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show(); + }else if (text02.equals(text03) == false) { + Toast.makeText(SettingPassword.this, "密码不匹配，请重新输入密码", Toast.LENGTH_SHORT).show(); + password_ack.setText(""); + }else if (text02.equals(text03) == true){ + SharedPreferences.Editor editor=getSharedPreferences("user management", + MODE_PRIVATE).edit(); + editor.putBoolean("user",true);//true表示已经设置登录密码 + editor.putString("password",text02); + editor.apply(); + Log.d("RegisterLoginPassword","password is "+text02); + Toast.makeText(SettingPassword.this, "设置密码成功", Toast.LENGTH_SHORT).show(); + Intent intent=new Intent(SettingPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } + + } + }); + } + + @Override + public void onBackPressed() { + Intent intent=new Intent(SettingPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } + +} diff --git a/src/main/java/net/micode/notes/ui/SplashActivity.java b/src/main/java/net/micode/notes/ui/SplashActivity.java new file mode 100644 index 0000000..5d9defb --- /dev/null +++ b/src/main/java/net/micode/notes/ui/SplashActivity.java @@ -0,0 +1,31 @@ +package net.micode.notes.ui; +import android.annotation.SuppressLint; +import android.content.Intent; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; +import android.os.Build; +import android.os.Bundle; +import android.os.Handler; +import android.view.MotionEvent; +import android.view.View; +import android.view.WindowInsets; +import net.micode.notes.R; +public class SplashActivity extends AppCompatActivity { + Handler mHandler=new Handler(); + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); //加载启动界面 + setContentView(R.layout.activity_splash); //加载启动 +// 当计时结束时，跳转至NotesListActivity + mHandler.postDelayed(new Runnable() { + + @Override + public void run() { + Intent intent=new Intent(); + intent.setClass(SplashActivity.this, LoginActivity.class); + startActivity(intent); + finish(); //销毁欢迎页面 + }}, 2000); // 2 秒后跳转} + } +} \ No newline at end of file diff --git a/src/main/java/net/micode/notes/ui/translate_demo/BaiduTranslateService.java b/src/main/java/net/micode/notes/ui/translate_demo/BaiduTranslateService.java new file mode 100644 index 0000000..f96f037 --- /dev/null +++ b/src/main/java/net/micode/notes/ui/translate_demo/BaiduTranslateService.java @@ -0,0 +1,13 @@ +package net.micode.notes.ui.translate_demo; + +import retrofit2.Call; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.POST; + +public interface BaiduTranslateService { + @POST("translate") + @FormUrlEncoded + Call translate(@Field("q") String q, @Field("from") String from, @Field("to") String to, @Field("appid") String appid, @Field("salt") String salt, + @Field("sign") String sign); +} \ No newline at end of file diff --git a/src/main/java/net/micode/notes/ui/translate_demo/MD5Utils.java b/src/main/java/net/micode/notes/ui/translate_demo/MD5Utils.java new file mode 100644 index 0000000..e0e8288 --- /dev/null +++ b/src/main/java/net/micode/notes/ui/translate_demo/MD5Utils.java @@ -0,0 +1,35 @@ +package net.micode.notes.ui.translate_demo; + +import java.security.MessageDigest; + +/** + * 加密解密工具类(对字符串加密) MD5加密 + */ +public class MD5Utils { + + /** + * MD5加密算法使用 对字符串加密 + * + * @param info 参数为需要加密的String + * @return 返回加密后的String + */ + public static String getMD5Code(String info) { + try { + MessageDigest md5 = MessageDigest.getInstance("MD5"); + md5.update(info.getBytes("utf-8"));//设置编码格式 + byte[] encryption = md5.digest(); + StringBuffer stringBuffer = new StringBuffer(); + for (int i = 0; i < encryption.length; i++) { + if (Integer.toHexString(0xff & encryption[i]).length() == 1) { + stringBuffer.append("0").append(Integer.toHexString(0xff & encryption[i])); + } else { + stringBuffer.append(Integer.toHexString(0xff & encryption[i])); + } + } + return stringBuffer.toString(); + } catch (Exception e) { + return "MD5加密异常"; + } + } + +} \ No newline at end of file diff --git a/src/main/java/net/micode/notes/ui/translate_demo/RespondBean.java b/src/main/java/net/micode/notes/ui/translate_demo/RespondBean.java new file mode 100644 index 0000000..3895737 --- /dev/null +++ b/src/main/java/net/micode/notes/ui/translate_demo/RespondBean.java @@ -0,0 +1,66 @@ +package net.micode.notes.ui.translate_demo; + +import java.util.List; + + public class RespondBean { + + /** + * from : zh + * to : en + * trans_result : [{"src":"你好","dst":"Hello"}] + */ + + private String from; + private String to; + private List trans_result; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public List getTrans_result() { + return trans_result; + } + + public void setTrans_result(List trans_result) { + this.trans_result = trans_result; + } + + public static class TransResultBean { + /** + * src : 你好 + * dst : Hello + */ + + private String src; + private String dst; + + public String getSrc() { + return src; + } + + public void setSrc(String src) { + this.src = src; + } + + public String getDst() { + return dst; + } + + public void setDst(String dst) { + this.dst = dst; + } + } +} \ No newline at end of file diff --git a/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider.java diff --git a/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java diff --git a/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java similarity index 100% rename from src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java diff --git a/src/app/src/main/res/color/primary_text_dark.xml b/src/main/res/color/primary_text_dark.xml similarity index 98% rename from src/app/src/main/res/color/primary_text_dark.xml rename to src/main/res/color/primary_text_dark.xml index 8ad98e3..ceef389 100644 --- a/src/app/src/main/res/color/primary_text_dark.xml +++ b/src/main/res/color/primary_text_dark.xml @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/src/app/src/main/res/color/secondary_text_dark.xml b/src/main/res/color/secondary_text_dark.xml similarity index 98% rename from src/app/src/main/res/color/secondary_text_dark.xml rename to src/main/res/color/secondary_text_dark.xml index 9cf8a1a..f0de0f5 100644 --- a/src/app/src/main/res/color/secondary_text_dark.xml +++ b/src/main/res/color/secondary_text_dark.xml @@ -17,4 +17,6 @@ - \ No newline at end of file + + + diff --git a/src/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/main/res/drawable-hdpi/bg_btn_set_color.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/bg_btn_set_color.png rename to src/main/res/drawable-hdpi/bg_btn_set_color.png diff --git a/src/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/main/res/drawable-hdpi/bg_color_btn_mask.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png rename to src/main/res/drawable-hdpi/bg_color_btn_mask.png diff --git a/src/main/res/drawable-hdpi/bitmap_pressed.png b/src/main/res/drawable-hdpi/bitmap_pressed.png new file mode 100644 index 0000000..f5773c0 Binary files /dev/null and b/src/main/res/drawable-hdpi/bitmap_pressed.png differ diff --git a/src/app/src/main/res/drawable-hdpi/call_record.png b/src/main/res/drawable-hdpi/call_record.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/call_record.png rename to src/main/res/drawable-hdpi/call_record.png diff --git a/src/app/src/main/res/drawable-hdpi/clock.png b/src/main/res/drawable-hdpi/clock.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/clock.png rename to src/main/res/drawable-hdpi/clock.png diff --git a/src/app/src/main/res/drawable-hdpi/delete.png b/src/main/res/drawable-hdpi/delete.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/delete.png rename to src/main/res/drawable-hdpi/delete.png diff --git a/src/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/main/res/drawable-hdpi/dropdown_icon.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/dropdown_icon.9.png rename to src/main/res/drawable-hdpi/dropdown_icon.9.png diff --git a/src/app/src/main/res/drawable-hdpi/edit_blue.9.png b/src/main/res/drawable-hdpi/edit_blue.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/edit_blue.9.png rename to src/main/res/drawable-hdpi/edit_blue.9.png diff --git a/src/app/src/main/res/drawable-hdpi/edit_green.9.png b/src/main/res/drawable-hdpi/edit_green.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/edit_green.9.png rename to src/main/res/drawable-hdpi/edit_green.9.png diff --git a/src/app/src/main/res/drawable-hdpi/edit_red.9.png b/src/main/res/drawable-hdpi/edit_red.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/edit_red.9.png rename to src/main/res/drawable-hdpi/edit_red.9.png diff --git a/src/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/main/res/drawable-hdpi/edit_title_blue.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/edit_title_blue.9.png rename to src/main/res/drawable-hdpi/edit_title_blue.9.png diff --git a/src/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/main/res/drawable-hdpi/edit_title_green.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/edit_title_green.9.png rename to src/main/res/drawable-hdpi/edit_title_green.9.png diff --git a/src/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/main/res/drawable-hdpi/edit_title_red.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/edit_title_red.9.png rename to src/main/res/drawable-hdpi/edit_title_red.9.png diff --git a/src/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/main/res/drawable-hdpi/edit_title_white.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/edit_title_white.9.png rename to src/main/res/drawable-hdpi/edit_title_white.9.png diff --git a/src/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/main/res/drawable-hdpi/edit_title_yellow.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png rename to src/main/res/drawable-hdpi/edit_title_yellow.9.png diff --git a/src/app/src/main/res/drawable-hdpi/edit_white.9.png b/src/main/res/drawable-hdpi/edit_white.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/edit_white.9.png rename to src/main/res/drawable-hdpi/edit_white.9.png diff --git a/src/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/main/res/drawable-hdpi/edit_yellow.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/edit_yellow.9.png rename to src/main/res/drawable-hdpi/edit_yellow.9.png diff --git a/src/app/src/main/res/drawable-hdpi/font_large.png b/src/main/res/drawable-hdpi/font_large.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/font_large.png rename to src/main/res/drawable-hdpi/font_large.png diff --git a/src/app/src/main/res/drawable-hdpi/font_normal.png b/src/main/res/drawable-hdpi/font_normal.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/font_normal.png rename to src/main/res/drawable-hdpi/font_normal.png diff --git a/src/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/main/res/drawable-hdpi/font_size_selector_bg.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png rename to src/main/res/drawable-hdpi/font_size_selector_bg.9.png diff --git a/src/app/src/main/res/drawable-hdpi/font_small.png b/src/main/res/drawable-hdpi/font_small.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/font_small.png rename to src/main/res/drawable-hdpi/font_small.png diff --git a/src/app/src/main/res/drawable-hdpi/font_super.png b/src/main/res/drawable-hdpi/font_super.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/font_super.png rename to src/main/res/drawable-hdpi/font_super.png diff --git a/src/app/src/main/res/drawable-hdpi/icon_app.png b/src/main/res/drawable-hdpi/icon_app.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/icon_app.png rename to src/main/res/drawable-hdpi/icon_app.png diff --git a/src/app/src/main/res/drawable-hdpi/list_background.png b/src/main/res/drawable-hdpi/list_background.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_background.png rename to src/main/res/drawable-hdpi/list_background.png diff --git a/src/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/main/res/drawable-hdpi/list_blue_down.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_blue_down.9.png rename to src/main/res/drawable-hdpi/list_blue_down.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/main/res/drawable-hdpi/list_blue_middle.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_blue_middle.9.png rename to src/main/res/drawable-hdpi/list_blue_middle.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/main/res/drawable-hdpi/list_blue_single.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_blue_single.9.png rename to src/main/res/drawable-hdpi/list_blue_single.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/main/res/drawable-hdpi/list_blue_up.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_blue_up.9.png rename to src/main/res/drawable-hdpi/list_blue_up.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_folder.9.png b/src/main/res/drawable-hdpi/list_folder.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_folder.9.png rename to src/main/res/drawable-hdpi/list_folder.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/main/res/drawable-hdpi/list_footer_bg.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_footer_bg.9.png rename to src/main/res/drawable-hdpi/list_footer_bg.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_green_down.9.png b/src/main/res/drawable-hdpi/list_green_down.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_green_down.9.png rename to src/main/res/drawable-hdpi/list_green_down.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/main/res/drawable-hdpi/list_green_middle.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_green_middle.9.png rename to src/main/res/drawable-hdpi/list_green_middle.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_green_single.9.png b/src/main/res/drawable-hdpi/list_green_single.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_green_single.9.png rename to src/main/res/drawable-hdpi/list_green_single.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_green_up.9.png b/src/main/res/drawable-hdpi/list_green_up.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_green_up.9.png rename to src/main/res/drawable-hdpi/list_green_up.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_red_down.9.png b/src/main/res/drawable-hdpi/list_red_down.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_red_down.9.png rename to src/main/res/drawable-hdpi/list_red_down.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/main/res/drawable-hdpi/list_red_middle.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_red_middle.9.png rename to src/main/res/drawable-hdpi/list_red_middle.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_red_single.9.png b/src/main/res/drawable-hdpi/list_red_single.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_red_single.9.png rename to src/main/res/drawable-hdpi/list_red_single.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_red_up.9.png b/src/main/res/drawable-hdpi/list_red_up.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_red_up.9.png rename to src/main/res/drawable-hdpi/list_red_up.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_white_down.9.png b/src/main/res/drawable-hdpi/list_white_down.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_white_down.9.png rename to src/main/res/drawable-hdpi/list_white_down.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/main/res/drawable-hdpi/list_white_middle.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_white_middle.9.png rename to src/main/res/drawable-hdpi/list_white_middle.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_white_single.9.png b/src/main/res/drawable-hdpi/list_white_single.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_white_single.9.png rename to src/main/res/drawable-hdpi/list_white_single.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_white_up.9.png b/src/main/res/drawable-hdpi/list_white_up.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_white_up.9.png rename to src/main/res/drawable-hdpi/list_white_up.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/main/res/drawable-hdpi/list_yellow_down.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_yellow_down.9.png rename to src/main/res/drawable-hdpi/list_yellow_down.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/main/res/drawable-hdpi/list_yellow_middle.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png rename to src/main/res/drawable-hdpi/list_yellow_middle.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/main/res/drawable-hdpi/list_yellow_single.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_yellow_single.9.png rename to src/main/res/drawable-hdpi/list_yellow_single.9.png diff --git a/src/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/main/res/drawable-hdpi/list_yellow_up.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_yellow_up.9.png rename to src/main/res/drawable-hdpi/list_yellow_up.9.png diff --git a/src/app/src/main/res/drawable-hdpi/menu_delete.png b/src/main/res/drawable-hdpi/menu_delete.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/menu_delete.png rename to src/main/res/drawable-hdpi/menu_delete.png diff --git a/src/app/src/main/res/drawable-hdpi/menu_move.png b/src/main/res/drawable-hdpi/menu_move.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/menu_move.png rename to src/main/res/drawable-hdpi/menu_move.png diff --git a/src/main/res/drawable-hdpi/menu_top.png b/src/main/res/drawable-hdpi/menu_top.png new file mode 100644 index 0000000..6568ddf Binary files /dev/null and b/src/main/res/drawable-hdpi/menu_top.png differ diff --git a/src/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/main/res/drawable-hdpi/new_note_normal.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/new_note_normal.png rename to src/main/res/drawable-hdpi/new_note_normal.png diff --git a/src/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/main/res/drawable-hdpi/new_note_pressed.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/new_note_pressed.png rename to src/main/res/drawable-hdpi/new_note_pressed.png diff --git a/src/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png rename to src/main/res/drawable-hdpi/note_edit_color_selector_panel.png diff --git a/src/app/src/main/res/drawable-hdpi/notification.png b/src/main/res/drawable-hdpi/notification.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/notification.png rename to src/main/res/drawable-hdpi/notification.png diff --git a/src/app/src/main/res/drawable-hdpi/search_result.png b/src/main/res/drawable-hdpi/search_result.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/search_result.png rename to src/main/res/drawable-hdpi/search_result.png diff --git a/src/app/src/main/res/drawable-hdpi/selected.png b/src/main/res/drawable-hdpi/selected.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/selected.png rename to src/main/res/drawable-hdpi/selected.png diff --git a/src/main/res/drawable-hdpi/splash.jpg b/src/main/res/drawable-hdpi/splash.jpg new file mode 100644 index 0000000..37b004d Binary files /dev/null and b/src/main/res/drawable-hdpi/splash.jpg differ diff --git a/src/app/src/main/res/drawable-hdpi/title_alert.png b/src/main/res/drawable-hdpi/title_alert.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/title_alert.png rename to src/main/res/drawable-hdpi/title_alert.png diff --git a/src/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/main/res/drawable-hdpi/title_bar_bg.9.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/title_bar_bg.9.png rename to src/main/res/drawable-hdpi/title_bar_bg.9.png diff --git a/src/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/main/res/drawable-hdpi/widget_2x_blue.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/widget_2x_blue.png rename to src/main/res/drawable-hdpi/widget_2x_blue.png diff --git a/src/app/src/main/res/drawable-hdpi/widget_2x_green.png b/src/main/res/drawable-hdpi/widget_2x_green.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/widget_2x_green.png rename to src/main/res/drawable-hdpi/widget_2x_green.png diff --git a/src/app/src/main/res/drawable-hdpi/widget_2x_red.png b/src/main/res/drawable-hdpi/widget_2x_red.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/widget_2x_red.png rename to src/main/res/drawable-hdpi/widget_2x_red.png diff --git a/src/app/src/main/res/drawable-hdpi/widget_2x_white.png b/src/main/res/drawable-hdpi/widget_2x_white.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/widget_2x_white.png rename to src/main/res/drawable-hdpi/widget_2x_white.png diff --git a/src/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/main/res/drawable-hdpi/widget_2x_yellow.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/widget_2x_yellow.png rename to src/main/res/drawable-hdpi/widget_2x_yellow.png diff --git a/src/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/main/res/drawable-hdpi/widget_4x_blue.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/widget_4x_blue.png rename to src/main/res/drawable-hdpi/widget_4x_blue.png diff --git a/src/app/src/main/res/drawable-hdpi/widget_4x_green.png b/src/main/res/drawable-hdpi/widget_4x_green.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/widget_4x_green.png rename to src/main/res/drawable-hdpi/widget_4x_green.png diff --git a/src/app/src/main/res/drawable-hdpi/widget_4x_red.png b/src/main/res/drawable-hdpi/widget_4x_red.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/widget_4x_red.png rename to src/main/res/drawable-hdpi/widget_4x_red.png diff --git a/src/app/src/main/res/drawable-hdpi/widget_4x_white.png b/src/main/res/drawable-hdpi/widget_4x_white.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/widget_4x_white.png rename to src/main/res/drawable-hdpi/widget_4x_white.png diff --git a/src/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/main/res/drawable-hdpi/widget_4x_yellow.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/widget_4x_yellow.png rename to src/main/res/drawable-hdpi/widget_4x_yellow.png diff --git a/src/app/src/main/res/drawable/new_note.xml b/src/main/res/drawable/new_note.xml similarity index 100% rename from src/app/src/main/res/drawable/new_note.xml rename to src/main/res/drawable/new_note.xml diff --git a/src/app/src/main/res/layout/account_dialog_title.xml b/src/main/res/layout/account_dialog_title.xml similarity index 74% rename from src/app/src/main/res/layout/account_dialog_title.xml rename to src/main/res/layout/account_dialog_title.xml index 7717112..5f2ebce 100644 --- a/src/app/src/main/res/layout/account_dialog_title.xml +++ b/src/main/res/layout/account_dialog_title.xml @@ -15,22 +15,22 @@ limitations under the License. --> - + + android:ellipsize="end" + android:gravity="center" + android:singleLine="true" /> + android:gravity="center" /> \ No newline at end of file diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml new file mode 100644 index 0000000..05eda7e --- /dev/null +++ b/src/main/res/layout/activity_change_password.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + +