diff --git a/src/data/Contact.java b/src/notes/data/Contact.java similarity index 100% rename from src/data/Contact.java rename to src/notes/data/Contact.java diff --git a/src/data/Notes.java b/src/notes/data/Notes.java similarity index 95% rename from src/data/Notes.java rename to src/notes/data/Notes.java index 6273380..ef9a4d5 100644 --- a/src/data/Notes.java +++ b/src/notes/data/Notes.java @@ -66,6 +66,7 @@ public class Notes { 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 ENCRYPTED_FOLDER = "vnd.android.cursor.item/encrypted_folder"; } /** @@ -185,6 +186,17 @@ public class Notes { *

Type : INTEGER (long)

*/ public static final String VERSION = "version"; + /** + * Flag to indicate this note is a habit note + *

Type : INTEGER (0/1)

+ */ + public static final String IS_HABIT = "is_habit"; + + /** + * Habit configuration stored as JSON string + *

Type : TEXT

+ */ + public static final String HABIT_CONFIG = "habit_config"; } //Data表数据库列名常量接口 diff --git a/src/data/NotesDatabaseHelper.java b/src/notes/data/NotesDatabaseHelper.java similarity index 100% rename from src/data/NotesDatabaseHelper.java rename to src/notes/data/NotesDatabaseHelper.java diff --git a/src/data/NotesProvider.java b/src/notes/data/NotesProvider.java similarity index 99% rename from src/data/NotesProvider.java rename to src/notes/data/NotesProvider.java index 54ff26e..4ea094d 100644 --- a/src/data/NotesProvider.java +++ b/src/notes/data/NotesProvider.java @@ -38,7 +38,7 @@ import net.micode.notes.data.NotesDatabaseHelper.TABLE; * * @Package: net.micode.notes.data * @ClassName: NotesProvider - * @Description: 便签提供类 + * @Description: java类作用描述 */ public class NotesProvider extends ContentProvider { //uri匹配器 diff --git a/src/gtask/data/MetaData.java b/src/notes/gtask/data/MetaData.java similarity index 92% rename from src/gtask/data/MetaData.java rename to src/notes/gtask/data/MetaData.java index d8bc462..e691062 100644 --- a/src/gtask/data/MetaData.java +++ b/src/notes/gtask/data/MetaData.java @@ -25,11 +25,6 @@ import org.json.JSONException; import org.json.JSONObject; -/** - * @Package: net.micode.notes.gtask.data - * @ClassName: MetaData - * @Description: 存储和管理Google Task同步相关的元数据，维护本地便签与Google Task任务的关联关系 - */ public class MetaData extends Task { private final static String TAG = MetaData.class.getSimpleName(); diff --git a/src/gtask/data/Node.java b/src/notes/gtask/data/Node.java similarity index 100% rename from src/gtask/data/Node.java rename to src/notes/gtask/data/Node.java diff --git a/src/gtask/data/SqlData.java b/src/notes/gtask/data/SqlData.java similarity index 100% rename from src/gtask/data/SqlData.java rename to src/notes/gtask/data/SqlData.java diff --git a/src/gtask/data/SqlNote.java b/src/notes/gtask/data/SqlNote.java similarity index 100% rename from src/gtask/data/SqlNote.java rename to src/notes/gtask/data/SqlNote.java diff --git a/src/gtask/data/Task.java b/src/notes/gtask/data/Task.java similarity index 100% rename from src/gtask/data/Task.java rename to src/notes/gtask/data/Task.java diff --git a/src/gtask/data/TaskList.java b/src/notes/gtask/data/TaskList.java similarity index 96% rename from src/gtask/data/TaskList.java rename to src/notes/gtask/data/TaskList.java index 6bfbc1e..ba1e7e8 100644 --- a/src/gtask/data/TaskList.java +++ b/src/notes/gtask/data/TaskList.java @@ -33,11 +33,7 @@ import java.util.ArrayList; * * @Package: net.micode.notes.gtask.data * @ClassName: TaskList - * @Description: 表示一个任务列表（或任务组），继承自Node类。 - * 1. 管理任务列表中的子任务（Task对象） - * 2. 处理任务列表与Google Task API的JSON数据转换 - * 3. 处理任务列表与本地数据库的同步逻辑 - * 4. 管理任务列表在远程服务中的创建、更新和删除操作 + * @Description: java类作用描述 */ public class TaskList extends Node { private static final String TAG = TaskList.class.getSimpleName(); diff --git a/src/gtask/exception/ActionFailureException.java b/src/notes/gtask/exception/ActionFailureException.java similarity index 100% rename from src/gtask/exception/ActionFailureException.java rename to src/notes/gtask/exception/ActionFailureException.java diff --git a/src/gtask/exception/NetworkFailureException.java b/src/notes/gtask/exception/NetworkFailureException.java similarity index 100% rename from src/gtask/exception/NetworkFailureException.java rename to src/notes/gtask/exception/NetworkFailureException.java diff --git a/src/gtask/remote/GTaskASyncTask.java b/src/notes/gtask/remote/GTaskASyncTask.java similarity index 84% rename from src/gtask/remote/GTaskASyncTask.java rename to src/notes/gtask/remote/GTaskASyncTask.java index 2a9a416..d7bf613 100644 --- a/src/gtask/remote/GTaskASyncTask.java +++ b/src/notes/gtask/remote/GTaskASyncTask.java @@ -27,7 +27,32 @@ import net.micode.notes.R; import net.micode.notes.ui.NotesListActivity; import net.micode.notes.ui.NotesPreferenceActivity; - +/** + * GTaskASyncTask 类 - Google Task同步异步任务 + * + * 功能概述： + * 1. 在后台线程执行Google Task同步操作 + * 2. 显示同步进度通知 + * 3. 处理同步完成后的结果展示 + * 4. 支持同步取消操作 + * + * 设计模式： + * - 异步任务模式：继承AsyncTask，在后台线程执行同步 + * - 观察者模式：通过回调接口通知同步完成 + * - 命令模式：封装同步操作和取消操作 + * + * 生命周期： + * 1. doInBackground()：在后台执行同步 + * 2. onProgressUpdate()：更新同步进度通知 + * 3. onPostExecute()：同步完成后显示结果通知 + * 4. cancelSync()：取消正在进行的同步 + * + * 线程安全： + * 使用AsyncTask确保UI线程和后台线程的正确分离 + * + * @author MiCode Open Source Community + * @version 1.0 + */ /** * * @Package: net.micode.notes.gtask.remote @@ -102,7 +127,16 @@ public class GTaskASyncTask extends AsyncTask { mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); } - + /** + * 在后台执行同步 + * + * 执行流程： + * 1. 发布登录进度 + * 2. 调用GTaskManager执行同步 + * + * @param unused 未使用的参数（Void类型） + * @return 同步结果状态码 + */ /** * @method doInBackground * @description 在后台执行同步 diff --git a/src/gtask/remote/GTaskClient.java b/src/notes/gtask/remote/GTaskClient.java similarity index 100% rename from src/gtask/remote/GTaskClient.java rename to src/notes/gtask/remote/GTaskClient.java diff --git a/src/gtask/remote/GTaskManager.java b/src/notes/gtask/remote/GTaskManager.java similarity index 99% rename from src/gtask/remote/GTaskManager.java rename to src/notes/gtask/remote/GTaskManager.java index bc5e1ae..f20c605 100644 --- a/src/gtask/remote/GTaskManager.java +++ b/src/notes/gtask/remote/GTaskManager.java @@ -912,7 +912,7 @@ public class GTaskManager { return GTaskClient.getInstance().getSyncAccount().name; } - + public void cancelSync() { mCancelled = true; } diff --git a/src/gtask/remote/GTaskSyncService.java b/src/notes/gtask/remote/GTaskSyncService.java similarity index 100% rename from src/gtask/remote/GTaskSyncService.java rename to src/notes/gtask/remote/GTaskSyncService.java diff --git a/src/model/Note.java b/src/notes/model/Note.java similarity index 100% rename from src/model/Note.java rename to src/notes/model/Note.java diff --git a/src/model/WorkingNote.java b/src/notes/model/WorkingNote.java similarity index 89% rename from src/model/WorkingNote.java rename to src/notes/model/WorkingNote.java index 61ec1f0..e5e8f67 100644 --- a/src/model/WorkingNote.java +++ b/src/notes/model/WorkingNote.java @@ -60,6 +60,10 @@ public class WorkingNote { private boolean mIsDeleted; + // habit fields + private boolean mIsHabit; + private String mHabitConfig; + private NoteSettingChangedListener mNoteSettingStatusListener;// 设置变化监听器 //数据表查询字段投影 用于查询便签数据 @@ -81,7 +85,10 @@ public class WorkingNote { NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.MODIFIED_DATE - }; + , + NoteColumns.IS_HABIT, + NoteColumns.HABIT_CONFIG + }; private static final int DATA_ID_COLUMN = 0; @@ -102,6 +109,8 @@ public class WorkingNote { private static final int NOTE_WIDGET_TYPE_COLUMN = 4; private static final int NOTE_MODIFIED_DATE_COLUMN = 5; + private static final int NOTE_HABIT_FLAG_COLUMN = 6; + private static final int NOTE_HABIT_CONFIG_COLUMN = 7; // New note construct 创建新便签 private WorkingNote(Context context, long folderId) { @@ -141,6 +150,17 @@ public class WorkingNote { mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN); mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN); mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN); + // habit fields (may not exist on older DB versions) + try { + mIsHabit = cursor.getInt(NOTE_HABIT_FLAG_COLUMN) == 1; + } catch (Exception e) { + mIsHabit = false; + } + try { + mHabitConfig = cursor.getString(NOTE_HABIT_CONFIG_COLUMN); + } catch (Exception e) { + mHabitConfig = ""; + } } cursor.close(); } else { @@ -285,6 +305,24 @@ public class WorkingNote { } } + // 设置/取消习惯便签并保存配置信息（config 为 JSON 字符串，可为空） + public void setHabit(boolean isHabit, String config) { + if (mIsHabit != isHabit || (config != null && !config.equals(mHabitConfig))) { + mIsHabit = isHabit; + mHabitConfig = config == null ? "" : config; + mNote.setNoteValue(NoteColumns.IS_HABIT, String.valueOf(isHabit ? 1 : 0)); + mNote.setNoteValue(NoteColumns.HABIT_CONFIG, mHabitConfig); + } + } + + public boolean isHabit() { + return mIsHabit; + } + + public String getHabitConfig() { + return mHabitConfig == null ? "" : mHabitConfig; + } + //设置清单模式 public void setCheckListMode(int mode) { if (mMode != mode) { diff --git a/src/tool/BackupUtils.java b/src/notes/tool/BackupUtils.java similarity index 77% rename from src/tool/BackupUtils.java rename to src/notes/tool/BackupUtils.java index 0fbf526..39f6ec4 100644 --- a/src/tool/BackupUtils.java +++ b/src/notes/tool/BackupUtils.java @@ -41,34 +41,38 @@ public class BackupUtils { // Singleton stuff private static BackupUtils sInstance; - //ynchronized 关键字，代表这个方法加锁,防止多进程混乱 + public static synchronized BackupUtils getInstance(Context context) { if (sInstance == null) { - //如果当前备份不存在，则新声明一个 sInstance = new BackupUtils(context); } return sInstance; } - // 当前 SD 卡未挂载 + + /** + * 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 public static final int STATE_BACKUP_FILE_NOT_EXIST = 1; - // 数据格式损坏（可能被其他程序修改） + // 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 public static final int STATE_SYSTEM_ERROR = 3; - // 备份或重新储存成功？？？ + // Backup or restore success public static final int STATE_SUCCESS = 4; - //文本提取 + private TextExport mTextExport; - //初始化类，将该类设置为context接口格式，提供了访问资源、启动组件、获取系统服务、管理文件、执行权限检查等。 + private BackupUtils(Context context) { mTextExport = new TextExport(context); } - // 获取外部存储的根目录，便于进行api操作 + private static boolean externalStorageAvailable() { return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState()); } - // mTextExport是一个静态内部类,提供了导出功能 + public int exportToText() { return mTextExport.exportToText(); } @@ -82,20 +86,20 @@ public class BackupUtils { } private static class TextExport { - private static final String[] NOTE_PROJECTION = { //文本基础信息 + private static final String[] NOTE_PROJECTION = { NoteColumns.ID, NoteColumns.MODIFIED_DATE, - NoteColumns.SNIPPET, //文本片段 + NoteColumns.SNIPPET, NoteColumns.TYPE }; - //定义类级别的常量.p s f，下面的 数字代表在字符串中存储位置 + private static final int NOTE_COLUMN_ID = 0; private static final int NOTE_COLUMN_MODIFIED_DATE = 1; private static final int NOTE_COLUMN_SNIPPET = 2; - private static final String[] DATA_PROJECTION = { //数据基础信息，这个数据是啥数据？？？ + private static final String[] DATA_PROJECTION = { DataColumns.CONTENT, DataColumns.MIME_TYPE, DataColumns.DATA1, @@ -106,7 +110,7 @@ public class BackupUtils { private static final int DATA_COLUMN_CONTENT = 0; - private static final int DATA_COLUMN_MIME_TYPE = 1; //导出笔记时，先查询这条笔记的 DATA_COLUMN_MIME_TYPE 值，判断格式 + private static final int DATA_COLUMN_MIME_TYPE = 1; private static final int DATA_COLUMN_CALL_DATE = 2; @@ -122,7 +126,7 @@ public class BackupUtils { private String mFileDirectory; public TextExport(Context context) { - TEXT_FORMAT = context.getResources().getStringArray(R.array.format_for_exported_note);//从array.xml里获取字符串数组信息 + TEXT_FORMAT = context.getResources().getStringArray(R.array.format_for_exported_note); mContext = context; mFileName = ""; mFileDirectory = ""; @@ -133,33 +137,33 @@ public class BackupUtils { } /** - * Export the folder identified by folder id to text ，从文件夹流向便签 + * Export the folder identified by folder id to text */ private void exportFolderToText(String folderId, PrintStream ps) { // Query notes belong to this folder Cursor notesCursor = mContext.getContentResolver().query(Notes.CONTENT_NOTE_URI, NOTE_PROJECTION, NoteColumns.PARENT_ID + "=?", new String[] { - folderId //引用的别的类的啥？？父母ID + folderId }, null); - if (notesCursor != null) { //遍历cursor的数据 - if (notesCursor.moveToFirst()) { //在开头 + if (notesCursor != null) { + if (notesCursor.moveToFirst()) { do { // Print note's last modified date ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format( - mContext.getString(R.string.format_datetime_mdhm), //R.string.xxx 是一个引用字符串资源的标识符，它直接指向资源文件中的字符串,用gststring执行 - notesCursor.getLong(NOTE_COLUMN_MODIFIED_DATE)))); //getXX，XX是结构 + mContext.getString(R.string.format_datetime_mdhm), + notesCursor.getLong(NOTE_COLUMN_MODIFIED_DATE)))); // Query data belong to this note String noteId = notesCursor.getString(NOTE_COLUMN_ID); exportNoteToText(noteId, ps); - } while (notesCursor.moveToNext()); //没有下一个就终止，代表数据遍历完毕 + } while (notesCursor.moveToNext()); } notesCursor.close(); } } /** - * Export note identified by id to a print stream，从便签流向文本流 + * Export note identified by id to a print stream */ private void exportNoteToText(String noteId, PrintStream ps) { Cursor dataCursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, @@ -171,14 +175,14 @@ public class BackupUtils { if (dataCursor.moveToFirst()) { do { String mimeType = dataCursor.getString(DATA_COLUMN_MIME_TYPE); - if (DataConstants.CALL_NOTE.equals(mimeType)) { //有电话的note + if (DataConstants.CALL_NOTE.equals(mimeType)) { // 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); if (!TextUtils.isEmpty(phoneNumber)) { - ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), //在导出内容时，把phoneNumber填充到 “笔记内容的格式模板” 并打印出来 + ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), phoneNumber)); } // Print call date @@ -212,10 +216,9 @@ public class BackupUtils { } /** - * Note will be exported as text which is user readable ,下面的是主函数 + * Note will be exported as text which is user readable */ public int exportToText() { - //判断两个失败条件 if (!externalStorageAvailable()) { Log.d(TAG, "Media was not mounted"); return STATE_SD_CARD_UNMOUONTED; @@ -226,22 +229,22 @@ public class BackupUtils { Log.e(TAG, "get print stream error"); return STATE_SYSTEM_ERROR; } - // First export folder and its notes 输出在文件夹中的便签 + // First export folder and its notes Cursor folderCursor = mContext.getContentResolver().query( Notes.CONTENT_NOTE_URI, NOTE_PROJECTION, "(" + NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + ") OR " - + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER, null, null); //xinxi + + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER, null, null); if (folderCursor != null) { if (folderCursor.moveToFirst()) { do { // Print folder's name String folderName = ""; - if(folderCursor.getLong(NOTE_COLUMN_ID) == Notes.ID_CALL_RECORD_FOLDER) { //这个判断何意味，为啥一个cursor一个context - folderName = mContext.getString(R.string.call_record_folder_name); //Context.getString 是 Android 中用于从资源文件中获取字符串的方法 - } else { //cursor.getString 是 Android 中用于从数据库中获取字符串类型数据的方法 + if(folderCursor.getLong(NOTE_COLUMN_ID) == Notes.ID_CALL_RECORD_FOLDER) { + folderName = mContext.getString(R.string.call_record_folder_name); + } else { folderName = folderCursor.getString(NOTE_COLUMN_SNIPPET); } if (!TextUtils.isEmpty(folderName)) { @@ -254,7 +257,7 @@ public class BackupUtils { folderCursor.close(); } - // Export notes in root's folder，输出根目录中的便签 + // Export notes in root's folder Cursor noteCursor = mContext.getContentResolver().query( Notes.CONTENT_NOTE_URI, NOTE_PROJECTION, @@ -276,16 +279,15 @@ public class BackupUtils { } ps.close(); - return STATE_SUCCESS; //都能对应上 + return STATE_SUCCESS; } /** - * Get a print stream pointed to the file {@generateExportedTextFile} ， - + * Get a print stream pointed to the file {@generateExportedTextFile} */ private PrintStream getExportToTextPrintStream() { File file = generateFileMountedOnSDcard(mContext, R.string.file_path, - R.string.file_name_txt_format); //建一个指向 SD 卡指定目录的 TXT 导出文件 + R.string.file_name_txt_format); if (file == null) { Log.e(TAG, "create file to exported failed"); return null; @@ -293,9 +295,9 @@ public class BackupUtils { mFileName = file.getName(); mFileDirectory = mContext.getString(R.string.file_path); PrintStream ps = null; - try { //try catch语法 + try { FileOutputStream fos = new FileOutputStream(file); - ps = new PrintStream(fos); //返回操作该文件的 PrintStream 输出流 + ps = new PrintStream(fos); } catch (FileNotFoundException e) { e.printStackTrace(); return null; @@ -308,25 +310,25 @@ public class BackupUtils { } /** - * Generate the text file to store imported data把笔记内容（比如之前的电话号码、笔记正文）写入到 TXT 文件中。 + * Generate the text file to store imported data */ private static File generateFileMountedOnSDcard(Context context, int filePathResId, int fileNameFormatResId) { StringBuilder sb = new StringBuilder(); sb.append(Environment.getExternalStorageDirectory()); sb.append(context.getString(filePathResId)); File filedir = new File(sb.toString()); - sb.append(context.getString( + sb.append(context.getString( fileNameFormatResId, DateFormat.format(context.getString(R.string.format_date_ymd), System.currentTimeMillis()))); - File file = new File(sb.toString()); //stringbuilder转成srting再写进file + File file = new File(sb.toString()); try { if (!filedir.exists()) { - filedir.mkdir(); //文件目录 + filedir.mkdir(); } if (!file.exists()) { - file.createNewFile(); //文件 + file.createNewFile(); } return file; } catch (SecurityException e) { diff --git a/src/tool/DataUtils.java b/src/notes/tool/DataUtils.java similarity index 68% rename from src/tool/DataUtils.java rename to src/notes/tool/DataUtils.java index 3c3e580..6244b1b 100644 --- a/src/tool/DataUtils.java +++ b/src/notes/tool/DataUtils.java @@ -37,7 +37,6 @@ import java.util.HashSet; public class DataUtils { public static final String TAG = "DataUtils"; - //批量操作删除便签，发生错误就返回flase，删除成功就返回true public static boolean batchDeleteNotes(ContentResolver resolver, HashSet ids) { if (ids == null) { Log.d(TAG, "the ids is null"); @@ -47,42 +46,41 @@ public class DataUtils { Log.d(TAG, "no id is in the hashset"); return true; } - // 构建删除操作：拼接标签ID到标签ContentUR + ArrayList operationList = new ArrayList(); for (long id : ids) { if(id == Notes.ID_ROOT_FOLDER) { Log.e(TAG, "Don't delete system folder root"); continue; } - ContentProviderOperation.Builder builder = ContentProviderOperation .newDelete(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id)); - //创建一个 ContentProviderOperation.Builder，删除指定id的标签 只查询 ID 为 id 的那一条记录 operationList.add(builder.build()); } try { ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList); - if (results == null || results.length == 0 || results[0] == null) {////上面的一条执行数据库操作删除并返回结果数组 + if (results == null || results.length == 0 || results[0] == null) { Log.d(TAG, "delete notes failed, ids:" + ids.toString()); return false; } return true; - } catch (RemoteException e) { //记录错误信息 + } catch (RemoteException e) { Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); } catch (OperationApplicationException e) { Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); } return false; } - //便签转进新文件夹 + public static void moveNoteToFoler(ContentResolver resolver, long id, long srcFolderId, long desFolderId) { ContentValues values = new ContentValues(); values.put(NoteColumns.PARENT_ID, desFolderId); values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId); values.put(NoteColumns.LOCAL_MODIFIED, 1); + values.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null); } - //批量操作便签转进新文件夹 + public static boolean batchMoveToFolder(ContentResolver resolver, HashSet ids, long folderId) { if (ids == null) { @@ -93,9 +91,10 @@ public class DataUtils { ArrayList operationList = new ArrayList(); for (long id : ids) { ContentProviderOperation.Builder builder = ContentProviderOperation - .newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id)); //创建更新, + .newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id)); builder.withValue(NoteColumns.PARENT_ID, folderId); builder.withValue(NoteColumns.LOCAL_MODIFIED, 1); + builder.withValue(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); operationList.add(builder.build()); } @@ -113,21 +112,11 @@ public class DataUtils { } return false; } + /** * Get the all folder count except system folders {@link Notes#TYPE_SYSTEM}} */ - public static int getUserFolderCount(ContentResolver resolver) { - //查询设备中「类型为文件夹（TYPE_FOLDER）」且「父文件夹 ID 不等于回收站 ID（ID_TRASH_FOLER）」的文件夹总数。 -''' -触发了一次跨进程的数据库查询操作 -Cursor query( - Uri uri, // 要查询的数据 URI - String[] projection, // 要返回的列（字段），null 表示所有列 - String selection, // WHERE 子句（不含 "WHERE" 关键字） - String[] selectionArgs, // WHERE 子句中占位符 ? 的实际值 - String sortOrder // 排序方式（如 "date DESC"） -); -''' + public static int getUserFolderCount(ContentResolver resolver) { Cursor cursor =resolver.query(Notes.CONTENT_NOTE_URI, new String[] { "COUNT(*)" }, NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>?", @@ -138,7 +127,7 @@ Cursor query( if(cursor != null) { if(cursor.moveToFirst()) { try { - count = cursor.getInt(0);//从当前游标指向的行中，读取第 0 列（第一列）的整数类型数据 + count = cursor.getInt(0); } catch (IndexOutOfBoundsException e) { Log.e(TAG, "get folder count failed:" + e.toString()); } finally { @@ -148,11 +137,11 @@ Cursor query( } return count; } - //变迁是否可见（没进回收站） + public static boolean visibleInNoteDatabase(ContentResolver resolver, long noteId, int type) { Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null, - NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER, //笔记的 parent_id 不能等于回收站的 ID（即不在回收站中） + NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER, new String [] {String.valueOf(type)}, null); @@ -165,7 +154,7 @@ Cursor query( } return exist; } - //便签还存在否 + public static boolean existInNoteDatabase(ContentResolver resolver, long noteId) { Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null, null, null, null); @@ -179,7 +168,7 @@ Cursor query( } return exist; } - //便签数据还存在否 + public static boolean existInDataDatabase(ContentResolver resolver, long dataId) { Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null, null, null, null); @@ -193,12 +182,12 @@ Cursor query( } return exist; } - //查看是否存在一个名字是XX的文件夹 + public static boolean checkVisibleFolderName(ContentResolver resolver, String name) { Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, null, - NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER + //类型是文件夹 - " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER +//没进回收站 - " AND " + NoteColumns.SNIPPET + "=?", //存储在snippet的名字和下面的name一样 + NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER + + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + + " AND " + NoteColumns.SNIPPET + "=?", new String[] { name }, null); boolean exist = false; if(cursor != null) { @@ -209,9 +198,9 @@ Cursor query( } return exist; } - //获得文件夹下的便签，并仅返回它们的 Widget ID 和 Widget 类型 + public static HashSet getFolderNoteWidget(ContentResolver resolver, long folderId) { - Cursor c = resolver.query(Notes.CONTENT_NOTE_URI, //获得便签 + Cursor c = resolver.query(Notes.CONTENT_NOTE_URI, new String[] { NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE }, NoteColumns.PARENT_ID + "=?", new String[] { String.valueOf(folderId) }, @@ -236,7 +225,7 @@ Cursor query( } return set; } - //获得电话号 + public static String getCallNumberByNoteId(ContentResolver resolver, long noteId) { Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI, new String [] { CallNote.PHONE_NUMBER }, @@ -246,7 +235,7 @@ Cursor query( if (cursor != null && cursor.moveToFirst()) { try { - return cursor.getString(0); //返回电话号 + return cursor.getString(0); } catch (IndexOutOfBoundsException e) { Log.e(TAG, "Get call number fails " + e.toString()); } finally { @@ -255,7 +244,7 @@ Cursor query( } return ""; } -//通过电话号和日期查找便签 + public static long getNoteIdByPhoneNumberAndCallDate(ContentResolver resolver, String phoneNumber, long callDate) { Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI, new String [] { CallNote.NOTE_ID }, @@ -276,7 +265,7 @@ Cursor query( } return 0; } -//通过id获得名字 + public static String getSnippetById(ContentResolver resolver, long noteId) { Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, new String [] { NoteColumns.SNIPPET }, @@ -294,15 +283,112 @@ Cursor query( } throw new IllegalArgumentException("Note is not found with id: " + noteId); } -//从一段文本（snippet）中提取作为标题 + public static String getFormattedSnippet(String snippet) { if (snippet != null) { - snippet = snippet.trim();//清空无用制表符 - int index = snippet.indexOf('\n');//index即录字符串中第一个换行符 \n 出现的位置 + snippet = snippet.trim(); + int index = snippet.indexOf('\n'); if (index != -1) { - snippet = snippet.substring(0, index);//只获取换行前的部分（核心）。 + snippet = snippet.substring(0, index); } } return snippet; } + + /** + * 获取指定文件夹中的所有便签ID + * @param resolver ContentResolver实例 + * @param folderId 文件夹ID + * @return 便签ID的HashSet + */ + public static HashSet getNotesInFolder(ContentResolver resolver, long folderId) { + Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, + new String[] { NoteColumns.ID }, + NoteColumns.PARENT_ID + "=?", + new String[] { String.valueOf(folderId) }, + null); + + HashSet ids = new HashSet(); + if (cursor != null) { + if (cursor.moveToFirst()) { + do { + try { + ids.add(cursor.getLong(0)); + } catch (IndexOutOfBoundsException e) { + Log.e(TAG, "Get note id fails " + e.toString()); + } + } while (cursor.moveToNext()); + } + cursor.close(); + } + return ids; + } + public static boolean batchMoveToTrash(ContentResolver resolver, HashSet ids, long originFolderId) { + if (ids == null || ids.isEmpty()) { + Log.d(TAG, "the ids is null or empty"); + return true; + } + ArrayList operationList = new ArrayList(); + long now = System.currentTimeMillis(); + + // 1. 更新便签的PARENT_ID为回收站ID + for (long id : ids) { + ContentProviderOperation.Builder builder = ContentProviderOperation + .newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id)); + builder.withValue(NoteColumns.PARENT_ID, Notes.ID_TRASH_FOLER); + builder.withValue(NoteColumns.ORIGIN_PARENT_ID, originFolderId); + builder.withValue(NoteColumns.LOCAL_MODIFIED, 1); + builder.withValue(NoteColumns.MODIFIED_DATE, now); + operationList.add(builder.build()); + } + + try { + ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList); + if (results == null || results.length == 0) { + Log.d(TAG, "move to trash failed, ids:" + ids.toString()); + return false; + } + return true; + } catch (RemoteException e) { + Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); + } catch (OperationApplicationException e) { + Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); + } + return false; + } + + public static void moveNotesToTrashForFolder(ContentResolver resolver, long folderId) { + ContentValues values = new ContentValues(); + values.put(NoteColumns.PARENT_ID, Notes.ID_TRASH_FOLER); + values.put(NoteColumns.ORIGIN_PARENT_ID, folderId); + values.put(NoteColumns.LOCAL_MODIFIED, 1); + values.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); + resolver.update(Notes.CONTENT_NOTE_URI, values, + NoteColumns.PARENT_ID + "=?", + new String[] { String.valueOf(folderId) }); + } + + /** + * 检查文件夹是否为加密文件夹 + * @param resolver ContentResolver + * @param folderId 文件夹ID + * @return 是否为加密文件夹 + */ + public static boolean isEncryptedFolder(ContentResolver resolver, long folderId) { + // 查询是否存在该文件夹的加密数据 + String selection = Notes.DataColumns.NOTE_ID + "=? AND " + Notes.DataColumns.MIME_TYPE + "=?"; + String[] selectionArgs = new String[] { + String.valueOf(folderId), + Notes.DataConstants.ENCRYPTED_FOLDER + }; + Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI, null, selection, selectionArgs, null); + boolean isEncrypted = false; + if (cursor != null) { + isEncrypted = cursor.getCount() > 0; + cursor.close(); + } + return isEncrypted; + } } + + diff --git a/src/notes/tool/DoodleDialog.java b/src/notes/tool/DoodleDialog.java new file mode 100644 index 0000000..8ffb89a --- /dev/null +++ b/src/notes/tool/DoodleDialog.java @@ -0,0 +1,238 @@ +/* + * 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.Dialog; +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.Path; +import android.os.Bundle; +import android.os.Environment; +import android.text.TextUtils; +import android.util.DisplayMetrics; +import android.view.MotionEvent; +import android.view.View; +import android.view.WindowManager; +import android.widget.Button; +import android.widget.LinearLayout; +import android.widget.Toast; + +import net.micode.notes.R; + +import java.io.File; +import java.io.FileOutputStream; +import java.util.ArrayList; +import java.util.List; + +public class DoodleDialog extends Dialog { + public interface OnDoodleSavedListener { + void onSaved(String localPath); + } + + private final Context mContext; + private final OnDoodleSavedListener mListener; + private DoodleView mDoodleView; + + public DoodleDialog(Context context, OnDoodleSavedListener listener) { + super(context); + mContext = context; + mListener = listener; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setTitle(R.string.doodle_title); + setContentView(createContentView()); + WindowManager.LayoutParams params = getWindow().getAttributes(); + params.width = WindowManager.LayoutParams.MATCH_PARENT; + params.height = WindowManager.LayoutParams.MATCH_PARENT; + getWindow().setAttributes(params); + } + + private View createContentView() { + LinearLayout root = new LinearLayout(mContext); + root.setOrientation(LinearLayout.VERTICAL); + int padding = dpToPx(12); + root.setPadding(padding, padding, padding, padding); + + mDoodleView = new DoodleView(mContext); + LinearLayout.LayoutParams canvasParams = new LinearLayout.LayoutParams( + LinearLayout.LayoutParams.MATCH_PARENT, 0); + canvasParams.weight = 1f; + root.addView(mDoodleView, canvasParams); + + LinearLayout actions = new LinearLayout(mContext); + actions.setOrientation(LinearLayout.HORIZONTAL); + LinearLayout.LayoutParams actionParams = new LinearLayout.LayoutParams( + LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT); + actions.setLayoutParams(actionParams); + + Button clearButton = new Button(mContext); + clearButton.setText(R.string.doodle_clear); + clearButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mDoodleView.clear(); + } + }); + + Button cancelButton = new Button(mContext); + cancelButton.setText(android.R.string.cancel); + cancelButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dismiss(); + } + }); + + Button saveButton = new Button(mContext); + saveButton.setText(R.string.doodle_save); + saveButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + String path = saveDoodle(); + if (!TextUtils.isEmpty(path)) { + if (mListener != null) { + mListener.onSaved(path); + } + dismiss(); + } else { + Toast.makeText(mContext, R.string.doodle_save_failed, Toast.LENGTH_SHORT).show(); + } + } + }); + + actions.addView(clearButton, new LinearLayout.LayoutParams(0, + LinearLayout.LayoutParams.WRAP_CONTENT, 1f)); + actions.addView(cancelButton, new LinearLayout.LayoutParams(0, + LinearLayout.LayoutParams.WRAP_CONTENT, 1f)); + actions.addView(saveButton, new LinearLayout.LayoutParams(0, + LinearLayout.LayoutParams.WRAP_CONTENT, 1f)); + root.addView(actions); + return root; + } + + private String saveDoodle() { + Bitmap bitmap = mDoodleView.exportBitmap(); + if (bitmap == null) { + return null; + } + try { + File baseDir = mContext.getExternalFilesDir(Environment.DIRECTORY_PICTURES); + if (baseDir == null) { + baseDir = mContext.getFilesDir(); + } + File appDir = new File(baseDir, "note_images"); + if (!appDir.exists() && !appDir.mkdirs()) { + return null; + } + File file = new File(appDir, "doodle_" + System.currentTimeMillis() + ".png"); + FileOutputStream fos = new FileOutputStream(file); + bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos); + fos.flush(); + fos.close(); + return file.getAbsolutePath(); + } catch (Exception e) { + return null; + } + } + + private int dpToPx(int dp) { + DisplayMetrics dm = mContext.getResources().getDisplayMetrics(); + return Math.round(dm.density * dp); + } + + private static class DoodleView extends View { + private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG); + private final List mPaths = new ArrayList<>(); + private Path mCurrentPath; + + DoodleView(Context context) { + super(context); + mPaint.setColor(Color.BLACK); + mPaint.setStyle(Paint.Style.STROKE); + mPaint.setStrokeCap(Paint.Cap.ROUND); + mPaint.setStrokeJoin(Paint.Join.ROUND); + mPaint.setStrokeWidth(6f); + setBackgroundColor(Color.WHITE); + } + + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + for (Path path : mPaths) { + canvas.drawPath(path, mPaint); + } + if (mCurrentPath != null) { + canvas.drawPath(mCurrentPath, mPaint); + } + } + + @Override + public boolean onTouchEvent(MotionEvent event) { + float x = event.getX(); + float y = event.getY(); + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + mCurrentPath = new Path(); + mCurrentPath.moveTo(x, y); + invalidate(); + return true; + case MotionEvent.ACTION_MOVE: + if (mCurrentPath != null) { + mCurrentPath.lineTo(x, y); + invalidate(); + } + return true; + case MotionEvent.ACTION_UP: + if (mCurrentPath != null) { + mCurrentPath.lineTo(x, y); + mPaths.add(mCurrentPath); + mCurrentPath = null; + invalidate(); + } + return true; + default: + return false; + } + } + + void clear() { + mPaths.clear(); + mCurrentPath = null; + invalidate(); + } + + Bitmap exportBitmap() { + if (getWidth() <= 0 || getHeight() <= 0) { + return null; + } + Bitmap bitmap = Bitmap.createBitmap(getWidth(), getHeight(), + Bitmap.Config.ARGB_8888); + Canvas canvas = new Canvas(bitmap); + canvas.drawColor(Color.WHITE); + for (Path path : mPaths) { + canvas.drawPath(path, mPaint); + } + return bitmap; + } + } +} diff --git a/src/notes/tool/EncryptedFolderManager.java b/src/notes/tool/EncryptedFolderManager.java new file mode 100644 index 0000000..326177c --- /dev/null +++ b/src/notes/tool/EncryptedFolderManager.java @@ -0,0 +1,218 @@ + + /* + * 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.AlertDialog; +import android.app.Dialog; +import android.content.ContentResolver; +import android.content.ContentValues; +import android.content.Context; +import android.content.DialogInterface; +import android.database.Cursor; +import android.net.Uri; +import android.text.InputType; +import android.text.TextUtils; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +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.DataColumns; +import net.micode.notes.data.Notes.NoteColumns; +import net.micode.notes.tool.DataUtils; + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +public class EncryptedFolderManager { + private static final String TAG = "EncryptedFolderManager"; + private final Context mContext; + private final ContentResolver mResolver; + private final Callback mCallback; + + public interface Callback { + void onEncryptedFolderCreated(); + + void onEncryptedFolderUnlocked(NoteItemData data); + } + + public EncryptedFolderManager(Context context, ContentResolver resolver, Callback callback) { + mContext = context; + mResolver = resolver; + mCallback = callback; + } + + public void showCreateEncryptedFolderDialog() { + final AlertDialog.Builder builder = new AlertDialog.Builder(mContext); + View view = LayoutInflater.from(mContext).inflate(R.layout.dialog_encrypted_folder, null); + final EditText etName = (EditText) view.findViewById(R.id.et_encrypted_folder_name); + final EditText etQuestion = (EditText) view.findViewById(R.id.et_encrypted_question); + final EditText etAnswer = (EditText) view.findViewById(R.id.et_encrypted_answer); + etAnswer.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD); + builder.setTitle(R.string.encrypted_folder_title); + builder.setView(view); + builder.setPositiveButton(android.R.string.ok, null); + builder.setNegativeButton(android.R.string.cancel, null); + final Dialog dialog = builder.show(); + final Button positive = (Button) dialog.findViewById(android.R.id.button1); + positive.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + String name = etName.getText().toString().trim(); + String question = etQuestion.getText().toString().trim(); + String answer = etAnswer.getText().toString().trim(); + if (TextUtils.isEmpty(name)) { + etName.setError(mContext.getString(R.string.hint_foler_name)); + return; + } + if (TextUtils.isEmpty(question)) { + etQuestion.setError(mContext.getString(R.string.encrypted_question_empty)); + return; + } + if (TextUtils.isEmpty(answer)) { + etAnswer.setError(mContext.getString(R.string.encrypted_answer_empty)); + return; + } + if (DataUtils.checkVisibleFolderName(mResolver, name)) { + Toast.makeText(mContext, + mContext.getString(R.string.folder_exist, name), Toast.LENGTH_LONG).show(); + return; + } + long folderId = createEncryptedFolder(name, question, answer); + if (folderId > 0) { + dialog.dismiss(); + if (mCallback != null) { + mCallback.onEncryptedFolderCreated(); + } + } + } + }); + } + + public EncryptedFolderInfo getEncryptedFolderInfo(long folderId) { + Cursor cursor = mResolver.query(Notes.CONTENT_DATA_URI, + new String[] { DataColumns.DATA3, DataColumns.DATA4 }, + DataColumns.NOTE_ID + "=? AND " + DataColumns.MIME_TYPE + "=?", + new String[] { String.valueOf(folderId), Notes.DataConstants.ENCRYPTED_FOLDER }, + null); + if (cursor == null) { + return null; + } + try { + if (cursor.moveToFirst()) { + String question = cursor.getString(0); + String answerHash = cursor.getString(1); + if (!TextUtils.isEmpty(question) && !TextUtils.isEmpty(answerHash)) { + return new EncryptedFolderInfo(folderId, question, answerHash); + } + } + } finally { + cursor.close(); + } + return null; + } + + public void showEncryptedUnlockDialog(final EncryptedFolderInfo info, final NoteItemData data) { + final AlertDialog.Builder builder = new AlertDialog.Builder(mContext); + View view = LayoutInflater.from(mContext).inflate(R.layout.dialog_encrypted_unlock, null); + TextView tvQuestion = (TextView) view.findViewById(R.id.tv_encrypted_question); + final EditText etAnswer = (EditText) view.findViewById(R.id.et_encrypted_answer); + tvQuestion.setText(info.question); + builder.setTitle(R.string.encrypted_unlock_title); + builder.setView(view); + builder.setPositiveButton(android.R.string.ok, null); + builder.setNegativeButton(android.R.string.cancel, null); + final Dialog dialog = builder.show(); + final Button positive = (Button) dialog.findViewById(android.R.id.button1); + positive.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + String answer = etAnswer.getText().toString().trim(); + if (TextUtils.isEmpty(answer)) { + etAnswer.setError(mContext.getString(R.string.encrypted_answer_empty)); + return; + } + if (!TextUtils.equals(hashAnswer(answer), info.answerHash)) { + Toast.makeText(mContext, R.string.encrypted_answer_wrong, + Toast.LENGTH_SHORT).show(); + return; + } + dialog.dismiss(); + if (mCallback != null) { + mCallback.onEncryptedFolderUnlocked(data); + } + } + }); + } + + private long createEncryptedFolder(String name, String question, String answer) { + ContentValues values = new ContentValues(); + values.put(NoteColumns.SNIPPET, name); + values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); + values.put(NoteColumns.LOCAL_MODIFIED, 1); + Uri uri = mResolver.insert(Notes.CONTENT_NOTE_URI, values); + if (uri == null) { + return -1; + } + long folderId = -1; + try { + folderId = Long.parseLong(uri.getPathSegments().get(1)); + } catch (NumberFormatException e) { + Log.e(TAG, "Create encrypted folder failed", e); + return -1; + } + ContentValues dataValues = new ContentValues(); + dataValues.put(DataColumns.NOTE_ID, folderId); + dataValues.put(DataColumns.MIME_TYPE, Notes.DataConstants.ENCRYPTED_FOLDER); + dataValues.put(DataColumns.DATA3, question); + dataValues.put(DataColumns.DATA4, hashAnswer(answer)); + mResolver.insert(Notes.CONTENT_DATA_URI, dataValues); + return folderId; + } + + private String hashAnswer(String answer) { + try { + MessageDigest digest = MessageDigest.getInstance("SHA-256"); + byte[] result = digest.digest(answer.getBytes()); + StringBuilder sb = new StringBuilder(); + for (byte b : result) { + sb.append(String.format("%02x", b)); + } + return sb.toString(); + } catch (NoSuchAlgorithmException e) { + Log.e(TAG, "Hash error", e); + return ""; + } + } + + public static class EncryptedFolderInfo { + private final long folderId; + private final String question; + private final String answerHash; + + private EncryptedFolderInfo(long folderId, String question, String answerHash) { + this.folderId = folderId; + this.question = question; + this.answerHash = answerHash; + } + } +} \ No newline at end of file diff --git a/src/tool/GTaskStringUtils.java b/src/notes/tool/GTaskStringUtils.java similarity index 95% rename from src/tool/GTaskStringUtils.java rename to src/notes/tool/GTaskStringUtils.java index 7a4b50f..666b729 100644 --- a/src/tool/GTaskStringUtils.java +++ b/src/notes/tool/GTaskStringUtils.java @@ -15,7 +15,7 @@ */ package net.micode.notes.tool; -//定义一些与 Google Tasks（GTask）JSON 数据交互相关的常量字符串,为与 Google Tasks 同步相关的 JSON 数据结构提供标准化的字段名常量，便于在GTask上同步 + public class GTaskStringUtils { public final static String GTASK_JSON_ACTION_ID = "action_id"; diff --git a/src/notes/tool/ImageInsertHelper.java b/src/notes/tool/ImageInsertHelper.java new file mode 100644 index 0000000..cdc2431 --- /dev/null +++ b/src/notes/tool/ImageInsertHelper.java @@ -0,0 +1,172 @@ +/* + * 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.content.ActivityNotFoundException; +import android.content.Intent; +import android.net.Uri; +import android.os.Build; +import android.os.Environment; +import android.text.TextUtils; +import android.util.Log; +import android.widget.Toast; + +import net.micode.notes.R; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.io.OutputStream; + +import jp.wasabeef.richeditor.RichEditor; + +public class ImageInsertHelper { + private static final String TAG = "ImageInsertHelper"; + private final Activity mActivity; + private final int mRequestCode; + + public static class Result { + public final boolean success; + public final String localPath; + public final String html; + + private Result(boolean success, String localPath, String html) { + this.success = success; + this.localPath = localPath; + this.html = html; + } + } + + public ImageInsertHelper(Activity activity, int requestCode) { + mActivity = activity; + mRequestCode = requestCode; + } + + public void startPickImage() { + try { + Intent intent; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + intent = new Intent(Intent.ACTION_OPEN_DOCUMENT); + intent.addCategory(Intent.CATEGORY_OPENABLE); + } else { + intent = new Intent(Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI); + } + intent.setType("image/*"); + intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + intent.addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION); + } + mActivity.startActivityForResult(intent, mRequestCode); + } catch (ActivityNotFoundException e) { + Intent intent = new Intent(Intent.ACTION_GET_CONTENT); + intent.setType("image/*"); + intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + try { + mActivity.startActivityForResult(intent, mRequestCode); + } catch (ActivityNotFoundException ex) { + Toast.makeText(mActivity, R.string.error_picture_select, Toast.LENGTH_SHORT).show(); + Log.e(TAG, "No image picker available", ex); + } + } + } + + public Result handleActivityResult(int requestCode, int resultCode, Intent data, RichEditor editor) { + if (requestCode != mRequestCode) { + return null; + } + if (resultCode != Activity.RESULT_OK || data == null) { + return new Result(false, null, null); + } + Uri uri = data.getData(); + if (uri == null) { + Toast.makeText(mActivity, R.string.error_picture_select, Toast.LENGTH_SHORT).show(); + return new Result(false, null, null); + } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + final int takeFlags = data.getFlags() + & (Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION); + try { + mActivity.getContentResolver().takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION); + } catch (SecurityException e) { + Log.w(TAG, "Persistable uri permission not granted", e); + } + } + String localImagePath = saveImageToLocal(uri); + if (TextUtils.isEmpty(localImagePath)) { + return new Result(false, null, null); + } + String newHtml = appendImageHtml(editor, localImagePath); + return new Result(true, localImagePath, newHtml); + } + + private String appendImageHtml(RichEditor editor, String localImagePath) { + String imgHtmlTag = buildImageHtmlTag(localImagePath); + String curHtml = normalizeEditorHtml(editor.getHtml()); + String newHtml = curHtml + imgHtmlTag; + editor.setHtml(newHtml); + editor.focusEditor(); + return newHtml; + } + + String buildImageHtmlTag(String localImagePath) { + String imgUrl = Uri.fromFile(new File(localImagePath)).toString(); + return "
"; + } + + private String normalizeEditorHtml(String html) { + if (TextUtils.isEmpty(html) || "null".equalsIgnoreCase(html)) { + return ""; + } + return html; + } + + private String saveImageToLocal(Uri uri) { + try { + File baseDir = mActivity.getExternalFilesDir(Environment.DIRECTORY_PICTURES); + if (baseDir == null) { + baseDir = mActivity.getFilesDir(); + } + File appDir = new File(baseDir, "note_images"); + if (!appDir.exists() && !appDir.mkdirs()) { + Log.e(TAG, "Create image directory failed: " + appDir.getAbsolutePath()); + Toast.makeText(mActivity, R.string.error_picture_select, Toast.LENGTH_SHORT).show(); + return null; + } + String fileName = "note_" + System.currentTimeMillis() + ".jpg"; + File targetFile = new File(appDir, fileName); + try (InputStream is = mActivity.getContentResolver().openInputStream(uri); + OutputStream os = new FileOutputStream(targetFile)) { + if (is == null) { + Log.e(TAG, "Open image stream failed: " + uri); + Toast.makeText(mActivity, R.string.error_picture_select, Toast.LENGTH_SHORT).show(); + return null; + } + byte[] buffer = new byte[1024]; + int len; + while ((len = is.read(buffer)) > 0) { + os.write(buffer, 0, len); + } + } + return targetFile.getAbsolutePath(); + } catch (Exception e) { + Log.e(TAG, "Save image failed", e); + Toast.makeText(mActivity, R.string.error_picture_select, Toast.LENGTH_SHORT).show(); + return null; + } + } +} diff --git a/src/tool/ResourceParser.java b/src/notes/tool/ResourceParser.java similarity index 81% rename from src/tool/ResourceParser.java rename to src/notes/tool/ResourceParser.java index 896e9a4..5364825 100644 --- a/src/tool/ResourceParser.java +++ b/src/notes/tool/ResourceParser.java @@ -19,7 +19,7 @@ package net.micode.notes.tool; import android.content.Context; import android.preference.PreferenceManager; -import net.micode.notes.R; //资源文件夹中的文件被编译成R类的一部分，R类在编译过程中会生成 +import net.micode.notes.R; import net.micode.notes.ui.NotesPreferenceActivity; public class ResourceParser { @@ -40,7 +40,6 @@ public class ResourceParser { 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, @@ -48,7 +47,7 @@ public class ResourceParser { 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, @@ -56,26 +55,32 @@ public class ResourceParser { R.drawable.edit_title_green, R.drawable.edit_title_red }; - + public static int getNoteBgResource(int id) { + if (id < 0 || id >= BG_EDIT_RESOURCES.length) { + return BG_EDIT_RESOURCES[0]; // 默认返回第一个背景资源 + } return BG_EDIT_RESOURCES[id]; } public static int getNoteTitleBgResource(int id) { + if (id < 0 || id >= BG_EDIT_TITLE_RESOURCES.length) { + return BG_EDIT_TITLE_RESOURCES[0]; // 默认返回第一个标题背景资源 + } return BG_EDIT_TITLE_RESOURCES[id]; } } public static int getDefaultBgId(Context context) { - if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean( //获得一个实例，指向该偏好框架在给定上下文中使用的默认文件 - NotesPreferenceActivity.PREFERENCE_SET_BG_COLOR_KEY, false)) { //如果没指定就随机给个颜色 + 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 { //便签主题资源 + public static class NoteItemBgResources { private final static int [] BG_FIRST_RESOURCES = new int [] { R.drawable.list_yellow_up, R.drawable.list_blue_up, @@ -109,18 +114,30 @@ public class ResourceParser { }; public static int getNoteBgFirstRes(int id) { + if (id < 0 || id >= BG_FIRST_RESOURCES.length) { + return BG_FIRST_RESOURCES[0]; // 默认返回第一个背景资源 + } return BG_FIRST_RESOURCES[id]; } public static int getNoteBgLastRes(int id) { + if (id < 0 || id >= BG_LAST_RESOURCES.length) { + return BG_LAST_RESOURCES[0]; // 默认返回第一个背景资源 + } return BG_LAST_RESOURCES[id]; } public static int getNoteBgSingleRes(int id) { + if (id < 0 || id >= BG_SINGLE_RESOURCES.length) { + return BG_SINGLE_RESOURCES[0]; // 默认返回第一个背景资源 + } return BG_SINGLE_RESOURCES[id]; } public static int getNoteBgNormalRes(int id) { + if (id < 0 || id >= BG_NORMAL_RESOURCES.length) { + return BG_NORMAL_RESOURCES[0]; // 默认返回第一个背景资源 + } return BG_NORMAL_RESOURCES[id]; } @@ -139,6 +156,9 @@ public class ResourceParser { }; public static int getWidget2xBgResource(int id) { + if (id < 0 || id >= BG_2X_RESOURCES.length) { + return BG_2X_RESOURCES[0]; // 默认返回第一个背景资源 + } return BG_2X_RESOURCES[id]; } @@ -151,6 +171,9 @@ public class ResourceParser { }; public static int getWidget4xBgResource(int id) { + if (id < 0 || id >= BG_4X_RESOURCES.length) { + return BG_4X_RESOURCES[0]; // 默认返回第一个背景资源 + } return BG_4X_RESOURCES[id]; } } diff --git a/src/tool/TranslateUtils.java b/src/notes/tool/TranslateUtils.java similarity index 99% rename from src/tool/TranslateUtils.java rename to src/notes/tool/TranslateUtils.java index 6d74a64..e93ebbc 100644 --- a/src/tool/TranslateUtils.java +++ b/src/notes/tool/TranslateUtils.java @@ -32,7 +32,6 @@ public class TranslateUtils { public static boolean isOnline(Context ctx) { ConnectivityManager cm = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE); if (cm == null) return false; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { Network network = cm.getActiveNetwork(); if (network == null) return false; @@ -46,6 +45,7 @@ public class TranslateUtils { NetworkInfo ni = cm.getActiveNetworkInfo(); return ni != null && ni.isConnected(); } + } public static String translateParagraph(String text, String targetLang) { diff --git a/src/ui/AlarmAlertActivity.java b/src/notes/ui/AlarmAlertActivity.java similarity index 85% rename from src/ui/AlarmAlertActivity.java rename to src/notes/ui/AlarmAlertActivity.java index 11798f8..68a8fdb 100644 --- a/src/ui/AlarmAlertActivity.java +++ b/src/notes/ui/AlarmAlertActivity.java @@ -55,7 +55,6 @@ import org.json.JSONException; import org.json.JSONObject; import java.util.Calendar; - //继承Activity //承诺实现click，dismiss接口，不继承功能 public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener { private static final String TAG = "AlarmAlertActivity"; private long mNoteId; @@ -63,42 +62,35 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD private static final int SNIPPET_PREW_MAX_LEN = 60; MediaPlayer mPlayer; - @Override //创建闹钟行为 + @Override protected void onCreate(Bundle savedInstanceState) { - //调用其父类Activity的onCreate方法来实现对界面的图画绘制工作。 super.onCreate(savedInstanceState); - //onSaveInstanceState()来保存当前activity的状态信息 requestWindowFeature(Window.FEATURE_NO_TITLE); - //final类似stactic，获得窗口对象 + final Window win = getWindow(); - //为窗口添加各种标志（flags），从而改变窗口的行为和外观 - //屏幕锁定时显示窗口，便于锁屏时启动闹钟 win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); - //LayoutParams 布局参数，规定子视图如何放置 - if (!isScreenOn()) {//不锁平时 - win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON//当这个window对用户是可见状态,则保持设备屏幕不关闭且不变暗 - | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON//当window被添加或者显示,系统会点亮屏幕, - | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON//允许在屏幕开启的时候锁定屏幕 - | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);//插入window的矩形大小,来确保内容不会被装饰物(如状态栏)掩盖 + + 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 { //传递到当前组件的 URI 数据，截取Uri内的字符串的第二个“/”右边的字符及id + try { mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1)); - //根据ID从数据库中获取标签的内容 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();// 将异常的详细信息输出到标准错误流 + e.printStackTrace(); return; } mPlayer = new MediaPlayer(); - //如果不在回收站就显示文字并发出声音 if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) { int isHabit = intent.getIntExtra("habit_alarm", 0); if (isHabit == 1) { @@ -112,27 +104,26 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD } } - private boolean isScreenOn() { //由电量判断屏幕状态 + private boolean isScreenOn() { PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE); return pm.isScreenOn(); } private void playAlarmSound() { - //由铃声管理器获得默认铃声的uri 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.setDataSource(this, url); mPlayer.prepare(); - mPlayer.setLooping(true);//设置循环播放 + mPlayer.setLooping(true); mPlayer.start(); } catch (IllegalArgumentException e) { // TODO Auto-generated catch block @@ -150,11 +141,10 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD } private void showActionDialog() { - //AlertDialog.Builder是对话框组件，用于显示信息 AlertDialog.Builder dialog = new AlertDialog.Builder(this); dialog.setTitle(R.string.app_name); dialog.setMessage(mSnippet); - dialog.setPositiveButton(R.string.notealert_ok, this); //setPositive/Negative/NeutralButton()设置：确定，取消，中立按钮； + dialog.setPositiveButton(R.string.notealert_ok, this); if (isScreenOn()) { dialog.setNegativeButton(R.string.notealert_enter, this); } @@ -344,20 +334,20 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD switch (which) { case DialogInterface.BUTTON_NEGATIVE: Intent intent = new Intent(this, NoteEditActivity.class); - intent.setAction(Intent.ACTION_VIEW);//执行安卓内置操作查看数据 - intent.putExtra(Intent.EXTRA_UID, mNoteId);//向目标页面传递笔记的ID - startActivity(intent);//触发页面跳转 + 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(); diff --git a/src/ui/AlarmInitReceiver.java b/src/notes/ui/AlarmInitReceiver.java similarity index 71% rename from src/ui/AlarmInitReceiver.java rename to src/notes/ui/AlarmInitReceiver.java index 61176a0..f221202 100644 --- a/src/ui/AlarmInitReceiver.java +++ b/src/notes/ui/AlarmInitReceiver.java @@ -27,7 +27,7 @@ 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 [] { @@ -39,31 +39,24 @@ public class AlarmInitReceiver extends BroadcastReceiver { private static final int COLUMN_ALERTED_DATE = 1; @Override - public void onReceive(Context context, Intent intent) { //设置接收装置 - //获取当前时间的常用方法。它返回自 1970 年 1 月 1 日 00:00:00.000 到当前时刻的时间距离 + 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格式，明确启动应用中的AlarmReceiver类 Intent sender = new Intent(context, AlarmReceiver.class); - //指定要访问的资源URI(这里的uir是把id和contentUri连接后成一个新的Uri) sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID))); - //(满足特定条件但这里是0即没有)向BroadcastReceiver发送执行sender的广播 PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0); - //获取 AlarmManager AlarmManager alermManager = (AlarmManager) context .getSystemService(Context.ALARM_SERVICE); - //set(int type，long startTime，PendingIntent pi) ,设置一次性定时器，到达时间执行完就没了 alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent); - //闹钟在睡眠状态下会唤醒系统并执行提示功能 } while (c.moveToNext()); } c.close(); diff --git a/src/ui/AlarmReceiver.java b/src/notes/ui/AlarmReceiver.java similarity index 71% rename from src/ui/AlarmReceiver.java rename to src/notes/ui/AlarmReceiver.java index e072fbb..54e503b 100644 --- a/src/ui/AlarmReceiver.java +++ b/src/notes/ui/AlarmReceiver.java @@ -20,11 +20,11 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -public class AlarmReceiver extends BroadcastReceiver {//闹钟响应广播接收者 +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);//执行 + intent.setClass(context, AlarmAlertActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(intent); } } diff --git a/src/ui/BackgroundManager.java b/src/notes/ui/BackgroundManager.java similarity index 67% rename from src/ui/BackgroundManager.java rename to src/notes/ui/BackgroundManager.java index 7b8d7b2..6d094cf 100644 --- a/src/ui/BackgroundManager.java +++ b/src/notes/ui/BackgroundManager.java @@ -15,65 +15,68 @@ import net.micode.notes.R; import java.io.InputStream; public class BackgroundManager { - public static final int REQUEST_CODE_PICK_IMAGE = 2001; - - private static final String PREF_BG_TYPE = "pref_bg_type"; // 0=color,1=builtin,2=uri - private static final String PREF_BG_COLOR = "pref_bg_color"; - private static final String PREF_BG_RES_ID = "pref_bg_res_id"; - private static final String PREF_BG_URI = "pref_bg_uri"; - - private static final int BG_TYPE_COLOR = 0; - private static final int BG_TYPE_BUILTIN = 1; - private static final int BG_TYPE_URI = 2; + public static final int REQUEST_CODE_PICK_IMAGE = 2001; // 选图请求码 + private static final String PREF_BG_TYPE = "pref_bg_type"; // 背景类型key：0=颜色，1=内置资源，2=自定义图片URI + private static final String PREF_BG_COLOR = "pref_bg_color"; // 背景颜色key + private static final String PREF_BG_RES_ID = "pref_bg_res_id"; // 内置背景资源ID key + private static final String PREF_BG_URI = "pref_bg_uri"; // 自定义图片URI key + private static final int BG_TYPE_COLOR = 0; // 颜色类型标识 + private static final int BG_TYPE_BUILTIN = 1; // 内置资源类型标识 + private static final int BG_TYPE_URI = 2; // 自定义图片类型标识 private Activity mActivity; - private View mRootView; + private View mRootView;//要设置背景的根View public BackgroundManager(Activity activity, int rootViewId) { mActivity = activity; - mRootView = activity.findViewById(rootViewId); + mRootView = activity.findViewById(rootViewId);//绑定指定的根View if (mRootView == null) { - mRootView = activity.getWindow().getDecorView(); + mRootView = activity.getWindow().getDecorView();//若传入的View ID无效，取窗口根View } } + // 根据偏好设置应用背景 public void applyBackgroundFromPrefs() { SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mActivity); - int type = sp.getInt(PREF_BG_TYPE, -1); - if (type == BG_TYPE_COLOR) { - int color = sp.getInt(PREF_BG_COLOR, 0xFFFFFFFF); - applyColorBackground(color); - } else if (type == BG_TYPE_BUILTIN) { - int resId = sp.getInt(PREF_BG_RES_ID, R.drawable.list_background); - applyBuiltinBackground(resId); - } else if (type == BG_TYPE_URI) { - String uriStr = sp.getString(PREF_BG_URI, null); + int type = sp.getInt(PREF_BG_TYPE, -1);//读取背景类型 + if (type == BG_TYPE_COLOR) {//颜色类型 + int color = sp.getInt(PREF_BG_COLOR, 0xFFFFFFFF);//读取颜色值 + applyColorBackground(color);//应用颜色背景 + } else if (type == BG_TYPE_BUILTIN) {//内置资源类型 + int resId = sp.getInt(PREF_BG_RES_ID, R.drawable.list_background);//读取资源ID + applyBuiltinBackground(resId);//应用内置背景 + } else if (type == BG_TYPE_URI) {//自定义图片类型 + String uriStr = sp.getString(PREF_BG_URI, null);//读取URI字符串 if (uriStr != null) { - applyUriBackground(Uri.parse(uriStr)); + applyUriBackground(Uri.parse(uriStr));//应用自定义图片背景 } } else { - mRootView.setBackgroundResource(R.drawable.list_background); + mRootView.setBackgroundResource(R.drawable.list_background);//默认背景 } } + // 应用颜色背景并保存偏好设置 public void applyColorAndSave(int color) { applyColorBackground(color); - SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mActivity); - sp.edit().putInt(PREF_BG_TYPE, BG_TYPE_COLOR).putInt(PREF_BG_COLOR, color).commit(); + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mActivity);//获取默认SharedPreferences + sp.edit().putInt(PREF_BG_TYPE, BG_TYPE_COLOR).putInt(PREF_BG_COLOR, color).commit();//保存背景类型和颜色值 } + // 应用内置背景并保存偏好设置 public void applyBuiltinAndSave(int resId) { applyBuiltinBackground(resId); SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mActivity); sp.edit().putInt(PREF_BG_TYPE, BG_TYPE_BUILTIN).putInt(PREF_BG_RES_ID, resId).commit(); } + // 启动图库选择图片 public void pickImageFromGallery() { Intent intent = new Intent(Intent.ACTION_PICK); intent.setType("image/*"); mActivity.startActivityForResult(intent, REQUEST_CODE_PICK_IMAGE); } + // 处理图库选择结果 public boolean handleActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == REQUEST_CODE_PICK_IMAGE && resultCode == Activity.RESULT_OK && data != null) { Uri uri = data.getData(); @@ -85,6 +88,7 @@ public class BackgroundManager { return false; } + // 重置为默认背景并清除偏好设置 public void resetToDefaultAndClear() { mRootView.setBackgroundResource(R.drawable.list_background); SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mActivity); @@ -99,9 +103,10 @@ public class BackgroundManager { mRootView.setBackgroundResource(resId); } + // 应用URI背景 private void applyUriBackground(Uri uri) { try { - InputStream is = mActivity.getContentResolver().openInputStream(uri); + InputStream is = mActivity.getContentResolver().openInputStream(uri);//通过内容解析器打开URI对应的输入流 if (is != null) { Drawable d = Drawable.createFromStream(is, uri.toString()); mRootView.setBackgroundDrawable(d); @@ -113,6 +118,7 @@ public class BackgroundManager { } } + // 应用URI背景并保存偏好设置 private void applyUriAndSave(Uri uri) { try { InputStream is = mActivity.getContentResolver().openInputStream(uri); diff --git a/src/ui/CallRecordReceiver.java b/src/notes/ui/CallRecordReceiver.java similarity index 99% rename from src/ui/CallRecordReceiver.java rename to src/notes/ui/CallRecordReceiver.java index 8683e9d..b09cab1 100644 --- a/src/ui/CallRecordReceiver.java +++ b/src/notes/ui/CallRecordReceiver.java @@ -39,6 +39,7 @@ public class CallRecordReceiver extends BroadcastReceiver { Log.d(TAG, "Received broadcast: " + intent.getAction()); if (intent.getAction().equals(TelephonyManager.ACTION_PHONE_STATE_CHANGED)) { + String state = intent.getStringExtra(TelephonyManager.EXTRA_STATE); String phoneNumber = intent.getStringExtra(TelephonyManager.EXTRA_INCOMING_NUMBER); diff --git a/src/ui/CallRecordService.java b/src/notes/ui/CallRecordService.java similarity index 98% rename from src/ui/CallRecordService.java rename to src/notes/ui/CallRecordService.java index 15451ef..ef60f2d 100644 --- a/src/ui/CallRecordService.java +++ b/src/notes/ui/CallRecordService.java @@ -87,7 +87,7 @@ public class CallRecordService extends IntentService { // 使用正确的键名传递便签ID intent.putExtra(Intent.EXTRA_UID, noteId); intent.putExtra(Notes.INTENT_EXTRA_CALL_DATE, callDate); - intent.putExtra("phone_number", phoneNumber); + intent.putExtra(Intent.EXTRA_PHONE_NUMBER, phoneNumber); // 从服务启动 Activity，需要 NEW_TASK 标志；避免清除整个任务栈 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); try { diff --git a/src/ui/DateTimePicker.java b/src/notes/ui/DateTimePicker.java similarity index 75% rename from src/ui/DateTimePicker.java rename to src/notes/ui/DateTimePicker.java index d921f3b..496b0cd 100644 --- a/src/ui/DateTimePicker.java +++ b/src/notes/ui/DateTimePicker.java @@ -27,7 +27,7 @@ import android.text.format.DateFormat; import android.view.View; import android.widget.FrameLayout; import android.widget.NumberPicker; - //FrameLayout 是 Android 布局容器之一，用于在屏幕上开辟一块区域，将子控件按照添加顺序进行层叠显示 + public class DateTimePicker extends FrameLayout { private static final boolean DEFAULT_ENABLE_STATE = true; @@ -45,56 +45,56 @@ public class DateTimePicker extends FrameLayout { 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; - //XX选择器设置 - //这里定义的四个变量全部是在设置闹钟时需要选择的变量（如日期、时、分、上午或者下午） + 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; //12小时制是否上午 + private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK]; + + private boolean mIsAm; - private boolean mIs24HourView;//24小时制 + private boolean mIs24HourView; - private boolean mIsEnabled = DEFAULT_ENABLE_STATE; //是否启动？ + private boolean mIsEnabled = DEFAULT_ENABLE_STATE; - private boolean mInitialising; //是否正在初始化？ + private boolean mInitialising; - private OnDateTimeChangedListener mOnDateTimeChangedListener; //自定义接口，创建接口类型变量,外部实现功能，可以调用onDateTimeChanged了 - //系统接口，自己实现功能，当用户滑动日期滚轮（比如从 5 号滑到 6 号），系统会自动调用onValueChange方法 - private NumberPicker.OnValueChangeListener mOnDateChangedListener = new NumberPicker.OnValueChangeListener() { //日期变更 + private OnDateTimeChangedListener mOnDateTimeChangedListener; + + private NumberPicker.OnValueChangeListener mOnDateChangedListener = new NumberPicker.OnValueChangeListener() { @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) { + public void onValueChange(NumberPicker picker, int oldVal, int newVal) { mDate.add(Calendar.DAY_OF_YEAR, newVal - oldVal); - updateDateControl();//更新日期 - onDateTimeChanged();//触发自定义接口的回调（把事件传给外部）[实现方法不在此类]，作用未知？？ + updateDateControl(); + onDateTimeChanged(); } }; - private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() { //小时变更 + + 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) { //12小时制 - if (!mIsAm && oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) { //从十一点多调整到第二天0点，日期加一。 - cal.setTimeInMillis(mDate.getTimeInMillis());// set time to（ 1970 年 1 月 1 日的 00:00:00.000到Calendar对象表示的时间之间的毫秒数 ）after january 1 1970 + 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) {//从0点多调整到昨天点，日期加一。 + } 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 || //上下午切换 + 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 {//24小时制 - if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) {//同上面日期切换逻辑 + } else { + if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, 1); isDateChanged = true; @@ -104,8 +104,8 @@ public class DateTimePicker extends FrameLayout { isDateChanged = true; } } - int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY);//24小时制的小时时间数 - mDate.set(Calendar.HOUR_OF_DAY, newHour); //通过set函数将新的Hour值传给mDate + 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)); @@ -115,18 +115,18 @@ public class DateTimePicker extends FrameLayout { } }; - private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() {//分钟变更 + 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; //分钟导致的的小时切换 + int offset = 0; if (oldVal == maxValue && newVal == minValue) { - offset += 1; //小时加一 + offset += 1; } else if (oldVal == minValue && newVal == maxValue) { - offset -= 1; //小时减一 + offset -= 1; } - if (offset != 0) { //更新小时时间 + if (offset != 0) { mDate.add(Calendar.HOUR_OF_DAY, offset); mHourSpinner.setValue(getCurrentHour()); updateDateControl(); @@ -139,44 +139,44 @@ public class DateTimePicker extends FrameLayout { updateAmPmControl(); } } - mDate.set(Calendar.MINUTE, newVal);//通过set函数将新的minutes值传给mDate + mDate.set(Calendar.MINUTE, newVal); onDateTimeChanged(); } }; - private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() {//上下午变更 + private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() { @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - mIsAm = !mIsAm;//为啥要变成否定的 - if (mIsAm) {//下午变成上午了24小时制减去12 + mIsAm = !mIsAm; + if (mIsAm) { mDate.add(Calendar.HOUR_OF_DAY, -HOURS_IN_HALF_DAY); - } else {//上午变下午，就加12除余 - 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 {//接口，要求实现onDateTimeChanged + public interface OnDateTimeChangedListener { void onDateTimeChanged(DateTimePicker view, int year, int month, int dayOfMonth, int hourOfDay, int minute); } - public DateTimePicker(Context context) {// 获得1970 年 1 月 1 日的 00:00:00.000到Calendar对象表示的时间之间的毫秒数 + public DateTimePicker(Context context) { this(context, System.currentTimeMillis()); } public DateTimePicker(Context context, long date) { - this(context, date, DateFormat.is24HourFormat(context));//把上一个函数的毫秒改成24小时制的日期格式 + this(context, date, DateFormat.is24HourFormat(context)); } public DateTimePicker(Context context, long date, boolean is24HourView) { - super(context);//super是啥？？ + super(context); mDate = Calendar.getInstance(); mInitialising = true; mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY; - inflate(context, R.layout.datetime_picker, this);//inflate的作用？？ + inflate(context, R.layout.datetime_picker, this); mDateSpinner = (NumberPicker) findViewById(R.id.date); mDateSpinner.setMinValue(DATE_SPINNER_MIN_VAL); @@ -188,14 +188,14 @@ public class DateTimePicker extends FrameLayout { mMinuteSpinner = (NumberPicker) findViewById(R.id.minute); mMinuteSpinner.setMinValue(MINUT_SPINNER_MIN_VAL); mMinuteSpinner.setMaxValue(MINUT_SPINNER_MAX_VAL); - mMinuteSpinner.setOnLongPressUpdateInterval(100);//？ + 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.setDisplayedValues(stringsForAmPm); mAmPmSpinner.setOnValueChangedListener(mOnAmPmChangedListener); // update controls to initial state @@ -208,7 +208,7 @@ public class DateTimePicker extends FrameLayout { // set to current time setCurrentDate(date); - setEnabled(isEnabled());//? + setEnabled(isEnabled()); // set the content descriptions mInitialising = false; @@ -241,7 +241,6 @@ public class DateTimePicker extends FrameLayout { return mDate.getTimeInMillis(); } -//两种不同的参数，对应不同的设置现在时间的方法 /** * Set the current date * @@ -427,87 +426,58 @@ public class DateTimePicker extends FrameLayout { if (mIs24HourView == is24HourView) { return; } - mIs24HourView = is24HourView; //spinner拉条 ，就是选am还是pm时候用的 + 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()); - // 计算起始日期：当前日期减去3天（DAYS_IN_ALL_WEEK/2=3）再减1天，得到一周前的日期 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); - // 格式化日期为"MM.dd EEEE"格式（例如：05.20 星期一） + 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(); } - /** - * 更新上午/下午选择控件的显示 - * 根据当前是否为24小时制，决定是否显示上午/下午选择器 - */ private void updateAmPmControl() { if (mIs24HourView) { - // 24小时制下，隐藏上午/下午选择器 mAmPmSpinner.setVisibility(View.GONE); } else { - // 12小时制下，根据当前是上午还是下午设置选择器值 int index = mIsAm ? Calendar.AM : Calendar.PM; mAmPmSpinner.setValue(index); - // 显示上午/下午选择器 mAmPmSpinner.setVisibility(View.VISIBLE); } } - /** - * 更新小时选择控件的显示范围 - * 根据当前是否为24小时制，设置不同的小时范围 - */ private void updateHourControl() { if (mIs24HourView) { - // 24小时制：小时范围0-23 mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW); mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW); } else { - // 12小时制：小时范围1-12 mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW); mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW); } } /** - * 设置日期时间改变监听器 - * 当用户修改日期或时间时，会调用该监听器的回调方法 - * @param callback 监听器对象，null表示不设置监听器 + * 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) { - // 调用监听器的onDateTimeChanged方法，传递当前选择的年、月、日、时、分 mOnDateTimeChangedListener.onDateTimeChanged(this, getCurrentYear(), getCurrentMonth(), getCurrentDay(), getCurrentHourOfDay(), getCurrentMinute()); } diff --git a/src/ui/DateTimePickerDialog.java b/src/notes/ui/DateTimePickerDialog.java similarity index 68% rename from src/ui/DateTimePickerDialog.java rename to src/notes/ui/DateTimePickerDialog.java index f0d05ef..2c47ba4 100644 --- a/src/ui/DateTimePickerDialog.java +++ b/src/notes/ui/DateTimePickerDialog.java @@ -28,39 +28,37 @@ 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 OnDateTimeSetListener mOnDateTimeSetListener; private DateTimePicker mDateTimePicker; - public interface OnDateTimeSetListener {//实现接口的函数调用 + public interface OnDateTimeSetListener { void OnDateTimeSet(AlertDialog dialog, long date); } public DateTimePickerDialog(Context context, long date) { - super(context);//访问AlertDialog的context + super(context); mDateTimePicker = new DateTimePicker(context); - setView(mDateTimePicker);//自定义对话框 - mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() { //注册监听器，用户操作日期时间选择器时，这个监听器会被自动触发 + 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());//根据新的日期时间更新对话框标题 + updateTitle(mDate.getTimeInMillis()); } }); - //下面三行是日期时间选择器初始化的核心逻辑 - mDate.setTimeInMillis(date); //导入calendar时间 - mDate.set(Calendar.SECOND, 0);//秒数设为0 - mDateTimePicker.setCurrentDate(mDate.getTimeInMillis());//设置为当前时间 - setButton(context.getString(R.string.datetime_dialog_ok), this);//设置了确认和取消按钮 + 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()); @@ -70,21 +68,20 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener mIs24HourView = is24HourView; } - public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) { //设置时间的接口 - mOnDateTimeSetListener = callBack; + public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) { + mOnDateTimeSetListener = callBack; } private void updateTitle(long date) { - int flag = //亮点，位掩码设计 返回了结果是一个包含所有标志位的整数作为时间显示格式 + int flag = DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME; - //再并上24小时格式或12小时格式 - flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_12HOUR; //错误应为12HOUR - setTitle(DateUtils.formatDateTime(this.getContext(), date, flag)); //设置对话框标题 - } //日期时间的本地化格式化 - - public void onClick(DialogInterface arg0, int arg1) {//点击确认按钮时调用 + 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()); } diff --git a/src/ui/DropdownMenu.java b/src/notes/ui/DropdownMenu.java similarity index 68% rename from src/ui/DropdownMenu.java rename to src/notes/ui/DropdownMenu.java index 33f6b96..613dc74 100644 --- a/src/ui/DropdownMenu.java +++ b/src/notes/ui/DropdownMenu.java @@ -29,35 +29,33 @@ import net.micode.notes.R; public class DropdownMenu { private Button mButton; - private PopupMenu mPopupMenu; //弹窗菜单 + private PopupMenu mPopupMenu; private Menu mMenu; public DropdownMenu(Context context, Button button, int menuId) { mButton = button; - mButton.setBackgroundResource(R.drawable.dropdown_icon);//绘制下拉菜单图标 + mButton.setBackgroundResource(R.drawable.dropdown_icon); mPopupMenu = new PopupMenu(context, mButton); - mMenu = mPopupMenu.getMenu();//获取弹窗菜单的菜单对象 - mPopupMenu.getMenuInflater().inflate(menuId, mMenu);//获得菜单 - //第一个参数用于指定我们通过哪一个资源文件来创建菜单，menuId。 - // 第二个参数用于指定我们的菜单项将添加到哪一个 Meau 对象中 - mButton.setOnClickListener(new OnClickListener() {//设置下拉菜单图标点击事件 + mMenu = mPopupMenu.getMenu(); + mPopupMenu.getMenuInflater().inflate(menuId, mMenu); + mButton.setOnClickListener(new OnClickListener() { public void onClick(View v) { mPopupMenu.show(); } }); } - public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) {//设置下拉菜单选项点击事件监听 + public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) { if (mPopupMenu != null) { mPopupMenu.setOnMenuItemClickListener(listener); } } - public MenuItem findItem(int id) {//根据菜单项的ID查找菜单项 + public MenuItem findItem(int id) { return mMenu.findItem(id); } - public void setTitle(CharSequence title) {//设置下拉菜单图标上的文本 + public void setTitle(CharSequence title) { mButton.setText(title); } } diff --git a/src/ui/FoldersListAdapter.java b/src/notes/ui/FoldersListAdapter.java similarity index 61% rename from src/ui/FoldersListAdapter.java rename to src/notes/ui/FoldersListAdapter.java index 3384004..96b77da 100644 --- a/src/ui/FoldersListAdapter.java +++ b/src/notes/ui/FoldersListAdapter.java @@ -28,8 +28,8 @@ import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; - //将cursor对象数据加载到界面的适配器 -public class FoldersListAdapter extends CursorAdapter {//将文件夹数据转换成视图 + +public class FoldersListAdapter extends CursorAdapter { public static final String [] PROJECTION = { NoteColumns.ID, NoteColumns.SNIPPET @@ -39,43 +39,41 @@ public class FoldersListAdapter extends CursorAdapter {//将文件夹数据转 public static final int NAME_COLUMN = 1; public FoldersListAdapter(Context context, Cursor c) { - super(context, c);//调用父类构造方法，初始化上下文和游标 + super(context, c); // TODO Auto-generated constructor stub } @Override - public View newView(Context context, Cursor cursor, ViewGroup parent) {//创建新的视图 - return new FolderListItem(context);//创建一个新的FolderListItem视图 + 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) {//判断视图是否为FolderListItem类型 - //根据文件夹类型动态显示不同的名称，当文件夹是文件夹时，显示移动到父文件夹 - //当文件夹是 普通文件夹时，显示其实际名称 + 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);//将文件夹名称绑定到FolderListItem视图 + ((FolderListItem) view).bind(folderName); } } - public String getFolderName(Context context, int position) {//根据位置找到对应文件夹的名称 + 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); } - //布局管理器 之一，属于 ViewGroup 的子类，用于 将子View按照线性方向排列 - private class FolderListItem extends LinearLayout {//文件夹列表项视图 + + private class FolderListItem extends LinearLayout { private TextView mName; + public FolderListItem(Context context) { super(context); - inflate(context, R.layout.folder_list_item, this);//对 LayoutInflater.inflate()的简化 - //将R.layout.folder_list_item布局文件实例化并添加到当前视图（FolderListItem）中 - mName = (TextView) findViewById(R.id.tv_folder_name);//获取布局文件中的TextView控件 + inflate(context, R.layout.folder_list_item, this); + mName = (TextView) findViewById(R.id.tv_folder_name); } public void bind(String name) { - mName.setText(name);//将文件夹名称设置到TextView中 + mName.setText(name); } } diff --git a/src/notes/ui/MemoryBottleDialog.java b/src/notes/ui/MemoryBottleDialog.java new file mode 100644 index 0000000..897b312 --- /dev/null +++ b/src/notes/ui/MemoryBottleDialog.java @@ -0,0 +1,569 @@ +/* + * 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.ContentResolver; +import android.content.ContentUris; +import android.content.ContentValues; +import android.content.DialogInterface; +import android.content.SharedPreferences; +import android.database.Cursor; +import android.os.AsyncTask; +import android.preference.PreferenceManager; +import android.text.InputType; +import android.text.TextUtils; +import android.view.Gravity; +import android.view.View; +import android.view.WindowManager; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +import net.micode.notes.R; +import net.micode.notes.data.Notes; +import net.micode.notes.data.Notes.DataColumns; +import net.micode.notes.data.Notes.NoteColumns; +import net.micode.notes.data.Notes.TextNote; +import net.micode.notes.model.WorkingNote; +import net.micode.notes.tool.DataUtils; +import net.micode.notes.tool.ResourceParser; + +import java.lang.ref.WeakReference; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Locale; +import java.util.Random; +import java.util.HashSet; + +public class MemoryBottleDialog extends Dialog implements View.OnClickListener { + private static final String PREF_MEMORY_FOLDER_ID = "pref_memory_bottle_folder_id"; + private static final List sAllEntries = new ArrayList<>(); + private static final List sRemainingEntries = new ArrayList<>(); + private static final Random sRandom = new Random(); + private static long sFolderId = Long.MIN_VALUE; + + private final Activity mActivity; + private Button mAddButton; + private Button mBrowseButton; + private long mMemoryFolderId = -1; + private boolean mEntriesLoaded; + private boolean mLoading; + private boolean mBrowseLoading; + private LoadTask mLoadTask; + private BrowseTask mBrowseTask; + private PendingAction mPendingAction = PendingAction.NONE; + + public MemoryBottleDialog(Activity activity) { + super(activity, android.R.style.Theme_Light_NoTitleBar); + mActivity = activity; + } + + @Override + protected void onCreate(android.os.Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.memory_bottle); + getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, + WindowManager.LayoutParams.MATCH_PARENT); + initResources(); + } + + @Override + public void dismiss() { + if (mLoadTask != null) { + mLoadTask.cancel(true); + mLoadTask = null; + } + if (mBrowseTask != null) { + mBrowseTask.cancel(true); + mBrowseTask = null; + } + super.dismiss(); + } + + private void initResources() { + mAddButton = (Button) findViewById(R.id.btn_memory_add); + mBrowseButton = (Button) findViewById(R.id.btn_memory_browse); + mAddButton.setOnClickListener(this); + mBrowseButton.setOnClickListener(this); + updateButtonState(); + } + + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.btn_memory_add: + requestAction(PendingAction.ADD); + break; + case R.id.btn_memory_browse: + requestAction(PendingAction.BROWSE); + break; + default: + break; + } + } + + private void requestAction(PendingAction action) { + if (mLoading || mBrowseLoading) { + Toast.makeText(mActivity, R.string.memory_bottle_loading, Toast.LENGTH_SHORT).show(); + return; + } + if (mMemoryFolderId <= 0) { + mPendingAction = action; + Toast.makeText(mActivity, R.string.memory_bottle_loading, Toast.LENGTH_SHORT).show(); + startLoadTask(action == PendingAction.BROWSE); + return; + } + if (action == PendingAction.BROWSE && !mEntriesLoaded) { + mPendingAction = action; + Toast.makeText(mActivity, R.string.memory_bottle_loading, Toast.LENGTH_SHORT).show(); + startLoadTask(true); + return; + } + if (action == PendingAction.ADD) { + showAddDialog(); + } else if (action == PendingAction.BROWSE) { + browseMemory(); + } + } + + private void startLoadTask(boolean loadEntries) { + if (mLoadTask != null) { + return; + } + setLoading(true); + mLoadTask = new LoadTask(this, loadEntries); + mLoadTask.execute(); + } + + private void setLoading(boolean loading) { + mLoading = loading; + updateButtonState(); + } + + private void setBrowseLoading(boolean loading) { + mBrowseLoading = loading; + updateButtonState(); + } + + private void updateButtonState() { + boolean enabled = !(mLoading || mBrowseLoading); + if (mAddButton != null) { + mAddButton.setEnabled(enabled); + } + if (mBrowseButton != null) { + mBrowseButton.setEnabled(enabled); + } + } + + private void showAddDialog() { + final EditText editText = new EditText(mActivity); + int padding = (int) (mActivity.getResources().getDisplayMetrics().density * 16); + editText.setPadding(padding, padding, padding, padding); + editText.setGravity(Gravity.TOP | Gravity.START); + editText.setMinLines(4); + editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE); + editText.setHint(R.string.memory_bottle_add_hint); + + AlertDialog.Builder builder = new AlertDialog.Builder(mActivity); + builder.setTitle(R.string.memory_bottle_add_title); + builder.setView(editText); + builder.setPositiveButton(android.R.string.ok, null); + builder.setNegativeButton(android.R.string.cancel, null); + final AlertDialog dialog = builder.show(); + dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + String content = editText.getText().toString().trim(); + if (TextUtils.isEmpty(content)) { + Toast.makeText(mActivity, R.string.memory_bottle_empty_input, + Toast.LENGTH_SHORT).show(); + return; + } + if (createMemoryNote(content)) { + dialog.dismiss(); + } + } + }); + } + + private boolean createMemoryNote(String content) { + if (mMemoryFolderId <= 0) { + Toast.makeText(mActivity, R.string.memory_bottle_folder_error, Toast.LENGTH_SHORT).show(); + return false; + } + WorkingNote note = WorkingNote.createEmptyNote(mActivity, mMemoryFolderId, + AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALIDE, + ResourceParser.getDefaultBgId(mActivity)); + note.setWorkingText(content); + if (!note.saveNote()) { + Toast.makeText(mActivity, R.string.memory_bottle_save_failed, Toast.LENGTH_SHORT).show(); + return false; + } + long noteId = note.getNoteId(); + long createdDate = queryNoteCreatedDate(noteId); + MemoryEntry entry = new MemoryEntry(noteId, createdDate, content); + sAllEntries.add(entry); + sRemainingEntries.add(entry); + mEntriesLoaded = true; + Toast.makeText(mActivity, R.string.memory_bottle_save_success, Toast.LENGTH_SHORT).show(); + return true; + } + + private long queryNoteCreatedDate(long noteId) { + Cursor cursor = mActivity.getContentResolver().query( + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), + new String[] { NoteColumns.CREATED_DATE }, + null, null, null); + if (cursor == null) { + return System.currentTimeMillis(); + } + try { + if (cursor.moveToFirst()) { + return cursor.getLong(0); + } + } finally { + cursor.close(); + } + return System.currentTimeMillis(); + } + + private void browseMemory() { + if (sAllEntries.isEmpty()) { + Toast.makeText(mActivity, R.string.memory_bottle_empty, Toast.LENGTH_SHORT).show(); + return; + } + if (sRemainingEntries.isEmpty()) { + showBrowseFinishedDialog(); + return; + } + showRandomEntry(); + } + + private void showBrowseFinishedDialog() { + new AlertDialog.Builder(mActivity) + .setMessage(R.string.memory_bottle_browse_done) + .setPositiveButton(R.string.memory_bottle_restart, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + resetRemainingEntries(); + showRandomEntry(); + } + }) + .setNegativeButton(android.R.string.cancel, null) + .show(); + } + + private void resetRemainingEntries() { + sRemainingEntries.clear(); + sRemainingEntries.addAll(sAllEntries); + } + + private void showRandomEntry() { + int index = sRandom.nextInt(sRemainingEntries.size()); + MemoryEntry entry = sRemainingEntries.remove(index); + startBrowseTask(entry); + } + + private void startBrowseTask(MemoryEntry entry) { + if (mBrowseTask != null) { + return; + } + setBrowseLoading(true); + mBrowseTask = new BrowseTask(this, entry); + mBrowseTask.execute(); + } + + private String formatEntryMessage(long createdDate, String content) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()); + String date = format.format(new Date(createdDate)); + return mActivity.getString(R.string.memory_bottle_entry_format, date, content); + } + + private long ensureMemoryFolder() { + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mActivity); + long storedId = sp.getLong(PREF_MEMORY_FOLDER_ID, Long.MIN_VALUE); + if (storedId > 0 && DataUtils.visibleInNoteDatabase(mActivity.getContentResolver(), + storedId, Notes.TYPE_FOLDER)) { + return storedId; + } + String folderName = mActivity.getString(R.string.memory_bottle_folder_name); + long folderId = queryFolderIdByName(folderName); + if (folderId > 0) { + sp.edit().putLong(PREF_MEMORY_FOLDER_ID, folderId).commit(); + return folderId; + } + folderId = createMemoryFolder(folderName); + if (folderId > 0) { + sp.edit().putLong(PREF_MEMORY_FOLDER_ID, folderId).commit(); + return folderId; + } + return -1; + } + + private long queryFolderIdByName(String name) { + ContentResolver resolver = mActivity.getContentResolver(); + Cursor cursor = resolver.query( + Notes.CONTENT_NOTE_URI, + new String[] { NoteColumns.ID }, + NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>?" + + " AND " + NoteColumns.SNIPPET + "=?", + new String[] { String.valueOf(Notes.TYPE_FOLDER), + String.valueOf(Notes.ID_TRASH_FOLER), name }, + null); + if (cursor == null) { + return 0; + } + try { + if (cursor.moveToFirst()) { + return cursor.getLong(0); + } + } finally { + cursor.close(); + } + return 0; + } + + private long createMemoryFolder(String name) { + ContentValues values = new ContentValues(); + values.put(NoteColumns.SNIPPET, name); + values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); + values.put(NoteColumns.PARENT_ID, Notes.ID_ROOT_FOLDER); + values.put(NoteColumns.LOCAL_MODIFIED, 1); + android.net.Uri uri = mActivity.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values); + if (uri == null) { + return 0; + } + try { + return Long.parseLong(uri.getPathSegments().get(1)); + } catch (NumberFormatException e) { + return 0; + } + } + + private String queryNoteContent(ContentResolver resolver, long noteId) { + Cursor cursor = resolver.query( + Notes.CONTENT_DATA_URI, + new String[] { DataColumns.CONTENT }, + DataColumns.NOTE_ID + "=? AND " + DataColumns.MIME_TYPE + "=?", + new String[] { String.valueOf(noteId), TextNote.CONTENT_ITEM_TYPE }, + null); + if (cursor == null) { + return ""; + } + try { + if (cursor.moveToFirst()) { + return cursor.getString(0); + } + } finally { + cursor.close(); + } + return ""; + } + + private List loadEntriesFromDatabase(long folderId) { + List entries = new ArrayList<>(); + ContentResolver resolver = mActivity.getContentResolver(); + Cursor cursor = resolver.query( + Notes.CONTENT_NOTE_URI, + new String[] { NoteColumns.ID, NoteColumns.CREATED_DATE }, + NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "=?", + new String[] { String.valueOf(Notes.TYPE_NOTE), String.valueOf(folderId) }, + NoteColumns.CREATED_DATE + " DESC"); + if (cursor == null) { + return entries; + } + try { + while (cursor.moveToNext()) { + long noteId = cursor.getLong(0); + long createdDate = cursor.getLong(1); + entries.add(new MemoryEntry(noteId, createdDate, "")); + } + } finally { + cursor.close(); + } + return entries; + } + + private static final class MemoryEntry { + private final long id; + private final long createdDate; + private final String content; + + private MemoryEntry(long id, long createdDate, String content) { + this.id = id; + this.createdDate = createdDate; + this.content = content; + } + } + + private static final class LoadResult { + private final long folderId; + private final List entries; + private final boolean loadedEntries; + + private LoadResult(long folderId, List entries, boolean loadedEntries) { + this.folderId = folderId; + this.entries = entries; + this.loadedEntries = loadedEntries; + } + } + + private static final class LoadTask extends AsyncTask { + private final WeakReference mRef; + private final boolean mLoadEntries; + + private LoadTask(MemoryBottleDialog dialog, boolean loadEntries) { + mRef = new WeakReference<>(dialog); + mLoadEntries = loadEntries; + } + + @Override + protected LoadResult doInBackground(Void... params) { + MemoryBottleDialog dialog = mRef.get(); + if (dialog == null) { + return null; + } + long folderId = dialog.ensureMemoryFolder(); + List entries = new ArrayList<>(); + if (folderId > 0 && mLoadEntries) { + entries = dialog.loadEntriesFromDatabase(folderId); + } + return new LoadResult(folderId, entries, mLoadEntries); + } + + @Override + protected void onPostExecute(LoadResult result) { + MemoryBottleDialog dialog = mRef.get(); + if (dialog == null || !dialog.isShowing()) { + return; + } + dialog.mLoadTask = null; + dialog.setLoading(false); + if (result == null || result.folderId <= 0) { + Toast.makeText(dialog.mActivity, R.string.memory_bottle_folder_error, + Toast.LENGTH_SHORT).show(); + dialog.mPendingAction = PendingAction.NONE; + return; + } + dialog.mMemoryFolderId = result.folderId; + sFolderId = result.folderId; + if (result.loadedEntries) { + sAllEntries.clear(); + sAllEntries.addAll(result.entries); + sRemainingEntries.clear(); + sRemainingEntries.addAll(result.entries); + dialog.mEntriesLoaded = true; + } else if (sFolderId == result.folderId) { + dialog.mEntriesLoaded = !sAllEntries.isEmpty(); + } + PendingAction pending = dialog.mPendingAction; + dialog.mPendingAction = PendingAction.NONE; + if (pending == PendingAction.ADD) { + dialog.showAddDialog(); + } else if (pending == PendingAction.BROWSE) { + dialog.browseMemory(); + } + } + } + + private static final class BrowseResult { + private final MemoryEntry entry; + private final String content; + + private BrowseResult(MemoryEntry entry, String content) { + this.entry = entry; + this.content = content; + } + } + + private static final class BrowseTask extends AsyncTask { + private final WeakReference mRef; + private final MemoryEntry mEntry; + + private BrowseTask(MemoryBottleDialog dialog, MemoryEntry entry) { + mRef = new WeakReference<>(dialog); + mEntry = entry; + } + + @Override + protected BrowseResult doInBackground(Void... params) { + MemoryBottleDialog dialog = mRef.get(); + if (dialog == null) { + return null; + } + String content = mEntry.content; + if (TextUtils.isEmpty(content)) { + content = dialog.queryNoteContent(dialog.mActivity.getContentResolver(), mEntry.id); + } + if (TextUtils.isEmpty(content)) { + content = dialog.mActivity.getString(R.string.memory_bottle_missing_content); + } + return new BrowseResult(mEntry, content); + } + + @Override + protected void onPostExecute(BrowseResult result) { + MemoryBottleDialog dialog = mRef.get(); + if (dialog == null || !dialog.isShowing()) { + return; + } + dialog.mBrowseTask = null; + dialog.setBrowseLoading(false); + if (result == null) { + return; + } + String message = dialog.formatEntryMessage(result.entry.createdDate, result.content); + new AlertDialog.Builder(dialog.mActivity) + .setTitle(R.string.memory_bottle_title) + .setMessage(message) + .setPositiveButton(R.string.memory_bottle_close, null) + .setNegativeButton(R.string.memory_bottle_delete, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int which) { + dialog.deleteMemoryEntry(result.entry); + } + }) + .show(); + } + } + private void deleteMemoryEntry(MemoryEntry entry) { + if (mMemoryFolderId <= 0) { + Toast.makeText(mActivity, R.string.memory_bottle_folder_error, Toast.LENGTH_SHORT).show(); + return; + } + HashSet ids = new HashSet(); + ids.add(entry.id); + if (DataUtils.batchMoveToTrash(mActivity.getContentResolver(), ids, mMemoryFolderId)) { + sAllEntries.remove(entry); + sRemainingEntries.remove(entry); + Toast.makeText(mActivity, R.string.memory_bottle_delete_success, Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(mActivity, R.string.memory_bottle_delete_failed, Toast.LENGTH_SHORT).show(); + } + } + private enum PendingAction { + NONE, + ADD, + BROWSE + } +} diff --git a/src/ui/NoteEditActivity.java b/src/notes/ui/NoteEditActivity.java similarity index 69% rename from src/ui/NoteEditActivity.java rename to src/notes/ui/NoteEditActivity.java index 945ec2d..3bf0bc9 100644 --- a/src/ui/NoteEditActivity.java +++ b/src/notes/ui/NoteEditActivity.java @@ -30,15 +30,23 @@ import android.net.Uri; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.Color; import android.graphics.Paint; +import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; +import android.webkit.JavascriptInterface; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; import android.text.format.DateUtils; import android.text.style.BackgroundColorSpan; +import android.text.style.ImageSpan; +import android.text.style.ForegroundColorSpan; import android.text.TextWatcher; import android.text.Editable; import android.util.Log; @@ -48,6 +56,7 @@ import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; +import android.view.ViewGroup; import android.app.ProgressDialog; import android.os.AsyncTask; import android.widget.ArrayAdapter; @@ -64,6 +73,9 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.TimePicker; import android.widget.Toast; +import android.text.InputType; +import android.content.ContentValues; + import net.micode.notes.R; import net.micode.notes.data.Notes; @@ -78,7 +90,9 @@ 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 jp.wasabeef.richeditor.RichEditor; +import java.io.File; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -107,14 +121,15 @@ import java.util.HashMap; public class NoteEditActivity extends Activity implements OnClickListener, - NoteSettingChangedListener, OnTextViewChangeListener, OnSelectionChangeListener { private class HeadViewHolder { public TextView tvModified; public ImageView ivAlertIcon; - public TextView tvAlertDate;//文本提醒日期？ - public ImageView ibSetBgColor;//设置背景颜色图像视图 + + public TextView tvAlertDate; + + public ImageView ibSetBgColor; public TextView tvCharNum;//新增字符数显示控件 } @@ -321,7 +336,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN); sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE); } - //上下是反的为啥？构建双向印射关系，方便根据颜色值获取对应的选择按钮ID（比如当前背景是红的，红的按钮就是按下去的），或者根据选择按钮ID获取对应的颜色值 + private static final Map sBgSelectorSelectionMap = new HashMap(); static { sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select); @@ -331,14 +346,14 @@ public class NoteEditActivity extends Activity implements OnClickListener, sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select); } - private static final Map sFontSizeBtnsMap = new HashMap();//字体大小选择按钮映射 + 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); @@ -357,7 +372,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, private View mFontSizeSelector; - private NoteEditText mNoteEditor; + + private RichEditor mNoteEditor; private View mNoteEditorPanel; @@ -384,12 +400,13 @@ public class NoteEditActivity extends Activity implements OnClickListener, private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10; + private static final int PHOTO_REQUEST =100; //请求照片 public static final String TAG_CHECKED = String.valueOf('\u221A'); public static final String TAG_UNCHECKED = String.valueOf('\u25A1'); private LinearLayout mEditTextList; - // translation state + // translation state private boolean mHasTranslation = false; private String mOriginalContent = null; private ProgressDialog mProgressDialog; @@ -397,31 +414,39 @@ public class NoteEditActivity extends Activity implements OnClickListener, private String mUserQuery; private Pattern mPattern; - //新增字符统计方法，排除空白字符 - //计算可见字符数，排除空白字符 + private ImageInsertHelper mImageInsertHelper; // 图片插入助手 + private String mText; // 富文本编辑器内容 + //新增字符统计方法，排除空白字符和HTML标签 + private int calcVisibleCharCount(CharSequence s) { if (s == null) return 0; - String filtered = s.toString().replaceAll("\\s+", ""); + String text = s.toString(); + // 移除HTML标签 + String plainText = text.replaceAll("<[^>]*>", ""); + // 移除空白字符 + String filtered = plainText.replaceAll("\\s+", ""); return filtered.length(); } - //根据选区更新字符统计显示 + private void updateCharNumForSelection(CharSequence text, int selStart, int selEnd) { if (text == null) { mNoteHeaderHolder.tvCharNum.setText("字符数：0"); return; } + int totalCount = calcVisibleCharCount(text); if (selStart == selEnd) { - mNoteHeaderHolder.tvCharNum.setText("字符数：" + calcVisibleCharCount(text)); + // 显示总字符数 + mNoteHeaderHolder.tvCharNum.setText("字符数：" + totalCount); } else { - int min = Math.min(selStart, selEnd); - int max = Math.max(selStart, selEnd); - CharSequence sub = text.subSequence(min, max); - mNoteHeaderHolder.tvCharNum.setText("字符数：" + calcVisibleCharCount(sub)); + // 选中文本统计 + String selectedText = text.subSequence(selStart, selEnd).toString(); + int selectedCount = calcVisibleCharCount(selectedText); + mNoteHeaderHolder.tvCharNum.setText("字符数：" + totalCount + "（选中：" + selectedCount + "）"); } } @Override - protected void onCreate(Bundle savedInstanceState) {//创建活动时调用 + protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); this.setContentView(R.layout.note_edit); @@ -429,19 +454,41 @@ public class NoteEditActivity extends Activity implements OnClickListener, finish(); return; } - initResources();//初始化资源 + initResources(); + } + + // JavaScript接口类，用于接收富文本编辑器的选中文本 + private class JsInterface { + @JavascriptInterface + public void getSelectedText(String selectedText, String totalText) { + // 计算选中字符数和总字符数 + int selectedCount = calcVisibleCharCount(selectedText); + int totalCount = calcVisibleCharCount(totalText); + + // 更新字符统计显示 + runOnUiThread(new Runnable() { + @Override + public void run() { + if (selectedCount > 0) { + mNoteHeaderHolder.tvCharNum.setText("字符数：" + totalCount + "（选中：" + selectedCount + "）"); + } else { + mNoteHeaderHolder.tvCharNum.setText("字符数：" + totalCount); + } + } + }); + } } /** * 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/ + * user load this activity, we should restore the former state */ @Override - protected void onRestoreInstanceState(Bundle savedInstanceState) {//存储uid便于恢复活动状态时调用 - super.onRestoreInstanceState(savedInstanceState); //使用 Intent Extra 在组件之间传递uid + protected void onRestoreInstanceState(Bundle savedInstanceState) { + super.onRestoreInstanceState(savedInstanceState); if (savedInstanceState != null && savedInstanceState.containsKey(Intent.EXTRA_UID)) { - Intent intent = new Intent(Intent.ACTION_VIEW); //创建一个意图，用于显示笔记详情,大小是（action_view显示数据功能） - intent.putExtra(Intent.EXTRA_UID, savedInstanceState.getLong(Intent.EXTRA_UID));//将uid添加到意图中，用于之后再调出来 + Intent intent = new Intent(Intent.ACTION_VIEW); + intent.putExtra(Intent.EXTRA_UID, savedInstanceState.getLong(Intent.EXTRA_UID)); if (!initActivityState(intent)) { finish(); return; @@ -456,56 +503,62 @@ public class NoteEditActivity extends Activity implements OnClickListener, * then jump to the NotesListActivity */ mWorkingNote = null; - if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) {//如果意图是查看操作 - long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0);//获取uid - mUserQuery = "";//初始化用户查询，用于后续搜索 + // 新增：Intent/Action 判空 + if (intent == null || TextUtils.isEmpty(intent.getAction())) { + Log.e(TAG, "Intent 或 Action 为空"); + finish(); + return false; + } + 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));//解析出笔记id - mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY);//解析出用户查询 + 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)) {//如果笔记数据库中不存在该笔记 + if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) { Intent jump = new Intent(this, NotesListActivity.class); - startActivity(jump);//执行跳转 - showToast(R.string.error_note_not_exist);//显示笔记不存在的提示 + startActivity(jump); + showToast(R.string.error_note_not_exist); finish(); return false; } else { - mWorkingNote = WorkingNote.load(this, noteId);//加载笔记 + 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())) {//如果意图是插入或编辑操作 + 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);//获取文件夹id + long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0); int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID, - AppWidgetManager.INVALID_APPWIDGET_ID);//获取小部件id + AppWidgetManager.INVALID_APPWIDGET_ID); int widgetType = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_TYPE, - Notes.TYPE_WIDGET_INVALIDE);//获取小部件类型 + Notes.TYPE_WIDGET_INVALIDE); int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, - ResourceParser.getDefaultBgId(this));//获取背景资源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) {//如果调用日期和电话号码都不为空 + 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;//初始化笔记id + long noteId = 0; if ((noteId = DataUtils.getNoteIdByPhoneNumberAndCallDate(getContentResolver(), - phoneNumber, callDate)) > 0) {//如果记录中根据电话号码和调用日期查询到笔记id - mWorkingNote = WorkingNote.load(this, noteId);//加载笔记 + phoneNumber, callDate)) > 0) { + mWorkingNote = WorkingNote.load(this, noteId); if (mWorkingNote == null) { Log.e(TAG, "load call note failed with note id" + noteId); finish(); @@ -513,15 +566,15 @@ public class NoteEditActivity extends Activity implements OnClickListener, } } else { mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, - widgetType, bgResId);//新建笔记 - mWorkingNote.convertToCallNote(phoneNumber, callDate);//将笔记转换为call笔记 + widgetType, bgResId); + mWorkingNote.convertToCallNote(phoneNumber, callDate); } } else { mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType, - bgResId);//新建笔记 + bgResId); } - getWindow().setSoftInputMode(//设置软键盘操作 + getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); } else { @@ -529,32 +582,66 @@ public class NoteEditActivity extends Activity implements OnClickListener, finish(); return false; } - mWorkingNote.setOnSettingStatusChangedListener(this);//设置笔记设置状态改变监听器 + mWorkingNote.setOnSettingStatusChangedListener(this); return true; } @Override - protected void onResume() {//已经oncreate后切出，再次调用时，初始化笔记界面 + 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());//将光标定位到文本末尾，方便用户继续编辑 + // 检查必要的视图是否已初始化 + if (mHeadViewPanel == null || mNoteEditorPanel == null || mNoteEditor == null) { + Log.e(TAG, "Some views are not initialized! Check initResources method."); + return; } - for (Integer id : sBgSelectorSelectionMap.keySet()) {//隐藏所有背景色选择器的 选中状态指示器 - findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE); + + // 设置富文本编辑器字体大小 + setRichEditorFontSize(mFontSizeId); + + if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { + switchToListMode(mWorkingNote.getContent()); + mNoteEditor.setVisibility(View.GONE); + mEditTextList.setVisibility(View.VISIBLE); } - mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());//设置笔记标题界面的 背景资源 - mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());设置笔记编辑区界面的 背景资源 + else { + // 切换到富文本模式 + mEditTextList.setVisibility(View.GONE); + mNoteEditor.setVisibility(View.VISIBLE); + + // 1. 获取笔记原始内容（为空则赋空字符串，避免空指针） + String content = mWorkingNote.getContent() == null ? "" : mWorkingNote.getContent(); - mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this, //显示笔记的 最后修改日期 ，并格式化显示 + // 2. 旧文本（非 HTML）转换为 HTML，确保图片与换行能正确展示 + String finalHtml; + if (TextUtils.isEmpty(content)) { + finalHtml = ""; + } else if (isHtmlContent(content)) { + finalHtml = content; + } else { + finalHtml = convertLegacyContentToHtml(content); + } + + // 3. 核心：用 RichEditor 加载 HTML 内容 + mNoteEditor.setHtml(finalHtml); + // 初始化字符统计显示 + updateCharNumForSelection(finalHtml, 0, 0); + } + + // 设置背景颜色 + for (Integer id : sBgSelectorSelectionMap.keySet()) { + View v = findViewById(sBgSelectorSelectionMap.get(id)); + if (v != null) { + v.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)); @@ -902,10 +989,10 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (mWorkingNote.hasClockAlert()) { long time = System.currentTimeMillis(); if (time > mWorkingNote.getAlertDate()) { - mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired);//显示已过期信息 + mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired); } else { mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString( - mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS));//显示剩余时间信息 + mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS)); } mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE); mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE); @@ -916,13 +1003,13 @@ public class NoteEditActivity extends Activity implements OnClickListener, } @Override - protected void onNewIntent(Intent intent) {//处理新的intent + protected void onNewIntent(Intent intent) { super.onNewIntent(intent); initActivityState(intent); } @Override - protected void onSaveInstanceState(Bundle outState) {//保存活动状态 + protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); /** * For new note without note id, we should firstly save it to @@ -937,23 +1024,23 @@ public class NoteEditActivity extends Activity implements OnClickListener, } @Override - public boolean dispatchTouchEvent(MotionEvent ev) {//处理触摸事件 + public boolean dispatchTouchEvent(MotionEvent ev) { if (mNoteBgColorSelector.getVisibility() == View.VISIBLE - && !inRangeOfView(mNoteBgColorSelector, ev)) {//如果背景色选择器可见，且触摸事件不在范围内？ - mNoteBgColorSelector.setVisibility(View.GONE);//隐藏背景色选择器 + && !inRangeOfView(mNoteBgColorSelector, ev)) { + mNoteBgColorSelector.setVisibility(View.GONE); return true; } if (mFontSizeSelector.getVisibility() == View.VISIBLE - && !inRangeOfView(mFontSizeSelector, ev)) {//如果字体大小选择器可见，且触摸事件不在范围内？ - mFontSizeSelector.setVisibility(View.GONE);//隐藏字体大小选择器 + && !inRangeOfView(mFontSizeSelector, ev)) { + mFontSizeSelector.setVisibility(View.GONE); return true; } - return super.dispatchTouchEvent(ev);//将事件传递给父类处理 + return super.dispatchTouchEvent(ev); } - private boolean inRangeOfView(View view, MotionEvent ev) {//判断触摸事件是否在视图范围内 - int []location = new int[2];//获取视图在屏幕上的坐标，长度为2的整数数组 + private boolean inRangeOfView(View view, MotionEvent ev) { + int []location = new int[2]; view.getLocationOnScreen(location); int x = location[0]; int y = location[1]; @@ -966,47 +1053,69 @@ public class NoteEditActivity extends Activity implements OnClickListener, return true; } - private void initResources() {//初始化资源 + private void initResources() { + // 初始化mHeadViewPanel，这是关键修复 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.tvCharNum = (TextView) findViewById(R.id.tv_char_num); mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color); mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this); - mNoteHeaderHolder.tvCharNum=(TextView)findViewById(R.id.tv_char_num);//将tvCharNum绑定到TextView - mNoteEditor = (NoteEditText) findViewById(R.id.note_edit_view); - // 注册选区变化监听 - mNoteEditor.setOnSelectionChangeListener(this); - //设置文本监听（统计时排除空白字符） - mNoteEditor.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - } - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - int displayCount = calcVisibleCharCount(s); - mNoteHeaderHolder.tvCharNum.setText("字符数：" + displayCount); - } + // 初始化富文本编辑器 + mNoteEditor = (RichEditor) findViewById(R.id.note_edit_view); + if (mNoteEditor == null) { + Log.e(TAG, "RichEditor is null! Check layout file."); + return; + } + + mImageInsertHelper = new ImageInsertHelper(this, PHOTO_REQUEST); + + // 初始化富文本编辑器配置 + initRichEditor(); + + // 注册JavaScript接口，用于获取选中文本 + mNoteEditor.addJavascriptInterface(new JsInterface(), "noteEditor"); + + // 设置富文本编辑器监听器 + mNoteEditor.setOnTextChangeListener(new RichEditor.OnTextChangeListener() { @Override - public void afterTextChanged(Editable s) { + public void onTextChange(String text) { + String safeText = text == null ? "" : text; + mText = safeText; + // 更新修改时间和字符数显示 + mNoteHeaderHolder.tvModified.setText( + DateUtils.formatDateTime(NoteEditActivity.this, + mWorkingNote.getModifiedDate(), + DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NUMERIC_DATE + | DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_YEAR) + ); + // 更新字符数显示 + updateCharNumForSelection(safeText, 0, 0); } }); - mNoteHeaderHolder.tvCharNum.setText("字符数：" + calcVisibleCharCount(mNoteEditor.getText())); + // 开启图文混排支持 + mNoteEditor.setLayerType(View.LAYER_TYPE_SOFTWARE, null); + // 初始化其他视图 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); + if (iv != null) { + iv.setOnClickListener(this); + } } mFontSizeSelector = findViewById(R.id.font_size_selector); for (int id : sFontSizeBtnsMap.keySet()) { View view = findViewById(id); - view.setOnClickListener(this); + if (view != null) { + view.setOnClickListener(this); + } }; mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE); @@ -1018,7 +1127,10 @@ public class NoteEditActivity extends Activity implements OnClickListener, if(mFontSizeId >= TextAppearanceResources.getResourcesSize()) { mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE; } + + // 初始化编辑列表和富文本按钮 mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list); + initRichEditorButtons(); // habit UI binds mHabitPanel = (LinearLayout) findViewById(R.id.habit_panel); mBtnPrevMonth = (Button) findViewById(R.id.btn_prev_month); @@ -1045,16 +1157,16 @@ public class NoteEditActivity extends Activity implements OnClickListener, } @Override - protected void onPause() {//在活动暂停时调用（切出去了） - super.onPause();//调用父类的onPause方法 + protected void onPause() { + super.onPause(); if(saveNote()) { Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length()); } - clearSettingState();//清除设置状态 + clearSettingState(); } - private void updateWidget() {//更新应用小部件 - Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);//接受意图 + 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) { @@ -1064,47 +1176,46 @@ public class NoteEditActivity extends Activity implements OnClickListener, return; } - intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {//添加应用小部件id + intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] { mWorkingNote.getWidgetId() }); - sendBroadcast(intent);//发送广播更新应用小部件 - setResult(RESULT_OK, intent);//设置结果为成功，返回意图 + sendBroadcast(intent); + setResult(RESULT_OK, intent); } - public void onClick(View v) {//点击事件处理，语法细节没看 + public void onClick(View v) { int id = v.getId(); - if (id == R.id.btn_set_bg_color) {//如果点击的是设置背景颜色按钮 + 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.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)) {//如果点击的是字体大小选择按钮 + } 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)); + //mNoteEditor.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId)); + setRichEditorFontSize(mFontSizeId); } mFontSizeSelector.setVisibility(View.GONE); } } @Override - public void onBackPressed() {//返回键处理 - if(clearSettingState()) { + public void onBackPressed() { + if (clearSettingState()) { return; } + if (mHasTranslation) { AlertDialog.Builder b = new AlertDialog.Builder(this); b.setTitle(R.string.translate_confirm_keep_title); @@ -1119,7 +1230,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, @Override public void onClick(DialogInterface dialog, int which) { if (mOriginalContent != null) { - mNoteEditor.setText(mOriginalContent); + mNoteEditor.setHtml(mOriginalContent); mHasTranslation = false; } saveNote(); @@ -1130,13 +1241,13 @@ public class NoteEditActivity extends Activity implements OnClickListener, b.show(); return; } - - saveNote();//保存笔记 + + saveNote(); super.onBackPressed(); } - private boolean clearSettingState() {//清除设置状态 - if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) {// + private boolean clearSettingState() { + if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) { mNoteBgColorSelector.setVisibility(View.GONE); return true; } else if (mFontSizeSelector.getVisibility() == View.VISIBLE) { @@ -1146,29 +1257,29 @@ public class NoteEditActivity extends Activity implements OnClickListener, return false; } - public void onBackgroundColorChanged() {// + public void onBackgroundColorChanged() { findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( - View.VISIBLE);//显示选中的背景颜色 - mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());//设置笔记编辑面板的背景颜色 - mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());//设置标题栏的背景颜色 + View.VISIBLE); + mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId()); + mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId()); } @Override - public boolean onPrepareOptionsMenu(Menu menu) {//准备选项菜单 + 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);//如果是通话记录文件夹， 通话记录转化为菜单 + 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);//如果是列表模式， 菜单标题为普通模式 + 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);//如果不是列表模式， 菜单标题为列表模式 + menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_list_mode); } if (mWorkingNote.hasClockAlert()) { menu.findItem(R.id.menu_alert).setVisible(false); @@ -1184,13 +1295,13 @@ public class NoteEditActivity extends Activity implements OnClickListener, } @Override - public boolean onOptionsItemSelected(MenuItem item) {//处理选项菜单点击事件 + public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - case R.id.menu_new_note://新建笔记 + case R.id.menu_new_note: createNewNote(); break; - case R.id.menu_delete://删除笔记 - AlertDialog.Builder builder = new AlertDialog.Builder(this);//创建删除确认对话框 + 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)); @@ -1204,28 +1315,28 @@ public class NoteEditActivity extends Activity implements OnClickListener, builder.setNegativeButton(android.R.string.cancel, null); builder.show(); break; - case R.id.menu_font_size://字体大小选择 + case R.id.menu_font_size: mFontSizeSelector.setVisibility(View.VISIBLE); findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); break; - case R.id.menu_list_mode://列表模式切换 + case R.id.menu_list_mode: mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? TextNote.MODE_CHECK_LIST : 0); break; - case R.id.menu_share://分享笔记 + case R.id.menu_share: getWorkingText(); sendTo(this, mWorkingNote.getContent()); break; case R.id.menu_translate: showTranslateDialog(); break; - case R.id.menu_send_to_desktop://发送到桌面 + case R.id.menu_send_to_desktop: sendToDesktop(); break; - case R.id.menu_alert://设置提醒 + case R.id.menu_alert: setReminder(); break; - case R.id.menu_delete_remind://删除提醒 + case R.id.menu_delete_remind: mWorkingNote.setAlertDate(0, false); break; case R.id.menu_set_habit: @@ -1260,34 +1371,123 @@ public class NoteEditActivity extends Activity implements OnClickListener, stopHabitBuilder.setNegativeButton(android.R.string.cancel, null); stopHabitBuilder.show(); break; + case R.id.menu_insert_image: + // 插入图片 + if (mImageInsertHelper != null) { + mImageInsertHelper.startPickImage(); + } + break; default: break; } return true; } -//下面是上文相关函数的具体实现 + private void setReminder() { + showReminderChoiceDialog(); + } + private void showReminderChoiceDialog() { + final String[] options = new String[] { + getString(R.string.reminder_mode_absolute), + getString(R.string.reminder_mode_relative) + }; + new AlertDialog.Builder(this) + .setTitle(R.string.reminder_mode_title) + .setItems(options, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + if (which == 0) { + showAbsoluteReminderDialog(); + } else { + showRelativeReminderDialog(); + } + } + }) + .show(); + } + + private void showAbsoluteReminderDialog() { DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis()); d.setOnDateTimeSetListener(new OnDateTimeSetListener() { public void OnDateTimeSet(AlertDialog dialog, long date) { - mWorkingNote.setAlertDate(date , true); + mWorkingNote.setAlertDate(date, true); } }); d.show(); } + private void showRelativeReminderDialog() { + final EditText hoursInput = new EditText(this); + final EditText minutesInput = new EditText(this); + final EditText secondsInput = new EditText(this); + hoursInput.setInputType(InputType.TYPE_CLASS_NUMBER); + minutesInput.setInputType(InputType.TYPE_CLASS_NUMBER); + secondsInput.setInputType(InputType.TYPE_CLASS_NUMBER); + hoursInput.setHint(R.string.reminder_hours_hint); + minutesInput.setHint(R.string.reminder_minutes_hint); + secondsInput.setHint(R.string.reminder_seconds_hint); + + LinearLayout container = new LinearLayout(this); + container.setOrientation(LinearLayout.VERTICAL); + int padding = (int) (getResources().getDisplayMetrics().density * 16); + container.setPadding(padding, padding, padding, padding); + container.addView(hoursInput); + container.addView(minutesInput); + container.addView(secondsInput); + + new AlertDialog.Builder(this) + .setTitle(getString(R.string.reminder_duration_title)) + .setView(container) + .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + String hoursText = hoursInput.getText().toString().trim(); + String minutesText = minutesInput.getText().toString().trim(); + String secondsText = secondsInput.getText().toString().trim(); + if (TextUtils.isEmpty(hoursText) + && TextUtils.isEmpty(minutesText) + && TextUtils.isEmpty(secondsText)) { + showToast(R.string.reminder_duration_empty); + return; + } + int hours; + int minutes; + int seconds; + try { + hours = TextUtils.isEmpty(hoursText) ? 0 : Integer.parseInt(hoursText); + minutes = TextUtils.isEmpty(minutesText) ? 0 : Integer.parseInt(minutesText); + seconds = TextUtils.isEmpty(secondsText) ? 0 : Integer.parseInt(secondsText); + } catch (NumberFormatException e) { + showToast(R.string.reminder_duration_invalid); + return; + } + if (hours < 0 || minutes < 0 || seconds < 0 + || (hours == 0 && minutes == 0 && seconds == 0)) { + showToast(R.string.reminder_duration_invalid); + return; + } + long delta = hours * 60L * 60L * 1000L + + minutes * 60L * 1000L + + seconds * 1000L; + long target = System.currentTimeMillis() + delta; + mWorkingNote.setAlertDate(target, true); + } + }) + .setNegativeButton(android.R.string.cancel, null) + .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);//再intetn中添加标签为EXTRA_TEXT， 值为info + intent.putExtra(Intent.EXTRA_TEXT, info); intent.setType("text/plain"); context.startActivity(intent); } - private void showTranslateDialog() { View v = LayoutInflater.from(this).inflate(R.layout.translate_dialog, null); final Spinner spinner = (Spinner) v.findViewById(R.id.spinner_target_lang); @@ -1356,7 +1556,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, mOriginalContent = sb.toString(); } else { // 普通模式下获取文本内容 - mOriginalContent = mNoteEditor.getText().toString(); + mOriginalContent = mNoteEditor.getHtml(); } } mTargetLangCode = targetLang; @@ -1379,7 +1579,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } content = sb.toString(); } else { - content = mNoteEditor.getText().toString(); + content = mNoteEditor.getHtml(); } new TranslateTask().execute(content); @@ -1432,7 +1632,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, View focused = mEditTextList.getChildAt(index); focused.findViewById(R.id.et_edit_text).requestFocus(); } else { - // 普通模式下，直接显示翻译结果 + // 普通模式下，直接显示翻译结果 SpannableString spannable = new SpannableString(result); // 分析文本结构：原文和翻译交替出现 // 格式：原文1\n翻译1\n原文2\n翻译2\n... @@ -1453,18 +1653,16 @@ public class NoteEditActivity extends Activity implements OnClickListener, currentPosition += line.length() + 1; // +1 for newline } - mNoteEditor.setText(spannable); + mNoteEditor.setHtml(spannable.toString()); // scroll to first translation - int firstTranslationIdx = result.indexOf('\n'); - if (firstTranslationIdx >= 0 && firstTranslationIdx + 1 < result.length()) { - mNoteEditor.setSelection(firstTranslationIdx + 1); - } + // RichEditor doesn't support setSelection method, so we skip this } } else { showToast(R.string.error_sync_network); } } } + private void createNewNote() { // Firstly, save current editing notes saveNote(); @@ -1481,29 +1679,41 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (mWorkingNote.existInDatabase()) { HashSet ids = new HashSet(); long id = mWorkingNote.getNoteId(); - if (id != Notes.ID_ROOT_FOLDER) {//如果不是根文件夹 - ids.add(id);//将笔记id添加到集合中 + 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"); + long originFolderId = mWorkingNote.getFolderId(); + if (originFolderId <= 0) { + originFolderId = Notes.ID_ROOT_FOLDER; + } + + // 直接调用DataUtils.batchMoveToTrash确保便签被移动到回收站 + if (!DataUtils.batchMoveToTrash(getContentResolver(), ids, originFolderId)) { + Log.e(TAG, "Move notes to trash folder error"); + // 如果批量移动失败，尝试单独移动 + if (!moveNoteToTrash(id, originFolderId)) { + Log.e(TAG, "Single move to trash folder also failed"); } } } mWorkingNote.markDeleted(true); } - private boolean isSyncMode() { - return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0; + private boolean moveNoteToTrash(long noteId, long originFolderId) { + ContentValues values = new ContentValues(); + values.put(Notes.NoteColumns.PARENT_ID, Notes.ID_TRASH_FOLER); + values.put(Notes.NoteColumns.ORIGIN_PARENT_ID, originFolderId); + values.put(Notes.NoteColumns.LOCAL_MODIFIED, 1); + values.put(Notes.NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); + int updated = getContentResolver().update( + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), + values, null, null); + return updated > 0; } - public void onClockAlertChanged(long date, boolean set) {//设置提醒时间 + 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 @@ -1537,34 +1747,33 @@ public class NoteEditActivity extends Activity implements OnClickListener, updateWidget(); } - public void onEditTextDelete(int index, String text) {//处理清单模式下删除列表项 的操作 - int childCount = mEditTextList.getChildCount();//获取编辑框的子视图数量 + public void onEditTextDelete(int index, String text) { + int childCount = mEditTextList.getChildCount(); if (childCount == 1) { return; } - for (int i = index + 1; i < childCount; i++) {//遍历删除项（index处）之后的所有列表项 ，将它们的索引减1，不会影响到后续的列表项的索引，从而避免了索引错乱的问题 + for (int i = index + 1; i < childCount; i++) { ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) .setIndex(i - 1); } - mEditTextList.removeViewAt(index);//删除index处的子图 - //亮点：小米笔记清单模式下的特殊设计 ，属于防误删的安全机制 ，主要为了保护用户内容，这是啥意思？ + 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);// + R.id.et_edit_text); } - int length = edit.length();//获取删除项（index处）之前的列表项的文本长度 - edit.append(text);//将被删除项的文本追加到目标项末尾 - edit.requestFocus();//将焦点自动切换到目标项 - edit.setSelection(length);//将光标定位到合并前的文本末尾 + int length = edit.length(); + edit.append(text); + edit.requestFocus(); + edit.setSelection(length); } - public void onEditTextEnter(int index, String text) {//处理清单模式下添加列表项的操作 + public void onEditTextEnter(int index, String text) { /** * Should not happen, check for debug */ @@ -1573,80 +1782,143 @@ public class NoteEditActivity extends Activity implements OnClickListener, } View view = getListItem(text, index); - mEditTextList.addView(view, index);//将新的列表项视图添加到编辑框中，位置为index - NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);//获取新添加的列表项的编辑框 + 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++) {//索引加一 + 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) {//将编辑框切换到清单模式 + 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(item, index)); index++; } } - mEditTextList.addView(getListItem("", index));//添加一个空列表项 - View focused = mEditTextList.getChildAt(index); - focused.findViewById(R.id.et_edit_text).requestFocus(); - // 更新字符统计，显示整条便签的字符数 - mNoteHeaderHolder.tvCharNum.setText("字符数：" + calcVisibleCharCount(text)); + mEditTextList.addView(getListItem("", index)); + mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus(); - mNoteEditor.setVisibility(View.GONE);//隐藏编辑框 + mNoteEditor.setVisibility(View.GONE); mEditTextList.setVisibility(View.VISIBLE); } - private Spannable getHighlightQueryResult(String fullText, String userQuery) {//高亮显示用户查询的文本，这里用了spannable，是比较好的视图管理器 - SpannableString spannable = new SpannableString(fullText == null ? "" : fullText);//存储高亮显示的文本 - if (!TextUtils.isEmpty(userQuery)) { - mPattern = Pattern.compile(userQuery, Pattern.CASE_INSENSITIVE);//编译正则表达式 - Matcher m = mPattern.matcher(fullText);//创建一个 Matcher 对象，用于对输入字符串进行匹配操作 + private Spannable getHighlightQueryResult(String fullText, String userQuery) { + // 1. 空值保护，避免空指针 + if (TextUtils.isEmpty(fullText)) { + return new SpannableString(""); + } + SpannableString spannable = new SpannableString(fullText); + String TAG = "NoteEdit"; + + // 2. 原有高亮逻辑（保留不动，仅补全空值判断） + if (!TextUtils.isEmpty(userQuery)) { + mPattern = Pattern.compile(userQuery); + Matcher m = mPattern.matcher(fullText); int start = 0; - while (m.find(start)) { //构建span字符串 + while (m.find(start)) { spannable.setSpan( - new BackgroundColorSpan(this.getResources().getColor( - R.color.user_query_highlight)), m.start(), m.end(), + new BackgroundColorSpan(getResources().getColor(R.color.user_query_highlight, getTheme())), + m.start(), m.end(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE); start = m.end(); } } + + Pattern imagePattern = Pattern.compile("【图】([^\\n]+)"); + Matcher imageMatcher = imagePattern.matcher(spannable); + while (imageMatcher.find()) { + try { + // 修复1：判空避免trim()空指针 + String imagePath = imageMatcher.group(1); + if (TextUtils.isEmpty(imagePath)) continue; + imagePath = imagePath.trim(); + + File imageFile = new File(imagePath); + if (!imageFile.exists() || !imageFile.isFile()) { + Log.e(TAG, "图片文件不存在：" + imagePath); + continue; + } + + // 修复2：Bitmap预压缩，避免OOM + BitmapFactory.Options options = new BitmapFactory.Options(); + options.inJustDecodeBounds = true; // 先获取尺寸，不加载像素 + BitmapFactory.decodeFile(imagePath, options); + // 计算采样率（按200x200压缩） + options.inSampleSize = calculateInSampleSize(options, 200, 200); + options.inJustDecodeBounds = false; + // 解码压缩后的图片 + Bitmap bitmap = BitmapFactory.decodeFile(imagePath, options); + if (bitmap == null) { + Log.e(TAG, "图片解码失败：" + imagePath); + continue; + } + // 缩放（可选，压缩后已足够小） + bitmap = Bitmap.createScaledBitmap(bitmap, 200, 200, true); + + ImageSpan imageSpan = new ImageSpan(this, bitmap); + spannable.setSpan( + imageSpan, + imageMatcher.start(), + imageMatcher.end(), + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + + } catch (Exception e) { + Log.e(TAG, "解析图片失败", e); + continue; + } + } + return spannable; } + private int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) { + final int width = options.outWidth; + final int height = options.outHeight; + int inSampleSize = 1; + if (height > reqHeight || width > reqWidth) { + final int halfHeight = height / 2; + final int halfWidth = width / 2; + while ((halfHeight / inSampleSize) >= reqHeight + && (halfWidth / inSampleSize) >= reqWidth) { + inSampleSize *= 2; + } + } + return inSampleSize; + } - private View getListItem(String item, int index) { //获取清单模式下的列表项视图 + 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);//获取列表项的编辑框 + 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) {//PaintFlags是Android中用于控制文本绘制样式的位掩码 ，通过位运算组合多个绘制标志 - edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);//添加删除线效果 + 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);//清除删除线效果 + edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); } } }); - if (item.startsWith(TAG_CHECKED)) {//如果列表项以(TAG_CHECKED)开头，则将复选框设置为选中状态 + 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();// + 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);// + edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); item = item.substring(TAG_UNCHECKED.length(), item.length()).trim(); } edit.setOnTextViewChangeListener(this); - //新增选区变化回调接口设置 + //新增选区变化回调接口设置 edit.setOnSelectionChangeListener(this); edit.setIndex(index); edit.setText(getHighlightQueryResult(item, mUserQuery)); @@ -1657,41 +1929,42 @@ public class NoteEditActivity extends Activity implements OnClickListener, @Override public void onSelectionChanged(int index, int selStart, int selEnd) { if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { - //列表模式下的选区变化事件 if (index >= 0 && index < mEditTextList.getChildCount()) { - //如果索引在范围内 View view = mEditTextList.getChildAt(index); NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); updateCharNumForSelection(edit.getText(), selStart, selEnd); } } else { - if (mNoteEditor != null && mNoteEditor.isFocused()) { - updateCharNumForSelection(mNoteEditor.getText(), selStart, selEnd); - } + // 富文本模式下，直接更新字符数显示 + // RichEditor没有直接的选择范围获取方法，所以只显示总字符数 + updateCharNumForSelection(mNoteEditor.getHtml(), 0, 0); } } - public void onTextChange(int index, boolean hasText) {// 列表项文本变化事件 - if (index >= mEditTextList.getChildCount()) {//检查索引是否超出范围 + public void onTextChange(int index, boolean hasText) { + if (index >= mEditTextList.getChildCount()) { Log.e(TAG, "Wrong index, should not happen"); return; } - if(hasText) {//如果列表项有文本 + 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()); + public void onCheckListModeChanged(int oldMode, int newMode) { + if (newMode == TextNote.MODE_CHECK_LIST) { + switchToListMode(mNoteEditor.getHtml()); } else { if (!getWorkingText()) { mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", - ""));//如果没有选中项，则将所有未选中项的文本删除 + "")); } - mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); + String content = mWorkingNote.getContent() == null ? "" : mWorkingNote.getContent(); + // 保留高亮逻辑，将结果转为HTML + Spannable highlightSpannable = getHighlightQueryResult(content, mUserQuery); + mNoteEditor.setHtml(highlightSpannable.toString()); mEditTextList.setVisibility(View.GONE); mNoteEditor.setVisibility(View.VISIBLE); // 更新字符统计为整条便签字符数 @@ -1699,30 +1972,37 @@ public class NoteEditActivity extends Activity implements OnClickListener, } } - private boolean getWorkingText() {//获取选中项的文本 + private boolean getWorkingText() { boolean hasChecked = false; - if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {//如果是检查列表模式 + if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { StringBuilder sb = new StringBuilder(); - for (int i = 0; i < mEditTextList.getChildCount(); i++) {//遍历所有列表项 + 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");//如果列表项选中，则将其文本添加到 StringBuilder 中 + sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n"); hasChecked = true; } else { - sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n");//如果列表项未选中，则将其文本添加到 StringBuilder 中 + sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n"); } } } mWorkingNote.setWorkingText(sb.toString()); } else { - mWorkingNote.setWorkingText(mNoteEditor.getText().toString()); + // 确保获取最新的富文本内容 + String currentHtml = normalizeEditorHtml(mNoteEditor.getHtml()); + if (TextUtils.isEmpty(currentHtml) && !TextUtils.isEmpty(mText)) { + currentHtml = normalizeEditorHtml(mText); + } + mWorkingNote.setWorkingText(currentHtml); + mText = currentHtml; // 更新mText变量，确保保存时使用最新内容 } return hasChecked; } - private boolean saveNote() {//保存笔记 + private boolean saveNote() { + // 总是调用getWorkingText()获取最新内容，确保保存的是最新编辑的内容 getWorkingText(); boolean saved = mWorkingNote.saveNote(); if (saved) { @@ -1738,24 +2018,54 @@ public class NoteEditActivity extends Activity implements OnClickListener, return saved; } - private void sendToDesktop() {//将笔记发送到桌面 + private void showImagePreview(String localImagePath) { + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle("图片选择成功！"); + + ImageView imageView = new ImageView(this); + imageView.setLayoutParams(new ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.WRAP_CONTENT)); + imageView.setImageURI(Uri.fromFile(new File(localImagePath))); + imageView.setScaleType(ImageView.ScaleType.FIT_CENTER); + builder.setView(imageView); + + builder.setPositiveButton("确认保存", (dialog, which) -> { + boolean isSaved = saveNote(); + if (isSaved) { + Toast.makeText(this, "图片信息已保存！", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(this, "保存失败，请重试", Toast.LENGTH_SHORT).show(); + } + }); + builder.setNegativeButton(android.R.string.cancel, null); + builder.show(); + } + + 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()) {//如果笔记不存在于数据库中 + if (!mWorkingNote.existInDatabase()) { saveNote(); } - if (mWorkingNote.getNoteId() > 0) {//如果笔记存在于数据库中 + if (mWorkingNote.getNoteId() > 0) { Intent sender = new Intent(); Intent shortcutIntent = new Intent(this, NoteEditActivity.class); - shortcutIntent.setAction(Intent.ACTION_VIEW);//设置意图操作行为为查看 + shortcutIntent.setAction(Intent.ACTION_VIEW); shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId()); shortcutIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); shortcutIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - + 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"); // 获取快捷方式名称 String shortcutName = makeShortcutIconTitle(mWorkingNote.getContent()); @@ -1799,7 +2109,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, showToast(R.string.error_note_empty_for_send_to_desktop); } } - + /** * 使用旧的广播方式创建快捷方式（兼容Android 7.1及以下） */ @@ -1822,11 +2132,224 @@ public class NoteEditActivity extends Activity implements OnClickListener, SHORTCUT_ICON_TITLE_MAX_LEN) : content; } - private void showToast(int resId) {//显示短时间的提示消息 - showToast(resId, Toast.LENGTH_SHORT);// + private void showToast(int resId) { + showToast(resId, Toast.LENGTH_SHORT); } - private void showToast(int resId, int duration) {//显示自定义时间长度的 Toast 消息 + private void showToast(int resId, int duration) { Toast.makeText(this, resId, duration).show(); } -} + + // ========== 新增：打开系统相册选择图片 ========== + private void addPicture() { + if (mImageInsertHelper != null) { + mImageInsertHelper.startPickImage(); + } + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (mImageInsertHelper == null) { + return; + } + ImageInsertHelper.Result result = mImageInsertHelper.handleActivityResult( + requestCode, resultCode, data, mNoteEditor); + if (result == null || !result.success) { + return; + } + mWorkingNote.setWorkingText(result.html); + mText = result.html; + showImagePreview(result.localPath); + } + + private String normalizeEditorHtml(String html) { + if (TextUtils.isEmpty(html) || "null".equalsIgnoreCase(html)) { + return ""; + } + return html; + } + + private boolean isHtmlContent(String content) { + if (TextUtils.isEmpty(content)) { + return false; + } + return content.contains(""); + } + // 自定义方法：给RichEditor设置字体大小（对应原EditText的setTextAppearance） + private void setRichEditorFontSize(int fontSizeId) { + switch (fontSizeId) { + case ResourceParser.TEXT_SMALL: + mNoteEditor.setEditorFontSize(14); // 小字体 + break; + case ResourceParser.TEXT_MEDIUM: + mNoteEditor.setEditorFontSize(18); // 中字体（默认） + break; + case ResourceParser.TEXT_LARGE: + mNoteEditor.setEditorFontSize(22); // 大字体 + break; + case ResourceParser.TEXT_SUPER: + mNoteEditor.setEditorFontSize(26); // 超大字体 + break; + default: + mNoteEditor.setEditorFontSize(18); // 默认值 + } + } + private void initRichEditor() { + mNoteEditor.setEditorHeight(600); // 设置编辑器高度 + mNoteEditor.setEditorFontSize(16); // 字体大小 + mNoteEditor.setEditorFontColor(Color.BLACK); // 字体颜色 + mNoteEditor.setPadding(10, 10, 10, 10); // 内边距 + mNoteEditor.setPlaceholder("请输入笔记内容..."); // 占位提示 + mNoteEditor.setInputEnabled(true); // 允许输入 + mNoteEditor.setBackgroundColor(Color.TRANSPARENT); + mNoteEditor.getSettings().setAllowContentAccess(true); + mNoteEditor.getSettings().setAllowFileAccess(true); + + // 启用JavaScript，用于获取选中文本 + mNoteEditor.getSettings().setJavaScriptEnabled(true); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { + mNoteEditor.getSettings().setAllowFileAccessFromFileURLs(true); + mNoteEditor.getSettings().setAllowUniversalAccessFromFileURLs(true); + } + + // 为富文本编辑器添加触摸监听，当用户点击或选择文本时更新字符数 + mNoteEditor.setOnTouchListener(new View.OnTouchListener() { + @Override + public boolean onTouch(View v, MotionEvent event) { + // 当触摸结束时更新字符数 + if (event.getAction() == MotionEvent.ACTION_UP) { + // 富文本模式下，尝试获取选中文本长度 + getSelectedTextLength(); + } + return false; // 继续传递触摸事件 + } + }); + + // 添加文本选择变化监听 + String currentHtml = mNoteEditor.getHtml(); + String scriptHtml = currentHtml + ""; + mNoteEditor.setHtml(scriptHtml); + } + + // 添加获取选中文本长度的方法 + private void getSelectedTextLength() { + if (mNoteEditor == null) return; + + // 使用JavaScript获取选中文本 + String js = "javascript:(function() {" + + "var selection = window.getSelection();" + + "var selectedText = selection.toString();" + + "var totalText = document.body.innerText;" + + "window.noteEditor.getSelectedText(selectedText, totalText);" + + "})();"; + + // 执行JavaScript + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + mNoteEditor.evaluateJavascript(js, null); + } else { + // 旧版本Android使用loadUrl + mNoteEditor.loadUrl(js); + } + } + // 添加富文本功能按钮初始化方法 + private void initRichEditorButtons() { + // 撤销功能 + findViewById(R.id.action_undo).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mNoteEditor.undo(); + } + }); + + // 加粗功能 + findViewById(R.id.action_bold).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mNoteEditor.setBold(); + } + }); + + // 斜体功能 + findViewById(R.id.action_italic).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mNoteEditor.setItalic(); + } + }); + + // 涂鸦功能 + findViewById(R.id.action_doodle).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + showDoodleDialog(); + } + }); + + } + + private void showDoodleDialog() { + DoodleDialog dialog = new DoodleDialog(this, new DoodleDialog.OnDoodleSavedListener() { + @Override + public void onSaved(String localPath) { + insertImageFromLocal(localPath); + showImagePreview(localPath); + } + }); + dialog.show(); + } + + private void insertImageFromLocal(String localImagePath) { + if (mNoteEditor == null) { + return; + } + String imgUrl = Uri.fromFile(new File(localImagePath)).toString(); + String imgHtmlTag = "
"; + String curHtml = normalizeEditorHtml(mNoteEditor.getHtml()); + String newHtml = curHtml + imgHtmlTag; + mNoteEditor.setHtml(newHtml); + mNoteEditor.focusEditor(); + mText = newHtml; + mWorkingNote.setWorkingText(newHtml); + } + + +} \ No newline at end of file diff --git a/src/ui/NoteEditText.java b/src/notes/ui/NoteEditText.java similarity index 64% rename from src/ui/NoteEditText.java rename to src/notes/ui/NoteEditText.java index b2ff0a0..1c42721 100644 --- a/src/ui/NoteEditText.java +++ b/src/notes/ui/NoteEditText.java @@ -37,117 +37,80 @@ import net.micode.notes.R; import java.util.HashMap; import java.util.Map; -/** - * 小米笔记的自定义文本编辑组件，扩展了Android原生EditText的功能 - * 支持特殊的按键处理、链接识别和动态添加/删除编辑框 - */ public class NoteEditText extends EditText { - private static final String TAG = "NoteEditText"; // 日志标签 - private int mIndex; // 当前编辑框在容器中的索引位置 - private int mSelectionStartBeforeDelete; // 删除操作前的光标起始位置 + 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:" ; // HTTP协议 - private static final String SCHEME_EMAIL = "mailto:" ; // 邮件协议 + 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); // 邮件链接菜单 + 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); } /** - * 与NoteEditActivity通信的监听器接口，用于处理编辑框的动态添加和删除 + * Call by the {@link NoteEditActivity} to delete or add edit text */ public interface OnTextViewChangeListener { /** - * 当按下删除键且文本为空时，删除当前编辑框 - * @param index 当前编辑框的索引 - * @param text 当前编辑框的文本内容 + * Delete current edit text when {@link KeyEvent#KEYCODE_DEL} happens + * and the text is null */ void onEditTextDelete(int index, String text); /** - * 当按下回车键时，在当前编辑框后添加新的编辑框 - * @param index 新编辑框的索引位置 - * @param text 新编辑框的初始文本内容 + * Add edit text after current edit text when {@link KeyEvent#KEYCODE_ENTER} + * happen */ void onEditTextEnter(int index, String text); /** - * 当文本内容变化时，通知外部显示或隐藏选项 - * @param index 当前编辑框的索引 - * @param hasText 是否包含文本 + * Hide or show item option when text change */ void onTextChange(int index, boolean hasText); } - private OnTextViewChangeListener mOnTextViewChangeListener; // 文本变化监听器实例 + private OnTextViewChangeListener mOnTextViewChangeListener; //新增选区变化回调接口 private OnSelectionChangeListener mOnSelectionChangeListener; - /** - * 构造函数，创建NoteEditText实例 - * @param context 上下文对象 - */ public NoteEditText(Context context) { super(context, null); mIndex = 0; } - /** - * 设置当前编辑框在容器中的索引位置 - * @param index 索引值 - */ public void setIndex(int index) { mIndex = index; } - /** - * 设置文本变化监听器，用于与NoteEditActivity通信 - * @param listener 监听器实例 - */ public void setOnTextViewChangeListener(OnTextViewChangeListener listener) { mOnTextViewChangeListener = listener; } + //新增选区变化回调接口设置方法 public void setOnSelectionChangeListener(OnSelectionChangeListener listener) { mOnSelectionChangeListener = listener; } - /** - * 构造函数，从XML布局创建NoteEditText实例 - * @param context 上下文对象 - * @param attrs XML属性集合 - */ public NoteEditText(Context context, AttributeSet attrs) { super(context, attrs, android.R.attr.editTextStyle); } - /** - * 构造函数，从XML布局创建NoteEditText实例，支持自定义样式 - * @param context 上下文对象 - * @param attrs XML属性集合 - * @param defStyle 自定义样式 - */ public NoteEditText(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); // TODO Auto-generated constructor stub } - /** - * 重写触摸事件处理，实现精确的文本选择 - * @param event 触摸事件对象 - * @return 事件处理结果 - */ @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(); @@ -158,30 +121,22 @@ public class NoteEditText extends EditText { Layout layout = getLayout(); int line = layout.getLineForVertical(y); int off = layout.getOffsetForHorizontal(line, x); - Selection.setSelection(getText(), off); // 设置光标位置 + Selection.setSelection(getText(), off); break; } return super.onTouchEvent(event); } - /** - * 重写按键按下事件处理 - * @param keyCode 按键码 - * @param event 按键事件对象 - * @return 事件处理结果 - */ @Override public boolean onKeyDown(int keyCode, KeyEvent event) { switch (keyCode) { case KeyEvent.KEYCODE_ENTER: - // 回车键按下时，交由onKeyUp处理 if (mOnTextViewChangeListener != null) { return false; } break; case KeyEvent.KEYCODE_DEL: - // 记录删除前的光标位置 mSelectionStartBeforeDelete = getSelectionStart(); break; default: @@ -190,17 +145,10 @@ public class NoteEditText extends EditText { return super.onKeyDown(keyCode, event); } - /** - * 重写按键释放事件处理，实现特殊的删除和回车功能 - * @param keyCode 按键码 - * @param event 按键事件对象 - * @return 事件处理结果 - */ @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()); @@ -211,14 +159,10 @@ public class NoteEditText extends EditText { } break; case KeyEvent.KEYCODE_ENTER: - // 回车键处理：在当前位置分割文本，创建新的编辑框 if (mOnTextViewChangeListener != null) { int selectionStart = getSelectionStart(); - // 获取光标后的文本 String text = getText().subSequence(selectionStart, length()).toString(); - // 保留光标前的文本 setText(getText().subSequence(0, selectionStart)); - // 通知Activity添加新的编辑框 mOnTextViewChangeListener.onEditTextEnter(mIndex + 1, text); } else { Log.d(TAG, "OnTextViewChangeListener was not seted"); @@ -230,16 +174,9 @@ public class NoteEditText extends EditText { return super.onKeyUp(keyCode, event); } - /** - * 重写焦点变化事件处理 - * @param focused 是否获得焦点 - * @param direction 焦点移动方向 - * @param previouslyFocusedRect 之前焦点所在的矩形区域 - */ @Override protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) { if (mOnTextViewChangeListener != null) { - // 失去焦点且文本为空时，通知Activity隐藏相关选项 if (!focused && TextUtils.isEmpty(getText())) { mOnTextViewChangeListener.onTextChange(mIndex, false); } else { @@ -249,10 +186,8 @@ public class NoteEditText extends EditText { super.onFocusChanged(focused, direction, previouslyFocusedRect); } - /** - * 创建上下文菜单，支持链接点击操作 - * @param menu 上下文菜单对象 - */ + + @Override protected void onCreateContextMenu(ContextMenu menu) { if (getText() instanceof Spanned) { @@ -262,10 +197,8 @@ public class NoteEditText extends EditText { int min = Math.min(selStart, selEnd); int max = Math.max(selStart, selEnd); - // 查找选中区域内的URLSpan 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) { @@ -278,11 +211,10 @@ public class NoteEditText extends EditText { 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; } @@ -306,4 +238,4 @@ public class NoteEditText extends EditText { // 新增选区变化回调接口 interface OnSelectionChangeListener { void onSelectionChanged(int index, int selStart, int selEnd); -} \ No newline at end of file +} diff --git a/src/notes/ui/NoteItemData.java b/src/notes/ui/NoteItemData.java new file mode 100644 index 0000000..7de56b1 --- /dev/null +++ b/src/notes/ui/NoteItemData.java @@ -0,0 +1,240 @@ +/* + * 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, + NoteColumns.IS_HABIT, + }; + + 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 static final int IS_HABIT_COLUMN = 12; + + 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 boolean mIsHabit; + 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); + // 移除HTML标签 + mSnippet = mSnippet.replaceAll("<[^>]*>", ""); + // 移除CHECKED和UNCHECKED标签 + 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); + // habit flag, may not exist on older DBs + try { + mIsHabit = cursor.getInt(IS_HABIT_COLUMN) > 0; + } catch (Exception e) { + mIsHabit = false; + } + + 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 isHabit() { + return mIsHabit; + } + + 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/ui/NotesListActivity.java b/src/notes/ui/NotesListActivity.java similarity index 80% rename from src/ui/NotesListActivity.java rename to src/notes/ui/NotesListActivity.java index 8f55201..2c73c9d 100644 --- a/src/ui/NotesListActivity.java +++ b/src/notes/ui/NotesListActivity.java @@ -54,6 +54,7 @@ import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.AdapterView.OnItemLongClickListener; import android.widget.Button; +import android.widget.ImageButton; import android.widget.EditText; import android.widget.ImageView; import android.widget.ListView; @@ -114,7 +115,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private enum ListEditState { NOTE_LIST, // 根目录笔记列表 SUB_FOLDER, // 子文件夹笔记列表 - CALL_RECORD_FOLDER // 通话记录文件夹列表 + CALL_RECORD_FOLDER, // 通话记录文件夹列表 + TRASH_FOLDER // 回收站文件夹列表 }; private ListEditState mState; // 当前列表状态 @@ -133,6 +135,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private static final String TAG = "NotesListActivity"; // 日志标签 public static final int NOTES_LISTVIEW_SCROLL_RATE = 30; // ListView滚动速率 private NoteItemData mFocusNoteDataItem; // 当前聚焦的笔记数据项 + private Button mMemoryBottle; // 记忆瓶按钮 + private ImageButton mTrashButton; // 回收站按钮 + private TrashManager mTrashManager; // 回收站管理器 + private EncryptedFolderManager mEncryptedFolderManager; // 加密文件夹管理器 + private View mNotesRootView; // 笔记根视图 + private BackgroundManager mBackgroundManager; // 背景管理器 + private MemoryBottleDialog mMemoryBottleDialog; // 记忆瓶对话框 /** * 数据库查询条件 @@ -141,13 +150,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt 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)"; // 根文件夹查询条件 + + NoteColumns.NOTES_COUNT + ">0)"; - /** - * startActivityForResult的请求码 - */ - private final static int REQUEST_CODE_OPEN_NODE = 102; // 打开笔记的请求码 - private final static int REQUEST_CODE_NEW_NODE = 103; // 新建笔记的请求码 + private static final String PREF_MEMORY_FOLDER_ID = "pref_memory_bottle_folder_id"; + + private final static int REQUEST_CODE_OPEN_NODE = 102; + private final static int REQUEST_CODE_NEW_NODE = 103; @Override protected void onCreate(Bundle savedInstanceState) {// 初始化活动，设置布局和资源 @@ -262,12 +270,61 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt mAddNewNote = (Button) findViewById(R.id.btn_new_note); mAddNewNote.setOnClickListener(this); mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener()); + mMemoryBottle = (Button) findViewById(R.id.btn_memory_bottle); + mMemoryBottle.setOnClickListener(this); + mTrashButton = (ImageButton) findViewById(R.id.btn_trash); + mTrashButton.setOnClickListener(this); mDispatch = false; mDispatchY = 0; mOriginY = 0; mTitleBar = (TextView) findViewById(R.id.tv_title_bar); mState = ListEditState.NOTE_LIST; mModeCallBack = new ModeCallback(); + mTrashManager = new TrashManager(this, mContentResolver, new TrashManager.Callback() { + @Override + public void onWidgetsNeedUpdate(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); + } + } + } + } + + @Override + public void onListChanged() { + startAsyncNotesListQuery(); + } + + @Override + public void onActionModeFinished() { + mModeCallBack.finishActionMode(); + } + + @Override + public void onRestoreInvalid() { + Toast.makeText(NotesListActivity.this, R.string.trash_restore_invalid, + Toast.LENGTH_SHORT).show(); + } + }); + mEncryptedFolderManager = new EncryptedFolderManager(this, mContentResolver, + new EncryptedFolderManager.Callback() { + @Override + public void onEncryptedFolderCreated() { + startAsyncNotesListQuery(); + } + + @Override + public void onEncryptedFolderUnlocked(NoteItemData data) { + openFolderInternal(data); + } + }); + updateMemoryButtonVisibility(); + updateTrashButtonVisibility(); + + //初始化背景管理器 mNotesRootView = findViewById(R.id.notes_root); @@ -439,6 +496,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private ActionMode mActionMode; /** 移动菜单项，用于批量移动笔记 */ private MenuItem mMoveMenu; + /** 恢复菜单项，用于从回收站恢复笔记 */ + private MenuItem mRestoreMenu; /** * 创建多选模式时的初始化操作 @@ -448,19 +507,37 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt */ public boolean onCreateActionMode(ActionMode mode, Menu menu) { getMenuInflater().inflate(R.menu.note_list_options, menu); + MenuItem deleteMenu = menu.findItem(R.id.delete); + deleteMenu.setOnMenuItemClickListener(this); 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) { + mRestoreMenu = menu.findItem(R.id.restore); + if (mState == ListEditState.TRASH_FOLDER) { mMoveMenu.setVisible(false); + mRestoreMenu.setVisible(true); + mRestoreMenu.setOnMenuItemClickListener(this); + deleteMenu.setTitle(R.string.menu_delete_permanent); } else { - mMoveMenu.setVisible(true); - mMoveMenu.setOnMenuItemClickListener(this); + mRestoreMenu.setVisible(false); + if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER + || DataUtils.getUserFolderCount(mContentResolver) == 0) { + mMoveMenu.setVisible(false); + } else { + mMoveMenu.setVisible(true); + mMoveMenu.setOnMenuItemClickListener(this); + } + deleteMenu.setTitle(R.string.menu_delete); } mActionMode = mode; - mNotesListAdapter.setChoiceMode(true); + mNotesListAdapter.setChoiceMode(true, mState == ListEditState.TRASH_FOLDER); mNotesListView.setLongClickable(false); mAddNewNote.setVisibility(View.GONE); + if (mMemoryBottle != null) { + mMemoryBottle.setVisibility(View.GONE); + } + if (mTrashButton != null) { + mTrashButton.setVisibility(View.GONE); + } View customView = LayoutInflater.from(NotesListActivity.this).inflate( R.layout.note_list_dropdown_menu, null); @@ -509,7 +586,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt public void onDestroyActionMode(ActionMode mode) {// 多选模式结束时的操作 mNotesListAdapter.setChoiceMode(false); mNotesListView.setLongClickable(true); - mAddNewNote.setVisibility(View.VISIBLE); + if (mState == ListEditState.CALL_RECORD_FOLDER) { + mAddNewNote.setVisibility(View.GONE); + } else { + mAddNewNote.setVisibility(View.VISIBLE); + } + updateMemoryButtonVisibility(); + updateTrashButtonVisibility(); } public void finishActionMode() {// 结束多选模式 @@ -534,21 +617,29 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt 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())); + if (mState == ListEditState.TRASH_FOLDER) { + builder.setMessage(getString(R.string.alert_message_delete_notes, + mNotesListAdapter.getSelectedCount())); + } else { + 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(); - } - }); + 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; + case R.id.restore: + restoreSelected(); + break; default: return false; } @@ -558,6 +649,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private class NewNoteOnTouchListener implements OnTouchListener {// 处理"新建笔记"按钮的触摸事件 public boolean onTouch(View v, MotionEvent event) { + if (event.getAction() == MotionEvent.ACTION_UP && !mDispatch) { + // 当触摸结束且没有分发到列表视图时，直接触发点击事件 + v.performClick(); + return true; + } + switch (event.getAction()) { case MotionEvent.ACTION_DOWN: { Display display = getWindowManager().getDefaultDisplay(); @@ -593,7 +690,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return mNotesListView.dispatchTouchEvent(event); } } - break; + mDispatch = false; + return false; } case MotionEvent.ACTION_MOVE: {// 处理"新建笔记"按钮的移动事件 if (mDispatch) { @@ -601,20 +699,19 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt event.setLocation(event.getX(), mDispatchY); return mNotesListView.dispatchTouchEvent(event); } - break; + return false; } - default: {// 处理"新建笔记"按钮的其他事件 + default: { if (mDispatch) { event.setLocation(event.getX(), mDispatchY); + boolean result = mNotesListView.dispatchTouchEvent(event); mDispatch = false; - return mNotesListView.dispatchTouchEvent(event); + return result; } - break; + return false; } } - return false; } - }; /** @@ -624,10 +721,24 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private void startAsyncNotesListQuery() { String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION : NORMAL_SELECTION; + String[] selectionArgs; + if (mCurrentFolderId == Notes.ID_ROOT_FOLDER) { + long memoryFolderId = getMemoryBottleFolderId(); + if (memoryFolderId > 0) { + selection = "(" + selection + ") AND " + NoteColumns.ID + "<> ?"; + selectionArgs = new String[] { + String.valueOf(mCurrentFolderId), + String.valueOf(memoryFolderId) + }; + } else { + selectionArgs = new String[] { String.valueOf(mCurrentFolderId) }; + } + } else { + selectionArgs = new String[] { String.valueOf(mCurrentFolderId) }; + } 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" );// 按类型和修改日期排序 + Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, selectionArgs, + NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); } /** @@ -699,6 +810,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt new AsyncTask>() { protected HashSet doInBackground(Void... unused) { HashSet widgets = mNotesListAdapter.getSelectedWidget(); + HashSet ids = mNotesListAdapter.getSelectedItemIds(); + boolean inTrash = mState == ListEditState.TRASH_FOLDER; + mTrashManager.batchDelete(inTrash, ids, widgets, mCurrentFolderId); if (!isSyncMode()) { // if not synced, delete notes directly if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter @@ -731,6 +845,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } }.execute(); } + private void restoreSelected() { + HashSet ids = mNotesListAdapter.getSelectedItemIds(); + HashSet widgets = mNotesListAdapter.getSelectedWidget(); + mTrashManager.restoreSelected(ids, widgets); + } private void deleteFolder(long folderId) {// 删除文件夹 if (folderId == Notes.ID_ROOT_FOLDER) { @@ -758,7 +877,38 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } } + private void updateMemoryButtonVisibility() { + if (mMemoryBottle == null) { + return; + } + if (mState == ListEditState.NOTE_LIST) { + mMemoryBottle.setVisibility(View.VISIBLE); + } else { + mMemoryBottle.setVisibility(View.GONE); + } + } + private void updateTrashButtonVisibility() { + if (mTrashButton == null) { + return; + } + if (mState == ListEditState.NOTE_LIST) { + mTrashButton.setVisibility(View.VISIBLE); + } else { + mTrashButton.setVisibility(View.GONE); + } + } + + + private long getMemoryBottleFolderId() { + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); + long folderId = sp.getLong(PREF_MEMORY_FOLDER_ID, -1); + if (folderId > 0 && DataUtils.visibleInNoteDatabase(mContentResolver, folderId, + Notes.TYPE_FOLDER)) { + return folderId; + } + return -1; + } private void openNode(NoteItemData data) {// 打开笔记 Intent intent = new Intent(this, NoteEditActivity.class); intent.setAction(Intent.ACTION_VIEW); @@ -766,7 +916,21 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE); } - private void openFolder(NoteItemData data) {// 打开文件夹 + private void openFolder(NoteItemData data) { + if (data.getId() == Notes.ID_TRASH_FOLER) { + openTrashFolder(); + return; + } + EncryptedFolderManager.EncryptedFolderInfo encryptedInfo = + mEncryptedFolderManager.getEncryptedFolderInfo(data.getId()); + if (encryptedInfo != null) { + mEncryptedFolderManager.showEncryptedUnlockDialog(encryptedInfo, data); + return; + } + openFolderInternal(data); + } + + private void openFolderInternal(NoteItemData data) { mCurrentFolderId = data.getId(); startAsyncNotesListQuery(); if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) { @@ -781,6 +945,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt mTitleBar.setText(data.getSnippet()); } mTitleBar.setVisibility(View.VISIBLE); + updateMemoryButtonVisibility(); + updateTrashButtonVisibility(); } public void onClick(View v) { @@ -788,11 +954,46 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt case R.id.btn_new_note: createNewNote(); break; + case R.id.btn_memory_bottle: + openMemoryBottle(); + break; + case R.id.btn_trash: + openTrashFolder(); + break; default: break; } } + private void openMemoryBottle() { + if (mMemoryBottleDialog == null) { + mMemoryBottleDialog = new MemoryBottleDialog(this); + } + mMemoryBottleDialog.show(); + } + + private void openTrashFolder() { + mCurrentFolderId = Notes.ID_TRASH_FOLER; + mState = ListEditState.TRASH_FOLDER; + mTrashManager.cleanupExpiredTrash(); + startAsyncNotesListQuery(); + mTitleBar.setText(R.string.trash_folder_name); + mTitleBar.setVisibility(View.VISIBLE); + mAddNewNote.setVisibility(View.GONE); + updateMemoryButtonVisibility(); + updateTrashButtonVisibility(); + } + + @Override + protected void onDestroy() { + if (mMemoryBottleDialog != null && mMemoryBottleDialog.isShowing()) { + mMemoryBottleDialog.dismiss(); + } + mMemoryBottleDialog = null; + super.onDestroy(); + } + + private void showSoftInput() {// 显示软键盘 InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); if (inputMethodManager != null) { @@ -901,6 +1102,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt mState = ListEditState.NOTE_LIST; mTitleBar.setVisibility(View.GONE); startAsyncNotesListQuery(); + updateMemoryButtonVisibility(); + updateTrashButtonVisibility(); invalidateOptionsMenu(); break; case CALL_RECORD_FOLDER:// 返回上一级通话记录文件夹 @@ -909,8 +1112,19 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt mAddNewNote.setVisibility(View.VISIBLE); mTitleBar.setVisibility(View.GONE); startAsyncNotesListQuery(); + updateMemoryButtonVisibility(); + updateTrashButtonVisibility(); break; - case NOTE_LIST:// 返回主界面 + case TRASH_FOLDER: + mCurrentFolderId = Notes.ID_ROOT_FOLDER; + mState = ListEditState.NOTE_LIST; + startAsyncNotesListQuery(); + mTitleBar.setVisibility(View.GONE); + mAddNewNote.setVisibility(View.VISIBLE); + updateMemoryButtonVisibility(); + updateTrashButtonVisibility(); + break; + case NOTE_LIST: super.onBackPressed(); break; default: @@ -1002,6 +1216,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt getMenuInflater().inflate(R.menu.sub_folder, menu); } else if (mState == ListEditState.CALL_RECORD_FOLDER) { getMenuInflater().inflate(R.menu.call_record_folder, menu); + } else if (mState == ListEditState.TRASH_FOLDER) { + getMenuInflater().inflate(R.menu.sub_folder, menu); + MenuItem newNote = menu.findItem(R.id.menu_new_note); + if (newNote != null) { + newNote.setVisible(false); + } } else { Log.e(TAG, "Wrong state:" + mState); } @@ -1015,7 +1235,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt showCreateOrModifyFolderDialog(true); break; } - case R.id.menu_export_text: {// 导出笔记为文本文件 + case R.id.menu_new_encrypted_folder: { + mEncryptedFolderManager.showCreateEncryptedFolderDialog(); + break; + } + case R.id.menu_export_text: { exportNoteToText(); break; } @@ -1146,6 +1370,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt Log.e(TAG, "Wrong note type in SUB_FOLDER"); } break; + case TRASH_FOLDER: + if (item.getType() == Notes.TYPE_NOTE) { + openNode(item); + } else { + Toast.makeText(NotesListActivity.this, + R.string.menu_restore, Toast.LENGTH_SHORT).show(); + } + break; default: break; } @@ -1175,7 +1407,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt 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 (mState == ListEditState.TRASH_FOLDER && !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_NOTE && !mNotesListAdapter.isInChoiceMode()) { if (mNotesListView.startActionMode(mModeCallBack) != null) { mModeCallBack.onItemCheckedStateChanged(null, position, id, true); mNotesListView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); diff --git a/src/ui/NotesListAdapter.java b/src/notes/ui/NotesListAdapter.java similarity index 60% rename from src/ui/NotesListAdapter.java rename to src/notes/ui/NotesListAdapter.java index 98106be..b4d0f1d 100644 --- a/src/ui/NotesListAdapter.java +++ b/src/notes/ui/NotesListAdapter.java @@ -31,80 +31,90 @@ import java.util.HashSet; import java.util.Iterator; -public class NotesListAdapter extends CursorAdapter {//Adapter作为Activity和ListView之间的适配器，将Cursor数据转换为ListView可以理解的视图格式 - private static final String TAG = "NotesListAdapter"; // 日志标签 - private Context mContext; // 上下文对象 - private HashMap mSelectedIndex; // 选中项索引映射 - private int mNotesCount; // 笔记数量（排除文件夹） - private boolean mChoiceMode; // 是否处于选择模式 - - public static class AppWidgetAttribute { // 小部件属性类，用于存储小部件的ID和类型 - public int widgetId; // 小部件ID - public int widgetType; // 小部件类型 +public class NotesListAdapter extends CursorAdapter { + private static final String TAG = "NotesListAdapter"; + private Context mContext; + private HashMap mSelectedIndex; + private int mNotesCount; + private boolean mChoiceMode; + + private boolean mIncludeFolders; + + public static class AppWidgetAttribute { + public int widgetId; + public int widgetType; }; - public NotesListAdapter(Context context) { // 构造函数，创建NotesListAdapter实例 + public NotesListAdapter(Context context) { super(context, null); - mSelectedIndex = new HashMap(); // 初始化选中项映射 + mSelectedIndex = new HashMap(); mContext = context; mNotesCount = 0; } @Override public View newView(Context context, Cursor cursor, ViewGroup parent) { - return new NotesListItem(context); // 创建新的NotesListItem + 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, // 绑定数据到视图 + 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(); // 通知数据变化，刷新UI + mSelectedIndex.put(position, checked); + notifyDataSetChanged(); } public boolean isInChoiceMode() { - return mChoiceMode; // 检查是否处于选择模式 + return mChoiceMode; } public void setChoiceMode(boolean mode) { - mSelectedIndex.clear(); // 清除之前的选中状态 - mChoiceMode = mode; // 更新模式标志 + mSelectedIndex.clear(); + mChoiceMode = mode; + mIncludeFolders = false; + } + public void setChoiceMode(boolean mode, boolean includeFolders) { + mSelectedIndex.clear(); + mChoiceMode = mode; + mIncludeFolders = includeFolders; } 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); // 设置选中状态 + int type = NoteItemData.getNoteType(cursor); + if (type == Notes.TYPE_NOTE || (mIncludeFolders && type == Notes.TYPE_FOLDER)) { + setCheckedItem(i, checked); } } } } - public HashSet getSelectedItemIds() {// 获取选中项的ID集合 + public HashSet getSelectedItemIds() { HashSet itemSet = new HashSet(); for (Integer position : mSelectedIndex.keySet()) { if (mSelectedIndex.get(position) == true) { - Long id = getItemId(position); // 获取选中项的ID + Long id = getItemId(position); if (id == Notes.ID_ROOT_FOLDER) { Log.d(TAG, "Wrong item id, should not happen"); } else { - itemSet.add(id); // 添加到集合 + itemSet.add(id); } } } + return itemSet; } - public HashSet getSelectedWidget() {// 获取选中项的小部件属性集合 + public HashSet getSelectedWidget() { HashSet itemSet = new HashSet(); for (Integer position : mSelectedIndex.keySet()) { if (mSelectedIndex.get(position) == true) { @@ -112,10 +122,12 @@ public class NotesListAdapter extends CursorAdapter {//Adapter作为Activity和L if (c != null) { AppWidgetAttribute widget = new AppWidgetAttribute(); NoteItemData item = new NoteItemData(mContext, c); - widget.widgetId = item.getWidgetId(); // 获取小部件ID - widget.widgetType = item.getWidgetType(); // 获取小部件类型 + widget.widgetId = item.getWidgetId(); + widget.widgetType = item.getWidgetType(); itemSet.add(widget); - // Don't close cursor here, only the adapter could close it + /** + * Don't close cursor here, only the adapter could close it + */ } else { Log.e(TAG, "Invalid cursor"); return null; @@ -125,7 +137,7 @@ public class NotesListAdapter extends CursorAdapter {//Adapter作为Activity和L return itemSet; } - public int getSelectedCount() {// 获取选中项数量 + public int getSelectedCount() { Collection values = mSelectedIndex.values(); if (null == values) { return 0; @@ -137,39 +149,39 @@ public class NotesListAdapter extends CursorAdapter {//Adapter作为Activity和L count++; } } - return count; // 返回选中项数量 + return count; } - public boolean isAllSelected() {// 检查是否所有笔记都被选中 + public boolean isAllSelected() { int checkedCount = getSelectedCount(); - return (checkedCount != 0 && checkedCount == mNotesCount); + return (checkedCount != 0 && checkedCount == mNotesCount); } - public boolean isSelectedItem(final int position) {// 检查指定位置的项是否被选中 + public boolean isSelectedItem(final int position) { if (null == mSelectedIndex.get(position)) { return false; } - return mSelectedIndex.get(position); // 检查指定位置的项是否被选中 + return mSelectedIndex.get(position); } @Override protected void onContentChanged() { super.onContentChanged(); - calcNotesCount(); // 当内容变化时，重新计算笔记数量 + calcNotesCount(); } @Override public void changeCursor(Cursor cursor) { super.changeCursor(cursor); - calcNotesCount(); // 当游标变化时，重新计算笔记数量 + calcNotesCount(); } - private void 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) { // 只统计普通笔记，排除文件夹 + if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) { mNotesCount++; } } else { diff --git a/src/ui/NotesListItem.java b/src/notes/ui/NotesListItem.java similarity index 73% rename from src/ui/NotesListItem.java rename to src/notes/ui/NotesListItem.java index 60c91cd..ac4b7af 100644 --- a/src/ui/NotesListItem.java +++ b/src/notes/ui/NotesListItem.java @@ -31,33 +31,26 @@ 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; // 选择模式下的复选框（用于批量操作） + private ImageView mAlert; + private ImageView mHabit; + 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); + mHabit = (ImageView) findViewById(R.id.iv_habit_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); } - /** - * 绑定数据到视图，根据数据类型动态调整UI样式 - * @param data 笔记数据模型 - * @param checked 选择模式下是否选中 - */ 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); @@ -66,7 +59,6 @@ public class NotesListItem extends LinearLayout { } mItemData = data; - // 处理通话记录文件夹 if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) { mCallName.setVisibility(View.GONE); mAlert.setVisibility(View.VISIBLE); @@ -74,9 +66,14 @@ public class NotesListItem extends LinearLayout { 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) { + } else if (data.getId() == Notes.ID_TRASH_FOLER) { + mCallName.setVisibility(View.GONE); + mAlert.setVisibility(View.VISIBLE); + mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem); + mTitle.setText(context.getString(R.string.trash_folder_name) + + context.getString(R.string.format_folder_files_count, data.getNotesCount())); + mAlert.setImageResource(R.drawable.baseline_restore_from_trash_24); + } else if (data.getParentId() == Notes.ID_CALL_RECORD_FOLDER) { mCallName.setVisibility(View.VISIBLE); mCallName.setText(data.getCallName()); mTitle.setTextAppearance(context,R.style.TextAppearanceSecondaryItem); @@ -87,9 +84,13 @@ public class NotesListItem extends LinearLayout { } else { mAlert.setVisibility(View.GONE); } - } - // 处理普通文件夹和笔记 - else { + // habit badge + if (data.isHabit()) { + mHabit.setVisibility(View.VISIBLE); + } else { + mHabit.setVisibility(View.GONE); + } + } else { mCallName.setVisibility(View.GONE); mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem); @@ -97,7 +98,14 @@ public class NotesListItem extends LinearLayout { mTitle.setText(data.getSnippet() + context.getString(R.string.format_folder_files_count, data.getNotesCount())); - mAlert.setVisibility(View.GONE); + // 加密文件夹使用锁图标，与打卡图标区分 + // 通过DataUtils检查是否为加密文件夹 + if (DataUtils.isEncryptedFolder(context.getContentResolver(), data.getId())) { + mAlert.setImageResource(R.drawable.lock); + mAlert.setVisibility(View.VISIBLE); + } else { + mAlert.setVisibility(View.GONE); + } } else { mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); if (data.hasAlert()) { @@ -106,22 +114,21 @@ public class NotesListItem extends LinearLayout { } else { mAlert.setVisibility(View.GONE); } + if (data.isHabit()) { + mHabit.setVisibility(View.VISIBLE); + } else { + mHabit.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()) { @@ -132,14 +139,10 @@ public class NotesListItem extends LinearLayout { setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id)); } } else { - // 文件夹使用统一背景 setBackgroundResource(NoteItemBgResources.getFolderBgRes()); } } - /** - * 获取当前列表项的数据模型 - */ public NoteItemData getItemData() { return mItemData; } diff --git a/src/ui/NotesPreferenceActivity.java b/src/notes/ui/NotesPreferenceActivity.java similarity index 86% rename from src/ui/NotesPreferenceActivity.java rename to src/notes/ui/NotesPreferenceActivity.java index 341b589..d111389 100644 --- a/src/ui/NotesPreferenceActivity.java +++ b/src/notes/ui/NotesPreferenceActivity.java @@ -48,37 +48,27 @@ 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 static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name"; - /** 最后同步时间偏好键 */ + public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time"; - /** 背景颜色随机显示偏好键 */ + public static final String PREFERENCE_SET_BG_COLOR_KEY = "pref_key_bg_random_appear"; - /** 同步账户分类键 */ + private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key"; - /** 账户授权过滤器键 */ + private static final String AUTHORITIES_FILTER_KEY = "authorities"; - /** 账户设置分类 */ private PreferenceCategory mAccountCategory; - /** GTask同步广播接收器 */ + private GTaskReceiver mReceiver; - /** 原始账户列表，用于检测是否添加了新账户 */ + private Account[] mOriAccounts; - /** 是否添加了新账户的标志 */ + private boolean mHasAddedAccount; - /** - * 创建偏好设置活动时的初始化操作 - * @param icicle 保存的活动状态 - */ @Override protected void onCreate(Bundle icicle) { super.onCreate(icicle); @@ -94,16 +84,14 @@ public class NotesPreferenceActivity extends PreferenceActivity { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) { registerReceiver(mReceiver, filter, Context.RECEIVER_NOT_EXPORTED); } else { - registerReceiver(mReceiver, filter); + registerReceiver(mReceiver, filter); + } mOriAccounts = null; View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null); getListView().addHeaderView(header, null, true); } - /** - * 活动恢复时调用，处理账户添加检测和UI刷新 - */ @Override protected void onResume() { super.onResume(); @@ -132,9 +120,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { refreshUI(); } - /** - * 活动销毁时调用，用于清理资源 - */ @Override protected void onDestroy() { if (mReceiver != null) { @@ -143,9 +128,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { super.onDestroy(); } - /** - * 加载账户偏好设置，创建账户选择偏好项 - */ private void loadAccountPreference() { mAccountCategory.removeAll(); @@ -176,9 +158,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { mAccountCategory.addPreference(accountPref); } - /** - * 加载同步按钮和同步状态显示 - */ private void loadSyncButton() { Button syncButton = (Button) findViewById(R.id.preference_sync_button); TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview); @@ -218,17 +197,11 @@ public class NotesPreferenceActivity extends PreferenceActivity { } } - /** - * 刷新UI界面，重新加载账户偏好和同步按钮状态 - */ private void refreshUI() { loadAccountPreference(); loadSyncButton(); } - /** - * 显示选择账户的对话框，允许用户选择或添加Google账户 - */ private void showSelectAccountAlertDialog() { AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); @@ -285,9 +258,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { }); } - /** - * 显示更改账户的确认对话框，提示用户更改账户的风险 - */ private void showChangeAccountConfirmAlertDialog() { AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); @@ -317,19 +287,11 @@ public class NotesPreferenceActivity extends PreferenceActivity { dialogBuilder.show(); } - /** - * 获取所有Google账户列表 - * @return Google账户数组 - */ private Account[] getGoogleAccounts() { AccountManager accountManager = AccountManager.get(this); return accountManager.getAccountsByType("com.google"); } - /** - * 设置同步账户 - * @param account 账户名称 - */ private void setSyncAccount(String account) { if (!getSyncAccountName(this).equals(account)) { SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); @@ -360,9 +322,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { } } - /** - * 移除同步账户，清理相关数据 - */ private void removeSyncAccount() { SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); SharedPreferences.Editor editor = settings.edit(); @@ -375,7 +334,7 @@ public class NotesPreferenceActivity extends PreferenceActivity { editor.commit(); // clean up local gtask related info - new Thread(new Runnable() {//清空一系列数据，thread多线程操作，避免阻塞主线程 + new Thread(new Runnable() { public void run() { ContentValues values = new ContentValues(); values.put(NoteColumns.GTASK_ID, ""); @@ -385,20 +344,13 @@ public class NotesPreferenceActivity extends PreferenceActivity { }).start(); } - /** - * 获取当前同步账户名称 - * @return 同步账户名称 - */ - public static String getSyncAccountName(Context context) {// + public static String getSyncAccountName(Context context) { SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, ""); } - /** - * 设置最后同步时间 - */ - public static void setLastSyncTime(Context context, long time) {// + public static void setLastSyncTime(Context context, long time) { SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); SharedPreferences.Editor editor = settings.edit(); @@ -406,20 +358,16 @@ public class NotesPreferenceActivity extends PreferenceActivity { editor.commit(); } - /** - * 获取最后同步时间 - * @return 最后同步时间（毫秒） - */ - public static long getLastSyncTime(Context context) {// + public static long getLastSyncTime(Context context) { SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0); } - private class GTaskReceiver extends BroadcastReceiver {// 处理同步状态更新广播 + private class GTaskReceiver extends BroadcastReceiver { @Override - public void onReceive(Context context, Intent intent) {// 处理同步状态更新广播 + public void onReceive(Context context, Intent intent) { refreshUI(); if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) { TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview); @@ -430,11 +378,7 @@ public class NotesPreferenceActivity extends PreferenceActivity { } } - /** - * 处理选项菜单点击事件 - * @param item 点击的菜单项 - */ - public boolean onOptionsItemSelected(MenuItem item) {// + public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case android.R.id.home: Intent intent = new Intent(this, NotesListActivity.class); diff --git a/src/notes/ui/TrashManager.java b/src/notes/ui/TrashManager.java new file mode 100644 index 0000000..e900b8e --- /dev/null +++ b/src/notes/ui/TrashManager.java @@ -0,0 +1,192 @@ +/* + * 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.ContentResolver; +import android.content.ContentUris; +import android.content.ContentValues; +import android.content.Context; +import android.database.Cursor; +import android.os.AsyncTask; +import android.util.Log; + +import net.micode.notes.data.Notes; +import net.micode.notes.data.Notes.NoteColumns; +import net.micode.notes.tool.DataUtils; +import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute; + +import java.util.HashSet; + +public class TrashManager { + private static final String TAG = "TrashManager"; + private final Context mContext; + private final ContentResolver mResolver; + private final Callback mCallback; + + public interface Callback { + void onWidgetsNeedUpdate(HashSet widgets); + + void onListChanged(); + + void onActionModeFinished(); + + void onRestoreInvalid(); + } + + public TrashManager(Context context, ContentResolver resolver, Callback callback) { + mContext = context; + mResolver = resolver; + mCallback = callback; + } + + public void cleanupExpiredTrash() { + long expireTime = System.currentTimeMillis() - 24L * 60L * 60L * 1000L; + mResolver.delete(Notes.CONTENT_NOTE_URI, + NoteColumns.PARENT_ID + "=? AND " + NoteColumns.MODIFIED_DATE + " ids, + final HashSet widgets, final long originFolderId) { + new AsyncTask>() { + protected HashSet doInBackground(Void... unused) { + if (inTrash) { + if (!DataUtils.batchDeleteNotes(mResolver, ids)) { + Log.e(TAG, "Delete notes error, should not happens"); + } + } else { + if (!DataUtils.batchMoveToTrash(mResolver, ids, originFolderId)) { + Log.e(TAG, "Move notes to trash folder error"); + } + } + return widgets; + } + + @Override + protected void onPostExecute(HashSet resultWidgets) { + if (mCallback != null) { + mCallback.onWidgetsNeedUpdate(resultWidgets); + mCallback.onListChanged(); + mCallback.onActionModeFinished(); + } + } + }.execute(); + } + + public void restoreSelected(final HashSet ids, final HashSet widgets) { + new AsyncTask() { + protected Boolean doInBackground(Void... params) { + boolean hasInvalid = false; + long now = System.currentTimeMillis(); + for (long id : ids) { + Cursor cursor = mResolver.query( + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), + new String[] { NoteColumns.ORIGIN_PARENT_ID, NoteColumns.TYPE }, + null, null, null); + if (cursor == null) { + continue; + } + long originParent = Notes.ID_ROOT_FOLDER; + int type = Notes.TYPE_NOTE; + try { + if (cursor.moveToFirst()) { + originParent = cursor.getLong(0); + type = cursor.getInt(1); + } + } finally { + cursor.close(); + } + long targetParent = resolveRestoreParent(originParent); + if (targetParent != originParent) { + hasInvalid = true; + } + ContentValues values = new ContentValues(); + values.put(NoteColumns.PARENT_ID, targetParent); + values.put(NoteColumns.ORIGIN_PARENT_ID, 0); + values.put(NoteColumns.LOCAL_MODIFIED, 1); + values.put(NoteColumns.MODIFIED_DATE, now); + mResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), + values, null, null); + if (type == Notes.TYPE_FOLDER) { + restoreNotesForFolder(id, now); + } + } + return hasInvalid; + } + + @Override + protected void onPostExecute(Boolean hasInvalid) { + if (mCallback != null) { + if (hasInvalid != null && hasInvalid) { + mCallback.onRestoreInvalid(); + } + mCallback.onWidgetsNeedUpdate(widgets); + mCallback.onListChanged(); + mCallback.onActionModeFinished(); + } + } + }.execute(); + } + + public HashSet moveFolderToTrash(long folderId, long originFolderId) { + HashSet widgets = DataUtils.getFolderNoteWidget(mResolver, folderId); + DataUtils.moveNotesToTrashForFolder(mResolver, folderId); + HashSet ids = new HashSet(); + ids.add(folderId); + if (!DataUtils.batchMoveToTrash(mResolver, ids, originFolderId)) { + Log.e(TAG, "Move folder to trash error"); + } + return widgets; + } + + private void restoreNotesForFolder(long folderId, long now) { + ContentValues values = new ContentValues(); + values.put(NoteColumns.PARENT_ID, folderId); + values.put(NoteColumns.ORIGIN_PARENT_ID, 0); + values.put(NoteColumns.LOCAL_MODIFIED, 1); + values.put(NoteColumns.MODIFIED_DATE, now); + mResolver.update(Notes.CONTENT_NOTE_URI, values, + NoteColumns.PARENT_ID + "=? AND " + NoteColumns.ORIGIN_PARENT_ID + "=?", + new String[] { String.valueOf(Notes.ID_TRASH_FOLER), String.valueOf(folderId) }); + } + + private long resolveRestoreParent(long originParentId) { + if (originParentId == Notes.ID_ROOT_FOLDER || originParentId == Notes.ID_CALL_RECORD_FOLDER) { + return originParentId; + } + if (originParentId <= 0) { + return Notes.ID_ROOT_FOLDER; + } + Cursor cursor = mResolver.query( + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, originParentId), + new String[] { NoteColumns.ID, NoteColumns.PARENT_ID }, + NoteColumns.PARENT_ID + "<>?", + new String[] { String.valueOf(Notes.ID_TRASH_FOLER) }, + null); + if (cursor == null) { + return Notes.ID_ROOT_FOLDER; + } + try { + if (cursor.moveToFirst()) { + return originParentId; + } + } finally { + cursor.close(); + } + return Notes.ID_ROOT_FOLDER; + } +} diff --git a/src/widget/NoteWidgetProvider.java b/src/notes/widget/NoteWidgetProvider.java similarity index 79% rename from src/widget/NoteWidgetProvider.java rename to src/notes/widget/NoteWidgetProvider.java index 5400be7..ec6f819 100644 --- a/src/widget/NoteWidgetProvider.java +++ b/src/notes/widget/NoteWidgetProvider.java @@ -32,11 +32,11 @@ import net.micode.notes.tool.ResourceParser; import net.micode.notes.ui.NoteEditActivity; import net.micode.notes.ui.NotesListActivity; -public abstract class NoteWidgetProvider extends AppWidgetProvider {//笔记小部件提供器 +public abstract class NoteWidgetProvider extends AppWidgetProvider { public static final String [] PROJECTION = new String [] { NoteColumns.ID, NoteColumns.BG_COLOR_ID, - NoteColumns.SNIPPET//笔记摘要 + NoteColumns.SNIPPET }; public static final int COLUMN_ID = 0; @@ -46,9 +46,9 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider {//笔记小 private static final String TAG = "NoteWidgetProvider"; @Override - public void onDeleted(Context context, int[] appWidgetIds) {//删除小部件时调用 - ContentValues values = new ContentValues();//创建内容值对象，用于更新数据库 - values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);//将小部件ID设置为无效值 + public void onDeleted(Context context, int[] appWidgetIds) { + ContentValues values = new ContentValues(); + values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); for (int i = 0; i < appWidgetIds.length; i++) { context.getContentResolver().update(Notes.CONTENT_NOTE_URI, values, @@ -59,18 +59,18 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider {//笔记小 private Cursor getNoteWidgetInfo(Context context, int widgetId) { return context.getContentResolver().query(Notes.CONTENT_NOTE_URI, - PROJECTION,//查询投影，指定要返回的列 + PROJECTION, NoteColumns.WIDGET_ID + "=? AND " + NoteColumns.PARENT_ID + "<>?", new String[] { String.valueOf(widgetId), String.valueOf(Notes.ID_TRASH_FOLER) }, null); } protected void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { - update(context, appWidgetManager, appWidgetIds, false);//false + update(context, appWidgetManager, appWidgetIds, false); } private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, - boolean privacyMode) {//更新小部件，是上面的实现方式 + boolean privacyMode) { for (int i = 0; i < appWidgetIds.length; i++) { if (appWidgetIds[i] != AppWidgetManager.INVALID_APPWIDGET_ID) { int bgId = ResourceParser.getDefaultBgId(context); @@ -90,38 +90,36 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider {//笔记小 snippet = c.getString(COLUMN_SNIPPET); bgId = c.getInt(COLUMN_BG_COLOR_ID); intent.putExtra(Intent.EXTRA_UID, c.getLong(COLUMN_ID)); - intent.setAction(Intent.ACTION_VIEW);//设置意图操作，查看笔记 + intent.setAction(Intent.ACTION_VIEW); } else { snippet = context.getResources().getString(R.string.widget_havenot_content); - intent.setAction(Intent.ACTION_INSERT_OR_EDIT);//设置意图操作，插入或编辑笔记 + intent.setAction(Intent.ACTION_INSERT_OR_EDIT); } if (c != null) { c.close(); } - RemoteViews rv = new RemoteViews(context.getPackageName(), getLayoutId());//创建远程视图对象，用于更新小部件的布局 - /*为什么在App Widget中使用RemoteViews而非普通View? RemoteViews是一种 跨进程视图描述机制 ，它不直接操作View对象，而是通过序列化方式传递视图的结构和属性 - 是Android系统为了解决跨进程视图更新问题而设计的一种安全、高效的机制。*/ + RemoteViews rv = new RemoteViews(context.getPackageName(), getLayoutId()); rv.setImageViewResource(R.id.widget_bg_image, getBgResourceId(bgId)); intent.putExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, bgId); /** * Generate the pending intent to start host for the widget */ - PendingIntent pendingIntent = null;//创建挂起意图对象，用于启动主活动 + PendingIntent pendingIntent = null; if (privacyMode) { rv.setTextViewText(R.id.widget_text, - context.getString(R.string.widget_under_visit_mode));//设置小部件文本为隐私模式下的提示文本 + context.getString(R.string.widget_under_visit_mode)); pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], new Intent( - context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);//用于动态更新 + context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT); } else { rv.setTextViewText(R.id.widget_text, snippet); pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], intent, PendingIntent.FLAG_UPDATE_CURRENT); } - rv.setOnClickPendingIntent(R.id.widget_text, pendingIntent);//设置小部件文本点击事件，启动挂起意图 - appWidgetManager.updateAppWidget(appWidgetIds[i], rv);//更新小部件布局 + rv.setOnClickPendingIntent(R.id.widget_text, pendingIntent); + appWidgetManager.updateAppWidget(appWidgetIds[i], rv); } } } diff --git a/src/widget/NoteWidgetProvider_2x.java b/src/notes/widget/NoteWidgetProvider_2x.java similarity index 88% rename from src/widget/NoteWidgetProvider_2x.java rename to src/notes/widget/NoteWidgetProvider_2x.java index 188caaf..adcb2f7 100644 --- a/src/widget/NoteWidgetProvider_2x.java +++ b/src/notes/widget/NoteWidgetProvider_2x.java @@ -24,10 +24,10 @@ import net.micode.notes.data.Notes; import net.micode.notes.tool.ResourceParser; -public class NoteWidgetProvider_2x extends NoteWidgetProvider {//小部件2x布局类 +public class NoteWidgetProvider_2x extends NoteWidgetProvider { @Override public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { - super.update(context, appWidgetManager, appWidgetIds);//调用父类更新方法 + super.update(context, appWidgetManager, appWidgetIds); } @Override diff --git a/src/widget/NoteWidgetProvider_4x.java b/src/notes/widget/NoteWidgetProvider_4x.java similarity index 84% rename from src/widget/NoteWidgetProvider_4x.java rename to src/notes/widget/NoteWidgetProvider_4x.java index 86c103d..c12a02e 100644 --- a/src/widget/NoteWidgetProvider_4x.java +++ b/src/notes/widget/NoteWidgetProvider_4x.java @@ -24,14 +24,14 @@ import net.micode.notes.data.Notes; import net.micode.notes.tool.ResourceParser; -public class NoteWidgetProvider_4x extends NoteWidgetProvider {//小部件4x布局类 +public class NoteWidgetProvider_4x extends NoteWidgetProvider { @Override public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { - super.update(context, appWidgetManager, appWidgetIds);//调用父类更新方法 + super.update(context, appWidgetManager, appWidgetIds); } protected int getLayoutId() { - return R.layout.widget_4x;//返回4x布局资源ID + return R.layout.widget_4x; } @Override diff --git a/src/res/color/primary_text_dark.xml b/src/res/color/primary_text_dark.xml new file mode 100644 index 0000000..7c85459 --- /dev/null +++ b/src/res/color/primary_text_dark.xml @@ -0,0 +1,22 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/res/color/secondary_text_dark.xml b/src/res/color/secondary_text_dark.xml new file mode 100644 index 0000000..c1c2384 --- /dev/null +++ b/src/res/color/secondary_text_dark.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/src/res/drawable-hdpi/background_1.png b/src/res/drawable-hdpi/background_1.png new file mode 100644 index 0000000..43cbd5a Binary files /dev/null and b/src/res/drawable-hdpi/background_1.png differ diff --git a/src/res/drawable-hdpi/background_2.png b/src/res/drawable-hdpi/background_2.png new file mode 100644 index 0000000..e879245 Binary files /dev/null and b/src/res/drawable-hdpi/background_2.png differ diff --git a/src/res/drawable-hdpi/background_3.png b/src/res/drawable-hdpi/background_3.png new file mode 100644 index 0000000..85507e3 Binary files /dev/null and b/src/res/drawable-hdpi/background_3.png differ diff --git a/src/res/drawable-hdpi/background_4.png b/src/res/drawable-hdpi/background_4.png new file mode 100644 index 0000000..1ab153d Binary files /dev/null and b/src/res/drawable-hdpi/background_4.png differ diff --git a/src/res/drawable-hdpi/bg_btn_set_color.png b/src/res/drawable-hdpi/bg_btn_set_color.png new file mode 100644 index 0000000..5eb5d44 Binary files /dev/null and b/src/res/drawable-hdpi/bg_btn_set_color.png differ diff --git a/src/res/drawable-hdpi/bg_color_btn_mask.png b/src/res/drawable-hdpi/bg_color_btn_mask.png new file mode 100644 index 0000000..100db77 Binary files /dev/null and b/src/res/drawable-hdpi/bg_color_btn_mask.png differ diff --git a/src/res/drawable-hdpi/call_record.png b/src/res/drawable-hdpi/call_record.png new file mode 100644 index 0000000..fb88ca4 Binary files /dev/null and b/src/res/drawable-hdpi/call_record.png differ diff --git a/src/res/drawable-hdpi/clock.png b/src/res/drawable-hdpi/clock.png new file mode 100644 index 0000000..5f2ae9a Binary files /dev/null and b/src/res/drawable-hdpi/clock.png differ diff --git a/src/res/drawable-hdpi/delete.png b/src/res/drawable-hdpi/delete.png new file mode 100644 index 0000000..643de3e Binary files /dev/null and b/src/res/drawable-hdpi/delete.png differ diff --git a/src/res/drawable-hdpi/dropdown_icon.9.png b/src/res/drawable-hdpi/dropdown_icon.9.png new file mode 100644 index 0000000..5525025 Binary files /dev/null and b/src/res/drawable-hdpi/dropdown_icon.9.png differ diff --git a/src/res/drawable-hdpi/edit_blue.9.png b/src/res/drawable-hdpi/edit_blue.9.png new file mode 100644 index 0000000..55a1856 Binary files /dev/null and b/src/res/drawable-hdpi/edit_blue.9.png differ diff --git a/src/res/drawable-hdpi/edit_green.9.png b/src/res/drawable-hdpi/edit_green.9.png new file mode 100644 index 0000000..2cb2d60 Binary files /dev/null and b/src/res/drawable-hdpi/edit_green.9.png differ diff --git a/src/res/drawable-hdpi/edit_red.9.png b/src/res/drawable-hdpi/edit_red.9.png new file mode 100644 index 0000000..bae944a Binary files /dev/null and b/src/res/drawable-hdpi/edit_red.9.png differ diff --git a/src/res/drawable-hdpi/edit_title_blue.9.png b/src/res/drawable-hdpi/edit_title_blue.9.png new file mode 100644 index 0000000..96e6092 Binary files /dev/null and b/src/res/drawable-hdpi/edit_title_blue.9.png differ diff --git a/src/res/drawable-hdpi/edit_title_green.9.png b/src/res/drawable-hdpi/edit_title_green.9.png new file mode 100644 index 0000000..08d8644 Binary files /dev/null and b/src/res/drawable-hdpi/edit_title_green.9.png differ diff --git a/src/res/drawable-hdpi/edit_title_red.9.png b/src/res/drawable-hdpi/edit_title_red.9.png new file mode 100644 index 0000000..9c430e5 Binary files /dev/null and b/src/res/drawable-hdpi/edit_title_red.9.png differ diff --git a/src/res/drawable-hdpi/edit_title_white.9.png b/src/res/drawable-hdpi/edit_title_white.9.png new file mode 100644 index 0000000..19e8d95 Binary files /dev/null and b/src/res/drawable-hdpi/edit_title_white.9.png differ diff --git a/src/res/drawable-hdpi/edit_title_yellow.9.png b/src/res/drawable-hdpi/edit_title_yellow.9.png new file mode 100644 index 0000000..bf8f580 Binary files /dev/null and b/src/res/drawable-hdpi/edit_title_yellow.9.png differ diff --git a/src/res/drawable-hdpi/edit_white.9.png b/src/res/drawable-hdpi/edit_white.9.png new file mode 100644 index 0000000..918f7a6 Binary files /dev/null and b/src/res/drawable-hdpi/edit_white.9.png differ diff --git a/src/res/drawable-hdpi/edit_yellow.9.png b/src/res/drawable-hdpi/edit_yellow.9.png new file mode 100644 index 0000000..10cb642 Binary files /dev/null and b/src/res/drawable-hdpi/edit_yellow.9.png differ diff --git a/src/res/drawable-hdpi/font_large.png b/src/res/drawable-hdpi/font_large.png new file mode 100644 index 0000000..78cf2e6 Binary files /dev/null and b/src/res/drawable-hdpi/font_large.png differ diff --git a/src/res/drawable-hdpi/font_normal.png b/src/res/drawable-hdpi/font_normal.png new file mode 100644 index 0000000..9de7ced Binary files /dev/null and b/src/res/drawable-hdpi/font_normal.png differ diff --git a/src/res/drawable-hdpi/font_size_selector_bg.9.png b/src/res/drawable-hdpi/font_size_selector_bg.9.png new file mode 100644 index 0000000..be8e64c Binary files /dev/null and b/src/res/drawable-hdpi/font_size_selector_bg.9.png differ diff --git a/src/res/drawable-hdpi/font_small.png b/src/res/drawable-hdpi/font_small.png new file mode 100644 index 0000000..d3ff104 Binary files /dev/null and b/src/res/drawable-hdpi/font_small.png differ diff --git a/src/res/drawable-hdpi/font_super.png b/src/res/drawable-hdpi/font_super.png new file mode 100644 index 0000000..85b13a1 Binary files /dev/null and b/src/res/drawable-hdpi/font_super.png differ diff --git a/src/res/drawable-hdpi/habit.png b/src/res/drawable-hdpi/habit.png new file mode 100644 index 0000000..bea8362 Binary files /dev/null and b/src/res/drawable-hdpi/habit.png differ diff --git a/src/res/drawable-hdpi/icon_app.png b/src/res/drawable-hdpi/icon_app.png new file mode 100644 index 0000000..418aadc Binary files /dev/null and b/src/res/drawable-hdpi/icon_app.png differ diff --git a/src/res/drawable-hdpi/list_background.png b/src/res/drawable-hdpi/list_background.png new file mode 100644 index 0000000..087e1f9 Binary files /dev/null and b/src/res/drawable-hdpi/list_background.png differ diff --git a/src/res/drawable-hdpi/list_blue_down.9.png b/src/res/drawable-hdpi/list_blue_down.9.png new file mode 100644 index 0000000..b88eebf Binary files /dev/null and b/src/res/drawable-hdpi/list_blue_down.9.png differ diff --git a/src/res/drawable-hdpi/list_blue_middle.9.png b/src/res/drawable-hdpi/list_blue_middle.9.png new file mode 100644 index 0000000..96b1c8b Binary files /dev/null and b/src/res/drawable-hdpi/list_blue_middle.9.png differ diff --git a/src/res/drawable-hdpi/list_blue_single.9.png b/src/res/drawable-hdpi/list_blue_single.9.png new file mode 100644 index 0000000..d7e7206 Binary files /dev/null and b/src/res/drawable-hdpi/list_blue_single.9.png differ diff --git a/src/res/drawable-hdpi/list_blue_up.9.png b/src/res/drawable-hdpi/list_blue_up.9.png new file mode 100644 index 0000000..632e88c Binary files /dev/null and b/src/res/drawable-hdpi/list_blue_up.9.png differ diff --git a/src/res/drawable-hdpi/list_folder.9.png b/src/res/drawable-hdpi/list_folder.9.png new file mode 100644 index 0000000..829f61b Binary files /dev/null and b/src/res/drawable-hdpi/list_folder.9.png differ diff --git a/src/res/drawable-hdpi/list_footer_bg.9.png b/src/res/drawable-hdpi/list_footer_bg.9.png new file mode 100644 index 0000000..5325c25 Binary files /dev/null and b/src/res/drawable-hdpi/list_footer_bg.9.png differ diff --git a/src/res/drawable-hdpi/list_green_down.9.png b/src/res/drawable-hdpi/list_green_down.9.png new file mode 100644 index 0000000..64a39d9 Binary files /dev/null and b/src/res/drawable-hdpi/list_green_down.9.png differ diff --git a/src/res/drawable-hdpi/list_green_middle.9.png b/src/res/drawable-hdpi/list_green_middle.9.png new file mode 100644 index 0000000..897325a Binary files /dev/null and b/src/res/drawable-hdpi/list_green_middle.9.png differ diff --git a/src/res/drawable-hdpi/list_green_single.9.png b/src/res/drawable-hdpi/list_green_single.9.png new file mode 100644 index 0000000..c83405f Binary files /dev/null and b/src/res/drawable-hdpi/list_green_single.9.png differ diff --git a/src/res/drawable-hdpi/list_green_up.9.png b/src/res/drawable-hdpi/list_green_up.9.png new file mode 100644 index 0000000..141f9e1 Binary files /dev/null and b/src/res/drawable-hdpi/list_green_up.9.png differ diff --git a/src/res/drawable-hdpi/list_red_down.9.png b/src/res/drawable-hdpi/list_red_down.9.png new file mode 100644 index 0000000..4224309 Binary files /dev/null and b/src/res/drawable-hdpi/list_red_down.9.png differ diff --git a/src/res/drawable-hdpi/list_red_middle.9.png b/src/res/drawable-hdpi/list_red_middle.9.png new file mode 100644 index 0000000..9988f17 Binary files /dev/null and b/src/res/drawable-hdpi/list_red_middle.9.png differ diff --git a/src/res/drawable-hdpi/list_red_single.9.png b/src/res/drawable-hdpi/list_red_single.9.png new file mode 100644 index 0000000..587c348 Binary files /dev/null and b/src/res/drawable-hdpi/list_red_single.9.png differ diff --git a/src/res/drawable-hdpi/list_red_up.9.png b/src/res/drawable-hdpi/list_red_up.9.png new file mode 100644 index 0000000..46b4757 Binary files /dev/null and b/src/res/drawable-hdpi/list_red_up.9.png differ diff --git a/src/res/drawable-hdpi/list_white_down.9.png b/src/res/drawable-hdpi/list_white_down.9.png new file mode 100644 index 0000000..29f9d8c Binary files /dev/null and b/src/res/drawable-hdpi/list_white_down.9.png differ diff --git a/src/res/drawable-hdpi/list_white_middle.9.png b/src/res/drawable-hdpi/list_white_middle.9.png new file mode 100644 index 0000000..77a4ab4 Binary files /dev/null and b/src/res/drawable-hdpi/list_white_middle.9.png differ diff --git a/src/res/drawable-hdpi/list_white_single.9.png b/src/res/drawable-hdpi/list_white_single.9.png new file mode 100644 index 0000000..3e79189 Binary files /dev/null and b/src/res/drawable-hdpi/list_white_single.9.png differ diff --git a/src/res/drawable-hdpi/list_white_up.9.png b/src/res/drawable-hdpi/list_white_up.9.png new file mode 100644 index 0000000..e23cd5c Binary files /dev/null and b/src/res/drawable-hdpi/list_white_up.9.png differ diff --git a/src/res/drawable-hdpi/list_yellow_down.9.png b/src/res/drawable-hdpi/list_yellow_down.9.png new file mode 100644 index 0000000..31cfc1e Binary files /dev/null and b/src/res/drawable-hdpi/list_yellow_down.9.png differ diff --git a/src/res/drawable-hdpi/list_yellow_middle.9.png b/src/res/drawable-hdpi/list_yellow_middle.9.png new file mode 100644 index 0000000..b6549b2 Binary files /dev/null and b/src/res/drawable-hdpi/list_yellow_middle.9.png differ diff --git a/src/res/drawable-hdpi/list_yellow_single.9.png b/src/res/drawable-hdpi/list_yellow_single.9.png new file mode 100644 index 0000000..3faf507 Binary files /dev/null and b/src/res/drawable-hdpi/list_yellow_single.9.png differ diff --git a/src/res/drawable-hdpi/list_yellow_up.9.png b/src/res/drawable-hdpi/list_yellow_up.9.png new file mode 100644 index 0000000..4ae791c Binary files /dev/null and b/src/res/drawable-hdpi/list_yellow_up.9.png differ diff --git a/src/res/drawable-hdpi/menu_delete.png b/src/res/drawable-hdpi/menu_delete.png new file mode 100644 index 0000000..ccdfc4b Binary files /dev/null and b/src/res/drawable-hdpi/menu_delete.png differ diff --git a/src/res/drawable-hdpi/menu_move.png b/src/res/drawable-hdpi/menu_move.png new file mode 100644 index 0000000..1140b71 Binary files /dev/null and b/src/res/drawable-hdpi/menu_move.png differ diff --git a/src/res/drawable-hdpi/new_note_normal.png b/src/res/drawable-hdpi/new_note_normal.png new file mode 100644 index 0000000..e24e0d1 Binary files /dev/null and b/src/res/drawable-hdpi/new_note_normal.png differ diff --git a/src/res/drawable-hdpi/new_note_pressed.png b/src/res/drawable-hdpi/new_note_pressed.png new file mode 100644 index 0000000..c748936 Binary files /dev/null and b/src/res/drawable-hdpi/new_note_pressed.png differ diff --git a/src/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/res/drawable-hdpi/note_edit_color_selector_panel.png new file mode 100644 index 0000000..fc49552 Binary files /dev/null and b/src/res/drawable-hdpi/note_edit_color_selector_panel.png differ diff --git a/src/res/drawable-hdpi/notification.png b/src/res/drawable-hdpi/notification.png new file mode 100644 index 0000000..b13ab4a Binary files /dev/null and b/src/res/drawable-hdpi/notification.png differ diff --git a/src/res/drawable-hdpi/search_result.png b/src/res/drawable-hdpi/search_result.png new file mode 100644 index 0000000..ff2befd Binary files /dev/null and b/src/res/drawable-hdpi/search_result.png differ diff --git a/src/res/drawable-hdpi/selected.png b/src/res/drawable-hdpi/selected.png new file mode 100644 index 0000000..b889bef Binary files /dev/null and b/src/res/drawable-hdpi/selected.png differ diff --git a/src/res/drawable-hdpi/title_alert.png b/src/res/drawable-hdpi/title_alert.png new file mode 100644 index 0000000..544ee9c Binary files /dev/null and b/src/res/drawable-hdpi/title_alert.png differ diff --git a/src/res/drawable-hdpi/title_bar_bg.9.png b/src/res/drawable-hdpi/title_bar_bg.9.png new file mode 100644 index 0000000..eb6bff0 Binary files /dev/null and b/src/res/drawable-hdpi/title_bar_bg.9.png differ diff --git a/src/res/drawable-hdpi/widget_2x_blue.png b/src/res/drawable-hdpi/widget_2x_blue.png new file mode 100644 index 0000000..a1707f4 Binary files /dev/null and b/src/res/drawable-hdpi/widget_2x_blue.png differ diff --git a/src/res/drawable-hdpi/widget_2x_green.png b/src/res/drawable-hdpi/widget_2x_green.png new file mode 100644 index 0000000..f86886c Binary files /dev/null and b/src/res/drawable-hdpi/widget_2x_green.png differ diff --git a/src/res/drawable-hdpi/widget_2x_red.png b/src/res/drawable-hdpi/widget_2x_red.png new file mode 100644 index 0000000..0e66c29 Binary files /dev/null and b/src/res/drawable-hdpi/widget_2x_red.png differ diff --git a/src/res/drawable-hdpi/widget_2x_white.png b/src/res/drawable-hdpi/widget_2x_white.png new file mode 100644 index 0000000..5f0619a Binary files /dev/null and b/src/res/drawable-hdpi/widget_2x_white.png differ diff --git a/src/res/drawable-hdpi/widget_2x_yellow.png b/src/res/drawable-hdpi/widget_2x_yellow.png new file mode 100644 index 0000000..12d1c2b Binary files /dev/null and b/src/res/drawable-hdpi/widget_2x_yellow.png differ diff --git a/src/res/drawable-hdpi/widget_4x_blue.png b/src/res/drawable-hdpi/widget_4x_blue.png new file mode 100644 index 0000000..9183738 Binary files /dev/null and b/src/res/drawable-hdpi/widget_4x_blue.png differ diff --git a/src/res/drawable-hdpi/widget_4x_green.png b/src/res/drawable-hdpi/widget_4x_green.png new file mode 100644 index 0000000..fa8b452 Binary files /dev/null and b/src/res/drawable-hdpi/widget_4x_green.png differ diff --git a/src/res/drawable-hdpi/widget_4x_red.png b/src/res/drawable-hdpi/widget_4x_red.png new file mode 100644 index 0000000..62de074 Binary files /dev/null and b/src/res/drawable-hdpi/widget_4x_red.png differ diff --git a/src/res/drawable-hdpi/widget_4x_white.png b/src/res/drawable-hdpi/widget_4x_white.png new file mode 100644 index 0000000..a37d67c Binary files /dev/null and b/src/res/drawable-hdpi/widget_4x_white.png differ diff --git a/src/res/drawable-hdpi/widget_4x_yellow.png b/src/res/drawable-hdpi/widget_4x_yellow.png new file mode 100644 index 0000000..d7c5fa4 Binary files /dev/null and b/src/res/drawable-hdpi/widget_4x_yellow.png differ diff --git a/src/res/drawable/action_bg_color.xml b/src/res/drawable/action_bg_color.xml new file mode 100644 index 0000000..2a1d558 --- /dev/null +++ b/src/res/drawable/action_bg_color.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/res/drawable/action_bold.xml b/src/res/drawable/action_bold.xml new file mode 100644 index 0000000..6f6af0e --- /dev/null +++ b/src/res/drawable/action_bold.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/res/drawable/action_italic.xml b/src/res/drawable/action_italic.xml new file mode 100644 index 0000000..3efecea --- /dev/null +++ b/src/res/drawable/action_italic.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/res/drawable/action_undo.xml b/src/res/drawable/action_undo.xml new file mode 100644 index 0000000..a19c057 --- /dev/null +++ b/src/res/drawable/action_undo.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/res/drawable/baseline_restore_from_trash_24.xml b/src/res/drawable/baseline_restore_from_trash_24.xml new file mode 100644 index 0000000..57b2e2f --- /dev/null +++ b/src/res/drawable/baseline_restore_from_trash_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/res/drawable/draw.xml b/src/res/drawable/draw.xml new file mode 100644 index 0000000..e930f6b --- /dev/null +++ b/src/res/drawable/draw.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/res/drawable/habit_badge.xml b/src/res/drawable/habit_badge.xml new file mode 100644 index 0000000..712f61a --- /dev/null +++ b/src/res/drawable/habit_badge.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/src/res/drawable/habit_day_completed_bg.xml b/src/res/drawable/habit_day_completed_bg.xml new file mode 100644 index 0000000..b84cf4d --- /dev/null +++ b/src/res/drawable/habit_day_completed_bg.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/res/drawable/habit_day_pending_bg.xml b/src/res/drawable/habit_day_pending_bg.xml new file mode 100644 index 0000000..660b572 --- /dev/null +++ b/src/res/drawable/habit_day_pending_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/res/drawable/habit_day_skipped_bg.xml b/src/res/drawable/habit_day_skipped_bg.xml new file mode 100644 index 0000000..fba7651 --- /dev/null +++ b/src/res/drawable/habit_day_skipped_bg.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/res/drawable/habit_day_today_bg.xml b/src/res/drawable/habit_day_today_bg.xml new file mode 100644 index 0000000..254d1d4 --- /dev/null +++ b/src/res/drawable/habit_day_today_bg.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/res/drawable/ic_launcher_background.xml b/src/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/src/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/res/drawable/ic_launcher_foreground.xml b/src/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/src/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/res/drawable/lock.png b/src/res/drawable/lock.png new file mode 100644 index 0000000..013924e Binary files /dev/null and b/src/res/drawable/lock.png differ diff --git a/src/res/drawable/memorybattle.png b/src/res/drawable/memorybattle.png new file mode 100644 index 0000000..a975472 Binary files /dev/null and b/src/res/drawable/memorybattle.png differ diff --git a/src/res/drawable/new_note.xml b/src/res/drawable/new_note.xml new file mode 100644 index 0000000..2154ebc --- /dev/null +++ b/src/res/drawable/new_note.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/src/res/drawable/underlined.xml b/src/res/drawable/underlined.xml new file mode 100644 index 0000000..c58bec5 --- /dev/null +++ b/src/res/drawable/underlined.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/res/layout/account_dialog_title.xml b/src/res/layout/account_dialog_title.xml new file mode 100644 index 0000000..7717112 --- /dev/null +++ b/src/res/layout/account_dialog_title.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/res/layout/activity_main.xml b/src/res/layout/activity_main.xml new file mode 100644 index 0000000..a2e3905 --- /dev/null +++ b/src/res/layout/activity_main.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/src/res/layout/add_account_text.xml b/src/res/layout/add_account_text.xml new file mode 100644 index 0000000..c799178 --- /dev/null +++ b/src/res/layout/add_account_text.xml @@ -0,0 +1,32 @@ + + + + + + + + \ No newline at end of file diff --git a/src/res/layout/background_settings_dialog.xml b/src/res/layout/background_settings_dialog.xml new file mode 100644 index 0000000..c3953e5 --- /dev/null +++ b/src/res/layout/background_settings_dialog.xml @@ -0,0 +1,45 @@ + + + + + +