diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..798f19a --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,293 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + "keyToString": { + "ASKED_ADD_EXTERNAL_FILES": "true", + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "RunOnceActivity.cidr.known.project.marker": "true", + "SHARE_PROJECT_CONFIGURATION_FILES": "true", + "cidr.known.project.marker": "true", + "last_opened_file_path": "D:/softwareengineering/Notes-master", + "project.structure.last.edited": "Modules", + "project.structure.proportion": "0.17", + "project.structure.side.proportion": "0.2", + "settings.editor.selected.configurable": "preferences.customizations" + } +} + + + + + + + + + + true + true + false + + + + + + + + + + + + + 1680843179165 + + + 1680848243607 + + + 1680850445899 + + + 1680942675194 + + + 1680942721752 + + + 1681292428634 + + + 1681312464473 + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/net/micode/notes/model/Note.java b/app/src/main/java/net/micode/notes/model/Note.java deleted file mode 100644 index 6706cf6..0000000 --- a/app/src/main/java/net/micode/notes/model/Note.java +++ /dev/null @@ -1,253 +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.model; -import android.content.ContentProviderOperation; -import android.content.ContentProviderResult; -import android.content.ContentUris; -import android.content.ContentValues; -import android.content.Context; -import android.content.OperationApplicationException; -import android.net.Uri; -import android.os.RemoteException; -import android.util.Log; - -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.CallNote; -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.data.Notes.TextNote; - -import java.util.ArrayList; - - -public class Note { - private ContentValues mNoteDiffValues; - private NoteData mNoteData; - private static final String TAG = "Note"; - /** - * Create a new note id for adding a new note to databases - */ - public static synchronized long getNewNoteId(Context context, long folderId) { - // Create a new note in the database - ContentValues values = new ContentValues(); - long createdTime = System.currentTimeMillis(); - values.put(NoteColumns.CREATED_DATE, createdTime); - values.put(NoteColumns.MODIFIED_DATE, createdTime); - values.put(NoteColumns.TYPE, Notes.TYPE_NOTE); - values.put(NoteColumns.LOCAL_MODIFIED, 1); - values.put(NoteColumns.PARENT_ID, folderId); - Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values); - - long noteId = 0; - try { - noteId = Long.valueOf(uri.getPathSegments().get(1)); - } catch (NumberFormatException e) { - Log.e(TAG, "Get note id error :" + e.toString()); - noteId = 0; - } - if (noteId == -1) { - throw new IllegalStateException("Wrong note id:" + noteId); - } - return noteId; - } - - public Note() { - mNoteDiffValues = new ContentValues(); - mNoteData = new NoteData(); - } - - public void setNoteValue(String key, String value) { - mNoteDiffValues.put(key, value); - mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); - mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); - } - - public void setTextData(String key, String value) { - mNoteData.setTextData(key, value); - } - - public void setTextDataId(long id) { - mNoteData.setTextDataId(id); - } - - public long getTextDataId() { - return mNoteData.mTextDataId; - } - - public void setCallDataId(long id) { - mNoteData.setCallDataId(id); - } - - public void setCallData(String key, String value) { - mNoteData.setCallData(key, value); - } - - public boolean isLocalModified() { - return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified(); - } - - public boolean syncNote(Context context, long noteId) { - if (noteId <= 0) { - throw new IllegalArgumentException("Wrong note id:" + noteId); - } - - if (!isLocalModified()) { - return true; - } - - /** - * In theory, once data changed, the note should be updated on {@link NoteColumns#LOCAL_MODIFIED} and - * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the - * note data info - */ - if (context.getContentResolver().update( - ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null, - null) == 0) { - Log.e(TAG, "Update note error, should not happen"); - // Do not return, fall through - } - mNoteDiffValues.clear(); - - if (mNoteData.isLocalModified() - && (mNoteData.pushIntoContentResolver(context, noteId) == null)) { - return false; - } - - return true; - } - - private class NoteData { - private long mTextDataId; - - private ContentValues mTextDataValues; - - private long mCallDataId; - - private ContentValues mCallDataValues; - - private static final String TAG = "NoteData"; - - public NoteData() { - mTextDataValues = new ContentValues(); - mCallDataValues = new ContentValues(); - mTextDataId = 0; - mCallDataId = 0; - } - - boolean isLocalModified() { - return mTextDataValues.size() > 0 || mCallDataValues.size() > 0; - } - - void setTextDataId(long id) { - if(id <= 0) { - throw new IllegalArgumentException("Text data id should larger than 0"); - } - mTextDataId = id; - } - - void setCallDataId(long id) { - if (id <= 0) { - throw new IllegalArgumentException("Call data id should larger than 0"); - } - mCallDataId = id; - } - - void setCallData(String key, String value) { - mCallDataValues.put(key, value); - mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); - mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); - } - - void setTextData(String key, String value) { - mTextDataValues.put(key, value); - mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); - mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); - } - - Uri pushIntoContentResolver(Context context, long noteId) { - /** - * Check for safety - */ - if (noteId <= 0) { - throw new IllegalArgumentException("Wrong note id:" + noteId); - } - - ArrayList operationList = new ArrayList(); - ContentProviderOperation.Builder builder = null; - - if(mTextDataValues.size() > 0) { - mTextDataValues.put(DataColumns.NOTE_ID, noteId); - if (mTextDataId == 0) { - mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE); - Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI, - mTextDataValues); - try { - setTextDataId(Long.valueOf(uri.getPathSegments().get(1))); - } catch (NumberFormatException e) { - Log.e(TAG, "Insert new text data fail with noteId" + noteId); - mTextDataValues.clear(); - return null; - } - } else { - builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( - Notes.CONTENT_DATA_URI, mTextDataId)); - builder.withValues(mTextDataValues); - operationList.add(builder.build()); - } - mTextDataValues.clear(); - } - - if(mCallDataValues.size() > 0) { - mCallDataValues.put(DataColumns.NOTE_ID, noteId); - if (mCallDataId == 0) { - mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE); - Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI, - mCallDataValues); - try { - setCallDataId(Long.valueOf(uri.getPathSegments().get(1))); - } catch (NumberFormatException e) { - Log.e(TAG, "Insert new call data fail with noteId" + noteId); - mCallDataValues.clear(); - return null; - } - } else { - builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( - Notes.CONTENT_DATA_URI, mCallDataId)); - builder.withValues(mCallDataValues); - operationList.add(builder.build()); - } - mCallDataValues.clear(); - } - - if (operationList.size() > 0) { - try { - ContentProviderResult[] results = context.getContentResolver().applyBatch( - Notes.AUTHORITY, operationList); - return (results == null || results.length == 0 || results[0] == null) ? null - : ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId); - } catch (RemoteException e) { - Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); - return null; - } catch (OperationApplicationException e) { - Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); - return null; - } - } - return null; - } - } -} diff --git a/app/src/main/java/net/micode/notes/model/WorkingNote.java b/app/src/main/java/net/micode/notes/model/WorkingNote.java deleted file mode 100644 index be081e4..0000000 --- a/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ /dev/null @@ -1,368 +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.model; - -import android.appwidget.AppWidgetManager; -import android.content.ContentUris; -import android.content.Context; -import android.database.Cursor; -import android.text.TextUtils; -import android.util.Log; - -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.CallNote; -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.tool.ResourceParser.NoteBgResources; - - -public class WorkingNote { - // Note for the working note - private Note mNote; - // Note Id - private long mNoteId; - // Note content - private String mContent; - // Note mode - private int mMode; - - private long mAlertDate; - - private long mModifiedDate; - - private int mBgColorId; - - private int mWidgetId; - - private int mWidgetType; - - private long mFolderId; - - private Context mContext; - - private static final String TAG = "WorkingNote"; - - private boolean mIsDeleted; - - private NoteSettingChangedListener mNoteSettingStatusListener; - - public static final String[] DATA_PROJECTION = new String[] { - DataColumns.ID, - DataColumns.CONTENT, - DataColumns.MIME_TYPE, - DataColumns.DATA1, - DataColumns.DATA2, - DataColumns.DATA3, - DataColumns.DATA4, - }; - - public static final String[] NOTE_PROJECTION = new String[] { - NoteColumns.PARENT_ID, - NoteColumns.ALERTED_DATE, - NoteColumns.BG_COLOR_ID, - NoteColumns.WIDGET_ID, - NoteColumns.WIDGET_TYPE, - NoteColumns.MODIFIED_DATE - }; - - private static final int DATA_ID_COLUMN = 0; - - private static final int DATA_CONTENT_COLUMN = 1; - - private static final int DATA_MIME_TYPE_COLUMN = 2; - - private static final int DATA_MODE_COLUMN = 3; - - private static final int NOTE_PARENT_ID_COLUMN = 0; - - private static final int NOTE_ALERTED_DATE_COLUMN = 1; - - private static final int NOTE_BG_COLOR_ID_COLUMN = 2; - - private static final int NOTE_WIDGET_ID_COLUMN = 3; - - private static final int NOTE_WIDGET_TYPE_COLUMN = 4; - - private static final int NOTE_MODIFIED_DATE_COLUMN = 5; - - // New note construct - private WorkingNote(Context context, long folderId) { - mContext = context; - mAlertDate = 0; - mModifiedDate = System.currentTimeMillis(); - mFolderId = folderId; - mNote = new Note(); - mNoteId = 0; - mIsDeleted = false; - mMode = 0; - mWidgetType = Notes.TYPE_WIDGET_INVALIDE; - } - - // Existing note construct - private WorkingNote(Context context, long noteId, long folderId) { - mContext = context; - mNoteId = noteId; - mFolderId = folderId; - mIsDeleted = false; - mNote = new Note(); - loadNote(); - } - - private void loadNote() { - Cursor cursor = mContext.getContentResolver().query( - ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null, - null, null); - - if (cursor != null) { - if (cursor.moveToFirst()) { - mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN); - mBgColorId = cursor.getInt(NOTE_BG_COLOR_ID_COLUMN); - mWidgetId = cursor.getInt(NOTE_WIDGET_ID_COLUMN); - mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN); - mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN); - mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN); - } - cursor.close(); - } else { - Log.e(TAG, "No note with id:" + mNoteId); - throw new IllegalArgumentException("Unable to find note with id " + mNoteId); - } - loadNoteData(); - } - - private void loadNoteData() { - Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION, - DataColumns.NOTE_ID + "=?", new String[] { - String.valueOf(mNoteId) - }, null); - - if (cursor != null) { - if (cursor.moveToFirst()) { - do { - String type = cursor.getString(DATA_MIME_TYPE_COLUMN); - if (DataConstants.NOTE.equals(type)) { - mContent = cursor.getString(DATA_CONTENT_COLUMN); - mMode = cursor.getInt(DATA_MODE_COLUMN); - mNote.setTextDataId(cursor.getLong(DATA_ID_COLUMN)); - } else if (DataConstants.CALL_NOTE.equals(type)) { - mNote.setCallDataId(cursor.getLong(DATA_ID_COLUMN)); - } else { - Log.d(TAG, "Wrong note type with type:" + type); - } - } while (cursor.moveToNext()); - } - cursor.close(); - } else { - Log.e(TAG, "No data with id:" + mNoteId); - throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId); - } - } - - public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId, - int widgetType, int defaultBgColorId) { - WorkingNote note = new WorkingNote(context, folderId); - note.setBgColorId(defaultBgColorId); - note.setWidgetId(widgetId); - note.setWidgetType(widgetType); - return note; - } - - public static WorkingNote load(Context context, long id) { - return new WorkingNote(context, id, 0); - } - - public synchronized boolean saveNote() { - if (isWorthSaving()) { - if (!existInDatabase()) { - if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) { - Log.e(TAG, "Create new note fail with id:" + mNoteId); - return false; - } - } - - mNote.syncNote(mContext, mNoteId); - - /** - * Update widget content if there exist any widget of this note - */ - if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID - && mWidgetType != Notes.TYPE_WIDGET_INVALIDE - && mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onWidgetChanged(); - } - return true; - } else { - return false; - } - } - - public boolean existInDatabase() { - return mNoteId > 0; - } - - private boolean isWorthSaving() { - if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent)) - || (existInDatabase() && !mNote.isLocalModified())) { - return false; - } else { - return true; - } - } - - public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) { - mNoteSettingStatusListener = l; - } - - public void setAlertDate(long date, boolean set) { - if (date != mAlertDate) { - mAlertDate = date; - mNote.setNoteValue(NoteColumns.ALERTED_DATE, String.valueOf(mAlertDate)); - } - if (mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onClockAlertChanged(date, set); - } - } - - public void markDeleted(boolean mark) { - mIsDeleted = mark; - if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID - && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onWidgetChanged(); - } - } - - public void setBgColorId(int id) { - if (id != mBgColorId) { - mBgColorId = id; - if (mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onBackgroundColorChanged(); - } - mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id)); - } - } - - public void setCheckListMode(int mode) { - if (mMode != mode) { - if (mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode); - } - mMode = mode; - mNote.setTextData(TextNote.MODE, String.valueOf(mMode)); - } - } - - public void setWidgetType(int type) { - if (type != mWidgetType) { - mWidgetType = type; - mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType)); - } - } - - public void setWidgetId(int id) { - if (id != mWidgetId) { - mWidgetId = id; - mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId)); - } - } - - public void setWorkingText(String text) { - if (!TextUtils.equals(mContent, text)) { - mContent = text; - mNote.setTextData(DataColumns.CONTENT, mContent); - } - } - - public void convertToCallNote(String phoneNumber, long callDate) { - mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate)); - mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber); - mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER)); - } - - public boolean hasClockAlert() { - return (mAlertDate > 0 ? true : false); - } - - public String getContent() { - return mContent; - } - - public long getAlertDate() { - return mAlertDate; - } - - public long getModifiedDate() { - return mModifiedDate; - } - - public int getBgColorResId() { - return NoteBgResources.getNoteBgResource(mBgColorId); - } - - public int getBgColorId() { - return mBgColorId; - } - - public int getTitleBgResId() { - return NoteBgResources.getNoteTitleBgResource(mBgColorId); - } - - public int getCheckListMode() { - return mMode; - } - - public long getNoteId() { - return mNoteId; - } - - public long getFolderId() { - return mFolderId; - } - - public int getWidgetId() { - return mWidgetId; - } - - public int getWidgetType() { - return mWidgetType; - } - - public interface NoteSettingChangedListener { - /** - * Called when the background color of current note has just changed - */ - void onBackgroundColorChanged(); - - /** - * Called when user set clock - */ - void onClockAlertChanged(long date, boolean set); - - /** - * Call when user create note from widget - */ - void onWidgetChanged(); - - /** - * Call when switch between check list mode and normal mode - * @param oldMode is previous mode before change - * @param newMode is new mode - */ - void onCheckListModeChanged(int oldMode, int newMode); - } -} diff --git a/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/app/src/main/java/net/micode/notes/tool/ResourceParser.java deleted file mode 100644 index 1ad3ad6..0000000 --- a/app/src/main/java/net/micode/notes/tool/ResourceParser.java +++ /dev/null @@ -1,181 +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.tool; - -import android.content.Context; -import android.preference.PreferenceManager; - -import net.micode.notes.R; -import net.micode.notes.ui.NotesPreferenceActivity; - -public class ResourceParser { - - public static final int YELLOW = 0; - public static final int BLUE = 1; - public static final int WHITE = 2; - public static final int GREEN = 3; - public static final int RED = 4; - - public static final int BG_DEFAULT_COLOR = YELLOW; - - public static final int TEXT_SMALL = 0; - public static final int TEXT_MEDIUM = 1; - public static final int TEXT_LARGE = 2; - public static final int TEXT_SUPER = 3; - - public static final int BG_DEFAULT_FONT_SIZE = TEXT_MEDIUM; - - public static class NoteBgResources { - private final static int [] BG_EDIT_RESOURCES = new int [] { - R.drawable.edit_yellow, - R.drawable.edit_blue, - R.drawable.edit_white, - R.drawable.edit_green, - R.drawable.edit_red - }; - - private final static int [] BG_EDIT_TITLE_RESOURCES = new int [] { - R.drawable.edit_title_yellow, - R.drawable.edit_title_blue, - R.drawable.edit_title_white, - R.drawable.edit_title_green, - R.drawable.edit_title_red - }; - - public static int getNoteBgResource(int id) { - return BG_EDIT_RESOURCES[id]; - } - - public static int getNoteTitleBgResource(int id) { - return BG_EDIT_TITLE_RESOURCES[id]; - } - } - - public static int getDefaultBgId(Context context) { - if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean( - NotesPreferenceActivity.PREFERENCE_SET_BG_COLOR_KEY, false)) { - return (int) (Math.random() * NoteBgResources.BG_EDIT_RESOURCES.length); - } else { - return BG_DEFAULT_COLOR; - } - } - - public static class NoteItemBgResources { - private final static int [] BG_FIRST_RESOURCES = new int [] { - R.drawable.list_yellow_up, - R.drawable.list_blue_up, - R.drawable.list_white_up, - R.drawable.list_green_up, - R.drawable.list_red_up - }; - - private final static int [] BG_NORMAL_RESOURCES = new int [] { - R.drawable.list_yellow_middle, - R.drawable.list_blue_middle, - R.drawable.list_white_middle, - R.drawable.list_green_middle, - R.drawable.list_red_middle - }; - - private final static int [] BG_LAST_RESOURCES = new int [] { - R.drawable.list_yellow_down, - R.drawable.list_blue_down, - R.drawable.list_white_down, - R.drawable.list_green_down, - R.drawable.list_red_down, - }; - - private final static int [] BG_SINGLE_RESOURCES = new int [] { - R.drawable.list_yellow_single, - R.drawable.list_blue_single, - R.drawable.list_white_single, - R.drawable.list_green_single, - R.drawable.list_red_single - }; - - public static int getNoteBgFirstRes(int id) { - return BG_FIRST_RESOURCES[id]; - } - - public static int getNoteBgLastRes(int id) { - return BG_LAST_RESOURCES[id]; - } - - public static int getNoteBgSingleRes(int id) { - return BG_SINGLE_RESOURCES[id]; - } - - public static int getNoteBgNormalRes(int id) { - return BG_NORMAL_RESOURCES[id]; - } - - public static int getFolderBgRes() { - return R.drawable.list_folder; - } - } - - public static class WidgetBgResources { - private final static int [] BG_2X_RESOURCES = new int [] { - R.drawable.widget_2x_yellow, - R.drawable.widget_2x_blue, - R.drawable.widget_2x_white, - R.drawable.widget_2x_green, - R.drawable.widget_2x_red, - }; - - public static int getWidget2xBgResource(int id) { - return BG_2X_RESOURCES[id]; - } - - private final static int [] BG_4X_RESOURCES = new int [] { - R.drawable.widget_4x_yellow, - R.drawable.widget_4x_blue, - R.drawable.widget_4x_white, - R.drawable.widget_4x_green, - R.drawable.widget_4x_red - }; - - public static int getWidget4xBgResource(int id) { - return BG_4X_RESOURCES[id]; - } - } - - public static class TextAppearanceResources { - private final static int [] TEXTAPPEARANCE_RESOURCES = new int [] { - R.style.TextAppearanceNormal, - R.style.TextAppearanceMedium, - R.style.TextAppearanceLarge, - R.style.TextAppearanceSuper - }; - - public static int getTexAppearanceResource(int id) { - /** - * 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 (id >= TEXTAPPEARANCE_RESOURCES.length) { - return BG_DEFAULT_FONT_SIZE; - } - return TEXTAPPEARANCE_RESOURCES[id]; - } - - public static int getResourcesSize() { - return TEXTAPPEARANCE_RESOURCES.length; - } - } -} diff --git a/app/src/main/java/net/micode/notes/data/Contact.java b/doc/庞浩注释的代码/Contact.java similarity index 74% rename from app/src/main/java/net/micode/notes/data/Contact.java rename to doc/庞浩注释的代码/Contact.java index d97ac5d..34f332e 100644 --- a/app/src/main/java/net/micode/notes/data/Contact.java +++ b/doc/庞浩注释的代码/Contact.java @@ -26,25 +26,34 @@ import android.util.Log; import java.util.HashMap; public class Contact { - private static HashMap sContactCache; - private static final String TAG = "Contact"; + private static HashMap sContactCache;// 用于缓存已查询过的联系人信息 + private static final String TAG = "Contact";// 用于日志输出的 TAG + // 查询电话号码与联系人名字匹配的过滤条件 private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" + " AND " + Data.RAW_CONTACT_ID + " IN " + "(SELECT raw_contact_id " + " FROM phone_lookup" + " WHERE min_match = '+')"; - + /* + * 获取电话号码对应的联系人名字 + * @param context 上下文 + * @param phoneNumber 电话号码 + * @return 电话号码对应的联系人名字 + */ public static String getContact(Context context, String phoneNumber) { + // 如果缓存为空,创建新的缓存对象 if(sContactCache == null) { sContactCache = new HashMap(); } + // 如果已经查询过该电话号码,直接返回缓存中的联系人名字 if(sContactCache.containsKey(phoneNumber)) { return sContactCache.get(phoneNumber); } + // 构造查询条件 String selection = CALLER_ID_SELECTION.replace("+", PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); Cursor cursor = context.getContentResolver().query( @@ -54,20 +63,22 @@ public class Contact { new String[] { phoneNumber }, null); + // 如果能够查询到联系人信息 if (cursor != null && cursor.moveToFirst()) { try { String name = cursor.getString(0); + // 将电话号码与联系人名字加入缓存中 sContactCache.put(phoneNumber, name); return name; } catch (IndexOutOfBoundsException e) { Log.e(TAG, " Cursor get string error " + e.toString()); return null; } finally { - cursor.close(); + cursor.close();// 关闭查询结果游标 } - } else { + } else {// 如果未能查询到联系人信息,输出日志并返回 null Log.d(TAG, "No contact matched with number:" + phoneNumber); return null; } } -} +} \ No newline at end of file diff --git a/doc/庞浩注释的代码/Note.java b/doc/庞浩注释的代码/Note.java new file mode 100644 index 0000000..e4e7339 --- /dev/null +++ b/doc/庞浩注释的代码/Note.java @@ -0,0 +1,268 @@ +/* + * 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.model; +import android.content.ContentProviderOperation; +import android.content.ContentProviderResult; +import android.content.ContentUris; +import android.content.ContentValues; +import android.content.Context; +import android.content.OperationApplicationException; +import android.net.Uri; +import android.os.RemoteException; +import android.util.Log; + +import net.micode.notes.data.Notes; +import net.micode.notes.data.Notes.CallNote; +import net.micode.notes.data.Notes.DataColumns; +import net.micode.notes.data.Notes.NoteColumns; +import net.micode.notes.data.Notes.TextNote; + +import java.util.ArrayList; + + +public class Note { + private ContentValues mNoteDiffValues;//声明了一个私有成员变量mNoteDiffValues,用于存储笔记的差异数据 + private NoteData mNoteData; + private static final String TAG = "Note";// 定义了一个静态常量TAG,用于在日志输出时标记日志来源 + /** + * Create a new note id for adding a new note to databases为添加新笔记到数据库中创建一个新的笔记id + */ + public static synchronized long getNewNoteId(Context context, long folderId) { + // Create a new note in the database(在数据库中创建一个新笔记) + ContentValues values = new ContentValues();// 创建一个ContentValues对象,用于存储要添加的笔记数据 + long createdTime = System.currentTimeMillis(); // 获取当前时间戳,作为笔记的创建时间和修改时间 + values.put(NoteColumns.CREATED_DATE, createdTime);// 将笔记的创建时间存储到ContentValues对象中 + values.put(NoteColumns.MODIFIED_DATE, createdTime);// 将笔记的修改时间存储到ContentValues对象中 + values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);// 将笔记的类型设置为“普通便签” + values.put(NoteColumns.LOCAL_MODIFIED, 1);// 将笔记的“本地修改”标志设置为“已修改” + values.put(NoteColumns.PARENT_ID, folderId);// 将笔记的父文件夹id存储到ContentValues对象中 + Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);// 将ContentValues对象插入到数据库中,返回插入的笔记的Uri地址 + + long noteId = 0; // 定义一个变量,用于存储新创建的笔记id + try { + noteId = Long.valueOf(uri.getPathSegments().get(1)); // 从Uri地址中提取新创建的笔记id + } catch (NumberFormatException e) { // 如果提取失败,记录错误日志 + Log.e(TAG, "Get note id error :" + e.toString()); + noteId = 0; + } + if (noteId == -1) {// 如果便签id异常,抛出异常 + throw new IllegalStateException("Wrong note id:" + noteId); + } + return noteId;// 返回新创建的便签id + } + + public Note() { + mNoteDiffValues = new ContentValues();// 创建一个ContentValues对象,用于存储便签的差异数据 + mNoteData = new NoteData();// 创建一个NoteData对象,用于存储便签的详细数据 + } + + public void setNoteValue(String key, String value) { + mNoteDiffValues.put(key, value);// 将便签的属性名和属性值存储到ContentValues对象中 + mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);// 将便签的“本地修改”标志设置为“已修改” + mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); // 将便签的修改时间设置为当前时间戳 + } + + public void setTextData(String key, String value) { + mNoteData.setTextData(key, value); + }//将便签的文本数据(如标题、正文等)存储到NoteData对象中 + + public void setTextDataId(long id) { + mNoteData.setTextDataId(id); + }// 将便签的文本数据的id存储到NoteData对象中 + + public long getTextDataId() { + return mNoteData.mTextDataId; + }// 返回便签的文本数据的id + + public void setCallDataId(long id) { + mNoteData.setCallDataId(id); + }// 将便签的通讯数据的id存储到NoteData对象中 + + public void setCallData(String key, String value) { + mNoteData.setCallData(key, value); + }// 将便签的通讯数据(如联系人、电话号码等)存储到NoteData对象中 + + public boolean isLocalModified() { + return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified(); + }// 检查便签是否被修改过,如果便签的差异数据或详细数据被修改过,则返回true,否则返回false。 + + public boolean syncNote(Context context, long noteId) { + if (noteId <= 0) { + throw new IllegalArgumentException("Wrong note id:" + noteId); + }// 如果便签id异常,抛出异常 + + if (!isLocalModified()) { + return true; + }// 如果便签没有被修改,直接返回true + + /** + * In theory, once data changed, the note should be updated on {@link NoteColumns#LOCAL_MODIFIED} and + * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the + * note data info(理论上,一旦数据发生更改,应该更新{@link NoteColumns#LOCAL_MODIFIED}和{@link NoteColumns#MODIFIED_DATE}。 + * 为了数据安全,虽然更新笔记失败,但仍然会更新笔记数据) + */ + if (context.getContentResolver().update(// 更新便签数据 + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null, + null) == 0) { + Log.e(TAG, "Update note error, should not happen");// 如果更新失败,记录错误日志 + // Do not return, fall through没有返回就是失败 + } + mNoteDiffValues.clear();// 清空便签的差异数据 + + if (mNoteData.isLocalModified()// 更新便签的详细数据 + && (mNoteData.pushIntoContentResolver(context, noteId) == null)) { + return false;// 如果更新失败,返回false + } + + return true;// 更新成功,返回true + } + + private class NoteData {// 定义私有字段 + private long mTextDataId;// 文本数据的 ID + + private ContentValues mTextDataValues;// 文本数据的 ContentValues 对象 + + private long mCallDataId;// 通话数据的 ID + + private ContentValues mCallDataValues;// 通话数据的 ContentValues 对象 + + private static final String TAG = "NoteData";// 定义静态常量TAG + + public NoteData() {// 定义构造函数 + mTextDataValues = new ContentValues(); // 初始化文本数据的 ContentValues 对象 + mCallDataValues = new ContentValues();// 初始化通话数据的 ContentValues 对象 + mTextDataId = 0;// 初始化文本数据的 ID + mCallDataId = 0;// 初始化通话数据的 ID + } + + boolean isLocalModified() {// 定义方法 isLocalModified,判断数据是否被修改过 + return mTextDataValues.size() > 0 || mCallDataValues.size() > 0; + } + + void setTextDataId(long id) { // 定义方法 setTextDataId,设置文本数据的 ID + if(id <= 0) { + throw new IllegalArgumentException("Text data id should larger than 0"); + } + mTextDataId = id; + } + + void setCallDataId(long id) {// 定义方法 setCallDataId,设置通话数据的 ID + if (id <= 0) { + throw new IllegalArgumentException("Call data id should larger than 0"); + } + mCallDataId = id; + } + + void setCallData(String key, String value) {// 定义方法 setCallData,用于设置通话数据的键值对 + mCallDataValues.put(key, value);// 将键值对存储在 mCallDataValues 中 + mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);// 标记数据已被修改 + mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); // 记录修改时间 + } + + void setTextData(String key, String value) {// 定义方法 setTextData,用于设置文本数据的键值对 + mTextDataValues.put(key, value);// 将键值对存储在 mTextDataValues 中 + mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); // 标记数据已被修改 + mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());// 记录修改时间 + } + + /** + * 这段代码定义了一个方法 pushIntoContentResolver,用于将笔记数据保存到 ContentProvider 中。 + * 该方法接受两个参数:context 表示上下文,noteId 表示笔记的 ID。 + * 运行时首先会检查传入的参数是否合法,如果 noteId 小于等于 0,则会抛出非法参数异常。 + * 接下来,该方法会创建一个 ContentProviderOperation 列表,用于存储要执行的操作。 + * 然后,该方法会检查 mTextDataValues 和 mCallDataValues 这两个成员变量中是否存储了文本数据和通话数据, + * 如果有,则会将它们保存到 ContentProvider 中。 + * 如果 mTextDataId 或 mCallDataId 不为 0,则会执行更新操作,否则会执行插入操作。 + * 最后,如果操作列表中有操作,则会通过 ContentResolver 将操作批量提交到 ContentProvider 中。 + * 如果提交操作成功,则会返回笔记的 URI,否则会返回 null。 + * @param context + * @param noteId + * @return + */ + Uri pushIntoContentResolver(Context context, long noteId) { + /** + * Check for safety(检查是否安全) + */ + if (noteId <= 0) { + throw new IllegalArgumentException("Wrong note id:" + noteId); + } + + ArrayList operationList = new ArrayList(); + ContentProviderOperation.Builder builder = null;// 创建一个ContentProviderOperation列表 + + if(mTextDataValues.size() > 0) {// 如果有文本数据需要更新或添加 + mTextDataValues.put(DataColumns.NOTE_ID, noteId);// 设置文本数据的noteId + if (mTextDataId == 0) { + mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE);// 如果文本数据的id为0,表示需要添加新的文本数据 + Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI, + mTextDataValues);// 插入新的文本数据到数据表中 + try {// 从插入结果中获取新插入数据的id + setTextDataId(Long.valueOf(uri.getPathSegments().get(1))); + } catch (NumberFormatException e) { + Log.e(TAG, "Insert new text data fail with noteId" + noteId); + mTextDataValues.clear(); + return null;// 插入失败,清空数据并返回null + } + } else { + builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( + Notes.CONTENT_DATA_URI, mTextDataId)); + builder.withValues(mTextDataValues); + operationList.add(builder.build()); + } // 如果文本数据的id不为0,表示需要更新已有的文本数据 + mTextDataValues.clear();// 清空文本数据的值 + } + + if(mCallDataValues.size() > 0) {// 如果有电话数据需要更新或添加 + mCallDataValues.put(DataColumns.NOTE_ID, noteId);// 设置电话数据的noteId + if (mCallDataId == 0) {// 如果电话数据的id为0,表示需要添加新的电话数据 + mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE); + Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI, + mCallDataValues);// 插入新的电话数据到数据表中 + try { // 从插入结果中获取新插入数据的id + setCallDataId(Long.valueOf(uri.getPathSegments().get(1))); + } catch (NumberFormatException e) { + Log.e(TAG, "Insert new call data fail with noteId" + noteId); + mCallDataValues.clear(); + return null;// 插入失败,清空数据并返回null + } + } else { + builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( + Notes.CONTENT_DATA_URI, mCallDataId)); + builder.withValues(mCallDataValues); + operationList.add(builder.build()); + } // 如果电话数据的id不为0,表示需要更新已有的电话数据 + mCallDataValues.clear(); // 清空电话数据的值 + } + + if (operationList.size() > 0) { // 如果有操作需要执行 + try {// 执行操作并获取结果 + ContentProviderResult[] results = context.getContentResolver().applyBatch( + Notes.AUTHORITY, operationList);// 返回操作结果的Uri + return (results == null || results.length == 0 || results[0] == null) ? null + : ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId); + } catch (RemoteException e) { + Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); + return null; // 操作失败,返回null并记录日志 + } catch (OperationApplicationException e) { + Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); + return null;// 操作失败,返回null并记录日志 + } + } + return null; + } + } +} diff --git a/src/minotes/data/Notes.java b/doc/庞浩注释的代码/Notes.java similarity index 54% rename from src/minotes/data/Notes.java rename to doc/庞浩注释的代码/Notes.java index f240604..e1fa12c 100644 --- a/src/minotes/data/Notes.java +++ b/doc/庞浩注释的代码/Notes.java @@ -18,155 +18,165 @@ package net.micode.notes.data; import android.net.Uri; public class Notes { - public static final String AUTHORITY = "micode_notes"; - public static final String TAG = "Notes"; - public static final int TYPE_NOTE = 0; - public static final int TYPE_FOLDER = 1; - public static final int TYPE_SYSTEM = 2; + public static final String AUTHORITY = "micode_notes"; // 小米便签内容提供器的URI授权 + public static final String TAG = "Notes"; // 用于调试和日志记录的标签 + // 小米便签支持的三种类型 + public static final int TYPE_NOTE = 0; // 笔记 + public static final int TYPE_FOLDER = 1;// 文件夹 + public static final int TYPE_SYSTEM = 2;// 系统便签 /** * Following IDs are system folders' identifiers - * {@link Notes#ID_ROOT_FOLDER } is default folder - * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder - * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records + * {@link Notes#ID_ROOT_FOLDER } is default folder根文件夹 + * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder不属于文件夹的笔记就是临时笔记,存放于临时文件夹 + * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records存放通话记录的文件夹 */ - public static final int ID_ROOT_FOLDER = 0; - public static final int ID_TEMPARAY_FOLDER = -1; - public static final int ID_CALL_RECORD_FOLDER = -2; - public static final int ID_TRASH_FOLER = -3; - - public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date"; - public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id"; - public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id"; - public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type"; - public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id"; - public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date"; - - public static final int TYPE_WIDGET_INVALIDE = -1; - public static final int TYPE_WIDGET_2X = 0; - public static final int TYPE_WIDGET_4X = 1; + // 小米便签内置的四个特殊文件夹 + public static final int ID_ROOT_FOLDER = 0; // 根文件夹 + public static final int ID_TEMPARAY_FOLDER = -1; // 临时文件夹 + public static final int ID_CALL_RECORD_FOLDER = -2;// 通话记录文件夹 + public static final int ID_TRASH_FOLER = -3; // 回收站文件夹 + + public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date";//提醒时间的Intent extra key,用于设置笔记的提醒时间。 + public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id";//背景颜色的Intent extra key,用于设置笔记的背景颜色。 + public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id";//小部件ID的Intent extra key,用于设置小部件的ID。 + public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type";//小部件类型的Intent extra key,用于设置小部件的类型。 + public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id";//文件夹ID的Intent extra key,用于设置笔记所属的文件夹。 + public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date";//通话时间的Intent extra key,用于设置通话笔记的通话时间。 + + public static final int TYPE_WIDGET_INVALIDE = -1;//表示无效的小部件类型,其值为-1。 + public static final int TYPE_WIDGET_2X = 0;//表示2x2大小的小部件,其值为0。 + public static final int TYPE_WIDGET_4X = 1;//表示4x4大小的小部件,其值为1。 public static class DataConstants { - public static final String NOTE = TextNote.CONTENT_ITEM_TYPE; - public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE; - } + public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;//指定普通的文本笔记类型 + public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;//指定通话记录笔记类型 + }//定义笔记的类型 /** - * Uri to query all notes and folders + * Uri to query all notes and folders(查询所有的笔记和文件夹) */ public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note"); /** - * Uri to query data + * Uri to query data(查询数据) */ public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data"); public interface NoteColumns { /** - * The unique ID for a row + * The unique ID for a row(笔记或文件夹的唯一ID) *

Type: INTEGER (long)

*/ public static final String ID = "_id"; /** - * The parent's id for note or folder + * The parent's id for note or folder(笔记或文件夹的父级 ID) *

Type: INTEGER (long)

*/ public static final String PARENT_ID = "parent_id"; /** - * Created data for note or folder + * Created data for note or folder(笔记或文件夹的创建日期) *

Type: INTEGER (long)

*/ public static final String CREATED_DATE = "created_date"; /** - * Latest modified date + * Latest modified date(笔记或文件夹的最后修改日期) *

Type: INTEGER (long)

*/ public static final String MODIFIED_DATE = "modified_date"; /** - * Alert date + * Alert date(笔记或文件夹的提醒日期) *

Type: INTEGER (long)

*/ public static final String ALERTED_DATE = "alert_date"; /** - * Folder's name or text content of note + * Folder's name or text content of note(笔记或文件夹的文本内容或名称) *

Type: TEXT

*/ public static final String SNIPPET = "snippet"; /** - * Note's widget id + * Note's widget id(笔记所对应的桌面小部件 ID) *

Type: INTEGER (long)

*/ public static final String WIDGET_ID = "widget_id"; /** - * Note's widget type + * Note's widget type(笔记所对应的桌面小部件类型) *

Type: INTEGER (long)

*/ public static final String WIDGET_TYPE = "widget_type"; /** - * Note's background color's id + * Note's background color's id(笔记的背景颜色 ID) *

Type: INTEGER (long)

*/ public static final String BG_COLOR_ID = "bg_color_id"; /** * For text note, it doesn't has attachment, for multi-media - * note, it has at least one attachment + * note, it has at least one attachment(笔记是否包含附件) *

Type: INTEGER

*/ public static final String HAS_ATTACHMENT = "has_attachment"; /** - * Folder's count of notes + * Folder's count of notes(文件夹中笔记的数量) *

Type: INTEGER (long)

*/ public static final String NOTES_COUNT = "notes_count"; /** - * The file type: folder or note + * The file type: folder or note(笔记类型,可以是文件夹或笔记) *

Type: INTEGER

*/ public static final String TYPE = "type"; /** - * The last sync id + * The last sync id(最后同步 ID) *

Type: INTEGER (long)

*/ public static final String SYNC_ID = "sync_id"; /** - * Sign to indicate local modified or not + * Sign to indicate local modified or not(本地是否修改过) *

Type: INTEGER

*/ public static final String LOCAL_MODIFIED = "local_modified"; /** - * Original parent id before moving into temporary folder + * Original parent id before moving into temporary folder(移动到临时文件夹之前的原始父级 ID) *

Type : INTEGER

*/ public static final String ORIGIN_PARENT_ID = "origin_parent_id"; /** - * The gtask id + * The gtask id(Google 任务 ID) *

Type : TEXT

*/ public static final String GTASK_ID = "gtask_id"; /** - * The version code + * The version code(版本号) *

Type : INTEGER (long)

*/ public static final String VERSION = "version"; } + /** + * 这个接口DataColumns定义了笔记应用程序中的笔记数据表格中所有列的常量, + * 而NotesColumns定义了笔记应用程序中的笔记数据表格中的特定列的常量。 + * 因此,DataColumns更通用,而NotesColumns更具体。 + * NotesColumns接口包含笔记的标题、正文和颜色等属性, + * 而DataColumns接口包含笔记数据表格中的通用列。 + * 在许多情况下,这两个接口将一起使用。所以重复的常量就不在做解释了。 + */ public interface DataColumns { /** * The unique ID for a row @@ -175,13 +185,13 @@ public class Notes { public static final String ID = "_id"; /** - * The MIME type of the item represented by this row. + * The MIME type of the item represented by this row.(表示该行数据的MIME类型) *

Type: Text

*/ public static final String MIME_TYPE = "mime_type"; /** - * The reference id to note that this data belongs to + * The reference id to note that this data belongs to(表示该行数据所属的笔记的ID) *

Type: INTEGER (long)

*/ public static final String NOTE_ID = "note_id"; @@ -241,39 +251,54 @@ public class Notes { public static final String DATA5 = "data5"; } + /** + * 这是一个嵌套在NotePad类中的静态内部类TextNote。 + * 它实现了DataColumns接口,并定义了特定于文本笔记的常量和内容URI。 + * 与NotesColumns类似,TextNote还具有特定于文本笔记的常量, + * 例如MODE和MODE_CHECK_LIST,以及特定于文本笔记的内容类型和内容项类型常量。 + * 此外,TextNote还定义了用于访问文本笔记数据的内容URI,该URI指向ContentProvider的text_note表。 + */ public static final class TextNote implements DataColumns { /** * Mode to indicate the text in check list mode or not *

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

*/ - public static final String MODE = DATA1; + public static final String MODE = DATA1;//MODE字段表示文本笔记的模式,可以是正常模式或者是带有任务清单的模式,类型为整数。它使用了接口中的DATA1字段来表示其存储值的列名。 - public static final int MODE_CHECK_LIST = 1; + public static final int MODE_CHECK_LIST = 1;//MODE_CHECK_LIST字段表示任务清单模式的值,为1。 public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note"; - + //CONTENT_TYPE字段表示此数据的MIME类型,指示ContentProvider返回的数据类型。此处表示返回的是文本笔记列表。 public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note"; - + //CONTENT_ITEM_TYPE字段表示此数据的单个项目的MIME类型。 public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note"); - } + //CONTENT_URI字段表示此数据的URI地址。 + } + /** + * 这是一个嵌套在Notes类中的静态内部类CallNote,实现了DataColumns接口。 + * CallNote定义了一些特定于电话记录的字段,如CALL_DATE(通话日期)和PHONE_NUMBER(电话号码), + * 并定义了ContentProvider使用的MIME类型和URI。 + */ public static final class CallNote implements DataColumns { /** - * Call date for this record + * Call date for this record(记录通话日期) *

Type: INTEGER (long)

*/ public static final String CALL_DATE = DATA1; - + //表示通话日期的列名,数据类型为long,存储在DATA1列中。 /** - * Phone number for this record + * Phone number for this record(记录通话号码) *

Type: TEXT

*/ public static final String PHONE_NUMBER = DATA3; - + //表示电话号码的列名,数据类型为String,存储在DATA3列中。 public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note"; - + //单条通话记录,用于指定MIME类型的常量 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"); - } + //该类的内容URI,用于访问通话记录。 + } } diff --git a/src/minotes/data/NotesDatabaseHelper.java b/doc/庞浩注释的代码/NotesDatabaseHelper.java similarity index 59% rename from src/minotes/data/NotesDatabaseHelper.java rename to doc/庞浩注释的代码/NotesDatabaseHelper.java index ffe5d57..d68f611 100644 --- a/src/minotes/data/NotesDatabaseHelper.java +++ b/doc/庞浩注释的代码/NotesDatabaseHelper.java @@ -26,7 +26,13 @@ import net.micode.notes.data.Notes.DataColumns; import net.micode.notes.data.Notes.DataConstants; import net.micode.notes.data.Notes.NoteColumns; - +/** + * 这段代码定义了一个名为NotesDatabaseHelper的类,继承自SQLiteOpenHelper。 + * 在该类中定义了数据库名(DB_NAME)和数据库版本号(DB_VERSION), + * 并定义了一个内部接口TABLE,该接口中定义了NOTE和DATA两个常量,分别表示数据库中的两个表名。 + * 其中SQLiteOpenHelper是Android提供的用于管理SQLite数据库的类, + * 它提供了创建、更新、打开和关闭数据库的方法,同时它也能够在不同的版本之间管理数据库的迁移。 + */ public class NotesDatabaseHelper extends SQLiteOpenHelper { private static final String DB_NAME = "note.db"; @@ -38,52 +44,64 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { public static final String DATA = "data"; } - private static final String TAG = "NotesDatabaseHelper"; - + private static final String TAG = "NotesDatabaseHelper";//这一行代码定义了一个名为TAG的字符串常量,用于在调试时作为日志标签。 + /** + * 定义了一个静态变量mInstance,类型是NotesDatabaseHelper,并且标记为static, + * 表示这个变量是属于类的而不是实例的。 + * 在类被加载的时候,这个变量会被创建。这个变量的作用是在整个应用中只创建一个NotesDatabaseHelper实例, + * 这样可以避免在多个地方重复创建数据库连接和实例,提高应用的性能和效率。 + */ private static NotesDatabaseHelper mInstance; - + /** + * 这段代码定义了两个字符串常量 CREATE_NOTE_TABLE_SQL 和 CREATE_DATA_TABLE_SQL, + * 分别用于创建两个数据库表格:note 和 data。 + */ private static final String CREATE_NOTE_TABLE_SQL = "CREATE TABLE " + TABLE.NOTE + "(" + - NoteColumns.ID + " INTEGER PRIMARY KEY," + - NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," + - NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + - 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.ID + " INTEGER PRIMARY KEY," +//笔记 ID,整数类型,作为主键 + NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +//父笔记 ID,整数类型,不为空,默认为 0 + NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +//提醒时间,整数类型,不为空,默认为 0 + NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," +//背景颜色 ID,整数类型,不为空,默认为 0 + NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +//创建时间,整数类型,不为空,默认为当前时间 + NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," +//是否有附件,整数类型,不为空,默认为 0 + NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +//修改时间,整数类型,不为空,默认为当前时间 + NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," +//笔记数量,整数类型,不为空,默认为 0 + NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," +//笔记概要,文本类型,不为空,默认为空字符串 + NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," +//笔记类型,整数类型,不为空,默认为 0 + NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," +//小部件 ID,整数类型,不为空,默认为 0 + NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +//小部件类型,整数类型,不为空,默认为 -1 + NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +//同步 ID,整数类型,不为空,默认为 0 + NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +//本地修改标识,整数类型,不为空,默认为 0 + NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +//原始父笔记 ID,整数类型,不为空,默认为 0 + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +//Google 任务 ID,文本类型,不为空,默认为空字符串 + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +//版本号,整数类型,不为空,默认为 0 ")"; private static final String CREATE_DATA_TABLE_SQL = "CREATE TABLE " + TABLE.DATA + "(" + - DataColumns.ID + " INTEGER PRIMARY KEY," + - DataColumns.MIME_TYPE + " TEXT NOT NULL," + - DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," + + DataColumns.ID + " INTEGER PRIMARY KEY," +//数据 ID,整数类型,作为主键 + DataColumns.MIME_TYPE + " TEXT NOT NULL," +//MIME 类型,文本类型,不为空 + DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +//笔记 ID,整数类型,不为空,默认为 0 + NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +//创建时间,整数类型,不为空,默认为当前时间 + NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +//修改时间,整数类型,不为空,默认为当前时间 + DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," +//数据内容,文本类型,不为空,默认为空字符串 DataColumns.DATA1 + " INTEGER," + DataColumns.DATA2 + " INTEGER," + DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + ")"; - + /** + * 这是一个用于创建数据库索引的SQL语句,它将创建一个名为"note_id_index"的索引, + * 该索引将位于"TABLE.DATA"表上,并将使用"DataColumns.NOTE_ID"列作为索引键。 + * 这个索引的目的是在查询该表时提高性能,尤其是在根据笔记ID进行过滤时。如果索引已经存在,则不会重复创建。 + */ private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = "CREATE INDEX IF NOT EXISTS note_id_index ON " + TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; - +//以下是各种 SQLite 数据库的触发器,用于更新数据库 /** - * Increase folder's note count when move note to the folder + * Increase folder's note count when move note to the folder(移动笔记到文件夹时增加文件夹的笔记数) */ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = "CREATE TRIGGER increase_folder_count_on_update "+ @@ -95,7 +113,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Decrease folder's note count when move note from folder + * Decrease folder's note count when move note from folder(从文件夹中移动笔记时减少文件夹笔记数) */ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = "CREATE TRIGGER decrease_folder_count_on_update " + @@ -108,7 +126,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Increase folder's note count when insert new note to the folder + * Increase folder's note count when insert new note to the folder(向文件夹插入新笔记时增加文件夹笔记计数) */ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = "CREATE TRIGGER increase_folder_count_on_insert " + @@ -120,7 +138,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Decrease folder's note count when delete note from the folder + * Decrease folder's note count when delete note from the folder(从文件夹中删除笔记时减少文件夹的笔记数) */ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = "CREATE TRIGGER decrease_folder_count_on_delete " + @@ -133,7 +151,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Update note's content when insert data with type {@link DataConstants#NOTE} + * Update note's content when insert data with type {@link DataConstants#NOTE}(插入DataConstants类型的数据时更新笔记的内容) */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = "CREATE TRIGGER update_note_content_on_insert " + @@ -146,7 +164,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Update note's content when data with {@link DataConstants#NOTE} type has changed + * Update note's content when data with {@link DataConstants#NOTE} type has changed(当DataConstants类型的数据发生更改时更新笔记的内容) */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = "CREATE TRIGGER update_note_content_on_update " + @@ -159,7 +177,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Update note's content when data with {@link DataConstants#NOTE} type has deleted + * Update note's content when data with {@link DataConstants#NOTE} type has deleted(删除DataConstants类型的数据时更新笔记的内容) */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = "CREATE TRIGGER update_note_content_on_delete " + @@ -172,7 +190,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Delete datas belong to note which has been deleted + * Delete datas belong to note which has been deleted(删除属于已删除笔记的数据) */ private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = "CREATE TRIGGER delete_data_on_delete " + @@ -183,7 +201,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Delete notes belong to folder which has been deleted + * Delete notes belong to folder which has been deleted(删除属于已删除文件夹的笔记) */ private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = "CREATE TRIGGER folder_delete_notes_on_delete " + @@ -194,7 +212,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Move notes belong to folder which has been moved to trash folder + * Move notes belong to folder which has been moved to trash folder(当一个文件夹被更新到废纸篓时,将其下所有笔记移动到废纸篓文件夹) */ private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = "CREATE TRIGGER folder_move_notes_on_trash " + @@ -206,10 +224,23 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + " END"; + /** + * 这段代码是一个构造函数,用于创建一个NotesDatabaseHelper对象。这个对象是用于管理SQLite数据库的帮助类,可以用来创建、升级和管理数据库表格。 + * 构造函数有四个参数,分别是: + * Context context:上下文对象,用于访问应用程序的资源和环境。 + * String DB_NAME:数据库的名称。 + * CursorFactory factory:用于创建游标对象的工厂类,如果为null,则使用默认工厂。 + * int DB_VERSION:数据库的版本号,用于管理数据库的升级。 + */ public NotesDatabaseHelper(Context context) { super(context, DB_NAME, null, DB_VERSION); } + /** + * 该方法负责在数据库中创建笔记表。 + * 它执行SQL语句CREATE_NOTE_TABLE_SQL来创建表,然后调用reCreateNoteTableTriggers方法来重新创建与笔记表关联的触发器。 + * 然后,它通过调用createSystemFolder方法创建一个系统文件夹,并使用Log.d方法记录一条消息,以指示笔记表已经创建。 + */ public void createNoteTable(SQLiteDatabase db) { db.execSQL(CREATE_NOTE_TABLE_SQL); reCreateNoteTableTriggers(db); @@ -217,6 +248,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { Log.d(TAG, "note table has been created"); } + /** + * 该方法用于重新创建笔记表相关的触发器。 + * 它首先使用DROP TRIGGER语句删除所有已有的触发器,然后使用CREATE TRIGGER语句重新创建它们。 + * 这个方法是为了在升级数据库时使用,以便更新旧版本的触发器。 + * @param db + */ private void reCreateNoteTableTriggers(SQLiteDatabase db) { db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update"); db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update"); @@ -235,18 +272,25 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER); } + /** + * 此方法在数据库中创建四个系统文件夹:通话记录文件夹、根文件夹、临时文件夹和废纸篓文件夹。 + * 该方法创建一个ContentValues对象,并为每个文件夹的ID和TYPE列添加值。 + * 然后,该方法使用SQLiteDatabase类的insert()方法将值插入笔记表中。 + * 系统文件夹的ID定义为Notes类中的常量。 + * 通话记录文件夹用于通话笔记,根文件夹是默认文件夹,临时文件夹用于移动笔记,废纸篓文件夹是移动已删除笔记的地方。 + */ private void createSystemFolder(SQLiteDatabase db) { ContentValues values = new ContentValues(); /** - * call record foler for call notes + * call record folder for call notes */ values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER); values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); db.insert(TABLE.NOTE, null, values); /** - * root folder which is default folder + * root folder which is default folder(mo */ values.clear(); values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER); @@ -270,6 +314,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.insert(TABLE.NOTE, null, values); } + /** + * 此方法在数据库中创建数据表,并设置必要的触发器和索引。 + * 它将SQLiteDatabase类的实例作为参数,用于执行SQL语句以创建数据表、重新创建触发器和创建索引。 + * CREATE_DATA_TABLE_SQL常量保存用于创建数据表的SQL语句,该语句定义列及其数据类型。 + * 调用recreatedatabletriggers()方法来删除和重新创建与数据表关联的触发器,这将确保触发器是最新的模式更改。 + * CREATE_DATA_NOTE_ID_INDEX_SQL常量保存SQL语句,用于在数据表的NOTE ID列上创建索引, + * 这提高了在NOTE ID列上联接数据和NOTE表的查询的性能。最后,打印一条日志消息,指示数据表已经创建。 + */ public void createDataTable(SQLiteDatabase db) { db.execSQL(CREATE_DATA_TABLE_SQL); reCreateDataTableTriggers(db); @@ -277,6 +329,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { Log.d(TAG, "data table has been created"); } + /** + * Recreatedatabletriggers方法用于删除用于在insert、update和delete上更新注释内容的现有触发器, + * 然后使用最新定义重新创建它们。 + * 以下是被删除的触发器:update_note_content_on_insert_content_on_update_note_content_on_delete, + * 这些是重新创建的触发器:data_update_note_content_on_insert_trigger data_update_trigger data_update_note_content_on_delete_trigger + * 这些触发器确保每当在数据表中创建、更新或删除笔记时,笔记表中的snippet字段都会被更新。 + */ private void reCreateDataTableTriggers(SQLiteDatabase db) { db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert"); db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update"); @@ -287,6 +346,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER); } + /** + * 这是一个静态方法,它返回NotesDatabaseHelper类的单个实例。 + * 它将Context对象作为参数,并检查NotesDatabaseHelper的实例是否为null。 + * 如果实例为null,则创建NotesDatabaseHelper类的新实例并返回它。如果实例已经存在,则返回现有实例。 + * 该方法是同步的,以确保一次只有一个线程可以访问它,避免任何并发问题。 + */ static synchronized NotesDatabaseHelper getInstance(Context context) { if (mInstance == null) { mInstance = new NotesDatabaseHelper(context); @@ -294,6 +359,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { return mInstance; } + /** + * 这是NotesDatabaseHelper类中onCreate()和onUpgrade()方法的实现。 + * 第一次创建数据库时调用onCreate()。 + * 它分别使用createNoteTable()和createDataTable()方法在数据库中创建Note和Data两个表。 + * 当数据库需要升级到较新版本时,将调用onUpgrade()。 + * 它首先检查数据库的旧版本,并执行必要的升级将其带到新版本。 + * 在这个实现中,有三个升级步骤:从版本1升级到版本2:这将删除现有的Note和数据表,并使用createNoteTable()和createDataTable()方法重新创建它们。 + * 从版本2升级到版本3:这将删除一些未使用的触发器,并向Note表添加一个新列gtask_id。它还为回收筒创建一个新的系统文件夹。 + * 从版本3升级到版本4:这将向注释表添加一个新的列版本。 + * 如果在升级步骤中删除了任何触发器,则调用reCreateNoteTableTriggers()和recreateDatabletriggers()方法来重新创建它们。 + * 如果升级因某种原因失败,将引发IllegalStateException。 + */ @Override public void onCreate(SQLiteDatabase db) { createNoteTable(db); diff --git a/app/src/main/java/net/micode/notes/data/NotesProvider.java b/doc/庞浩注释的代码/NotesProvider.java similarity index 64% rename from app/src/main/java/net/micode/notes/data/NotesProvider.java rename to doc/庞浩注释的代码/NotesProvider.java index edb0a60..e1e5eb2 100644 --- a/app/src/main/java/net/micode/notes/data/NotesProvider.java +++ b/doc/庞浩注释的代码/NotesProvider.java @@ -35,20 +35,20 @@ import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.NotesDatabaseHelper.TABLE; -public class NotesProvider extends ContentProvider { - private static final UriMatcher mMatcher; +public class NotesProvider extends ContentProvider {//定义NotesProvider类,它继承自ContentProvider类 + private static final UriMatcher mMatcher;//声明UriMatcher实例 - private NotesDatabaseHelper mHelper; + private NotesDatabaseHelper mHelper;//声明NotesDatabaseHelper实例用于匹配Uri,以确定请求的类型,例如是否是请求特定的数据项,或者是否是搜索建议请求。 private static final String TAG = "NotesProvider"; - private static final int URI_NOTE = 1; - private static final int URI_NOTE_ITEM = 2; - private static final int URI_DATA = 3; - private static final int URI_DATA_ITEM = 4; + private static final int URI_NOTE = 1;//代表笔记数据的URI + private static final int URI_NOTE_ITEM = 2;//代表单个笔记数据的URI + private static final int URI_DATA = 3;//代表附加数据的URI + private static final int URI_DATA_ITEM = 4;//代表单个附加数据的URI - private static final int URI_SEARCH = 5; - private static final int URI_SEARCH_SUGGEST = 6; + private static final int URI_SEARCH = 5;//代表搜索请求的URI + private static final int URI_SEARCH_SUGGEST = 6;//代表搜索建议请求的URI static { mMatcher = new UriMatcher(UriMatcher.NO_MATCH); @@ -65,6 +65,7 @@ public class NotesProvider extends ContentProvider { * x'0A' represents the '\n' character in sqlite. For title and content in the search result, * we will trim '\n' and white space in order to show more information. */ + // 定义将在搜索结果中返回的列 private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + "," + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + "," + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + "," @@ -72,15 +73,15 @@ public class NotesProvider extends ContentProvider { + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + "," + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + "," + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA; - + // 定义将执行以检索搜索结果的搜索查询 private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION - + " FROM " + TABLE.NOTE - + " WHERE " + NoteColumns.SNIPPET + " LIKE ?" - + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER - + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; + + " FROM " + TABLE.NOTE// 指定要搜索的表 + + " WHERE " + NoteColumns.SNIPPET + " LIKE ?"// 指定搜索查询 + + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER// 排除在垃圾桶文件夹中的笔记 + + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE;// 排除非笔记条目 @Override - public boolean onCreate() { + public boolean onCreate() {// 获取数据库帮助类的实例 mHelper = NotesDatabaseHelper.getInstance(getContext()); return true; } @@ -88,30 +89,30 @@ public class NotesProvider extends ContentProvider { @Override public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { - Cursor c = null; + Cursor c = null;// 获取可读的数据库实例 SQLiteDatabase db = mHelper.getReadableDatabase(); String id = null; switch (mMatcher.match(uri)) { - case URI_NOTE: + case URI_NOTE:// 查询所有笔记 c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null, sortOrder); break; - case URI_NOTE_ITEM: + case URI_NOTE_ITEM:// 查询单个笔记 id = uri.getPathSegments().get(1); c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs, null, null, sortOrder); break; - case URI_DATA: + case URI_DATA:// 查询所有数据 c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null, sortOrder); break; - case URI_DATA_ITEM: + case URI_DATA_ITEM: // 查询单个数据 id = uri.getPathSegments().get(1); c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs, null, null, sortOrder); break; case URI_SEARCH: - case URI_SEARCH_SUGGEST: + case URI_SEARCH_SUGGEST:// 搜索笔记 if (sortOrder != null || projection != null) { throw new IllegalArgumentException( "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query"); @@ -130,7 +131,7 @@ public class NotesProvider extends ContentProvider { return null; } - try { + try {// 搜索所有匹配的笔记 searchString = String.format("%%%s%%", searchString); c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY, new String[] { searchString }); @@ -141,44 +142,44 @@ public class NotesProvider extends ContentProvider { default: throw new IllegalArgumentException("Unknown URI " + uri); } - if (c != null) { + if (c != null) {// 设置通知URI,以便在数据更改时通知观察者 c.setNotificationUri(getContext().getContentResolver(), uri); } return c; } @Override - public Uri insert(Uri uri, ContentValues values) { - SQLiteDatabase db = mHelper.getWritableDatabase(); - long dataId = 0, noteId = 0, insertedId = 0; + public Uri insert(Uri uri, ContentValues values) {// 获取可写的 SQLiteDatabase 对象 + SQLiteDatabase db = mHelper.getWritableDatabase();// 初始化三个变量,用于存储 note、data 和插入的记录的 ID + long dataId = 0, noteId = 0, insertedId = 0;// 根据传入的 Uri 进行匹配 switch (mMatcher.match(uri)) { - case URI_NOTE: + case URI_NOTE:// 向 TABLE.NOTE 表中插入记录,并获取插入的记录的 ID insertedId = noteId = db.insert(TABLE.NOTE, null, values); break; case URI_DATA: - if (values.containsKey(DataColumns.NOTE_ID)) { - noteId = values.getAsLong(DataColumns.NOTE_ID); + if (values.containsKey(DataColumns.NOTE_ID)) {// 如果 ContentValues 包含 DataColumns.NOTE_ID 列 + noteId = values.getAsLong(DataColumns.NOTE_ID);// 获取 DataColumns.NOTE_ID 列的值 } else { Log.d(TAG, "Wrong data format without note id:" + values.toString()); - } - insertedId = dataId = db.insert(TABLE.DATA, null, values); + }//打印日志 + insertedId = dataId = db.insert(TABLE.DATA, null, values);// 向 TABLE.DATA 表中插入记录,并获取插入的记录的 ID break; default: - throw new IllegalArgumentException("Unknown URI " + uri); + throw new IllegalArgumentException("Unknown URI " + uri);// 抛出 IllegalArgumentException 异常 } // Notify the note uri - if (noteId > 0) { + if (noteId > 0) { // 如果 noteId 大于 0,则通知 content resolver 对应的 Uri 对应的数据已经发生了变化 getContext().getContentResolver().notifyChange( ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null); } // Notify the data uri - if (dataId > 0) { + if (dataId > 0) {// 如果 dataId 大于 0,则通知 content resolver 对应的 Uri 对应的数据已经发生了变化 getContext().getContentResolver().notifyChange( ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null); } - return ContentUris.withAppendedId(uri, insertedId); + return ContentUris.withAppendedId(uri, insertedId); // 返回插入的记录的 Uri } @Override @@ -187,60 +188,62 @@ public class NotesProvider extends ContentProvider { String id = null; SQLiteDatabase db = mHelper.getWritableDatabase(); boolean deleteData = false; - switch (mMatcher.match(uri)) { - case URI_NOTE: - selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 "; - count = db.delete(TABLE.NOTE, selection, selectionArgs); + switch (mMatcher.match(uri)) {// 根据传入的 Uri 进行匹配 + case URI_NOTE:// 如果匹配到 URI_NOTE + selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 ";// 组合 selection 条件,以确保删除的是用户笔记,而不是系统文件夹 + count = db.delete(TABLE.NOTE, selection, selectionArgs);// 删除 TABLE.NOTE 表中符合条件的记录,并返回删除的数量 break; - case URI_NOTE_ITEM: - id = uri.getPathSegments().get(1); + case URI_NOTE_ITEM: // 如果匹配到 URI_NOTE_ITEM + id = uri.getPathSegments().get(1);// 获取 Uri 中的 ID /** * ID that smaller than 0 is system folder which is not allowed to * trash */ long noteId = Long.valueOf(id); - if (noteId <= 0) { + if (noteId <= 0) { // 如果 ID 小于等于 0,则直接跳出 switch 语句 break; } count = db.delete(TABLE.NOTE, - NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs); + NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs);// 删除 TABLE.NOTE 表中符合条件的记录,并返回删除的数量 break; - case URI_DATA: - count = db.delete(TABLE.DATA, selection, selectionArgs); + case URI_DATA:// 如果匹配到 URI_DATA + count = db.delete(TABLE.DATA, selection, selectionArgs);// 删除 TABLE.DATA 表中符合条件的记录,并返回删除的数量 deleteData = true; break; - case URI_DATA_ITEM: - id = uri.getPathSegments().get(1); + case URI_DATA_ITEM:// 如果匹配到 URI_DATA_ITEM + id = uri.getPathSegments().get(1); // 获取 Uri 中的 ID count = db.delete(TABLE.DATA, - DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs); + DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs);// 删除 TABLE.DATA 表中符合条件的记录,并返回删除的数量 deleteData = true; break; - default: - throw new IllegalArgumentException("Unknown URI " + uri); + default:// 如果无法匹配到 Uri + throw new IllegalArgumentException("Unknown URI " + uri);// 抛出 IllegalArgumentException 异常 } - if (count > 0) { + if (count > 0) {// 如果删除的数量大于 0 if (deleteData) { getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null); - } + } // 如果删除的是 TABLE.DATA 表中的记录,则通知 content resolver 对应的 Uri 对应的笔记数据已经发生了变化 getContext().getContentResolver().notifyChange(uri, null); } - return count; + return count;// 返回删除的数量 } @Override public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { - int count = 0; - String id = null; - SQLiteDatabase db = mHelper.getWritableDatabase(); - boolean updateData = false; - switch (mMatcher.match(uri)) { + int count = 0;// 受影响的行数 + String id = null;// 被更新的笔记或数据项的ID + SQLiteDatabase db = mHelper.getWritableDatabase();// 获取可写数据库 + boolean updateData = false;// 是否更新数据项 + + switch (mMatcher.match(uri)) {// 使用 switch 语句处理不同类型的 URI case URI_NOTE: - increaseNoteVersion(-1, selection, selectionArgs); - count = db.update(TABLE.NOTE, values, selection, selectionArgs); + increaseNoteVersion(-1, selection, selectionArgs);// 在更新前增加所有受影响的笔记的版本号 + count = db.update(TABLE.NOTE, values, selection, selectionArgs);// 更新数据库中的行并获取受影响的行数 + break; case URI_NOTE_ITEM: - id = uri.getPathSegments().get(1); - increaseNoteVersion(Long.valueOf(id), selection, selectionArgs); + id = uri.getPathSegments().get(1);// 在更新前增加笔记的版本号 + increaseNoteVersion(Long.valueOf(id), selection, selectionArgs); // 更新数据库中的行并获取受影响的行数 count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs); break; @@ -257,20 +260,20 @@ public class NotesProvider extends ContentProvider { default: throw new IllegalArgumentException("Unknown URI " + uri); } - + // 如果有行被更新,通知已注册的 ContentObserver if (count > 0) { if (updateData) { getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null); } getContext().getContentResolver().notifyChange(uri, null); } - return count; + return count; // 返回受影响的行数 } - + // 辅助方法,如果传递了 selection 参数,则将其添加到 SQL 查询中 private String parseSelection(String selection) { return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""); } - + // 辅助方法,在更新笔记之前增加其版本号 private void increaseNoteVersion(long id, String selection, String[] selectionArgs) { StringBuilder sql = new StringBuilder(120); sql.append("UPDATE "); @@ -278,7 +281,7 @@ public class NotesProvider extends ContentProvider { sql.append(" SET "); sql.append(NoteColumns.VERSION); sql.append("=" + NoteColumns.VERSION + "+1 "); - + // 如果传递了 ID 或 selection 参数,则将其添加到 SQL 查询中 if (id > 0 || !TextUtils.isEmpty(selection)) { sql.append(" WHERE "); } @@ -293,12 +296,12 @@ public class NotesProvider extends ContentProvider { sql.append(selectString); } - mHelper.getWritableDatabase().execSQL(sql.toString()); + mHelper.getWritableDatabase().execSQL(sql.toString());// 执行 SQL 查询以更新笔记的版本号 } @Override public String getType(Uri uri) { - // TODO Auto-generated method stub + // TODO Auto-generated method stub这是一个待办事项,需要根据 ContentProvider需求添加适当的 MIME类型。 return null; } diff --git a/src/minotes/tool/BackupUtils.java b/doc/邹兴云注释的代码/BackupUtils.java similarity index 66% rename from src/minotes/tool/BackupUtils.java rename to doc/邹兴云注释的代码/BackupUtils.java index 39f6ec4..8dbec2e 100644 --- a/src/minotes/tool/BackupUtils.java +++ b/doc/邹兴云注释的代码/BackupUtils.java @@ -47,23 +47,28 @@ public class BackupUtils { } return sInstance; } +/* `TAG` 是一个 String 常量,用于标识日志输出的 tag。 + `sInstance` 是一个静态变量,用于存储单例实例。 + `getInstance()` 是一个静态方法,通过传入一个 `Context` 参数获取 `BackupUtils` 的单例实例。 + 这里使用了双重检查锁定来确保线程安全。 +*/ /** - * Following states are signs to represents backup or restore + * Following states are signs to represents backup or restore(以下是表示备份或恢复的符号) * status */ // Currently, the sdcard is not mounted public static final int STATE_SD_CARD_UNMOUONTED = 0; - // The backup file not exist + // The backup file not exist(备份文件不存在) public static final int STATE_BACKUP_FILE_NOT_EXIST = 1; - // The data is not well formated, may be changed by other programs + // The data is not well formated, may be changed by other programs(数据格式不正确可能被其他程序更改) public static final int STATE_DATA_DESTROIED = 2; - // Some run-time exception which causes restore or backup fails + // Some run-time exception which causes restore or backup fails(导致备份或还原失败的默写运行异常) public static final int STATE_SYSTEM_ERROR = 3; - // Backup or restore success + // Backup or restore success(备份或还原成功) public static final int STATE_SUCCESS = 4; - private TextExport mTextExport; + private TextExport mTextExport;//实例化对象 private BackupUtils(Context context) { mTextExport = new TextExport(context); @@ -75,15 +80,15 @@ public class BackupUtils { public int exportToText() { return mTextExport.exportToText(); - } + }//这是一个 public 方法,用于将数据导出为文本,并返回一个整数值。 public String getExportedTextFileName() { return mTextExport.mFileName; - } + }//这是一个 public 方法,用于获取导出的文本文件名。 public String getExportedTextFileDir() { return mTextExport.mFileDirectory; - } + }//这是一个 public 方法,用于获取导出的文本文件所在的目录。 private static class TextExport { private static final String[] NOTE_PROJECTION = { @@ -91,7 +96,8 @@ public class BackupUtils { NoteColumns.MODIFIED_DATE, NoteColumns.SNIPPET, NoteColumns.TYPE - }; + };//这是一个私有的静态内部类,用于完成数据导出的操作。 + private static final int NOTE_COLUMN_ID = 0; @@ -115,32 +121,37 @@ public class BackupUtils { private static final int DATA_COLUMN_CALL_DATE = 2; private static final int DATA_COLUMN_PHONE_NUMBER = 4; + // 定义了多个常量,用于操作笔记和数据的列索引 private final String [] TEXT_FORMAT; private static final int FORMAT_FOLDER_NAME = 0; private static final int FORMAT_NOTE_DATE = 1; private static final int FORMAT_NOTE_CONTENT = 2; + // 定义了一个字符串数组 TEXT_FORMAT,其中存储了导出笔记时的文件格式 private Context mContext; private String mFileName; private String mFileDirectory; + // 定义了 Context mContext、String mFileName、String mFileDirectory 三个变量 + // mContext 存储了当前上下文,mFileName 存储了文件名,mFileDirectory 存储了文件夹路径 public TextExport(Context context) { TEXT_FORMAT = context.getResources().getStringArray(R.array.format_for_exported_note); mContext = context; mFileName = ""; - mFileDirectory = ""; + mFileDirectory = "";// 构造函数,初始化了 TEXT_FORMAT、mContext、mFileName 和 mFileDirectory } private String getFormat(int id) { return TEXT_FORMAT[id]; - } + }// getFormat 方法返回 TEXT_FORMAT 数组中指定 id 的字符串 /** * Export the folder identified by folder id to text + * (exportFolderToText 方法用于将指定文件夹下的笔记导出到文本中) */ private void exportFolderToText(String folderId, PrintStream ps) { - // Query notes belong to this folder + // Query notes belong to this folder// 查询属于该文件夹的笔记 Cursor notesCursor = mContext.getContentResolver().query(Notes.CONTENT_NOTE_URI, NOTE_PROJECTION, NoteColumns.PARENT_ID + "=?", new String[] { folderId @@ -149,11 +160,11 @@ public class BackupUtils { if (notesCursor != null) { if (notesCursor.moveToFirst()) { do { - // Print note's last modified date + // Print note's last modified date // 输出笔记的最后修改日期 ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format( mContext.getString(R.string.format_datetime_mdhm), notesCursor.getLong(NOTE_COLUMN_MODIFIED_DATE)))); - // Query data belong to this note + // Query data belong to this note // 查询属于该笔记的数据 String noteId = notesCursor.getString(NOTE_COLUMN_ID); exportNoteToText(noteId, ps); } while (notesCursor.moveToNext()); @@ -169,14 +180,14 @@ public class BackupUtils { Cursor dataCursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] { noteId - }, null); + }, null);// exportNoteToText 方法用于将指定笔记的数据导出到文本中 if (dataCursor != null) { if (dataCursor.moveToFirst()) { do { String mimeType = dataCursor.getString(DATA_COLUMN_MIME_TYPE); if (DataConstants.CALL_NOTE.equals(mimeType)) { - // Print phone number + // Print phone number // 输出电话号码 String phoneNumber = dataCursor.getString(DATA_COLUMN_PHONE_NUMBER); long callDate = dataCursor.getLong(DATA_COLUMN_CALL_DATE); String location = dataCursor.getString(DATA_COLUMN_CONTENT); @@ -185,11 +196,11 @@ public class BackupUtils { ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), phoneNumber)); } - // Print call date + // Print call date// 输出通话日期 ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), DateFormat .format(mContext.getString(R.string.format_datetime_mdhm), callDate))); - // Print call attachment location + // Print call attachment location // 输出通话附件位置 if (!TextUtils.isEmpty(location)) { ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), location)); @@ -205,7 +216,7 @@ public class BackupUtils { } dataCursor.close(); } - // print a line separator between note + // print a line separator between note// 在导出每个笔记后输出一个分隔符 try { ps.write(new byte[] { Character.LINE_SEPARATOR, Character.LETTER_NUMBER @@ -222,14 +233,20 @@ public class BackupUtils { if (!externalStorageAvailable()) { Log.d(TAG, "Media was not mounted"); return STATE_SD_CARD_UNMOUONTED; - } + }/*这段代码的作用是向指定的PrintStream对象中写入一个分隔符。它使用了Java中的byte数组,其中包含了两个特殊的字符:Character.LINE_SEPARATOR和Character.LETTER_NUMBER。 + + Character.LINE_SEPARATOR表示平台的行分隔符,其值因平台而异。例如,在Windows中,它的值是"\r\n",在Unix/Linux中,它的值是"\n"。 + + Character.LETTER_NUMBER是一个没有实际意义的字符,它只是被用来作为分隔符的一部分。 + + 当这个byte数组被写入PrintStream对象时,它会在文本中插入一个分隔符,以便在文本中区分不同的笔记。如果写入过程中发生IOException,那么会在Logcat中输出相应的错误信息。*/ PrintStream ps = getExportToTextPrintStream(); if (ps == null) { Log.e(TAG, "get print stream error"); return STATE_SYSTEM_ERROR; - } - // First export folder and its notes + }//这段代码中的 getExportToTextPrintStream() 是一个自定义方法,它返回一个 PrintStream 对象,该对象用于将笔记数据导出到文本文件中 + // First export folder and its notes//“首先导出文件夹及其包含的笔记” Cursor folderCursor = mContext.getContentResolver().query( Notes.CONTENT_NOTE_URI, NOTE_PROJECTION, @@ -255,7 +272,11 @@ public class BackupUtils { } while (folderCursor.moveToNext()); } folderCursor.close(); - } + }/*这段代码的作用是导出所有文件夹及其包含的笔记。 + + 首先,通过调用 ContentResolver 的 query() 方法查询所有的文件夹和 Call Record 文件夹,同时排除回收站中的笔记,将结果保存在 Cursor 对象 folderCursor 中。 + + 接着,通过遍历 folderCursor 中的所有记录,获取每个文件夹的名称和ID,并将其写入到输出流 ps 中。如果当前文件夹是 Call Record 文件夹,则使用字符串资源文件中的值作为文件夹的名称*/ // Export notes in root's folder Cursor noteCursor = mContext.getContentResolver().query( @@ -280,7 +301,13 @@ public class BackupUtils { ps.close(); return STATE_SUCCESS; - } + }/*这段代码的作用是导出根文件夹中的所有笔记。 + + 首先,通过调用 ContentResolver 的 query() 方法查询根文件夹中的所有笔记,并将结果保存在 Cursor 对象 noteCursor 中。 + + 接着,通过遍历 noteCursor 中的所有记录,获取每个笔记的修改日期,并将其写入到输出流 ps 中。然后,调用 exportNoteToText() 方法,将当前笔记的内容导出到输出流 ps 中。 + + 最后,关闭输出流 ps,并返回 STATE_SUCCESS 表示导出笔记数据成功。如果 noteCursor 为空,则不会做任何处理,直接关闭输出流并返回成功状态。*/ /** * Get a print stream pointed to the file {@generateExportedTextFile} @@ -307,7 +334,15 @@ public class BackupUtils { } return ps; } - } + }/*这段代码的作用是创建一个输出流 PrintStream 对象,用于将笔记数据导出到文本文件中。 + +首先,通过调用 generateFileMountedOnSDcard() 方法获取导出文件的路径和名称,并将结果保存在 File 对象 file 中。 + +接着,检查 file 是否为 null。如果是,则在Logcat中输出 "create file to exported failed" 的错误信息,并返回 null。 + +然后,获取 file 的名称和路径,并创建一个 FileOutputStream 对象 fos,将其作为参数传递给 PrintStream 构造函数,创建一个 PrintStream 对象 ps。 + +最后,返回 ps 对象,如果在创建 PrintStream 对象时出现 FileNotFoundException 或 NullPointerException 异常,则返回 null*/ /** * Generate the text file to store imported data @@ -339,6 +374,14 @@ public class BackupUtils { return null; } -} +}/*这段代码的作用是生成一个文件对象,并返回该对象的引用。 + +首先,获取外部存储设备的根目录,并将其与 filePathResId 参数所指定的路径拼接成一个完整的路径,并将其保存在 StringBuilder 对象 sb 中。 + +接着,创建一个 File 对象 filedir,用于表示存储导出文件的目录。如果该目录不存在,则调用 mkdir() 方法创建该目录。 + +然后,使用 fileNameFormatResId 参数所指定的文件名格式,将当前日期和时间添加到 sb 中,形成完整的文件路径。最后,创建一个 File 对象 file,用于表示导出的文件。 + +最后,检查 file 和 filedir 是否存在。如果它们都存在,则直接返回 file 对象的引用。否则,通过捕捉 SecurityException 和 IOException 异常,输出异常信息,并返回 null。*/ diff --git a/src/minotes/tool/DataUtils.java b/doc/邹兴云注释的代码/DataUtils.java similarity index 50% rename from src/minotes/tool/DataUtils.java rename to doc/邹兴云注释的代码/DataUtils.java index 2a14982..5ba9df3 100644 --- a/src/minotes/tool/DataUtils.java +++ b/doc/邹兴云注释的代码/DataUtils.java @@ -36,7 +36,7 @@ import java.util.HashSet; public class DataUtils { - public static final String TAG = "DataUtils"; + public static final String TAG = "DataUtils";//定义了一个Java常量变量,名为TAG public static boolean batchDeleteNotes(ContentResolver resolver, HashSet ids) { if (ids == null) { Log.d(TAG, "the ids is null"); @@ -70,7 +70,13 @@ public class DataUtils { Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); } return false; - } + }/*这段代码是一个静态方法,它接受两个参数:ContentResolver对象和一个Long类型的HashSet集合。这个方法的作用是批量删除笔记。 + +如果传入的ids集合为空,方法会输出一条日志并返回true;如果ids集合的大小为0,同样会输出一条日志并返回true。 + +如果ids集合不为空且大小不为0,方法会遍历ids集合中的每个元素。如果该元素等于Notes.ID_ROOT_FOLDER,也就是系统文件夹的根目录,那么会输出一个错误日志并跳过该元素;否则,会创建一个ContentProviderOperation对象,使用ContentProviderOperation.newDelete()方法来构建一个删除操作,并将该操作添加到操作列表(operationList)中。 + +最后,方法会使用ContentResolver.applyBatch()方法来执行操作列表中的所有操作,如果操作成功,则返回true,否则返回false。如果发生RemoteException或OperationApplicationException异常,方法会输出一个错误日志并返回false。*/ public static void moveNoteToFoler(ContentResolver resolver, long id, long srcFolderId, long desFolderId) { ContentValues values = new ContentValues(); @@ -78,7 +84,11 @@ public class DataUtils { values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId); values.put(NoteColumns.LOCAL_MODIFIED, 1); resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null); - } + }/*这段代码是一个静态方法,它接受四个参数:ContentResolver对象、一个long类型的id、一个long类型的srcFolderId和一个long类型的desFolderId。这个方法的作用是将一个笔记移动到指定的文件夹中。 + +方法首先创建一个ContentValues对象,并将要更新的字段和值添加到该对象中。这里,将NoteColumns.PARENT_ID字段设置为desFolderId,表示将笔记的父文件夹设置为目标文件夹;将NoteColumns.ORIGIN_PARENT_ID字段设置为srcFolderId,表示将笔记的原始父文件夹设置为源文件夹;将NoteColumns.LOCAL_MODIFIED字段设置为1,表示该笔记已被本地修改过。 + +接下来,方法调用ContentResolver.update()方法来更新笔记。该方法接受四个参数:笔记的URI、要更新的值、选择条件和选择条件的参数。这里,笔记的URI是通过ContentUris.withAppendedId()方法创建的,其值为Notes.CONTENT_NOTE_URI与id拼接而成;要更新的值是上面创建的ContentValues对象;选择条件和选择条件的参数都为null,表示更新所有行。*/ public static boolean batchMoveToFolder(ContentResolver resolver, HashSet ids, long folderId) { @@ -109,7 +119,13 @@ public class DataUtils { Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); } return false; - } + }/*这段代码是一个静态方法,它接受三个参数:ContentResolver对象、一个Long类型的HashSet集合ids和一个Long类型的folderId。这个方法的作用是批量将笔记移动到指定的文件夹中。 + +如果传入的ids集合为空,方法会输出一条日志并返回true。 + +如果ids集合不为空,方法会遍历ids集合中的每个元素。对于每个元素,方法会创建一个ContentProviderOperation对象,并使用ContentProviderOperation.newUpdate()方法来构建一个更新操作。然后,将NoteColumns.PARENT_ID字段设置为folderId,表示将笔记的父文件夹设置为目标文件夹;将NoteColumns.LOCAL_MODIFIED字段设置为1,表示该笔记已被本地修改过。最后,将该操作添加到操作列表(operationList)中。 + +最后,方法使用ContentResolver.applyBatch()方法来执行操作列表中的所有操作。如果操作成功,则返回true,否则返回false。如果发生RemoteException或OperationApplicationException异常,方法会输出一个错误日志并返回false*/ /** * Get the all folder count except system folders {@link Notes#TYPE_SYSTEM}} @@ -134,7 +150,13 @@ public class DataUtils { } } return count; - } + }/*这段代码是一个静态方法,它接受一个ContentResolver对象作为参数。该方法的作用是返回用户创建的文件夹的数量。 + +该方法创建了一个Cursor对象,使用ContentResolver.query()方法查询笔记数据库,并返回所有类型为Notes.TYPE_FOLDER(文件夹类型)且不在回收站中的笔记数量。查询结果只包含一列,即COUNT(*)。 + +查询结果存储在Cursor对象中。如果Cursor对象不为null,方法会将光标移动到第一行,并使用getInt(0)方法获取查询结果中的第一列的值,即文件夹数量。如果发生IndexOutOfBoundsException异常,则输出一个错误日志。最后,方法关闭Cursor对象并返回文件夹数量。 + +注意,该方法只返回用户创建的文件夹数量,不包括系统预置的文件夹(如回收站)。*/ public static boolean visibleInNoteDatabase(ContentResolver resolver, long noteId, int type) { Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), @@ -151,7 +173,11 @@ public class DataUtils { cursor.close(); } return exist; - } + }/*这段代码是一个静态方法,它接受三个参数:ContentResolver对象、一个long类型的noteId和一个int类型的type。该方法的作用是检查给定的笔记是否存在于笔记数据库中,并且不在回收站中。 + +该方法首先创建一个Cursor对象,使用ContentResolver.query()方法查询笔记数据库,查询的条件是笔记类型为type,并且笔记的父文件夹不是回收站。查询结果包含所有列。 + +然后,方法检查查询结果是否存在,如果存在则将exist变量设置为true。最后,方法关闭Cursor对象并返回exist变量的值,即给定的笔记是否存在于笔记数据库中。*/ public static boolean existInNoteDatabase(ContentResolver resolver, long noteId) { Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), @@ -165,7 +191,11 @@ public class DataUtils { cursor.close(); } return exist; - } + }/*这段代码是一个静态方法,它接受两个参数:ContentResolver对象和一个long类型的noteId。该方法的作用是检查给定的笔记是否存在于笔记数据库中。 + +该方法首先创建一个Cursor对象,使用ContentResolver.query()方法查询笔记数据库。查询条件为笔记ID等于noteId,查询结果包含所有列。 + +然后,方法检查查询结果是否存在,如果存在则将exist变量设置为true。最后,方法关闭Cursor对象并返回exist变量的值,即给定的笔记是否存在于笔记数据库中*/ public static boolean existInDataDatabase(ContentResolver resolver, long dataId) { Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), @@ -179,7 +209,11 @@ public class DataUtils { cursor.close(); } return exist; - } + }/*这段代码是一个静态方法,它接受两个参数:ContentResolver对象和一个long类型的dataId。该方法的作用是检查给定的数据是否存在于数据数据库中。 + +该方法首先创建一个Cursor对象,使用ContentResolver.query()方法查询数据数据库。查询条件为数据ID等于dataId,查询结果包含所有列。 + +然后,方法检查查询结果是否存在,如果存在则将exist变量设置为true。最后,方法关闭Cursor对象并返回exist变量的值,即给定的数据是否存在于数据数据库中。*/ public static boolean checkVisibleFolderName(ContentResolver resolver, String name) { Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, null, @@ -195,7 +229,11 @@ public class DataUtils { cursor.close(); } return exist; - } + }/*这段代码是一个静态方法,它接受两个参数:ContentResolver对象和一个String类型的name。该方法的作用是检查给定名称的文件夹在笔记数据库中是否可见(即不在回收站中)。 + +该方法首先创建一个Cursor对象,使用ContentResolver.query()方法查询笔记数据库。查询条件为笔记类型为Notes.TYPE_FOLDER(文件夹类型)、父文件夹不是回收站(NoteColumns.PARENT_ID <> Notes.ID_TRASH_FOLER)以及笔记的摘要(NoteColumns.SNIPPET)等于给定的名称。查询结果包含所有列。 + +然后,方法检查查询结果是否存在,如果存在则将exist变量设置为true。最后,方法关闭Cursor对象并返回exist变量的值,即给定名称的文件夹在笔记数据库中是否可见。*/ public static HashSet getFolderNoteWidget(ContentResolver resolver, long folderId) { Cursor c = resolver.query(Notes.CONTENT_NOTE_URI, @@ -222,7 +260,13 @@ public class DataUtils { c.close(); } return set; - } + }/*这段代码是一个静态方法,它接受两个参数:ContentResolver对象和一个long类型的folderId。该方法的作用是获取给定文件夹下所有包含小部件的笔记的小部件ID和小部件类型。 + +该方法首先创建一个Cursor对象,使用ContentResolver.query()方法查询笔记数据库。查询条件为笔记的父文件夹ID等于给定的folderId。查询结果包含小部件ID和小部件类型这两列。 + +然后,方法将查询结果装入一个HashSet对象中。如果查询结果不为空,则创建一个HashSet对象,遍历查询结果并逐个添加小部件ID和小部件类型到HashSet中。如果查询结果为空,则返回null。 + +最后,方法关闭Cursor对象并返回HashSet对象,其中包含给定文件夹下所有包含小部件的笔记的小部件ID和小部件类型。*/ public static String getCallNumberByNoteId(ContentResolver resolver, long noteId) { Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI, @@ -241,7 +285,13 @@ public class DataUtils { } } return ""; - } + }/*这段代码是一个静态方法,它接受两个参数:ContentResolver对象和一个long类型的noteId。该方法的作用是获取给定笔记ID对应的电话笔记的电话号码。 + +该方法首先创建一个Cursor对象,使用ContentResolver.query()方法查询数据数据库。查询条件为电话笔记的笔记ID等于给定的noteId,且电话笔记的MIME类型为CallNote.CONTENT_ITEM_TYPE。查询结果包含电话号码这一列。 + +然后,方法检查查询结果是否存在,如果存在则返回查询结果中的电话号码。如果查询结果不存在,则返回空字符串。 + +最后,方法关闭Cursor对象并返回电话号码(或空字符串)。*/ public static long getNoteIdByPhoneNumberAndCallDate(ContentResolver resolver, String phoneNumber, long callDate) { Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI, @@ -262,7 +312,13 @@ public class DataUtils { cursor.close(); } return 0; - } + }/*这段代码是一个静态方法,它接受三个参数:ContentResolver对象、一个String类型的phoneNumber和一个long类型的callDate。该方法的作用是根据给定的电话号码和通话日期获取对应的电话笔记的笔记ID。 + +该方法首先创建一个Cursor对象,使用ContentResolver.query()方法查询数据数据库。查询条件为电话笔记的通话日期等于给定的callDate,电话笔记的MIME类型为CallNote.CONTENT_ITEM_TYPE,且电话号码等于给定的phoneNumber。查询结果包含笔记ID这一列。 + +然后,方法检查查询结果是否存在。如果存在,则返回查询结果中的笔记ID。如果查询结果不存在,则返回0。 + +最后,方法关闭Cursor对象并返回笔记ID(或0)。*/ public static String getSnippetById(ContentResolver resolver, long noteId) { Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, @@ -280,7 +336,11 @@ public class DataUtils { return snippet; } throw new IllegalArgumentException("Note is not found with id: " + noteId); - } + }/*这段代码是一个静态方法,它接受两个参数:ContentResolver对象和一个long类型的noteId。该方法的作用是获取给定笔记ID对应的笔记的摘要(snippet)。 + +该方法首先创建一个Cursor对象,使用ContentResolver.query()方法查询笔记的内容提供者。查询条件为笔记的ID等于给定的noteId。查询结果包含笔记的摘要这一列。 + +然后,方法检查查询结果是否存在。如果存在,则获取查询结果中的笔记摘要并将其存储在一个字符串变量snippet中。然后,方法关闭Cursor对象并返回snippet。如果查询结果不存在,则抛出一个IllegalArgumentException异常,其中包含“Note is not found with id: ”和给定的noteId作为错误消息。*/ public static String getFormattedSnippet(String snippet) { if (snippet != null) { @@ -292,4 +352,8 @@ public class DataUtils { } return snippet; } -} +}/*这段代码是一个静态方法,它接受一个String类型的snippet参数。该方法的作用是对给定的snippet进行格式化处理,以便在界面上显示。 + +该方法首先检查传入的snippet是否为空。如果不为空,则使用String.trim()方法删除snippet字符串中的前导和尾随空格。然后,使用String.indexOf()方法查找snippet字符串中第一个换行符的位置。如果找到了换行符,则使用String.substring()方法截取snippet字符串中第一个换行符之前的所有字符,并将结果存储回snippet变量中。否则,不做任何修改,直接返回原始的snippet字符串。 + +最后,方法返回格式化后的snippet字符串。*/ diff --git a/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/doc/邹兴云注释的代码/GTaskStringUtils.java similarity index 52% rename from app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java rename to doc/邹兴云注释的代码/GTaskStringUtils.java index 666b729..f8ba895 100644 --- a/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java +++ b/doc/邹兴云注释的代码/GTaskStringUtils.java @@ -18,96 +18,95 @@ package net.micode.notes.tool; public class GTaskStringUtils { - public final static String GTASK_JSON_ACTION_ID = "action_id"; + public final static String GTASK_JSON_ACTION_ID = "action_id";// 行动 ID - public final static String GTASK_JSON_ACTION_LIST = "action_list"; + public final static String GTASK_JSON_ACTION_LIST = "action_list";// 行动清单 - public final static String GTASK_JSON_ACTION_TYPE = "action_type"; + public final static String GTASK_JSON_ACTION_TYPE = "action_type";// 行动类型 - public final static String GTASK_JSON_ACTION_TYPE_CREATE = "create"; + public final static String GTASK_JSON_ACTION_TYPE_CREATE = "create";// 创建行动 - public final static String GTASK_JSON_ACTION_TYPE_GETALL = "get_all"; + public final static String GTASK_JSON_ACTION_TYPE_GETALL = "get_all";// 获取全部行动 - public final static String GTASK_JSON_ACTION_TYPE_MOVE = "move"; + public final static String GTASK_JSON_ACTION_TYPE_MOVE = "move";// 移动行动 - public final static String GTASK_JSON_ACTION_TYPE_UPDATE = "update"; + public final static String GTASK_JSON_ACTION_TYPE_UPDATE = "update"; // 更新行动 - public final static String GTASK_JSON_CREATOR_ID = "creator_id"; + public final static String GTASK_JSON_CREATOR_ID = "creator_id";// 创建者 ID - public final static String GTASK_JSON_CHILD_ENTITY = "child_entity"; + public final static String GTASK_JSON_CHILD_ENTITY = "child_entity";// 子实体 - public final static String GTASK_JSON_CLIENT_VERSION = "client_version"; + public final static String GTASK_JSON_CLIENT_VERSION = "client_version";// 客户端版本 - public final static String GTASK_JSON_COMPLETED = "completed"; + public final static String GTASK_JSON_COMPLETED = "completed"; // 完成状态 - public final static String GTASK_JSON_CURRENT_LIST_ID = "current_list_id"; + public final static String GTASK_JSON_CURRENT_LIST_ID = "current_list_id";// 当前清单 ID - public final static String GTASK_JSON_DEFAULT_LIST_ID = "default_list_id"; + public final static String GTASK_JSON_DEFAULT_LIST_ID = "default_list_id"; // 默认清单 ID - public final static String GTASK_JSON_DELETED = "deleted"; + public final static String GTASK_JSON_DELETED = "deleted";// 删除状态 - public final static String GTASK_JSON_DEST_LIST = "dest_list"; + public final static String GTASK_JSON_DEST_LIST = "dest_list";// 目标清单 - public final static String GTASK_JSON_DEST_PARENT = "dest_parent"; + public final static String GTASK_JSON_DEST_PARENT = "dest_parent";// 目标父元素 - public final static String GTASK_JSON_DEST_PARENT_TYPE = "dest_parent_type"; + public final static String GTASK_JSON_DEST_PARENT_TYPE = "dest_parent_type"; // 目标父元素类型 - public final static String GTASK_JSON_ENTITY_DELTA = "entity_delta"; + public final static String GTASK_JSON_ENTITY_DELTA = "entity_delta";// 实体增量 - public final static String GTASK_JSON_ENTITY_TYPE = "entity_type"; + public final static String GTASK_JSON_ENTITY_TYPE = "entity_type"; // 实体类型 - public final static String GTASK_JSON_GET_DELETED = "get_deleted"; + public final static String GTASK_JSON_GET_DELETED = "get_deleted"; // 获取删除状态 - public final static String GTASK_JSON_ID = "id"; + public final static String GTASK_JSON_ID = "id";// ID - public final static String GTASK_JSON_INDEX = "index"; + public final static String GTASK_JSON_INDEX = "index";// 索引 - public final static String GTASK_JSON_LAST_MODIFIED = "last_modified"; + public final static String GTASK_JSON_LAST_MODIFIED = "last_modified"; // 最后修改时间 - public final static String GTASK_JSON_LATEST_SYNC_POINT = "latest_sync_point"; + public final static String GTASK_JSON_LATEST_SYNC_POINT = "latest_sync_point";// 最新同步点 - public final static String GTASK_JSON_LIST_ID = "list_id"; + public final static String GTASK_JSON_LIST_ID = "list_id"; // 清单 ID - public final static String GTASK_JSON_LISTS = "lists"; + public final static String GTASK_JSON_LISTS = "lists";// 清单列表 + public final static String GTASK_JSON_NAME = "name";// 名称 - public final static String GTASK_JSON_NAME = "name"; + public final static String GTASK_JSON_NEW_ID = "new_id";// 新 ID - public final static String GTASK_JSON_NEW_ID = "new_id"; + public final static String GTASK_JSON_NOTES = "notes";// 备注 - public final static String GTASK_JSON_NOTES = "notes"; + public final static String GTASK_JSON_PARENT_ID = "parent_id";// 父 ID - public final static String GTASK_JSON_PARENT_ID = "parent_id"; + public final static String GTASK_JSON_PRIOR_SIBLING_ID = "prior_sibling_id";// 上一个同级 ID - public final static String GTASK_JSON_PRIOR_SIBLING_ID = "prior_sibling_id"; + public final static String GTASK_JSON_RESULTS = "results";// 结果 - public final static String GTASK_JSON_RESULTS = "results"; + public final static String GTASK_JSON_SOURCE_LIST = "source_list";// 源清单 - public final static String GTASK_JSON_SOURCE_LIST = "source_list"; + public final static String GTASK_JSON_TASKS = "tasks";// 任务列表 - public final static String GTASK_JSON_TASKS = "tasks"; + public final static String GTASK_JSON_TYPE = "type";// 类型 - public final static String GTASK_JSON_TYPE = "type"; + public final static String GTASK_JSON_TYPE_GROUP = "GROUP";// 分组类型 - public final static String GTASK_JSON_TYPE_GROUP = "GROUP"; + public final static String GTASK_JSON_TYPE_TASK = "TASK";// 任务类型 - public final static String GTASK_JSON_TYPE_TASK = "TASK"; + public final static String GTASK_JSON_USER = "user";// 用户 - public final static String GTASK_JSON_USER = "user"; + public final static String MIUI_FOLDER_PREFFIX = "[MIUI_Notes]"; // MIUI 笔记前缀 - public final static String MIUI_FOLDER_PREFFIX = "[MIUI_Notes]"; + public final static String FOLDER_DEFAULT = "Default";// 默认文件夹 - public final static String FOLDER_DEFAULT = "Default"; + public final static String FOLDER_CALL_NOTE = "Call_Note"; // 通话笔记文件夹 - public final static String FOLDER_CALL_NOTE = "Call_Note"; + public final static String FOLDER_META = "METADATA";// 元数据文件夹 - public final static String FOLDER_META = "METADATA"; + public final static String META_HEAD_GTASK_ID = "meta_gid";// GTASK ID 元数据头 - public final static String META_HEAD_GTASK_ID = "meta_gid"; + public final static String META_HEAD_NOTE = "meta_note";// 笔记元数据头 - public final static String META_HEAD_NOTE = "meta_note"; + public final static String META_HEAD_DATA = "meta_data";// 数据元数据头 - public final static String META_HEAD_DATA = "meta_data"; - - public final static String META_NOTE_NAME = "[META INFO] DON'T UPDATE AND DELETE"; + public final static String META_NOTE_NAME = "[META INFO] DON'T UPDATE AND DELETE";// 元数据笔记名称 } diff --git a/src/minotes/widget/NoteWidgetProvider.java b/doc/邹兴云注释的代码/NoteWidgetProvider.java similarity index 55% rename from src/minotes/widget/NoteWidgetProvider.java rename to doc/邹兴云注释的代码/NoteWidgetProvider.java index ec6f819..5c7f03a 100644 --- a/src/minotes/widget/NoteWidgetProvider.java +++ b/doc/邹兴云注释的代码/NoteWidgetProvider.java @@ -37,13 +37,15 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { NoteColumns.ID, NoteColumns.BG_COLOR_ID, NoteColumns.SNIPPET - }; + };/*一个抽象类 NoteWidgetProvider,它继承自 AppWidgetProvider 类。 - public static final int COLUMN_ID = 0; - public static final int COLUMN_BG_COLOR_ID = 1; - public static final int COLUMN_SNIPPET = 2; +在这个抽象类中定义了一个公共静态常量数组 PROJECTION,该数组包含三个字符串元素,这些字符串元素对应着笔记应用中的一些数据库列名,包括笔记的 ID、背景颜色 ID 和摘录内容。*/ - private static final String TAG = "NoteWidgetProvider"; + public static final int COLUMN_ID = 0;// 笔记 ID 列在 PROJECTION 数组中的索引 + public static final int COLUMN_BG_COLOR_ID = 1;// 笔记背景颜色 ID 列在 PROJECTION 数组中的索引 + public static final int COLUMN_SNIPPET = 2;// 笔记摘录内容列在 PROJECTION 数组中的索引 + + private static final String TAG = "NoteWidgetProvider";// 日志输出标识符 @Override public void onDeleted(Context context, int[] appWidgetIds) { @@ -55,19 +57,28 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { NoteColumns.WIDGET_ID + "=?", new String[] { String.valueOf(appWidgetIds[i])}); } - } + }/*这是 NoteWidgetProvider 抽象类中的一个公共方法 onDeleted(),它重写了父类 AppWidgetProvider 中的方法,用于处理小部件被删除的事件。 + +在该方法中,首先创建了一个 ContentValues 对象 values,并将 NoteColumns.WIDGET_ID 的值设为 AppWidgetManager.INVALID_APPWIDGET_ID,表示小部件已被删除。 - private Cursor getNoteWidgetInfo(Context context, int widgetId) { - return context.getContentResolver().query(Notes.CONTENT_NOTE_URI, +然后遍历传入的 appWidgetIds 数组,将每个小部件的 NoteColumns.WIDGET_ID 列更新为 AppWidgetManager.INVALID_APPWIDGET_ID,以便将小部件与笔记数据库中的记录解除绑定。 + +具体地,使用 getContentResolver() 获取一个 ContentResolver 对象,调用 update() 方法对笔记数据库中的记录进行更新。更新的条件为 NoteColumns.WIDGET_ID + "=?",即 NoteColumns.WIDGET_ID 等于当前小部件 ID,更新的数据为 values 对象,其中 NoteColumns.WIDGET_ID 的值已经被设置为 AppWidgetManager.INVALID_APPWIDGET_ID。*/ + + private Cursor getNoteWidgetInfo(Context context, int widgetId) {// 使用 getContentResolver() 方法获取 ContentResolver 对象,通过该对象进行对笔记数据库的查询操作 + return context.getContentResolver().query(Notes.CONTENT_NOTE_URI, // 使用 query() 方法查询笔记数据库,返回一个 Cursor 对象 + return context.getContentResolver().query(// 查询的 URI,笔记数据库中笔记的内容保存在该 URI 下 + PROJECTION, + Notes.CONTENT_NOTE_URI, PROJECTION, - NoteColumns.WIDGET_ID + "=? AND " + NoteColumns.PARENT_ID + "<>?", - new String[] { String.valueOf(widgetId), String.valueOf(Notes.ID_TRASH_FOLER) }, - null); + NoteColumns.WIDGET_ID + "=? AND " + NoteColumns.PARENT_ID + "<>?",// 查询的列,即笔记 ID、笔记背景颜色 ID 和笔记摘录内容 + new String[] { String.valueOf(widgetId), String.valueOf(Notes.ID_TRASH_FOLER) },//查询的条件,即笔记关联的小部件 ID 以及笔记的父 ID 不为回收站的笔记 + null);// 排序方式,这里为 null 表示不排序 } protected void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { update(context, appWidgetManager, appWidgetIds, false); - } + }/*这是 NoteWidgetProvider 抽象类中的一个受保护的方法 update(),它接受一个 Context 对象、一个 AppWidgetManager 对象和一个整型数组 appWidgetIds 作为参数,并在方法中调用了另一个同名方法。*/ private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, boolean privacyMode) { @@ -122,11 +133,21 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { appWidgetManager.updateAppWidget(appWidgetIds[i], rv); } } - } + }/*这是 `NoteWidgetProvider` 抽象类中的一个私有方法 `update()`,它接受一个 `Context` 对象、一个 `AppWidgetManager` 对象、一个整型数组 `appWidgetIds` 和一个布尔型参数 `privacyMode` 作为参数。该方法用于更新小部件的显示内容和点击事件。 + +方法中首先对 `appWidgetIds` 数组进行遍历,对于每个小部件 ID,如果它不等于 `AppWidgetManager.INVALID_APPWIDGET_ID`,则执行以下操作: + +- 获取小部件的默认背景 ID,以及一个空的摘录字符串。 +- 创建一个 `NoteEditActivity` 的意图,并将小部件 ID、小部件类型等信息作为附加数据放入其中。 +- 调用 `getNoteWidgetInfo()` 方法获取与当前小部件关联的笔记信息,并根据结果设置摘录字符串、背景 ID 和意图的操作类型。 +- 根据背景 ID 创建一个 `RemoteViews` 对象,并将背景图片、背景 ID 和点击事件所需的 `PendingIntent` 添加到其中。 +- 调用 `AppWidgetManager` 的 `updateAppWidget()` 方法更新小部件的显示内容。 + +如果 `privacyMode` 为 `true`,则小部件将显示 "隐私模式",并且点击小部件将启动 `NotesListActivity`;否则,小部件将显示与笔记关联的摘录字符串,点击小部件将启动 `NoteEditActivity`。*/ - protected abstract int getBgResourceId(int bgId); + protected abstract int getBgResourceId(int bgId);//用于获取小部件的背景资源 ID。 - protected abstract int getLayoutId(); + protected abstract int getLayoutId();//用于获取小部件的布局资源 ID。 - protected abstract int getWidgetType(); + protected abstract int getWidgetType();//用于获取小部件的类型。 } diff --git a/src/minotes/widget/NoteWidgetProvider_2x.java b/doc/邹兴云注释的代码/NoteWidgetProvider_2x.java similarity index 61% rename from src/minotes/widget/NoteWidgetProvider_2x.java rename to doc/邹兴云注释的代码/NoteWidgetProvider_2x.java index adcb2f7..43921a1 100644 --- a/src/minotes/widget/NoteWidgetProvider_2x.java +++ b/doc/邹兴云注释的代码/NoteWidgetProvider_2x.java @@ -24,24 +24,24 @@ import net.micode.notes.data.Notes; import net.micode.notes.tool.ResourceParser; -public class NoteWidgetProvider_2x extends NoteWidgetProvider { +public class NoteWidgetProvider_2x extends NoteWidgetProvider {//创建一个继承自 NoteWidgetProvider 的子类 NoteWidgetProvider_2x @Override public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { super.update(context, appWidgetManager, appWidgetIds); - } + }/*重写父类的 onUpdate() 方法,并在其中调用父类的 update() 方法,以更新小部件的显示内容和点击事件。*/ @Override protected int getLayoutId() { return R.layout.widget_2x; - } + }/*重写父类的 getLayoutId() 方法,返回用于小部件的布局资源 ID。这里返回 R.layout.widget_2x,表示使用 widget_2x.xml 文件作为布局资源。*/ @Override protected int getBgResourceId(int bgId) { return ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId); - } + }/*重写父类的 getBgResourceId() 方法,返回用于小部件的背景资源 ID。这里调用了 ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId) 方法,该方法根据传入的背景 ID 返回相应的背景资源 ID。*/ @Override protected int getWidgetType() { return Notes.TYPE_WIDGET_2X; - } + }/*重写父类的 getWidgetType() 方法,返回小部件的类型。这里返回 Notes.TYPE_WIDGET_2X,表示这是一个 2x 大小的小部件。*/ } diff --git a/src/minotes/widget/NoteWidgetProvider_4x.java b/doc/邹兴云注释的代码/NoteWidgetProvider_4x.java similarity index 60% rename from src/minotes/widget/NoteWidgetProvider_4x.java rename to doc/邹兴云注释的代码/NoteWidgetProvider_4x.java index c12a02e..7c6c512 100644 --- a/src/minotes/widget/NoteWidgetProvider_4x.java +++ b/doc/邹兴云注释的代码/NoteWidgetProvider_4x.java @@ -24,23 +24,22 @@ import net.micode.notes.data.Notes; import net.micode.notes.tool.ResourceParser; -public class NoteWidgetProvider_4x extends NoteWidgetProvider { +public class NoteWidgetProvider_4x extends NoteWidgetProvider {//创建一个继承自 NoteWidgetProvider 的子类 NoteWidgetProvider_4x。 @Override public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { super.update(context, appWidgetManager, appWidgetIds); - } + }/*重写父类的 onUpdate() 方法,并在其中调用父类的 update() 方法,以更新小部件的显示内容和点击事件。*/ protected int getLayoutId() { return R.layout.widget_4x; - } - + }/*重写父类的 getLayoutId() 方法,返回用于小部件的布局资源 ID。这里返回 R.layout.widget_4x,表示使用 widget_4x.xml 文件作为布局资源。*/ @Override protected int getBgResourceId(int bgId) { return ResourceParser.WidgetBgResources.getWidget4xBgResource(bgId); - } + }/*重写父类的 getBgResourceId() 方法,返回用于小部件的背景资源 ID。这里调用了 ResourceParser.WidgetBgResources.getWidget4xBgResource(bgId) 方法,该方法根据传入的背景 ID 返回相应的背景资源 ID。*/ @Override protected int getWidgetType() { return Notes.TYPE_WIDGET_4X; } -} +}/*重写父类的 getWidgetType() 方法,返回小部件的类型。这里返回 Notes.TYPE_WIDGET_4X,表示这是一个 4x 大小的小部件。*/ diff --git a/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/doc/邹兴云注释的代码/NotesPreferenceActivity.java similarity index 51% rename from app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java rename to doc/邹兴云注释的代码/NotesPreferenceActivity.java index 07c5f7e..735e9bd 100644 --- a/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java +++ b/doc/邹兴云注释的代码/NotesPreferenceActivity.java @@ -48,26 +48,28 @@ import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.gtask.remote.GTaskSyncService; -public class NotesPreferenceActivity extends PreferenceActivity { - public static final String PREFERENCE_NAME = "notes_preferences"; +public class NotesPreferenceActivity extends PreferenceActivity {// 定义了一个常量字符串 PREFERENCE_NAME,表示 SharedPreferences 的名称 + public static final String PREFERENCE_NAME = "notes_preferences";// 定义了一个常量字符串 PREFERENCE_SYNC_ACCOUNT_NAME,表示同步账户名称的键名 - public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name"; + public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name";// 定义了一个常量字符串 PREFERENCE_LAST_SYNC_TIME,表示上一次同步时间的键名 - public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time"; + public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time";// 定义了一个常量字符串 PREFERENCE_SET_BG_COLOR_KEY,表示是否随机设置背景颜色的键名 - public static final String PREFERENCE_SET_BG_COLOR_KEY = "pref_key_bg_random_appear"; + public static final String PREFERENCE_SET_BG_COLOR_KEY = "pref_key_bg_random_appear";// 定义了一个常量字符串 PREFERENCE_SYNC_ACCOUNT_KEY,表示同步账户的键名 - private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key"; + private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key";// 定义了一个常量字符串 PREFERENCE_SYNC_ACCOUNT_KEY,表示同步账户的键名 - private static final String AUTHORITIES_FILTER_KEY = "authorities"; + private static final String AUTHORITIES_FILTER_KEY = "authorities";// 定义了一个常量字符串 AUTHORITIES_FILTER_KEY,表示过滤器的 authorities 键名 - private PreferenceCategory mAccountCategory; + private PreferenceCategory mAccountCategory;// 声明了一个 PreferenceCategory 类型的成员变量 mAccountCategory,表示账户分类 - private GTaskReceiver mReceiver; - private Account[] mOriAccounts; + private GTaskReceiver mReceiver;// 声明了一个 GTaskReceiver 类型的成员变量 mReceiver,表示 GTask 接收器 - private boolean mHasAddedAccount; + + private Account[] mOriAccounts;// 声明了一个 Account 数组类型的成员变量 mOriAccounts,表示原始账户 + + private boolean mHasAddedAccount;// 声明了一个 boolean 类型的成员变量 mHasAddedAccount,表示是否已添加了账户 @Override protected void onCreate(Bundle icicle) { @@ -76,21 +78,22 @@ public class NotesPreferenceActivity extends PreferenceActivity { /* using the app icon for navigation */ getActionBar().setDisplayHomeAsUpEnabled(true); - addPreferencesFromResource(R.xml.preferences); - mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY); + addPreferencesFromResource(R.xml.preferences);// 加载 preferences.xml 文件中的 Preference + mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);// 从 preferences.xml 中找到同步账户分类,赋值给 mAccountCategory + mReceiver = new GTaskReceiver(); IntentFilter filter = new IntentFilter(); filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME); - registerReceiver(mReceiver, filter); + registerReceiver(mReceiver, filter);// 注册 GTaskReceiver 广播接收器,监听 Gtask 同步服务的消息 mOriAccounts = null; View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null); - getListView().addHeaderView(header, null, true); + getListView().addHeaderView(header, null, true);//将原始账户数组 mOriAccounts 设置为 null。 } @Override protected void onResume() { - super.onResume(); + super.onResume();// onStart 方法,表示 Activity 启动时调用的方 // need to set sync account automatically if user has added a new // account @@ -114,7 +117,15 @@ public class NotesPreferenceActivity extends PreferenceActivity { } refreshUI(); - } + }/*1. 调用父类的 onCreate() 方法,初始化 Activity。 +2. 设置应用图标作为导航按钮,以便用户可以返回上一个Activity或者返回应用的主界面。 +3. 加载 preferences.xml 文件中的 Preference。 +4. 从 preferences.xml 中找到同步账户分类,赋值给 mAccountCategory。 +5. 注册 GTaskReceiver 广播接收器,监听 GTask 同步服务的消息。 +6. 将原始账户数组 mOriAccounts 设置为 null。 +7. 通过 LayoutInflater 加载一个设置界面的头部布局 R.layout.settings_header。 +8. 将头部布局添加到 ListView 的头部。 +这段代码的作用是初始化设置界面,并设置导航按钮、注册广播接收器、加载头部布局。*/ @Override protected void onDestroy() { @@ -122,64 +133,67 @@ public class NotesPreferenceActivity extends PreferenceActivity { unregisterReceiver(mReceiver); } super.onDestroy(); - } + }/*这段代码是 Android 中的一个 Activity 的 onDestroy() 方法,主要进行了以下操作: +1. 判断 mReceiver 是否为 null,如果不为 null,则解除广播接收器的注册。 +2. 调用父类的 onDestroy() 方法,销毁 Activity。 +这段代码的目的是在 Activity 销毁时,解除之前注册的广播接收器,以避免出现内存泄漏的情况。在 Android 中,如果不及时解除广播接收器的注册,会导致广播接收器持有 Activity 的引用而无法被垃圾回收,从而导致内存泄漏。因此,在 Activity销毁前,需要手动解除广播接收器的注册,以确保程序的正常运行和内存的释放。*/ private void loadAccountPreference() { - mAccountCategory.removeAll(); + mAccountCategory.removeAll();// 清空同步账户分类中的所有设置项 - Preference accountPref = new Preference(this); - final String defaultAccount = getSyncAccountName(this); - accountPref.setTitle(getString(R.string.preferences_account_title)); - accountPref.setSummary(getString(R.string.preferences_account_summary)); + Preference accountPref = new Preference(this);// 创建一个新的 Preference 对象 accountPref + final String defaultAccount = getSyncAccountName(this);// 获取当前默认的同步账户名称 + accountPref.setTitle(getString(R.string.preferences_account_title));// 设置 accountPref 的标题和摘要 + accountPref.setSummary(getString(R.string.preferences_account_summary)); // 设置 accountPref 的点击事件监听器 accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() { - public boolean onPreferenceClick(Preference preference) { + public boolean onPreferenceClick(Preference preference) {// 判断是否正在进行同步任务 if (!GTaskSyncService.isSyncing()) { if (TextUtils.isEmpty(defaultAccount)) { // the first time to set account - showSelectAccountAlertDialog(); + showSelectAccountAlertDialog();//如果当前同步账户为空,则弹出选择账户对话框 } else { // if the account has already been set, we need to promp // user about the risk showChangeAccountConfirmAlertDialog(); - } + }// 如果已经设置了同步账户,则需要提示用户风险 } else { Toast.makeText(NotesPreferenceActivity.this, R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT) - .show(); + .show();// 如果正在进行同步任务,则提示用户无法更改账户 } - return true; + return true;// 返回 true,表示点击事件已被处理 } }); - mAccountCategory.addPreference(accountPref); + mAccountCategory.addPreference(accountPref);// 将 accountPref 添加到同步账户分类中 } private void loadSyncButton() { - Button syncButton = (Button) findViewById(R.id.preference_sync_button); - TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview); + Button syncButton = (Button) findViewById(R.id.preference_sync_button);// 获取同步按钮和上次同步时间的视图对 + TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview);// 设置同步按钮的状态和点击事件监听器 // set button state if (GTaskSyncService.isSyncing()) { - syncButton.setText(getString(R.string.preferences_button_sync_cancel)); + syncButton.setText(getString(R.string.preferences_button_sync_cancel)); // 如果正在同步任务中,则将按钮文本设置为“取消同步”,并添加取消同步的点击事件监听器 syncButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { GTaskSyncService.cancelSync(NotesPreferenceActivity.this); } }); } else { - syncButton.setText(getString(R.string.preferences_button_sync_immediately)); + syncButton.setText(getString(R.string.preferences_button_sync_immediately));// 如果没有正在同步任务,则将按钮文本设置为“立即同步”,并添加开始同步的点击事件监听器 syncButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { GTaskSyncService.startSync(NotesPreferenceActivity.this); } }); - } - syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this))); + }// 根据当前是否设置了同步账户来设置同步按钮的可用状态 + syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));// 设置上次同步时间的显示状态和文本内容 // set last sync time if (GTaskSyncService.isSyncing()) { lastSyncTimeView.setText(GTaskSyncService.getProgressString()); - lastSyncTimeView.setVisibility(View.VISIBLE); + lastSyncTimeView.setVisibility(View.VISIBLE); // 如果正在同步任务中,则显示当前同步进度,并将上次同步时间视图设置为可见状态 } else { long lastSyncTime = getLastSyncTime(this); if (lastSyncTime != 0) { @@ -191,184 +205,192 @@ public class NotesPreferenceActivity extends PreferenceActivity { lastSyncTimeView.setVisibility(View.GONE); } } - } + }// 如果没有正在同步任务,则获取上次同步时间,并根据上次同步时间是否为0来设置上次同步时间视图的可见状态和文本内容 private void refreshUI() { loadAccountPreference(); loadSyncButton(); - } + }/*loadAccountPreference() 方法用于加载和显示当前同步账户的信息,而 loadSyncButton() 方法则用于设置同步按钮的状态和点击事件监听器,并显示上次同步时间的信息。*/ private void showSelectAccountAlertDialog() { - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); + AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);// 创建 AlertDialog.Builder 对象 View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null); - TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title); - titleTextView.setText(getString(R.string.preferences_dialog_select_account_title)); + TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);/// 创建自定义标题视图 + titleTextView.setText(getString(R.string.preferences_dialog_select_account_title));// 设置标题文本 TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle); - subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips)); + subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips));// 设置副标题文本 - dialogBuilder.setCustomTitle(titleView); - dialogBuilder.setPositiveButton(null, null); + dialogBuilder.setCustomTitle(titleView);// 将自定义标题视图设置到对话框中 + dialogBuilder.setPositiveButton(null, null); // 不设置确定按钮和点击事件监听器 Account[] accounts = getGoogleAccounts(); - String defAccount = getSyncAccountName(this); + String defAccount = getSyncAccountName(this);// 获取所有谷歌账户的列表和当前同步账户的名称 mOriAccounts = accounts; - mHasAddedAccount = false; + mHasAddedAccount = false;// 保存原始账户列表并将“已添加账户”标志设为 false - if (accounts.length > 0) { - CharSequence[] items = new CharSequence[accounts.length]; - final CharSequence[] itemMapping = items; - int checkedItem = -1; + if (accounts.length > 0) {// 如果找到了至少一个谷歌账户,则创建单选项列表 + CharSequence[] items = new CharSequence[accounts.length];// 创建单选项列表的选项文本数组 + final CharSequence[] itemMapping = items;// 创建选项文本数组的映射数组 + int checkedItem = -1; // 初始化默认选中项的索引为 -1 int index = 0; - for (Account account : accounts) { + for (Account account : accounts) {// 遍历所有谷歌账户,为每个账户设置一个选项 if (TextUtils.equals(account.name, defAccount)) { checkedItem = index; - } - items[index++] = account.name; + }// 如果该账户的名称与当前同步账户的名称相同,则将其作为默认选中项 + items[index++] = account.name;// 将该账户的名称添加到选项文本数组中 } - dialogBuilder.setSingleChoiceItems(items, checkedItem, + dialogBuilder.setSingleChoiceItems(items, checkedItem, // 将单选项列表设置到对话框中,并为每个选项设置点击事件监听器 new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { - setSyncAccount(itemMapping[which].toString()); - dialog.dismiss(); - refreshUI(); + setSyncAccount(itemMapping[which].toString()); // 将用户选择的账户名称设置为同步账户 + dialog.dismiss();// 关闭对话框 + refreshUI();// 刷新 UI 界面上的账户和同步按钮状态 } }); } - View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null); - dialogBuilder.setView(addAccountView); + View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null);//从布局文件中加载一个视图对象并将其赋值给 addAccountView 变量 + dialogBuilder.setView(addAccountView);//将 addAccountView 设置为对话框的自定义视图 - final AlertDialog dialog = dialogBuilder.show(); - addAccountView.setOnClickListener(new View.OnClickListener() { + final AlertDialog dialog = dialogBuilder.show();//创建一个 AlertDialog 对象,并将其显示出来 + addAccountView.setOnClickListener(new View.OnClickListener() {//添加一个点击事件监听器 public void onClick(View v) { - mHasAddedAccount = true; + mHasAddedAccount = true;//用户是否已经添加了一个账户 Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS"); intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] { "gmail-ls" - }); - startActivityForResult(intent, -1); - dialog.dismiss(); + });//创建了一个 Intent 对象,用于启动一个系统设置界面,以便让用户添加新的帐户 + startActivityForResult(intent, -1);//启动一个新的界面,等待用户添加新的账户 + dialog.dismiss();//关闭对话框 } }); } private void showChangeAccountConfirmAlertDialog() { + // 创建一个 AlertDialog.Builder 对象 AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); + // 从布局文件 R.layout.account_dialog_title 中加载一个视图 titleView View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null); + // 从 titleView 中找到一个 TextView 对象 titleTextView,并设置其文本 TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title); titleTextView.setText(getString(R.string.preferences_dialog_change_account_title, getSyncAccountName(this))); + // 从 titleView 中找到一个 TextView 对象 subtitleTextView,并设置其文本 TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle); subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg)); + // 将 titleView 设置为对话框的自定义标题 dialogBuilder.setCustomTitle(titleView); + // 创建一个 CharSequence 类型的数组 menuItemArray,包含三个字符串,作为选项菜单的标签文字 CharSequence[] menuItemArray = new CharSequence[] { getString(R.string.preferences_menu_change_account), getString(R.string.preferences_menu_remove_account), getString(R.string.preferences_menu_cancel) }; - dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { + dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() { // 创建一个 DialogInterface.OnClickListener 对象,用于处理选项菜单的点击事件 + public void onClick(DialogInterface dialog, int which) {// 判断点击了哪个菜单项 if (which == 0) { - showSelectAccountAlertDialog(); + showSelectAccountAlertDialog();// 如果点击了第一个菜单项,调用 showSelectAccountAlertDialog() 方法显示“选择帐户”对话框 } else if (which == 1) { removeSyncAccount(); - refreshUI(); + refreshUI();// 如果点击了第二个菜单项,先调用 removeSyncAccount() 方法删除同步帐户,再调用 refreshUI() 方法刷新界面 } } }); - dialogBuilder.show(); + dialogBuilder.show();// 显示对话框 } private Account[] getGoogleAccounts() { + // 获取 AccountManager 对象 AccountManager accountManager = AccountManager.get(this); + // 调用 getAccountsByType() 方法,传入参数 "com.google",以获取所有类型为 "com.google" 的帐户 return accountManager.getAccountsByType("com.google"); } private void setSyncAccount(String account) { - if (!getSyncAccountName(this).equals(account)) { + if (!getSyncAccountName(this).equals(account)) {// 判断传入的 account 是否与当前同步帐户相同 SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); - SharedPreferences.Editor editor = settings.edit(); + SharedPreferences.Editor editor = settings.edit();// 获取 SharedPreferences 对象 if (account != null) { - editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, account); + editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, account); // 如果传入的 account 不为 null,则将其存储到 SharedPreferences 中 } else { - editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, ""); + editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, "");// 如果传入的 account 为 null,则将空字符串存储到 SharedPreferences 中 } - editor.commit(); + editor.commit();// 提交修改 // clean up last sync time - setLastSyncTime(this, 0); + setLastSyncTime(this, 0);// 清除上一次同步的时间 // clean up local gtask related info new Thread(new Runnable() { public void run() { - ContentValues values = new ContentValues(); - values.put(NoteColumns.GTASK_ID, ""); - values.put(NoteColumns.SYNC_ID, 0); - getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null); + ContentValues values = new ContentValues(); // 创建一个 ContentValues 对象,用于更新所有的 note + values.put(NoteColumns.GTASK_ID, "");// 清空 GTasks ID 和 sync ID + values.put(NoteColumns.SYNC_ID, 0);// 清空 GTasks ID 和 sync ID + getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null); // 更新所有的 note } }).start(); Toast.makeText(NotesPreferenceActivity.this, getString(R.string.preferences_toast_success_set_accout, account), - Toast.LENGTH_SHORT).show(); + Toast.LENGTH_SHORT).show();// 显示一个 Toast,提示同步帐户设置成功 } } private void removeSyncAccount() { - SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); - SharedPreferences.Editor editor = settings.edit(); + SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); // 获取 SharedPreferences 对象 + SharedPreferences.Editor editor = settings.edit();// 获取 SharedPreferences 对象 if (settings.contains(PREFERENCE_SYNC_ACCOUNT_NAME)) { editor.remove(PREFERENCE_SYNC_ACCOUNT_NAME); - } + }// 如果 SharedPreferences 包含同步帐户名称,则从 SharedPreferences 中删除该名称 if (settings.contains(PREFERENCE_LAST_SYNC_TIME)) { - editor.remove(PREFERENCE_LAST_SYNC_TIME); + editor.remove(PREFERENCE_LAST_SYNC_TIME); // 如果 SharedPreferences 包含上一次同步的时间,则从 SharedPreferences 中删除该时间 } - editor.commit(); + editor.commit(); // 提交修改 // clean up local gtask related info new Thread(new Runnable() { public void run() { - ContentValues values = new ContentValues(); + ContentValues values = new ContentValues();// 创建一个 ContentValues 对象,用于更新所有的 note values.put(NoteColumns.GTASK_ID, ""); - values.put(NoteColumns.SYNC_ID, 0); + values.put(NoteColumns.SYNC_ID, 0); // 清空 GTasks ID 和 sync ID getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null); } - }).start(); + }).start();// 更新所有的 note } public static String getSyncAccountName(Context context) { - SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, + SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,// 获取 SharedPreferences 对象 Context.MODE_PRIVATE); - return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, ""); + return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, "");// 从 SharedPreferences 中获取同步帐户名称 } public static void setLastSyncTime(Context context, long time) { SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); - SharedPreferences.Editor editor = settings.edit(); - editor.putLong(PREFERENCE_LAST_SYNC_TIME, time); - editor.commit(); + SharedPreferences.Editor editor = settings.edit(); // 获取 SharedPreferences 对象 + editor.putLong(PREFERENCE_LAST_SYNC_TIME, time);// 将最后一次同步的时间保存到 SharedPreferences 中 + editor.commit();// 提交修改 } public static long getLastSyncTime(Context context) { SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, - Context.MODE_PRIVATE); - return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0); + Context.MODE_PRIVATE);// 获取 SharedPreferences 对象 + return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0);// 从 SharedPreferences 中获取最后一次同步的时间 } private class GTaskReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - refreshUI(); + refreshUI();// 刷新用户界面 if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) { TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview); syncStatus.setText(intent - .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG)); + .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG));// 如果正在同步,则更新同步状态 } } @@ -380,9 +402,9 @@ public class NotesPreferenceActivity extends PreferenceActivity { Intent intent = new Intent(this, NotesListActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); startActivity(intent); - return true; + return true; // 创建一个 Intent 对象,跳转到 NotesListActivity,并清除之前的所有 Activity default: - return false; + return false;// 如果选择的菜单项不是返回主页,则返回 false } } } diff --git a/doc/邹兴云注释的代码/ResourceParser.java b/doc/邹兴云注释的代码/ResourceParser.java new file mode 100644 index 0000000..fd1e936 --- /dev/null +++ b/doc/邹兴云注释的代码/ResourceParser.java @@ -0,0 +1,215 @@ +/* + * 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.tool; + +import android.content.Context; +import android.preference.PreferenceManager; + +import net.micode.notes.R; +import net.micode.notes.ui.NotesPreferenceActivity; + +public class ResourceParser { + + public static final int YELLOW = 0;// 黄色 + public static final int BLUE = 1;// 蓝色 + public static final int WHITE = 2;// 白色 + public static final int GREEN = 3;// 绿色 + public static final int RED = 4;// 红色 + public static final int BG_DEFAULT_COLOR = YELLOW;// 默认背景颜色 + + + public static final int TEXT_SMALL = 0;// 小号字体 + public static final int TEXT_MEDIUM = 1;// 中号字体 + public static final int TEXT_LARGE = 2;// 大号字体 + public static final int TEXT_SUPER = 3;// 超大号字 + + public static final int BG_DEFAULT_FONT_SIZE = TEXT_MEDIUM;// 默认背景字体大小 + + public static class NoteBgResources { + private final static int [] BG_EDIT_RESOURCES = new int [] { + R.drawable.edit_yellow, + R.drawable.edit_blue, + R.drawable.edit_white, + R.drawable.edit_green, + R.drawable.edit_red + };/*这是一个静态内部类 NoteBgResources,其中包含一个名为 BG_EDIT_RESOURCES 的静态常量数组,该数组包含了 5 个整型元素,这些整型元素对应着项目中的一些 drawable 资源 R.drawable.edit_yellow、R.drawable.edit_blue、R.drawable.edit_white、R.drawable.edit_green、R.drawable.edit_red。*/ + + private final static int [] BG_EDIT_TITLE_RESOURCES = new int [] { + R.drawable.edit_title_yellow, + R.drawable.edit_title_blue, + R.drawable.edit_title_white, + R.drawable.edit_title_green, + R.drawable.edit_title_red + };/*这是一个私有的静态常量数组 BG_EDIT_TITLE_RESOURCES,它包含了五个整型元素,这些整型元素对应着项目中的一些 drawable 资源 R.drawable.edit_title_yellow、R.drawable.edit_title_blue、R.drawable.edit_title_white、R.drawable.edit_title_green、R.drawable.edit_title_red。*/ + + public static int getNoteBgResource(int id) { + return BG_EDIT_RESOURCES[id]; + }/*一个静态方法 getNoteBgResource(),它接受一个整型参数 id,并返回一个整型值。在这个方法中,静态常量数组 BG_EDIT_RESOURCES 被索引到,以返回该数组中索引为 id 的元素的值。*/ + + public static int getNoteTitleBgResource(int id) { + return BG_EDIT_TITLE_RESOURCES[id]; + } + }/*一个静态方法 getNoteTitleBgResource(),它接受一个整型参数 id,并返回一个整型值。在这个方法中,静态常量数组 BG_EDIT_TITLE_RESOURCES 被索引到,以返回该数组中索引为 id 的元素的值。*/ + + public static int getDefaultBgId(Context context) { + if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean( + NotesPreferenceActivity.PREFERENCE_SET_BG_COLOR_KEY, false)) { + return (int) (Math.random() * NoteBgResources.BG_EDIT_RESOURCES.length); + } else { + return BG_DEFAULT_COLOR; + } + }/*一个公共静态方法 getDefaultBgId(),它接受一个 Context 对象作为参数,并返回一个整型值。 + +在这个方法中,首先通过 PreferenceManager.getDefaultSharedPreferences(context) 获取了一个默认的 SharedPreferences 对象,并检查其中的 PREFERENCE_SET_BG_COLOR_KEY 是否为 true。如果是 true,则使用 Math.random() 随机生成一个范围在 NoteBgResources.BG_EDIT_RESOURCES 数组长度内的整数,并返回该整数作为默认背景颜色的 ID。如果 PREFERENCE_SET_BG_COLOR_KEY 是 false,则返回 BG_DEFAULT_COLOR,它是 ResourceParser 类中定义的默认背景颜色的静态常量。*/ + + public static class NoteItemBgResources { + private final static int [] BG_FIRST_RESOURCES = new int [] { + R.drawable.list_yellow_up, + R.drawable.list_blue_up, + R.drawable.list_white_up, + R.drawable.list_green_up, + R.drawable.list_red_up + };/*一个静态内部类 NoteItemBgResources,其中包含一个名为 BG_FIRST_RESOURCES 的私有静态常量数组。 + +该数组包含了 5 个整型元素,这些整型元素对应着项目中的一些 drawable 资源 R.drawable.list_yellow_up、R.drawable.list_blue_up、R.drawable.list_white_up、R.drawable.list_green_up、R.drawable.list_red_up。*/ + + private final static int [] BG_NORMAL_RESOURCES = new int [] { + R.drawable.list_yellow_middle, + R.drawable.list_blue_middle, + R.drawable.list_white_middle, + R.drawable.list_green_middle, + R.drawable.list_red_middle + };/*这是一个私有的静态常量数组 BG_NORMAL_RESOURCES,它包含了五个整型元素,这些整型元素对应着项目中的一些 drawable 资源 R.drawable.list_yellow_middle、R.drawable.list_blue_middle、R.drawable.list_white_middle、R.drawable.list_green_middle、R.drawable.list_red_middle。 + +这个数组可能是用于为笔记列表项设置不同背景颜色的 drawable 资源数组,每个元素对应一种背景颜色。 +其中,R.drawable.list_yellow_middle、R.drawable.list_blue_middle、R.drawable.list_white_middle、R.drawable.list_green_middle、R.drawable.list_red_middle 对应的是列表项中间部分的背景颜色。*/ + private final static int [] BG_LAST_RESOURCES = new int [] { + R.drawable.list_yellow_down, + R.drawable.list_blue_down, + R.drawable.list_white_down, + R.drawable.list_green_down, + R.drawable.list_red_down, + };/*一个私有的静态常量数组 BG_LAST_RESOURCES,它包含了五个整型元素,这些整型元素对应着项目中的一些 drawable 资源 R.drawable.list_yellow_down、R.drawable.list_blue_down、R.drawable.list_white_down、R.drawable.list_green_down、R.drawable.list_red_down。 + +这个数组可能是用于为笔记列表项设置不同背景颜色的 drawable 资源数组,每个元素对应一种背景颜色。其中,R.drawable.list_yellow_down、R.drawable.list_blue_down、R.drawable.list_white_down、R.drawable.list_green_down、R.drawable.list_red_down 对应的是列表项底部部分的背景颜色。*/ + + private final static int [] BG_SINGLE_RESOURCES = new int [] { + R.drawable.list_yellow_single, + R.drawable.list_blue_single, + R.drawable.list_white_single, + R.drawable.list_green_single, + R.drawable.list_red_single + };/*一个私有的静态常量数组 BG_SINGLE_RESOURCES,它包含了五个整型元素,这些整型元素对应着项目中的一些 drawable 资源 R.drawable.list_yellow_single、R.drawable.list_blue_single、R.drawable.list_white_single、R.drawable.list_green_single、R.drawable.list_red_single。 + +这个数组可能是用于为笔记列表项设置不同背景颜色的 drawable 资源数组,每个元素对应一种背景颜色。其中,R.drawable.list_yellow_single、R.drawable.list_blue_single、R.drawable.list_white_single、R.drawable.list_green_single、R.drawable.list_red_single 对应的是只有一个列表项时的背景颜色。*/ + + public static int getNoteBgFirstRes(int id) { + return BG_FIRST_RESOURCES[id]; + }/*一个公共静态方法 getNoteBgFirstRes(),它接受一个整型参数 id,并返回一个整型值。*/ + + public static int getNoteBgLastRes(int id) { + return BG_LAST_RESOURCES[id]; + }/*一个公共静态方法 getNoteBgLastRes(),它接受一个整型参数 id,并返回一个整型值。 + +在这个方法中,静态常量数组 BG_LAST_RESOURCES 被索引到,以返回该数组中索引为 id 的元素的值*/ + + public static int getNoteBgSingleRes(int id) { + return BG_SINGLE_RESOURCES[id]; + }/*一个公共静态方法 getNoteBgSingleRes(),它接受一个整型参数 id,并返回一个整型值。 + +在这个方法中,静态常量数组 BG_SINGLE_RESOURCES 被索引到,以返回该数组中索引为 id 的元素的值。*/ + + public static int getNoteBgNormalRes(int id) { + return BG_NORMAL_RESOURCES[id]; + }/*一个公共静态方法 getNoteBgNormalRes(),它接受一个整型参数 id,并返回一个整型值。 + +在这个方法中,静态常量数组 BG_NORMAL_RESOURCES 被索引到,以返回该数组中索引为 id 的元素的值。*/ + + public static int getFolderBgRes() { + return R.drawable.list_folder; + } + }/*一个公共静态方法 getFolderBgRes(),它返回一个整型值。 + +在这个方法中,返回了一个名为 list_folder 的 drawable 资源的 ID,该资源可能是用于为文件夹列表项设置背景的。*/ + + public static class WidgetBgResources { + private final static int [] BG_2X_RESOURCES = new int [] { + R.drawable.widget_2x_yellow, + R.drawable.widget_2x_blue, + R.drawable.widget_2x_white, + R.drawable.widget_2x_green, + R.drawable.widget_2x_red, + };/*一个静态内部类 WidgetBgResources,它包含一个私有的静态常量数组 BG_2X_RESOURCES,该数组包含五个整型元素,这些整型元素对应着项目中的一些 drawable 资源 R.drawable.widget_2x_yellow、R.drawable.widget_2x_blue、R.drawable.widget_2x_white、R.drawable.widget_2x_green、R.drawable.widget_2x_red。*/ + + public static int getWidget2xBgResource(int id) { + return BG_2X_RESOURCES[id]; + } + + private final static int [] BG_4X_RESOURCES = new int [] { + R.drawable.widget_4x_yellow, + R.drawable.widget_4x_blue, + R.drawable.widget_4x_white, + R.drawable.widget_4x_green, + R.drawable.widget_4x_red + };/*一个公共静态方法 getWidget2xBgResource(),它接受一个整型参数 id,并返回一个整型值。 + +在这个方法中,静态常量数组 BG_2X_RESOURCES 被索引到,以返回该数组中索引为 id 的元素的值。 + +这个方法可能是用于获取小部件 2x2 大小的背景资源的方法,它接受一个背景颜色的 ID,返回对应的 drawable 资源。 + +这个静态内部类还包含了一个私有的静态常量数组 BG_4X_RESOURCES,该数组包含五个整型元素,这些整型元素对应着项目中的一些 drawable 资源 R.drawable.widget_4x_yellow、R.drawable.widget_4x_blue、R.drawable.widget_4x_white、R.drawable.widget_4x_green、R.drawable.widget_4x_red。*/ + + public static int getWidget4xBgResource(int id) { + return BG_4X_RESOURCES[id]; + } + }/*一个公共静态方法 getWidget4xBgResource(),它接受一个整型参数 id,并返回一个整型值。 + +在这个方法中,静态常量数组 BG_4X_RESOURCES 被索引到,以返回该数组中索引为 id 的元素的值。*/ + + public static class TextAppearanceResources { + private final static int [] TEXTAPPEARANCE_RESOURCES = new int [] { + R.style.TextAppearanceNormal, + R.style.TextAppearanceMedium, + R.style.TextAppearanceLarge, + R.style.TextAppearanceSuper + };/*一个静态内部类 TextAppearanceResources,它包含一个私有的静态常量数组 TEXTAPPEARANCE_RESOURCES,该数组包含四个整型元素,这些整型元素对应着项目中的一些样式资源 R.style.TextAppearanceNormal、R.style.TextAppearanceMedium、R.style.TextAppearanceLarge、R.style.TextAppearanceSuper。*/ + + public static int getTexAppearanceResource(int id) { + /** + * 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 (id >= TEXTAPPEARANCE_RESOURCES.length) { + return BG_DEFAULT_FONT_SIZE; + } + return TEXTAPPEARANCE_RESOURCES[id]; + }/*一个公共静态方法 getTexAppearanceResource(),它接受一个整型参数 id,并返回一个整型值。 + +在这个方法中,首先判断传入的 id 是否大于等于 TEXTAPPEARANCE_RESOURCES 数组的长度,如果是,则返回默认的字体大小 BG_DEFAULT_FONT_SIZE。 + +如果 id 小于 TEXTAPPEARANCE_RESOURCES 数组的长度,则返回 TEXTAPPEARANCE_RESOURCES 数组中索引为 id 的元素的值。*/ + + public static int getResourcesSize() { + return TEXTAPPEARANCE_RESOURCES.length; + } + } +}/*一个公共静态方法 getTexAppearanceResource(),它接受一个整型参数 id,并返回一个整型值。 + +在这个方法中,首先判断传入的 id 是否大于等于 TEXTAPPEARANCE_RESOURCES 数组的长度,如果是,则返回默认的字体大小 BG_DEFAULT_FONT_SIZE。 + +如果 id 小于 TEXTAPPEARANCE_RESOURCES 数组的长度,则返回 TEXTAPPEARANCE_RESOURCES 数组中索引为 id 的元素的值。*/ diff --git a/src/.gradle/7.4.2/checksums/checksums.lock b/src/.gradle/7.4.2/checksums/checksums.lock new file mode 100644 index 0000000..32765d4 Binary files /dev/null and b/src/.gradle/7.4.2/checksums/checksums.lock differ diff --git a/src/.gradle/7.4.2/checksums/md5-checksums.bin b/src/.gradle/7.4.2/checksums/md5-checksums.bin new file mode 100644 index 0000000..fa21229 Binary files /dev/null and b/src/.gradle/7.4.2/checksums/md5-checksums.bin differ diff --git a/src/.gradle/7.4.2/checksums/sha1-checksums.bin b/src/.gradle/7.4.2/checksums/sha1-checksums.bin new file mode 100644 index 0000000..17d2d09 Binary files /dev/null and b/src/.gradle/7.4.2/checksums/sha1-checksums.bin differ diff --git a/src/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock b/src/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 0000000..43ff0e8 Binary files /dev/null and b/src/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock differ diff --git a/src/.gradle/7.4.2/dependencies-accessors/gc.properties b/src/.gradle/7.4.2/dependencies-accessors/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/src/.gradle/7.4.2/executionHistory/executionHistory.lock b/src/.gradle/7.4.2/executionHistory/executionHistory.lock new file mode 100644 index 0000000..8a49b53 Binary files /dev/null and b/src/.gradle/7.4.2/executionHistory/executionHistory.lock differ diff --git a/src/.gradle/7.4.2/fileChanges/last-build.bin b/src/.gradle/7.4.2/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/src/.gradle/7.4.2/fileChanges/last-build.bin differ diff --git a/src/.gradle/7.4.2/fileHashes/fileHashes.lock b/src/.gradle/7.4.2/fileHashes/fileHashes.lock new file mode 100644 index 0000000..3d978cb Binary files /dev/null and b/src/.gradle/7.4.2/fileHashes/fileHashes.lock differ diff --git a/src/.gradle/7.4.2/gc.properties b/src/.gradle/7.4.2/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/src/.gradle/7.5/checksums/checksums.lock b/src/.gradle/7.5/checksums/checksums.lock new file mode 100644 index 0000000..60ac4eb Binary files /dev/null and b/src/.gradle/7.5/checksums/checksums.lock differ diff --git a/src/.gradle/7.5/checksums/md5-checksums.bin b/src/.gradle/7.5/checksums/md5-checksums.bin new file mode 100644 index 0000000..4f2d98f Binary files /dev/null and b/src/.gradle/7.5/checksums/md5-checksums.bin differ diff --git a/src/.gradle/7.5/checksums/sha1-checksums.bin b/src/.gradle/7.5/checksums/sha1-checksums.bin new file mode 100644 index 0000000..976ee9f Binary files /dev/null and b/src/.gradle/7.5/checksums/sha1-checksums.bin differ diff --git a/src/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock b/src/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 0000000..89b5e8f Binary files /dev/null and b/src/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock differ diff --git a/src/.gradle/7.5/dependencies-accessors/gc.properties b/src/.gradle/7.5/dependencies-accessors/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/src/.gradle/7.5/executionHistory/executionHistory.bin b/src/.gradle/7.5/executionHistory/executionHistory.bin new file mode 100644 index 0000000..4a7631b Binary files /dev/null and b/src/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/src/.gradle/7.5/executionHistory/executionHistory.lock b/src/.gradle/7.5/executionHistory/executionHistory.lock new file mode 100644 index 0000000..6102a39 Binary files /dev/null and b/src/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/src/.gradle/7.5/fileChanges/last-build.bin b/src/.gradle/7.5/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/src/.gradle/7.5/fileChanges/last-build.bin differ diff --git a/src/.gradle/7.5/fileHashes/fileHashes.bin b/src/.gradle/7.5/fileHashes/fileHashes.bin new file mode 100644 index 0000000..02f60a0 Binary files /dev/null and b/src/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/src/.gradle/7.5/fileHashes/fileHashes.lock b/src/.gradle/7.5/fileHashes/fileHashes.lock new file mode 100644 index 0000000..cd47ca4 Binary files /dev/null and b/src/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/src/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/.gradle/7.5/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000..6b60347 Binary files /dev/null and b/src/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/src/.gradle/7.5/gc.properties b/src/.gradle/7.5/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..455b071 Binary files /dev/null and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/.gradle/buildOutputCleanup/cache.properties b/src/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..a634f43 --- /dev/null +++ b/src/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Thu Apr 13 13:41:37 CST 2023 +gradle.version=7.5 diff --git a/src/.gradle/buildOutputCleanup/outputFiles.bin b/src/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000..a4e6ba3 Binary files /dev/null and b/src/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/.gradle/file-system.probe b/src/.gradle/file-system.probe new file mode 100644 index 0000000..8083b64 Binary files /dev/null and b/src/.gradle/file-system.probe differ diff --git a/src/.gradle/vcs-1/gc.properties b/src/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.idea/.gitignore b/src/.idea/.gitignore similarity index 100% rename from .idea/.gitignore rename to src/.idea/.gitignore diff --git a/.idea/compiler.xml b/src/.idea/compiler.xml similarity index 100% rename from .idea/compiler.xml rename to src/.idea/compiler.xml diff --git a/.idea/deploymentTargetDropDown.xml b/src/.idea/deploymentTargetDropDown.xml similarity index 74% rename from .idea/deploymentTargetDropDown.xml rename to src/.idea/deploymentTargetDropDown.xml index 4babd7f..8e3647d 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/src/.idea/deploymentTargetDropDown.xml @@ -12,6 +12,10 @@ +<<<<<<< HEAD:.idea/deploymentTargetDropDown.xml +======= + +>>>>>>> master:src/.idea/deploymentTargetDropDown.xml \ No newline at end of file diff --git a/.idea/gradle.xml b/src/.idea/gradle.xml similarity index 100% rename from .idea/gradle.xml rename to src/.idea/gradle.xml diff --git a/.idea/jarRepositories.xml b/src/.idea/jarRepositories.xml similarity index 100% rename from .idea/jarRepositories.xml rename to src/.idea/jarRepositories.xml diff --git a/.idea/misc.xml b/src/.idea/misc.xml similarity index 100% rename from .idea/misc.xml rename to src/.idea/misc.xml diff --git a/.idea/modules.xml b/src/.idea/modules.xml similarity index 100% rename from .idea/modules.xml rename to src/.idea/modules.xml diff --git a/src/.idea/modules/app/minote.app.androidTest.iml b/src/.idea/modules/app/minote.app.androidTest.iml new file mode 100644 index 0000000..02a5a9c --- /dev/null +++ b/src/.idea/modules/app/minote.app.androidTest.iml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/.idea/modules/app/minote.app.iml b/src/.idea/modules/app/minote.app.iml new file mode 100644 index 0000000..30ee2ea --- /dev/null +++ b/src/.idea/modules/app/minote.app.iml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/.idea/modules/app/minote.app.main.iml b/src/.idea/modules/app/minote.app.main.iml new file mode 100644 index 0000000..213d746 --- /dev/null +++ b/src/.idea/modules/app/minote.app.main.iml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/.idea/modules/app/minote.app.unitTest.iml b/src/.idea/modules/app/minote.app.unitTest.iml new file mode 100644 index 0000000..3ffec00 --- /dev/null +++ b/src/.idea/modules/app/minote.app.unitTest.iml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/src/.idea/vcs.xml similarity index 100% rename from .idea/vcs.xml rename to src/.idea/vcs.xml diff --git a/app/build.gradle b/src/app/build.gradle similarity index 100% rename from app/build.gradle rename to src/app/build.gradle diff --git a/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java b/src/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java similarity index 100% rename from app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java rename to src/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java diff --git a/src/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/src/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/src/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/src/app/build/intermediates/apk/debug/app-debug.apk b/src/app/build/intermediates/apk/debug/app-debug.apk new file mode 100644 index 0000000..5df6b37 Binary files /dev/null and b/src/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/app/build/intermediates/apk/debug/output-metadata.json b/src/app/build/intermediates/apk/debug/output-metadata.json new file mode 100644 index 0000000..b2231b9 --- /dev/null +++ b/src/app/build/intermediates/apk/debug/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "0.1", + "outputFile": "app-debug.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/src/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/src/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt new file mode 100644 index 0000000..46dacc6 --- /dev/null +++ b/src/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt @@ -0,0 +1,2 @@ +#- File Locator - +listingFile=../../apk/debug/output-metadata.json diff --git a/src/app/build/intermediates/app_metadata/debug/app-metadata.properties b/src/app/build/intermediates/app_metadata/debug/app-metadata.properties new file mode 100644 index 0000000..260f1ee --- /dev/null +++ b/src/app/build/intermediates/app_metadata/debug/app-metadata.properties @@ -0,0 +1,2 @@ +appMetadataVersion=1.1 +androidGradlePluginVersion=7.4.2 diff --git a/src/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json b/src/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json new file mode 100644 index 0000000..714f651 --- /dev/null +++ b/src/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json @@ -0,0 +1,10 @@ +{ + "version": 3, + "artifactType": { + "type": "COMPATIBLE_SCREEN_MANIFEST", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [] +} \ No newline at end of file diff --git a/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar new file mode 100644 index 0000000..a54964f Binary files /dev/null and b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin new file mode 100644 index 0000000..f171931 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin new file mode 100644 index 0000000..229f80d Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin new file mode 100644 index 0000000..3e3b888 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin new file mode 100644 index 0000000..300af99 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a7d840a0cfbe533a0bd2f3e687847baccb6e68d74785d8c2ff50ab024bcddd35_bucket_0/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a7d840a0cfbe533a0bd2f3e687847baccb6e68d74785d8c2ff50ab024bcddd35_bucket_0/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a7d840a0cfbe533a0bd2f3e687847baccb6e68d74785d8c2ff50ab024bcddd35_bucket_0/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a7d840a0cfbe533a0bd2f3e687847baccb6e68d74785d8c2ff50ab024bcddd35_bucket_1/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a7d840a0cfbe533a0bd2f3e687847baccb6e68d74785d8c2ff50ab024bcddd35_bucket_1/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a7d840a0cfbe533a0bd2f3e687847baccb6e68d74785d8c2ff50ab024bcddd35_bucket_1/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a7d840a0cfbe533a0bd2f3e687847baccb6e68d74785d8c2ff50ab024bcddd35_bucket_2/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a7d840a0cfbe533a0bd2f3e687847baccb6e68d74785d8c2ff50ab024bcddd35_bucket_2/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a7d840a0cfbe533a0bd2f3e687847baccb6e68d74785d8c2ff50ab024bcddd35_bucket_2/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a7d840a0cfbe533a0bd2f3e687847baccb6e68d74785d8c2ff50ab024bcddd35_bucket_3/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a7d840a0cfbe533a0bd2f3e687847baccb6e68d74785d8c2ff50ab024bcddd35_bucket_3/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a7d840a0cfbe533a0bd2f3e687847baccb6e68d74785d8c2ff50ab024bcddd35_bucket_3/graph.bin differ diff --git a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex new file mode 100644 index 0000000..085a2c9 Binary files /dev/null and b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out new file mode 100644 index 0000000..a66e67a Binary files /dev/null and b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/app/build/intermediates/dex_number_of_buckets_file/debug/out new file mode 100644 index 0000000..bf0d87a --- /dev/null +++ b/src/app/build/intermediates/dex_number_of_buckets_file/debug/out @@ -0,0 +1 @@ +4 \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state new file mode 100644 index 0000000..1c983fc Binary files /dev/null and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties new file mode 100644 index 0000000..5a37f55 --- /dev/null +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -0,0 +1,96 @@ +#Thu Apr 13 13:41:58 CST 2023 +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml new file mode 100644 index 0000000..d65e0cc --- /dev/null +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -0,0 +1,108 @@ + + + + 短信 + 邮件 + + + %1$s 条符合“%2$s”的搜索结果 + + 确认删除文件夹及所包含的便签吗? + 确认要删除该条便签吗? + 确认要删除所选的 %d 条便签吗? + 删除 + 便签 + 便签2x2 + 便签4x4 + 删除 + 通话便签 + 取消 + 设置 + 成功删除提醒 + 不能为空便签设置闹钟提醒 + 不能将空便签发送到桌面 + 要查看的便签不存在 + 导出文本时发生错误,请检查SD卡 + SD卡被占用,不能操作 + 同步已取消 + 同步失败,发生内部错误 + 同步失败,请检查网络和帐号设置 + 导出失败 + 文件夹 %1$s 已存在,请重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已将文本文件(%1$s)输出至SD卡(%2$s)目录 + 已将所选 %1$d 条便签移到 %2$s 文件夹 + 请输入名称 + 已添加到桌面 + 提醒我 + 新建文件夹 + 删除 + 取消全选 + 导出文本 + 修改文件夹名称 + 刪除文件夹 + 查看文件夹 + + 正常 + 文字大小 + + 超大 + 进入清单模式 + 移动到文件夹 + 上一级文件夹 + 退出清单模式 + 删除提醒 + 搜索 + 全选 + 没有选中项,操作无效 + 选中了 %d 项 + 发送到桌面 + 设置 + 分享 + 同步 + 取消同步 + 选择文件夹 + 已过期 + 发送邮件 + 打开地图 + 呼叫电话 + 浏览网页 + 查看 + 知道了 + 新建便签 + ... + 与google task同步便签记录 + 同步账号 + 添加账号 + 新建便签背景颜色随机 + 取消同步 + 立即同步 + 当前帐号 %1$s + 如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复 + 请选择google帐号,便签将与该帐号的google task内容同步。 + 同步便签 + 上次同步于 %1$s + 取消 + 更换账号 + 删除账号 + 设置 + 正在同步中,不能修改同步帐号 + 同步帐号已设置为%1$s + 便签 + 搜索便签 + 正在搜索便签 + 便签中的文字 + 创建提醒 + 导出成功 + 与%1$s同步成功 + 正在获取服务器便签列表... + 登录%1$s... + 正在同步本地便签... + 同步已取消 + 同步失败 + 同步成功 + 同步便签... + 没有关联内容,点击新建便签。 + 访客模式下,便签内容不可见 + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml new file mode 100644 index 0000000..226b5bc --- /dev/null +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml @@ -0,0 +1,108 @@ + + + + 短信 + 郵件 + + + %1$s 條符合”%2$s“的搜尋結果 + + 確認刪除檔夾及所包含的便簽嗎? + 确认要删除該條便籤嗎? + 确认要刪除所選的 %d 條便籤嗎? + 刪除 + 便簽 + 便簽2x2 + 便簽4x4 + 刪除 + 通話便籤 + 取消 + 設置 + 成功刪除提醒 + 不能爲空便籤設置鬧鐘提醒 + 不能將空便籤發送到桌面 + 要查看的便籤不存在 + 導出TXT時發生錯誤,請檢查SD卡 + SD卡被佔用,不能操作 + 同步已取消 + 同步失敗,發生內部錯誤 + 同步失敗,請檢查網絡和帳號設置 + 導出失敗 + 文件夾 %1$s 已存在,請重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已將文本文件(%1$s)導出至SD(%2$s)目錄 + 已將所選 %1$d 便籤移到 %2$s 文件夾 + 請輸入名稱 + 已添加到桌面 + 提醒我 + 新建文件夾 + 刪除 + 取消全選 + 導出文本 + 修改文件夾名稱 + 刪除文件夾 + 查看文件夾 + + 正常 + 文字大小 + + 超大 + 進入清單模式 + 移動到文件夾 + 上一級文件夾 + 退出清單模式 + 刪除提醒 + 搜尋 + 全選 + 沒有選中項,操作無效 + 選中了 %d 項 + 發送到桌面 + 設置 + 分享 + 同步 + 取消同步 + 選擇文件夾 + 已過期 + 發送郵件 + 打開地圖 + 呼叫電話 + 浏覽網頁 + 查看 + 知道了 + 新建便簽 + ... + 与google task同步便簽記錄 + 同步賬號 + 添加賬號 + 新建便籤背景顏色隨機 + 取消同步 + 立即同步 + 當前帳號 %1$s + 如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復 + 請選擇google帳號,便簽將與該帳號的google task內容同步。 + 同步便簽 + 上次同步于 %1$s + 取消 + 更換賬號 + 刪除賬號 + 設置 + 正在同步中,不能修改同步帳號 + 同步帳號已設置為%1$s + 便籤 + 搜索便籤 + 正在搜索便籤 + 便籤中的文字 + 創建提醒 + 導出成功 + 與%1$s同步成功 + 正在獲取服務器便籤列表... + 登陸%1$s... + 正在同步本地便籤... + 同步已取消 + 同步失敗 + 同步成功 + 同步便簽... + 沒有關聯內容,點擊新建便簽。 + 訪客模式下,便籤內容不可見 + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml new file mode 100644 index 0000000..e49b0c3 --- /dev/null +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -0,0 +1,169 @@ + + + + -%s + --%s + --%s + --%s + + + Messaging + Email + + #335b5b5b + 26sp + 20sp + 17sp + 14sp + 33sp + + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + Confirm to delete folder and its notes? + Confirm to delete this note? + Confirm to delete the selected %d notes? + Delete selected notes + Notes + Notes 2x2 + Notes 4x4 + Delete + Call notes + cancel + set + Delete reminder successfully + Sorry, can not set clock on empty note + Sorry, can not send and empty note to home + The note is not exist + Export failed, please check SD card + SD card busy, not available now + Sync is canceled + Sync failed, internal error occurs + Sync failed, please check network and account settings + Export fail + notes_%s.txt + /MIUI/notes/ + The folder %1$s exist, please rename + yyyyMMdd + MMMd kk:mm + Export text file (%1$s) to SD (%2$s) directory + (%d) + Have moved selected %1$d notes to %2$s folder + Input name + Note added to home + Remind me + New Folder + Delete + Deselect all + Export text + Change folder name + Delete folder + View folder + Large + Medium + Font size + Small + Super + Enter check list + Move to folder + Parent folder + Leave check list + Delete reminder + Search + Select all + Nothing selected, the operation is invalid + %d selected + Send to home + Settings + Share + Sync + Cancel syncing + Select folder + Expired + Send email + Open map + Call + Browse web + Take a look + Got it + Add note + ... + Sync notes with google task + Sync account + Add account + New note background color random + Cancel syncing + Sync immediately + Current account %1$s + All sync related information will be deleted, which may result in duplicated items sometime + Please select a google account. Local notes will be synced with google task. + Sync notes + Last sync time %1$s + yyyy-MM-dd hh:mm:ss + Cancel + Change sync account + Remove sync account + Settings + Cannot change the account because sync is in progress + %1$s has been set as the sync account + Notes + Search notes + Searching Notes + Text in your notes + Set reminder + Export successful + Sync is successful with account %1$s + Getting remote note list... + Logging into %1$s... + Synchronize local notes with Google Task... + Sync is canceled + Sync is failed + Sync is successful + Syncing notes... + No associated note found, click to create associated note. + Privacy mode,can not see note content + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml new file mode 100644 index 0000000..5120759 --- /dev/null +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -0,0 +1,56 @@ + + + -%s + --%s + --%s + --%s + + Messaging + Email + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + 短信 + 邮件 + 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小正常超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + %1$s 条符合“%2$s”的搜索结果 + + 短信 + 郵件 + 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小正常超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + %1$s 條符合”%2$s“的搜尋結果 + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml new file mode 100644 index 0000000..d03b88b --- /dev/null +++ b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml new file mode 100644 index 0000000..5e8ed44 --- /dev/null +++ b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml new file mode 100644 index 0000000..f68b0c7 --- /dev/null +++ b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt new file mode 100644 index 0000000..722d348 --- /dev/null +++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -0,0 +1,4 @@ +#Thu Apr 13 13:42:23 CST 2023 +base.0=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +renamed.0=classes.dex +path.0=classes.dex diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources new file mode 100644 index 0000000..44d33ab Binary files /dev/null and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 new file mode 100644 index 0000000..945a7c5 Binary files /dev/null and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class new file mode 100644 index 0000000..d0ec272 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class new file mode 100644 index 0000000..8599639 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class new file mode 100644 index 0000000..db74b30 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class new file mode 100644 index 0000000..569dbdc Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class new file mode 100644 index 0000000..6bb9e91 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class new file mode 100644 index 0000000..36c8d49 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class new file mode 100644 index 0000000..0427615 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class new file mode 100644 index 0000000..193f9b8 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class new file mode 100644 index 0000000..64fe9eb Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class new file mode 100644 index 0000000..6feebc5 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class new file mode 100644 index 0000000..734c190 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class new file mode 100644 index 0000000..20ff3f7 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class new file mode 100644 index 0000000..5236c5e Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class new file mode 100644 index 0000000..099f3ba Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class new file mode 100644 index 0000000..2783ae3 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class new file mode 100644 index 0000000..5aaf1d4 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class new file mode 100644 index 0000000..359609e Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class new file mode 100644 index 0000000..1a059ce Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class new file mode 100644 index 0000000..75665c2 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class new file mode 100644 index 0000000..a98e2d4 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class new file mode 100644 index 0000000..f73069c Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class new file mode 100644 index 0000000..0ee6693 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class new file mode 100644 index 0000000..7be3b8a Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class new file mode 100644 index 0000000..afad37e Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class new file mode 100644 index 0000000..f246eb8 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class new file mode 100644 index 0000000..18da491 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class new file mode 100644 index 0000000..c40e945 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class new file mode 100644 index 0000000..d2041cc Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class new file mode 100644 index 0000000..15f1f77 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class new file mode 100644 index 0000000..df71afc Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class new file mode 100644 index 0000000..a8b5858 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class new file mode 100644 index 0000000..59b1fff Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class new file mode 100644 index 0000000..6af3200 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class new file mode 100644 index 0000000..d320e3e Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class new file mode 100644 index 0000000..3a43d3e Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class new file mode 100644 index 0000000..76971f6 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class new file mode 100644 index 0000000..5868ba7 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class new file mode 100644 index 0000000..e8542fb Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class new file mode 100644 index 0000000..f2e1b62 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class new file mode 100644 index 0000000..51317a3 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class new file mode 100644 index 0000000..a1d202d Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class new file mode 100644 index 0000000..a41b775 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class new file mode 100644 index 0000000..029286f Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class new file mode 100644 index 0000000..e65c35c Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class new file mode 100644 index 0000000..de51bad Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class new file mode 100644 index 0000000..d04cbe7 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class new file mode 100644 index 0000000..255a4e6 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class new file mode 100644 index 0000000..505c291 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class new file mode 100644 index 0000000..415e755 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class new file mode 100644 index 0000000..70481dd Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class new file mode 100644 index 0000000..7f6cc71 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class new file mode 100644 index 0000000..ddd74fd Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class new file mode 100644 index 0000000..d805d20 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class new file mode 100644 index 0000000..45d174e Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class new file mode 100644 index 0000000..383f2f5 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class new file mode 100644 index 0000000..f7afcae Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class new file mode 100644 index 0000000..24c7362 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class new file mode 100644 index 0000000..1725d92 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class new file mode 100644 index 0000000..8e1f0bf Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class new file mode 100644 index 0000000..26e0ea0 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class new file mode 100644 index 0000000..2040186 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class new file mode 100644 index 0000000..9874f47 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class new file mode 100644 index 0000000..3a1b2fa Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class new file mode 100644 index 0000000..771aa91 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class new file mode 100644 index 0000000..8b49661 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class new file mode 100644 index 0000000..70299f5 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class new file mode 100644 index 0000000..4b38b8c Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class new file mode 100644 index 0000000..fb39036 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class new file mode 100644 index 0000000..fe71934 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class new file mode 100644 index 0000000..d3fdd7c Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class new file mode 100644 index 0000000..b598c32 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class new file mode 100644 index 0000000..a86271b Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class new file mode 100644 index 0000000..4d1fc47 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class new file mode 100644 index 0000000..fadd4fc Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class new file mode 100644 index 0000000..2edab7b Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class new file mode 100644 index 0000000..3981f16 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class new file mode 100644 index 0000000..99e161f Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class new file mode 100644 index 0000000..4d23237 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class new file mode 100644 index 0000000..1e7b9f0 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class new file mode 100644 index 0000000..6c2b8ff Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class new file mode 100644 index 0000000..e4a168f Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class new file mode 100644 index 0000000..2bdb58b Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class new file mode 100644 index 0000000..5e432e9 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class new file mode 100644 index 0000000..3f69317 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class new file mode 100644 index 0000000..00ee0c3 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class new file mode 100644 index 0000000..8523228 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class new file mode 100644 index 0000000..d91bc85 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class new file mode 100644 index 0000000..99c7a64 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class new file mode 100644 index 0000000..17e4d3b Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class new file mode 100644 index 0000000..7b80036 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class new file mode 100644 index 0000000..d9abeb9 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class new file mode 100644 index 0000000..39e534a Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class new file mode 100644 index 0000000..2e15406 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class new file mode 100644 index 0000000..a19956f Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class new file mode 100644 index 0000000..b06613f Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class new file mode 100644 index 0000000..b11cc4f Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class new file mode 100644 index 0000000..f7e3c77 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ diff --git a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt new file mode 100644 index 0000000..2443fda --- /dev/null +++ b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -0,0 +1,273 @@ +1 +2 +17 +21 +22 D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:23:5-44 +23 android:minSdkVersion="14" +23-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:23:15-41 +24 android:targetSdkVersion="14" /> +24-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:23:5-44 +25 +26 +26-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:25:5-81 +26-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:25:22-78 +27 +27-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:26:5-88 +27-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:26:22-85 +28 +28-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:27:5-67 +28-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:27:22-64 +29 +29-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:28:5-72 +29-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:28:22-69 +30 +30-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:29:5-74 +30-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:29:22-71 +31 +31-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:30:5-80 +31-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:30:22-77 +32 +32-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:31:5-71 +32-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:31:22-68 +33 +33-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:32:5-74 +33-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:32:22-71 +34 +34-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:33:5-81 +34-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:33:22-78 +35 +36 D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:35:5-149:19 +37 android:debuggable="true" +38 android:icon="@drawable/icon_app" +38-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:36:9-42 +39 android:label="@string/app_name" +39-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:37:9-41 +40 android:testOnly="true" > +41 D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:38:9-51:20 +42 android:name="net.micode.notes.ui.NotesListActivity" +42-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:39:13-49 +43 android:configChanges="keyboardHidden|orientation|screenSize" +43-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:40:13-74 +44 android:label="@string/app_name" +44-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:41:13-45 +45 android:launchMode="singleTop" +45-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:42:13-43 +46 android:theme="@style/NoteTheme" +46-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:43:13-45 +47 android:uiOptions="splitActionBarWhenNarrow" +47-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:44:13-57 +48 android:windowSoftInputMode="adjustPan" > +48-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:45:13-52 +49 +49-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:47:13-50:29 +50 +50-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:48:17-69 +50-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:48:25-66 +51 +52 +52-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:49:17-77 +52-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:49:27-74 +53 +54 +55 D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:53:9-81:20 +56 android:name="net.micode.notes.ui.NoteEditActivity" +56-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:54:13-48 +57 android:configChanges="keyboardHidden|orientation|screenSize" +57-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:55:13-74 +58 android:launchMode="singleTop" +58-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:56:13-43 +59 android:theme="@style/NoteTheme" > +59-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:57:13-45 +60 +60-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:59:13-64:29 +61 +61-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:60:17-69 +61-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:60:25-66 +62 +63 +63-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:61:17-76 +63-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:61:27-73 +64 +65 +65-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:62:17-78 +65-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:62:23-75 +66 +66-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:62:17-78 +66-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:62:23-75 +67 +68 +68-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:66:13-71:29 +69 +69-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:67:17-79 +69-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:67:25-76 +70 +71 +71-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:61:17-76 +71-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:61:27-73 +72 +73 +73-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:62:17-78 +73-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:62:23-75 +74 +74-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:62:17-78 +74-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:62:23-75 +75 +76 +76-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:73:13-76:29 +77 +77-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:74:17-71 +77-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:74:25-68 +78 +79 +79-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:61:17-76 +79-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:61:27-73 +80 +81 +82 D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:78:13-80:54 +83 android:name="android.app.searchable" +83-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:79:17-54 +84 android:resource="@xml/searchable" /> +84-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:80:17-51 +85 +86 +87 D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:83:9-86:43 +88 android:name="net.micode.notes.data.NotesProvider" +88-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:84:13-63 +89 android:authorities="micode_notes" +89-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:85:13-47 +90 android:multiprocess="true" /> +90-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:86:13-40 +91 +92 D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:88:9-100:20 +93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +93-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:89:13-57 +94 android:label="@string/app_widget2x2" > +94-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:90:13-50 +95 +95-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:91:13-95:29 +96 +96-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:92:17-84 +96-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:92:25-81 +97 +97-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:93:17-85 +97-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:93:25-82 +98 +98-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:94:17-85 +98-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:94:25-82 +99 +100 +101 D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:97:13-99:58 +102 android:name="android.appwidget.provider" +102-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:98:17-58 +103 android:resource="@xml/widget_2x_info" /> +103-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:99:17-55 +104 +105 D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:101:9-114:20 +106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +106-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:102:13-57 +107 android:label="@string/app_widget4x4" > +107-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:103:13-50 +108 +108-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:91:13-95:29 +109 +109-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:92:17-84 +109-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:92:25-81 +110 +110-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:93:17-85 +110-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:93:25-82 +111 +111-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:94:17-85 +111-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:94:25-82 +112 +113 +114 D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:97:13-99:58 +115 android:name="android.appwidget.provider" +115-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:98:17-58 +116 android:resource="@xml/widget_4x_info" /> +116-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:99:17-55 +117 +118 +118-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:116:9-120:20 +118-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:116:19-55 +119 +119-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:117:13-119:29 +120 +120-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:118:17-79 +120-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:118:25-76 +121 +122 +123 D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:122:9-125:20 +124 android:name="net.micode.notes.ui.AlarmReceiver" +124-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:123:13-61 +125 android:process=":remote" > +125-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:124:13-38 +126 +127 +128 D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:127:9-132:20 +129 android:name="net.micode.notes.ui.AlarmAlertActivity" +129-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:128:13-50 +130 android:label="@string/app_name" +130-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:129:13-45 +131 android:launchMode="singleInstance" +131-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:130:13-48 +132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +132-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:131:13-75 +133 +134 D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:134:9-139:20 +135 android:name="net.micode.notes.ui.NotesPreferenceActivity" +135-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:135:13-71 +136 android:label="@string/preferences_title" +136-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:136:13-54 +137 android:launchMode="singleTop" +137-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:137:13-43 +138 android:theme="@android:style/Theme.Holo.Light" > +138-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:138:13-60 +139 +140 +141 D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:141:9-144:19 +142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +142-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:142:13-74 +143 android:exported="false" > +143-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:143:13-37 +144 +145 +146 D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:146:9-148:52 +147 android:name="android.app.default_searchable" +147-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:147:13-58 +148 android:value=".ui.NoteEditActivity" /> +148-->D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:148:13-49 +149 +150 +151 diff --git a/src/app/build/intermediates/merged_java_res/debug/base.jar b/src/app/build/intermediates/merged_java_res/debug/base.jar new file mode 100644 index 0000000..15cb0ec Binary files /dev/null and b/src/app/build/intermediates/merged_java_res/debug/base.jar differ diff --git a/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml new file mode 100644 index 0000000..f237bf5 --- /dev/null +++ b/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml new file mode 100644 index 0000000..f237bf5 --- /dev/null +++ b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/build/intermediates/merged_manifests/debug/output-metadata.json b/src/app/build/intermediates/merged_manifests/debug/output-metadata.json new file mode 100644 index 0000000..a56d03a --- /dev/null +++ b/src/app/build/intermediates/merged_manifests/debug/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "MERGED_MANIFESTS", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "0.1", + "outputFile": "AndroidManifest.xml" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/src/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/src/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat new file mode 100644 index 0000000..802be34 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/src/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat new file mode 100644 index 0000000..2d9ddb4 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat new file mode 100644 index 0000000..a783113 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat new file mode 100644 index 0000000..a9576bb Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat new file mode 100644 index 0000000..0692876 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat new file mode 100644 index 0000000..a5cd8ef Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat new file mode 100644 index 0000000..b5e283d Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat new file mode 100644 index 0000000..74c78c0 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat new file mode 100644 index 0000000..5436926 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat new file mode 100644 index 0000000..4d95a89 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat new file mode 100644 index 0000000..ce52bc1 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat new file mode 100644 index 0000000..b376e80 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat new file mode 100644 index 0000000..b8cc9ab Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat new file mode 100644 index 0000000..2af509b Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat new file mode 100644 index 0000000..f3a6c60 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat new file mode 100644 index 0000000..8828ae3 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat new file mode 100644 index 0000000..8a98c38 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat new file mode 100644 index 0000000..4c9bdf9 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat new file mode 100644 index 0000000..1422573 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat new file mode 100644 index 0000000..704993a Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat new file mode 100644 index 0000000..9a4b989 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat new file mode 100644 index 0000000..11857a4 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat new file mode 100644 index 0000000..2227ab8 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat new file mode 100644 index 0000000..27a8412 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat new file mode 100644 index 0000000..0bda0bc Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat new file mode 100644 index 0000000..75f3cd0 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat new file mode 100644 index 0000000..f82dd6d Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat new file mode 100644 index 0000000..d57fe3a Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat new file mode 100644 index 0000000..683b6f1 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat new file mode 100644 index 0000000..e75e056 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat new file mode 100644 index 0000000..3f89243 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat new file mode 100644 index 0000000..6b24efc Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat new file mode 100644 index 0000000..4f7fa61 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat new file mode 100644 index 0000000..725a39f Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat new file mode 100644 index 0000000..f7b11e8 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat new file mode 100644 index 0000000..82de739 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat new file mode 100644 index 0000000..224f699 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat new file mode 100644 index 0000000..6c1bc35 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat new file mode 100644 index 0000000..d29584e Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat new file mode 100644 index 0000000..394cf64 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat new file mode 100644 index 0000000..6a55c1f Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat new file mode 100644 index 0000000..d3094aa Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat new file mode 100644 index 0000000..a3558dd Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat new file mode 100644 index 0000000..e9e827a Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat new file mode 100644 index 0000000..812fbce Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat new file mode 100644 index 0000000..c4a34ba Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat new file mode 100644 index 0000000..a0b2963 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat new file mode 100644 index 0000000..0d0a7c7 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat new file mode 100644 index 0000000..7b7b9c9 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat new file mode 100644 index 0000000..ac802ba Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat new file mode 100644 index 0000000..ee82d6c Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat new file mode 100644 index 0000000..8d48e8e Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat new file mode 100644 index 0000000..dbeee0b Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat new file mode 100644 index 0000000..e55822d Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat new file mode 100644 index 0000000..be2aedd Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat new file mode 100644 index 0000000..8f6daec Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat new file mode 100644 index 0000000..87aeb20 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat new file mode 100644 index 0000000..825e93d Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat new file mode 100644 index 0000000..e039b02 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat new file mode 100644 index 0000000..a2eb42b Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat new file mode 100644 index 0000000..c7eff78 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat new file mode 100644 index 0000000..decfaad Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat new file mode 100644 index 0000000..7c3cf3a Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat new file mode 100644 index 0000000..1c75d02 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat new file mode 100644 index 0000000..e82e879 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat new file mode 100644 index 0000000..366fd2c Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat new file mode 100644 index 0000000..ac23b11 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/src/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat new file mode 100644 index 0000000..8b4b3a5 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat new file mode 100644 index 0000000..5fdf154 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat new file mode 100644 index 0000000..f2fd34a Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat new file mode 100644 index 0000000..16cf2ef Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat new file mode 100644 index 0000000..afee10f Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat new file mode 100644 index 0000000..b3d34f5 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat new file mode 100644 index 0000000..951dd2f Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat new file mode 100644 index 0000000..544cfb6 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat new file mode 100644 index 0000000..2ae3d38 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat new file mode 100644 index 0000000..b092461 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat new file mode 100644 index 0000000..ef9a690 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat new file mode 100644 index 0000000..48aa960 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat new file mode 100644 index 0000000..4b1a1cd Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat new file mode 100644 index 0000000..c923e71 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat new file mode 100644 index 0000000..bd9974e Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat new file mode 100644 index 0000000..c89b09d Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat new file mode 100644 index 0000000..504fc9c Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat new file mode 100644 index 0000000..c2c61cc Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat new file mode 100644 index 0000000..c138bc9 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat new file mode 100644 index 0000000..6e3c761 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat new file mode 100644 index 0000000..60513de Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat new file mode 100644 index 0000000..4e4f099 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat new file mode 100644 index 0000000..17cb018 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/raw_introduction.flat b/src/app/build/intermediates/merged_res/debug/raw_introduction.flat new file mode 100644 index 0000000..608c6fd Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/raw_introduction.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat new file mode 100644 index 0000000..035ddcd Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat new file mode 100644 index 0000000..1043ced Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat new file mode 100644 index 0000000..ea0ebfc Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/src/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat new file mode 100644 index 0000000..e36a338 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/src/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat new file mode 100644 index 0000000..c4dc076 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/src/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat new file mode 100644 index 0000000..b960844 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/src/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat new file mode 100644 index 0000000..1605ca0 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat differ diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json new file mode 100644 index 0000000..1570241 --- /dev/null +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -0,0 +1,186 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", + "map": [ + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + } + }, + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", + "map": [ + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + } + }, + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endColumns": "56", + "endOffsets": "764" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + }, + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } + }, + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json new file mode 100644 index 0000000..a166c33 --- /dev/null +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -0,0 +1,47 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", + "map": [ + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + } + }, + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json new file mode 100644 index 0000000..9a37356 --- /dev/null +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -0,0 +1,47 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", + "map": [ + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } + }, + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json new file mode 100644 index 0000000..dbae3f0 --- /dev/null +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -0,0 +1,100 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", + "map": [ + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + } + }, + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endColumns": "56", + "endOffsets": "764" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + }, + { + "source": "D:\\softwareengineering\\minote\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json new file mode 100644 index 0000000..2a106a9 --- /dev/null +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -0,0 +1,382 @@ +[ + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_item.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/sub_folder.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/settings_header.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat", + "source": "net.micode.notes.app-main-7:/raw/introduction" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat", + "source": "net.micode.notes.app-main-7:/drawable/new_note.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat", + "source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat", + "source": "net.micode.notes.app-main-7:/xml/preferences.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat", + "source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat", + "source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat", + "source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_edit.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/widget_4x.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat", + "source": "net.micode.notes.app-main-7:/xml/searchable.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_list.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_list.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_list_options.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat", + "source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_edit.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png" + } +] \ No newline at end of file diff --git a/src/app/build/intermediates/navigation_json/debug/navigation.json b/src/app/build/intermediates/navigation_json/debug/navigation.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/src/app/build/intermediates/navigation_json/debug/navigation.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml new file mode 100644 index 0000000..f237bf5 --- /dev/null +++ b/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/build/intermediates/packaged_manifests/debug/output-metadata.json b/src/app/build/intermediates/packaged_manifests/debug/output-metadata.json new file mode 100644 index 0000000..eea66e3 --- /dev/null +++ b/src/app/build/intermediates/packaged_manifests/debug/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "PACKAGED_MANIFESTS", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "0.1", + "outputFile": "AndroidManifest.xml" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/src/app/build/intermediates/processed_res/debug/out/output-metadata.json b/src/app/build/intermediates/processed_res/debug/out/output-metadata.json new file mode 100644 index 0000000..1eefece --- /dev/null +++ b/src/app/build/intermediates/processed_res/debug/out/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "PROCESSED_RES", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "0.1", + "outputFile": "resources-debug.ap_" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ new file mode 100644 index 0000000..c31ed29 Binary files /dev/null and b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar b/src/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar new file mode 100644 index 0000000..be74c24 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex new file mode 100644 index 0000000..3ec8694 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex new file mode 100644 index 0000000..efd57fd Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex new file mode 100644 index 0000000..c3b5082 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex new file mode 100644 index 0000000..2b0d946 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex new file mode 100644 index 0000000..a60f83d Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex new file mode 100644 index 0000000..81c3fc2 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex new file mode 100644 index 0000000..38a8559 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex new file mode 100644 index 0000000..9ae054a Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex new file mode 100644 index 0000000..6b4a469 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex new file mode 100644 index 0000000..3a82be9 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex new file mode 100644 index 0000000..2cb474b Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex new file mode 100644 index 0000000..8f17e71 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex new file mode 100644 index 0000000..e2055dc Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex new file mode 100644 index 0000000..f51d63b Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex new file mode 100644 index 0000000..2aba33b Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex new file mode 100644 index 0000000..67e31de Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex new file mode 100644 index 0000000..60b9e39 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex new file mode 100644 index 0000000..7009519 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex new file mode 100644 index 0000000..e2dff47 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex new file mode 100644 index 0000000..4855d0e Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex new file mode 100644 index 0000000..64d96b3 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex new file mode 100644 index 0000000..0de0587 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex new file mode 100644 index 0000000..29cbbbf Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex new file mode 100644 index 0000000..c4b7db6 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex new file mode 100644 index 0000000..01d237b Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex new file mode 100644 index 0000000..5f25c0f Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex new file mode 100644 index 0000000..b8db69c Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex new file mode 100644 index 0000000..ec0402c Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex new file mode 100644 index 0000000..5fd517e Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex new file mode 100644 index 0000000..dc8c600 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex new file mode 100644 index 0000000..51d4bec Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex new file mode 100644 index 0000000..48f993c Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex new file mode 100644 index 0000000..91d53df Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex new file mode 100644 index 0000000..0215fa6 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex new file mode 100644 index 0000000..e9217ca Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex new file mode 100644 index 0000000..eac1844 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex new file mode 100644 index 0000000..254d2ca Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex new file mode 100644 index 0000000..4b699f3 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex new file mode 100644 index 0000000..dfce0f1 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex new file mode 100644 index 0000000..3d37b7c Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex new file mode 100644 index 0000000..04d5c91 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex new file mode 100644 index 0000000..64cbaab Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex new file mode 100644 index 0000000..b1a976d Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex new file mode 100644 index 0000000..97a7ce4 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex new file mode 100644 index 0000000..5ff69b8 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex new file mode 100644 index 0000000..08f79c9 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex new file mode 100644 index 0000000..e26f40f Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex new file mode 100644 index 0000000..c00e5b5 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex new file mode 100644 index 0000000..379d253 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex new file mode 100644 index 0000000..b8ecb0a Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex new file mode 100644 index 0000000..2e21e00 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex new file mode 100644 index 0000000..a355446 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex new file mode 100644 index 0000000..7f1ee6d Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex new file mode 100644 index 0000000..f75d453 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex new file mode 100644 index 0000000..a1fad89 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex new file mode 100644 index 0000000..84a4592 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex new file mode 100644 index 0000000..5651cb4 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex new file mode 100644 index 0000000..a52b249 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex new file mode 100644 index 0000000..a2bbe0e Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex new file mode 100644 index 0000000..3136635 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex new file mode 100644 index 0000000..1a6e15e Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex new file mode 100644 index 0000000..ff32b28 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex new file mode 100644 index 0000000..f01ae95 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex new file mode 100644 index 0000000..8eba346 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex new file mode 100644 index 0000000..916c87e Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex new file mode 100644 index 0000000..2d6c690 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex new file mode 100644 index 0000000..51eac93 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex new file mode 100644 index 0000000..1226c8e Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex new file mode 100644 index 0000000..9df73db Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex new file mode 100644 index 0000000..b0900a0 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex new file mode 100644 index 0000000..9c884ea Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex new file mode 100644 index 0000000..8fcb62f Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex new file mode 100644 index 0000000..68f4b7f Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex new file mode 100644 index 0000000..6b3c811 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex new file mode 100644 index 0000000..83194ec Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex new file mode 100644 index 0000000..357ed7c Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex new file mode 100644 index 0000000..a1a5391 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex new file mode 100644 index 0000000..62dcb26 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex new file mode 100644 index 0000000..a6d8979 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex new file mode 100644 index 0000000..edb0f85 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex new file mode 100644 index 0000000..e832510 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex new file mode 100644 index 0000000..b2e4069 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex new file mode 100644 index 0000000..3456bf5 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex new file mode 100644 index 0000000..cab7e8d Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex new file mode 100644 index 0000000..b30d3ed Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex new file mode 100644 index 0000000..c665855 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex new file mode 100644 index 0000000..afc2167 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex new file mode 100644 index 0000000..c75dcff Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex new file mode 100644 index 0000000..5a37d5a Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex new file mode 100644 index 0000000..d79be5e Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex new file mode 100644 index 0000000..92aba60 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex new file mode 100644 index 0000000..f42000d Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex new file mode 100644 index 0000000..21aa394 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex new file mode 100644 index 0000000..c159f55 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex new file mode 100644 index 0000000..0d540b4 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex new file mode 100644 index 0000000..39632c6 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex new file mode 100644 index 0000000..520e151 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ diff --git a/src/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/app/build/intermediates/runtime_symbol_list/debug/R.txt new file mode 100644 index 0000000..00d6e91 --- /dev/null +++ b/src/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -0,0 +1,283 @@ +int array format_for_exported_note 0x7f010000 +int array menu_share_ways 0x7f010001 +int color primary_text_dark 0x7f020000 +int color secondary_text_dark 0x7f020001 +int color user_query_highlight 0x7f020002 +int dimen text_font_size_large 0x7f030000 +int dimen text_font_size_medium 0x7f030001 +int dimen text_font_size_normal 0x7f030002 +int dimen text_font_size_small 0x7f030003 +int dimen text_font_size_super 0x7f030004 +int drawable bg_btn_set_color 0x7f040000 +int drawable bg_color_btn_mask 0x7f040001 +int drawable call_record 0x7f040002 +int drawable clock 0x7f040003 +int drawable delete 0x7f040004 +int drawable dropdown_icon 0x7f040005 +int drawable edit_blue 0x7f040006 +int drawable edit_green 0x7f040007 +int drawable edit_red 0x7f040008 +int drawable edit_title_blue 0x7f040009 +int drawable edit_title_green 0x7f04000a +int drawable edit_title_red 0x7f04000b +int drawable edit_title_white 0x7f04000c +int drawable edit_title_yellow 0x7f04000d +int drawable edit_white 0x7f04000e +int drawable edit_yellow 0x7f04000f +int drawable font_large 0x7f040010 +int drawable font_normal 0x7f040011 +int drawable font_size_selector_bg 0x7f040012 +int drawable font_small 0x7f040013 +int drawable font_super 0x7f040014 +int drawable icon_app 0x7f040015 +int drawable list_background 0x7f040016 +int drawable list_blue_down 0x7f040017 +int drawable list_blue_middle 0x7f040018 +int drawable list_blue_single 0x7f040019 +int drawable list_blue_up 0x7f04001a +int drawable list_folder 0x7f04001b +int drawable list_footer_bg 0x7f04001c +int drawable list_green_down 0x7f04001d +int drawable list_green_middle 0x7f04001e +int drawable list_green_single 0x7f04001f +int drawable list_green_up 0x7f040020 +int drawable list_red_down 0x7f040021 +int drawable list_red_middle 0x7f040022 +int drawable list_red_single 0x7f040023 +int drawable list_red_up 0x7f040024 +int drawable list_white_down 0x7f040025 +int drawable list_white_middle 0x7f040026 +int drawable list_white_single 0x7f040027 +int drawable list_white_up 0x7f040028 +int drawable list_yellow_down 0x7f040029 +int drawable list_yellow_middle 0x7f04002a +int drawable list_yellow_single 0x7f04002b +int drawable list_yellow_up 0x7f04002c +int drawable menu_delete 0x7f04002d +int drawable menu_move 0x7f04002e +int drawable new_note 0x7f04002f +int drawable new_note_normal 0x7f040030 +int drawable new_note_pressed 0x7f040031 +int drawable note_edit_color_selector_panel 0x7f040032 +int drawable notification 0x7f040033 +int drawable search_result 0x7f040034 +int drawable selected 0x7f040035 +int drawable title_alert 0x7f040036 +int drawable title_bar_bg 0x7f040037 +int drawable widget_2x_blue 0x7f040038 +int drawable widget_2x_green 0x7f040039 +int drawable widget_2x_red 0x7f04003a +int drawable widget_2x_white 0x7f04003b +int drawable widget_2x_yellow 0x7f04003c +int drawable widget_4x_blue 0x7f04003d +int drawable widget_4x_green 0x7f04003e +int drawable widget_4x_red 0x7f04003f +int drawable widget_4x_white 0x7f040040 +int drawable widget_4x_yellow 0x7f040041 +int id account_dialog_subtitle 0x7f050000 +int id account_dialog_title 0x7f050001 +int id action_select_all 0x7f050002 +int id amPm 0x7f050003 +int id btn_new_note 0x7f050004 +int id btn_set_bg_color 0x7f050005 +int id cb_edit_item 0x7f050006 +int id date 0x7f050007 +int id delete 0x7f050008 +int id et_edit_text 0x7f050009 +int id et_foler_name 0x7f05000a +int id font_size_selector 0x7f05000b +int id hour 0x7f05000c +int id iv_alert_icon 0x7f05000d +int id iv_bg_blue 0x7f05000e +int id iv_bg_blue_select 0x7f05000f +int id iv_bg_green 0x7f050010 +int id iv_bg_green_select 0x7f050011 +int id iv_bg_red 0x7f050012 +int id iv_bg_red_select 0x7f050013 +int id iv_bg_white 0x7f050014 +int id iv_bg_white_select 0x7f050015 +int id iv_bg_yellow 0x7f050016 +int id iv_bg_yellow_select 0x7f050017 +int id iv_large_select 0x7f050018 +int id iv_medium_select 0x7f050019 +int id iv_small_select 0x7f05001a +int id iv_super_select 0x7f05001b +int id ll_font_large 0x7f05001c +int id ll_font_normal 0x7f05001d +int id ll_font_small 0x7f05001e +int id ll_font_super 0x7f05001f +int id menu_alert 0x7f050020 +int id menu_delete 0x7f050021 +int id menu_delete_remind 0x7f050022 +int id menu_export_text 0x7f050023 +int id menu_font_size 0x7f050024 +int id menu_list_mode 0x7f050025 +int id menu_new_folder 0x7f050026 +int id menu_new_note 0x7f050027 +int id menu_search 0x7f050028 +int id menu_send_to_desktop 0x7f050029 +int id menu_setting 0x7f05002a +int id menu_share 0x7f05002b +int id menu_sync 0x7f05002c +int id minute 0x7f05002d +int id move 0x7f05002e +int id navigation_bar 0x7f05002f +int id note_bg_color_selector 0x7f050030 +int id note_edit_list 0x7f050031 +int id note_edit_view 0x7f050032 +int id note_item 0x7f050033 +int id note_title 0x7f050034 +int id notes_list 0x7f050035 +int id prefenerece_sync_status_textview 0x7f050036 +int id preference_sync_button 0x7f050037 +int id selection_menu 0x7f050038 +int id sv_note_edit 0x7f050039 +int id tv_alert_date 0x7f05003a +int id tv_folder_name 0x7f05003b +int id tv_modified_date 0x7f05003c +int id tv_name 0x7f05003d +int id tv_time 0x7f05003e +int id tv_title 0x7f05003f +int id tv_title_bar 0x7f050040 +int id widget_bg_image 0x7f050041 +int id widget_text 0x7f050042 +int layout account_dialog_title 0x7f060000 +int layout add_account_text 0x7f060001 +int layout datetime_picker 0x7f060002 +int layout dialog_edit_text 0x7f060003 +int layout folder_list_item 0x7f060004 +int layout note_edit 0x7f060005 +int layout note_edit_list_item 0x7f060006 +int layout note_item 0x7f060007 +int layout note_list 0x7f060008 +int layout note_list_dropdown_menu 0x7f060009 +int layout note_list_footer 0x7f06000a +int layout settings_header 0x7f06000b +int layout widget_2x 0x7f06000c +int layout widget_4x 0x7f06000d +int menu call_note_edit 0x7f070000 +int menu call_record_folder 0x7f070001 +int menu note_edit 0x7f070002 +int menu note_list 0x7f070003 +int menu note_list_dropdown 0x7f070004 +int menu note_list_options 0x7f070005 +int menu sub_folder 0x7f070006 +int plurals search_results_title 0x7f080000 +int raw introduction 0x7f090000 +int string alert_message_delete_folder 0x7f0a0000 +int string alert_message_delete_note 0x7f0a0001 +int string alert_message_delete_notes 0x7f0a0002 +int string alert_title_delete 0x7f0a0003 +int string app_name 0x7f0a0004 +int string app_widget2x2 0x7f0a0005 +int string app_widget4x4 0x7f0a0006 +int string button_delete 0x7f0a0007 +int string call_record_folder_name 0x7f0a0008 +int string datetime_dialog_cancel 0x7f0a0009 +int string datetime_dialog_ok 0x7f0a000a +int string delete_remind_time_message 0x7f0a000b +int string error_note_empty_for_clock 0x7f0a000c +int string error_note_empty_for_send_to_desktop 0x7f0a000d +int string error_note_not_exist 0x7f0a000e +int string error_sdcard_export 0x7f0a000f +int string error_sdcard_unmounted 0x7f0a0010 +int string error_sync_cancelled 0x7f0a0011 +int string error_sync_internal 0x7f0a0012 +int string error_sync_network 0x7f0a0013 +int string failed_sdcard_export 0x7f0a0014 +int string file_name_txt_format 0x7f0a0015 +int string file_path 0x7f0a0016 +int string folder_exist 0x7f0a0017 +int string format_date_ymd 0x7f0a0018 +int string format_datetime_mdhm 0x7f0a0019 +int string format_exported_file_location 0x7f0a001a +int string format_folder_files_count 0x7f0a001b +int string format_move_notes_to_folder 0x7f0a001c +int string hint_foler_name 0x7f0a001d +int string info_note_enter_desktop 0x7f0a001e +int string menu_alert 0x7f0a001f +int string menu_create_folder 0x7f0a0020 +int string menu_delete 0x7f0a0021 +int string menu_deselect_all 0x7f0a0022 +int string menu_export_text 0x7f0a0023 +int string menu_folder_change_name 0x7f0a0024 +int string menu_folder_delete 0x7f0a0025 +int string menu_folder_view 0x7f0a0026 +int string menu_font_large 0x7f0a0027 +int string menu_font_normal 0x7f0a0028 +int string menu_font_size 0x7f0a0029 +int string menu_font_small 0x7f0a002a +int string menu_font_super 0x7f0a002b +int string menu_list_mode 0x7f0a002c +int string menu_move 0x7f0a002d +int string menu_move_parent_folder 0x7f0a002e +int string menu_normal_mode 0x7f0a002f +int string menu_remove_remind 0x7f0a0030 +int string menu_search 0x7f0a0031 +int string menu_select_all 0x7f0a0032 +int string menu_select_none 0x7f0a0033 +int string menu_select_title 0x7f0a0034 +int string menu_send_to_desktop 0x7f0a0035 +int string menu_setting 0x7f0a0036 +int string menu_share 0x7f0a0037 +int string menu_sync 0x7f0a0038 +int string menu_sync_cancel 0x7f0a0039 +int string menu_title_select_folder 0x7f0a003a +int string note_alert_expired 0x7f0a003b +int string note_link_email 0x7f0a003c +int string note_link_other 0x7f0a003d +int string note_link_tel 0x7f0a003e +int string note_link_web 0x7f0a003f +int string notealert_enter 0x7f0a0040 +int string notealert_ok 0x7f0a0041 +int string notelist_menu_new 0x7f0a0042 +int string notelist_string_info 0x7f0a0043 +int string preferences_account_summary 0x7f0a0044 +int string preferences_account_title 0x7f0a0045 +int string preferences_add_account 0x7f0a0046 +int string preferences_bg_random_appear_title 0x7f0a0047 +int string preferences_button_sync_cancel 0x7f0a0048 +int string preferences_button_sync_immediately 0x7f0a0049 +int string preferences_dialog_change_account_title 0x7f0a004a +int string preferences_dialog_change_account_warn_msg 0x7f0a004b +int string preferences_dialog_select_account_tips 0x7f0a004c +int string preferences_dialog_select_account_title 0x7f0a004d +int string preferences_last_sync_time 0x7f0a004e +int string preferences_last_sync_time_format 0x7f0a004f +int string preferences_menu_cancel 0x7f0a0050 +int string preferences_menu_change_account 0x7f0a0051 +int string preferences_menu_remove_account 0x7f0a0052 +int string preferences_title 0x7f0a0053 +int string preferences_toast_cannot_change_account 0x7f0a0054 +int string preferences_toast_success_set_accout 0x7f0a0055 +int string search 0x7f0a0056 +int string search_hint 0x7f0a0057 +int string search_label 0x7f0a0058 +int string search_setting_description 0x7f0a0059 +int string set_remind_time_message 0x7f0a005a +int string success_sdcard_export 0x7f0a005b +int string success_sync_account 0x7f0a005c +int string sync_progress_init_list 0x7f0a005d +int string sync_progress_login 0x7f0a005e +int string sync_progress_syncing 0x7f0a005f +int string ticker_cancel 0x7f0a0060 +int string ticker_fail 0x7f0a0061 +int string ticker_success 0x7f0a0062 +int string ticker_syncing 0x7f0a0063 +int string widget_havenot_content 0x7f0a0064 +int string widget_under_visit_mode 0x7f0a0065 +int style HighlightTextAppearancePrimary 0x7f0b0000 +int style HighlightTextAppearanceSecondary 0x7f0b0001 +int style NoteActionBarStyle 0x7f0b0002 +int style NoteTheme 0x7f0b0003 +int style TextAppearanceLarge 0x7f0b0004 +int style TextAppearanceMedium 0x7f0b0005 +int style TextAppearanceNormal 0x7f0b0006 +int style TextAppearancePrimaryItem 0x7f0b0007 +int style TextAppearanceSecondaryItem 0x7f0b0008 +int style TextAppearanceSuper 0x7f0b0009 +int style TextAppearanceUnderMenuIcon 0x7f0b000a +int xml preferences 0x7f0c0000 +int xml searchable 0x7f0c0001 +int xml widget_2x_info 0x7f0c0002 +int xml widget_4x_info 0x7f0c0003 diff --git a/src/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json new file mode 100644 index 0000000..1920ca8 --- /dev/null +++ b/src/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json @@ -0,0 +1 @@ +{"enableV1Signing":true,"enableV2Signing":false,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file diff --git a/src/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt new file mode 100644 index 0000000..7357ec6 --- /dev/null +++ b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -0,0 +1,8 @@ +net.micode.notes.app-pngs-0 D:\softwareengineering\minote\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\softwareengineering\minote\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 D:\softwareengineering\minote\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 D:\softwareengineering\minote\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 D:\softwareengineering\minote\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 D:\softwareengineering\minote\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 D:\softwareengineering\minote\app\src\debug\res +net.micode.notes.app-main-7 D:\softwareengineering\minote\app\src\main\res diff --git a/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt new file mode 100644 index 0000000..4461006 --- /dev/null +++ b/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -0,0 +1,283 @@ +net.micode.notes:xml/widget_4x_info = 0x7f0c0003 +net.micode.notes:xml/preferences = 0x7f0c0000 +net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 +net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 +net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 +net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 +net.micode.notes:string/widget_havenot_content = 0x7f0a0064 +net.micode.notes:string/ticker_syncing = 0x7f0a0063 +net.micode.notes:string/ticker_success = 0x7f0a0062 +net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 +net.micode.notes:string/ticker_cancel = 0x7f0a0060 +net.micode.notes:string/sync_progress_syncing = 0x7f0a005f +net.micode.notes:string/sync_progress_init_list = 0x7f0a005d +net.micode.notes:string/search_label = 0x7f0a0058 +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 +net.micode.notes:string/preferences_title = 0x7f0a0053 +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 +net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 +net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051 +net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050 +net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e +net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b +net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 +net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048 +net.micode.notes:string/preferences_account_summary = 0x7f0a0044 +net.micode.notes:string/success_sdcard_export = 0x7f0a005b +net.micode.notes:string/notelist_string_info = 0x7f0a0043 +net.micode.notes:string/notelist_menu_new = 0x7f0a0042 +net.micode.notes:string/notealert_ok = 0x7f0a0041 +net.micode.notes:string/notealert_enter = 0x7f0a0040 +net.micode.notes:string/note_link_web = 0x7f0a003f +net.micode.notes:string/note_link_tel = 0x7f0a003e +net.micode.notes:string/note_link_other = 0x7f0a003d +net.micode.notes:string/note_link_email = 0x7f0a003c +net.micode.notes:string/note_alert_expired = 0x7f0a003b +net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 +net.micode.notes:string/menu_sync = 0x7f0a0038 +net.micode.notes:string/menu_share = 0x7f0a0037 +net.micode.notes:string/menu_select_title = 0x7f0a0034 +net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 +net.micode.notes:string/menu_select_none = 0x7f0a0033 +net.micode.notes:string/menu_title_select_folder = 0x7f0a003a +net.micode.notes:string/menu_select_all = 0x7f0a0032 +net.micode.notes:string/menu_search = 0x7f0a0031 +net.micode.notes:string/menu_remove_remind = 0x7f0a0030 +net.micode.notes:string/menu_normal_mode = 0x7f0a002f +net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e +net.micode.notes:string/menu_move = 0x7f0a002d +net.micode.notes:string/menu_list_mode = 0x7f0a002c +net.micode.notes:string/menu_font_super = 0x7f0a002b +net.micode.notes:string/menu_font_small = 0x7f0a002a +net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 +net.micode.notes:string/menu_export_text = 0x7f0a0023 +net.micode.notes:string/menu_deselect_all = 0x7f0a0022 +net.micode.notes:string/menu_create_folder = 0x7f0a0020 +net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 +net.micode.notes:string/folder_exist = 0x7f0a0017 +net.micode.notes:string/hint_foler_name = 0x7f0a001d +net.micode.notes:string/format_date_ymd = 0x7f0a0018 +net.micode.notes:string/file_path = 0x7f0a0016 +net.micode.notes:string/set_remind_time_message = 0x7f0a005a +net.micode.notes:string/error_sync_network = 0x7f0a0013 +net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 +net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a +net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 +net.micode.notes:drawable/list_green_up = 0x7f040020 +net.micode.notes:string/call_record_folder_name = 0x7f0a0008 +net.micode.notes:drawable/new_note_normal = 0x7f040030 +net.micode.notes:string/button_delete = 0x7f0a0007 +net.micode.notes:string/app_widget2x2 = 0x7f0a0005 +net.micode.notes:string/menu_font_normal = 0x7f0a0028 +net.micode.notes:string/format_exported_file_location = 0x7f0a001a +net.micode.notes:raw/introduction = 0x7f090000 +net.micode.notes:string/delete_remind_time_message = 0x7f0a000b +net.micode.notes:dimen/text_font_size_super = 0x7f030004 +net.micode.notes:drawable/selected = 0x7f040035 +net.micode.notes:plurals/search_results_title = 0x7f080000 +net.micode.notes:menu/sub_folder = 0x7f070006 +net.micode.notes:menu/note_edit = 0x7f070002 +net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 +net.micode.notes:color/secondary_text_dark = 0x7f020001 +net.micode.notes:id/move = 0x7f05002e +net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 +net.micode.notes:menu/call_note_edit = 0x7f070000 +net.micode.notes:drawable/new_note_pressed = 0x7f040031 +net.micode.notes:id/iv_bg_blue = 0x7f05000e +net.micode.notes:layout/settings_header = 0x7f06000b +net.micode.notes:layout/note_list = 0x7f060008 +net.micode.notes:drawable/list_white_single = 0x7f040027 +net.micode.notes:layout/note_item = 0x7f060007 +net.micode.notes:xml/widget_2x_info = 0x7f0c0002 +net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 +net.micode.notes:layout/datetime_picker = 0x7f060002 +net.micode.notes:id/btn_new_note = 0x7f050004 +net.micode.notes:layout/note_list_footer = 0x7f06000a +net.micode.notes:id/widget_text = 0x7f050042 +net.micode.notes:id/tv_title_bar = 0x7f050040 +net.micode.notes:drawable/widget_2x_blue = 0x7f040038 +net.micode.notes:id/tv_time = 0x7f05003e +net.micode.notes:id/tv_name = 0x7f05003d +net.micode.notes:drawable/new_note = 0x7f04002f +net.micode.notes:id/sv_note_edit = 0x7f050039 +net.micode.notes:id/selection_menu = 0x7f050038 +net.micode.notes:string/error_sdcard_export = 0x7f0a000f +net.micode.notes:id/preference_sync_button = 0x7f050037 +net.micode.notes:layout/note_edit = 0x7f060005 +net.micode.notes:id/notes_list = 0x7f050035 +net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 +net.micode.notes:drawable/title_alert = 0x7f040036 +net.micode.notes:id/note_title = 0x7f050034 +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f +net.micode.notes:id/note_edit_view = 0x7f050032 +net.micode.notes:id/navigation_bar = 0x7f05002f +net.micode.notes:string/app_widget4x4 = 0x7f0a0006 +net.micode.notes:drawable/font_normal = 0x7f040011 +net.micode.notes:id/minute = 0x7f05002d +net.micode.notes:drawable/font_super = 0x7f040014 +net.micode.notes:id/menu_sync = 0x7f05002c +net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e +net.micode.notes:id/menu_share = 0x7f05002b +net.micode.notes:id/menu_setting = 0x7f05002a +net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 +net.micode.notes:id/menu_send_to_desktop = 0x7f050029 +net.micode.notes:id/menu_search = 0x7f050028 +net.micode.notes:drawable/list_green_down = 0x7f04001d +net.micode.notes:id/menu_new_note = 0x7f050027 +net.micode.notes:string/error_note_not_exist = 0x7f0a000e +net.micode.notes:id/menu_new_folder = 0x7f050026 +net.micode.notes:id/menu_list_mode = 0x7f050025 +net.micode.notes:id/iv_medium_select = 0x7f050019 +net.micode.notes:id/menu_export_text = 0x7f050023 +net.micode.notes:string/menu_folder_view = 0x7f0a0026 +net.micode.notes:id/menu_delete = 0x7f050021 +net.micode.notes:string/ticker_fail = 0x7f0a0061 +net.micode.notes:string/file_name_txt_format = 0x7f0a0015 +net.micode.notes:drawable/edit_blue = 0x7f040006 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036 +net.micode.notes:string/menu_font_size = 0x7f0a0029 +net.micode.notes:string/menu_alert = 0x7f0a001f +net.micode.notes:drawable/edit_title_yellow = 0x7f04000d +net.micode.notes:id/menu_alert = 0x7f050020 +net.micode.notes:string/success_sync_account = 0x7f0a005c +net.micode.notes:id/ll_font_super = 0x7f05001f +net.micode.notes:id/ll_font_small = 0x7f05001e +net.micode.notes:menu/call_record_folder = 0x7f070001 +net.micode.notes:id/ll_font_normal = 0x7f05001d +net.micode.notes:id/ll_font_large = 0x7f05001c +net.micode.notes:id/note_bg_color_selector = 0x7f050030 +net.micode.notes:drawable/search_result = 0x7f040034 +net.micode.notes:id/iv_super_select = 0x7f05001b +net.micode.notes:id/iv_bg_yellow = 0x7f050016 +net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 +net.micode.notes:id/iv_bg_white_select = 0x7f050015 +net.micode.notes:id/tv_alert_date = 0x7f05003a +net.micode.notes:dimen/text_font_size_large = 0x7f030000 +net.micode.notes:drawable/notification = 0x7f040033 +net.micode.notes:id/iv_bg_red = 0x7f050012 +net.micode.notes:string/menu_font_large = 0x7f0a0027 +net.micode.notes:drawable/widget_4x_blue = 0x7f04003d +net.micode.notes:id/iv_large_select = 0x7f050018 +net.micode.notes:id/widget_bg_image = 0x7f050041 +net.micode.notes:id/iv_bg_green_select = 0x7f050011 +net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a +net.micode.notes:drawable/menu_move = 0x7f04002e +net.micode.notes:drawable/widget_4x_white = 0x7f040040 +net.micode.notes:id/iv_bg_blue_select = 0x7f05000f +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c +net.micode.notes:id/font_size_selector = 0x7f05000b +net.micode.notes:id/et_edit_text = 0x7f050009 +net.micode.notes:id/et_foler_name = 0x7f05000a +net.micode.notes:drawable/edit_green = 0x7f040007 +net.micode.notes:layout/widget_4x = 0x7f06000d +net.micode.notes:string/search = 0x7f0a0056 +net.micode.notes:id/cb_edit_item = 0x7f050006 +net.micode.notes:id/btn_set_bg_color = 0x7f050005 +net.micode.notes:id/account_dialog_subtitle = 0x7f050000 +net.micode.notes:menu/note_list = 0x7f070003 +net.micode.notes:id/account_dialog_title = 0x7f050001 +net.micode.notes:id/iv_bg_green = 0x7f050010 +net.micode.notes:id/amPm = 0x7f050003 +net.micode.notes:drawable/widget_4x_green = 0x7f04003e +net.micode.notes:style/NoteTheme = 0x7f0b0003 +net.micode.notes:id/hour = 0x7f05000c +net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 +net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c +net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c +net.micode.notes:drawable/widget_2x_red = 0x7f04003a +net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a +net.micode.notes:id/delete = 0x7f050008 +net.micode.notes:drawable/widget_2x_green = 0x7f040039 +net.micode.notes:drawable/title_bar_bg = 0x7f040037 +net.micode.notes:drawable/menu_delete = 0x7f04002d +net.micode.notes:string/error_sync_internal = 0x7f0a0012 +net.micode.notes:drawable/list_green_single = 0x7f04001f +net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 +net.micode.notes:id/tv_modified_date = 0x7f05003c +net.micode.notes:drawable/list_blue_middle = 0x7f040018 +net.micode.notes:id/iv_small_select = 0x7f05001a +net.micode.notes:menu/note_list_options = 0x7f070005 +net.micode.notes:xml/searchable = 0x7f0c0001 +net.micode.notes:string/menu_folder_delete = 0x7f0a0025 +net.micode.notes:drawable/dropdown_icon = 0x7f040005 +net.micode.notes:id/date = 0x7f050007 +net.micode.notes:drawable/list_yellow_single = 0x7f04002b +net.micode.notes:drawable/list_red_up = 0x7f040024 +net.micode.notes:drawable/widget_4x_yellow = 0x7f040041 +net.micode.notes:drawable/list_yellow_middle = 0x7f04002a +net.micode.notes:id/tv_folder_name = 0x7f05003b +net.micode.notes:drawable/list_yellow_down = 0x7f040029 +net.micode.notes:string/format_folder_files_count = 0x7f0a001b +net.micode.notes:drawable/clock = 0x7f040003 +net.micode.notes:drawable/list_white_up = 0x7f040028 +net.micode.notes:drawable/edit_title_blue = 0x7f040009 +net.micode.notes:drawable/edit_red = 0x7f040008 +net.micode.notes:id/iv_alert_icon = 0x7f05000d +net.micode.notes:layout/dialog_edit_text = 0x7f060003 +net.micode.notes:string/preferences_account_title = 0x7f0a0045 +net.micode.notes:drawable/edit_white = 0x7f04000e +net.micode.notes:drawable/list_white_middle = 0x7f040026 +net.micode.notes:color/user_query_highlight = 0x7f020002 +net.micode.notes:drawable/list_white_down = 0x7f040025 +net.micode.notes:string/preferences_add_account = 0x7f0a0046 +net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 +net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047 +net.micode.notes:layout/widget_2x = 0x7f06000c +net.micode.notes:drawable/list_footer_bg = 0x7f04001c +net.micode.notes:string/alert_title_delete = 0x7f0a0003 +net.micode.notes:drawable/edit_title_green = 0x7f04000a +net.micode.notes:drawable/icon_app = 0x7f040015 +net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035 +net.micode.notes:drawable/list_red_single = 0x7f040023 +net.micode.notes:string/failed_sdcard_export = 0x7f0a0014 +net.micode.notes:drawable/widget_4x_red = 0x7f04003f +net.micode.notes:id/menu_delete_remind = 0x7f050022 +net.micode.notes:drawable/list_red_down = 0x7f040021 +net.micode.notes:drawable/list_red_middle = 0x7f040022 +net.micode.notes:id/iv_bg_white = 0x7f050014 +net.micode.notes:id/iv_bg_red_select = 0x7f050013 +net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d +net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 +net.micode.notes:drawable/list_blue_down = 0x7f040017 +net.micode.notes:id/action_select_all = 0x7f050002 +net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019 +net.micode.notes:drawable/font_small = 0x7f040013 +net.micode.notes:string/sync_progress_login = 0x7f0a005e +net.micode.notes:array/menu_share_ways = 0x7f010001 +net.micode.notes:drawable/widget_2x_white = 0x7f04003b +net.micode.notes:layout/folder_list_item = 0x7f060004 +net.micode.notes:layout/add_account_text = 0x7f060001 +net.micode.notes:id/tv_title = 0x7f05003f +net.micode.notes:color/primary_text_dark = 0x7f020000 +net.micode.notes:drawable/font_size_selector_bg = 0x7f040012 +net.micode.notes:drawable/list_blue_up = 0x7f04001a +net.micode.notes:string/search_setting_description = 0x7f0a0059 +net.micode.notes:drawable/list_blue_single = 0x7f040019 +net.micode.notes:drawable/font_large = 0x7f040010 +net.micode.notes:drawable/delete = 0x7f040004 +net.micode.notes:drawable/edit_yellow = 0x7f04000f +net.micode.notes:id/note_item = 0x7f050033 +net.micode.notes:drawable/edit_title_white = 0x7f04000c +net.micode.notes:id/note_edit_list = 0x7f050031 +net.micode.notes:drawable/edit_title_red = 0x7f04000b +net.micode.notes:string/menu_delete = 0x7f0a0021 +net.micode.notes:drawable/list_folder = 0x7f04001b +net.micode.notes:drawable/call_record = 0x7f040002 +net.micode.notes:string/search_hint = 0x7f0a0057 +net.micode.notes:id/menu_font_size = 0x7f050024 +net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 +net.micode.notes:drawable/list_yellow_up = 0x7f04002c +net.micode.notes:dimen/text_font_size_small = 0x7f030003 +net.micode.notes:dimen/text_font_size_normal = 0x7f030002 +net.micode.notes:drawable/list_green_middle = 0x7f04001e +net.micode.notes:drawable/list_background = 0x7f040016 +net.micode.notes:string/app_name = 0x7f0a0004 +net.micode.notes:menu/note_list_dropdown = 0x7f070004 +net.micode.notes:string/menu_setting = 0x7f0a0036 +net.micode.notes:dimen/text_font_size_medium = 0x7f030001 +net.micode.notes:layout/note_edit_list_item = 0x7f060006 +net.micode.notes:layout/account_dialog_title = 0x7f060000 +net.micode.notes:array/format_for_exported_note = 0x7f010000 diff --git a/src/app/build/intermediates/variant_model/debug/variant_model.json b/src/app/build/intermediates/variant_model/debug/variant_model.json new file mode 100644 index 0000000..fbfb74a Binary files /dev/null and b/src/app/build/intermediates/variant_model/debug/variant_model.json differ diff --git a/src/app/build/outputs/apk/debug/app-debug.apk b/src/app/build/outputs/apk/debug/app-debug.apk new file mode 100644 index 0000000..b70b3fa Binary files /dev/null and b/src/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/app/build/outputs/apk/debug/output-metadata.json b/src/app/build/outputs/apk/debug/output-metadata.json new file mode 100644 index 0000000..b2231b9 --- /dev/null +++ b/src/app/build/outputs/apk/debug/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "0.1", + "outputFile": "app-debug.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/src/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/app/build/outputs/logs/manifest-merger-debug-report.txt new file mode 100644 index 0000000..e0b9c0c --- /dev/null +++ b/src/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -0,0 +1,235 @@ +-- Merging decision tree log --- +manifest +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:18:1-150:12 + package + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:19:5-31 + INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml + INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml + android:versionName + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:21:5-30 + INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml + INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml + xmlns:android + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:18:11-69 + android:versionCode + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:20:5-28 + INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml + INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml +uses-sdk +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:23:5-44 + android:targetSdkVersion + INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:23:5-44 + INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml + android:minSdkVersion + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:23:15-41 + INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml + INJECTED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml +uses-permission#android.permission.WRITE_EXTERNAL_STORAGE +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:25:5-81 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:25:22-78 +uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:26:5-88 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:26:22-85 +uses-permission#android.permission.INTERNET +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:27:5-67 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:27:22-64 +uses-permission#android.permission.READ_CONTACTS +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:28:5-72 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:28:22-69 +uses-permission#android.permission.MANAGE_ACCOUNTS +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:29:5-74 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:29:22-71 +uses-permission#android.permission.AUTHENTICATE_ACCOUNTS +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:30:5-80 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:30:22-77 +uses-permission#android.permission.GET_ACCOUNTS +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:31:5-71 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:31:22-68 +uses-permission#android.permission.USE_CREDENTIALS +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:32:5-74 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:32:22-71 +uses-permission#android.permission.RECEIVE_BOOT_COMPLETED +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:33:5-81 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:33:22-78 +application +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:35:5-149:19 + android:label + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:37:9-41 + android:icon + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:36:9-42 +activity#net.micode.notes.ui.NotesListActivity +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:38:9-51:20 + android:label + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:41:13-45 + android:launchMode + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:42:13-43 + android:windowSoftInputMode + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:45:13-52 + android:uiOptions + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:44:13-57 + android:configChanges + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:40:13-74 + android:theme + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:43:13-45 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:39:13-49 +intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:47:13-50:29 +action#android.intent.action.MAIN +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:48:17-69 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:48:25-66 +category#android.intent.category.LAUNCHER +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:49:17-77 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:49:27-74 +activity#net.micode.notes.ui.NoteEditActivity +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:53:9-81:20 + android:launchMode + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:56:13-43 + android:configChanges + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:55:13-74 + android:theme + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:57:13-45 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:54:13-48 +intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:59:13-64:29 +action#android.intent.action.VIEW +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:60:17-69 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:60:25-66 +category#android.intent.category.DEFAULT +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:61:17-76 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:61:27-73 +data +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:62:17-78 + android:mimeType + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:62:23-75 +intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:66:13-71:29 +action#android.intent.action.INSERT_OR_EDIT +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:67:17-79 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:67:25-76 +intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:73:13-76:29 +action#android.intent.action.SEARCH +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:74:17-71 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:74:25-68 +meta-data#android.app.searchable +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:78:13-80:54 + android:resource + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:80:17-51 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:79:17-54 +provider#net.micode.notes.data.NotesProvider +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:83:9-86:43 + android:authorities + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:85:13-47 + android:multiprocess + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:86:13-40 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:84:13-63 +receiver#net.micode.notes.widget.NoteWidgetProvider_2x +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:88:9-100:20 + android:label + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:90:13-50 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:89:13-57 +intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:91:13-95:29 +action#android.appwidget.action.APPWIDGET_UPDATE +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:92:17-84 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:92:25-81 +action#android.appwidget.action.APPWIDGET_DELETED +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:93:17-85 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:93:25-82 +action#android.intent.action.PRIVACY_MODE_CHANGED +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:94:17-85 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:94:25-82 +meta-data#android.appwidget.provider +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:97:13-99:58 + android:resource + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:99:17-55 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:98:17-58 +receiver#net.micode.notes.widget.NoteWidgetProvider_4x +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:101:9-114:20 + android:label + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:103:13-50 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:102:13-57 +receiver#net.micode.notes.ui.AlarmInitReceiver +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:116:9-120:20 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:116:19-55 +intent-filter#action:name:android.intent.action.BOOT_COMPLETED +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:117:13-119:29 +action#android.intent.action.BOOT_COMPLETED +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:118:17-79 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:118:25-76 +receiver#net.micode.notes.ui.AlarmReceiver +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:122:9-125:20 + android:process + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:124:13-38 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:123:13-61 +activity#net.micode.notes.ui.AlarmAlertActivity +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:127:9-132:20 + android:label + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:129:13-45 + android:launchMode + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:130:13-48 + android:theme + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:131:13-75 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:128:13-50 +activity#net.micode.notes.ui.NotesPreferenceActivity +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:134:9-139:20 + android:label + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:136:13-54 + android:launchMode + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:137:13-43 + android:theme + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:138:13-60 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:135:13-71 +service#net.micode.notes.gtask.remote.GTaskSyncService +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:141:9-144:19 + android:exported + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:143:13-37 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:142:13-74 +meta-data#android.app.default_searchable +ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:146:9-148:52 + android:value + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:148:13-49 + android:name + ADDED from D:\softwareengineering\minote\app\src\main\AndroidManifest.xml:147:13-58 diff --git a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin new file mode 100644 index 0000000..b30f0a5 Binary files /dev/null and b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml similarity index 100% rename from app/src/main/AndroidManifest.xml rename to src/app/src/main/AndroidManifest.xml diff --git a/src/minotes/data/Contact.java b/src/app/src/main/java/net/micode/notes/data/Contact.java similarity index 74% rename from src/minotes/data/Contact.java rename to src/app/src/main/java/net/micode/notes/data/Contact.java index d97ac5d..34f332e 100644 --- a/src/minotes/data/Contact.java +++ b/src/app/src/main/java/net/micode/notes/data/Contact.java @@ -26,25 +26,34 @@ import android.util.Log; import java.util.HashMap; public class Contact { - private static HashMap sContactCache; - private static final String TAG = "Contact"; + private static HashMap sContactCache;// 用于缓存已查询过的联系人信息 + private static final String TAG = "Contact";// 用于日志输出的 TAG + // 查询电话号码与联系人名字匹配的过滤条件 private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" + " AND " + Data.RAW_CONTACT_ID + " IN " + "(SELECT raw_contact_id " + " FROM phone_lookup" + " WHERE min_match = '+')"; - + /* + * 获取电话号码对应的联系人名字 + * @param context 上下文 + * @param phoneNumber 电话号码 + * @return 电话号码对应的联系人名字 + */ public static String getContact(Context context, String phoneNumber) { + // 如果缓存为空,创建新的缓存对象 if(sContactCache == null) { sContactCache = new HashMap(); } + // 如果已经查询过该电话号码,直接返回缓存中的联系人名字 if(sContactCache.containsKey(phoneNumber)) { return sContactCache.get(phoneNumber); } + // 构造查询条件 String selection = CALLER_ID_SELECTION.replace("+", PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); Cursor cursor = context.getContentResolver().query( @@ -54,20 +63,22 @@ public class Contact { new String[] { phoneNumber }, null); + // 如果能够查询到联系人信息 if (cursor != null && cursor.moveToFirst()) { try { String name = cursor.getString(0); + // 将电话号码与联系人名字加入缓存中 sContactCache.put(phoneNumber, name); return name; } catch (IndexOutOfBoundsException e) { Log.e(TAG, " Cursor get string error " + e.toString()); return null; } finally { - cursor.close(); + cursor.close();// 关闭查询结果游标 } - } else { + } else {// 如果未能查询到联系人信息,输出日志并返回 null Log.d(TAG, "No contact matched with number:" + phoneNumber); return null; } } -} +} \ No newline at end of file diff --git a/app/src/main/java/net/micode/notes/data/Notes.java b/src/app/src/main/java/net/micode/notes/data/Notes.java similarity index 54% rename from app/src/main/java/net/micode/notes/data/Notes.java rename to src/app/src/main/java/net/micode/notes/data/Notes.java index f240604..e1fa12c 100644 --- a/app/src/main/java/net/micode/notes/data/Notes.java +++ b/src/app/src/main/java/net/micode/notes/data/Notes.java @@ -18,155 +18,165 @@ package net.micode.notes.data; import android.net.Uri; public class Notes { - public static final String AUTHORITY = "micode_notes"; - public static final String TAG = "Notes"; - public static final int TYPE_NOTE = 0; - public static final int TYPE_FOLDER = 1; - public static final int TYPE_SYSTEM = 2; + public static final String AUTHORITY = "micode_notes"; // 小米便签内容提供器的URI授权 + public static final String TAG = "Notes"; // 用于调试和日志记录的标签 + // 小米便签支持的三种类型 + public static final int TYPE_NOTE = 0; // 笔记 + public static final int TYPE_FOLDER = 1;// 文件夹 + public static final int TYPE_SYSTEM = 2;// 系统便签 /** * Following IDs are system folders' identifiers - * {@link Notes#ID_ROOT_FOLDER } is default folder - * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder - * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records + * {@link Notes#ID_ROOT_FOLDER } is default folder根文件夹 + * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder不属于文件夹的笔记就是临时笔记,存放于临时文件夹 + * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records存放通话记录的文件夹 */ - public static final int ID_ROOT_FOLDER = 0; - public static final int ID_TEMPARAY_FOLDER = -1; - public static final int ID_CALL_RECORD_FOLDER = -2; - public static final int ID_TRASH_FOLER = -3; - - public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date"; - public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id"; - public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id"; - public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type"; - public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id"; - public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date"; - - public static final int TYPE_WIDGET_INVALIDE = -1; - public static final int TYPE_WIDGET_2X = 0; - public static final int TYPE_WIDGET_4X = 1; + // 小米便签内置的四个特殊文件夹 + public static final int ID_ROOT_FOLDER = 0; // 根文件夹 + public static final int ID_TEMPARAY_FOLDER = -1; // 临时文件夹 + public static final int ID_CALL_RECORD_FOLDER = -2;// 通话记录文件夹 + public static final int ID_TRASH_FOLER = -3; // 回收站文件夹 + + public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date";//提醒时间的Intent extra key,用于设置笔记的提醒时间。 + public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id";//背景颜色的Intent extra key,用于设置笔记的背景颜色。 + public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id";//小部件ID的Intent extra key,用于设置小部件的ID。 + public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type";//小部件类型的Intent extra key,用于设置小部件的类型。 + public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id";//文件夹ID的Intent extra key,用于设置笔记所属的文件夹。 + public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date";//通话时间的Intent extra key,用于设置通话笔记的通话时间。 + + public static final int TYPE_WIDGET_INVALIDE = -1;//表示无效的小部件类型,其值为-1。 + public static final int TYPE_WIDGET_2X = 0;//表示2x2大小的小部件,其值为0。 + public static final int TYPE_WIDGET_4X = 1;//表示4x4大小的小部件,其值为1。 public static class DataConstants { - public static final String NOTE = TextNote.CONTENT_ITEM_TYPE; - public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE; - } + public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;//指定普通的文本笔记类型 + public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;//指定通话记录笔记类型 + }//定义笔记的类型 /** - * Uri to query all notes and folders + * Uri to query all notes and folders(查询所有的笔记和文件夹) */ public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note"); /** - * Uri to query data + * Uri to query data(查询数据) */ public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data"); public interface NoteColumns { /** - * The unique ID for a row + * The unique ID for a row(笔记或文件夹的唯一ID) *

Type: INTEGER (long)

*/ public static final String ID = "_id"; /** - * The parent's id for note or folder + * The parent's id for note or folder(笔记或文件夹的父级 ID) *

Type: INTEGER (long)

*/ public static final String PARENT_ID = "parent_id"; /** - * Created data for note or folder + * Created data for note or folder(笔记或文件夹的创建日期) *

Type: INTEGER (long)

*/ public static final String CREATED_DATE = "created_date"; /** - * Latest modified date + * Latest modified date(笔记或文件夹的最后修改日期) *

Type: INTEGER (long)

*/ public static final String MODIFIED_DATE = "modified_date"; /** - * Alert date + * Alert date(笔记或文件夹的提醒日期) *

Type: INTEGER (long)

*/ public static final String ALERTED_DATE = "alert_date"; /** - * Folder's name or text content of note + * Folder's name or text content of note(笔记或文件夹的文本内容或名称) *

Type: TEXT

*/ public static final String SNIPPET = "snippet"; /** - * Note's widget id + * Note's widget id(笔记所对应的桌面小部件 ID) *

Type: INTEGER (long)

*/ public static final String WIDGET_ID = "widget_id"; /** - * Note's widget type + * Note's widget type(笔记所对应的桌面小部件类型) *

Type: INTEGER (long)

*/ public static final String WIDGET_TYPE = "widget_type"; /** - * Note's background color's id + * Note's background color's id(笔记的背景颜色 ID) *

Type: INTEGER (long)

*/ public static final String BG_COLOR_ID = "bg_color_id"; /** * For text note, it doesn't has attachment, for multi-media - * note, it has at least one attachment + * note, it has at least one attachment(笔记是否包含附件) *

Type: INTEGER

*/ public static final String HAS_ATTACHMENT = "has_attachment"; /** - * Folder's count of notes + * Folder's count of notes(文件夹中笔记的数量) *

Type: INTEGER (long)

*/ public static final String NOTES_COUNT = "notes_count"; /** - * The file type: folder or note + * The file type: folder or note(笔记类型,可以是文件夹或笔记) *

Type: INTEGER

*/ public static final String TYPE = "type"; /** - * The last sync id + * The last sync id(最后同步 ID) *

Type: INTEGER (long)

*/ public static final String SYNC_ID = "sync_id"; /** - * Sign to indicate local modified or not + * Sign to indicate local modified or not(本地是否修改过) *

Type: INTEGER

*/ public static final String LOCAL_MODIFIED = "local_modified"; /** - * Original parent id before moving into temporary folder + * Original parent id before moving into temporary folder(移动到临时文件夹之前的原始父级 ID) *

Type : INTEGER

*/ public static final String ORIGIN_PARENT_ID = "origin_parent_id"; /** - * The gtask id + * The gtask id(Google 任务 ID) *

Type : TEXT

*/ public static final String GTASK_ID = "gtask_id"; /** - * The version code + * The version code(版本号) *

Type : INTEGER (long)

*/ public static final String VERSION = "version"; } + /** + * 这个接口DataColumns定义了笔记应用程序中的笔记数据表格中所有列的常量, + * 而NotesColumns定义了笔记应用程序中的笔记数据表格中的特定列的常量。 + * 因此,DataColumns更通用,而NotesColumns更具体。 + * NotesColumns接口包含笔记的标题、正文和颜色等属性, + * 而DataColumns接口包含笔记数据表格中的通用列。 + * 在许多情况下,这两个接口将一起使用。所以重复的常量就不在做解释了。 + */ public interface DataColumns { /** * The unique ID for a row @@ -175,13 +185,13 @@ public class Notes { public static final String ID = "_id"; /** - * The MIME type of the item represented by this row. + * The MIME type of the item represented by this row.(表示该行数据的MIME类型) *

Type: Text

*/ public static final String MIME_TYPE = "mime_type"; /** - * The reference id to note that this data belongs to + * The reference id to note that this data belongs to(表示该行数据所属的笔记的ID) *

Type: INTEGER (long)

*/ public static final String NOTE_ID = "note_id"; @@ -241,39 +251,54 @@ public class Notes { public static final String DATA5 = "data5"; } + /** + * 这是一个嵌套在NotePad类中的静态内部类TextNote。 + * 它实现了DataColumns接口,并定义了特定于文本笔记的常量和内容URI。 + * 与NotesColumns类似,TextNote还具有特定于文本笔记的常量, + * 例如MODE和MODE_CHECK_LIST,以及特定于文本笔记的内容类型和内容项类型常量。 + * 此外,TextNote还定义了用于访问文本笔记数据的内容URI,该URI指向ContentProvider的text_note表。 + */ public static final class TextNote implements DataColumns { /** * Mode to indicate the text in check list mode or not *

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

*/ - public static final String MODE = DATA1; + public static final String MODE = DATA1;//MODE字段表示文本笔记的模式,可以是正常模式或者是带有任务清单的模式,类型为整数。它使用了接口中的DATA1字段来表示其存储值的列名。 - public static final int MODE_CHECK_LIST = 1; + public static final int MODE_CHECK_LIST = 1;//MODE_CHECK_LIST字段表示任务清单模式的值,为1。 public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note"; - + //CONTENT_TYPE字段表示此数据的MIME类型,指示ContentProvider返回的数据类型。此处表示返回的是文本笔记列表。 public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note"; - + //CONTENT_ITEM_TYPE字段表示此数据的单个项目的MIME类型。 public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note"); - } + //CONTENT_URI字段表示此数据的URI地址。 + } + /** + * 这是一个嵌套在Notes类中的静态内部类CallNote,实现了DataColumns接口。 + * CallNote定义了一些特定于电话记录的字段,如CALL_DATE(通话日期)和PHONE_NUMBER(电话号码), + * 并定义了ContentProvider使用的MIME类型和URI。 + */ public static final class CallNote implements DataColumns { /** - * Call date for this record + * Call date for this record(记录通话日期) *

Type: INTEGER (long)

*/ public static final String CALL_DATE = DATA1; - + //表示通话日期的列名,数据类型为long,存储在DATA1列中。 /** - * Phone number for this record + * Phone number for this record(记录通话号码) *

Type: TEXT

*/ public static final String PHONE_NUMBER = DATA3; - + //表示电话号码的列名,数据类型为String,存储在DATA3列中。 public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note"; - + //单条通话记录,用于指定MIME类型的常量 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"); - } + //该类的内容URI,用于访问通话记录。 + } } diff --git a/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java similarity index 59% rename from app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java rename to src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index ffe5d57..d68f611 100644 --- a/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -26,7 +26,13 @@ import net.micode.notes.data.Notes.DataColumns; import net.micode.notes.data.Notes.DataConstants; import net.micode.notes.data.Notes.NoteColumns; - +/** + * 这段代码定义了一个名为NotesDatabaseHelper的类,继承自SQLiteOpenHelper。 + * 在该类中定义了数据库名(DB_NAME)和数据库版本号(DB_VERSION), + * 并定义了一个内部接口TABLE,该接口中定义了NOTE和DATA两个常量,分别表示数据库中的两个表名。 + * 其中SQLiteOpenHelper是Android提供的用于管理SQLite数据库的类, + * 它提供了创建、更新、打开和关闭数据库的方法,同时它也能够在不同的版本之间管理数据库的迁移。 + */ public class NotesDatabaseHelper extends SQLiteOpenHelper { private static final String DB_NAME = "note.db"; @@ -38,52 +44,64 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { public static final String DATA = "data"; } - private static final String TAG = "NotesDatabaseHelper"; - + private static final String TAG = "NotesDatabaseHelper";//这一行代码定义了一个名为TAG的字符串常量,用于在调试时作为日志标签。 + /** + * 定义了一个静态变量mInstance,类型是NotesDatabaseHelper,并且标记为static, + * 表示这个变量是属于类的而不是实例的。 + * 在类被加载的时候,这个变量会被创建。这个变量的作用是在整个应用中只创建一个NotesDatabaseHelper实例, + * 这样可以避免在多个地方重复创建数据库连接和实例,提高应用的性能和效率。 + */ private static NotesDatabaseHelper mInstance; - + /** + * 这段代码定义了两个字符串常量 CREATE_NOTE_TABLE_SQL 和 CREATE_DATA_TABLE_SQL, + * 分别用于创建两个数据库表格:note 和 data。 + */ private static final String CREATE_NOTE_TABLE_SQL = "CREATE TABLE " + TABLE.NOTE + "(" + - NoteColumns.ID + " INTEGER PRIMARY KEY," + - NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," + - NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + - 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.ID + " INTEGER PRIMARY KEY," +//笔记 ID,整数类型,作为主键 + NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +//父笔记 ID,整数类型,不为空,默认为 0 + NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +//提醒时间,整数类型,不为空,默认为 0 + NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," +//背景颜色 ID,整数类型,不为空,默认为 0 + NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +//创建时间,整数类型,不为空,默认为当前时间 + NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," +//是否有附件,整数类型,不为空,默认为 0 + NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +//修改时间,整数类型,不为空,默认为当前时间 + NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," +//笔记数量,整数类型,不为空,默认为 0 + NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," +//笔记概要,文本类型,不为空,默认为空字符串 + NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," +//笔记类型,整数类型,不为空,默认为 0 + NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," +//小部件 ID,整数类型,不为空,默认为 0 + NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +//小部件类型,整数类型,不为空,默认为 -1 + NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +//同步 ID,整数类型,不为空,默认为 0 + NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +//本地修改标识,整数类型,不为空,默认为 0 + NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +//原始父笔记 ID,整数类型,不为空,默认为 0 + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +//Google 任务 ID,文本类型,不为空,默认为空字符串 + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +//版本号,整数类型,不为空,默认为 0 ")"; private static final String CREATE_DATA_TABLE_SQL = "CREATE TABLE " + TABLE.DATA + "(" + - DataColumns.ID + " INTEGER PRIMARY KEY," + - DataColumns.MIME_TYPE + " TEXT NOT NULL," + - DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," + + DataColumns.ID + " INTEGER PRIMARY KEY," +//数据 ID,整数类型,作为主键 + DataColumns.MIME_TYPE + " TEXT NOT NULL," +//MIME 类型,文本类型,不为空 + DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +//笔记 ID,整数类型,不为空,默认为 0 + NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +//创建时间,整数类型,不为空,默认为当前时间 + NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +//修改时间,整数类型,不为空,默认为当前时间 + DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," +//数据内容,文本类型,不为空,默认为空字符串 DataColumns.DATA1 + " INTEGER," + DataColumns.DATA2 + " INTEGER," + DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + ")"; - + /** + * 这是一个用于创建数据库索引的SQL语句,它将创建一个名为"note_id_index"的索引, + * 该索引将位于"TABLE.DATA"表上,并将使用"DataColumns.NOTE_ID"列作为索引键。 + * 这个索引的目的是在查询该表时提高性能,尤其是在根据笔记ID进行过滤时。如果索引已经存在,则不会重复创建。 + */ private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = "CREATE INDEX IF NOT EXISTS note_id_index ON " + TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; - +//以下是各种 SQLite 数据库的触发器,用于更新数据库 /** - * Increase folder's note count when move note to the folder + * Increase folder's note count when move note to the folder(移动笔记到文件夹时增加文件夹的笔记数) */ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = "CREATE TRIGGER increase_folder_count_on_update "+ @@ -95,7 +113,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Decrease folder's note count when move note from folder + * Decrease folder's note count when move note from folder(从文件夹中移动笔记时减少文件夹笔记数) */ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = "CREATE TRIGGER decrease_folder_count_on_update " + @@ -108,7 +126,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Increase folder's note count when insert new note to the folder + * Increase folder's note count when insert new note to the folder(向文件夹插入新笔记时增加文件夹笔记计数) */ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = "CREATE TRIGGER increase_folder_count_on_insert " + @@ -120,7 +138,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Decrease folder's note count when delete note from the folder + * Decrease folder's note count when delete note from the folder(从文件夹中删除笔记时减少文件夹的笔记数) */ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = "CREATE TRIGGER decrease_folder_count_on_delete " + @@ -133,7 +151,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Update note's content when insert data with type {@link DataConstants#NOTE} + * Update note's content when insert data with type {@link DataConstants#NOTE}(插入DataConstants类型的数据时更新笔记的内容) */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = "CREATE TRIGGER update_note_content_on_insert " + @@ -146,7 +164,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Update note's content when data with {@link DataConstants#NOTE} type has changed + * Update note's content when data with {@link DataConstants#NOTE} type has changed(当DataConstants类型的数据发生更改时更新笔记的内容) */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = "CREATE TRIGGER update_note_content_on_update " + @@ -159,7 +177,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Update note's content when data with {@link DataConstants#NOTE} type has deleted + * Update note's content when data with {@link DataConstants#NOTE} type has deleted(删除DataConstants类型的数据时更新笔记的内容) */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = "CREATE TRIGGER update_note_content_on_delete " + @@ -172,7 +190,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Delete datas belong to note which has been deleted + * Delete datas belong to note which has been deleted(删除属于已删除笔记的数据) */ private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = "CREATE TRIGGER delete_data_on_delete " + @@ -183,7 +201,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Delete notes belong to folder which has been deleted + * Delete notes belong to folder which has been deleted(删除属于已删除文件夹的笔记) */ private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = "CREATE TRIGGER folder_delete_notes_on_delete " + @@ -194,7 +212,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " END"; /** - * Move notes belong to folder which has been moved to trash folder + * Move notes belong to folder which has been moved to trash folder(当一个文件夹被更新到废纸篓时,将其下所有笔记移动到废纸篓文件夹) */ private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = "CREATE TRIGGER folder_move_notes_on_trash " + @@ -206,10 +224,23 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + " END"; + /** + * 这段代码是一个构造函数,用于创建一个NotesDatabaseHelper对象。这个对象是用于管理SQLite数据库的帮助类,可以用来创建、升级和管理数据库表格。 + * 构造函数有四个参数,分别是: + * Context context:上下文对象,用于访问应用程序的资源和环境。 + * String DB_NAME:数据库的名称。 + * CursorFactory factory:用于创建游标对象的工厂类,如果为null,则使用默认工厂。 + * int DB_VERSION:数据库的版本号,用于管理数据库的升级。 + */ public NotesDatabaseHelper(Context context) { super(context, DB_NAME, null, DB_VERSION); } + /** + * 该方法负责在数据库中创建笔记表。 + * 它执行SQL语句CREATE_NOTE_TABLE_SQL来创建表,然后调用reCreateNoteTableTriggers方法来重新创建与笔记表关联的触发器。 + * 然后,它通过调用createSystemFolder方法创建一个系统文件夹,并使用Log.d方法记录一条消息,以指示笔记表已经创建。 + */ public void createNoteTable(SQLiteDatabase db) { db.execSQL(CREATE_NOTE_TABLE_SQL); reCreateNoteTableTriggers(db); @@ -217,6 +248,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { Log.d(TAG, "note table has been created"); } + /** + * 该方法用于重新创建笔记表相关的触发器。 + * 它首先使用DROP TRIGGER语句删除所有已有的触发器,然后使用CREATE TRIGGER语句重新创建它们。 + * 这个方法是为了在升级数据库时使用,以便更新旧版本的触发器。 + * @param db + */ private void reCreateNoteTableTriggers(SQLiteDatabase db) { db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update"); db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update"); @@ -235,18 +272,25 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER); } + /** + * 此方法在数据库中创建四个系统文件夹:通话记录文件夹、根文件夹、临时文件夹和废纸篓文件夹。 + * 该方法创建一个ContentValues对象,并为每个文件夹的ID和TYPE列添加值。 + * 然后,该方法使用SQLiteDatabase类的insert()方法将值插入笔记表中。 + * 系统文件夹的ID定义为Notes类中的常量。 + * 通话记录文件夹用于通话笔记,根文件夹是默认文件夹,临时文件夹用于移动笔记,废纸篓文件夹是移动已删除笔记的地方。 + */ private void createSystemFolder(SQLiteDatabase db) { ContentValues values = new ContentValues(); /** - * call record foler for call notes + * call record folder for call notes */ values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER); values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); db.insert(TABLE.NOTE, null, values); /** - * root folder which is default folder + * root folder which is default folder(mo */ values.clear(); values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER); @@ -270,6 +314,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.insert(TABLE.NOTE, null, values); } + /** + * 此方法在数据库中创建数据表,并设置必要的触发器和索引。 + * 它将SQLiteDatabase类的实例作为参数,用于执行SQL语句以创建数据表、重新创建触发器和创建索引。 + * CREATE_DATA_TABLE_SQL常量保存用于创建数据表的SQL语句,该语句定义列及其数据类型。 + * 调用recreatedatabletriggers()方法来删除和重新创建与数据表关联的触发器,这将确保触发器是最新的模式更改。 + * CREATE_DATA_NOTE_ID_INDEX_SQL常量保存SQL语句,用于在数据表的NOTE ID列上创建索引, + * 这提高了在NOTE ID列上联接数据和NOTE表的查询的性能。最后,打印一条日志消息,指示数据表已经创建。 + */ public void createDataTable(SQLiteDatabase db) { db.execSQL(CREATE_DATA_TABLE_SQL); reCreateDataTableTriggers(db); @@ -277,6 +329,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { Log.d(TAG, "data table has been created"); } + /** + * Recreatedatabletriggers方法用于删除用于在insert、update和delete上更新注释内容的现有触发器, + * 然后使用最新定义重新创建它们。 + * 以下是被删除的触发器:update_note_content_on_insert_content_on_update_note_content_on_delete, + * 这些是重新创建的触发器:data_update_note_content_on_insert_trigger data_update_trigger data_update_note_content_on_delete_trigger + * 这些触发器确保每当在数据表中创建、更新或删除笔记时,笔记表中的snippet字段都会被更新。 + */ private void reCreateDataTableTriggers(SQLiteDatabase db) { db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert"); db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update"); @@ -287,6 +346,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER); } + /** + * 这是一个静态方法,它返回NotesDatabaseHelper类的单个实例。 + * 它将Context对象作为参数,并检查NotesDatabaseHelper的实例是否为null。 + * 如果实例为null,则创建NotesDatabaseHelper类的新实例并返回它。如果实例已经存在,则返回现有实例。 + * 该方法是同步的,以确保一次只有一个线程可以访问它,避免任何并发问题。 + */ static synchronized NotesDatabaseHelper getInstance(Context context) { if (mInstance == null) { mInstance = new NotesDatabaseHelper(context); @@ -294,6 +359,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { return mInstance; } + /** + * 这是NotesDatabaseHelper类中onCreate()和onUpgrade()方法的实现。 + * 第一次创建数据库时调用onCreate()。 + * 它分别使用createNoteTable()和createDataTable()方法在数据库中创建Note和Data两个表。 + * 当数据库需要升级到较新版本时,将调用onUpgrade()。 + * 它首先检查数据库的旧版本,并执行必要的升级将其带到新版本。 + * 在这个实现中,有三个升级步骤:从版本1升级到版本2:这将删除现有的Note和数据表,并使用createNoteTable()和createDataTable()方法重新创建它们。 + * 从版本2升级到版本3:这将删除一些未使用的触发器,并向Note表添加一个新列gtask_id。它还为回收筒创建一个新的系统文件夹。 + * 从版本3升级到版本4:这将向注释表添加一个新的列版本。 + * 如果在升级步骤中删除了任何触发器,则调用reCreateNoteTableTriggers()和recreateDatabletriggers()方法来重新创建它们。 + * 如果升级因某种原因失败,将引发IllegalStateException。 + */ @Override public void onCreate(SQLiteDatabase db) { createNoteTable(db); diff --git a/src/minotes/data/NotesProvider.java b/src/app/src/main/java/net/micode/notes/data/NotesProvider.java similarity index 64% rename from src/minotes/data/NotesProvider.java rename to src/app/src/main/java/net/micode/notes/data/NotesProvider.java index edb0a60..e1e5eb2 100644 --- a/src/minotes/data/NotesProvider.java +++ b/src/app/src/main/java/net/micode/notes/data/NotesProvider.java @@ -35,20 +35,20 @@ import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.NotesDatabaseHelper.TABLE; -public class NotesProvider extends ContentProvider { - private static final UriMatcher mMatcher; +public class NotesProvider extends ContentProvider {//定义NotesProvider类,它继承自ContentProvider类 + private static final UriMatcher mMatcher;//声明UriMatcher实例 - private NotesDatabaseHelper mHelper; + private NotesDatabaseHelper mHelper;//声明NotesDatabaseHelper实例用于匹配Uri,以确定请求的类型,例如是否是请求特定的数据项,或者是否是搜索建议请求。 private static final String TAG = "NotesProvider"; - private static final int URI_NOTE = 1; - private static final int URI_NOTE_ITEM = 2; - private static final int URI_DATA = 3; - private static final int URI_DATA_ITEM = 4; + private static final int URI_NOTE = 1;//代表笔记数据的URI + private static final int URI_NOTE_ITEM = 2;//代表单个笔记数据的URI + private static final int URI_DATA = 3;//代表附加数据的URI + private static final int URI_DATA_ITEM = 4;//代表单个附加数据的URI - private static final int URI_SEARCH = 5; - private static final int URI_SEARCH_SUGGEST = 6; + private static final int URI_SEARCH = 5;//代表搜索请求的URI + private static final int URI_SEARCH_SUGGEST = 6;//代表搜索建议请求的URI static { mMatcher = new UriMatcher(UriMatcher.NO_MATCH); @@ -65,6 +65,7 @@ public class NotesProvider extends ContentProvider { * x'0A' represents the '\n' character in sqlite. For title and content in the search result, * we will trim '\n' and white space in order to show more information. */ + // 定义将在搜索结果中返回的列 private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + "," + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + "," + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + "," @@ -72,15 +73,15 @@ public class NotesProvider extends ContentProvider { + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + "," + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + "," + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA; - + // 定义将执行以检索搜索结果的搜索查询 private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION - + " FROM " + TABLE.NOTE - + " WHERE " + NoteColumns.SNIPPET + " LIKE ?" - + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER - + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; + + " FROM " + TABLE.NOTE// 指定要搜索的表 + + " WHERE " + NoteColumns.SNIPPET + " LIKE ?"// 指定搜索查询 + + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER// 排除在垃圾桶文件夹中的笔记 + + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE;// 排除非笔记条目 @Override - public boolean onCreate() { + public boolean onCreate() {// 获取数据库帮助类的实例 mHelper = NotesDatabaseHelper.getInstance(getContext()); return true; } @@ -88,30 +89,30 @@ public class NotesProvider extends ContentProvider { @Override public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { - Cursor c = null; + Cursor c = null;// 获取可读的数据库实例 SQLiteDatabase db = mHelper.getReadableDatabase(); String id = null; switch (mMatcher.match(uri)) { - case URI_NOTE: + case URI_NOTE:// 查询所有笔记 c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null, sortOrder); break; - case URI_NOTE_ITEM: + case URI_NOTE_ITEM:// 查询单个笔记 id = uri.getPathSegments().get(1); c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs, null, null, sortOrder); break; - case URI_DATA: + case URI_DATA:// 查询所有数据 c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null, sortOrder); break; - case URI_DATA_ITEM: + case URI_DATA_ITEM: // 查询单个数据 id = uri.getPathSegments().get(1); c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs, null, null, sortOrder); break; case URI_SEARCH: - case URI_SEARCH_SUGGEST: + case URI_SEARCH_SUGGEST:// 搜索笔记 if (sortOrder != null || projection != null) { throw new IllegalArgumentException( "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query"); @@ -130,7 +131,7 @@ public class NotesProvider extends ContentProvider { return null; } - try { + try {// 搜索所有匹配的笔记 searchString = String.format("%%%s%%", searchString); c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY, new String[] { searchString }); @@ -141,44 +142,44 @@ public class NotesProvider extends ContentProvider { default: throw new IllegalArgumentException("Unknown URI " + uri); } - if (c != null) { + if (c != null) {// 设置通知URI,以便在数据更改时通知观察者 c.setNotificationUri(getContext().getContentResolver(), uri); } return c; } @Override - public Uri insert(Uri uri, ContentValues values) { - SQLiteDatabase db = mHelper.getWritableDatabase(); - long dataId = 0, noteId = 0, insertedId = 0; + public Uri insert(Uri uri, ContentValues values) {// 获取可写的 SQLiteDatabase 对象 + SQLiteDatabase db = mHelper.getWritableDatabase();// 初始化三个变量,用于存储 note、data 和插入的记录的 ID + long dataId = 0, noteId = 0, insertedId = 0;// 根据传入的 Uri 进行匹配 switch (mMatcher.match(uri)) { - case URI_NOTE: + case URI_NOTE:// 向 TABLE.NOTE 表中插入记录,并获取插入的记录的 ID insertedId = noteId = db.insert(TABLE.NOTE, null, values); break; case URI_DATA: - if (values.containsKey(DataColumns.NOTE_ID)) { - noteId = values.getAsLong(DataColumns.NOTE_ID); + if (values.containsKey(DataColumns.NOTE_ID)) {// 如果 ContentValues 包含 DataColumns.NOTE_ID 列 + noteId = values.getAsLong(DataColumns.NOTE_ID);// 获取 DataColumns.NOTE_ID 列的值 } else { Log.d(TAG, "Wrong data format without note id:" + values.toString()); - } - insertedId = dataId = db.insert(TABLE.DATA, null, values); + }//打印日志 + insertedId = dataId = db.insert(TABLE.DATA, null, values);// 向 TABLE.DATA 表中插入记录,并获取插入的记录的 ID break; default: - throw new IllegalArgumentException("Unknown URI " + uri); + throw new IllegalArgumentException("Unknown URI " + uri);// 抛出 IllegalArgumentException 异常 } // Notify the note uri - if (noteId > 0) { + if (noteId > 0) { // 如果 noteId 大于 0,则通知 content resolver 对应的 Uri 对应的数据已经发生了变化 getContext().getContentResolver().notifyChange( ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null); } // Notify the data uri - if (dataId > 0) { + if (dataId > 0) {// 如果 dataId 大于 0,则通知 content resolver 对应的 Uri 对应的数据已经发生了变化 getContext().getContentResolver().notifyChange( ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null); } - return ContentUris.withAppendedId(uri, insertedId); + return ContentUris.withAppendedId(uri, insertedId); // 返回插入的记录的 Uri } @Override @@ -187,60 +188,62 @@ public class NotesProvider extends ContentProvider { String id = null; SQLiteDatabase db = mHelper.getWritableDatabase(); boolean deleteData = false; - switch (mMatcher.match(uri)) { - case URI_NOTE: - selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 "; - count = db.delete(TABLE.NOTE, selection, selectionArgs); + switch (mMatcher.match(uri)) {// 根据传入的 Uri 进行匹配 + case URI_NOTE:// 如果匹配到 URI_NOTE + selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 ";// 组合 selection 条件,以确保删除的是用户笔记,而不是系统文件夹 + count = db.delete(TABLE.NOTE, selection, selectionArgs);// 删除 TABLE.NOTE 表中符合条件的记录,并返回删除的数量 break; - case URI_NOTE_ITEM: - id = uri.getPathSegments().get(1); + case URI_NOTE_ITEM: // 如果匹配到 URI_NOTE_ITEM + id = uri.getPathSegments().get(1);// 获取 Uri 中的 ID /** * ID that smaller than 0 is system folder which is not allowed to * trash */ long noteId = Long.valueOf(id); - if (noteId <= 0) { + if (noteId <= 0) { // 如果 ID 小于等于 0,则直接跳出 switch 语句 break; } count = db.delete(TABLE.NOTE, - NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs); + NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs);// 删除 TABLE.NOTE 表中符合条件的记录,并返回删除的数量 break; - case URI_DATA: - count = db.delete(TABLE.DATA, selection, selectionArgs); + case URI_DATA:// 如果匹配到 URI_DATA + count = db.delete(TABLE.DATA, selection, selectionArgs);// 删除 TABLE.DATA 表中符合条件的记录,并返回删除的数量 deleteData = true; break; - case URI_DATA_ITEM: - id = uri.getPathSegments().get(1); + case URI_DATA_ITEM:// 如果匹配到 URI_DATA_ITEM + id = uri.getPathSegments().get(1); // 获取 Uri 中的 ID count = db.delete(TABLE.DATA, - DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs); + DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs);// 删除 TABLE.DATA 表中符合条件的记录,并返回删除的数量 deleteData = true; break; - default: - throw new IllegalArgumentException("Unknown URI " + uri); + default:// 如果无法匹配到 Uri + throw new IllegalArgumentException("Unknown URI " + uri);// 抛出 IllegalArgumentException 异常 } - if (count > 0) { + if (count > 0) {// 如果删除的数量大于 0 if (deleteData) { getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null); - } + } // 如果删除的是 TABLE.DATA 表中的记录,则通知 content resolver 对应的 Uri 对应的笔记数据已经发生了变化 getContext().getContentResolver().notifyChange(uri, null); } - return count; + return count;// 返回删除的数量 } @Override public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { - int count = 0; - String id = null; - SQLiteDatabase db = mHelper.getWritableDatabase(); - boolean updateData = false; - switch (mMatcher.match(uri)) { + int count = 0;// 受影响的行数 + String id = null;// 被更新的笔记或数据项的ID + SQLiteDatabase db = mHelper.getWritableDatabase();// 获取可写数据库 + boolean updateData = false;// 是否更新数据项 + + switch (mMatcher.match(uri)) {// 使用 switch 语句处理不同类型的 URI case URI_NOTE: - increaseNoteVersion(-1, selection, selectionArgs); - count = db.update(TABLE.NOTE, values, selection, selectionArgs); + increaseNoteVersion(-1, selection, selectionArgs);// 在更新前增加所有受影响的笔记的版本号 + count = db.update(TABLE.NOTE, values, selection, selectionArgs);// 更新数据库中的行并获取受影响的行数 + break; case URI_NOTE_ITEM: - id = uri.getPathSegments().get(1); - increaseNoteVersion(Long.valueOf(id), selection, selectionArgs); + id = uri.getPathSegments().get(1);// 在更新前增加笔记的版本号 + increaseNoteVersion(Long.valueOf(id), selection, selectionArgs); // 更新数据库中的行并获取受影响的行数 count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs); break; @@ -257,20 +260,20 @@ public class NotesProvider extends ContentProvider { default: throw new IllegalArgumentException("Unknown URI " + uri); } - + // 如果有行被更新,通知已注册的 ContentObserver if (count > 0) { if (updateData) { getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null); } getContext().getContentResolver().notifyChange(uri, null); } - return count; + return count; // 返回受影响的行数 } - + // 辅助方法,如果传递了 selection 参数,则将其添加到 SQL 查询中 private String parseSelection(String selection) { return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""); } - + // 辅助方法,在更新笔记之前增加其版本号 private void increaseNoteVersion(long id, String selection, String[] selectionArgs) { StringBuilder sql = new StringBuilder(120); sql.append("UPDATE "); @@ -278,7 +281,7 @@ public class NotesProvider extends ContentProvider { sql.append(" SET "); sql.append(NoteColumns.VERSION); sql.append("=" + NoteColumns.VERSION + "+1 "); - + // 如果传递了 ID 或 selection 参数,则将其添加到 SQL 查询中 if (id > 0 || !TextUtils.isEmpty(selection)) { sql.append(" WHERE "); } @@ -293,12 +296,12 @@ public class NotesProvider extends ContentProvider { sql.append(selectString); } - mHelper.getWritableDatabase().execSQL(sql.toString()); + mHelper.getWritableDatabase().execSQL(sql.toString());// 执行 SQL 查询以更新笔记的版本号 } @Override public String getType(Uri uri) { - // TODO Auto-generated method stub + // TODO Auto-generated method stub这是一个待办事项,需要根据 ContentProvider需求添加适当的 MIME类型。 return null; } diff --git a/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/app/src/main/java/net/micode/notes/gtask/data/MetaData.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/MetaData.java rename to src/app/src/main/java/net/micode/notes/gtask/data/MetaData.java diff --git a/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/app/src/main/java/net/micode/notes/gtask/data/Node.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/Node.java rename to src/app/src/main/java/net/micode/notes/gtask/data/Node.java diff --git a/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/SqlData.java rename to src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java diff --git a/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/SqlNote.java rename to src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java diff --git a/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/app/src/main/java/net/micode/notes/gtask/data/Task.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/Task.java rename to src/app/src/main/java/net/micode/notes/gtask/data/Task.java diff --git a/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/app/src/main/java/net/micode/notes/gtask/data/TaskList.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/TaskList.java rename to src/app/src/main/java/net/micode/notes/gtask/data/TaskList.java diff --git a/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java rename to src/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java diff --git a/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java rename to src/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java rename to src/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java rename to src/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java rename to src/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java rename to src/app/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/app/src/main/java/net/micode/notes/model/Note.java new file mode 100644 index 0000000..e4e7339 --- /dev/null +++ b/src/app/src/main/java/net/micode/notes/model/Note.java @@ -0,0 +1,268 @@ +/* + * 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.model; +import android.content.ContentProviderOperation; +import android.content.ContentProviderResult; +import android.content.ContentUris; +import android.content.ContentValues; +import android.content.Context; +import android.content.OperationApplicationException; +import android.net.Uri; +import android.os.RemoteException; +import android.util.Log; + +import net.micode.notes.data.Notes; +import net.micode.notes.data.Notes.CallNote; +import net.micode.notes.data.Notes.DataColumns; +import net.micode.notes.data.Notes.NoteColumns; +import net.micode.notes.data.Notes.TextNote; + +import java.util.ArrayList; + + +public class Note { + private ContentValues mNoteDiffValues;//声明了一个私有成员变量mNoteDiffValues,用于存储笔记的差异数据 + private NoteData mNoteData; + private static final String TAG = "Note";// 定义了一个静态常量TAG,用于在日志输出时标记日志来源 + /** + * Create a new note id for adding a new note to databases为添加新笔记到数据库中创建一个新的笔记id + */ + public static synchronized long getNewNoteId(Context context, long folderId) { + // Create a new note in the database(在数据库中创建一个新笔记) + ContentValues values = new ContentValues();// 创建一个ContentValues对象,用于存储要添加的笔记数据 + long createdTime = System.currentTimeMillis(); // 获取当前时间戳,作为笔记的创建时间和修改时间 + values.put(NoteColumns.CREATED_DATE, createdTime);// 将笔记的创建时间存储到ContentValues对象中 + values.put(NoteColumns.MODIFIED_DATE, createdTime);// 将笔记的修改时间存储到ContentValues对象中 + values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);// 将笔记的类型设置为“普通便签” + values.put(NoteColumns.LOCAL_MODIFIED, 1);// 将笔记的“本地修改”标志设置为“已修改” + values.put(NoteColumns.PARENT_ID, folderId);// 将笔记的父文件夹id存储到ContentValues对象中 + Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);// 将ContentValues对象插入到数据库中,返回插入的笔记的Uri地址 + + long noteId = 0; // 定义一个变量,用于存储新创建的笔记id + try { + noteId = Long.valueOf(uri.getPathSegments().get(1)); // 从Uri地址中提取新创建的笔记id + } catch (NumberFormatException e) { // 如果提取失败,记录错误日志 + Log.e(TAG, "Get note id error :" + e.toString()); + noteId = 0; + } + if (noteId == -1) {// 如果便签id异常,抛出异常 + throw new IllegalStateException("Wrong note id:" + noteId); + } + return noteId;// 返回新创建的便签id + } + + public Note() { + mNoteDiffValues = new ContentValues();// 创建一个ContentValues对象,用于存储便签的差异数据 + mNoteData = new NoteData();// 创建一个NoteData对象,用于存储便签的详细数据 + } + + public void setNoteValue(String key, String value) { + mNoteDiffValues.put(key, value);// 将便签的属性名和属性值存储到ContentValues对象中 + mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);// 将便签的“本地修改”标志设置为“已修改” + mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); // 将便签的修改时间设置为当前时间戳 + } + + public void setTextData(String key, String value) { + mNoteData.setTextData(key, value); + }//将便签的文本数据(如标题、正文等)存储到NoteData对象中 + + public void setTextDataId(long id) { + mNoteData.setTextDataId(id); + }// 将便签的文本数据的id存储到NoteData对象中 + + public long getTextDataId() { + return mNoteData.mTextDataId; + }// 返回便签的文本数据的id + + public void setCallDataId(long id) { + mNoteData.setCallDataId(id); + }// 将便签的通讯数据的id存储到NoteData对象中 + + public void setCallData(String key, String value) { + mNoteData.setCallData(key, value); + }// 将便签的通讯数据(如联系人、电话号码等)存储到NoteData对象中 + + public boolean isLocalModified() { + return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified(); + }// 检查便签是否被修改过,如果便签的差异数据或详细数据被修改过,则返回true,否则返回false。 + + public boolean syncNote(Context context, long noteId) { + if (noteId <= 0) { + throw new IllegalArgumentException("Wrong note id:" + noteId); + }// 如果便签id异常,抛出异常 + + if (!isLocalModified()) { + return true; + }// 如果便签没有被修改,直接返回true + + /** + * In theory, once data changed, the note should be updated on {@link NoteColumns#LOCAL_MODIFIED} and + * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the + * note data info(理论上,一旦数据发生更改,应该更新{@link NoteColumns#LOCAL_MODIFIED}和{@link NoteColumns#MODIFIED_DATE}。 + * 为了数据安全,虽然更新笔记失败,但仍然会更新笔记数据) + */ + if (context.getContentResolver().update(// 更新便签数据 + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null, + null) == 0) { + Log.e(TAG, "Update note error, should not happen");// 如果更新失败,记录错误日志 + // Do not return, fall through没有返回就是失败 + } + mNoteDiffValues.clear();// 清空便签的差异数据 + + if (mNoteData.isLocalModified()// 更新便签的详细数据 + && (mNoteData.pushIntoContentResolver(context, noteId) == null)) { + return false;// 如果更新失败,返回false + } + + return true;// 更新成功,返回true + } + + private class NoteData {// 定义私有字段 + private long mTextDataId;// 文本数据的 ID + + private ContentValues mTextDataValues;// 文本数据的 ContentValues 对象 + + private long mCallDataId;// 通话数据的 ID + + private ContentValues mCallDataValues;// 通话数据的 ContentValues 对象 + + private static final String TAG = "NoteData";// 定义静态常量TAG + + public NoteData() {// 定义构造函数 + mTextDataValues = new ContentValues(); // 初始化文本数据的 ContentValues 对象 + mCallDataValues = new ContentValues();// 初始化通话数据的 ContentValues 对象 + mTextDataId = 0;// 初始化文本数据的 ID + mCallDataId = 0;// 初始化通话数据的 ID + } + + boolean isLocalModified() {// 定义方法 isLocalModified,判断数据是否被修改过 + return mTextDataValues.size() > 0 || mCallDataValues.size() > 0; + } + + void setTextDataId(long id) { // 定义方法 setTextDataId,设置文本数据的 ID + if(id <= 0) { + throw new IllegalArgumentException("Text data id should larger than 0"); + } + mTextDataId = id; + } + + void setCallDataId(long id) {// 定义方法 setCallDataId,设置通话数据的 ID + if (id <= 0) { + throw new IllegalArgumentException("Call data id should larger than 0"); + } + mCallDataId = id; + } + + void setCallData(String key, String value) {// 定义方法 setCallData,用于设置通话数据的键值对 + mCallDataValues.put(key, value);// 将键值对存储在 mCallDataValues 中 + mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);// 标记数据已被修改 + mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); // 记录修改时间 + } + + void setTextData(String key, String value) {// 定义方法 setTextData,用于设置文本数据的键值对 + mTextDataValues.put(key, value);// 将键值对存储在 mTextDataValues 中 + mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); // 标记数据已被修改 + mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());// 记录修改时间 + } + + /** + * 这段代码定义了一个方法 pushIntoContentResolver,用于将笔记数据保存到 ContentProvider 中。 + * 该方法接受两个参数:context 表示上下文,noteId 表示笔记的 ID。 + * 运行时首先会检查传入的参数是否合法,如果 noteId 小于等于 0,则会抛出非法参数异常。 + * 接下来,该方法会创建一个 ContentProviderOperation 列表,用于存储要执行的操作。 + * 然后,该方法会检查 mTextDataValues 和 mCallDataValues 这两个成员变量中是否存储了文本数据和通话数据, + * 如果有,则会将它们保存到 ContentProvider 中。 + * 如果 mTextDataId 或 mCallDataId 不为 0,则会执行更新操作,否则会执行插入操作。 + * 最后,如果操作列表中有操作,则会通过 ContentResolver 将操作批量提交到 ContentProvider 中。 + * 如果提交操作成功,则会返回笔记的 URI,否则会返回 null。 + * @param context + * @param noteId + * @return + */ + Uri pushIntoContentResolver(Context context, long noteId) { + /** + * Check for safety(检查是否安全) + */ + if (noteId <= 0) { + throw new IllegalArgumentException("Wrong note id:" + noteId); + } + + ArrayList operationList = new ArrayList(); + ContentProviderOperation.Builder builder = null;// 创建一个ContentProviderOperation列表 + + if(mTextDataValues.size() > 0) {// 如果有文本数据需要更新或添加 + mTextDataValues.put(DataColumns.NOTE_ID, noteId);// 设置文本数据的noteId + if (mTextDataId == 0) { + mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE);// 如果文本数据的id为0,表示需要添加新的文本数据 + Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI, + mTextDataValues);// 插入新的文本数据到数据表中 + try {// 从插入结果中获取新插入数据的id + setTextDataId(Long.valueOf(uri.getPathSegments().get(1))); + } catch (NumberFormatException e) { + Log.e(TAG, "Insert new text data fail with noteId" + noteId); + mTextDataValues.clear(); + return null;// 插入失败,清空数据并返回null + } + } else { + builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( + Notes.CONTENT_DATA_URI, mTextDataId)); + builder.withValues(mTextDataValues); + operationList.add(builder.build()); + } // 如果文本数据的id不为0,表示需要更新已有的文本数据 + mTextDataValues.clear();// 清空文本数据的值 + } + + if(mCallDataValues.size() > 0) {// 如果有电话数据需要更新或添加 + mCallDataValues.put(DataColumns.NOTE_ID, noteId);// 设置电话数据的noteId + if (mCallDataId == 0) {// 如果电话数据的id为0,表示需要添加新的电话数据 + mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE); + Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI, + mCallDataValues);// 插入新的电话数据到数据表中 + try { // 从插入结果中获取新插入数据的id + setCallDataId(Long.valueOf(uri.getPathSegments().get(1))); + } catch (NumberFormatException e) { + Log.e(TAG, "Insert new call data fail with noteId" + noteId); + mCallDataValues.clear(); + return null;// 插入失败,清空数据并返回null + } + } else { + builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( + Notes.CONTENT_DATA_URI, mCallDataId)); + builder.withValues(mCallDataValues); + operationList.add(builder.build()); + } // 如果电话数据的id不为0,表示需要更新已有的电话数据 + mCallDataValues.clear(); // 清空电话数据的值 + } + + if (operationList.size() > 0) { // 如果有操作需要执行 + try {// 执行操作并获取结果 + ContentProviderResult[] results = context.getContentResolver().applyBatch( + Notes.AUTHORITY, operationList);// 返回操作结果的Uri + return (results == null || results.length == 0 || results[0] == null) ? null + : ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId); + } catch (RemoteException e) { + Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); + return null; // 操作失败,返回null并记录日志 + } catch (OperationApplicationException e) { + Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); + return null;// 操作失败,返回null并记录日志 + } + } + return null; + } + } +} diff --git a/src/minotes/model/WorkingNote.java b/src/app/src/main/java/net/micode/notes/model/WorkingNote.java similarity index 93% rename from src/minotes/model/WorkingNote.java rename to src/app/src/main/java/net/micode/notes/model/WorkingNote.java index be081e4..fbb91fe 100644 --- a/src/minotes/model/WorkingNote.java +++ b/src/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -33,39 +33,39 @@ import net.micode.notes.tool.ResourceParser.NoteBgResources; public class WorkingNote { - // Note for the working note - private Note mNote; - // Note Id + // Note for the working note(工作笔记类) + private Note mNote;// 笔记 + // Note Id/笔记ID private long mNoteId; - // Note content + // Note content笔记内容 private String mContent; - // Note mode + // Note mode笔记模式 private int mMode; - private long mAlertDate; + private long mAlertDate;// 提醒日期 - private long mModifiedDate; + private long mModifiedDate;// 修改日期 - private int mBgColorId; + private int mBgColorId;// 背景颜色ID - private int mWidgetId; + private int mWidgetId;// 小部件ID - private int mWidgetType; + private int mWidgetType;// 小部件类型 - private long mFolderId; + private long mFolderId;// 文件夹ID - private Context mContext; + private Context mContext;// 上下文 - private static final String TAG = "WorkingNote"; + private static final String TAG = "WorkingNote";// 标签 - private boolean mIsDeleted; + private boolean mIsDeleted;// 是否已删除 - private NoteSettingChangedListener mNoteSettingStatusListener; + private NoteSettingChangedListener mNoteSettingStatusListener;// 笔记设置改变监听器 - public static final String[] DATA_PROJECTION = new String[] { - DataColumns.ID, - DataColumns.CONTENT, - DataColumns.MIME_TYPE, + public static final String[] DATA_PROJECTION = new String[] {// 查询数据时需要返回的列名数组 + DataColumns.ID,// ID列 + DataColumns.CONTENT, // 内容列 + DataColumns.MIME_TYPE, // MIME类型列 DataColumns.DATA1, DataColumns.DATA2, DataColumns.DATA3, diff --git a/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/app/src/main/java/net/micode/notes/tool/BackupUtils.java similarity index 66% rename from app/src/main/java/net/micode/notes/tool/BackupUtils.java rename to src/app/src/main/java/net/micode/notes/tool/BackupUtils.java index 39f6ec4..8dbec2e 100644 --- a/app/src/main/java/net/micode/notes/tool/BackupUtils.java +++ b/src/app/src/main/java/net/micode/notes/tool/BackupUtils.java @@ -47,23 +47,28 @@ public class BackupUtils { } return sInstance; } +/* `TAG` 是一个 String 常量,用于标识日志输出的 tag。 + `sInstance` 是一个静态变量,用于存储单例实例。 + `getInstance()` 是一个静态方法,通过传入一个 `Context` 参数获取 `BackupUtils` 的单例实例。 + 这里使用了双重检查锁定来确保线程安全。 +*/ /** - * Following states are signs to represents backup or restore + * Following states are signs to represents backup or restore(以下是表示备份或恢复的符号) * status */ // Currently, the sdcard is not mounted public static final int STATE_SD_CARD_UNMOUONTED = 0; - // The backup file not exist + // The backup file not exist(备份文件不存在) public static final int STATE_BACKUP_FILE_NOT_EXIST = 1; - // The data is not well formated, may be changed by other programs + // The data is not well formated, may be changed by other programs(数据格式不正确可能被其他程序更改) public static final int STATE_DATA_DESTROIED = 2; - // Some run-time exception which causes restore or backup fails + // Some run-time exception which causes restore or backup fails(导致备份或还原失败的默写运行异常) public static final int STATE_SYSTEM_ERROR = 3; - // Backup or restore success + // Backup or restore success(备份或还原成功) public static final int STATE_SUCCESS = 4; - private TextExport mTextExport; + private TextExport mTextExport;//实例化对象 private BackupUtils(Context context) { mTextExport = new TextExport(context); @@ -75,15 +80,15 @@ public class BackupUtils { public int exportToText() { return mTextExport.exportToText(); - } + }//这是一个 public 方法,用于将数据导出为文本,并返回一个整数值。 public String getExportedTextFileName() { return mTextExport.mFileName; - } + }//这是一个 public 方法,用于获取导出的文本文件名。 public String getExportedTextFileDir() { return mTextExport.mFileDirectory; - } + }//这是一个 public 方法,用于获取导出的文本文件所在的目录。 private static class TextExport { private static final String[] NOTE_PROJECTION = { @@ -91,7 +96,8 @@ public class BackupUtils { NoteColumns.MODIFIED_DATE, NoteColumns.SNIPPET, NoteColumns.TYPE - }; + };//这是一个私有的静态内部类,用于完成数据导出的操作。 + private static final int NOTE_COLUMN_ID = 0; @@ -115,32 +121,37 @@ public class BackupUtils { private static final int DATA_COLUMN_CALL_DATE = 2; private static final int DATA_COLUMN_PHONE_NUMBER = 4; + // 定义了多个常量,用于操作笔记和数据的列索引 private final String [] TEXT_FORMAT; private static final int FORMAT_FOLDER_NAME = 0; private static final int FORMAT_NOTE_DATE = 1; private static final int FORMAT_NOTE_CONTENT = 2; + // 定义了一个字符串数组 TEXT_FORMAT,其中存储了导出笔记时的文件格式 private Context mContext; private String mFileName; private String mFileDirectory; + // 定义了 Context mContext、String mFileName、String mFileDirectory 三个变量 + // mContext 存储了当前上下文,mFileName 存储了文件名,mFileDirectory 存储了文件夹路径 public TextExport(Context context) { TEXT_FORMAT = context.getResources().getStringArray(R.array.format_for_exported_note); mContext = context; mFileName = ""; - mFileDirectory = ""; + mFileDirectory = "";// 构造函数,初始化了 TEXT_FORMAT、mContext、mFileName 和 mFileDirectory } private String getFormat(int id) { return TEXT_FORMAT[id]; - } + }// getFormat 方法返回 TEXT_FORMAT 数组中指定 id 的字符串 /** * Export the folder identified by folder id to text + * (exportFolderToText 方法用于将指定文件夹下的笔记导出到文本中) */ private void exportFolderToText(String folderId, PrintStream ps) { - // Query notes belong to this folder + // Query notes belong to this folder// 查询属于该文件夹的笔记 Cursor notesCursor = mContext.getContentResolver().query(Notes.CONTENT_NOTE_URI, NOTE_PROJECTION, NoteColumns.PARENT_ID + "=?", new String[] { folderId @@ -149,11 +160,11 @@ public class BackupUtils { if (notesCursor != null) { if (notesCursor.moveToFirst()) { do { - // Print note's last modified date + // Print note's last modified date // 输出笔记的最后修改日期 ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format( mContext.getString(R.string.format_datetime_mdhm), notesCursor.getLong(NOTE_COLUMN_MODIFIED_DATE)))); - // Query data belong to this note + // Query data belong to this note // 查询属于该笔记的数据 String noteId = notesCursor.getString(NOTE_COLUMN_ID); exportNoteToText(noteId, ps); } while (notesCursor.moveToNext()); @@ -169,14 +180,14 @@ public class BackupUtils { Cursor dataCursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] { noteId - }, null); + }, null);// exportNoteToText 方法用于将指定笔记的数据导出到文本中 if (dataCursor != null) { if (dataCursor.moveToFirst()) { do { String mimeType = dataCursor.getString(DATA_COLUMN_MIME_TYPE); if (DataConstants.CALL_NOTE.equals(mimeType)) { - // Print phone number + // Print phone number // 输出电话号码 String phoneNumber = dataCursor.getString(DATA_COLUMN_PHONE_NUMBER); long callDate = dataCursor.getLong(DATA_COLUMN_CALL_DATE); String location = dataCursor.getString(DATA_COLUMN_CONTENT); @@ -185,11 +196,11 @@ public class BackupUtils { ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), phoneNumber)); } - // Print call date + // Print call date// 输出通话日期 ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), DateFormat .format(mContext.getString(R.string.format_datetime_mdhm), callDate))); - // Print call attachment location + // Print call attachment location // 输出通话附件位置 if (!TextUtils.isEmpty(location)) { ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), location)); @@ -205,7 +216,7 @@ public class BackupUtils { } dataCursor.close(); } - // print a line separator between note + // print a line separator between note// 在导出每个笔记后输出一个分隔符 try { ps.write(new byte[] { Character.LINE_SEPARATOR, Character.LETTER_NUMBER @@ -222,14 +233,20 @@ public class BackupUtils { if (!externalStorageAvailable()) { Log.d(TAG, "Media was not mounted"); return STATE_SD_CARD_UNMOUONTED; - } + }/*这段代码的作用是向指定的PrintStream对象中写入一个分隔符。它使用了Java中的byte数组,其中包含了两个特殊的字符:Character.LINE_SEPARATOR和Character.LETTER_NUMBER。 + + Character.LINE_SEPARATOR表示平台的行分隔符,其值因平台而异。例如,在Windows中,它的值是"\r\n",在Unix/Linux中,它的值是"\n"。 + + Character.LETTER_NUMBER是一个没有实际意义的字符,它只是被用来作为分隔符的一部分。 + + 当这个byte数组被写入PrintStream对象时,它会在文本中插入一个分隔符,以便在文本中区分不同的笔记。如果写入过程中发生IOException,那么会在Logcat中输出相应的错误信息。*/ PrintStream ps = getExportToTextPrintStream(); if (ps == null) { Log.e(TAG, "get print stream error"); return STATE_SYSTEM_ERROR; - } - // First export folder and its notes + }//这段代码中的 getExportToTextPrintStream() 是一个自定义方法,它返回一个 PrintStream 对象,该对象用于将笔记数据导出到文本文件中 + // First export folder and its notes//“首先导出文件夹及其包含的笔记” Cursor folderCursor = mContext.getContentResolver().query( Notes.CONTENT_NOTE_URI, NOTE_PROJECTION, @@ -255,7 +272,11 @@ public class BackupUtils { } while (folderCursor.moveToNext()); } folderCursor.close(); - } + }/*这段代码的作用是导出所有文件夹及其包含的笔记。 + + 首先,通过调用 ContentResolver 的 query() 方法查询所有的文件夹和 Call Record 文件夹,同时排除回收站中的笔记,将结果保存在 Cursor 对象 folderCursor 中。 + + 接着,通过遍历 folderCursor 中的所有记录,获取每个文件夹的名称和ID,并将其写入到输出流 ps 中。如果当前文件夹是 Call Record 文件夹,则使用字符串资源文件中的值作为文件夹的名称*/ // Export notes in root's folder Cursor noteCursor = mContext.getContentResolver().query( @@ -280,7 +301,13 @@ public class BackupUtils { ps.close(); return STATE_SUCCESS; - } + }/*这段代码的作用是导出根文件夹中的所有笔记。 + + 首先,通过调用 ContentResolver 的 query() 方法查询根文件夹中的所有笔记,并将结果保存在 Cursor 对象 noteCursor 中。 + + 接着,通过遍历 noteCursor 中的所有记录,获取每个笔记的修改日期,并将其写入到输出流 ps 中。然后,调用 exportNoteToText() 方法,将当前笔记的内容导出到输出流 ps 中。 + + 最后,关闭输出流 ps,并返回 STATE_SUCCESS 表示导出笔记数据成功。如果 noteCursor 为空,则不会做任何处理,直接关闭输出流并返回成功状态。*/ /** * Get a print stream pointed to the file {@generateExportedTextFile} @@ -307,7 +334,15 @@ public class BackupUtils { } return ps; } - } + }/*这段代码的作用是创建一个输出流 PrintStream 对象,用于将笔记数据导出到文本文件中。 + +首先,通过调用 generateFileMountedOnSDcard() 方法获取导出文件的路径和名称,并将结果保存在 File 对象 file 中。 + +接着,检查 file 是否为 null。如果是,则在Logcat中输出 "create file to exported failed" 的错误信息,并返回 null。 + +然后,获取 file 的名称和路径,并创建一个 FileOutputStream 对象 fos,将其作为参数传递给 PrintStream 构造函数,创建一个 PrintStream 对象 ps。 + +最后,返回 ps 对象,如果在创建 PrintStream 对象时出现 FileNotFoundException 或 NullPointerException 异常,则返回 null*/ /** * Generate the text file to store imported data @@ -339,6 +374,14 @@ public class BackupUtils { return null; } -} +}/*这段代码的作用是生成一个文件对象,并返回该对象的引用。 + +首先,获取外部存储设备的根目录,并将其与 filePathResId 参数所指定的路径拼接成一个完整的路径,并将其保存在 StringBuilder 对象 sb 中。 + +接着,创建一个 File 对象 filedir,用于表示存储导出文件的目录。如果该目录不存在,则调用 mkdir() 方法创建该目录。 + +然后,使用 fileNameFormatResId 参数所指定的文件名格式,将当前日期和时间添加到 sb 中,形成完整的文件路径。最后,创建一个 File 对象 file,用于表示导出的文件。 + +最后,检查 file 和 filedir 是否存在。如果它们都存在,则直接返回 file 对象的引用。否则,通过捕捉 SecurityException 和 IOException 异常,输出异常信息,并返回 null。*/ diff --git a/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/app/src/main/java/net/micode/notes/tool/DataUtils.java similarity index 50% rename from app/src/main/java/net/micode/notes/tool/DataUtils.java rename to src/app/src/main/java/net/micode/notes/tool/DataUtils.java index 2a14982..5ba9df3 100644 --- a/app/src/main/java/net/micode/notes/tool/DataUtils.java +++ b/src/app/src/main/java/net/micode/notes/tool/DataUtils.java @@ -36,7 +36,7 @@ import java.util.HashSet; public class DataUtils { - public static final String TAG = "DataUtils"; + public static final String TAG = "DataUtils";//定义了一个Java常量变量,名为TAG public static boolean batchDeleteNotes(ContentResolver resolver, HashSet ids) { if (ids == null) { Log.d(TAG, "the ids is null"); @@ -70,7 +70,13 @@ public class DataUtils { Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); } return false; - } + }/*这段代码是一个静态方法,它接受两个参数:ContentResolver对象和一个Long类型的HashSet集合。这个方法的作用是批量删除笔记。 + +如果传入的ids集合为空,方法会输出一条日志并返回true;如果ids集合的大小为0,同样会输出一条日志并返回true。 + +如果ids集合不为空且大小不为0,方法会遍历ids集合中的每个元素。如果该元素等于Notes.ID_ROOT_FOLDER,也就是系统文件夹的根目录,那么会输出一个错误日志并跳过该元素;否则,会创建一个ContentProviderOperation对象,使用ContentProviderOperation.newDelete()方法来构建一个删除操作,并将该操作添加到操作列表(operationList)中。 + +最后,方法会使用ContentResolver.applyBatch()方法来执行操作列表中的所有操作,如果操作成功,则返回true,否则返回false。如果发生RemoteException或OperationApplicationException异常,方法会输出一个错误日志并返回false。*/ public static void moveNoteToFoler(ContentResolver resolver, long id, long srcFolderId, long desFolderId) { ContentValues values = new ContentValues(); @@ -78,7 +84,11 @@ public class DataUtils { values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId); values.put(NoteColumns.LOCAL_MODIFIED, 1); resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null); - } + }/*这段代码是一个静态方法,它接受四个参数:ContentResolver对象、一个long类型的id、一个long类型的srcFolderId和一个long类型的desFolderId。这个方法的作用是将一个笔记移动到指定的文件夹中。 + +方法首先创建一个ContentValues对象,并将要更新的字段和值添加到该对象中。这里,将NoteColumns.PARENT_ID字段设置为desFolderId,表示将笔记的父文件夹设置为目标文件夹;将NoteColumns.ORIGIN_PARENT_ID字段设置为srcFolderId,表示将笔记的原始父文件夹设置为源文件夹;将NoteColumns.LOCAL_MODIFIED字段设置为1,表示该笔记已被本地修改过。 + +接下来,方法调用ContentResolver.update()方法来更新笔记。该方法接受四个参数:笔记的URI、要更新的值、选择条件和选择条件的参数。这里,笔记的URI是通过ContentUris.withAppendedId()方法创建的,其值为Notes.CONTENT_NOTE_URI与id拼接而成;要更新的值是上面创建的ContentValues对象;选择条件和选择条件的参数都为null,表示更新所有行。*/ public static boolean batchMoveToFolder(ContentResolver resolver, HashSet ids, long folderId) { @@ -109,7 +119,13 @@ public class DataUtils { Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); } return false; - } + }/*这段代码是一个静态方法,它接受三个参数:ContentResolver对象、一个Long类型的HashSet集合ids和一个Long类型的folderId。这个方法的作用是批量将笔记移动到指定的文件夹中。 + +如果传入的ids集合为空,方法会输出一条日志并返回true。 + +如果ids集合不为空,方法会遍历ids集合中的每个元素。对于每个元素,方法会创建一个ContentProviderOperation对象,并使用ContentProviderOperation.newUpdate()方法来构建一个更新操作。然后,将NoteColumns.PARENT_ID字段设置为folderId,表示将笔记的父文件夹设置为目标文件夹;将NoteColumns.LOCAL_MODIFIED字段设置为1,表示该笔记已被本地修改过。最后,将该操作添加到操作列表(operationList)中。 + +最后,方法使用ContentResolver.applyBatch()方法来执行操作列表中的所有操作。如果操作成功,则返回true,否则返回false。如果发生RemoteException或OperationApplicationException异常,方法会输出一个错误日志并返回false*/ /** * Get the all folder count except system folders {@link Notes#TYPE_SYSTEM}} @@ -134,7 +150,13 @@ public class DataUtils { } } return count; - } + }/*这段代码是一个静态方法,它接受一个ContentResolver对象作为参数。该方法的作用是返回用户创建的文件夹的数量。 + +该方法创建了一个Cursor对象,使用ContentResolver.query()方法查询笔记数据库,并返回所有类型为Notes.TYPE_FOLDER(文件夹类型)且不在回收站中的笔记数量。查询结果只包含一列,即COUNT(*)。 + +查询结果存储在Cursor对象中。如果Cursor对象不为null,方法会将光标移动到第一行,并使用getInt(0)方法获取查询结果中的第一列的值,即文件夹数量。如果发生IndexOutOfBoundsException异常,则输出一个错误日志。最后,方法关闭Cursor对象并返回文件夹数量。 + +注意,该方法只返回用户创建的文件夹数量,不包括系统预置的文件夹(如回收站)。*/ public static boolean visibleInNoteDatabase(ContentResolver resolver, long noteId, int type) { Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), @@ -151,7 +173,11 @@ public class DataUtils { cursor.close(); } return exist; - } + }/*这段代码是一个静态方法,它接受三个参数:ContentResolver对象、一个long类型的noteId和一个int类型的type。该方法的作用是检查给定的笔记是否存在于笔记数据库中,并且不在回收站中。 + +该方法首先创建一个Cursor对象,使用ContentResolver.query()方法查询笔记数据库,查询的条件是笔记类型为type,并且笔记的父文件夹不是回收站。查询结果包含所有列。 + +然后,方法检查查询结果是否存在,如果存在则将exist变量设置为true。最后,方法关闭Cursor对象并返回exist变量的值,即给定的笔记是否存在于笔记数据库中。*/ public static boolean existInNoteDatabase(ContentResolver resolver, long noteId) { Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), @@ -165,7 +191,11 @@ public class DataUtils { cursor.close(); } return exist; - } + }/*这段代码是一个静态方法,它接受两个参数:ContentResolver对象和一个long类型的noteId。该方法的作用是检查给定的笔记是否存在于笔记数据库中。 + +该方法首先创建一个Cursor对象,使用ContentResolver.query()方法查询笔记数据库。查询条件为笔记ID等于noteId,查询结果包含所有列。 + +然后,方法检查查询结果是否存在,如果存在则将exist变量设置为true。最后,方法关闭Cursor对象并返回exist变量的值,即给定的笔记是否存在于笔记数据库中*/ public static boolean existInDataDatabase(ContentResolver resolver, long dataId) { Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), @@ -179,7 +209,11 @@ public class DataUtils { cursor.close(); } return exist; - } + }/*这段代码是一个静态方法,它接受两个参数:ContentResolver对象和一个long类型的dataId。该方法的作用是检查给定的数据是否存在于数据数据库中。 + +该方法首先创建一个Cursor对象,使用ContentResolver.query()方法查询数据数据库。查询条件为数据ID等于dataId,查询结果包含所有列。 + +然后,方法检查查询结果是否存在,如果存在则将exist变量设置为true。最后,方法关闭Cursor对象并返回exist变量的值,即给定的数据是否存在于数据数据库中。*/ public static boolean checkVisibleFolderName(ContentResolver resolver, String name) { Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, null, @@ -195,7 +229,11 @@ public class DataUtils { cursor.close(); } return exist; - } + }/*这段代码是一个静态方法,它接受两个参数:ContentResolver对象和一个String类型的name。该方法的作用是检查给定名称的文件夹在笔记数据库中是否可见(即不在回收站中)。 + +该方法首先创建一个Cursor对象,使用ContentResolver.query()方法查询笔记数据库。查询条件为笔记类型为Notes.TYPE_FOLDER(文件夹类型)、父文件夹不是回收站(NoteColumns.PARENT_ID <> Notes.ID_TRASH_FOLER)以及笔记的摘要(NoteColumns.SNIPPET)等于给定的名称。查询结果包含所有列。 + +然后,方法检查查询结果是否存在,如果存在则将exist变量设置为true。最后,方法关闭Cursor对象并返回exist变量的值,即给定名称的文件夹在笔记数据库中是否可见。*/ public static HashSet getFolderNoteWidget(ContentResolver resolver, long folderId) { Cursor c = resolver.query(Notes.CONTENT_NOTE_URI, @@ -222,7 +260,13 @@ public class DataUtils { c.close(); } return set; - } + }/*这段代码是一个静态方法,它接受两个参数:ContentResolver对象和一个long类型的folderId。该方法的作用是获取给定文件夹下所有包含小部件的笔记的小部件ID和小部件类型。 + +该方法首先创建一个Cursor对象,使用ContentResolver.query()方法查询笔记数据库。查询条件为笔记的父文件夹ID等于给定的folderId。查询结果包含小部件ID和小部件类型这两列。 + +然后,方法将查询结果装入一个HashSet对象中。如果查询结果不为空,则创建一个HashSet对象,遍历查询结果并逐个添加小部件ID和小部件类型到HashSet中。如果查询结果为空,则返回null。 + +最后,方法关闭Cursor对象并返回HashSet对象,其中包含给定文件夹下所有包含小部件的笔记的小部件ID和小部件类型。*/ public static String getCallNumberByNoteId(ContentResolver resolver, long noteId) { Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI, @@ -241,7 +285,13 @@ public class DataUtils { } } return ""; - } + }/*这段代码是一个静态方法,它接受两个参数:ContentResolver对象和一个long类型的noteId。该方法的作用是获取给定笔记ID对应的电话笔记的电话号码。 + +该方法首先创建一个Cursor对象,使用ContentResolver.query()方法查询数据数据库。查询条件为电话笔记的笔记ID等于给定的noteId,且电话笔记的MIME类型为CallNote.CONTENT_ITEM_TYPE。查询结果包含电话号码这一列。 + +然后,方法检查查询结果是否存在,如果存在则返回查询结果中的电话号码。如果查询结果不存在,则返回空字符串。 + +最后,方法关闭Cursor对象并返回电话号码(或空字符串)。*/ public static long getNoteIdByPhoneNumberAndCallDate(ContentResolver resolver, String phoneNumber, long callDate) { Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI, @@ -262,7 +312,13 @@ public class DataUtils { cursor.close(); } return 0; - } + }/*这段代码是一个静态方法,它接受三个参数:ContentResolver对象、一个String类型的phoneNumber和一个long类型的callDate。该方法的作用是根据给定的电话号码和通话日期获取对应的电话笔记的笔记ID。 + +该方法首先创建一个Cursor对象,使用ContentResolver.query()方法查询数据数据库。查询条件为电话笔记的通话日期等于给定的callDate,电话笔记的MIME类型为CallNote.CONTENT_ITEM_TYPE,且电话号码等于给定的phoneNumber。查询结果包含笔记ID这一列。 + +然后,方法检查查询结果是否存在。如果存在,则返回查询结果中的笔记ID。如果查询结果不存在,则返回0。 + +最后,方法关闭Cursor对象并返回笔记ID(或0)。*/ public static String getSnippetById(ContentResolver resolver, long noteId) { Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, @@ -280,7 +336,11 @@ public class DataUtils { return snippet; } throw new IllegalArgumentException("Note is not found with id: " + noteId); - } + }/*这段代码是一个静态方法,它接受两个参数:ContentResolver对象和一个long类型的noteId。该方法的作用是获取给定笔记ID对应的笔记的摘要(snippet)。 + +该方法首先创建一个Cursor对象,使用ContentResolver.query()方法查询笔记的内容提供者。查询条件为笔记的ID等于给定的noteId。查询结果包含笔记的摘要这一列。 + +然后,方法检查查询结果是否存在。如果存在,则获取查询结果中的笔记摘要并将其存储在一个字符串变量snippet中。然后,方法关闭Cursor对象并返回snippet。如果查询结果不存在,则抛出一个IllegalArgumentException异常,其中包含“Note is not found with id: ”和给定的noteId作为错误消息。*/ public static String getFormattedSnippet(String snippet) { if (snippet != null) { @@ -292,4 +352,8 @@ public class DataUtils { } return snippet; } -} +}/*这段代码是一个静态方法,它接受一个String类型的snippet参数。该方法的作用是对给定的snippet进行格式化处理,以便在界面上显示。 + +该方法首先检查传入的snippet是否为空。如果不为空,则使用String.trim()方法删除snippet字符串中的前导和尾随空格。然后,使用String.indexOf()方法查找snippet字符串中第一个换行符的位置。如果找到了换行符,则使用String.substring()方法截取snippet字符串中第一个换行符之前的所有字符,并将结果存储回snippet变量中。否则,不做任何修改,直接返回原始的snippet字符串。 + +最后,方法返回格式化后的snippet字符串。*/ diff --git a/src/minotes/tool/GTaskStringUtils.java b/src/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java similarity index 52% rename from src/minotes/tool/GTaskStringUtils.java rename to src/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java index 666b729..f8ba895 100644 --- a/src/minotes/tool/GTaskStringUtils.java +++ b/src/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java @@ -18,96 +18,95 @@ package net.micode.notes.tool; public class GTaskStringUtils { - public final static String GTASK_JSON_ACTION_ID = "action_id"; + public final static String GTASK_JSON_ACTION_ID = "action_id";// 行动 ID - public final static String GTASK_JSON_ACTION_LIST = "action_list"; + public final static String GTASK_JSON_ACTION_LIST = "action_list";// 行动清单 - public final static String GTASK_JSON_ACTION_TYPE = "action_type"; + public final static String GTASK_JSON_ACTION_TYPE = "action_type";// 行动类型 - public final static String GTASK_JSON_ACTION_TYPE_CREATE = "create"; + public final static String GTASK_JSON_ACTION_TYPE_CREATE = "create";// 创建行动 - public final static String GTASK_JSON_ACTION_TYPE_GETALL = "get_all"; + public final static String GTASK_JSON_ACTION_TYPE_GETALL = "get_all";// 获取全部行动 - public final static String GTASK_JSON_ACTION_TYPE_MOVE = "move"; + public final static String GTASK_JSON_ACTION_TYPE_MOVE = "move";// 移动行动 - public final static String GTASK_JSON_ACTION_TYPE_UPDATE = "update"; + public final static String GTASK_JSON_ACTION_TYPE_UPDATE = "update"; // 更新行动 - public final static String GTASK_JSON_CREATOR_ID = "creator_id"; + public final static String GTASK_JSON_CREATOR_ID = "creator_id";// 创建者 ID - public final static String GTASK_JSON_CHILD_ENTITY = "child_entity"; + public final static String GTASK_JSON_CHILD_ENTITY = "child_entity";// 子实体 - public final static String GTASK_JSON_CLIENT_VERSION = "client_version"; + public final static String GTASK_JSON_CLIENT_VERSION = "client_version";// 客户端版本 - public final static String GTASK_JSON_COMPLETED = "completed"; + public final static String GTASK_JSON_COMPLETED = "completed"; // 完成状态 - public final static String GTASK_JSON_CURRENT_LIST_ID = "current_list_id"; + public final static String GTASK_JSON_CURRENT_LIST_ID = "current_list_id";// 当前清单 ID - public final static String GTASK_JSON_DEFAULT_LIST_ID = "default_list_id"; + public final static String GTASK_JSON_DEFAULT_LIST_ID = "default_list_id"; // 默认清单 ID - public final static String GTASK_JSON_DELETED = "deleted"; + public final static String GTASK_JSON_DELETED = "deleted";// 删除状态 - public final static String GTASK_JSON_DEST_LIST = "dest_list"; + public final static String GTASK_JSON_DEST_LIST = "dest_list";// 目标清单 - public final static String GTASK_JSON_DEST_PARENT = "dest_parent"; + public final static String GTASK_JSON_DEST_PARENT = "dest_parent";// 目标父元素 - public final static String GTASK_JSON_DEST_PARENT_TYPE = "dest_parent_type"; + public final static String GTASK_JSON_DEST_PARENT_TYPE = "dest_parent_type"; // 目标父元素类型 - public final static String GTASK_JSON_ENTITY_DELTA = "entity_delta"; + public final static String GTASK_JSON_ENTITY_DELTA = "entity_delta";// 实体增量 - public final static String GTASK_JSON_ENTITY_TYPE = "entity_type"; + public final static String GTASK_JSON_ENTITY_TYPE = "entity_type"; // 实体类型 - public final static String GTASK_JSON_GET_DELETED = "get_deleted"; + public final static String GTASK_JSON_GET_DELETED = "get_deleted"; // 获取删除状态 - public final static String GTASK_JSON_ID = "id"; + public final static String GTASK_JSON_ID = "id";// ID - public final static String GTASK_JSON_INDEX = "index"; + public final static String GTASK_JSON_INDEX = "index";// 索引 - public final static String GTASK_JSON_LAST_MODIFIED = "last_modified"; + public final static String GTASK_JSON_LAST_MODIFIED = "last_modified"; // 最后修改时间 - public final static String GTASK_JSON_LATEST_SYNC_POINT = "latest_sync_point"; + public final static String GTASK_JSON_LATEST_SYNC_POINT = "latest_sync_point";// 最新同步点 - public final static String GTASK_JSON_LIST_ID = "list_id"; + public final static String GTASK_JSON_LIST_ID = "list_id"; // 清单 ID - public final static String GTASK_JSON_LISTS = "lists"; + public final static String GTASK_JSON_LISTS = "lists";// 清单列表 + public final static String GTASK_JSON_NAME = "name";// 名称 - public final static String GTASK_JSON_NAME = "name"; + public final static String GTASK_JSON_NEW_ID = "new_id";// 新 ID - public final static String GTASK_JSON_NEW_ID = "new_id"; + public final static String GTASK_JSON_NOTES = "notes";// 备注 - public final static String GTASK_JSON_NOTES = "notes"; + public final static String GTASK_JSON_PARENT_ID = "parent_id";// 父 ID - public final static String GTASK_JSON_PARENT_ID = "parent_id"; + public final static String GTASK_JSON_PRIOR_SIBLING_ID = "prior_sibling_id";// 上一个同级 ID - public final static String GTASK_JSON_PRIOR_SIBLING_ID = "prior_sibling_id"; + public final static String GTASK_JSON_RESULTS = "results";// 结果 - public final static String GTASK_JSON_RESULTS = "results"; + public final static String GTASK_JSON_SOURCE_LIST = "source_list";// 源清单 - public final static String GTASK_JSON_SOURCE_LIST = "source_list"; + public final static String GTASK_JSON_TASKS = "tasks";// 任务列表 - public final static String GTASK_JSON_TASKS = "tasks"; + public final static String GTASK_JSON_TYPE = "type";// 类型 - public final static String GTASK_JSON_TYPE = "type"; + public final static String GTASK_JSON_TYPE_GROUP = "GROUP";// 分组类型 - public final static String GTASK_JSON_TYPE_GROUP = "GROUP"; + public final static String GTASK_JSON_TYPE_TASK = "TASK";// 任务类型 - public final static String GTASK_JSON_TYPE_TASK = "TASK"; + public final static String GTASK_JSON_USER = "user";// 用户 - public final static String GTASK_JSON_USER = "user"; + public final static String MIUI_FOLDER_PREFFIX = "[MIUI_Notes]"; // MIUI 笔记前缀 - public final static String MIUI_FOLDER_PREFFIX = "[MIUI_Notes]"; + public final static String FOLDER_DEFAULT = "Default";// 默认文件夹 - public final static String FOLDER_DEFAULT = "Default"; + public final static String FOLDER_CALL_NOTE = "Call_Note"; // 通话笔记文件夹 - public final static String FOLDER_CALL_NOTE = "Call_Note"; + public final static String FOLDER_META = "METADATA";// 元数据文件夹 - public final static String FOLDER_META = "METADATA"; + public final static String META_HEAD_GTASK_ID = "meta_gid";// GTASK ID 元数据头 - public final static String META_HEAD_GTASK_ID = "meta_gid"; + public final static String META_HEAD_NOTE = "meta_note";// 笔记元数据头 - public final static String META_HEAD_NOTE = "meta_note"; + public final static String META_HEAD_DATA = "meta_data";// 数据元数据头 - public final static String META_HEAD_DATA = "meta_data"; - - public final static String META_NOTE_NAME = "[META INFO] DON'T UPDATE AND DELETE"; + public final static String META_NOTE_NAME = "[META INFO] DON'T UPDATE AND DELETE";// 元数据笔记名称 } diff --git a/src/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/app/src/main/java/net/micode/notes/tool/ResourceParser.java new file mode 100644 index 0000000..fd1e936 --- /dev/null +++ b/src/app/src/main/java/net/micode/notes/tool/ResourceParser.java @@ -0,0 +1,215 @@ +/* + * 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.tool; + +import android.content.Context; +import android.preference.PreferenceManager; + +import net.micode.notes.R; +import net.micode.notes.ui.NotesPreferenceActivity; + +public class ResourceParser { + + public static final int YELLOW = 0;// 黄色 + public static final int BLUE = 1;// 蓝色 + public static final int WHITE = 2;// 白色 + public static final int GREEN = 3;// 绿色 + public static final int RED = 4;// 红色 + public static final int BG_DEFAULT_COLOR = YELLOW;// 默认背景颜色 + + + public static final int TEXT_SMALL = 0;// 小号字体 + public static final int TEXT_MEDIUM = 1;// 中号字体 + public static final int TEXT_LARGE = 2;// 大号字体 + public static final int TEXT_SUPER = 3;// 超大号字 + + public static final int BG_DEFAULT_FONT_SIZE = TEXT_MEDIUM;// 默认背景字体大小 + + public static class NoteBgResources { + private final static int [] BG_EDIT_RESOURCES = new int [] { + R.drawable.edit_yellow, + R.drawable.edit_blue, + R.drawable.edit_white, + R.drawable.edit_green, + R.drawable.edit_red + };/*这是一个静态内部类 NoteBgResources,其中包含一个名为 BG_EDIT_RESOURCES 的静态常量数组,该数组包含了 5 个整型元素,这些整型元素对应着项目中的一些 drawable 资源 R.drawable.edit_yellow、R.drawable.edit_blue、R.drawable.edit_white、R.drawable.edit_green、R.drawable.edit_red。*/ + + private final static int [] BG_EDIT_TITLE_RESOURCES = new int [] { + R.drawable.edit_title_yellow, + R.drawable.edit_title_blue, + R.drawable.edit_title_white, + R.drawable.edit_title_green, + R.drawable.edit_title_red + };/*这是一个私有的静态常量数组 BG_EDIT_TITLE_RESOURCES,它包含了五个整型元素,这些整型元素对应着项目中的一些 drawable 资源 R.drawable.edit_title_yellow、R.drawable.edit_title_blue、R.drawable.edit_title_white、R.drawable.edit_title_green、R.drawable.edit_title_red。*/ + + public static int getNoteBgResource(int id) { + return BG_EDIT_RESOURCES[id]; + }/*一个静态方法 getNoteBgResource(),它接受一个整型参数 id,并返回一个整型值。在这个方法中,静态常量数组 BG_EDIT_RESOURCES 被索引到,以返回该数组中索引为 id 的元素的值。*/ + + public static int getNoteTitleBgResource(int id) { + return BG_EDIT_TITLE_RESOURCES[id]; + } + }/*一个静态方法 getNoteTitleBgResource(),它接受一个整型参数 id,并返回一个整型值。在这个方法中,静态常量数组 BG_EDIT_TITLE_RESOURCES 被索引到,以返回该数组中索引为 id 的元素的值。*/ + + public static int getDefaultBgId(Context context) { + if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean( + NotesPreferenceActivity.PREFERENCE_SET_BG_COLOR_KEY, false)) { + return (int) (Math.random() * NoteBgResources.BG_EDIT_RESOURCES.length); + } else { + return BG_DEFAULT_COLOR; + } + }/*一个公共静态方法 getDefaultBgId(),它接受一个 Context 对象作为参数,并返回一个整型值。 + +在这个方法中,首先通过 PreferenceManager.getDefaultSharedPreferences(context) 获取了一个默认的 SharedPreferences 对象,并检查其中的 PREFERENCE_SET_BG_COLOR_KEY 是否为 true。如果是 true,则使用 Math.random() 随机生成一个范围在 NoteBgResources.BG_EDIT_RESOURCES 数组长度内的整数,并返回该整数作为默认背景颜色的 ID。如果 PREFERENCE_SET_BG_COLOR_KEY 是 false,则返回 BG_DEFAULT_COLOR,它是 ResourceParser 类中定义的默认背景颜色的静态常量。*/ + + public static class NoteItemBgResources { + private final static int [] BG_FIRST_RESOURCES = new int [] { + R.drawable.list_yellow_up, + R.drawable.list_blue_up, + R.drawable.list_white_up, + R.drawable.list_green_up, + R.drawable.list_red_up + };/*一个静态内部类 NoteItemBgResources,其中包含一个名为 BG_FIRST_RESOURCES 的私有静态常量数组。 + +该数组包含了 5 个整型元素,这些整型元素对应着项目中的一些 drawable 资源 R.drawable.list_yellow_up、R.drawable.list_blue_up、R.drawable.list_white_up、R.drawable.list_green_up、R.drawable.list_red_up。*/ + + private final static int [] BG_NORMAL_RESOURCES = new int [] { + R.drawable.list_yellow_middle, + R.drawable.list_blue_middle, + R.drawable.list_white_middle, + R.drawable.list_green_middle, + R.drawable.list_red_middle + };/*这是一个私有的静态常量数组 BG_NORMAL_RESOURCES,它包含了五个整型元素,这些整型元素对应着项目中的一些 drawable 资源 R.drawable.list_yellow_middle、R.drawable.list_blue_middle、R.drawable.list_white_middle、R.drawable.list_green_middle、R.drawable.list_red_middle。 + +这个数组可能是用于为笔记列表项设置不同背景颜色的 drawable 资源数组,每个元素对应一种背景颜色。 +其中,R.drawable.list_yellow_middle、R.drawable.list_blue_middle、R.drawable.list_white_middle、R.drawable.list_green_middle、R.drawable.list_red_middle 对应的是列表项中间部分的背景颜色。*/ + private final static int [] BG_LAST_RESOURCES = new int [] { + R.drawable.list_yellow_down, + R.drawable.list_blue_down, + R.drawable.list_white_down, + R.drawable.list_green_down, + R.drawable.list_red_down, + };/*一个私有的静态常量数组 BG_LAST_RESOURCES,它包含了五个整型元素,这些整型元素对应着项目中的一些 drawable 资源 R.drawable.list_yellow_down、R.drawable.list_blue_down、R.drawable.list_white_down、R.drawable.list_green_down、R.drawable.list_red_down。 + +这个数组可能是用于为笔记列表项设置不同背景颜色的 drawable 资源数组,每个元素对应一种背景颜色。其中,R.drawable.list_yellow_down、R.drawable.list_blue_down、R.drawable.list_white_down、R.drawable.list_green_down、R.drawable.list_red_down 对应的是列表项底部部分的背景颜色。*/ + + private final static int [] BG_SINGLE_RESOURCES = new int [] { + R.drawable.list_yellow_single, + R.drawable.list_blue_single, + R.drawable.list_white_single, + R.drawable.list_green_single, + R.drawable.list_red_single + };/*一个私有的静态常量数组 BG_SINGLE_RESOURCES,它包含了五个整型元素,这些整型元素对应着项目中的一些 drawable 资源 R.drawable.list_yellow_single、R.drawable.list_blue_single、R.drawable.list_white_single、R.drawable.list_green_single、R.drawable.list_red_single。 + +这个数组可能是用于为笔记列表项设置不同背景颜色的 drawable 资源数组,每个元素对应一种背景颜色。其中,R.drawable.list_yellow_single、R.drawable.list_blue_single、R.drawable.list_white_single、R.drawable.list_green_single、R.drawable.list_red_single 对应的是只有一个列表项时的背景颜色。*/ + + public static int getNoteBgFirstRes(int id) { + return BG_FIRST_RESOURCES[id]; + }/*一个公共静态方法 getNoteBgFirstRes(),它接受一个整型参数 id,并返回一个整型值。*/ + + public static int getNoteBgLastRes(int id) { + return BG_LAST_RESOURCES[id]; + }/*一个公共静态方法 getNoteBgLastRes(),它接受一个整型参数 id,并返回一个整型值。 + +在这个方法中,静态常量数组 BG_LAST_RESOURCES 被索引到,以返回该数组中索引为 id 的元素的值*/ + + public static int getNoteBgSingleRes(int id) { + return BG_SINGLE_RESOURCES[id]; + }/*一个公共静态方法 getNoteBgSingleRes(),它接受一个整型参数 id,并返回一个整型值。 + +在这个方法中,静态常量数组 BG_SINGLE_RESOURCES 被索引到,以返回该数组中索引为 id 的元素的值。*/ + + public static int getNoteBgNormalRes(int id) { + return BG_NORMAL_RESOURCES[id]; + }/*一个公共静态方法 getNoteBgNormalRes(),它接受一个整型参数 id,并返回一个整型值。 + +在这个方法中,静态常量数组 BG_NORMAL_RESOURCES 被索引到,以返回该数组中索引为 id 的元素的值。*/ + + public static int getFolderBgRes() { + return R.drawable.list_folder; + } + }/*一个公共静态方法 getFolderBgRes(),它返回一个整型值。 + +在这个方法中,返回了一个名为 list_folder 的 drawable 资源的 ID,该资源可能是用于为文件夹列表项设置背景的。*/ + + public static class WidgetBgResources { + private final static int [] BG_2X_RESOURCES = new int [] { + R.drawable.widget_2x_yellow, + R.drawable.widget_2x_blue, + R.drawable.widget_2x_white, + R.drawable.widget_2x_green, + R.drawable.widget_2x_red, + };/*一个静态内部类 WidgetBgResources,它包含一个私有的静态常量数组 BG_2X_RESOURCES,该数组包含五个整型元素,这些整型元素对应着项目中的一些 drawable 资源 R.drawable.widget_2x_yellow、R.drawable.widget_2x_blue、R.drawable.widget_2x_white、R.drawable.widget_2x_green、R.drawable.widget_2x_red。*/ + + public static int getWidget2xBgResource(int id) { + return BG_2X_RESOURCES[id]; + } + + private final static int [] BG_4X_RESOURCES = new int [] { + R.drawable.widget_4x_yellow, + R.drawable.widget_4x_blue, + R.drawable.widget_4x_white, + R.drawable.widget_4x_green, + R.drawable.widget_4x_red + };/*一个公共静态方法 getWidget2xBgResource(),它接受一个整型参数 id,并返回一个整型值。 + +在这个方法中,静态常量数组 BG_2X_RESOURCES 被索引到,以返回该数组中索引为 id 的元素的值。 + +这个方法可能是用于获取小部件 2x2 大小的背景资源的方法,它接受一个背景颜色的 ID,返回对应的 drawable 资源。 + +这个静态内部类还包含了一个私有的静态常量数组 BG_4X_RESOURCES,该数组包含五个整型元素,这些整型元素对应着项目中的一些 drawable 资源 R.drawable.widget_4x_yellow、R.drawable.widget_4x_blue、R.drawable.widget_4x_white、R.drawable.widget_4x_green、R.drawable.widget_4x_red。*/ + + public static int getWidget4xBgResource(int id) { + return BG_4X_RESOURCES[id]; + } + }/*一个公共静态方法 getWidget4xBgResource(),它接受一个整型参数 id,并返回一个整型值。 + +在这个方法中,静态常量数组 BG_4X_RESOURCES 被索引到,以返回该数组中索引为 id 的元素的值。*/ + + public static class TextAppearanceResources { + private final static int [] TEXTAPPEARANCE_RESOURCES = new int [] { + R.style.TextAppearanceNormal, + R.style.TextAppearanceMedium, + R.style.TextAppearanceLarge, + R.style.TextAppearanceSuper + };/*一个静态内部类 TextAppearanceResources,它包含一个私有的静态常量数组 TEXTAPPEARANCE_RESOURCES,该数组包含四个整型元素,这些整型元素对应着项目中的一些样式资源 R.style.TextAppearanceNormal、R.style.TextAppearanceMedium、R.style.TextAppearanceLarge、R.style.TextAppearanceSuper。*/ + + public static int getTexAppearanceResource(int id) { + /** + * 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 (id >= TEXTAPPEARANCE_RESOURCES.length) { + return BG_DEFAULT_FONT_SIZE; + } + return TEXTAPPEARANCE_RESOURCES[id]; + }/*一个公共静态方法 getTexAppearanceResource(),它接受一个整型参数 id,并返回一个整型值。 + +在这个方法中,首先判断传入的 id 是否大于等于 TEXTAPPEARANCE_RESOURCES 数组的长度,如果是,则返回默认的字体大小 BG_DEFAULT_FONT_SIZE。 + +如果 id 小于 TEXTAPPEARANCE_RESOURCES 数组的长度,则返回 TEXTAPPEARANCE_RESOURCES 数组中索引为 id 的元素的值。*/ + + public static int getResourcesSize() { + return TEXTAPPEARANCE_RESOURCES.length; + } + } +}/*一个公共静态方法 getTexAppearanceResource(),它接受一个整型参数 id,并返回一个整型值。 + +在这个方法中,首先判断传入的 id 是否大于等于 TEXTAPPEARANCE_RESOURCES 数组的长度,如果是,则返回默认的字体大小 BG_DEFAULT_FONT_SIZE。 + +如果 id 小于 TEXTAPPEARANCE_RESOURCES 数组的长度,则返回 TEXTAPPEARANCE_RESOURCES 数组中索引为 id 的元素的值。*/ diff --git a/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java rename to src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java diff --git a/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java rename to src/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java diff --git a/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/AlarmReceiver.java rename to src/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java diff --git a/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/app/src/main/java/net/micode/notes/ui/DateTimePicker.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/DateTimePicker.java rename to src/app/src/main/java/net/micode/notes/ui/DateTimePicker.java diff --git a/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java rename to src/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java diff --git a/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/app/src/main/java/net/micode/notes/ui/DropdownMenu.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/DropdownMenu.java rename to src/app/src/main/java/net/micode/notes/ui/DropdownMenu.java diff --git a/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java rename to src/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NoteEditActivity.java rename to src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NoteEditText.java rename to src/app/src/main/java/net/micode/notes/ui/NoteEditText.java diff --git a/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NoteItemData.java rename to src/app/src/main/java/net/micode/notes/ui/NoteItemData.java diff --git a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NotesListActivity.java rename to src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java diff --git a/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NotesListAdapter.java rename to src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java diff --git a/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NotesListItem.java rename to src/app/src/main/java/net/micode/notes/ui/NotesListItem.java diff --git a/src/minotes/ui/NotesPreferenceActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java similarity index 51% rename from src/minotes/ui/NotesPreferenceActivity.java rename to src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java index 07c5f7e..735e9bd 100644 --- a/src/minotes/ui/NotesPreferenceActivity.java +++ b/src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java @@ -48,26 +48,28 @@ import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.gtask.remote.GTaskSyncService; -public class NotesPreferenceActivity extends PreferenceActivity { - public static final String PREFERENCE_NAME = "notes_preferences"; +public class NotesPreferenceActivity extends PreferenceActivity {// 定义了一个常量字符串 PREFERENCE_NAME,表示 SharedPreferences 的名称 + public static final String PREFERENCE_NAME = "notes_preferences";// 定义了一个常量字符串 PREFERENCE_SYNC_ACCOUNT_NAME,表示同步账户名称的键名 - public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name"; + public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name";// 定义了一个常量字符串 PREFERENCE_LAST_SYNC_TIME,表示上一次同步时间的键名 - public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time"; + public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time";// 定义了一个常量字符串 PREFERENCE_SET_BG_COLOR_KEY,表示是否随机设置背景颜色的键名 - public static final String PREFERENCE_SET_BG_COLOR_KEY = "pref_key_bg_random_appear"; + public static final String PREFERENCE_SET_BG_COLOR_KEY = "pref_key_bg_random_appear";// 定义了一个常量字符串 PREFERENCE_SYNC_ACCOUNT_KEY,表示同步账户的键名 - private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key"; + private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key";// 定义了一个常量字符串 PREFERENCE_SYNC_ACCOUNT_KEY,表示同步账户的键名 - private static final String AUTHORITIES_FILTER_KEY = "authorities"; + private static final String AUTHORITIES_FILTER_KEY = "authorities";// 定义了一个常量字符串 AUTHORITIES_FILTER_KEY,表示过滤器的 authorities 键名 - private PreferenceCategory mAccountCategory; + private PreferenceCategory mAccountCategory;// 声明了一个 PreferenceCategory 类型的成员变量 mAccountCategory,表示账户分类 - private GTaskReceiver mReceiver; - private Account[] mOriAccounts; + private GTaskReceiver mReceiver;// 声明了一个 GTaskReceiver 类型的成员变量 mReceiver,表示 GTask 接收器 - private boolean mHasAddedAccount; + + private Account[] mOriAccounts;// 声明了一个 Account 数组类型的成员变量 mOriAccounts,表示原始账户 + + private boolean mHasAddedAccount;// 声明了一个 boolean 类型的成员变量 mHasAddedAccount,表示是否已添加了账户 @Override protected void onCreate(Bundle icicle) { @@ -76,21 +78,22 @@ public class NotesPreferenceActivity extends PreferenceActivity { /* using the app icon for navigation */ getActionBar().setDisplayHomeAsUpEnabled(true); - addPreferencesFromResource(R.xml.preferences); - mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY); + addPreferencesFromResource(R.xml.preferences);// 加载 preferences.xml 文件中的 Preference + mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);// 从 preferences.xml 中找到同步账户分类,赋值给 mAccountCategory + mReceiver = new GTaskReceiver(); IntentFilter filter = new IntentFilter(); filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME); - registerReceiver(mReceiver, filter); + registerReceiver(mReceiver, filter);// 注册 GTaskReceiver 广播接收器,监听 Gtask 同步服务的消息 mOriAccounts = null; View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null); - getListView().addHeaderView(header, null, true); + getListView().addHeaderView(header, null, true);//将原始账户数组 mOriAccounts 设置为 null。 } @Override protected void onResume() { - super.onResume(); + super.onResume();// onStart 方法,表示 Activity 启动时调用的方 // need to set sync account automatically if user has added a new // account @@ -114,7 +117,15 @@ public class NotesPreferenceActivity extends PreferenceActivity { } refreshUI(); - } + }/*1. 调用父类的 onCreate() 方法,初始化 Activity。 +2. 设置应用图标作为导航按钮,以便用户可以返回上一个Activity或者返回应用的主界面。 +3. 加载 preferences.xml 文件中的 Preference。 +4. 从 preferences.xml 中找到同步账户分类,赋值给 mAccountCategory。 +5. 注册 GTaskReceiver 广播接收器,监听 GTask 同步服务的消息。 +6. 将原始账户数组 mOriAccounts 设置为 null。 +7. 通过 LayoutInflater 加载一个设置界面的头部布局 R.layout.settings_header。 +8. 将头部布局添加到 ListView 的头部。 +这段代码的作用是初始化设置界面,并设置导航按钮、注册广播接收器、加载头部布局。*/ @Override protected void onDestroy() { @@ -122,64 +133,67 @@ public class NotesPreferenceActivity extends PreferenceActivity { unregisterReceiver(mReceiver); } super.onDestroy(); - } + }/*这段代码是 Android 中的一个 Activity 的 onDestroy() 方法,主要进行了以下操作: +1. 判断 mReceiver 是否为 null,如果不为 null,则解除广播接收器的注册。 +2. 调用父类的 onDestroy() 方法,销毁 Activity。 +这段代码的目的是在 Activity 销毁时,解除之前注册的广播接收器,以避免出现内存泄漏的情况。在 Android 中,如果不及时解除广播接收器的注册,会导致广播接收器持有 Activity 的引用而无法被垃圾回收,从而导致内存泄漏。因此,在 Activity销毁前,需要手动解除广播接收器的注册,以确保程序的正常运行和内存的释放。*/ private void loadAccountPreference() { - mAccountCategory.removeAll(); + mAccountCategory.removeAll();// 清空同步账户分类中的所有设置项 - Preference accountPref = new Preference(this); - final String defaultAccount = getSyncAccountName(this); - accountPref.setTitle(getString(R.string.preferences_account_title)); - accountPref.setSummary(getString(R.string.preferences_account_summary)); + Preference accountPref = new Preference(this);// 创建一个新的 Preference 对象 accountPref + final String defaultAccount = getSyncAccountName(this);// 获取当前默认的同步账户名称 + accountPref.setTitle(getString(R.string.preferences_account_title));// 设置 accountPref 的标题和摘要 + accountPref.setSummary(getString(R.string.preferences_account_summary)); // 设置 accountPref 的点击事件监听器 accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() { - public boolean onPreferenceClick(Preference preference) { + public boolean onPreferenceClick(Preference preference) {// 判断是否正在进行同步任务 if (!GTaskSyncService.isSyncing()) { if (TextUtils.isEmpty(defaultAccount)) { // the first time to set account - showSelectAccountAlertDialog(); + showSelectAccountAlertDialog();//如果当前同步账户为空,则弹出选择账户对话框 } else { // if the account has already been set, we need to promp // user about the risk showChangeAccountConfirmAlertDialog(); - } + }// 如果已经设置了同步账户,则需要提示用户风险 } else { Toast.makeText(NotesPreferenceActivity.this, R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT) - .show(); + .show();// 如果正在进行同步任务,则提示用户无法更改账户 } - return true; + return true;// 返回 true,表示点击事件已被处理 } }); - mAccountCategory.addPreference(accountPref); + mAccountCategory.addPreference(accountPref);// 将 accountPref 添加到同步账户分类中 } private void loadSyncButton() { - Button syncButton = (Button) findViewById(R.id.preference_sync_button); - TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview); + Button syncButton = (Button) findViewById(R.id.preference_sync_button);// 获取同步按钮和上次同步时间的视图对 + TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview);// 设置同步按钮的状态和点击事件监听器 // set button state if (GTaskSyncService.isSyncing()) { - syncButton.setText(getString(R.string.preferences_button_sync_cancel)); + syncButton.setText(getString(R.string.preferences_button_sync_cancel)); // 如果正在同步任务中,则将按钮文本设置为“取消同步”,并添加取消同步的点击事件监听器 syncButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { GTaskSyncService.cancelSync(NotesPreferenceActivity.this); } }); } else { - syncButton.setText(getString(R.string.preferences_button_sync_immediately)); + syncButton.setText(getString(R.string.preferences_button_sync_immediately));// 如果没有正在同步任务,则将按钮文本设置为“立即同步”,并添加开始同步的点击事件监听器 syncButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { GTaskSyncService.startSync(NotesPreferenceActivity.this); } }); - } - syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this))); + }// 根据当前是否设置了同步账户来设置同步按钮的可用状态 + syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));// 设置上次同步时间的显示状态和文本内容 // set last sync time if (GTaskSyncService.isSyncing()) { lastSyncTimeView.setText(GTaskSyncService.getProgressString()); - lastSyncTimeView.setVisibility(View.VISIBLE); + lastSyncTimeView.setVisibility(View.VISIBLE); // 如果正在同步任务中,则显示当前同步进度,并将上次同步时间视图设置为可见状态 } else { long lastSyncTime = getLastSyncTime(this); if (lastSyncTime != 0) { @@ -191,184 +205,192 @@ public class NotesPreferenceActivity extends PreferenceActivity { lastSyncTimeView.setVisibility(View.GONE); } } - } + }// 如果没有正在同步任务,则获取上次同步时间,并根据上次同步时间是否为0来设置上次同步时间视图的可见状态和文本内容 private void refreshUI() { loadAccountPreference(); loadSyncButton(); - } + }/*loadAccountPreference() 方法用于加载和显示当前同步账户的信息,而 loadSyncButton() 方法则用于设置同步按钮的状态和点击事件监听器,并显示上次同步时间的信息。*/ private void showSelectAccountAlertDialog() { - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); + AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);// 创建 AlertDialog.Builder 对象 View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null); - TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title); - titleTextView.setText(getString(R.string.preferences_dialog_select_account_title)); + TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);/// 创建自定义标题视图 + titleTextView.setText(getString(R.string.preferences_dialog_select_account_title));// 设置标题文本 TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle); - subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips)); + subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips));// 设置副标题文本 - dialogBuilder.setCustomTitle(titleView); - dialogBuilder.setPositiveButton(null, null); + dialogBuilder.setCustomTitle(titleView);// 将自定义标题视图设置到对话框中 + dialogBuilder.setPositiveButton(null, null); // 不设置确定按钮和点击事件监听器 Account[] accounts = getGoogleAccounts(); - String defAccount = getSyncAccountName(this); + String defAccount = getSyncAccountName(this);// 获取所有谷歌账户的列表和当前同步账户的名称 mOriAccounts = accounts; - mHasAddedAccount = false; + mHasAddedAccount = false;// 保存原始账户列表并将“已添加账户”标志设为 false - if (accounts.length > 0) { - CharSequence[] items = new CharSequence[accounts.length]; - final CharSequence[] itemMapping = items; - int checkedItem = -1; + if (accounts.length > 0) {// 如果找到了至少一个谷歌账户,则创建单选项列表 + CharSequence[] items = new CharSequence[accounts.length];// 创建单选项列表的选项文本数组 + final CharSequence[] itemMapping = items;// 创建选项文本数组的映射数组 + int checkedItem = -1; // 初始化默认选中项的索引为 -1 int index = 0; - for (Account account : accounts) { + for (Account account : accounts) {// 遍历所有谷歌账户,为每个账户设置一个选项 if (TextUtils.equals(account.name, defAccount)) { checkedItem = index; - } - items[index++] = account.name; + }// 如果该账户的名称与当前同步账户的名称相同,则将其作为默认选中项 + items[index++] = account.name;// 将该账户的名称添加到选项文本数组中 } - dialogBuilder.setSingleChoiceItems(items, checkedItem, + dialogBuilder.setSingleChoiceItems(items, checkedItem, // 将单选项列表设置到对话框中,并为每个选项设置点击事件监听器 new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { - setSyncAccount(itemMapping[which].toString()); - dialog.dismiss(); - refreshUI(); + setSyncAccount(itemMapping[which].toString()); // 将用户选择的账户名称设置为同步账户 + dialog.dismiss();// 关闭对话框 + refreshUI();// 刷新 UI 界面上的账户和同步按钮状态 } }); } - View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null); - dialogBuilder.setView(addAccountView); + View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null);//从布局文件中加载一个视图对象并将其赋值给 addAccountView 变量 + dialogBuilder.setView(addAccountView);//将 addAccountView 设置为对话框的自定义视图 - final AlertDialog dialog = dialogBuilder.show(); - addAccountView.setOnClickListener(new View.OnClickListener() { + final AlertDialog dialog = dialogBuilder.show();//创建一个 AlertDialog 对象,并将其显示出来 + addAccountView.setOnClickListener(new View.OnClickListener() {//添加一个点击事件监听器 public void onClick(View v) { - mHasAddedAccount = true; + mHasAddedAccount = true;//用户是否已经添加了一个账户 Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS"); intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] { "gmail-ls" - }); - startActivityForResult(intent, -1); - dialog.dismiss(); + });//创建了一个 Intent 对象,用于启动一个系统设置界面,以便让用户添加新的帐户 + startActivityForResult(intent, -1);//启动一个新的界面,等待用户添加新的账户 + dialog.dismiss();//关闭对话框 } }); } private void showChangeAccountConfirmAlertDialog() { + // 创建一个 AlertDialog.Builder 对象 AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); + // 从布局文件 R.layout.account_dialog_title 中加载一个视图 titleView View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null); + // 从 titleView 中找到一个 TextView 对象 titleTextView,并设置其文本 TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title); titleTextView.setText(getString(R.string.preferences_dialog_change_account_title, getSyncAccountName(this))); + // 从 titleView 中找到一个 TextView 对象 subtitleTextView,并设置其文本 TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle); subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg)); + // 将 titleView 设置为对话框的自定义标题 dialogBuilder.setCustomTitle(titleView); + // 创建一个 CharSequence 类型的数组 menuItemArray,包含三个字符串,作为选项菜单的标签文字 CharSequence[] menuItemArray = new CharSequence[] { getString(R.string.preferences_menu_change_account), getString(R.string.preferences_menu_remove_account), getString(R.string.preferences_menu_cancel) }; - dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { + dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() { // 创建一个 DialogInterface.OnClickListener 对象,用于处理选项菜单的点击事件 + public void onClick(DialogInterface dialog, int which) {// 判断点击了哪个菜单项 if (which == 0) { - showSelectAccountAlertDialog(); + showSelectAccountAlertDialog();// 如果点击了第一个菜单项,调用 showSelectAccountAlertDialog() 方法显示“选择帐户”对话框 } else if (which == 1) { removeSyncAccount(); - refreshUI(); + refreshUI();// 如果点击了第二个菜单项,先调用 removeSyncAccount() 方法删除同步帐户,再调用 refreshUI() 方法刷新界面 } } }); - dialogBuilder.show(); + dialogBuilder.show();// 显示对话框 } private Account[] getGoogleAccounts() { + // 获取 AccountManager 对象 AccountManager accountManager = AccountManager.get(this); + // 调用 getAccountsByType() 方法,传入参数 "com.google",以获取所有类型为 "com.google" 的帐户 return accountManager.getAccountsByType("com.google"); } private void setSyncAccount(String account) { - if (!getSyncAccountName(this).equals(account)) { + if (!getSyncAccountName(this).equals(account)) {// 判断传入的 account 是否与当前同步帐户相同 SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); - SharedPreferences.Editor editor = settings.edit(); + SharedPreferences.Editor editor = settings.edit();// 获取 SharedPreferences 对象 if (account != null) { - editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, account); + editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, account); // 如果传入的 account 不为 null,则将其存储到 SharedPreferences 中 } else { - editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, ""); + editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, "");// 如果传入的 account 为 null,则将空字符串存储到 SharedPreferences 中 } - editor.commit(); + editor.commit();// 提交修改 // clean up last sync time - setLastSyncTime(this, 0); + setLastSyncTime(this, 0);// 清除上一次同步的时间 // clean up local gtask related info new Thread(new Runnable() { public void run() { - ContentValues values = new ContentValues(); - values.put(NoteColumns.GTASK_ID, ""); - values.put(NoteColumns.SYNC_ID, 0); - getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null); + ContentValues values = new ContentValues(); // 创建一个 ContentValues 对象,用于更新所有的 note + values.put(NoteColumns.GTASK_ID, "");// 清空 GTasks ID 和 sync ID + values.put(NoteColumns.SYNC_ID, 0);// 清空 GTasks ID 和 sync ID + getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null); // 更新所有的 note } }).start(); Toast.makeText(NotesPreferenceActivity.this, getString(R.string.preferences_toast_success_set_accout, account), - Toast.LENGTH_SHORT).show(); + Toast.LENGTH_SHORT).show();// 显示一个 Toast,提示同步帐户设置成功 } } private void removeSyncAccount() { - SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); - SharedPreferences.Editor editor = settings.edit(); + SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); // 获取 SharedPreferences 对象 + SharedPreferences.Editor editor = settings.edit();// 获取 SharedPreferences 对象 if (settings.contains(PREFERENCE_SYNC_ACCOUNT_NAME)) { editor.remove(PREFERENCE_SYNC_ACCOUNT_NAME); - } + }// 如果 SharedPreferences 包含同步帐户名称,则从 SharedPreferences 中删除该名称 if (settings.contains(PREFERENCE_LAST_SYNC_TIME)) { - editor.remove(PREFERENCE_LAST_SYNC_TIME); + editor.remove(PREFERENCE_LAST_SYNC_TIME); // 如果 SharedPreferences 包含上一次同步的时间,则从 SharedPreferences 中删除该时间 } - editor.commit(); + editor.commit(); // 提交修改 // clean up local gtask related info new Thread(new Runnable() { public void run() { - ContentValues values = new ContentValues(); + ContentValues values = new ContentValues();// 创建一个 ContentValues 对象,用于更新所有的 note values.put(NoteColumns.GTASK_ID, ""); - values.put(NoteColumns.SYNC_ID, 0); + values.put(NoteColumns.SYNC_ID, 0); // 清空 GTasks ID 和 sync ID getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null); } - }).start(); + }).start();// 更新所有的 note } public static String getSyncAccountName(Context context) { - SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, + SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,// 获取 SharedPreferences 对象 Context.MODE_PRIVATE); - return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, ""); + return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, "");// 从 SharedPreferences 中获取同步帐户名称 } public static void setLastSyncTime(Context context, long time) { SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); - SharedPreferences.Editor editor = settings.edit(); - editor.putLong(PREFERENCE_LAST_SYNC_TIME, time); - editor.commit(); + SharedPreferences.Editor editor = settings.edit(); // 获取 SharedPreferences 对象 + editor.putLong(PREFERENCE_LAST_SYNC_TIME, time);// 将最后一次同步的时间保存到 SharedPreferences 中 + editor.commit();// 提交修改 } public static long getLastSyncTime(Context context) { SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, - Context.MODE_PRIVATE); - return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0); + Context.MODE_PRIVATE);// 获取 SharedPreferences 对象 + return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0);// 从 SharedPreferences 中获取最后一次同步的时间 } private class GTaskReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - refreshUI(); + refreshUI();// 刷新用户界面 if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) { TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview); syncStatus.setText(intent - .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG)); + .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG));// 如果正在同步,则更新同步状态 } } @@ -380,9 +402,9 @@ public class NotesPreferenceActivity extends PreferenceActivity { Intent intent = new Intent(this, NotesListActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); startActivity(intent); - return true; + return true; // 创建一个 Intent 对象,跳转到 NotesListActivity,并清除之前的所有 Activity default: - return false; + return false;// 如果选择的菜单项不是返回主页,则返回 false } } } diff --git a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java similarity index 55% rename from app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java rename to src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java index ec6f819..5c7f03a 100644 --- a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java +++ b/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java @@ -37,13 +37,15 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { NoteColumns.ID, NoteColumns.BG_COLOR_ID, NoteColumns.SNIPPET - }; + };/*一个抽象类 NoteWidgetProvider,它继承自 AppWidgetProvider 类。 - public static final int COLUMN_ID = 0; - public static final int COLUMN_BG_COLOR_ID = 1; - public static final int COLUMN_SNIPPET = 2; +在这个抽象类中定义了一个公共静态常量数组 PROJECTION,该数组包含三个字符串元素,这些字符串元素对应着笔记应用中的一些数据库列名,包括笔记的 ID、背景颜色 ID 和摘录内容。*/ - private static final String TAG = "NoteWidgetProvider"; + public static final int COLUMN_ID = 0;// 笔记 ID 列在 PROJECTION 数组中的索引 + public static final int COLUMN_BG_COLOR_ID = 1;// 笔记背景颜色 ID 列在 PROJECTION 数组中的索引 + public static final int COLUMN_SNIPPET = 2;// 笔记摘录内容列在 PROJECTION 数组中的索引 + + private static final String TAG = "NoteWidgetProvider";// 日志输出标识符 @Override public void onDeleted(Context context, int[] appWidgetIds) { @@ -55,19 +57,28 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { NoteColumns.WIDGET_ID + "=?", new String[] { String.valueOf(appWidgetIds[i])}); } - } + }/*这是 NoteWidgetProvider 抽象类中的一个公共方法 onDeleted(),它重写了父类 AppWidgetProvider 中的方法,用于处理小部件被删除的事件。 + +在该方法中,首先创建了一个 ContentValues 对象 values,并将 NoteColumns.WIDGET_ID 的值设为 AppWidgetManager.INVALID_APPWIDGET_ID,表示小部件已被删除。 - private Cursor getNoteWidgetInfo(Context context, int widgetId) { - return context.getContentResolver().query(Notes.CONTENT_NOTE_URI, +然后遍历传入的 appWidgetIds 数组,将每个小部件的 NoteColumns.WIDGET_ID 列更新为 AppWidgetManager.INVALID_APPWIDGET_ID,以便将小部件与笔记数据库中的记录解除绑定。 + +具体地,使用 getContentResolver() 获取一个 ContentResolver 对象,调用 update() 方法对笔记数据库中的记录进行更新。更新的条件为 NoteColumns.WIDGET_ID + "=?",即 NoteColumns.WIDGET_ID 等于当前小部件 ID,更新的数据为 values 对象,其中 NoteColumns.WIDGET_ID 的值已经被设置为 AppWidgetManager.INVALID_APPWIDGET_ID。*/ + + private Cursor getNoteWidgetInfo(Context context, int widgetId) {// 使用 getContentResolver() 方法获取 ContentResolver 对象,通过该对象进行对笔记数据库的查询操作 + return context.getContentResolver().query(Notes.CONTENT_NOTE_URI, // 使用 query() 方法查询笔记数据库,返回一个 Cursor 对象 + return context.getContentResolver().query(// 查询的 URI,笔记数据库中笔记的内容保存在该 URI 下 + PROJECTION, + Notes.CONTENT_NOTE_URI, PROJECTION, - NoteColumns.WIDGET_ID + "=? AND " + NoteColumns.PARENT_ID + "<>?", - new String[] { String.valueOf(widgetId), String.valueOf(Notes.ID_TRASH_FOLER) }, - null); + NoteColumns.WIDGET_ID + "=? AND " + NoteColumns.PARENT_ID + "<>?",// 查询的列,即笔记 ID、笔记背景颜色 ID 和笔记摘录内容 + new String[] { String.valueOf(widgetId), String.valueOf(Notes.ID_TRASH_FOLER) },//查询的条件,即笔记关联的小部件 ID 以及笔记的父 ID 不为回收站的笔记 + null);// 排序方式,这里为 null 表示不排序 } protected void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { update(context, appWidgetManager, appWidgetIds, false); - } + }/*这是 NoteWidgetProvider 抽象类中的一个受保护的方法 update(),它接受一个 Context 对象、一个 AppWidgetManager 对象和一个整型数组 appWidgetIds 作为参数,并在方法中调用了另一个同名方法。*/ private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, boolean privacyMode) { @@ -122,11 +133,21 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { appWidgetManager.updateAppWidget(appWidgetIds[i], rv); } } - } + }/*这是 `NoteWidgetProvider` 抽象类中的一个私有方法 `update()`,它接受一个 `Context` 对象、一个 `AppWidgetManager` 对象、一个整型数组 `appWidgetIds` 和一个布尔型参数 `privacyMode` 作为参数。该方法用于更新小部件的显示内容和点击事件。 + +方法中首先对 `appWidgetIds` 数组进行遍历,对于每个小部件 ID,如果它不等于 `AppWidgetManager.INVALID_APPWIDGET_ID`,则执行以下操作: + +- 获取小部件的默认背景 ID,以及一个空的摘录字符串。 +- 创建一个 `NoteEditActivity` 的意图,并将小部件 ID、小部件类型等信息作为附加数据放入其中。 +- 调用 `getNoteWidgetInfo()` 方法获取与当前小部件关联的笔记信息,并根据结果设置摘录字符串、背景 ID 和意图的操作类型。 +- 根据背景 ID 创建一个 `RemoteViews` 对象,并将背景图片、背景 ID 和点击事件所需的 `PendingIntent` 添加到其中。 +- 调用 `AppWidgetManager` 的 `updateAppWidget()` 方法更新小部件的显示内容。 + +如果 `privacyMode` 为 `true`,则小部件将显示 "隐私模式",并且点击小部件将启动 `NotesListActivity`;否则,小部件将显示与笔记关联的摘录字符串,点击小部件将启动 `NoteEditActivity`。*/ - protected abstract int getBgResourceId(int bgId); + protected abstract int getBgResourceId(int bgId);//用于获取小部件的背景资源 ID。 - protected abstract int getLayoutId(); + protected abstract int getLayoutId();//用于获取小部件的布局资源 ID。 - protected abstract int getWidgetType(); + protected abstract int getWidgetType();//用于获取小部件的类型。 } diff --git a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java similarity index 61% rename from app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java rename to src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java index adcb2f7..43921a1 100644 --- a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java +++ b/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java @@ -24,24 +24,24 @@ import net.micode.notes.data.Notes; import net.micode.notes.tool.ResourceParser; -public class NoteWidgetProvider_2x extends NoteWidgetProvider { +public class NoteWidgetProvider_2x extends NoteWidgetProvider {//创建一个继承自 NoteWidgetProvider 的子类 NoteWidgetProvider_2x @Override public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { super.update(context, appWidgetManager, appWidgetIds); - } + }/*重写父类的 onUpdate() 方法,并在其中调用父类的 update() 方法,以更新小部件的显示内容和点击事件。*/ @Override protected int getLayoutId() { return R.layout.widget_2x; - } + }/*重写父类的 getLayoutId() 方法,返回用于小部件的布局资源 ID。这里返回 R.layout.widget_2x,表示使用 widget_2x.xml 文件作为布局资源。*/ @Override protected int getBgResourceId(int bgId) { return ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId); - } + }/*重写父类的 getBgResourceId() 方法,返回用于小部件的背景资源 ID。这里调用了 ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId) 方法,该方法根据传入的背景 ID 返回相应的背景资源 ID。*/ @Override protected int getWidgetType() { return Notes.TYPE_WIDGET_2X; - } + }/*重写父类的 getWidgetType() 方法,返回小部件的类型。这里返回 Notes.TYPE_WIDGET_2X,表示这是一个 2x 大小的小部件。*/ } diff --git a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java similarity index 60% rename from app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java rename to src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java index c12a02e..7c6c512 100644 --- a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java +++ b/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java @@ -24,23 +24,22 @@ import net.micode.notes.data.Notes; import net.micode.notes.tool.ResourceParser; -public class NoteWidgetProvider_4x extends NoteWidgetProvider { +public class NoteWidgetProvider_4x extends NoteWidgetProvider {//创建一个继承自 NoteWidgetProvider 的子类 NoteWidgetProvider_4x。 @Override public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { super.update(context, appWidgetManager, appWidgetIds); - } + }/*重写父类的 onUpdate() 方法,并在其中调用父类的 update() 方法,以更新小部件的显示内容和点击事件。*/ protected int getLayoutId() { return R.layout.widget_4x; - } - + }/*重写父类的 getLayoutId() 方法,返回用于小部件的布局资源 ID。这里返回 R.layout.widget_4x,表示使用 widget_4x.xml 文件作为布局资源。*/ @Override protected int getBgResourceId(int bgId) { return ResourceParser.WidgetBgResources.getWidget4xBgResource(bgId); - } + }/*重写父类的 getBgResourceId() 方法,返回用于小部件的背景资源 ID。这里调用了 ResourceParser.WidgetBgResources.getWidget4xBgResource(bgId) 方法,该方法根据传入的背景 ID 返回相应的背景资源 ID。*/ @Override protected int getWidgetType() { return Notes.TYPE_WIDGET_4X; } -} +}/*重写父类的 getWidgetType() 方法,返回小部件的类型。这里返回 Notes.TYPE_WIDGET_4X,表示这是一个 4x 大小的小部件。*/ diff --git a/app/src/main/res/color/primary_text_dark.xml b/src/app/src/main/res/color/primary_text_dark.xml similarity index 100% rename from app/src/main/res/color/primary_text_dark.xml rename to src/app/src/main/res/color/primary_text_dark.xml diff --git a/app/src/main/res/color/secondary_text_dark.xml b/src/app/src/main/res/color/secondary_text_dark.xml similarity index 100% rename from app/src/main/res/color/secondary_text_dark.xml rename to src/app/src/main/res/color/secondary_text_dark.xml diff --git a/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/app/src/main/res/drawable-hdpi/bg_btn_set_color.png similarity index 100% rename from app/src/main/res/drawable-hdpi/bg_btn_set_color.png rename to src/app/src/main/res/drawable-hdpi/bg_btn_set_color.png diff --git a/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png similarity index 100% rename from app/src/main/res/drawable-hdpi/bg_color_btn_mask.png rename to src/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png diff --git a/app/src/main/res/drawable-hdpi/call_record.png b/src/app/src/main/res/drawable-hdpi/call_record.png similarity index 100% rename from app/src/main/res/drawable-hdpi/call_record.png rename to src/app/src/main/res/drawable-hdpi/call_record.png diff --git a/app/src/main/res/drawable-hdpi/clock.png b/src/app/src/main/res/drawable-hdpi/clock.png similarity index 100% rename from app/src/main/res/drawable-hdpi/clock.png rename to src/app/src/main/res/drawable-hdpi/clock.png diff --git a/app/src/main/res/drawable-hdpi/delete.png b/src/app/src/main/res/drawable-hdpi/delete.png similarity index 100% rename from app/src/main/res/drawable-hdpi/delete.png rename to src/app/src/main/res/drawable-hdpi/delete.png diff --git a/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/app/src/main/res/drawable-hdpi/dropdown_icon.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/dropdown_icon.9.png rename to src/app/src/main/res/drawable-hdpi/dropdown_icon.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_blue.9.png b/src/app/src/main/res/drawable-hdpi/edit_blue.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_blue.9.png rename to src/app/src/main/res/drawable-hdpi/edit_blue.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_green.9.png b/src/app/src/main/res/drawable-hdpi/edit_green.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_green.9.png rename to src/app/src/main/res/drawable-hdpi/edit_green.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_red.9.png b/src/app/src/main/res/drawable-hdpi/edit_red.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_red.9.png rename to src/app/src/main/res/drawable-hdpi/edit_red.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/app/src/main/res/drawable-hdpi/edit_title_blue.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_title_blue.9.png rename to src/app/src/main/res/drawable-hdpi/edit_title_blue.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/app/src/main/res/drawable-hdpi/edit_title_green.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_title_green.9.png rename to src/app/src/main/res/drawable-hdpi/edit_title_green.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/app/src/main/res/drawable-hdpi/edit_title_red.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_title_red.9.png rename to src/app/src/main/res/drawable-hdpi/edit_title_red.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/app/src/main/res/drawable-hdpi/edit_title_white.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_title_white.9.png rename to src/app/src/main/res/drawable-hdpi/edit_title_white.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_title_yellow.9.png rename to src/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_white.9.png b/src/app/src/main/res/drawable-hdpi/edit_white.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_white.9.png rename to src/app/src/main/res/drawable-hdpi/edit_white.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/app/src/main/res/drawable-hdpi/edit_yellow.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_yellow.9.png rename to src/app/src/main/res/drawable-hdpi/edit_yellow.9.png diff --git a/app/src/main/res/drawable-hdpi/font_large.png b/src/app/src/main/res/drawable-hdpi/font_large.png similarity index 100% rename from app/src/main/res/drawable-hdpi/font_large.png rename to src/app/src/main/res/drawable-hdpi/font_large.png diff --git a/app/src/main/res/drawable-hdpi/font_normal.png b/src/app/src/main/res/drawable-hdpi/font_normal.png similarity index 100% rename from app/src/main/res/drawable-hdpi/font_normal.png rename to src/app/src/main/res/drawable-hdpi/font_normal.png diff --git a/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png rename to src/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png diff --git a/app/src/main/res/drawable-hdpi/font_small.png b/src/app/src/main/res/drawable-hdpi/font_small.png similarity index 100% rename from app/src/main/res/drawable-hdpi/font_small.png rename to src/app/src/main/res/drawable-hdpi/font_small.png diff --git a/app/src/main/res/drawable-hdpi/font_super.png b/src/app/src/main/res/drawable-hdpi/font_super.png similarity index 100% rename from app/src/main/res/drawable-hdpi/font_super.png rename to src/app/src/main/res/drawable-hdpi/font_super.png diff --git a/app/src/main/res/drawable-hdpi/icon_app.png b/src/app/src/main/res/drawable-hdpi/icon_app.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_app.png rename to src/app/src/main/res/drawable-hdpi/icon_app.png diff --git a/app/src/main/res/drawable-hdpi/list_background.png b/src/app/src/main/res/drawable-hdpi/list_background.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_background.png rename to src/app/src/main/res/drawable-hdpi/list_background.png diff --git a/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/app/src/main/res/drawable-hdpi/list_blue_down.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_blue_down.9.png rename to src/app/src/main/res/drawable-hdpi/list_blue_down.9.png diff --git a/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/app/src/main/res/drawable-hdpi/list_blue_middle.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_blue_middle.9.png rename to src/app/src/main/res/drawable-hdpi/list_blue_middle.9.png diff --git a/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/app/src/main/res/drawable-hdpi/list_blue_single.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_blue_single.9.png rename to src/app/src/main/res/drawable-hdpi/list_blue_single.9.png diff --git a/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/app/src/main/res/drawable-hdpi/list_blue_up.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_blue_up.9.png rename to src/app/src/main/res/drawable-hdpi/list_blue_up.9.png diff --git a/app/src/main/res/drawable-hdpi/list_folder.9.png b/src/app/src/main/res/drawable-hdpi/list_folder.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_folder.9.png rename to src/app/src/main/res/drawable-hdpi/list_folder.9.png diff --git a/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/app/src/main/res/drawable-hdpi/list_footer_bg.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_footer_bg.9.png rename to src/app/src/main/res/drawable-hdpi/list_footer_bg.9.png diff --git a/app/src/main/res/drawable-hdpi/list_green_down.9.png b/src/app/src/main/res/drawable-hdpi/list_green_down.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_green_down.9.png rename to src/app/src/main/res/drawable-hdpi/list_green_down.9.png diff --git a/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/app/src/main/res/drawable-hdpi/list_green_middle.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_green_middle.9.png rename to src/app/src/main/res/drawable-hdpi/list_green_middle.9.png diff --git a/app/src/main/res/drawable-hdpi/list_green_single.9.png b/src/app/src/main/res/drawable-hdpi/list_green_single.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_green_single.9.png rename to src/app/src/main/res/drawable-hdpi/list_green_single.9.png diff --git a/app/src/main/res/drawable-hdpi/list_green_up.9.png b/src/app/src/main/res/drawable-hdpi/list_green_up.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_green_up.9.png rename to src/app/src/main/res/drawable-hdpi/list_green_up.9.png diff --git a/app/src/main/res/drawable-hdpi/list_red_down.9.png b/src/app/src/main/res/drawable-hdpi/list_red_down.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_red_down.9.png rename to src/app/src/main/res/drawable-hdpi/list_red_down.9.png diff --git a/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/app/src/main/res/drawable-hdpi/list_red_middle.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_red_middle.9.png rename to src/app/src/main/res/drawable-hdpi/list_red_middle.9.png diff --git a/app/src/main/res/drawable-hdpi/list_red_single.9.png b/src/app/src/main/res/drawable-hdpi/list_red_single.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_red_single.9.png rename to src/app/src/main/res/drawable-hdpi/list_red_single.9.png diff --git a/app/src/main/res/drawable-hdpi/list_red_up.9.png b/src/app/src/main/res/drawable-hdpi/list_red_up.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_red_up.9.png rename to src/app/src/main/res/drawable-hdpi/list_red_up.9.png diff --git a/app/src/main/res/drawable-hdpi/list_white_down.9.png b/src/app/src/main/res/drawable-hdpi/list_white_down.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_white_down.9.png rename to src/app/src/main/res/drawable-hdpi/list_white_down.9.png diff --git a/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/app/src/main/res/drawable-hdpi/list_white_middle.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_white_middle.9.png rename to src/app/src/main/res/drawable-hdpi/list_white_middle.9.png diff --git a/app/src/main/res/drawable-hdpi/list_white_single.9.png b/src/app/src/main/res/drawable-hdpi/list_white_single.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_white_single.9.png rename to src/app/src/main/res/drawable-hdpi/list_white_single.9.png diff --git a/app/src/main/res/drawable-hdpi/list_white_up.9.png b/src/app/src/main/res/drawable-hdpi/list_white_up.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_white_up.9.png rename to src/app/src/main/res/drawable-hdpi/list_white_up.9.png diff --git a/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/app/src/main/res/drawable-hdpi/list_yellow_down.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_yellow_down.9.png rename to src/app/src/main/res/drawable-hdpi/list_yellow_down.9.png diff --git a/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_yellow_middle.9.png rename to src/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png diff --git a/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/app/src/main/res/drawable-hdpi/list_yellow_single.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_yellow_single.9.png rename to src/app/src/main/res/drawable-hdpi/list_yellow_single.9.png diff --git a/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/app/src/main/res/drawable-hdpi/list_yellow_up.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_yellow_up.9.png rename to src/app/src/main/res/drawable-hdpi/list_yellow_up.9.png diff --git a/app/src/main/res/drawable-hdpi/menu_delete.png b/src/app/src/main/res/drawable-hdpi/menu_delete.png similarity index 100% rename from app/src/main/res/drawable-hdpi/menu_delete.png rename to src/app/src/main/res/drawable-hdpi/menu_delete.png diff --git a/app/src/main/res/drawable-hdpi/menu_move.png b/src/app/src/main/res/drawable-hdpi/menu_move.png similarity index 100% rename from app/src/main/res/drawable-hdpi/menu_move.png rename to src/app/src/main/res/drawable-hdpi/menu_move.png diff --git a/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/app/src/main/res/drawable-hdpi/new_note_normal.png similarity index 100% rename from app/src/main/res/drawable-hdpi/new_note_normal.png rename to src/app/src/main/res/drawable-hdpi/new_note_normal.png diff --git a/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/app/src/main/res/drawable-hdpi/new_note_pressed.png similarity index 100% rename from app/src/main/res/drawable-hdpi/new_note_pressed.png rename to src/app/src/main/res/drawable-hdpi/new_note_pressed.png diff --git a/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png similarity index 100% rename from app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png rename to src/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png diff --git a/app/src/main/res/drawable-hdpi/notification.png b/src/app/src/main/res/drawable-hdpi/notification.png similarity index 100% rename from app/src/main/res/drawable-hdpi/notification.png rename to src/app/src/main/res/drawable-hdpi/notification.png diff --git a/app/src/main/res/drawable-hdpi/search_result.png b/src/app/src/main/res/drawable-hdpi/search_result.png similarity index 100% rename from app/src/main/res/drawable-hdpi/search_result.png rename to src/app/src/main/res/drawable-hdpi/search_result.png diff --git a/app/src/main/res/drawable-hdpi/selected.png b/src/app/src/main/res/drawable-hdpi/selected.png similarity index 100% rename from app/src/main/res/drawable-hdpi/selected.png rename to src/app/src/main/res/drawable-hdpi/selected.png diff --git a/app/src/main/res/drawable-hdpi/title_alert.png b/src/app/src/main/res/drawable-hdpi/title_alert.png similarity index 100% rename from app/src/main/res/drawable-hdpi/title_alert.png rename to src/app/src/main/res/drawable-hdpi/title_alert.png diff --git a/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/app/src/main/res/drawable-hdpi/title_bar_bg.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/title_bar_bg.9.png rename to src/app/src/main/res/drawable-hdpi/title_bar_bg.9.png diff --git a/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/app/src/main/res/drawable-hdpi/widget_2x_blue.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_2x_blue.png rename to src/app/src/main/res/drawable-hdpi/widget_2x_blue.png diff --git a/app/src/main/res/drawable-hdpi/widget_2x_green.png b/src/app/src/main/res/drawable-hdpi/widget_2x_green.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_2x_green.png rename to src/app/src/main/res/drawable-hdpi/widget_2x_green.png diff --git a/app/src/main/res/drawable-hdpi/widget_2x_red.png b/src/app/src/main/res/drawable-hdpi/widget_2x_red.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_2x_red.png rename to src/app/src/main/res/drawable-hdpi/widget_2x_red.png diff --git a/app/src/main/res/drawable-hdpi/widget_2x_white.png b/src/app/src/main/res/drawable-hdpi/widget_2x_white.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_2x_white.png rename to src/app/src/main/res/drawable-hdpi/widget_2x_white.png diff --git a/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/app/src/main/res/drawable-hdpi/widget_2x_yellow.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_2x_yellow.png rename to src/app/src/main/res/drawable-hdpi/widget_2x_yellow.png diff --git a/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/app/src/main/res/drawable-hdpi/widget_4x_blue.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_4x_blue.png rename to src/app/src/main/res/drawable-hdpi/widget_4x_blue.png diff --git a/app/src/main/res/drawable-hdpi/widget_4x_green.png b/src/app/src/main/res/drawable-hdpi/widget_4x_green.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_4x_green.png rename to src/app/src/main/res/drawable-hdpi/widget_4x_green.png diff --git a/app/src/main/res/drawable-hdpi/widget_4x_red.png b/src/app/src/main/res/drawable-hdpi/widget_4x_red.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_4x_red.png rename to src/app/src/main/res/drawable-hdpi/widget_4x_red.png diff --git a/app/src/main/res/drawable-hdpi/widget_4x_white.png b/src/app/src/main/res/drawable-hdpi/widget_4x_white.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_4x_white.png rename to src/app/src/main/res/drawable-hdpi/widget_4x_white.png diff --git a/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/app/src/main/res/drawable-hdpi/widget_4x_yellow.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_4x_yellow.png rename to src/app/src/main/res/drawable-hdpi/widget_4x_yellow.png diff --git a/app/src/main/res/drawable/new_note.xml b/src/app/src/main/res/drawable/new_note.xml similarity index 100% rename from app/src/main/res/drawable/new_note.xml rename to src/app/src/main/res/drawable/new_note.xml diff --git a/app/src/main/res/layout/account_dialog_title.xml b/src/app/src/main/res/layout/account_dialog_title.xml similarity index 100% rename from app/src/main/res/layout/account_dialog_title.xml rename to src/app/src/main/res/layout/account_dialog_title.xml diff --git a/app/src/main/res/layout/add_account_text.xml b/src/app/src/main/res/layout/add_account_text.xml similarity index 100% rename from app/src/main/res/layout/add_account_text.xml rename to src/app/src/main/res/layout/add_account_text.xml diff --git a/app/src/main/res/layout/datetime_picker.xml b/src/app/src/main/res/layout/datetime_picker.xml similarity index 100% rename from app/src/main/res/layout/datetime_picker.xml rename to src/app/src/main/res/layout/datetime_picker.xml diff --git a/app/src/main/res/layout/dialog_edit_text.xml b/src/app/src/main/res/layout/dialog_edit_text.xml similarity index 100% rename from app/src/main/res/layout/dialog_edit_text.xml rename to src/app/src/main/res/layout/dialog_edit_text.xml diff --git a/app/src/main/res/layout/folder_list_item.xml b/src/app/src/main/res/layout/folder_list_item.xml similarity index 100% rename from app/src/main/res/layout/folder_list_item.xml rename to src/app/src/main/res/layout/folder_list_item.xml diff --git a/app/src/main/res/layout/note_edit.xml b/src/app/src/main/res/layout/note_edit.xml similarity index 100% rename from app/src/main/res/layout/note_edit.xml rename to src/app/src/main/res/layout/note_edit.xml diff --git a/app/src/main/res/layout/note_edit_list_item.xml b/src/app/src/main/res/layout/note_edit_list_item.xml similarity index 100% rename from app/src/main/res/layout/note_edit_list_item.xml rename to src/app/src/main/res/layout/note_edit_list_item.xml diff --git a/app/src/main/res/layout/note_item.xml b/src/app/src/main/res/layout/note_item.xml similarity index 100% rename from app/src/main/res/layout/note_item.xml rename to src/app/src/main/res/layout/note_item.xml diff --git a/app/src/main/res/layout/note_list.xml b/src/app/src/main/res/layout/note_list.xml similarity index 100% rename from app/src/main/res/layout/note_list.xml rename to src/app/src/main/res/layout/note_list.xml diff --git a/app/src/main/res/layout/note_list_dropdown_menu.xml b/src/app/src/main/res/layout/note_list_dropdown_menu.xml similarity index 100% rename from app/src/main/res/layout/note_list_dropdown_menu.xml rename to src/app/src/main/res/layout/note_list_dropdown_menu.xml diff --git a/app/src/main/res/layout/note_list_footer.xml b/src/app/src/main/res/layout/note_list_footer.xml similarity index 100% rename from app/src/main/res/layout/note_list_footer.xml rename to src/app/src/main/res/layout/note_list_footer.xml diff --git a/app/src/main/res/layout/settings_header.xml b/src/app/src/main/res/layout/settings_header.xml similarity index 100% rename from app/src/main/res/layout/settings_header.xml rename to src/app/src/main/res/layout/settings_header.xml diff --git a/app/src/main/res/layout/widget_2x.xml b/src/app/src/main/res/layout/widget_2x.xml similarity index 100% rename from app/src/main/res/layout/widget_2x.xml rename to src/app/src/main/res/layout/widget_2x.xml diff --git a/app/src/main/res/layout/widget_4x.xml b/src/app/src/main/res/layout/widget_4x.xml similarity index 100% rename from app/src/main/res/layout/widget_4x.xml rename to src/app/src/main/res/layout/widget_4x.xml diff --git a/app/src/main/res/menu/call_note_edit.xml b/src/app/src/main/res/menu/call_note_edit.xml similarity index 100% rename from app/src/main/res/menu/call_note_edit.xml rename to src/app/src/main/res/menu/call_note_edit.xml diff --git a/app/src/main/res/menu/call_record_folder.xml b/src/app/src/main/res/menu/call_record_folder.xml similarity index 100% rename from app/src/main/res/menu/call_record_folder.xml rename to src/app/src/main/res/menu/call_record_folder.xml diff --git a/app/src/main/res/menu/note_edit.xml b/src/app/src/main/res/menu/note_edit.xml similarity index 100% rename from app/src/main/res/menu/note_edit.xml rename to src/app/src/main/res/menu/note_edit.xml diff --git a/app/src/main/res/menu/note_list.xml b/src/app/src/main/res/menu/note_list.xml similarity index 100% rename from app/src/main/res/menu/note_list.xml rename to src/app/src/main/res/menu/note_list.xml diff --git a/app/src/main/res/menu/note_list_dropdown.xml b/src/app/src/main/res/menu/note_list_dropdown.xml similarity index 100% rename from app/src/main/res/menu/note_list_dropdown.xml rename to src/app/src/main/res/menu/note_list_dropdown.xml diff --git a/app/src/main/res/menu/note_list_options.xml b/src/app/src/main/res/menu/note_list_options.xml similarity index 100% rename from app/src/main/res/menu/note_list_options.xml rename to src/app/src/main/res/menu/note_list_options.xml diff --git a/app/src/main/res/menu/sub_folder.xml b/src/app/src/main/res/menu/sub_folder.xml similarity index 100% rename from app/src/main/res/menu/sub_folder.xml rename to src/app/src/main/res/menu/sub_folder.xml diff --git a/app/src/main/res/raw-zh-rCN/introduction b/src/app/src/main/res/raw-zh-rCN/introduction similarity index 100% rename from app/src/main/res/raw-zh-rCN/introduction rename to src/app/src/main/res/raw-zh-rCN/introduction diff --git a/app/src/main/res/raw/introduction b/src/app/src/main/res/raw/introduction similarity index 100% rename from app/src/main/res/raw/introduction rename to src/app/src/main/res/raw/introduction diff --git a/app/src/main/res/values-zh-rCN/arrays.xml b/src/app/src/main/res/values-zh-rCN/arrays.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/arrays.xml rename to src/app/src/main/res/values-zh-rCN/arrays.xml diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/src/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/strings.xml rename to src/app/src/main/res/values-zh-rCN/strings.xml diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/src/app/src/main/res/values-zh-rTW/arrays.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/arrays.xml rename to src/app/src/main/res/values-zh-rTW/arrays.xml diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/src/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/strings.xml rename to src/app/src/main/res/values-zh-rTW/strings.xml diff --git a/app/src/main/res/values/arrays.xml b/src/app/src/main/res/values/arrays.xml similarity index 100% rename from app/src/main/res/values/arrays.xml rename to src/app/src/main/res/values/arrays.xml diff --git a/app/src/main/res/values/colors.xml b/src/app/src/main/res/values/colors.xml similarity index 100% rename from app/src/main/res/values/colors.xml rename to src/app/src/main/res/values/colors.xml diff --git a/app/src/main/res/values/dimens.xml b/src/app/src/main/res/values/dimens.xml similarity index 100% rename from app/src/main/res/values/dimens.xml rename to src/app/src/main/res/values/dimens.xml diff --git a/app/src/main/res/values/strings.xml b/src/app/src/main/res/values/strings.xml similarity index 100% rename from app/src/main/res/values/strings.xml rename to src/app/src/main/res/values/strings.xml diff --git a/app/src/main/res/values/styles.xml b/src/app/src/main/res/values/styles.xml similarity index 100% rename from app/src/main/res/values/styles.xml rename to src/app/src/main/res/values/styles.xml diff --git a/app/src/main/res/xml/preferences.xml b/src/app/src/main/res/xml/preferences.xml similarity index 100% rename from app/src/main/res/xml/preferences.xml rename to src/app/src/main/res/xml/preferences.xml diff --git a/app/src/main/res/xml/searchable.xml b/src/app/src/main/res/xml/searchable.xml similarity index 100% rename from app/src/main/res/xml/searchable.xml rename to src/app/src/main/res/xml/searchable.xml diff --git a/app/src/main/res/xml/widget_2x_info.xml b/src/app/src/main/res/xml/widget_2x_info.xml similarity index 100% rename from app/src/main/res/xml/widget_2x_info.xml rename to src/app/src/main/res/xml/widget_2x_info.xml diff --git a/app/src/main/res/xml/widget_4x_info.xml b/src/app/src/main/res/xml/widget_4x_info.xml similarity index 100% rename from app/src/main/res/xml/widget_4x_info.xml rename to src/app/src/main/res/xml/widget_4x_info.xml diff --git a/build.gradle b/src/build.gradle similarity index 100% rename from build.gradle rename to src/build.gradle diff --git a/gradle/wrapper/gradle-wrapper.jar b/src/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from gradle/wrapper/gradle-wrapper.jar rename to src/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/src/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from gradle/wrapper/gradle-wrapper.properties rename to src/gradle/wrapper/gradle-wrapper.properties diff --git a/gradlew b/src/gradlew similarity index 100% rename from gradlew rename to src/gradlew diff --git a/gradlew.bat b/src/gradlew.bat similarity index 100% rename from gradlew.bat rename to src/gradlew.bat diff --git a/import-summary.txt b/src/import-summary.txt similarity index 100% rename from import-summary.txt rename to src/import-summary.txt diff --git a/local.properties b/src/local.properties similarity index 100% rename from local.properties rename to src/local.properties diff --git a/src/minote.iml b/src/minote.iml new file mode 100644 index 0000000..cc22eb3 --- /dev/null +++ b/src/minote.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/minotes/gtask/data/MetaData.java b/src/minotes/gtask/data/MetaData.java deleted file mode 100644 index 3a2050b..0000000 --- a/src/minotes/gtask/data/MetaData.java +++ /dev/null @@ -1,82 +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.gtask.data; - -import android.database.Cursor; -import android.util.Log; - -import net.micode.notes.tool.GTaskStringUtils; - -import org.json.JSONException; -import org.json.JSONObject; - - -public class MetaData extends Task { - private final static String TAG = MetaData.class.getSimpleName(); - - private String mRelatedGid = null; - - public void setMeta(String gid, JSONObject metaInfo) { - try { - metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid); - } catch (JSONException e) { - Log.e(TAG, "failed to put related gid"); - } - setNotes(metaInfo.toString()); - setName(GTaskStringUtils.META_NOTE_NAME); - } - - public String getRelatedGid() { - return mRelatedGid; - } - - @Override - public boolean isWorthSaving() { - return getNotes() != null; - } - - @Override - public void setContentByRemoteJSON(JSONObject js) { - super.setContentByRemoteJSON(js); - if (getNotes() != null) { - try { - JSONObject metaInfo = new JSONObject(getNotes().trim()); - mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID); - } catch (JSONException e) { - Log.w(TAG, "failed to get related gid"); - mRelatedGid = null; - } - } - } - - @Override - public void setContentByLocalJSON(JSONObject js) { - // this function should not be called - throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called"); - } - - @Override - public JSONObject getLocalJSONFromContent() { - throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called"); - } - - @Override - public int getSyncAction(Cursor c) { - throw new IllegalAccessError("MetaData:getSyncAction should not be called"); - } - -} diff --git a/src/minotes/gtask/data/Node.java b/src/minotes/gtask/data/Node.java deleted file mode 100644 index 63950e0..0000000 --- a/src/minotes/gtask/data/Node.java +++ /dev/null @@ -1,101 +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.gtask.data; - -import android.database.Cursor; - -import org.json.JSONObject; - -public abstract class Node { - public static final int SYNC_ACTION_NONE = 0; - - public static final int SYNC_ACTION_ADD_REMOTE = 1; - - public static final int SYNC_ACTION_ADD_LOCAL = 2; - - public static final int SYNC_ACTION_DEL_REMOTE = 3; - - public static final int SYNC_ACTION_DEL_LOCAL = 4; - - public static final int SYNC_ACTION_UPDATE_REMOTE = 5; - - public static final int SYNC_ACTION_UPDATE_LOCAL = 6; - - public static final int SYNC_ACTION_UPDATE_CONFLICT = 7; - - public static final int SYNC_ACTION_ERROR = 8; - - private String mGid; - - private String mName; - - private long mLastModified; - - private boolean mDeleted; - - public Node() { - mGid = null; - mName = ""; - mLastModified = 0; - mDeleted = false; - } - - public abstract JSONObject getCreateAction(int actionId); - - public abstract JSONObject getUpdateAction(int actionId); - - public abstract void setContentByRemoteJSON(JSONObject js); - - public abstract void setContentByLocalJSON(JSONObject js); - - public abstract JSONObject getLocalJSONFromContent(); - - public abstract int getSyncAction(Cursor c); - - public void setGid(String gid) { - this.mGid = gid; - } - - public void setName(String name) { - this.mName = name; - } - - public void setLastModified(long lastModified) { - this.mLastModified = lastModified; - } - - public void setDeleted(boolean deleted) { - this.mDeleted = deleted; - } - - public String getGid() { - return this.mGid; - } - - public String getName() { - return this.mName; - } - - public long getLastModified() { - return this.mLastModified; - } - - public boolean getDeleted() { - return this.mDeleted; - } - -} diff --git a/src/minotes/gtask/data/SqlData.java b/src/minotes/gtask/data/SqlData.java deleted file mode 100644 index d3ec3be..0000000 --- a/src/minotes/gtask/data/SqlData.java +++ /dev/null @@ -1,189 +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.gtask.data; - -import android.content.ContentResolver; -import android.content.ContentUris; -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.net.Uri; -import android.util.Log; - -import net.micode.notes.data.Notes; -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.NotesDatabaseHelper.TABLE; -import net.micode.notes.gtask.exception.ActionFailureException; - -import org.json.JSONException; -import org.json.JSONObject; - - -public class SqlData { - private static final String TAG = SqlData.class.getSimpleName(); - - private static final int INVALID_ID = -99999; - - public static final String[] PROJECTION_DATA = new String[] { - DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1, - DataColumns.DATA3 - }; - - public static final int DATA_ID_COLUMN = 0; - - public static final int DATA_MIME_TYPE_COLUMN = 1; - - public static final int DATA_CONTENT_COLUMN = 2; - - public static final int DATA_CONTENT_DATA_1_COLUMN = 3; - - public static final int DATA_CONTENT_DATA_3_COLUMN = 4; - - private ContentResolver mContentResolver; - - private boolean mIsCreate; - - private long mDataId; - - private String mDataMimeType; - - private String mDataContent; - - private long mDataContentData1; - - private String mDataContentData3; - - private ContentValues mDiffDataValues; - - public SqlData(Context context) { - mContentResolver = context.getContentResolver(); - mIsCreate = true; - mDataId = INVALID_ID; - mDataMimeType = DataConstants.NOTE; - mDataContent = ""; - mDataContentData1 = 0; - mDataContentData3 = ""; - mDiffDataValues = new ContentValues(); - } - - public SqlData(Context context, Cursor c) { - mContentResolver = context.getContentResolver(); - mIsCreate = false; - loadFromCursor(c); - mDiffDataValues = new ContentValues(); - } - - private void loadFromCursor(Cursor c) { - mDataId = c.getLong(DATA_ID_COLUMN); - mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN); - mDataContent = c.getString(DATA_CONTENT_COLUMN); - mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN); - mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN); - } - - public void setContent(JSONObject js) throws JSONException { - long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID; - if (mIsCreate || mDataId != dataId) { - mDiffDataValues.put(DataColumns.ID, dataId); - } - mDataId = dataId; - - String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE) - : DataConstants.NOTE; - if (mIsCreate || !mDataMimeType.equals(dataMimeType)) { - mDiffDataValues.put(DataColumns.MIME_TYPE, dataMimeType); - } - mDataMimeType = dataMimeType; - - String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : ""; - if (mIsCreate || !mDataContent.equals(dataContent)) { - mDiffDataValues.put(DataColumns.CONTENT, dataContent); - } - mDataContent = dataContent; - - long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0; - if (mIsCreate || mDataContentData1 != dataContentData1) { - mDiffDataValues.put(DataColumns.DATA1, dataContentData1); - } - mDataContentData1 = dataContentData1; - - String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : ""; - if (mIsCreate || !mDataContentData3.equals(dataContentData3)) { - mDiffDataValues.put(DataColumns.DATA3, dataContentData3); - } - mDataContentData3 = dataContentData3; - } - - public JSONObject getContent() throws JSONException { - if (mIsCreate) { - Log.e(TAG, "it seems that we haven't created this in database yet"); - return null; - } - JSONObject js = new JSONObject(); - js.put(DataColumns.ID, mDataId); - js.put(DataColumns.MIME_TYPE, mDataMimeType); - js.put(DataColumns.CONTENT, mDataContent); - js.put(DataColumns.DATA1, mDataContentData1); - js.put(DataColumns.DATA3, mDataContentData3); - return js; - } - - public void commit(long noteId, boolean validateVersion, long version) { - - if (mIsCreate) { - if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) { - mDiffDataValues.remove(DataColumns.ID); - } - - mDiffDataValues.put(DataColumns.NOTE_ID, noteId); - Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues); - try { - mDataId = Long.valueOf(uri.getPathSegments().get(1)); - } catch (NumberFormatException e) { - Log.e(TAG, "Get note id error :" + e.toString()); - throw new ActionFailureException("create note failed"); - } - } else { - if (mDiffDataValues.size() > 0) { - int result = 0; - if (!validateVersion) { - result = mContentResolver.update(ContentUris.withAppendedId( - Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null); - } else { - result = mContentResolver.update(ContentUris.withAppendedId( - Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, - " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE - + " WHERE " + NoteColumns.VERSION + "=?)", new String[] { - String.valueOf(noteId), String.valueOf(version) - }); - } - if (result == 0) { - Log.w(TAG, "there is no update. maybe user updates note when syncing"); - } - } - } - - mDiffDataValues.clear(); - mIsCreate = false; - } - - public long getId() { - return mDataId; - } -} diff --git a/src/minotes/gtask/data/SqlNote.java b/src/minotes/gtask/data/SqlNote.java deleted file mode 100644 index 79a4095..0000000 --- a/src/minotes/gtask/data/SqlNote.java +++ /dev/null @@ -1,505 +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.gtask.data; - -import android.appwidget.AppWidgetManager; -import android.content.ContentResolver; -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.net.Uri; -import android.util.Log; - -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.gtask.exception.ActionFailureException; -import net.micode.notes.tool.GTaskStringUtils; -import net.micode.notes.tool.ResourceParser; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.ArrayList; - - -public class SqlNote { - private static final String TAG = SqlNote.class.getSimpleName(); - - private static final int INVALID_ID = -99999; - - public static final String[] PROJECTION_NOTE = new String[] { - 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, NoteColumns.TYPE, - NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.SYNC_ID, - NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID, - NoteColumns.VERSION - }; - - public static final int ID_COLUMN = 0; - - public static final int ALERTED_DATE_COLUMN = 1; - - public static final int BG_COLOR_ID_COLUMN = 2; - - public static final int CREATED_DATE_COLUMN = 3; - - public static final int HAS_ATTACHMENT_COLUMN = 4; - - public static final int MODIFIED_DATE_COLUMN = 5; - - public static final int NOTES_COUNT_COLUMN = 6; - - public static final int PARENT_ID_COLUMN = 7; - - public static final int SNIPPET_COLUMN = 8; - - public static final int TYPE_COLUMN = 9; - - public static final int WIDGET_ID_COLUMN = 10; - - public static final int WIDGET_TYPE_COLUMN = 11; - - public static final int SYNC_ID_COLUMN = 12; - - public static final int LOCAL_MODIFIED_COLUMN = 13; - - public static final int ORIGIN_PARENT_ID_COLUMN = 14; - - public static final int GTASK_ID_COLUMN = 15; - - public static final int VERSION_COLUMN = 16; - - private Context mContext; - - private ContentResolver mContentResolver; - - private boolean mIsCreate; - - private long mId; - - private long mAlertDate; - - private int mBgColorId; - - private long mCreatedDate; - - private int mHasAttachment; - - private long mModifiedDate; - - private long mParentId; - - private String mSnippet; - - private int mType; - - private int mWidgetId; - - private int mWidgetType; - - private long mOriginParent; - - private long mVersion; - - private ContentValues mDiffNoteValues; - - private ArrayList mDataList; - - public SqlNote(Context context) { - mContext = context; - mContentResolver = context.getContentResolver(); - mIsCreate = true; - mId = INVALID_ID; - mAlertDate = 0; - mBgColorId = ResourceParser.getDefaultBgId(context); - mCreatedDate = System.currentTimeMillis(); - mHasAttachment = 0; - mModifiedDate = System.currentTimeMillis(); - mParentId = 0; - mSnippet = ""; - mType = Notes.TYPE_NOTE; - mWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID; - mWidgetType = Notes.TYPE_WIDGET_INVALIDE; - mOriginParent = 0; - mVersion = 0; - mDiffNoteValues = new ContentValues(); - mDataList = new ArrayList(); - } - - public SqlNote(Context context, Cursor c) { - mContext = context; - mContentResolver = context.getContentResolver(); - mIsCreate = false; - loadFromCursor(c); - mDataList = new ArrayList(); - if (mType == Notes.TYPE_NOTE) - loadDataContent(); - mDiffNoteValues = new ContentValues(); - } - - public SqlNote(Context context, long id) { - mContext = context; - mContentResolver = context.getContentResolver(); - mIsCreate = false; - loadFromCursor(id); - mDataList = new ArrayList(); - if (mType == Notes.TYPE_NOTE) - loadDataContent(); - mDiffNoteValues = new ContentValues(); - - } - - private void loadFromCursor(long id) { - Cursor c = null; - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)", - new String[] { - String.valueOf(id) - }, null); - if (c != null) { - c.moveToNext(); - loadFromCursor(c); - } else { - Log.w(TAG, "loadFromCursor: cursor = null"); - } - } finally { - if (c != null) - c.close(); - } - } - - private void loadFromCursor(Cursor c) { - mId = c.getLong(ID_COLUMN); - mAlertDate = c.getLong(ALERTED_DATE_COLUMN); - mBgColorId = c.getInt(BG_COLOR_ID_COLUMN); - mCreatedDate = c.getLong(CREATED_DATE_COLUMN); - mHasAttachment = c.getInt(HAS_ATTACHMENT_COLUMN); - mModifiedDate = c.getLong(MODIFIED_DATE_COLUMN); - mParentId = c.getLong(PARENT_ID_COLUMN); - mSnippet = c.getString(SNIPPET_COLUMN); - mType = c.getInt(TYPE_COLUMN); - mWidgetId = c.getInt(WIDGET_ID_COLUMN); - mWidgetType = c.getInt(WIDGET_TYPE_COLUMN); - mVersion = c.getLong(VERSION_COLUMN); - } - - private void loadDataContent() { - Cursor c = null; - mDataList.clear(); - try { - c = mContentResolver.query(Notes.CONTENT_DATA_URI, SqlData.PROJECTION_DATA, - "(note_id=?)", new String[] { - String.valueOf(mId) - }, null); - if (c != null) { - if (c.getCount() == 0) { - Log.w(TAG, "it seems that the note has not data"); - return; - } - while (c.moveToNext()) { - SqlData data = new SqlData(mContext, c); - mDataList.add(data); - } - } else { - Log.w(TAG, "loadDataContent: cursor = null"); - } - } finally { - if (c != null) - c.close(); - } - } - - public boolean setContent(JSONObject js) { - try { - JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { - Log.w(TAG, "cannot set system folder"); - } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { - // for folder we can only update the snnipet and type - String snippet = note.has(NoteColumns.SNIPPET) ? note - .getString(NoteColumns.SNIPPET) : ""; - if (mIsCreate || !mSnippet.equals(snippet)) { - mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); - } - mSnippet = snippet; - - int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) - : Notes.TYPE_NOTE; - if (mIsCreate || mType != type) { - mDiffNoteValues.put(NoteColumns.TYPE, type); - } - mType = type; - } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) { - JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); - long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID; - if (mIsCreate || mId != id) { - mDiffNoteValues.put(NoteColumns.ID, id); - } - mId = id; - - long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note - .getLong(NoteColumns.ALERTED_DATE) : 0; - if (mIsCreate || mAlertDate != alertDate) { - mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate); - } - mAlertDate = alertDate; - - int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note - .getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext); - if (mIsCreate || mBgColorId != bgColorId) { - mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId); - } - mBgColorId = bgColorId; - - long createDate = note.has(NoteColumns.CREATED_DATE) ? note - .getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis(); - if (mIsCreate || mCreatedDate != createDate) { - mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate); - } - mCreatedDate = createDate; - - int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note - .getInt(NoteColumns.HAS_ATTACHMENT) : 0; - if (mIsCreate || mHasAttachment != hasAttachment) { - mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment); - } - mHasAttachment = hasAttachment; - - long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note - .getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis(); - if (mIsCreate || mModifiedDate != modifiedDate) { - mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate); - } - mModifiedDate = modifiedDate; - - long parentId = note.has(NoteColumns.PARENT_ID) ? note - .getLong(NoteColumns.PARENT_ID) : 0; - if (mIsCreate || mParentId != parentId) { - mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId); - } - mParentId = parentId; - - String snippet = note.has(NoteColumns.SNIPPET) ? note - .getString(NoteColumns.SNIPPET) : ""; - if (mIsCreate || !mSnippet.equals(snippet)) { - mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); - } - mSnippet = snippet; - - int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) - : Notes.TYPE_NOTE; - if (mIsCreate || mType != type) { - mDiffNoteValues.put(NoteColumns.TYPE, type); - } - mType = type; - - int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID) - : AppWidgetManager.INVALID_APPWIDGET_ID; - if (mIsCreate || mWidgetId != widgetId) { - mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId); - } - mWidgetId = widgetId; - - int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note - .getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE; - if (mIsCreate || mWidgetType != widgetType) { - mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType); - } - mWidgetType = widgetType; - - long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note - .getLong(NoteColumns.ORIGIN_PARENT_ID) : 0; - if (mIsCreate || mOriginParent != originParent) { - mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent); - } - mOriginParent = originParent; - - for (int i = 0; i < dataArray.length(); i++) { - JSONObject data = dataArray.getJSONObject(i); - SqlData sqlData = null; - if (data.has(DataColumns.ID)) { - long dataId = data.getLong(DataColumns.ID); - for (SqlData temp : mDataList) { - if (dataId == temp.getId()) { - sqlData = temp; - } - } - } - - if (sqlData == null) { - sqlData = new SqlData(mContext); - mDataList.add(sqlData); - } - - sqlData.setContent(data); - } - } - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - return false; - } - return true; - } - - public JSONObject getContent() { - try { - JSONObject js = new JSONObject(); - - if (mIsCreate) { - Log.e(TAG, "it seems that we haven't created this in database yet"); - return null; - } - - JSONObject note = new JSONObject(); - if (mType == Notes.TYPE_NOTE) { - note.put(NoteColumns.ID, mId); - note.put(NoteColumns.ALERTED_DATE, mAlertDate); - note.put(NoteColumns.BG_COLOR_ID, mBgColorId); - note.put(NoteColumns.CREATED_DATE, mCreatedDate); - note.put(NoteColumns.HAS_ATTACHMENT, mHasAttachment); - note.put(NoteColumns.MODIFIED_DATE, mModifiedDate); - note.put(NoteColumns.PARENT_ID, mParentId); - note.put(NoteColumns.SNIPPET, mSnippet); - note.put(NoteColumns.TYPE, mType); - note.put(NoteColumns.WIDGET_ID, mWidgetId); - note.put(NoteColumns.WIDGET_TYPE, mWidgetType); - note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent); - js.put(GTaskStringUtils.META_HEAD_NOTE, note); - - JSONArray dataArray = new JSONArray(); - for (SqlData sqlData : mDataList) { - JSONObject data = sqlData.getContent(); - if (data != null) { - dataArray.put(data); - } - } - js.put(GTaskStringUtils.META_HEAD_DATA, dataArray); - } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) { - note.put(NoteColumns.ID, mId); - note.put(NoteColumns.TYPE, mType); - note.put(NoteColumns.SNIPPET, mSnippet); - js.put(GTaskStringUtils.META_HEAD_NOTE, note); - } - - return js; - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - } - return null; - } - - public void setParentId(long id) { - mParentId = id; - mDiffNoteValues.put(NoteColumns.PARENT_ID, id); - } - - public void setGtaskId(String gid) { - mDiffNoteValues.put(NoteColumns.GTASK_ID, gid); - } - - public void setSyncId(long syncId) { - mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId); - } - - public void resetLocalModified() { - mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0); - } - - public long getId() { - return mId; - } - - public long getParentId() { - return mParentId; - } - - public String getSnippet() { - return mSnippet; - } - - public boolean isNoteType() { - return mType == Notes.TYPE_NOTE; - } - - public void commit(boolean validateVersion) { - if (mIsCreate) { - if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) { - mDiffNoteValues.remove(NoteColumns.ID); - } - - Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues); - try { - mId = Long.valueOf(uri.getPathSegments().get(1)); - } catch (NumberFormatException e) { - Log.e(TAG, "Get note id error :" + e.toString()); - throw new ActionFailureException("create note failed"); - } - if (mId == 0) { - throw new IllegalStateException("Create thread id failed"); - } - - if (mType == Notes.TYPE_NOTE) { - for (SqlData sqlData : mDataList) { - sqlData.commit(mId, false, -1); - } - } - } else { - if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) { - Log.e(TAG, "No such note"); - throw new IllegalStateException("Try to update note with invalid id"); - } - if (mDiffNoteValues.size() > 0) { - mVersion ++; - int result = 0; - if (!validateVersion) { - result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" - + NoteColumns.ID + "=?)", new String[] { - String.valueOf(mId) - }); - } else { - result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" - + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)", - new String[] { - String.valueOf(mId), String.valueOf(mVersion) - }); - } - if (result == 0) { - Log.w(TAG, "there is no update. maybe user updates note when syncing"); - } - } - - if (mType == Notes.TYPE_NOTE) { - for (SqlData sqlData : mDataList) { - sqlData.commit(mId, validateVersion, mVersion); - } - } - } - - // refresh local info - loadFromCursor(mId); - if (mType == Notes.TYPE_NOTE) - loadDataContent(); - - mDiffNoteValues.clear(); - mIsCreate = false; - } -} diff --git a/src/minotes/gtask/data/Task.java b/src/minotes/gtask/data/Task.java deleted file mode 100644 index 6a19454..0000000 --- a/src/minotes/gtask/data/Task.java +++ /dev/null @@ -1,351 +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.gtask.data; - -import android.database.Cursor; -import android.text.TextUtils; -import android.util.Log; - -import net.micode.notes.data.Notes; -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.gtask.exception.ActionFailureException; -import net.micode.notes.tool.GTaskStringUtils; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - - -public class Task extends Node { - private static final String TAG = Task.class.getSimpleName(); - - private boolean mCompleted; - - private String mNotes; - - private JSONObject mMetaInfo; - - private Task mPriorSibling; - - private TaskList mParent; - - public Task() { - super(); - mCompleted = false; - mNotes = null; - mPriorSibling = null; - mParent = null; - mMetaInfo = null; - } - - public JSONObject getCreateAction(int actionId) { - JSONObject js = new JSONObject(); - - try { - // action_type - js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, - GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE); - - // action_id - js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); - - // index - js.put(GTaskStringUtils.GTASK_JSON_INDEX, mParent.getChildTaskIndex(this)); - - // entity_delta - JSONObject entity = new JSONObject(); - entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); - entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null"); - entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE, - GTaskStringUtils.GTASK_JSON_TYPE_TASK); - if (getNotes() != null) { - entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes()); - } - js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); - - // parent_id - js.put(GTaskStringUtils.GTASK_JSON_PARENT_ID, mParent.getGid()); - - // dest_parent_type - js.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT_TYPE, - GTaskStringUtils.GTASK_JSON_TYPE_GROUP); - - // list_id - js.put(GTaskStringUtils.GTASK_JSON_LIST_ID, mParent.getGid()); - - // prior_sibling_id - if (mPriorSibling != null) { - js.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, mPriorSibling.getGid()); - } - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("fail to generate task-create jsonobject"); - } - - return js; - } - - public JSONObject getUpdateAction(int actionId) { - JSONObject js = new JSONObject(); - - try { - // action_type - js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, - GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE); - - // action_id - js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); - - // id - js.put(GTaskStringUtils.GTASK_JSON_ID, getGid()); - - // entity_delta - JSONObject entity = new JSONObject(); - entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); - if (getNotes() != null) { - entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes()); - } - entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted()); - js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("fail to generate task-update jsonobject"); - } - - return js; - } - - public void setContentByRemoteJSON(JSONObject js) { - if (js != null) { - try { - // id - if (js.has(GTaskStringUtils.GTASK_JSON_ID)) { - setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID)); - } - - // last_modified - if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) { - setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)); - } - - // name - if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) { - setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME)); - } - - // notes - if (js.has(GTaskStringUtils.GTASK_JSON_NOTES)) { - setNotes(js.getString(GTaskStringUtils.GTASK_JSON_NOTES)); - } - - // deleted - if (js.has(GTaskStringUtils.GTASK_JSON_DELETED)) { - setDeleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_DELETED)); - } - - // completed - if (js.has(GTaskStringUtils.GTASK_JSON_COMPLETED)) { - setCompleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_COMPLETED)); - } - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("fail to get task content from jsonobject"); - } - } - } - - public void setContentByLocalJSON(JSONObject js) { - if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE) - || !js.has(GTaskStringUtils.META_HEAD_DATA)) { - Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); - } - - try { - JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); - - if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) { - Log.e(TAG, "invalid type"); - return; - } - - for (int i = 0; i < dataArray.length(); i++) { - JSONObject data = dataArray.getJSONObject(i); - if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) { - setName(data.getString(DataColumns.CONTENT)); - break; - } - } - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - } - } - - public JSONObject getLocalJSONFromContent() { - String name = getName(); - try { - if (mMetaInfo == null) { - // new task created from web - if (name == null) { - Log.w(TAG, "the note seems to be an empty one"); - return null; - } - - JSONObject js = new JSONObject(); - JSONObject note = new JSONObject(); - JSONArray dataArray = new JSONArray(); - JSONObject data = new JSONObject(); - data.put(DataColumns.CONTENT, name); - dataArray.put(data); - js.put(GTaskStringUtils.META_HEAD_DATA, dataArray); - note.put(NoteColumns.TYPE, Notes.TYPE_NOTE); - js.put(GTaskStringUtils.META_HEAD_NOTE, note); - return js; - } else { - // synced task - JSONObject note = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - JSONArray dataArray = mMetaInfo.getJSONArray(GTaskStringUtils.META_HEAD_DATA); - - for (int i = 0; i < dataArray.length(); i++) { - JSONObject data = dataArray.getJSONObject(i); - if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) { - data.put(DataColumns.CONTENT, getName()); - break; - } - } - - note.put(NoteColumns.TYPE, Notes.TYPE_NOTE); - return mMetaInfo; - } - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - return null; - } - } - - public void setMetaInfo(MetaData metaData) { - if (metaData != null && metaData.getNotes() != null) { - try { - mMetaInfo = new JSONObject(metaData.getNotes()); - } catch (JSONException e) { - Log.w(TAG, e.toString()); - mMetaInfo = null; - } - } - } - - public int getSyncAction(Cursor c) { - try { - JSONObject noteInfo = null; - if (mMetaInfo != null && mMetaInfo.has(GTaskStringUtils.META_HEAD_NOTE)) { - noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - } - - if (noteInfo == null) { - Log.w(TAG, "it seems that note meta has been deleted"); - return SYNC_ACTION_UPDATE_REMOTE; - } - - if (!noteInfo.has(NoteColumns.ID)) { - Log.w(TAG, "remote note id seems to be deleted"); - return SYNC_ACTION_UPDATE_LOCAL; - } - - // validate the note id now - if (c.getLong(SqlNote.ID_COLUMN) != noteInfo.getLong(NoteColumns.ID)) { - Log.w(TAG, "note id doesn't match"); - return SYNC_ACTION_UPDATE_LOCAL; - } - - if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) { - // there is no local update - if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { - // no update both side - return SYNC_ACTION_NONE; - } else { - // apply remote to local - return SYNC_ACTION_UPDATE_LOCAL; - } - } else { - // validate gtask id - if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) { - Log.e(TAG, "gtask id doesn't match"); - return SYNC_ACTION_ERROR; - } - if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { - // local modification only - return SYNC_ACTION_UPDATE_REMOTE; - } else { - return SYNC_ACTION_UPDATE_CONFLICT; - } - } - } catch (Exception e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - } - - return SYNC_ACTION_ERROR; - } - - public boolean isWorthSaving() { - return mMetaInfo != null || (getName() != null && getName().trim().length() > 0) - || (getNotes() != null && getNotes().trim().length() > 0); - } - - public void setCompleted(boolean completed) { - this.mCompleted = completed; - } - - public void setNotes(String notes) { - this.mNotes = notes; - } - - public void setPriorSibling(Task priorSibling) { - this.mPriorSibling = priorSibling; - } - - public void setParent(TaskList parent) { - this.mParent = parent; - } - - public boolean getCompleted() { - return this.mCompleted; - } - - public String getNotes() { - return this.mNotes; - } - - public Task getPriorSibling() { - return this.mPriorSibling; - } - - public TaskList getParent() { - return this.mParent; - } - -} diff --git a/src/minotes/gtask/data/TaskList.java b/src/minotes/gtask/data/TaskList.java deleted file mode 100644 index 4ea21c5..0000000 --- a/src/minotes/gtask/data/TaskList.java +++ /dev/null @@ -1,343 +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.gtask.data; - -import android.database.Cursor; -import android.util.Log; - -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.gtask.exception.ActionFailureException; -import net.micode.notes.tool.GTaskStringUtils; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.ArrayList; - - -public class TaskList extends Node { - private static final String TAG = TaskList.class.getSimpleName(); - - private int mIndex; - - private ArrayList mChildren; - - public TaskList() { - super(); - mChildren = new ArrayList(); - mIndex = 1; - } - - public JSONObject getCreateAction(int actionId) { - JSONObject js = new JSONObject(); - - try { - // action_type - js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, - GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE); - - // action_id - js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); - - // index - js.put(GTaskStringUtils.GTASK_JSON_INDEX, mIndex); - - // entity_delta - JSONObject entity = new JSONObject(); - entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); - entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null"); - entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE, - GTaskStringUtils.GTASK_JSON_TYPE_GROUP); - js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("fail to generate tasklist-create jsonobject"); - } - - return js; - } - - public JSONObject getUpdateAction(int actionId) { - JSONObject js = new JSONObject(); - - try { - // action_type - js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, - GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE); - - // action_id - js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); - - // id - js.put(GTaskStringUtils.GTASK_JSON_ID, getGid()); - - // entity_delta - JSONObject entity = new JSONObject(); - entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); - entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted()); - js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("fail to generate tasklist-update jsonobject"); - } - - return js; - } - - public void setContentByRemoteJSON(JSONObject js) { - if (js != null) { - try { - // id - if (js.has(GTaskStringUtils.GTASK_JSON_ID)) { - setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID)); - } - - // last_modified - if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) { - setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)); - } - - // name - if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) { - setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME)); - } - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("fail to get tasklist content from jsonobject"); - } - } - } - - public void setContentByLocalJSON(JSONObject js) { - if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) { - Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); - } - - try { - JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - - if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { - String name = folder.getString(NoteColumns.SNIPPET); - setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name); - } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { - if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER) - setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT); - else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER) - setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX - + GTaskStringUtils.FOLDER_CALL_NOTE); - else - Log.e(TAG, "invalid system folder"); - } else { - Log.e(TAG, "error type"); - } - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - } - } - - public JSONObject getLocalJSONFromContent() { - try { - JSONObject js = new JSONObject(); - JSONObject folder = new JSONObject(); - - String folderName = getName(); - if (getName().startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX)) - folderName = folderName.substring(GTaskStringUtils.MIUI_FOLDER_PREFFIX.length(), - folderName.length()); - folder.put(NoteColumns.SNIPPET, folderName); - if (folderName.equals(GTaskStringUtils.FOLDER_DEFAULT) - || folderName.equals(GTaskStringUtils.FOLDER_CALL_NOTE)) - folder.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - else - folder.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); - - js.put(GTaskStringUtils.META_HEAD_NOTE, folder); - - return js; - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - return null; - } - } - - public int getSyncAction(Cursor c) { - try { - if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) { - // there is no local update - if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { - // no update both side - return SYNC_ACTION_NONE; - } else { - // apply remote to local - return SYNC_ACTION_UPDATE_LOCAL; - } - } else { - // validate gtask id - if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) { - Log.e(TAG, "gtask id doesn't match"); - return SYNC_ACTION_ERROR; - } - if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { - // local modification only - return SYNC_ACTION_UPDATE_REMOTE; - } else { - // for folder conflicts, just apply local modification - return SYNC_ACTION_UPDATE_REMOTE; - } - } - } catch (Exception e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - } - - return SYNC_ACTION_ERROR; - } - - public int getChildTaskCount() { - return mChildren.size(); - } - - public boolean addChildTask(Task task) { - boolean ret = false; - if (task != null && !mChildren.contains(task)) { - ret = mChildren.add(task); - if (ret) { - // need to set prior sibling and parent - task.setPriorSibling(mChildren.isEmpty() ? null : mChildren - .get(mChildren.size() - 1)); - task.setParent(this); - } - } - return ret; - } - - public boolean addChildTask(Task task, int index) { - if (index < 0 || index > mChildren.size()) { - Log.e(TAG, "add child task: invalid index"); - return false; - } - - int pos = mChildren.indexOf(task); - if (task != null && pos == -1) { - mChildren.add(index, task); - - // update the task list - Task preTask = null; - Task afterTask = null; - if (index != 0) - preTask = mChildren.get(index - 1); - if (index != mChildren.size() - 1) - afterTask = mChildren.get(index + 1); - - task.setPriorSibling(preTask); - if (afterTask != null) - afterTask.setPriorSibling(task); - } - - return true; - } - - public boolean removeChildTask(Task task) { - boolean ret = false; - int index = mChildren.indexOf(task); - if (index != -1) { - ret = mChildren.remove(task); - - if (ret) { - // reset prior sibling and parent - task.setPriorSibling(null); - task.setParent(null); - - // update the task list - if (index != mChildren.size()) { - mChildren.get(index).setPriorSibling( - index == 0 ? null : mChildren.get(index - 1)); - } - } - } - return ret; - } - - public boolean moveChildTask(Task task, int index) { - - if (index < 0 || index >= mChildren.size()) { - Log.e(TAG, "move child task: invalid index"); - return false; - } - - int pos = mChildren.indexOf(task); - if (pos == -1) { - Log.e(TAG, "move child task: the task should in the list"); - return false; - } - - if (pos == index) - return true; - return (removeChildTask(task) && addChildTask(task, index)); - } - - public Task findChildTaskByGid(String gid) { - for (int i = 0; i < mChildren.size(); i++) { - Task t = mChildren.get(i); - if (t.getGid().equals(gid)) { - return t; - } - } - return null; - } - - public int getChildTaskIndex(Task task) { - return mChildren.indexOf(task); - } - - public Task getChildTaskByIndex(int index) { - if (index < 0 || index >= mChildren.size()) { - Log.e(TAG, "getTaskByIndex: invalid index"); - return null; - } - return mChildren.get(index); - } - - public Task getChilTaskByGid(String gid) { - for (Task task : mChildren) { - if (task.getGid().equals(gid)) - return task; - } - return null; - } - - public ArrayList getChildTaskList() { - return this.mChildren; - } - - public void setIndex(int index) { - this.mIndex = index; - } - - public int getIndex() { - return this.mIndex; - } -} diff --git a/src/minotes/gtask/exception/ActionFailureException.java b/src/minotes/gtask/exception/ActionFailureException.java deleted file mode 100644 index 15504be..0000000 --- a/src/minotes/gtask/exception/ActionFailureException.java +++ /dev/null @@ -1,33 +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.gtask.exception; - -public class ActionFailureException extends RuntimeException { - private static final long serialVersionUID = 4425249765923293627L; - - public ActionFailureException() { - super(); - } - - public ActionFailureException(String paramString) { - super(paramString); - } - - public ActionFailureException(String paramString, Throwable paramThrowable) { - super(paramString, paramThrowable); - } -} diff --git a/src/minotes/gtask/exception/NetworkFailureException.java b/src/minotes/gtask/exception/NetworkFailureException.java deleted file mode 100644 index b08cfb1..0000000 --- a/src/minotes/gtask/exception/NetworkFailureException.java +++ /dev/null @@ -1,33 +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.gtask.exception; - -public class NetworkFailureException extends Exception { - private static final long serialVersionUID = 2107610287180234136L; - - public NetworkFailureException() { - super(); - } - - public NetworkFailureException(String paramString) { - super(paramString); - } - - public NetworkFailureException(String paramString, Throwable paramThrowable) { - super(paramString, paramThrowable); - } -} diff --git a/src/minotes/gtask/remote/GTaskASyncTask.java b/src/minotes/gtask/remote/GTaskASyncTask.java deleted file mode 100644 index b3b61e7..0000000 --- a/src/minotes/gtask/remote/GTaskASyncTask.java +++ /dev/null @@ -1,123 +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.gtask.remote; - -import android.app.Notification; -import android.app.NotificationManager; -import android.app.PendingIntent; -import android.content.Context; -import android.content.Intent; -import android.os.AsyncTask; - -import net.micode.notes.R; -import net.micode.notes.ui.NotesListActivity; -import net.micode.notes.ui.NotesPreferenceActivity; - - -public class GTaskASyncTask extends AsyncTask { - - private static int GTASK_SYNC_NOTIFICATION_ID = 5234235; - - public interface OnCompleteListener { - void onComplete(); - } - - private Context mContext; - - private NotificationManager mNotifiManager; - - private GTaskManager mTaskManager; - - private OnCompleteListener mOnCompleteListener; - - public GTaskASyncTask(Context context, OnCompleteListener listener) { - mContext = context; - mOnCompleteListener = listener; - mNotifiManager = (NotificationManager) mContext - .getSystemService(Context.NOTIFICATION_SERVICE); - mTaskManager = GTaskManager.getInstance(); - } - - public void cancelSync() { - mTaskManager.cancelSync(); - } - - public void publishProgess(String message) { - publishProgress(new String[] { - message - }); - } - - private void showNotification(int tickerId, String content) { - Notification notification = new Notification(R.drawable.notification, mContext - .getString(tickerId), System.currentTimeMillis()); - notification.defaults = Notification.DEFAULT_LIGHTS; - notification.flags = Notification.FLAG_AUTO_CANCEL; - PendingIntent pendingIntent; - if (tickerId != R.string.ticker_success) { - pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, - NotesPreferenceActivity.class), 0); - - } else { - 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); - } - - @Override - protected Integer doInBackground(Void... unused) { - publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity - .getSyncAccountName(mContext))); - return mTaskManager.sync(mContext, this); - } - - @Override - protected void onProgressUpdate(String... progress) { - showNotification(R.string.ticker_syncing, progress[0]); - if (mContext instanceof GTaskSyncService) { - ((GTaskSyncService) mContext).sendBroadcast(progress[0]); - } - } - - @Override - protected void onPostExecute(Integer result) { - if (result == GTaskManager.STATE_SUCCESS) { - showNotification(R.string.ticker_success, mContext.getString( - R.string.success_sync_account, mTaskManager.getSyncAccount())); - NotesPreferenceActivity.setLastSyncTime(mContext, System.currentTimeMillis()); - } else if (result == GTaskManager.STATE_NETWORK_ERROR) { - showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_network)); - } else if (result == GTaskManager.STATE_INTERNAL_ERROR) { - showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_internal)); - } else if (result == GTaskManager.STATE_SYNC_CANCELLED) { - showNotification(R.string.ticker_cancel, mContext - .getString(R.string.error_sync_cancelled)); - } - if (mOnCompleteListener != null) { - new Thread(new Runnable() { - - public void run() { - mOnCompleteListener.onComplete(); - } - }).start(); - } - } -} diff --git a/src/minotes/gtask/remote/GTaskClient.java b/src/minotes/gtask/remote/GTaskClient.java deleted file mode 100644 index c67dfdf..0000000 --- a/src/minotes/gtask/remote/GTaskClient.java +++ /dev/null @@ -1,585 +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.gtask.remote; - -import android.accounts.Account; -import android.accounts.AccountManager; -import android.accounts.AccountManagerFuture; -import android.app.Activity; -import android.os.Bundle; -import android.text.TextUtils; -import android.util.Log; - -import net.micode.notes.gtask.data.Node; -import net.micode.notes.gtask.data.Task; -import net.micode.notes.gtask.data.TaskList; -import net.micode.notes.gtask.exception.ActionFailureException; -import net.micode.notes.gtask.exception.NetworkFailureException; -import net.micode.notes.tool.GTaskStringUtils; -import net.micode.notes.ui.NotesPreferenceActivity; - -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.cookie.Cookie; -import org.apache.http.impl.client.BasicCookieStore; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.params.BasicHttpParams; -import org.apache.http.params.HttpConnectionParams; -import org.apache.http.params.HttpParams; -import org.apache.http.params.HttpProtocolParams; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.LinkedList; -import java.util.List; -import java.util.zip.GZIPInputStream; -import java.util.zip.Inflater; -import java.util.zip.InflaterInputStream; - - -public class GTaskClient { - private static final String TAG = GTaskClient.class.getSimpleName(); - - private static final String GTASK_URL = "https://mail.google.com/tasks/"; - - private static final String GTASK_GET_URL = "https://mail.google.com/tasks/ig"; - - private static final String GTASK_POST_URL = "https://mail.google.com/tasks/r/ig"; - - private static GTaskClient mInstance = null; - - private DefaultHttpClient mHttpClient; - - private String mGetUrl; - - private String mPostUrl; - - private long mClientVersion; - - private boolean mLoggedin; - - private long mLastLoginTime; - - private int mActionId; - - private Account mAccount; - - private JSONArray mUpdateArray; - - private GTaskClient() { - mHttpClient = null; - mGetUrl = GTASK_GET_URL; - mPostUrl = GTASK_POST_URL; - mClientVersion = -1; - mLoggedin = false; - mLastLoginTime = 0; - mActionId = 1; - mAccount = null; - mUpdateArray = null; - } - - public static synchronized GTaskClient getInstance() { - if (mInstance == null) { - mInstance = new GTaskClient(); - } - return mInstance; - } - - public boolean login(Activity activity) { - // we suppose that the cookie would expire after 5 minutes - // then we need to re-login - final long interval = 1000 * 60 * 5; - if (mLastLoginTime + interval < System.currentTimeMillis()) { - mLoggedin = false; - } - - // need to re-login after account switch - if (mLoggedin - && !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity - .getSyncAccountName(activity))) { - mLoggedin = false; - } - - if (mLoggedin) { - Log.d(TAG, "already logged in"); - return true; - } - - mLastLoginTime = System.currentTimeMillis(); - String authToken = loginGoogleAccount(activity, false); - if (authToken == null) { - Log.e(TAG, "login google account failed"); - return false; - } - - // login with custom domain if necessary - if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase() - .endsWith("googlemail.com"))) { - StringBuilder url = new StringBuilder(GTASK_URL).append("a/"); - int index = mAccount.name.indexOf('@') + 1; - String suffix = mAccount.name.substring(index); - url.append(suffix + "/"); - mGetUrl = url.toString() + "ig"; - mPostUrl = url.toString() + "r/ig"; - - if (tryToLoginGtask(activity, authToken)) { - mLoggedin = true; - } - } - - // try to login with google official url - if (!mLoggedin) { - mGetUrl = GTASK_GET_URL; - mPostUrl = GTASK_POST_URL; - if (!tryToLoginGtask(activity, authToken)) { - return false; - } - } - - mLoggedin = true; - return true; - } - - private String loginGoogleAccount(Activity activity, boolean invalidateToken) { - String authToken; - AccountManager accountManager = AccountManager.get(activity); - Account[] accounts = accountManager.getAccountsByType("com.google"); - - if (accounts.length == 0) { - Log.e(TAG, "there is no available google account"); - return null; - } - - String accountName = NotesPreferenceActivity.getSyncAccountName(activity); - Account account = null; - for (Account a : accounts) { - if (a.name.equals(accountName)) { - account = a; - break; - } - } - if (account != null) { - mAccount = account; - } else { - Log.e(TAG, "unable to get an account with the same name in the settings"); - return null; - } - - // get the token now - AccountManagerFuture accountManagerFuture = accountManager.getAuthToken(account, - "goanna_mobile", null, activity, null, null); - try { - Bundle authTokenBundle = accountManagerFuture.getResult(); - authToken = authTokenBundle.getString(AccountManager.KEY_AUTHTOKEN); - if (invalidateToken) { - accountManager.invalidateAuthToken("com.google", authToken); - loginGoogleAccount(activity, false); - } - } catch (Exception e) { - Log.e(TAG, "get auth token failed"); - authToken = null; - } - - return authToken; - } - - private boolean tryToLoginGtask(Activity activity, String authToken) { - if (!loginGtask(authToken)) { - // maybe the auth token is out of date, now let's invalidate the - // token and try again - authToken = loginGoogleAccount(activity, true); - if (authToken == null) { - Log.e(TAG, "login google account failed"); - return false; - } - - if (!loginGtask(authToken)) { - Log.e(TAG, "login gtask failed"); - return false; - } - } - return true; - } - - private boolean loginGtask(String authToken) { - int timeoutConnection = 10000; - int timeoutSocket = 15000; - HttpParams httpParameters = new BasicHttpParams(); - HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection); - HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket); - mHttpClient = new DefaultHttpClient(httpParameters); - BasicCookieStore localBasicCookieStore = new BasicCookieStore(); - mHttpClient.setCookieStore(localBasicCookieStore); - HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false); - - // login gtask - try { - String loginUrl = mGetUrl + "?auth=" + authToken; - HttpGet httpGet = new HttpGet(loginUrl); - HttpResponse response = null; - response = mHttpClient.execute(httpGet); - - // get the cookie now - List cookies = mHttpClient.getCookieStore().getCookies(); - boolean hasAuthCookie = false; - for (Cookie cookie : cookies) { - if (cookie.getName().contains("GTL")) { - hasAuthCookie = true; - } - } - if (!hasAuthCookie) { - Log.w(TAG, "it seems that there is no auth cookie"); - } - - // get the client version - String resString = getResponseContent(response.getEntity()); - String jsBegin = "_setup("; - String jsEnd = ")}"; - int begin = resString.indexOf(jsBegin); - int end = resString.lastIndexOf(jsEnd); - String jsString = null; - if (begin != -1 && end != -1 && begin < end) { - jsString = resString.substring(begin + jsBegin.length(), end); - } - JSONObject js = new JSONObject(jsString); - mClientVersion = js.getLong("v"); - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - return false; - } catch (Exception e) { - // simply catch all exceptions - Log.e(TAG, "httpget gtask_url failed"); - return false; - } - - return true; - } - - private int getActionId() { - return mActionId++; - } - - private HttpPost createHttpPost() { - HttpPost httpPost = new HttpPost(mPostUrl); - httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); - httpPost.setHeader("AT", "1"); - return httpPost; - } - - private String getResponseContent(HttpEntity entity) throws IOException { - String contentEncoding = null; - if (entity.getContentEncoding() != null) { - contentEncoding = entity.getContentEncoding().getValue(); - Log.d(TAG, "encoding: " + contentEncoding); - } - - InputStream input = entity.getContent(); - if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) { - input = new GZIPInputStream(entity.getContent()); - } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) { - Inflater inflater = new Inflater(true); - input = new InflaterInputStream(entity.getContent(), inflater); - } - - try { - InputStreamReader isr = new InputStreamReader(input); - BufferedReader br = new BufferedReader(isr); - StringBuilder sb = new StringBuilder(); - - while (true) { - String buff = br.readLine(); - if (buff == null) { - return sb.toString(); - } - sb = sb.append(buff); - } - } finally { - input.close(); - } - } - - private JSONObject postRequest(JSONObject js) throws NetworkFailureException { - if (!mLoggedin) { - Log.e(TAG, "please login first"); - throw new ActionFailureException("not logged in"); - } - - HttpPost httpPost = createHttpPost(); - try { - LinkedList list = new LinkedList(); - list.add(new BasicNameValuePair("r", js.toString())); - UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8"); - httpPost.setEntity(entity); - - // execute the post - HttpResponse response = mHttpClient.execute(httpPost); - String jsString = getResponseContent(response.getEntity()); - return new JSONObject(jsString); - - } catch (ClientProtocolException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new NetworkFailureException("postRequest failed"); - } catch (IOException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new NetworkFailureException("postRequest failed"); - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("unable to convert response content to jsonobject"); - } catch (Exception e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("error occurs when posting request"); - } - } - - public void createTask(Task task) throws NetworkFailureException { - commitUpdate(); - try { - JSONObject jsPost = new JSONObject(); - JSONArray actionList = new JSONArray(); - - // action_list - actionList.put(task.getCreateAction(getActionId())); - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); - - // client_version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - // post - JSONObject jsResponse = postRequest(jsPost); - JSONObject jsResult = (JSONObject) jsResponse.getJSONArray( - GTaskStringUtils.GTASK_JSON_RESULTS).get(0); - task.setGid(jsResult.getString(GTaskStringUtils.GTASK_JSON_NEW_ID)); - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("create task: handing jsonobject failed"); - } - } - - public void createTaskList(TaskList tasklist) throws NetworkFailureException { - commitUpdate(); - try { - JSONObject jsPost = new JSONObject(); - JSONArray actionList = new JSONArray(); - - // action_list - actionList.put(tasklist.getCreateAction(getActionId())); - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); - - // client version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - // post - JSONObject jsResponse = postRequest(jsPost); - JSONObject jsResult = (JSONObject) jsResponse.getJSONArray( - GTaskStringUtils.GTASK_JSON_RESULTS).get(0); - tasklist.setGid(jsResult.getString(GTaskStringUtils.GTASK_JSON_NEW_ID)); - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("create tasklist: handing jsonobject failed"); - } - } - - public void commitUpdate() throws NetworkFailureException { - if (mUpdateArray != null) { - try { - JSONObject jsPost = new JSONObject(); - - // action_list - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, mUpdateArray); - - // client_version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - postRequest(jsPost); - mUpdateArray = null; - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("commit update: handing jsonobject failed"); - } - } - } - - public void addUpdateNode(Node node) throws NetworkFailureException { - if (node != null) { - // too many update items may result in an error - // set max to 10 items - if (mUpdateArray != null && mUpdateArray.length() > 10) { - commitUpdate(); - } - - if (mUpdateArray == null) - mUpdateArray = new JSONArray(); - mUpdateArray.put(node.getUpdateAction(getActionId())); - } - } - - public void moveTask(Task task, TaskList preParent, TaskList curParent) - throws NetworkFailureException { - commitUpdate(); - try { - JSONObject jsPost = new JSONObject(); - JSONArray actionList = new JSONArray(); - JSONObject action = new JSONObject(); - - // action_list - action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, - GTaskStringUtils.GTASK_JSON_ACTION_TYPE_MOVE); - action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId()); - action.put(GTaskStringUtils.GTASK_JSON_ID, task.getGid()); - if (preParent == curParent && task.getPriorSibling() != null) { - // put prioring_sibing_id only if moving within the tasklist and - // it is not the first one - action.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, task.getPriorSibling()); - } - action.put(GTaskStringUtils.GTASK_JSON_SOURCE_LIST, preParent.getGid()); - action.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT, curParent.getGid()); - if (preParent != curParent) { - // put the dest_list only if moving between tasklists - action.put(GTaskStringUtils.GTASK_JSON_DEST_LIST, curParent.getGid()); - } - actionList.put(action); - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); - - // client_version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - postRequest(jsPost); - - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("move task: handing jsonobject failed"); - } - } - - public void deleteNode(Node node) throws NetworkFailureException { - commitUpdate(); - try { - JSONObject jsPost = new JSONObject(); - JSONArray actionList = new JSONArray(); - - // action_list - node.setDeleted(true); - actionList.put(node.getUpdateAction(getActionId())); - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); - - // client_version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - postRequest(jsPost); - mUpdateArray = null; - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("delete node: handing jsonobject failed"); - } - } - - public JSONArray getTaskLists() throws NetworkFailureException { - if (!mLoggedin) { - Log.e(TAG, "please login first"); - throw new ActionFailureException("not logged in"); - } - - try { - HttpGet httpGet = new HttpGet(mGetUrl); - HttpResponse response = null; - response = mHttpClient.execute(httpGet); - - // get the task list - String resString = getResponseContent(response.getEntity()); - String jsBegin = "_setup("; - String jsEnd = ")}"; - int begin = resString.indexOf(jsBegin); - int end = resString.lastIndexOf(jsEnd); - String jsString = null; - if (begin != -1 && end != -1 && begin < end) { - jsString = resString.substring(begin + jsBegin.length(), end); - } - JSONObject js = new JSONObject(jsString); - return js.getJSONObject("t").getJSONArray(GTaskStringUtils.GTASK_JSON_LISTS); - } catch (ClientProtocolException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new NetworkFailureException("gettasklists: httpget failed"); - } catch (IOException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new NetworkFailureException("gettasklists: httpget failed"); - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("get task lists: handing jasonobject failed"); - } - } - - public JSONArray getTaskList(String listGid) throws NetworkFailureException { - commitUpdate(); - try { - JSONObject jsPost = new JSONObject(); - JSONArray actionList = new JSONArray(); - JSONObject action = new JSONObject(); - - // action_list - action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, - GTaskStringUtils.GTASK_JSON_ACTION_TYPE_GETALL); - action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId()); - action.put(GTaskStringUtils.GTASK_JSON_LIST_ID, listGid); - action.put(GTaskStringUtils.GTASK_JSON_GET_DELETED, false); - actionList.put(action); - jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); - - // client_version - jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); - - JSONObject jsResponse = postRequest(jsPost); - return jsResponse.getJSONArray(GTaskStringUtils.GTASK_JSON_TASKS); - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("get task list: handing jsonobject failed"); - } - } - - public Account getSyncAccount() { - return mAccount; - } - - public void resetUpdateArray() { - mUpdateArray = null; - } -} diff --git a/src/minotes/gtask/remote/GTaskManager.java b/src/minotes/gtask/remote/GTaskManager.java deleted file mode 100644 index d2b4082..0000000 --- a/src/minotes/gtask/remote/GTaskManager.java +++ /dev/null @@ -1,800 +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.gtask.remote; - -import android.app.Activity; -import android.content.ContentResolver; -import android.content.ContentUris; -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.util.Log; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.gtask.data.MetaData; -import net.micode.notes.gtask.data.Node; -import net.micode.notes.gtask.data.SqlNote; -import net.micode.notes.gtask.data.Task; -import net.micode.notes.gtask.data.TaskList; -import net.micode.notes.gtask.exception.ActionFailureException; -import net.micode.notes.gtask.exception.NetworkFailureException; -import net.micode.notes.tool.DataUtils; -import net.micode.notes.tool.GTaskStringUtils; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; - - -public class GTaskManager { - private static final String TAG = GTaskManager.class.getSimpleName(); - - public static final int STATE_SUCCESS = 0; - - public static final int STATE_NETWORK_ERROR = 1; - - public static final int STATE_INTERNAL_ERROR = 2; - - public static final int STATE_SYNC_IN_PROGRESS = 3; - - public static final int STATE_SYNC_CANCELLED = 4; - - private static GTaskManager mInstance = null; - - private Activity mActivity; - - private Context mContext; - - private ContentResolver mContentResolver; - - private boolean mSyncing; - - private boolean mCancelled; - - private HashMap mGTaskListHashMap; - - private HashMap mGTaskHashMap; - - private HashMap mMetaHashMap; - - private TaskList mMetaList; - - private HashSet mLocalDeleteIdMap; - - private HashMap mGidToNid; - - private HashMap mNidToGid; - - private GTaskManager() { - mSyncing = false; - mCancelled = false; - mGTaskListHashMap = new HashMap(); - mGTaskHashMap = new HashMap(); - mMetaHashMap = new HashMap(); - mMetaList = null; - mLocalDeleteIdMap = new HashSet(); - mGidToNid = new HashMap(); - mNidToGid = new HashMap(); - } - - public static synchronized GTaskManager getInstance() { - if (mInstance == null) { - mInstance = new GTaskManager(); - } - return mInstance; - } - - public synchronized void setActivityContext(Activity activity) { - // used for getting authtoken - mActivity = activity; - } - - public int sync(Context context, GTaskASyncTask asyncTask) { - if (mSyncing) { - Log.d(TAG, "Sync is in progress"); - return STATE_SYNC_IN_PROGRESS; - } - mContext = context; - mContentResolver = mContext.getContentResolver(); - mSyncing = true; - mCancelled = false; - mGTaskListHashMap.clear(); - mGTaskHashMap.clear(); - mMetaHashMap.clear(); - mLocalDeleteIdMap.clear(); - mGidToNid.clear(); - mNidToGid.clear(); - - try { - GTaskClient client = GTaskClient.getInstance(); - client.resetUpdateArray(); - - // login google task - if (!mCancelled) { - if (!client.login(mActivity)) { - throw new NetworkFailureException("login google task failed"); - } - } - - // get the task list from google - asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list)); - initGTaskList(); - - // do content sync work - asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing)); - syncContent(); - } catch (NetworkFailureException e) { - Log.e(TAG, e.toString()); - return STATE_NETWORK_ERROR; - } catch (ActionFailureException e) { - Log.e(TAG, e.toString()); - return STATE_INTERNAL_ERROR; - } catch (Exception e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - return STATE_INTERNAL_ERROR; - } finally { - mGTaskListHashMap.clear(); - mGTaskHashMap.clear(); - mMetaHashMap.clear(); - mLocalDeleteIdMap.clear(); - mGidToNid.clear(); - mNidToGid.clear(); - mSyncing = false; - } - - return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS; - } - - private void initGTaskList() throws NetworkFailureException { - if (mCancelled) - return; - GTaskClient client = GTaskClient.getInstance(); - try { - JSONArray jsTaskLists = client.getTaskLists(); - - // init meta list first - mMetaList = null; - for (int i = 0; i < jsTaskLists.length(); i++) { - JSONObject object = jsTaskLists.getJSONObject(i); - String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); - String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME); - - if (name - .equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) { - mMetaList = new TaskList(); - mMetaList.setContentByRemoteJSON(object); - - // load meta data - JSONArray jsMetas = client.getTaskList(gid); - for (int j = 0; j < jsMetas.length(); j++) { - object = (JSONObject) jsMetas.getJSONObject(j); - MetaData metaData = new MetaData(); - metaData.setContentByRemoteJSON(object); - if (metaData.isWorthSaving()) { - mMetaList.addChildTask(metaData); - if (metaData.getGid() != null) { - mMetaHashMap.put(metaData.getRelatedGid(), metaData); - } - } - } - } - } - - // create meta list if not existed - if (mMetaList == null) { - mMetaList = new TaskList(); - mMetaList.setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX - + GTaskStringUtils.FOLDER_META); - GTaskClient.getInstance().createTaskList(mMetaList); - } - - // init task list - for (int i = 0; i < jsTaskLists.length(); i++) { - JSONObject object = jsTaskLists.getJSONObject(i); - String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); - String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME); - - if (name.startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX) - && !name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX - + GTaskStringUtils.FOLDER_META)) { - TaskList tasklist = new TaskList(); - tasklist.setContentByRemoteJSON(object); - mGTaskListHashMap.put(gid, tasklist); - mGTaskHashMap.put(gid, tasklist); - - // load tasks - JSONArray jsTasks = client.getTaskList(gid); - for (int j = 0; j < jsTasks.length(); j++) { - object = (JSONObject) jsTasks.getJSONObject(j); - gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); - Task task = new Task(); - task.setContentByRemoteJSON(object); - if (task.isWorthSaving()) { - task.setMetaInfo(mMetaHashMap.get(gid)); - tasklist.addChildTask(task); - mGTaskHashMap.put(gid, task); - } - } - } - } - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("initGTaskList: handing JSONObject failed"); - } - } - - private void syncContent() throws NetworkFailureException { - int syncType; - Cursor c = null; - String gid; - Node node; - - mLocalDeleteIdMap.clear(); - - if (mCancelled) { - return; - } - - // for local deleted note - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, - "(type<>? AND parent_id=?)", new String[] { - String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER) - }, null); - if (c != null) { - while (c.moveToNext()) { - gid = c.getString(SqlNote.GTASK_ID_COLUMN); - node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - doContentSync(Node.SYNC_ACTION_DEL_REMOTE, node, c); - } - - mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN)); - } - } else { - Log.w(TAG, "failed to query trash folder"); - } - } finally { - if (c != null) { - c.close(); - c = null; - } - } - - // sync folder first - syncFolder(); - - // for note existing in database - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, - "(type=? AND parent_id<>?)", new String[] { - String.valueOf(Notes.TYPE_NOTE), String.valueOf(Notes.ID_TRASH_FOLER) - }, NoteColumns.TYPE + " DESC"); - if (c != null) { - while (c.moveToNext()) { - gid = c.getString(SqlNote.GTASK_ID_COLUMN); - node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN)); - mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid); - syncType = node.getSyncAction(c); - } else { - if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) { - // local add - syncType = Node.SYNC_ACTION_ADD_REMOTE; - } else { - // remote delete - syncType = Node.SYNC_ACTION_DEL_LOCAL; - } - } - doContentSync(syncType, node, c); - } - } else { - Log.w(TAG, "failed to query existing note in database"); - } - - } finally { - if (c != null) { - c.close(); - c = null; - } - } - - // go through remaining items - Iterator> iter = mGTaskHashMap.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry entry = iter.next(); - node = entry.getValue(); - doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); - } - - // mCancelled can be set by another thread, so we neet to check one by - // one - // clear local delete table - if (!mCancelled) { - if (!DataUtils.batchDeleteNotes(mContentResolver, mLocalDeleteIdMap)) { - throw new ActionFailureException("failed to batch-delete local deleted notes"); - } - } - - // refresh local sync id - if (!mCancelled) { - GTaskClient.getInstance().commitUpdate(); - refreshLocalSyncId(); - } - - } - - private void syncFolder() throws NetworkFailureException { - Cursor c = null; - String gid; - Node node; - int syncType; - - if (mCancelled) { - return; - } - - // for root folder - try { - c = mContentResolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, - Notes.ID_ROOT_FOLDER), SqlNote.PROJECTION_NOTE, null, null, null); - if (c != null) { - c.moveToNext(); - gid = c.getString(SqlNote.GTASK_ID_COLUMN); - node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - mGidToNid.put(gid, (long) Notes.ID_ROOT_FOLDER); - mNidToGid.put((long) Notes.ID_ROOT_FOLDER, gid); - // for system folder, only update remote name if necessary - if (!node.getName().equals( - GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT)) - doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c); - } else { - doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c); - } - } else { - Log.w(TAG, "failed to query root folder"); - } - } finally { - if (c != null) { - c.close(); - c = null; - } - } - - // for call-note folder - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, "(_id=?)", - new String[] { - String.valueOf(Notes.ID_CALL_RECORD_FOLDER) - }, null); - if (c != null) { - if (c.moveToNext()) { - gid = c.getString(SqlNote.GTASK_ID_COLUMN); - node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - mGidToNid.put(gid, (long) Notes.ID_CALL_RECORD_FOLDER); - mNidToGid.put((long) Notes.ID_CALL_RECORD_FOLDER, gid); - // for system folder, only update remote name if - // necessary - if (!node.getName().equals( - GTaskStringUtils.MIUI_FOLDER_PREFFIX - + GTaskStringUtils.FOLDER_CALL_NOTE)) - doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c); - } else { - doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c); - } - } - } else { - Log.w(TAG, "failed to query call note folder"); - } - } finally { - if (c != null) { - c.close(); - c = null; - } - } - - // for local existing folders - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, - "(type=? AND parent_id<>?)", new String[] { - String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER) - }, NoteColumns.TYPE + " DESC"); - if (c != null) { - while (c.moveToNext()) { - gid = c.getString(SqlNote.GTASK_ID_COLUMN); - node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN)); - mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid); - syncType = node.getSyncAction(c); - } else { - if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) { - // local add - syncType = Node.SYNC_ACTION_ADD_REMOTE; - } else { - // remote delete - syncType = Node.SYNC_ACTION_DEL_LOCAL; - } - } - doContentSync(syncType, node, c); - } - } else { - Log.w(TAG, "failed to query existing folder"); - } - } finally { - if (c != null) { - c.close(); - c = null; - } - } - - // for remote add folders - Iterator> iter = mGTaskListHashMap.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry entry = iter.next(); - gid = entry.getKey(); - node = entry.getValue(); - if (mGTaskHashMap.containsKey(gid)) { - mGTaskHashMap.remove(gid); - doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); - } - } - - if (!mCancelled) - GTaskClient.getInstance().commitUpdate(); - } - - private void doContentSync(int syncType, Node node, Cursor c) throws NetworkFailureException { - if (mCancelled) { - return; - } - - MetaData meta; - switch (syncType) { - case Node.SYNC_ACTION_ADD_LOCAL: - addLocalNode(node); - break; - case Node.SYNC_ACTION_ADD_REMOTE: - addRemoteNode(node, c); - break; - case Node.SYNC_ACTION_DEL_LOCAL: - meta = mMetaHashMap.get(c.getString(SqlNote.GTASK_ID_COLUMN)); - if (meta != null) { - GTaskClient.getInstance().deleteNode(meta); - } - mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN)); - break; - case Node.SYNC_ACTION_DEL_REMOTE: - meta = mMetaHashMap.get(node.getGid()); - if (meta != null) { - GTaskClient.getInstance().deleteNode(meta); - } - GTaskClient.getInstance().deleteNode(node); - break; - case Node.SYNC_ACTION_UPDATE_LOCAL: - updateLocalNode(node, c); - break; - case Node.SYNC_ACTION_UPDATE_REMOTE: - updateRemoteNode(node, c); - break; - case Node.SYNC_ACTION_UPDATE_CONFLICT: - // merging both modifications maybe a good idea - // right now just use local update simply - updateRemoteNode(node, c); - break; - case Node.SYNC_ACTION_NONE: - break; - case Node.SYNC_ACTION_ERROR: - default: - throw new ActionFailureException("unkown sync action type"); - } - } - - private void addLocalNode(Node node) throws NetworkFailureException { - if (mCancelled) { - return; - } - - SqlNote sqlNote; - if (node instanceof TaskList) { - if (node.getName().equals( - GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT)) { - sqlNote = new SqlNote(mContext, Notes.ID_ROOT_FOLDER); - } else if (node.getName().equals( - GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_CALL_NOTE)) { - sqlNote = new SqlNote(mContext, Notes.ID_CALL_RECORD_FOLDER); - } else { - sqlNote = new SqlNote(mContext); - sqlNote.setContent(node.getLocalJSONFromContent()); - sqlNote.setParentId(Notes.ID_ROOT_FOLDER); - } - } else { - sqlNote = new SqlNote(mContext); - JSONObject js = node.getLocalJSONFromContent(); - try { - if (js.has(GTaskStringUtils.META_HEAD_NOTE)) { - JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - if (note.has(NoteColumns.ID)) { - long id = note.getLong(NoteColumns.ID); - if (DataUtils.existInNoteDatabase(mContentResolver, id)) { - // the id is not available, have to create a new one - note.remove(NoteColumns.ID); - } - } - } - - if (js.has(GTaskStringUtils.META_HEAD_DATA)) { - JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); - for (int i = 0; i < dataArray.length(); i++) { - JSONObject data = dataArray.getJSONObject(i); - if (data.has(DataColumns.ID)) { - long dataId = data.getLong(DataColumns.ID); - if (DataUtils.existInDataDatabase(mContentResolver, dataId)) { - // the data id is not available, have to create - // a new one - data.remove(DataColumns.ID); - } - } - } - - } - } catch (JSONException e) { - Log.w(TAG, e.toString()); - e.printStackTrace(); - } - sqlNote.setContent(js); - - Long parentId = mGidToNid.get(((Task) node).getParent().getGid()); - if (parentId == null) { - Log.e(TAG, "cannot find task's parent id locally"); - throw new ActionFailureException("cannot add local node"); - } - sqlNote.setParentId(parentId.longValue()); - } - - // create the local node - sqlNote.setGtaskId(node.getGid()); - sqlNote.commit(false); - - // update gid-nid mapping - mGidToNid.put(node.getGid(), sqlNote.getId()); - mNidToGid.put(sqlNote.getId(), node.getGid()); - - // update meta - updateRemoteMeta(node.getGid(), sqlNote); - } - - private void updateLocalNode(Node node, Cursor c) throws NetworkFailureException { - if (mCancelled) { - return; - } - - SqlNote sqlNote; - // update the note locally - sqlNote = new SqlNote(mContext, c); - sqlNote.setContent(node.getLocalJSONFromContent()); - - Long parentId = (node instanceof Task) ? mGidToNid.get(((Task) node).getParent().getGid()) - : new Long(Notes.ID_ROOT_FOLDER); - if (parentId == null) { - Log.e(TAG, "cannot find task's parent id locally"); - throw new ActionFailureException("cannot update local node"); - } - sqlNote.setParentId(parentId.longValue()); - sqlNote.commit(true); - - // update meta info - updateRemoteMeta(node.getGid(), sqlNote); - } - - private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException { - if (mCancelled) { - return; - } - - SqlNote sqlNote = new SqlNote(mContext, c); - Node n; - - // update remotely - if (sqlNote.isNoteType()) { - Task task = new Task(); - task.setContentByLocalJSON(sqlNote.getContent()); - - String parentGid = mNidToGid.get(sqlNote.getParentId()); - if (parentGid == null) { - Log.e(TAG, "cannot find task's parent tasklist"); - throw new ActionFailureException("cannot add remote task"); - } - mGTaskListHashMap.get(parentGid).addChildTask(task); - - GTaskClient.getInstance().createTask(task); - n = (Node) task; - - // add meta - updateRemoteMeta(task.getGid(), sqlNote); - } else { - TaskList tasklist = null; - - // we need to skip folder if it has already existed - String folderName = GTaskStringUtils.MIUI_FOLDER_PREFFIX; - if (sqlNote.getId() == Notes.ID_ROOT_FOLDER) - folderName += GTaskStringUtils.FOLDER_DEFAULT; - else if (sqlNote.getId() == Notes.ID_CALL_RECORD_FOLDER) - folderName += GTaskStringUtils.FOLDER_CALL_NOTE; - else - folderName += sqlNote.getSnippet(); - - Iterator> iter = mGTaskListHashMap.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry entry = iter.next(); - String gid = entry.getKey(); - TaskList list = entry.getValue(); - - if (list.getName().equals(folderName)) { - tasklist = list; - if (mGTaskHashMap.containsKey(gid)) { - mGTaskHashMap.remove(gid); - } - break; - } - } - - // no match we can add now - if (tasklist == null) { - tasklist = new TaskList(); - tasklist.setContentByLocalJSON(sqlNote.getContent()); - GTaskClient.getInstance().createTaskList(tasklist); - mGTaskListHashMap.put(tasklist.getGid(), tasklist); - } - n = (Node) tasklist; - } - - // update local note - sqlNote.setGtaskId(n.getGid()); - sqlNote.commit(false); - sqlNote.resetLocalModified(); - sqlNote.commit(true); - - // gid-id mapping - mGidToNid.put(n.getGid(), sqlNote.getId()); - mNidToGid.put(sqlNote.getId(), n.getGid()); - } - - private void updateRemoteNode(Node node, Cursor c) throws NetworkFailureException { - if (mCancelled) { - return; - } - - SqlNote sqlNote = new SqlNote(mContext, c); - - // update remotely - node.setContentByLocalJSON(sqlNote.getContent()); - GTaskClient.getInstance().addUpdateNode(node); - - // update meta - updateRemoteMeta(node.getGid(), sqlNote); - - // move task if necessary - if (sqlNote.isNoteType()) { - Task task = (Task) node; - TaskList preParentList = task.getParent(); - - String curParentGid = mNidToGid.get(sqlNote.getParentId()); - if (curParentGid == null) { - Log.e(TAG, "cannot find task's parent tasklist"); - throw new ActionFailureException("cannot update remote task"); - } - TaskList curParentList = mGTaskListHashMap.get(curParentGid); - - if (preParentList != curParentList) { - preParentList.removeChildTask(task); - curParentList.addChildTask(task); - GTaskClient.getInstance().moveTask(task, preParentList, curParentList); - } - } - - // clear local modified flag - sqlNote.resetLocalModified(); - sqlNote.commit(true); - } - - private void updateRemoteMeta(String gid, SqlNote sqlNote) throws NetworkFailureException { - if (sqlNote != null && sqlNote.isNoteType()) { - MetaData metaData = mMetaHashMap.get(gid); - if (metaData != null) { - metaData.setMeta(gid, sqlNote.getContent()); - GTaskClient.getInstance().addUpdateNode(metaData); - } else { - metaData = new MetaData(); - metaData.setMeta(gid, sqlNote.getContent()); - mMetaList.addChildTask(metaData); - mMetaHashMap.put(gid, metaData); - GTaskClient.getInstance().createTask(metaData); - } - } - } - - private void refreshLocalSyncId() throws NetworkFailureException { - if (mCancelled) { - return; - } - - // get the latest gtask list - mGTaskHashMap.clear(); - mGTaskListHashMap.clear(); - mMetaHashMap.clear(); - initGTaskList(); - - Cursor c = null; - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, - "(type<>? AND parent_id<>?)", new String[] { - String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER) - }, NoteColumns.TYPE + " DESC"); - if (c != null) { - while (c.moveToNext()) { - String gid = c.getString(SqlNote.GTASK_ID_COLUMN); - Node node = mGTaskHashMap.get(gid); - if (node != null) { - mGTaskHashMap.remove(gid); - ContentValues values = new ContentValues(); - values.put(NoteColumns.SYNC_ID, node.getLastModified()); - mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, - c.getLong(SqlNote.ID_COLUMN)), values, null, null); - } else { - Log.e(TAG, "something is missed"); - throw new ActionFailureException( - "some local items don't have gid after sync"); - } - } - } else { - Log.w(TAG, "failed to query local note to refresh sync id"); - } - } finally { - if (c != null) { - c.close(); - c = null; - } - } - } - - public String getSyncAccount() { - return GTaskClient.getInstance().getSyncAccount().name; - } - - public void cancelSync() { - mCancelled = true; - } -} diff --git a/src/minotes/gtask/remote/GTaskSyncService.java b/src/minotes/gtask/remote/GTaskSyncService.java deleted file mode 100644 index cca36f7..0000000 --- a/src/minotes/gtask/remote/GTaskSyncService.java +++ /dev/null @@ -1,128 +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.gtask.remote; - -import android.app.Activity; -import android.app.Service; -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.os.IBinder; - -public class GTaskSyncService extends Service { - public final static String ACTION_STRING_NAME = "sync_action_type"; - - public final static int ACTION_START_SYNC = 0; - - public final static int ACTION_CANCEL_SYNC = 1; - - public final static int ACTION_INVALID = 2; - - public final static String GTASK_SERVICE_BROADCAST_NAME = "net.micode.notes.gtask.remote.gtask_sync_service"; - - public final static String GTASK_SERVICE_BROADCAST_IS_SYNCING = "isSyncing"; - - public final static String GTASK_SERVICE_BROADCAST_PROGRESS_MSG = "progressMsg"; - - private static GTaskASyncTask mSyncTask = null; - - private static String mSyncProgress = ""; - - private void startSync() { - if (mSyncTask == null) { - mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() { - public void onComplete() { - mSyncTask = null; - sendBroadcast(""); - stopSelf(); - } - }); - sendBroadcast(""); - mSyncTask.execute(); - } - } - - private void cancelSync() { - if (mSyncTask != null) { - mSyncTask.cancelSync(); - } - } - - @Override - public void onCreate() { - mSyncTask = null; - } - - @Override - public int onStartCommand(Intent intent, int flags, int startId) { - Bundle bundle = intent.getExtras(); - if (bundle != null && bundle.containsKey(ACTION_STRING_NAME)) { - switch (bundle.getInt(ACTION_STRING_NAME, ACTION_INVALID)) { - case ACTION_START_SYNC: - startSync(); - break; - case ACTION_CANCEL_SYNC: - cancelSync(); - break; - default: - break; - } - return START_STICKY; - } - return super.onStartCommand(intent, flags, startId); - } - - @Override - public void onLowMemory() { - if (mSyncTask != null) { - mSyncTask.cancelSync(); - } - } - - public IBinder onBind(Intent intent) { - return null; - } - - public void sendBroadcast(String msg) { - mSyncProgress = msg; - Intent intent = new Intent(GTASK_SERVICE_BROADCAST_NAME); - intent.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null); - intent.putExtra(GTASK_SERVICE_BROADCAST_PROGRESS_MSG, msg); - sendBroadcast(intent); - } - - public static void startSync(Activity activity) { - GTaskManager.getInstance().setActivityContext(activity); - Intent intent = new Intent(activity, GTaskSyncService.class); - intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_START_SYNC); - activity.startService(intent); - } - - public static void cancelSync(Context context) { - Intent intent = new Intent(context, GTaskSyncService.class); - intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_CANCEL_SYNC); - context.startService(intent); - } - - public static boolean isSyncing() { - return mSyncTask != null; - } - - public static String getProgressString() { - return mSyncProgress; - } -} diff --git a/src/minotes/model/Note.java b/src/minotes/model/Note.java deleted file mode 100644 index 6706cf6..0000000 --- a/src/minotes/model/Note.java +++ /dev/null @@ -1,253 +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.model; -import android.content.ContentProviderOperation; -import android.content.ContentProviderResult; -import android.content.ContentUris; -import android.content.ContentValues; -import android.content.Context; -import android.content.OperationApplicationException; -import android.net.Uri; -import android.os.RemoteException; -import android.util.Log; - -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.CallNote; -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.data.Notes.TextNote; - -import java.util.ArrayList; - - -public class Note { - private ContentValues mNoteDiffValues; - private NoteData mNoteData; - private static final String TAG = "Note"; - /** - * Create a new note id for adding a new note to databases - */ - public static synchronized long getNewNoteId(Context context, long folderId) { - // Create a new note in the database - ContentValues values = new ContentValues(); - long createdTime = System.currentTimeMillis(); - values.put(NoteColumns.CREATED_DATE, createdTime); - values.put(NoteColumns.MODIFIED_DATE, createdTime); - values.put(NoteColumns.TYPE, Notes.TYPE_NOTE); - values.put(NoteColumns.LOCAL_MODIFIED, 1); - values.put(NoteColumns.PARENT_ID, folderId); - Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values); - - long noteId = 0; - try { - noteId = Long.valueOf(uri.getPathSegments().get(1)); - } catch (NumberFormatException e) { - Log.e(TAG, "Get note id error :" + e.toString()); - noteId = 0; - } - if (noteId == -1) { - throw new IllegalStateException("Wrong note id:" + noteId); - } - return noteId; - } - - public Note() { - mNoteDiffValues = new ContentValues(); - mNoteData = new NoteData(); - } - - public void setNoteValue(String key, String value) { - mNoteDiffValues.put(key, value); - mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); - mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); - } - - public void setTextData(String key, String value) { - mNoteData.setTextData(key, value); - } - - public void setTextDataId(long id) { - mNoteData.setTextDataId(id); - } - - public long getTextDataId() { - return mNoteData.mTextDataId; - } - - public void setCallDataId(long id) { - mNoteData.setCallDataId(id); - } - - public void setCallData(String key, String value) { - mNoteData.setCallData(key, value); - } - - public boolean isLocalModified() { - return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified(); - } - - public boolean syncNote(Context context, long noteId) { - if (noteId <= 0) { - throw new IllegalArgumentException("Wrong note id:" + noteId); - } - - if (!isLocalModified()) { - return true; - } - - /** - * In theory, once data changed, the note should be updated on {@link NoteColumns#LOCAL_MODIFIED} and - * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the - * note data info - */ - if (context.getContentResolver().update( - ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null, - null) == 0) { - Log.e(TAG, "Update note error, should not happen"); - // Do not return, fall through - } - mNoteDiffValues.clear(); - - if (mNoteData.isLocalModified() - && (mNoteData.pushIntoContentResolver(context, noteId) == null)) { - return false; - } - - return true; - } - - private class NoteData { - private long mTextDataId; - - private ContentValues mTextDataValues; - - private long mCallDataId; - - private ContentValues mCallDataValues; - - private static final String TAG = "NoteData"; - - public NoteData() { - mTextDataValues = new ContentValues(); - mCallDataValues = new ContentValues(); - mTextDataId = 0; - mCallDataId = 0; - } - - boolean isLocalModified() { - return mTextDataValues.size() > 0 || mCallDataValues.size() > 0; - } - - void setTextDataId(long id) { - if(id <= 0) { - throw new IllegalArgumentException("Text data id should larger than 0"); - } - mTextDataId = id; - } - - void setCallDataId(long id) { - if (id <= 0) { - throw new IllegalArgumentException("Call data id should larger than 0"); - } - mCallDataId = id; - } - - void setCallData(String key, String value) { - mCallDataValues.put(key, value); - mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); - mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); - } - - void setTextData(String key, String value) { - mTextDataValues.put(key, value); - mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); - mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); - } - - Uri pushIntoContentResolver(Context context, long noteId) { - /** - * Check for safety - */ - if (noteId <= 0) { - throw new IllegalArgumentException("Wrong note id:" + noteId); - } - - ArrayList operationList = new ArrayList(); - ContentProviderOperation.Builder builder = null; - - if(mTextDataValues.size() > 0) { - mTextDataValues.put(DataColumns.NOTE_ID, noteId); - if (mTextDataId == 0) { - mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE); - Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI, - mTextDataValues); - try { - setTextDataId(Long.valueOf(uri.getPathSegments().get(1))); - } catch (NumberFormatException e) { - Log.e(TAG, "Insert new text data fail with noteId" + noteId); - mTextDataValues.clear(); - return null; - } - } else { - builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( - Notes.CONTENT_DATA_URI, mTextDataId)); - builder.withValues(mTextDataValues); - operationList.add(builder.build()); - } - mTextDataValues.clear(); - } - - if(mCallDataValues.size() > 0) { - mCallDataValues.put(DataColumns.NOTE_ID, noteId); - if (mCallDataId == 0) { - mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE); - Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI, - mCallDataValues); - try { - setCallDataId(Long.valueOf(uri.getPathSegments().get(1))); - } catch (NumberFormatException e) { - Log.e(TAG, "Insert new call data fail with noteId" + noteId); - mCallDataValues.clear(); - return null; - } - } else { - builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( - Notes.CONTENT_DATA_URI, mCallDataId)); - builder.withValues(mCallDataValues); - operationList.add(builder.build()); - } - mCallDataValues.clear(); - } - - if (operationList.size() > 0) { - try { - ContentProviderResult[] results = context.getContentResolver().applyBatch( - Notes.AUTHORITY, operationList); - return (results == null || results.length == 0 || results[0] == null) ? null - : ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId); - } catch (RemoteException e) { - Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); - return null; - } catch (OperationApplicationException e) { - Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); - return null; - } - } - return null; - } - } -} diff --git a/src/minotes/tool/ResourceParser.java b/src/minotes/tool/ResourceParser.java deleted file mode 100644 index 1ad3ad6..0000000 --- a/src/minotes/tool/ResourceParser.java +++ /dev/null @@ -1,181 +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.tool; - -import android.content.Context; -import android.preference.PreferenceManager; - -import net.micode.notes.R; -import net.micode.notes.ui.NotesPreferenceActivity; - -public class ResourceParser { - - public static final int YELLOW = 0; - public static final int BLUE = 1; - public static final int WHITE = 2; - public static final int GREEN = 3; - public static final int RED = 4; - - public static final int BG_DEFAULT_COLOR = YELLOW; - - public static final int TEXT_SMALL = 0; - public static final int TEXT_MEDIUM = 1; - public static final int TEXT_LARGE = 2; - public static final int TEXT_SUPER = 3; - - public static final int BG_DEFAULT_FONT_SIZE = TEXT_MEDIUM; - - public static class NoteBgResources { - private final static int [] BG_EDIT_RESOURCES = new int [] { - R.drawable.edit_yellow, - R.drawable.edit_blue, - R.drawable.edit_white, - R.drawable.edit_green, - R.drawable.edit_red - }; - - private final static int [] BG_EDIT_TITLE_RESOURCES = new int [] { - R.drawable.edit_title_yellow, - R.drawable.edit_title_blue, - R.drawable.edit_title_white, - R.drawable.edit_title_green, - R.drawable.edit_title_red - }; - - public static int getNoteBgResource(int id) { - return BG_EDIT_RESOURCES[id]; - } - - public static int getNoteTitleBgResource(int id) { - return BG_EDIT_TITLE_RESOURCES[id]; - } - } - - public static int getDefaultBgId(Context context) { - if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean( - NotesPreferenceActivity.PREFERENCE_SET_BG_COLOR_KEY, false)) { - return (int) (Math.random() * NoteBgResources.BG_EDIT_RESOURCES.length); - } else { - return BG_DEFAULT_COLOR; - } - } - - public static class NoteItemBgResources { - private final static int [] BG_FIRST_RESOURCES = new int [] { - R.drawable.list_yellow_up, - R.drawable.list_blue_up, - R.drawable.list_white_up, - R.drawable.list_green_up, - R.drawable.list_red_up - }; - - private final static int [] BG_NORMAL_RESOURCES = new int [] { - R.drawable.list_yellow_middle, - R.drawable.list_blue_middle, - R.drawable.list_white_middle, - R.drawable.list_green_middle, - R.drawable.list_red_middle - }; - - private final static int [] BG_LAST_RESOURCES = new int [] { - R.drawable.list_yellow_down, - R.drawable.list_blue_down, - R.drawable.list_white_down, - R.drawable.list_green_down, - R.drawable.list_red_down, - }; - - private final static int [] BG_SINGLE_RESOURCES = new int [] { - R.drawable.list_yellow_single, - R.drawable.list_blue_single, - R.drawable.list_white_single, - R.drawable.list_green_single, - R.drawable.list_red_single - }; - - public static int getNoteBgFirstRes(int id) { - return BG_FIRST_RESOURCES[id]; - } - - public static int getNoteBgLastRes(int id) { - return BG_LAST_RESOURCES[id]; - } - - public static int getNoteBgSingleRes(int id) { - return BG_SINGLE_RESOURCES[id]; - } - - public static int getNoteBgNormalRes(int id) { - return BG_NORMAL_RESOURCES[id]; - } - - public static int getFolderBgRes() { - return R.drawable.list_folder; - } - } - - public static class WidgetBgResources { - private final static int [] BG_2X_RESOURCES = new int [] { - R.drawable.widget_2x_yellow, - R.drawable.widget_2x_blue, - R.drawable.widget_2x_white, - R.drawable.widget_2x_green, - R.drawable.widget_2x_red, - }; - - public static int getWidget2xBgResource(int id) { - return BG_2X_RESOURCES[id]; - } - - private final static int [] BG_4X_RESOURCES = new int [] { - R.drawable.widget_4x_yellow, - R.drawable.widget_4x_blue, - R.drawable.widget_4x_white, - R.drawable.widget_4x_green, - R.drawable.widget_4x_red - }; - - public static int getWidget4xBgResource(int id) { - return BG_4X_RESOURCES[id]; - } - } - - public static class TextAppearanceResources { - private final static int [] TEXTAPPEARANCE_RESOURCES = new int [] { - R.style.TextAppearanceNormal, - R.style.TextAppearanceMedium, - R.style.TextAppearanceLarge, - R.style.TextAppearanceSuper - }; - - public static int getTexAppearanceResource(int id) { - /** - * 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 (id >= TEXTAPPEARANCE_RESOURCES.length) { - return BG_DEFAULT_FONT_SIZE; - } - return TEXTAPPEARANCE_RESOURCES[id]; - } - - public static int getResourcesSize() { - return TEXTAPPEARANCE_RESOURCES.length; - } - } -} diff --git a/src/minotes/ui/AlarmAlertActivity.java b/src/minotes/ui/AlarmAlertActivity.java deleted file mode 100644 index 85723be..0000000 --- a/src/minotes/ui/AlarmAlertActivity.java +++ /dev/null @@ -1,158 +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.app.Activity; -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; -import android.content.DialogInterface.OnDismissListener; -import android.content.Intent; -import android.media.AudioManager; -import android.media.MediaPlayer; -import android.media.RingtoneManager; -import android.net.Uri; -import android.os.Bundle; -import android.os.PowerManager; -import android.provider.Settings; -import android.view.Window; -import android.view.WindowManager; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.tool.DataUtils; - -import java.io.IOException; - - -public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener { - private long mNoteId; - private String mSnippet; - private static final int SNIPPET_PREW_MAX_LEN = 60; - MediaPlayer mPlayer; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - requestWindowFeature(Window.FEATURE_NO_TITLE); - - final Window win = getWindow(); - win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); - - if (!isScreenOn()) { - win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON - | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON - | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON - | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR); - } - - Intent intent = getIntent(); - - try { - mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1)); - mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId); - mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0, - SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info) - : mSnippet; - } catch (IllegalArgumentException e) { - e.printStackTrace(); - return; - } - - mPlayer = new MediaPlayer(); - if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) { - showActionDialog(); - playAlarmSound(); - } else { - finish(); - } - } - - private boolean isScreenOn() { - PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE); - return pm.isScreenOn(); - } - - private void playAlarmSound() { - Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM); - - int silentModeStreams = Settings.System.getInt(getContentResolver(), - Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0); - - if ((silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0) { - mPlayer.setAudioStreamType(silentModeStreams); - } else { - mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM); - } - try { - mPlayer.setDataSource(this, url); - mPlayer.prepare(); - mPlayer.setLooping(true); - mPlayer.start(); - } catch (IllegalArgumentException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (SecurityException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IllegalStateException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - private void showActionDialog() { - AlertDialog.Builder dialog = new AlertDialog.Builder(this); - dialog.setTitle(R.string.app_name); - dialog.setMessage(mSnippet); - dialog.setPositiveButton(R.string.notealert_ok, this); - if (isScreenOn()) { - dialog.setNegativeButton(R.string.notealert_enter, this); - } - dialog.show().setOnDismissListener(this); - } - - public void onClick(DialogInterface dialog, int which) { - switch (which) { - case DialogInterface.BUTTON_NEGATIVE: - Intent intent = new Intent(this, NoteEditActivity.class); - intent.setAction(Intent.ACTION_VIEW); - intent.putExtra(Intent.EXTRA_UID, mNoteId); - startActivity(intent); - break; - default: - break; - } - } - - public void onDismiss(DialogInterface dialog) { - stopAlarmSound(); - finish(); - } - - private void stopAlarmSound() { - if (mPlayer != null) { - mPlayer.stop(); - mPlayer.release(); - mPlayer = null; - } - } -} diff --git a/src/minotes/ui/AlarmInitReceiver.java b/src/minotes/ui/AlarmInitReceiver.java deleted file mode 100644 index f221202..0000000 --- a/src/minotes/ui/AlarmInitReceiver.java +++ /dev/null @@ -1,65 +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.app.AlarmManager; -import android.app.PendingIntent; -import android.content.BroadcastReceiver; -import android.content.ContentUris; -import android.content.Context; -import android.content.Intent; -import android.database.Cursor; - -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.NoteColumns; - - -public class AlarmInitReceiver extends BroadcastReceiver { - - private static final String [] PROJECTION = new String [] { - NoteColumns.ID, - NoteColumns.ALERTED_DATE - }; - - private static final int COLUMN_ID = 0; - private static final int COLUMN_ALERTED_DATE = 1; - - @Override - public void onReceive(Context context, Intent intent) { - long currentDate = System.currentTimeMillis(); - Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI, - PROJECTION, - NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE, - new String[] { String.valueOf(currentDate) }, - null); - - if (c != null) { - if (c.moveToFirst()) { - do { - long alertDate = c.getLong(COLUMN_ALERTED_DATE); - Intent sender = new Intent(context, AlarmReceiver.class); - sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID))); - PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0); - AlarmManager alermManager = (AlarmManager) context - .getSystemService(Context.ALARM_SERVICE); - alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent); - } while (c.moveToNext()); - } - c.close(); - } - } -} diff --git a/src/minotes/ui/AlarmReceiver.java b/src/minotes/ui/AlarmReceiver.java deleted file mode 100644 index 54e503b..0000000 --- a/src/minotes/ui/AlarmReceiver.java +++ /dev/null @@ -1,30 +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.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; - -public class AlarmReceiver extends BroadcastReceiver { - @Override - public void onReceive(Context context, Intent intent) { - intent.setClass(context, AlarmAlertActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); - } -} diff --git a/src/minotes/ui/DateTimePicker.java b/src/minotes/ui/DateTimePicker.java deleted file mode 100644 index 496b0cd..0000000 --- a/src/minotes/ui/DateTimePicker.java +++ /dev/null @@ -1,485 +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 java.text.DateFormatSymbols; -import java.util.Calendar; - -import net.micode.notes.R; - - -import android.content.Context; -import android.text.format.DateFormat; -import android.view.View; -import android.widget.FrameLayout; -import android.widget.NumberPicker; - -public class DateTimePicker extends FrameLayout { - - private static final boolean DEFAULT_ENABLE_STATE = true; - - private static final int HOURS_IN_HALF_DAY = 12; - private static final int HOURS_IN_ALL_DAY = 24; - private static final int DAYS_IN_ALL_WEEK = 7; - private static final int DATE_SPINNER_MIN_VAL = 0; - private static final int DATE_SPINNER_MAX_VAL = DAYS_IN_ALL_WEEK - 1; - private static final int HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW = 0; - private static final int HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW = 23; - private static final int HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW = 1; - private static final int HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW = 12; - private static final int MINUT_SPINNER_MIN_VAL = 0; - private static final int MINUT_SPINNER_MAX_VAL = 59; - private static final int AMPM_SPINNER_MIN_VAL = 0; - private static final int AMPM_SPINNER_MAX_VAL = 1; - - private final NumberPicker mDateSpinner; - private final NumberPicker mHourSpinner; - private final NumberPicker mMinuteSpinner; - private final NumberPicker mAmPmSpinner; - private Calendar mDate; - - private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK]; - - private boolean mIsAm; - - private boolean mIs24HourView; - - private boolean mIsEnabled = DEFAULT_ENABLE_STATE; - - private boolean mInitialising; - - private OnDateTimeChangedListener mOnDateTimeChangedListener; - - private NumberPicker.OnValueChangeListener mOnDateChangedListener = new NumberPicker.OnValueChangeListener() { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - mDate.add(Calendar.DAY_OF_YEAR, newVal - oldVal); - updateDateControl(); - onDateTimeChanged(); - } - }; - - private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - boolean isDateChanged = false; - Calendar cal = Calendar.getInstance(); - if (!mIs24HourView) { - if (!mIsAm && oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) { - cal.setTimeInMillis(mDate.getTimeInMillis()); - cal.add(Calendar.DAY_OF_YEAR, 1); - isDateChanged = true; - } else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { - cal.setTimeInMillis(mDate.getTimeInMillis()); - cal.add(Calendar.DAY_OF_YEAR, -1); - isDateChanged = true; - } - if (oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY || - oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { - mIsAm = !mIsAm; - updateAmPmControl(); - } - } else { - if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) { - cal.setTimeInMillis(mDate.getTimeInMillis()); - cal.add(Calendar.DAY_OF_YEAR, 1); - isDateChanged = true; - } else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) { - cal.setTimeInMillis(mDate.getTimeInMillis()); - cal.add(Calendar.DAY_OF_YEAR, -1); - isDateChanged = true; - } - } - int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY); - mDate.set(Calendar.HOUR_OF_DAY, newHour); - onDateTimeChanged(); - if (isDateChanged) { - setCurrentYear(cal.get(Calendar.YEAR)); - setCurrentMonth(cal.get(Calendar.MONTH)); - setCurrentDay(cal.get(Calendar.DAY_OF_MONTH)); - } - } - }; - - private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - int minValue = mMinuteSpinner.getMinValue(); - int maxValue = mMinuteSpinner.getMaxValue(); - int offset = 0; - if (oldVal == maxValue && newVal == minValue) { - offset += 1; - } else if (oldVal == minValue && newVal == maxValue) { - offset -= 1; - } - if (offset != 0) { - mDate.add(Calendar.HOUR_OF_DAY, offset); - mHourSpinner.setValue(getCurrentHour()); - updateDateControl(); - int newHour = getCurrentHourOfDay(); - if (newHour >= HOURS_IN_HALF_DAY) { - mIsAm = false; - updateAmPmControl(); - } else { - mIsAm = true; - updateAmPmControl(); - } - } - mDate.set(Calendar.MINUTE, newVal); - onDateTimeChanged(); - } - }; - - private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - mIsAm = !mIsAm; - if (mIsAm) { - mDate.add(Calendar.HOUR_OF_DAY, -HOURS_IN_HALF_DAY); - } else { - mDate.add(Calendar.HOUR_OF_DAY, HOURS_IN_HALF_DAY); - } - updateAmPmControl(); - onDateTimeChanged(); - } - }; - - public interface OnDateTimeChangedListener { - void onDateTimeChanged(DateTimePicker view, int year, int month, - int dayOfMonth, int hourOfDay, int minute); - } - - public DateTimePicker(Context context) { - this(context, System.currentTimeMillis()); - } - - public DateTimePicker(Context context, long date) { - this(context, date, DateFormat.is24HourFormat(context)); - } - - public DateTimePicker(Context context, long date, boolean is24HourView) { - super(context); - mDate = Calendar.getInstance(); - mInitialising = true; - mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY; - inflate(context, R.layout.datetime_picker, this); - - mDateSpinner = (NumberPicker) findViewById(R.id.date); - mDateSpinner.setMinValue(DATE_SPINNER_MIN_VAL); - mDateSpinner.setMaxValue(DATE_SPINNER_MAX_VAL); - mDateSpinner.setOnValueChangedListener(mOnDateChangedListener); - - mHourSpinner = (NumberPicker) findViewById(R.id.hour); - mHourSpinner.setOnValueChangedListener(mOnHourChangedListener); - mMinuteSpinner = (NumberPicker) findViewById(R.id.minute); - mMinuteSpinner.setMinValue(MINUT_SPINNER_MIN_VAL); - mMinuteSpinner.setMaxValue(MINUT_SPINNER_MAX_VAL); - mMinuteSpinner.setOnLongPressUpdateInterval(100); - mMinuteSpinner.setOnValueChangedListener(mOnMinuteChangedListener); - - String[] stringsForAmPm = new DateFormatSymbols().getAmPmStrings(); - mAmPmSpinner = (NumberPicker) findViewById(R.id.amPm); - mAmPmSpinner.setMinValue(AMPM_SPINNER_MIN_VAL); - mAmPmSpinner.setMaxValue(AMPM_SPINNER_MAX_VAL); - mAmPmSpinner.setDisplayedValues(stringsForAmPm); - mAmPmSpinner.setOnValueChangedListener(mOnAmPmChangedListener); - - // update controls to initial state - updateDateControl(); - updateHourControl(); - updateAmPmControl(); - - set24HourView(is24HourView); - - // set to current time - setCurrentDate(date); - - setEnabled(isEnabled()); - - // set the content descriptions - mInitialising = false; - } - - @Override - public void setEnabled(boolean enabled) { - if (mIsEnabled == enabled) { - return; - } - super.setEnabled(enabled); - mDateSpinner.setEnabled(enabled); - mMinuteSpinner.setEnabled(enabled); - mHourSpinner.setEnabled(enabled); - mAmPmSpinner.setEnabled(enabled); - mIsEnabled = enabled; - } - - @Override - public boolean isEnabled() { - return mIsEnabled; - } - - /** - * Get the current date in millis - * - * @return the current date in millis - */ - public long getCurrentDateInTimeMillis() { - return mDate.getTimeInMillis(); - } - - /** - * Set the current date - * - * @param date The current date in millis - */ - public void setCurrentDate(long date) { - Calendar cal = Calendar.getInstance(); - cal.setTimeInMillis(date); - setCurrentDate(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), - cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE)); - } - - /** - * Set the current date - * - * @param year The current year - * @param month The current month - * @param dayOfMonth The current dayOfMonth - * @param hourOfDay The current hourOfDay - * @param minute The current minute - */ - public void setCurrentDate(int year, int month, - int dayOfMonth, int hourOfDay, int minute) { - setCurrentYear(year); - setCurrentMonth(month); - setCurrentDay(dayOfMonth); - setCurrentHour(hourOfDay); - setCurrentMinute(minute); - } - - /** - * Get current year - * - * @return The current year - */ - public int getCurrentYear() { - return mDate.get(Calendar.YEAR); - } - - /** - * Set current year - * - * @param year The current year - */ - public void setCurrentYear(int year) { - if (!mInitialising && year == getCurrentYear()) { - return; - } - mDate.set(Calendar.YEAR, year); - updateDateControl(); - onDateTimeChanged(); - } - - /** - * Get current month in the year - * - * @return The current month in the year - */ - public int getCurrentMonth() { - return mDate.get(Calendar.MONTH); - } - - /** - * Set current month in the year - * - * @param month The month in the year - */ - public void setCurrentMonth(int month) { - if (!mInitialising && month == getCurrentMonth()) { - return; - } - mDate.set(Calendar.MONTH, month); - updateDateControl(); - onDateTimeChanged(); - } - - /** - * Get current day of the month - * - * @return The day of the month - */ - public int getCurrentDay() { - return mDate.get(Calendar.DAY_OF_MONTH); - } - - /** - * Set current day of the month - * - * @param dayOfMonth The day of the month - */ - public void setCurrentDay(int dayOfMonth) { - if (!mInitialising && dayOfMonth == getCurrentDay()) { - return; - } - mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth); - updateDateControl(); - onDateTimeChanged(); - } - - /** - * Get current hour in 24 hour mode, in the range (0~23) - * @return The current hour in 24 hour mode - */ - public int getCurrentHourOfDay() { - return mDate.get(Calendar.HOUR_OF_DAY); - } - - private int getCurrentHour() { - if (mIs24HourView){ - return getCurrentHourOfDay(); - } else { - int hour = getCurrentHourOfDay(); - if (hour > HOURS_IN_HALF_DAY) { - return hour - HOURS_IN_HALF_DAY; - } else { - return hour == 0 ? HOURS_IN_HALF_DAY : hour; - } - } - } - - /** - * Set current hour in 24 hour mode, in the range (0~23) - * - * @param hourOfDay - */ - public void setCurrentHour(int hourOfDay) { - if (!mInitialising && hourOfDay == getCurrentHourOfDay()) { - return; - } - mDate.set(Calendar.HOUR_OF_DAY, hourOfDay); - if (!mIs24HourView) { - if (hourOfDay >= HOURS_IN_HALF_DAY) { - mIsAm = false; - if (hourOfDay > HOURS_IN_HALF_DAY) { - hourOfDay -= HOURS_IN_HALF_DAY; - } - } else { - mIsAm = true; - if (hourOfDay == 0) { - hourOfDay = HOURS_IN_HALF_DAY; - } - } - updateAmPmControl(); - } - mHourSpinner.setValue(hourOfDay); - onDateTimeChanged(); - } - - /** - * Get currentMinute - * - * @return The Current Minute - */ - public int getCurrentMinute() { - return mDate.get(Calendar.MINUTE); - } - - /** - * Set current minute - */ - public void setCurrentMinute(int minute) { - if (!mInitialising && minute == getCurrentMinute()) { - return; - } - mMinuteSpinner.setValue(minute); - mDate.set(Calendar.MINUTE, minute); - onDateTimeChanged(); - } - - /** - * @return true if this is in 24 hour view else false. - */ - public boolean is24HourView () { - return mIs24HourView; - } - - /** - * Set whether in 24 hour or AM/PM mode. - * - * @param is24HourView True for 24 hour mode. False for AM/PM mode. - */ - public void set24HourView(boolean is24HourView) { - if (mIs24HourView == is24HourView) { - return; - } - mIs24HourView = is24HourView; - mAmPmSpinner.setVisibility(is24HourView ? View.GONE : View.VISIBLE); - int hour = getCurrentHourOfDay(); - updateHourControl(); - setCurrentHour(hour); - updateAmPmControl(); - } - - private void updateDateControl() { - Calendar cal = Calendar.getInstance(); - cal.setTimeInMillis(mDate.getTimeInMillis()); - cal.add(Calendar.DAY_OF_YEAR, -DAYS_IN_ALL_WEEK / 2 - 1); - mDateSpinner.setDisplayedValues(null); - for (int i = 0; i < DAYS_IN_ALL_WEEK; ++i) { - cal.add(Calendar.DAY_OF_YEAR, 1); - mDateDisplayValues[i] = (String) DateFormat.format("MM.dd EEEE", cal); - } - mDateSpinner.setDisplayedValues(mDateDisplayValues); - mDateSpinner.setValue(DAYS_IN_ALL_WEEK / 2); - mDateSpinner.invalidate(); - } - - private void updateAmPmControl() { - if (mIs24HourView) { - mAmPmSpinner.setVisibility(View.GONE); - } else { - int index = mIsAm ? Calendar.AM : Calendar.PM; - mAmPmSpinner.setValue(index); - mAmPmSpinner.setVisibility(View.VISIBLE); - } - } - - private void updateHourControl() { - if (mIs24HourView) { - mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW); - mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW); - } else { - mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW); - mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW); - } - } - - /** - * Set the callback that indicates the 'Set' button has been pressed. - * @param callback the callback, if null will do nothing - */ - public void setOnDateTimeChangedListener(OnDateTimeChangedListener callback) { - mOnDateTimeChangedListener = callback; - } - - private void onDateTimeChanged() { - if (mOnDateTimeChangedListener != null) { - mOnDateTimeChangedListener.onDateTimeChanged(this, getCurrentYear(), - getCurrentMonth(), getCurrentDay(), getCurrentHourOfDay(), getCurrentMinute()); - } - } -} diff --git a/src/minotes/ui/DateTimePickerDialog.java b/src/minotes/ui/DateTimePickerDialog.java deleted file mode 100644 index 2c47ba4..0000000 --- a/src/minotes/ui/DateTimePickerDialog.java +++ /dev/null @@ -1,90 +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 java.util.Calendar; - -import net.micode.notes.R; -import net.micode.notes.ui.DateTimePicker; -import net.micode.notes.ui.DateTimePicker.OnDateTimeChangedListener; - -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; -import android.text.format.DateFormat; -import android.text.format.DateUtils; - -public class DateTimePickerDialog extends AlertDialog implements OnClickListener { - - private Calendar mDate = Calendar.getInstance(); - private boolean mIs24HourView; - private OnDateTimeSetListener mOnDateTimeSetListener; - private DateTimePicker mDateTimePicker; - - public interface OnDateTimeSetListener { - void OnDateTimeSet(AlertDialog dialog, long date); - } - - public DateTimePickerDialog(Context context, long date) { - super(context); - mDateTimePicker = new DateTimePicker(context); - setView(mDateTimePicker); - mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() { - public void onDateTimeChanged(DateTimePicker view, int year, int month, - int dayOfMonth, int hourOfDay, int minute) { - mDate.set(Calendar.YEAR, year); - mDate.set(Calendar.MONTH, month); - mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth); - mDate.set(Calendar.HOUR_OF_DAY, hourOfDay); - mDate.set(Calendar.MINUTE, minute); - updateTitle(mDate.getTimeInMillis()); - } - }); - mDate.setTimeInMillis(date); - mDate.set(Calendar.SECOND, 0); - mDateTimePicker.setCurrentDate(mDate.getTimeInMillis()); - setButton(context.getString(R.string.datetime_dialog_ok), this); - setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null); - set24HourView(DateFormat.is24HourFormat(this.getContext())); - updateTitle(mDate.getTimeInMillis()); - } - - public void set24HourView(boolean is24HourView) { - mIs24HourView = is24HourView; - } - - public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) { - mOnDateTimeSetListener = callBack; - } - - private void updateTitle(long date) { - int flag = - DateUtils.FORMAT_SHOW_YEAR | - DateUtils.FORMAT_SHOW_DATE | - DateUtils.FORMAT_SHOW_TIME; - flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR; - setTitle(DateUtils.formatDateTime(this.getContext(), date, flag)); - } - - public void onClick(DialogInterface arg0, int arg1) { - if (mOnDateTimeSetListener != null) { - mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis()); - } - } - -} \ No newline at end of file diff --git a/src/minotes/ui/DropdownMenu.java b/src/minotes/ui/DropdownMenu.java deleted file mode 100644 index 613dc74..0000000 --- a/src/minotes/ui/DropdownMenu.java +++ /dev/null @@ -1,61 +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.content.Context; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.Button; -import android.widget.PopupMenu; -import android.widget.PopupMenu.OnMenuItemClickListener; - -import net.micode.notes.R; - -public class DropdownMenu { - private Button mButton; - private PopupMenu mPopupMenu; - private Menu mMenu; - - public DropdownMenu(Context context, Button button, int menuId) { - mButton = button; - mButton.setBackgroundResource(R.drawable.dropdown_icon); - mPopupMenu = new PopupMenu(context, mButton); - mMenu = mPopupMenu.getMenu(); - mPopupMenu.getMenuInflater().inflate(menuId, mMenu); - mButton.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - mPopupMenu.show(); - } - }); - } - - public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) { - if (mPopupMenu != null) { - mPopupMenu.setOnMenuItemClickListener(listener); - } - } - - public MenuItem findItem(int id) { - return mMenu.findItem(id); - } - - public void setTitle(CharSequence title) { - mButton.setText(title); - } -} diff --git a/src/minotes/ui/FoldersListAdapter.java b/src/minotes/ui/FoldersListAdapter.java deleted file mode 100644 index 96b77da..0000000 --- a/src/minotes/ui/FoldersListAdapter.java +++ /dev/null @@ -1,80 +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.content.Context; -import android.database.Cursor; -import android.view.View; -import android.view.ViewGroup; -import android.widget.CursorAdapter; -import android.widget.LinearLayout; -import android.widget.TextView; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.NoteColumns; - - -public class FoldersListAdapter extends CursorAdapter { - public static final String [] PROJECTION = { - NoteColumns.ID, - NoteColumns.SNIPPET - }; - - public static final int ID_COLUMN = 0; - public static final int NAME_COLUMN = 1; - - public FoldersListAdapter(Context context, Cursor c) { - super(context, c); - // TODO Auto-generated constructor stub - } - - @Override - public View newView(Context context, Cursor cursor, ViewGroup parent) { - return new FolderListItem(context); - } - - @Override - public void bindView(View view, Context context, Cursor cursor) { - if (view instanceof FolderListItem) { - String folderName = (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context - .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN); - ((FolderListItem) view).bind(folderName); - } - } - - public String getFolderName(Context context, int position) { - Cursor cursor = (Cursor) getItem(position); - return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context - .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN); - } - - private class FolderListItem extends LinearLayout { - private TextView mName; - - public FolderListItem(Context context) { - super(context); - inflate(context, R.layout.folder_list_item, this); - mName = (TextView) findViewById(R.id.tv_folder_name); - } - - public void bind(String name) { - mName.setText(name); - } - } - -} diff --git a/src/minotes/ui/NoteEditActivity.java b/src/minotes/ui/NoteEditActivity.java deleted file mode 100644 index 96a9ff8..0000000 --- a/src/minotes/ui/NoteEditActivity.java +++ /dev/null @@ -1,873 +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.app.Activity; -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.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.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_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/minotes/ui/NoteEditText.java b/src/minotes/ui/NoteEditText.java deleted file mode 100644 index 2afe2a8..0000000 --- a/src/minotes/ui/NoteEditText.java +++ /dev/null @@ -1,217 +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.content.Context; -import android.graphics.Rect; -import android.text.Layout; -import android.text.Selection; -import android.text.Spanned; -import android.text.TextUtils; -import android.text.style.URLSpan; -import android.util.AttributeSet; -import android.util.Log; -import android.view.ContextMenu; -import android.view.KeyEvent; -import android.view.MenuItem; -import android.view.MenuItem.OnMenuItemClickListener; -import android.view.MotionEvent; -import android.widget.EditText; - -import net.micode.notes.R; - -import java.util.HashMap; -import java.util.Map; - -public class NoteEditText extends EditText { - private static final String TAG = "NoteEditText"; - private int mIndex; - private int mSelectionStartBeforeDelete; - - private static final String SCHEME_TEL = "tel:" ; - private static final String SCHEME_HTTP = "http:" ; - private static final String SCHEME_EMAIL = "mailto:" ; - - private static final Map sSchemaActionResMap = new HashMap(); - static { - sSchemaActionResMap.put(SCHEME_TEL, R.string.note_link_tel); - sSchemaActionResMap.put(SCHEME_HTTP, R.string.note_link_web); - sSchemaActionResMap.put(SCHEME_EMAIL, R.string.note_link_email); - } - - /** - * Call by the {@link NoteEditActivity} to delete or add edit text - */ - public interface OnTextViewChangeListener { - /** - * Delete current edit text when {@link KeyEvent#KEYCODE_DEL} happens - * and the text is null - */ - void onEditTextDelete(int index, String text); - - /** - * Add edit text after current edit text when {@link KeyEvent#KEYCODE_ENTER} - * happen - */ - void onEditTextEnter(int index, String text); - - /** - * Hide or show item option when text change - */ - void onTextChange(int index, boolean hasText); - } - - private OnTextViewChangeListener mOnTextViewChangeListener; - - public NoteEditText(Context context) { - super(context, null); - mIndex = 0; - } - - public void setIndex(int index) { - mIndex = index; - } - - public void setOnTextViewChangeListener(OnTextViewChangeListener listener) { - mOnTextViewChangeListener = listener; - } - - public NoteEditText(Context context, AttributeSet attrs) { - super(context, attrs, android.R.attr.editTextStyle); - } - - public NoteEditText(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - // TODO Auto-generated constructor stub - } - - @Override - public boolean onTouchEvent(MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - - int x = (int) event.getX(); - int y = (int) event.getY(); - x -= getTotalPaddingLeft(); - y -= getTotalPaddingTop(); - x += getScrollX(); - y += getScrollY(); - - Layout layout = getLayout(); - int line = layout.getLineForVertical(y); - int off = layout.getOffsetForHorizontal(line, x); - Selection.setSelection(getText(), off); - break; - } - - return super.onTouchEvent(event); - } - - @Override - public boolean onKeyDown(int keyCode, KeyEvent event) { - switch (keyCode) { - case KeyEvent.KEYCODE_ENTER: - if (mOnTextViewChangeListener != null) { - return false; - } - break; - case KeyEvent.KEYCODE_DEL: - mSelectionStartBeforeDelete = getSelectionStart(); - break; - default: - break; - } - return super.onKeyDown(keyCode, event); - } - - @Override - public boolean onKeyUp(int keyCode, KeyEvent event) { - switch(keyCode) { - case KeyEvent.KEYCODE_DEL: - if (mOnTextViewChangeListener != null) { - if (0 == mSelectionStartBeforeDelete && mIndex != 0) { - mOnTextViewChangeListener.onEditTextDelete(mIndex, getText().toString()); - return true; - } - } else { - Log.d(TAG, "OnTextViewChangeListener was not seted"); - } - break; - case KeyEvent.KEYCODE_ENTER: - if (mOnTextViewChangeListener != null) { - int selectionStart = getSelectionStart(); - String text = getText().subSequence(selectionStart, length()).toString(); - setText(getText().subSequence(0, selectionStart)); - mOnTextViewChangeListener.onEditTextEnter(mIndex + 1, text); - } else { - Log.d(TAG, "OnTextViewChangeListener was not seted"); - } - break; - default: - break; - } - return super.onKeyUp(keyCode, event); - } - - @Override - protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) { - if (mOnTextViewChangeListener != null) { - if (!focused && TextUtils.isEmpty(getText())) { - mOnTextViewChangeListener.onTextChange(mIndex, false); - } else { - mOnTextViewChangeListener.onTextChange(mIndex, true); - } - } - super.onFocusChanged(focused, direction, previouslyFocusedRect); - } - - @Override - protected void onCreateContextMenu(ContextMenu menu) { - if (getText() instanceof Spanned) { - int selStart = getSelectionStart(); - int selEnd = getSelectionEnd(); - - int min = Math.min(selStart, selEnd); - int max = Math.max(selStart, selEnd); - - final URLSpan[] urls = ((Spanned) getText()).getSpans(min, max, URLSpan.class); - if (urls.length == 1) { - int defaultResId = 0; - for(String schema: sSchemaActionResMap.keySet()) { - if(urls[0].getURL().indexOf(schema) >= 0) { - defaultResId = sSchemaActionResMap.get(schema); - break; - } - } - - if (defaultResId == 0) { - defaultResId = R.string.note_link_other; - } - - menu.add(0, 0, 0, defaultResId).setOnMenuItemClickListener( - new OnMenuItemClickListener() { - public boolean onMenuItemClick(MenuItem item) { - // goto a new intent - urls[0].onClick(NoteEditText.this); - return true; - } - }); - } - } - super.onCreateContextMenu(menu); - } -} diff --git a/src/minotes/ui/NoteItemData.java b/src/minotes/ui/NoteItemData.java deleted file mode 100644 index 0f5a878..0000000 --- a/src/minotes/ui/NoteItemData.java +++ /dev/null @@ -1,224 +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.content.Context; -import android.database.Cursor; -import android.text.TextUtils; - -import net.micode.notes.data.Contact; -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.tool.DataUtils; - - -public class NoteItemData { - static final String [] PROJECTION = new String [] { - 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, - NoteColumns.TYPE, - NoteColumns.WIDGET_ID, - NoteColumns.WIDGET_TYPE, - }; - - private static final int ID_COLUMN = 0; - private static final int ALERTED_DATE_COLUMN = 1; - private static final int BG_COLOR_ID_COLUMN = 2; - private static final int CREATED_DATE_COLUMN = 3; - private static final int HAS_ATTACHMENT_COLUMN = 4; - private static final int MODIFIED_DATE_COLUMN = 5; - private static final int NOTES_COUNT_COLUMN = 6; - private static final int PARENT_ID_COLUMN = 7; - private static final int SNIPPET_COLUMN = 8; - private static final int TYPE_COLUMN = 9; - private static final int WIDGET_ID_COLUMN = 10; - private static final int WIDGET_TYPE_COLUMN = 11; - - private long mId; - private long mAlertDate; - private int mBgColorId; - private long mCreatedDate; - private boolean mHasAttachment; - private long mModifiedDate; - private int mNotesCount; - private long mParentId; - private String mSnippet; - private int mType; - private int mWidgetId; - private int mWidgetType; - private String mName; - private String mPhoneNumber; - - private boolean mIsLastItem; - private boolean mIsFirstItem; - private boolean mIsOnlyOneItem; - private boolean mIsOneNoteFollowingFolder; - private boolean mIsMultiNotesFollowingFolder; - - public NoteItemData(Context context, Cursor cursor) { - mId = cursor.getLong(ID_COLUMN); - mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN); - mBgColorId = cursor.getInt(BG_COLOR_ID_COLUMN); - mCreatedDate = cursor.getLong(CREATED_DATE_COLUMN); - mHasAttachment = (cursor.getInt(HAS_ATTACHMENT_COLUMN) > 0) ? true : false; - mModifiedDate = cursor.getLong(MODIFIED_DATE_COLUMN); - mNotesCount = cursor.getInt(NOTES_COUNT_COLUMN); - mParentId = cursor.getLong(PARENT_ID_COLUMN); - mSnippet = cursor.getString(SNIPPET_COLUMN); - mSnippet = mSnippet.replace(NoteEditActivity.TAG_CHECKED, "").replace( - NoteEditActivity.TAG_UNCHECKED, ""); - mType = cursor.getInt(TYPE_COLUMN); - mWidgetId = cursor.getInt(WIDGET_ID_COLUMN); - mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN); - - mPhoneNumber = ""; - if (mParentId == Notes.ID_CALL_RECORD_FOLDER) { - mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId); - if (!TextUtils.isEmpty(mPhoneNumber)) { - mName = Contact.getContact(context, mPhoneNumber); - if (mName == null) { - mName = mPhoneNumber; - } - } - } - - if (mName == null) { - mName = ""; - } - checkPostion(cursor); - } - - private void checkPostion(Cursor cursor) { - mIsLastItem = cursor.isLast() ? true : false; - mIsFirstItem = cursor.isFirst() ? true : false; - mIsOnlyOneItem = (cursor.getCount() == 1); - mIsMultiNotesFollowingFolder = false; - mIsOneNoteFollowingFolder = false; - - if (mType == Notes.TYPE_NOTE && !mIsFirstItem) { - int position = cursor.getPosition(); - if (cursor.moveToPrevious()) { - if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER - || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) { - if (cursor.getCount() > (position + 1)) { - mIsMultiNotesFollowingFolder = true; - } else { - mIsOneNoteFollowingFolder = true; - } - } - if (!cursor.moveToNext()) { - throw new IllegalStateException("cursor move to previous but can't move back"); - } - } - } - } - - public boolean isOneFollowingFolder() { - return mIsOneNoteFollowingFolder; - } - - public boolean isMultiFollowingFolder() { - return mIsMultiNotesFollowingFolder; - } - - public boolean isLast() { - return mIsLastItem; - } - - public String getCallName() { - return mName; - } - - public boolean isFirst() { - return mIsFirstItem; - } - - public boolean isSingle() { - return mIsOnlyOneItem; - } - - public long getId() { - return mId; - } - - public long getAlertDate() { - return mAlertDate; - } - - public long getCreatedDate() { - return mCreatedDate; - } - - public boolean hasAttachment() { - return mHasAttachment; - } - - public long getModifiedDate() { - return mModifiedDate; - } - - public int getBgColorId() { - return mBgColorId; - } - - public long getParentId() { - return mParentId; - } - - public int getNotesCount() { - return mNotesCount; - } - - public long getFolderId () { - return mParentId; - } - - public int getType() { - return mType; - } - - public int getWidgetType() { - return mWidgetType; - } - - public int getWidgetId() { - return mWidgetId; - } - - public String getSnippet() { - return mSnippet; - } - - public boolean hasAlert() { - return (mAlertDate > 0); - } - - public boolean isCallRecord() { - return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber)); - } - - public static int getNoteType(Cursor cursor) { - return cursor.getInt(TYPE_COLUMN); - } -} diff --git a/src/minotes/ui/NotesListActivity.java b/src/minotes/ui/NotesListActivity.java deleted file mode 100644 index e843aec..0000000 --- a/src/minotes/ui/NotesListActivity.java +++ /dev/null @@ -1,954 +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.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.appwidget.AppWidgetManager; -import android.content.AsyncQueryHandler; -import android.content.ContentResolver; -import android.content.ContentValues; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.SharedPreferences; -import android.database.Cursor; -import android.os.AsyncTask; -import android.os.Bundle; -import android.preference.PreferenceManager; -import android.text.Editable; -import android.text.TextUtils; -import android.text.TextWatcher; -import android.util.Log; -import android.view.ActionMode; -import android.view.ContextMenu; -import android.view.ContextMenu.ContextMenuInfo; -import android.view.Display; -import android.view.HapticFeedbackConstants; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuItem; -import android.view.MenuItem.OnMenuItemClickListener; -import android.view.MotionEvent; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.View.OnCreateContextMenuListener; -import android.view.View.OnTouchListener; -import android.view.inputmethod.InputMethodManager; -import android.widget.AdapterView; -import android.widget.AdapterView.OnItemClickListener; -import android.widget.AdapterView.OnItemLongClickListener; -import android.widget.Button; -import android.widget.EditText; -import android.widget.ListView; -import android.widget.PopupMenu; -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.NoteColumns; -import net.micode.notes.gtask.remote.GTaskSyncService; -import net.micode.notes.model.WorkingNote; -import net.micode.notes.tool.BackupUtils; -import net.micode.notes.tool.DataUtils; -import net.micode.notes.tool.ResourceParser; -import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute; -import net.micode.notes.widget.NoteWidgetProvider_2x; -import net.micode.notes.widget.NoteWidgetProvider_4x; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.HashSet; - -public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { - private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; - - private static final int FOLDER_LIST_QUERY_TOKEN = 1; - - private static final int MENU_FOLDER_DELETE = 0; - - private static final int MENU_FOLDER_VIEW = 1; - - private static final int MENU_FOLDER_CHANGE_NAME = 2; - - private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction"; - - private enum ListEditState { - NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER - }; - - private ListEditState mState; - - private BackgroundQueryHandler mBackgroundQueryHandler; - - private NotesListAdapter mNotesListAdapter; - - private ListView mNotesListView; - - private Button mAddNewNote; - - private boolean mDispatch; - - private int mOriginY; - - private int mDispatchY; - - private TextView mTitleBar; - - private long mCurrentFolderId; - - private ContentResolver mContentResolver; - - private ModeCallback mModeCallBack; - - private static final String TAG = "NotesListActivity"; - - public static final int NOTES_LISTVIEW_SCROLL_RATE = 30; - - private NoteItemData mFocusNoteDataItem; - - private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?"; - - private static final String ROOT_FOLDER_SELECTION = "(" + NoteColumns.TYPE + "<>" - + Notes.TYPE_SYSTEM + " AND " + NoteColumns.PARENT_ID + "=?)" + " OR (" - + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER + " AND " - + NoteColumns.NOTES_COUNT + ">0)"; - - private final static int REQUEST_CODE_OPEN_NODE = 102; - private final static int REQUEST_CODE_NEW_NODE = 103; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.note_list); - initResources(); - - /** - * Insert an introduction when user firstly use this application - */ - setAppInfoFromRawRes(); - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - if (resultCode == RESULT_OK - && (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) { - mNotesListAdapter.changeCursor(null); - } else { - super.onActivityResult(requestCode, resultCode, data); - } - } - - private void setAppInfoFromRawRes() { - SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); - if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) { - StringBuilder sb = new StringBuilder(); - InputStream in = null; - try { - in = getResources().openRawResource(R.raw.introduction); - if (in != null) { - InputStreamReader isr = new InputStreamReader(in); - BufferedReader br = new BufferedReader(isr); - char [] buf = new char[1024]; - int len = 0; - while ((len = br.read(buf)) > 0) { - sb.append(buf, 0, len); - } - } else { - Log.e(TAG, "Read introduction file error"); - return; - } - } catch (IOException e) { - e.printStackTrace(); - return; - } finally { - if(in != null) { - try { - in.close(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - } - - WorkingNote note = WorkingNote.createEmptyNote(this, Notes.ID_ROOT_FOLDER, - AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALIDE, - ResourceParser.RED); - note.setWorkingText(sb.toString()); - if (note.saveNote()) { - sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit(); - } else { - Log.e(TAG, "Save introduction note error"); - return; - } - } - } - - @Override - protected void onStart() { - super.onStart(); - startAsyncNotesListQuery(); - } - - private void initResources() { - mContentResolver = this.getContentResolver(); - mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver()); - mCurrentFolderId = Notes.ID_ROOT_FOLDER; - mNotesListView = (ListView) findViewById(R.id.notes_list); - mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null), - null, false); - mNotesListView.setOnItemClickListener(new OnListItemClickListener()); - mNotesListView.setOnItemLongClickListener(this); - mNotesListAdapter = new NotesListAdapter(this); - mNotesListView.setAdapter(mNotesListAdapter); - mAddNewNote = (Button) findViewById(R.id.btn_new_note); - mAddNewNote.setOnClickListener(this); - mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener()); - mDispatch = false; - mDispatchY = 0; - mOriginY = 0; - mTitleBar = (TextView) findViewById(R.id.tv_title_bar); - mState = ListEditState.NOTE_LIST; - mModeCallBack = new ModeCallback(); - } - - private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener { - private DropdownMenu mDropDownMenu; - private ActionMode mActionMode; - private MenuItem mMoveMenu; - - public boolean onCreateActionMode(ActionMode mode, Menu menu) { - getMenuInflater().inflate(R.menu.note_list_options, menu); - menu.findItem(R.id.delete).setOnMenuItemClickListener(this); - mMoveMenu = menu.findItem(R.id.move); - if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER - || DataUtils.getUserFolderCount(mContentResolver) == 0) { - mMoveMenu.setVisible(false); - } else { - mMoveMenu.setVisible(true); - mMoveMenu.setOnMenuItemClickListener(this); - } - mActionMode = mode; - mNotesListAdapter.setChoiceMode(true); - mNotesListView.setLongClickable(false); - mAddNewNote.setVisibility(View.GONE); - - View customView = LayoutInflater.from(NotesListActivity.this).inflate( - R.layout.note_list_dropdown_menu, null); - mode.setCustomView(customView); - mDropDownMenu = new DropdownMenu(NotesListActivity.this, - (Button) customView.findViewById(R.id.selection_menu), - R.menu.note_list_dropdown); - mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){ - public boolean onMenuItemClick(MenuItem item) { - mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected()); - updateMenu(); - return true; - } - - }); - return true; - } - - private void updateMenu() { - int selectedCount = mNotesListAdapter.getSelectedCount(); - // Update dropdown menu - String format = getResources().getString(R.string.menu_select_title, selectedCount); - mDropDownMenu.setTitle(format); - MenuItem item = mDropDownMenu.findItem(R.id.action_select_all); - if (item != null) { - if (mNotesListAdapter.isAllSelected()) { - item.setChecked(true); - item.setTitle(R.string.menu_deselect_all); - } else { - item.setChecked(false); - item.setTitle(R.string.menu_select_all); - } - } - } - - public boolean onPrepareActionMode(ActionMode mode, Menu menu) { - // TODO Auto-generated method stub - return false; - } - - public boolean onActionItemClicked(ActionMode mode, MenuItem item) { - // TODO Auto-generated method stub - return false; - } - - public void onDestroyActionMode(ActionMode mode) { - mNotesListAdapter.setChoiceMode(false); - mNotesListView.setLongClickable(true); - mAddNewNote.setVisibility(View.VISIBLE); - } - - public void finishActionMode() { - mActionMode.finish(); - } - - public void onItemCheckedStateChanged(ActionMode mode, int position, long id, - boolean checked) { - mNotesListAdapter.setCheckedItem(position, checked); - updateMenu(); - } - - public boolean onMenuItemClick(MenuItem item) { - if (mNotesListAdapter.getSelectedCount() == 0) { - Toast.makeText(NotesListActivity.this, getString(R.string.menu_select_none), - Toast.LENGTH_SHORT).show(); - return true; - } - - switch (item.getItemId()) { - case R.id.delete: - AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.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_notes, - mNotesListAdapter.getSelectedCount())); - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { - batchDelete(); - } - }); - builder.setNegativeButton(android.R.string.cancel, null); - builder.show(); - break; - case R.id.move: - startQueryDestinationFolders(); - break; - default: - return false; - } - return true; - } - } - - private class NewNoteOnTouchListener implements OnTouchListener { - - public boolean onTouch(View v, MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: { - Display display = getWindowManager().getDefaultDisplay(); - int screenHeight = display.getHeight(); - int newNoteViewHeight = mAddNewNote.getHeight(); - int start = screenHeight - newNoteViewHeight; - int eventY = start + (int) event.getY(); - /** - * Minus TitleBar's height - */ - if (mState == ListEditState.SUB_FOLDER) { - eventY -= mTitleBar.getHeight(); - start -= mTitleBar.getHeight(); - } - /** - * HACKME:When click the transparent part of "New Note" button, dispatch - * the event to the list view behind this button. The transparent part of - * "New Note" button could be expressed by formula y=-0.12x+94(Unit:pixel) - * and the line top of the button. The coordinate based on left of the "New - * Note" button. The 94 represents maximum height of the transparent part. - * Notice that, if the background of the button changes, the formula should - * also change. This is very bad, just for the UI designer's strong requirement. - */ - if (event.getY() < (event.getX() * (-0.12) + 94)) { - View view = mNotesListView.getChildAt(mNotesListView.getChildCount() - 1 - - mNotesListView.getFooterViewsCount()); - if (view != null && view.getBottom() > start - && (view.getTop() < (start + 94))) { - mOriginY = (int) event.getY(); - mDispatchY = eventY; - event.setLocation(event.getX(), mDispatchY); - mDispatch = true; - return mNotesListView.dispatchTouchEvent(event); - } - } - break; - } - case MotionEvent.ACTION_MOVE: { - if (mDispatch) { - mDispatchY += (int) event.getY() - mOriginY; - event.setLocation(event.getX(), mDispatchY); - return mNotesListView.dispatchTouchEvent(event); - } - break; - } - default: { - if (mDispatch) { - event.setLocation(event.getX(), mDispatchY); - mDispatch = false; - return mNotesListView.dispatchTouchEvent(event); - } - break; - } - } - return false; - } - - }; - - private void startAsyncNotesListQuery() { - String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION - : NORMAL_SELECTION; - 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"); - } - - private final class BackgroundQueryHandler extends AsyncQueryHandler { - public BackgroundQueryHandler(ContentResolver contentResolver) { - super(contentResolver); - } - - @Override - protected void onQueryComplete(int token, Object cookie, Cursor cursor) { - switch (token) { - case FOLDER_NOTE_LIST_QUERY_TOKEN: - mNotesListAdapter.changeCursor(cursor); - break; - case FOLDER_LIST_QUERY_TOKEN: - if (cursor != null && cursor.getCount() > 0) { - showFolderListMenu(cursor); - } else { - Log.e(TAG, "Query folder failed"); - } - break; - default: - return; - } - } - } - - private void showFolderListMenu(Cursor cursor) { - AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); - builder.setTitle(R.string.menu_title_select_folder); - final FoldersListAdapter adapter = new FoldersListAdapter(this, cursor); - builder.setAdapter(adapter, new DialogInterface.OnClickListener() { - - public void onClick(DialogInterface dialog, int which) { - DataUtils.batchMoveToFolder(mContentResolver, - mNotesListAdapter.getSelectedItemIds(), adapter.getItemId(which)); - Toast.makeText( - NotesListActivity.this, - getString(R.string.format_move_notes_to_folder, - mNotesListAdapter.getSelectedCount(), - adapter.getFolderName(NotesListActivity.this, which)), - Toast.LENGTH_SHORT).show(); - mModeCallBack.finishActionMode(); - } - }); - builder.show(); - } - - private void createNewNote() { - Intent intent = new Intent(this, NoteEditActivity.class); - intent.setAction(Intent.ACTION_INSERT_OR_EDIT); - intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mCurrentFolderId); - this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE); - } - - private void batchDelete() { - new AsyncTask>() { - protected HashSet doInBackground(Void... unused) { - HashSet widgets = mNotesListAdapter.getSelectedWidget(); - if (!isSyncMode()) { - // if not synced, delete notes directly - if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter - .getSelectedItemIds())) { - } else { - Log.e(TAG, "Delete notes error, should not happens"); - } - } else { - // in sync mode, we'll move the deleted note into the trash - // folder - if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter - .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) { - Log.e(TAG, "Move notes to trash folder error, should not happens"); - } - } - return widgets; - } - - @Override - protected void onPostExecute(HashSet widgets) { - if (widgets != null) { - for (AppWidgetAttribute widget : widgets) { - if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID - && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) { - updateWidget(widget.widgetId, widget.widgetType); - } - } - } - mModeCallBack.finishActionMode(); - } - }.execute(); - } - - private void deleteFolder(long folderId) { - if (folderId == Notes.ID_ROOT_FOLDER) { - Log.e(TAG, "Wrong folder id, should not happen " + folderId); - return; - } - - HashSet ids = new HashSet(); - ids.add(folderId); - HashSet widgets = DataUtils.getFolderNoteWidget(mContentResolver, - folderId); - if (!isSyncMode()) { - // if not synced, delete folder directly - DataUtils.batchDeleteNotes(mContentResolver, ids); - } else { - // in sync mode, we'll move the deleted folder into the trash folder - DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLER); - } - if (widgets != null) { - for (AppWidgetAttribute widget : widgets) { - if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID - && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) { - updateWidget(widget.widgetId, widget.widgetType); - } - } - } - } - - private void openNode(NoteItemData data) { - Intent intent = new Intent(this, NoteEditActivity.class); - intent.setAction(Intent.ACTION_VIEW); - intent.putExtra(Intent.EXTRA_UID, data.getId()); - this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE); - } - - private void openFolder(NoteItemData data) { - mCurrentFolderId = data.getId(); - startAsyncNotesListQuery(); - if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) { - mState = ListEditState.CALL_RECORD_FOLDER; - mAddNewNote.setVisibility(View.GONE); - } else { - mState = ListEditState.SUB_FOLDER; - } - if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) { - mTitleBar.setText(R.string.call_record_folder_name); - } else { - mTitleBar.setText(data.getSnippet()); - } - mTitleBar.setVisibility(View.VISIBLE); - } - - public void onClick(View v) { - switch (v.getId()) { - case R.id.btn_new_note: - createNewNote(); - break; - default: - break; - } - } - - private void showSoftInput() { - InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - if (inputMethodManager != null) { - inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0); - } - } - - private void hideSoftInput(View view) { - InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0); - } - - private void showCreateOrModifyFolderDialog(final boolean create) { - final AlertDialog.Builder builder = new AlertDialog.Builder(this); - View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null); - final EditText etName = (EditText) view.findViewById(R.id.et_foler_name); - showSoftInput(); - if (!create) { - if (mFocusNoteDataItem != null) { - etName.setText(mFocusNoteDataItem.getSnippet()); - builder.setTitle(getString(R.string.menu_folder_change_name)); - } else { - Log.e(TAG, "The long click data item is null"); - return; - } - } else { - etName.setText(""); - builder.setTitle(this.getString(R.string.menu_create_folder)); - } - - builder.setPositiveButton(android.R.string.ok, null); - builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - hideSoftInput(etName); - } - }); - - final Dialog dialog = builder.setView(view).show(); - final Button positive = (Button)dialog.findViewById(android.R.id.button1); - positive.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - hideSoftInput(etName); - String name = etName.getText().toString(); - if (DataUtils.checkVisibleFolderName(mContentResolver, name)) { - Toast.makeText(NotesListActivity.this, getString(R.string.folder_exist, name), - Toast.LENGTH_LONG).show(); - etName.setSelection(0, etName.length()); - return; - } - if (!create) { - if (!TextUtils.isEmpty(name)) { - ContentValues values = new ContentValues(); - values.put(NoteColumns.SNIPPET, name); - values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); - values.put(NoteColumns.LOCAL_MODIFIED, 1); - mContentResolver.update(Notes.CONTENT_NOTE_URI, values, NoteColumns.ID - + "=?", new String[] { - String.valueOf(mFocusNoteDataItem.getId()) - }); - } - } else if (!TextUtils.isEmpty(name)) { - ContentValues values = new ContentValues(); - values.put(NoteColumns.SNIPPET, name); - values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); - mContentResolver.insert(Notes.CONTENT_NOTE_URI, values); - } - dialog.dismiss(); - } - }); - - if (TextUtils.isEmpty(etName.getText())) { - positive.setEnabled(false); - } - /** - * When the name edit text is null, disable the positive button - */ - etName.addTextChangedListener(new TextWatcher() { - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - // TODO Auto-generated method stub - - } - - public void onTextChanged(CharSequence s, int start, int before, int count) { - if (TextUtils.isEmpty(etName.getText())) { - positive.setEnabled(false); - } else { - positive.setEnabled(true); - } - } - - public void afterTextChanged(Editable s) { - // TODO Auto-generated method stub - - } - }); - } - - @Override - public void onBackPressed() { - switch (mState) { - case SUB_FOLDER: - mCurrentFolderId = Notes.ID_ROOT_FOLDER; - mState = ListEditState.NOTE_LIST; - startAsyncNotesListQuery(); - mTitleBar.setVisibility(View.GONE); - break; - case CALL_RECORD_FOLDER: - mCurrentFolderId = Notes.ID_ROOT_FOLDER; - mState = ListEditState.NOTE_LIST; - mAddNewNote.setVisibility(View.VISIBLE); - mTitleBar.setVisibility(View.GONE); - startAsyncNotesListQuery(); - break; - case NOTE_LIST: - super.onBackPressed(); - break; - default: - break; - } - } - - private void updateWidget(int appWidgetId, int appWidgetType) { - Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); - if (appWidgetType == Notes.TYPE_WIDGET_2X) { - intent.setClass(this, NoteWidgetProvider_2x.class); - } else if (appWidgetType == 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[] { - appWidgetId - }); - - sendBroadcast(intent); - setResult(RESULT_OK, intent); - } - - private final OnCreateContextMenuListener mFolderOnCreateContextMenuListener = new OnCreateContextMenuListener() { - public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { - if (mFocusNoteDataItem != null) { - menu.setHeaderTitle(mFocusNoteDataItem.getSnippet()); - menu.add(0, MENU_FOLDER_VIEW, 0, R.string.menu_folder_view); - menu.add(0, MENU_FOLDER_DELETE, 0, R.string.menu_folder_delete); - menu.add(0, MENU_FOLDER_CHANGE_NAME, 0, R.string.menu_folder_change_name); - } - } - }; - - @Override - public void onContextMenuClosed(Menu menu) { - if (mNotesListView != null) { - mNotesListView.setOnCreateContextMenuListener(null); - } - super.onContextMenuClosed(menu); - } - - @Override - public boolean onContextItemSelected(MenuItem item) { - if (mFocusNoteDataItem == null) { - Log.e(TAG, "The long click data item is null"); - return false; - } - switch (item.getItemId()) { - case MENU_FOLDER_VIEW: - openFolder(mFocusNoteDataItem); - break; - case MENU_FOLDER_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_folder)); - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - deleteFolder(mFocusNoteDataItem.getId()); - } - }); - builder.setNegativeButton(android.R.string.cancel, null); - builder.show(); - break; - case MENU_FOLDER_CHANGE_NAME: - showCreateOrModifyFolderDialog(false); - break; - default: - break; - } - - return true; - } - - @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 - menu.findItem(R.id.menu_sync).setTitle( - GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync); - } else if (mState == ListEditState.SUB_FOLDER) { - getMenuInflater().inflate(R.menu.sub_folder, menu); - } else if (mState == ListEditState.CALL_RECORD_FOLDER) { - getMenuInflater().inflate(R.menu.call_record_folder, menu); - } else { - Log.e(TAG, "Wrong state:" + mState); - } - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_new_folder: { - 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; - default: - break; - } - return true; - } - - @Override - public boolean onSearchRequested() { - startSearch(null, false, null /* appData */, false); - return true; - } - - private void exportNoteToText() { - final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this); - new AsyncTask() { - - @Override - protected Integer doInBackground(Void... unused) { - return backup.exportToText(); - } - - @Override - protected void onPostExecute(Integer result) { - if (result == BackupUtils.STATE_SD_CARD_UNMOUONTED) { - AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); - builder.setTitle(NotesListActivity.this - .getString(R.string.failed_sdcard_export)); - builder.setMessage(NotesListActivity.this - .getString(R.string.error_sdcard_unmounted)); - builder.setPositiveButton(android.R.string.ok, null); - builder.show(); - } else if (result == BackupUtils.STATE_SUCCESS) { - AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); - builder.setTitle(NotesListActivity.this - .getString(R.string.success_sdcard_export)); - builder.setMessage(NotesListActivity.this.getString( - R.string.format_exported_file_location, backup - .getExportedTextFileName(), backup.getExportedTextFileDir())); - builder.setPositiveButton(android.R.string.ok, null); - builder.show(); - } else if (result == BackupUtils.STATE_SYSTEM_ERROR) { - AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); - builder.setTitle(NotesListActivity.this - .getString(R.string.failed_sdcard_export)); - builder.setMessage(NotesListActivity.this - .getString(R.string.error_sdcard_export)); - builder.setPositiveButton(android.R.string.ok, null); - builder.show(); - } - } - - }.execute(); - } - - private boolean isSyncMode() { - return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0; - } - - private void startPreferenceActivity() { - Activity from = getParent() != null ? getParent() : this; - Intent intent = new Intent(from, NotesPreferenceActivity.class); - from.startActivityIfNeeded(intent, -1); - } - - private class OnListItemClickListener implements OnItemClickListener { - - public void onItemClick(AdapterView parent, View view, int position, long id) { - if (view instanceof NotesListItem) { - NoteItemData item = ((NotesListItem) view).getItemData(); - if (mNotesListAdapter.isInChoiceMode()) { - if (item.getType() == Notes.TYPE_NOTE) { - position = position - mNotesListView.getHeaderViewsCount(); - mModeCallBack.onItemCheckedStateChanged(null, position, id, - !mNotesListAdapter.isSelectedItem(position)); - } - return; - } - - switch (mState) { - case NOTE_LIST: - if (item.getType() == Notes.TYPE_FOLDER - || item.getType() == Notes.TYPE_SYSTEM) { - openFolder(item); - } else if (item.getType() == Notes.TYPE_NOTE) { - openNode(item); - } else { - Log.e(TAG, "Wrong note type in NOTE_LIST"); - } - break; - case SUB_FOLDER: - case CALL_RECORD_FOLDER: - if (item.getType() == Notes.TYPE_NOTE) { - openNode(item); - } else { - Log.e(TAG, "Wrong note type in SUB_FOLDER"); - } - break; - default: - break; - } - } - } - - } - - private void startQueryDestinationFolders() { - String selection = NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>? AND " + NoteColumns.ID + "<>?"; - selection = (mState == ListEditState.NOTE_LIST) ? selection: - "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")"; - - mBackgroundQueryHandler.startQuery(FOLDER_LIST_QUERY_TOKEN, - null, - Notes.CONTENT_NOTE_URI, - FoldersListAdapter.PROJECTION, - selection, - new String[] { - String.valueOf(Notes.TYPE_FOLDER), - String.valueOf(Notes.ID_TRASH_FOLER), - String.valueOf(mCurrentFolderId) - }, - NoteColumns.MODIFIED_DATE + " DESC"); - } - - public boolean onItemLongClick(AdapterView parent, View view, int position, long id) { - if (view instanceof NotesListItem) { - mFocusNoteDataItem = ((NotesListItem) view).getItemData(); - if (mFocusNoteDataItem.getType() == Notes.TYPE_NOTE && !mNotesListAdapter.isInChoiceMode()) { - if (mNotesListView.startActionMode(mModeCallBack) != null) { - mModeCallBack.onItemCheckedStateChanged(null, position, id, true); - mNotesListView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); - } else { - Log.e(TAG, "startActionMode fails"); - } - } else if (mFocusNoteDataItem.getType() == Notes.TYPE_FOLDER) { - mNotesListView.setOnCreateContextMenuListener(mFolderOnCreateContextMenuListener); - } - } - return false; - } -} diff --git a/src/minotes/ui/NotesListAdapter.java b/src/minotes/ui/NotesListAdapter.java deleted file mode 100644 index 51c9cb9..0000000 --- a/src/minotes/ui/NotesListAdapter.java +++ /dev/null @@ -1,184 +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.content.Context; -import android.database.Cursor; -import android.util.Log; -import android.view.View; -import android.view.ViewGroup; -import android.widget.CursorAdapter; - -import net.micode.notes.data.Notes; - -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; - - -public class NotesListAdapter extends CursorAdapter { - private static final String TAG = "NotesListAdapter"; - private Context mContext; - private HashMap mSelectedIndex; - private int mNotesCount; - private boolean mChoiceMode; - - public static class AppWidgetAttribute { - public int widgetId; - public int widgetType; - }; - - public NotesListAdapter(Context context) { - super(context, null); - mSelectedIndex = new HashMap(); - mContext = context; - mNotesCount = 0; - } - - @Override - public View newView(Context context, Cursor cursor, ViewGroup parent) { - return new NotesListItem(context); - } - - @Override - public void bindView(View view, Context context, Cursor cursor) { - if (view instanceof NotesListItem) { - NoteItemData itemData = new NoteItemData(context, cursor); - ((NotesListItem) view).bind(context, itemData, mChoiceMode, - isSelectedItem(cursor.getPosition())); - } - } - - public void setCheckedItem(final int position, final boolean checked) { - mSelectedIndex.put(position, checked); - notifyDataSetChanged(); - } - - public boolean isInChoiceMode() { - return mChoiceMode; - } - - public void setChoiceMode(boolean mode) { - mSelectedIndex.clear(); - mChoiceMode = mode; - } - - public void selectAll(boolean checked) { - Cursor cursor = getCursor(); - for (int i = 0; i < getCount(); i++) { - if (cursor.moveToPosition(i)) { - if (NoteItemData.getNoteType(cursor) == Notes.TYPE_NOTE) { - setCheckedItem(i, checked); - } - } - } - } - - public HashSet getSelectedItemIds() { - HashSet itemSet = new HashSet(); - for (Integer position : mSelectedIndex.keySet()) { - if (mSelectedIndex.get(position) == true) { - Long id = getItemId(position); - if (id == Notes.ID_ROOT_FOLDER) { - Log.d(TAG, "Wrong item id, should not happen"); - } else { - itemSet.add(id); - } - } - } - - return itemSet; - } - - public HashSet getSelectedWidget() { - HashSet itemSet = new HashSet(); - for (Integer position : mSelectedIndex.keySet()) { - if (mSelectedIndex.get(position) == true) { - Cursor c = (Cursor) getItem(position); - if (c != null) { - AppWidgetAttribute widget = new AppWidgetAttribute(); - NoteItemData item = new NoteItemData(mContext, c); - widget.widgetId = item.getWidgetId(); - widget.widgetType = item.getWidgetType(); - itemSet.add(widget); - /** - * Don't close cursor here, only the adapter could close it - */ - } else { - Log.e(TAG, "Invalid cursor"); - return null; - } - } - } - return itemSet; - } - - public int getSelectedCount() { - Collection values = mSelectedIndex.values(); - if (null == values) { - return 0; - } - Iterator iter = values.iterator(); - int count = 0; - while (iter.hasNext()) { - if (true == iter.next()) { - count++; - } - } - return count; - } - - public boolean isAllSelected() { - int checkedCount = getSelectedCount(); - return (checkedCount != 0 && checkedCount == mNotesCount); - } - - public boolean isSelectedItem(final int position) { - if (null == mSelectedIndex.get(position)) { - return false; - } - return mSelectedIndex.get(position); - } - - @Override - protected void onContentChanged() { - super.onContentChanged(); - calcNotesCount(); - } - - @Override - public void changeCursor(Cursor cursor) { - super.changeCursor(cursor); - calcNotesCount(); - } - - private void calcNotesCount() { - mNotesCount = 0; - for (int i = 0; i < getCount(); i++) { - Cursor c = (Cursor) getItem(i); - if (c != null) { - if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) { - mNotesCount++; - } - } else { - Log.e(TAG, "Invalid cursor"); - return; - } - } - } -} diff --git a/src/minotes/ui/NotesListItem.java b/src/minotes/ui/NotesListItem.java deleted file mode 100644 index 1221e80..0000000 --- a/src/minotes/ui/NotesListItem.java +++ /dev/null @@ -1,122 +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.content.Context; -import android.text.format.DateUtils; -import android.view.View; -import android.widget.CheckBox; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.tool.DataUtils; -import net.micode.notes.tool.ResourceParser.NoteItemBgResources; - - -public class NotesListItem extends LinearLayout { - private ImageView mAlert; - private TextView mTitle; - private TextView mTime; - private TextView mCallName; - private NoteItemData mItemData; - private CheckBox mCheckBox; - - public NotesListItem(Context context) { - super(context); - inflate(context, R.layout.note_item, this); - mAlert = (ImageView) findViewById(R.id.iv_alert_icon); - mTitle = (TextView) findViewById(R.id.tv_title); - mTime = (TextView) findViewById(R.id.tv_time); - mCallName = (TextView) findViewById(R.id.tv_name); - mCheckBox = (CheckBox) findViewById(android.R.id.checkbox); - } - - public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) { - if (choiceMode && data.getType() == Notes.TYPE_NOTE) { - mCheckBox.setVisibility(View.VISIBLE); - mCheckBox.setChecked(checked); - } else { - mCheckBox.setVisibility(View.GONE); - } - - mItemData = data; - if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) { - mCallName.setVisibility(View.GONE); - mAlert.setVisibility(View.VISIBLE); - mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem); - mTitle.setText(context.getString(R.string.call_record_folder_name) - + context.getString(R.string.format_folder_files_count, data.getNotesCount())); - mAlert.setImageResource(R.drawable.call_record); - } else if (data.getParentId() == Notes.ID_CALL_RECORD_FOLDER) { - mCallName.setVisibility(View.VISIBLE); - mCallName.setText(data.getCallName()); - mTitle.setTextAppearance(context,R.style.TextAppearanceSecondaryItem); - mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); - if (data.hasAlert()) { - mAlert.setImageResource(R.drawable.clock); - mAlert.setVisibility(View.VISIBLE); - } else { - mAlert.setVisibility(View.GONE); - } - } else { - mCallName.setVisibility(View.GONE); - mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem); - - if (data.getType() == Notes.TYPE_FOLDER) { - mTitle.setText(data.getSnippet() - + context.getString(R.string.format_folder_files_count, - data.getNotesCount())); - mAlert.setVisibility(View.GONE); - } else { - mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); - if (data.hasAlert()) { - mAlert.setImageResource(R.drawable.clock); - mAlert.setVisibility(View.VISIBLE); - } else { - mAlert.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) { - if (data.isSingle() || data.isOneFollowingFolder()) { - setBackgroundResource(NoteItemBgResources.getNoteBgSingleRes(id)); - } else if (data.isLast()) { - setBackgroundResource(NoteItemBgResources.getNoteBgLastRes(id)); - } else if (data.isFirst() || data.isMultiFollowingFolder()) { - setBackgroundResource(NoteItemBgResources.getNoteBgFirstRes(id)); - } else { - setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id)); - } - } else { - setBackgroundResource(NoteItemBgResources.getFolderBgRes()); - } - } - - public NoteItemData getItemData() { - return mItemData; - } -} diff --git a/settings.gradle b/src/settings.gradle similarity index 100% rename from settings.gradle rename to src/settings.gradle