From f11ef279acedd27b7c483d6ab3572ecd5cf824c1 Mon Sep 17 00:00:00 2001
From: NANBEI <1461476498@qq.com>
Date: Thu, 18 Jan 2024 20:10:43 +0800
Subject: [PATCH] xy 1.18
---
src/Notes-master1/app/.idea/app.iml | 2 +-
src/Notes-master1/app/.idea/misc.xml | 6 -
src/Notes-master1/app/.idea/modules/app.iml | 2 +-
src/Notes-master1/app/build.gradle | 2 +-
src/Notes-master1/app/local.properties | 4 +-
.../app/src/main/AndroidManifest.xml | 65 ++-
.../net/micode/notes/gtask/data/SqlData.java | 209 +++++----
.../java/net/micode/notes/model/Note.java | 83 ++--
.../net/micode/notes/model/WorkingNote.java | 22 +-
.../micode/notes/ui/AlarmAlertActivity.java | 57 ++-
.../micode/notes/ui/AlarmInitReceiver.java | 22 +-
.../net/micode/notes/ui/AlarmReceiver.java | 6 +-
.../micode/notes/ui/DateTimePickerDialog.java | 50 +--
.../net/micode/notes/ui/DropdownMenu.java | 23 +-
.../micode/notes/ui/FoldersListAdapter.java | 20 +-
.../net/micode/notes/ui/LoginActivity.java | 2 +-
.../net/micode/notes/ui/NoteEditActivity.java | 276 +++++-------
.../net/micode/notes/ui/NoteItemData.java | 105 ++---
.../micode/notes/ui/NotesListActivity.java | 19 +-
.../net/micode/notes/ui/NotesListAdapter.java | 17 -
.../net/micode/notes/ui/NotesListItem.java | 44 +-
.../notes/ui/NotesPreferenceActivity.java | 420 ++++++++----------
.../net/micode/notes/ui/SplashActivity.java | 4 +-
.../notes/widget/NoteWidgetProvider.java | 99 +----
.../notes/widget/NoteWidgetProvider_2x.java | 4 -
.../notes/widget/NoteWidgetProvider_4x.java | 5 +-
.../src/main/res/layout/activity_login.xml | 2 +-
.../app/src/main/res/menu/note_list.xml | 8 +-
.../app/src/main/res/menu/sub_folder.xml | 7 -
.../src/main/res/values-zh-rCN/strings.xml | 22 +-
.../src/main/res/values-zh-rTW/strings.xml | 22 +-
.../app/src/main/res/values/strings.xml | 28 +-
src/Notes-master1/build.gradle | 2 +-
33 files changed, 719 insertions(+), 940 deletions(-)
diff --git a/src/Notes-master1/app/.idea/app.iml b/src/Notes-master1/app/.idea/app.iml
index 6785d96..bf9376c 100644
--- a/src/Notes-master1/app/.idea/app.iml
+++ b/src/Notes-master1/app/.idea/app.iml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/.idea/misc.xml b/src/Notes-master1/app/.idea/misc.xml
index 7eda01e..91eadb3 100644
--- a/src/Notes-master1/app/.idea/misc.xml
+++ b/src/Notes-master1/app/.idea/misc.xml
@@ -7,12 +7,6 @@
-
-
-
-
-
-
diff --git a/src/Notes-master1/app/.idea/modules/app.iml b/src/Notes-master1/app/.idea/modules/app.iml
index 10379b0..4f57967 100644
--- a/src/Notes-master1/app/.idea/modules/app.iml
+++ b/src/Notes-master1/app/.idea/modules/app.iml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build.gradle b/src/Notes-master1/app/build.gradle
index 6030d78..6ec6142 100644
--- a/src/Notes-master1/app/build.gradle
+++ b/src/Notes-master1/app/build.gradle
@@ -9,7 +9,7 @@ android {
useLibrary'org.apache.http.legacy'
applicationId "net.micode.notes"
minSdkVersion 16
- targetSdkVersion 23
+ targetSdkVersion 14
}
buildTypes {
diff --git a/src/Notes-master1/app/local.properties b/src/Notes-master1/app/local.properties
index 4fbb2b5..c6b2c27 100644
--- a/src/Notes-master1/app/local.properties
+++ b/src/Notes-master1/app/local.properties
@@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-#Mon Jan 15 19:35:45 CST 2024
-sdk.dir=C\:\\Users\\33699\\AppData\\Local\\Android\\Sdk
\ No newline at end of file
+#Thu Jan 18 19:04:00 CST 2024
+sdk.dir=C\:\\Users\\33699\\AppData\\Local\\Android\\Sdk
diff --git a/src/Notes-master1/app/src/main/AndroidManifest.xml b/src/Notes-master1/app/src/main/AndroidManifest.xml
index cbcfe7f..2487597 100644
--- a/src/Notes-master1/app/src/main/AndroidManifest.xml
+++ b/src/Notes-master1/app/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
android:versionCode="1"
android:versionName="0.1">
-
+
@@ -19,63 +19,48 @@
-
+ android:name=".ui.LoginActivity"
+ android:background="@drawable/edit_blue"
+ android:configChanges="orientation|keyboardHidden|screenSize"
+ android:exported="true"
+ android:label="@string/title_activity_login">
+
-
+ android:theme="@style/Theme.Notesmaster1.Fullscreen" >
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -137,22 +122,22 @@
+ android:process=":remote" />
+ android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" />
+ android:theme="@android:style/Theme.Holo.Light" />
+ android:exported="false" />
0) {// 如果mDiffDataValues的大小大于0
- int result = 0;// 声明并初始化int类型变量result为0
- if (!validateVersion) {// 如果validateVersion为false
+ if (mDiffDataValues.size() > 0) {
+ int result = 0;
+ if (!validateVersion) {
result = mContentResolver.update(ContentUris.withAppendedId(
- Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null);// 调用ContentResolver的update方法，更新Notes.CONTENT_DATA_URI中mDataId对应的数据，更新值为mDiffDataValues
+ Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null);
} else {
result = mContentResolver.update(ContentUris.withAppendedId(
Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues,
" ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE
+ " WHERE " + NoteColumns.VERSION + "=?)", new String[] {
String.valueOf(noteId), String.valueOf(version)
- });// 调用ContentResolver的update方法，更新Notes.CONTENT_DATA_URI中mDataId对应的数据，更新值为mDiffDataValues，更新条件为对应的noteId和version
+ });
}
if (result == 0) {
- Log.w(TAG, "there is no update. maybe user updates note when syncing");// 输出警告日志信息
+ Log.w(TAG, "there is no update. maybe user updates note when syncing");
}
}
}
- mDiffDataValues.clear(); // 清空mDiffDataValues
- mIsCreate = false;// 将mIsCreate赋值为false
+ mDiffDataValues.clear();
+ mIsCreate = false;
}
public long getId() {
return mDataId;
- }// 定义公共方法getId ，返回mDataId
+ }
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java b/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java
index fe5cfdd..ac8fca2 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java
@@ -41,72 +41,73 @@ public class Note {
/**
* Create a new note id for adding a new note to databases为将新笔记添加到数据库中创建一个新的笔记ID
*/
- public static synchronized long getNewNoteId(Context context, long folderId) {
+ public static synchronized long getNewNoteId(Context context, long folderId) {//定义一个公共的静态同步方法，用于获取新的笔记ID。该方法接受两个参数：Context对象和folderId。
// Create a new note in the database在数据库中创建一个新的笔记
- ContentValues values = new ContentValues();
- long createdTime = System.currentTimeMillis();
- values.put(NoteColumns.CREATED_DATE, createdTime);
- values.put(NoteColumns.MODIFIED_DATE, createdTime);
- values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
- values.put(NoteColumns.LOCAL_MODIFIED, 1);
- values.put(NoteColumns.PARENT_ID, folderId);
- Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);
-
- long noteId = 0;
- try {
- noteId = Long.valueOf(uri.getPathSegments().get(1));
- } catch (NumberFormatException e) {
- Log.e(TAG, "Get note id error :" + e.toString());
- noteId = 0;
+ ContentValues values = new ContentValues();//创建一个新的ContentValues对象，用于存储要插入数据库的值。
+ long createdTime = System.currentTimeMillis();//获取当前系统时间的毫秒表示。
+ values.put(NoteColumns.CREATED_DATE, createdTime);//将创建时间添加到ContentValues对象中。
+ values.put(NoteColumns.MODIFIED_DATE, createdTime);//将修改时间添加到ContentValues对象中，此时与创建时间相同。
+ values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);//将笔记类型添加到ContentValues对象中
+ values.put(NoteColumns.LOCAL_MODIFIED, 1);//将本地修改标志添加到ContentValues对象中，设置为1。
+ values.put(NoteColumns.PARENT_ID, folderId);//将父文件夹ID添加到ContentValues对象中。
+
+ Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);//通过ContentResolver的insert方法将ContentValues对象中的值插入到笔记数据库中，并返回新笔记的URI。
+
+ long noteId = 0;//初始化一个long类型的变量noteId，用于存储新笔记的ID
+ try {//开始一个try块，用于捕获异常
+ noteId = Long.valueOf(uri.getPathSegments().get(1));//从URI中获取新笔记的ID。
+ } catch (NumberFormatException e) {//捕获NumberFormatException类型的异常
+ Log.e(TAG, "Get note id error :" + e.toString());//如果捕获到异常，则记录错误信息到日志中。
+ noteId = 0;//将noteId设置为0，表示获取ID失败
}
if (noteId == -1) {
- throw new IllegalStateException("Wrong note id:" + noteId);
+ throw new IllegalStateException("Wrong note id:" + noteId);//如果noteId为-1，则抛出一个IllegalStateException，表示获取到错误的笔记ID。
}
- return noteId;
+ return noteId;//返回获取到的新笔记ID
}
public Note() {
- mNoteDiffValues = new ContentValues();
- mNoteData = new NoteData();
+ mNoteDiffValues = new ContentValues();//创建新的ContentValues对象
+ mNoteData = new NoteData();//创建新的笔记数据
}
- public void setNoteValue(String key, String value) {
- mNoteDiffValues.put(key, value);
- mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
- mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
+ public void setNoteValue(String key, String value) {//定义了一个公共的方法setNoteValue，该方法用于设置笔记的数值。它接受两个参数：key和value。
+ mNoteDiffValues.put(key, value);//将键值对(key, value)添加到mNoteDiffValues中。
+ mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);//将本地修改标志设置为1，表示笔记已被修改。
+ mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());//将修改日期设置为当前系统时间的毫秒表示。
}
- public void setTextData(String key, String value) {
- mNoteData.setTextData(key, value);
- }
+ public void setTextData(String key, String value) {//定义了一个公共的方法setTextData，用于设置笔记的文本数据。它接受两个参数：key和value。
+ mNoteData.setTextData(key, value);}//调用mNoteData对象的setTextData方法，将键值对(key, value)添加到笔记数据中
- public void setTextDataId(long id) {
- mNoteData.setTextDataId(id);
+ public void setTextDataId(long id) {//定义了一个公共的方法setTextDataId，用于设置笔记文本数据的ID。它接受一个参数：id。
+ mNoteData.setTextDataId(id);//调用mNoteData对象的setTextDataId方法，设置笔记文本数据的ID。
}
public long getTextDataId() {
- return mNoteData.mTextDataId;
- }
+ return mNoteData.mTextDataId;//返回mNoteData对象中的文本数据ID
+ }//定义了一个公共的方法getTextDataId，用于获取笔记文本数据的ID
public void setCallDataId(long id) {
- mNoteData.setCallDataId(id);
- }
+ mNoteData.setCallDataId(id);//调用mNoteData对象的setCallDataId方法，设置笔记通话数据的ID。
+ }//定义了一个公共的方法setCallDataId，用于设置笔记通话数据的ID。它接受一个参数：id。
public void setCallData(String key, String value) {
- mNoteData.setCallData(key, value);
- }
+ mNoteData.setCallData(key, value);//调用mNoteData对象的setCallData方法，将键值对(key, value)添加到笔记通话数据中。
+ }//定义了一个公共的方法setCallData，用于设置笔记的通话数据。它接受两个参数：key和value。
+
- public boolean isLocalModified() {
- return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified();
+ public boolean isLocalModified() {//定义了一个公共的方法isLocalModified，用于检查笔记是否被本地修改。
+ return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified();//返回一个布尔值，表示mNoteDiffValues的大小是否大于0，或者mNoteData是否被本地修改。
}
- public boolean syncNote(Context context, long noteId) {
+ public boolean syncNote(Context context, long noteId) {//定义了一个公共的方法syncNote，用于同步笔记。
if (noteId <= 0) {
- throw new IllegalArgumentException("Wrong note id:" + noteId);
+ throw new IllegalArgumentException("Wrong note id:" + noteId);//如果笔记ID小于等于0，则抛出一个IllegalArgumentException，表示获取到错误的笔记ID。
}
- if (!isLocalModified()) {
- return true;
+ if (!isLocalModified()) {//检查笔记是否被本地修改
+ return true;//如果笔记没有被本地修改，则返回true
}
/**
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java
index a31c759..082f399 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java
@@ -332,19 +332,20 @@ public class WorkingNote {//`WorkingNote` 类用于管理笔记数据，包含
public boolean hasClockAlert() {//这个方法用于判断笔记是否有闹钟提醒
return (mAlertDate > 0 ? true : false);
- }
+ }//这个方法用于判断笔记是否有闹钟提醒。
+
public String getContent() {//这个方法用于获取笔记内容
return mContent;
- }
+ }//这个方法用于获取笔记内容。
public long getAlertDate() {//这个方法用于获取提醒日期
return mAlertDate;
- }
+ }//这个方法用于获取提醒日期
public long getModifiedDate() {//这个方法用于获取笔记修改日期
return mModifiedDate;
- }
+ }//这个方法用于获取笔记修改日期
public int getBgColorResId() {//这个方法用于获取背景颜色的资源ID
return NoteBgResources.getNoteBgResource(mBgColorId);
@@ -352,27 +353,26 @@ public class WorkingNote {//`WorkingNote` 类用于管理笔记数据，包含
public int getBgColorId() {//这个方法用于获取背景颜色的ID
return mBgColorId;
- }
+ }//这个方法用于获取背景颜色的ID。
public int getTitleBgResId() {//这个方法用于获取标题背景的资源ID
- return NoteBgResources.getNoteTitleBgResource(mBgColorId);
- }
+ return NoteBgResources.getNoteTitleBgResource(mBgColorId);} //这个方法用于获取标题背景的资源ID。
public int getCheckListMode() {//这个方法用于获取清单模式
return mMode;
- }
+ }//这个方法用于获取清单模式。
public long getNoteId() {//这个方法用于获取笔记ID
return mNoteId;
- }
+ } //这个方法用于获取笔记ID
public long getFolderId() {//这个方法用于获取笔记所属文件夹的ID
return mFolderId;
- }
+ } //这个方法用于获取笔记所属文件夹的ID。
public int getWidgetId() {//这个方法用于获取小部件的ID
return mWidgetId;
- }
+ } //这个方法用于获取小部件的ID。
public int getWidgetType() {//这个方法用于获取小部件的类型
return mWidgetType;
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
index 5a3aa97..85723be 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
@@ -41,10 +41,10 @@ import java.io.IOException;
public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
- private long mNoteId; // 提醒记录的ID
- private String mSnippet; // 提醒记录的摘要
- private static final int SNIPPET_PREW_MAX_LEN = 60; // 摘要预览的最大长度
- MediaPlayer mPlayer; // 媒体播放器
+ private long mNoteId;
+ private String mSnippet;
+ private static final int SNIPPET_PREW_MAX_LEN = 60;
+ MediaPlayer mPlayer;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -64,20 +64,20 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
Intent intent = getIntent();
try {
- mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1)); // 从Intent中获取提醒记录的ID
- mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId); // 根据ID从数据库中获取提醒记录的摘要
+ mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1));
+ mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId);
mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0,
SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info)
- : mSnippet; // 如果摘要超过预设的最大长度，则截断并添加附加信息
+ : mSnippet;
} catch (IllegalArgumentException e) {
e.printStackTrace();
return;
}
- mPlayer = new MediaPlayer(); // 创建媒体播放器实例
- if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) { // 检查提醒记录是否在数据库中可见
- showActionDialog(); // 显示操作对话框
- playAlarmSound(); // 播放闹钟声音
+ mPlayer = new MediaPlayer();
+ if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) {
+ showActionDialog();
+ playAlarmSound();
} else {
finish();
}
@@ -85,25 +85,25 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
private boolean isScreenOn() {
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
- return pm.isScreenOn(); // 检查屏幕是否亮起
+ return pm.isScreenOn();
}
private void playAlarmSound() {
- Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM); // 获取闹钟铃声的URI
+ Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
int silentModeStreams = Settings.System.getInt(getContentResolver(),
- Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0); // 获取受静音模式影响的音频流
+ Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);
if ((silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0) {
- mPlayer.setAudioStreamType(silentModeStreams); // 设置媒体播放器的音频流类型
+ mPlayer.setAudioStreamType(silentModeStreams);
} else {
mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM);
}
try {
- mPlayer.setDataSource(this, url); // 设置媒体播放器的数据源
- mPlayer.prepare(); // 准备媒体播放器
- mPlayer.setLooping(true); // 设置循环播放
- mPlayer.start(); // 开始播放
+ mPlayer.setDataSource(this, url);
+ mPlayer.prepare();
+ mPlayer.setLooping(true);
+ mPlayer.start();
} catch (IllegalArgumentException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -122,12 +122,12 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
private void showActionDialog() {
AlertDialog.Builder dialog = new AlertDialog.Builder(this);
dialog.setTitle(R.string.app_name);
- dialog.setMessage(mSnippet); // 设置对话框的消息内容为提醒记录的摘要
- dialog.setPositiveButton(R.string.notealert_ok, this); // 设置对话框的确定按钮
+ dialog.setMessage(mSnippet);
+ dialog.setPositiveButton(R.string.notealert_ok, this);
if (isScreenOn()) {
- dialog.setNegativeButton(R.string.notealert_enter, this); // 设置对话框的取消按钮
+ dialog.setNegativeButton(R.string.notealert_enter, this);
}
- dialog.show().setOnDismissListener(this); // 显示对话框，并设置对话框的消失监听器
+ dialog.show().setOnDismissListener(this);
}
public void onClick(DialogInterface dialog, int which) {
@@ -136,7 +136,7 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
Intent intent = new Intent(this, NoteEditActivity.class);
intent.setAction(Intent.ACTION_VIEW);
intent.putExtra(Intent.EXTRA_UID, mNoteId);
- startActivity(intent); // 启动编辑提醒记录的界面
+ startActivity(intent);
break;
default:
break;
@@ -144,16 +144,15 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
}
public void onDismiss(DialogInterface dialog) {
- stopAlarmSound(); // 停止闹钟声音
- finish(); // 结束当前Activity
+ stopAlarmSound();
+ finish();
}
private void stopAlarmSound() {
if (mPlayer != null) {
- mPlayer.stop(); // 停止播放
- mPlayer.release(); // 释放资源
+ mPlayer.stop();
+ mPlayer.release();
mPlayer = null;
}
}
}
-
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
index b609331..f221202 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
@@ -31,8 +31,8 @@ import net.micode.notes.data.Notes.NoteColumns;
public class AlarmInitReceiver extends BroadcastReceiver {
private static final String [] PROJECTION = new String [] {
- NoteColumns.ID, // 提醒记录的ID
- NoteColumns.ALERTED_DATE // 提醒时间
+ NoteColumns.ID,
+ NoteColumns.ALERTED_DATE
};
private static final int COLUMN_ID = 0;
@@ -40,9 +40,7 @@ public class AlarmInitReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
- long currentDate = System.currentTimeMillis(); // 获取当前时间
-
- // 查询数据库，获取需要提醒的记录
+ long currentDate = System.currentTimeMillis();
Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
PROJECTION,
NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE,
@@ -52,16 +50,16 @@ public class AlarmInitReceiver extends BroadcastReceiver {
if (c != null) {
if (c.moveToFirst()) {
do {
- long alertDate = c.getLong(COLUMN_ALERTED_DATE); // 获取提醒时间
- Intent sender = new Intent(context, AlarmReceiver.class); // 创建Intent对象，用于触发AlarmReceiver类
- sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID))); // 设置Intent的数据，以便在AlarmReceiver类中获取相应的提醒记录
- PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0); // 创建待定的广播Intent
- AlarmManager alermManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); // 获取AlarmManager实例
- alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent); // 设置闹钟提醒
+ long alertDate = c.getLong(COLUMN_ALERTED_DATE);
+ Intent sender = new Intent(context, AlarmReceiver.class);
+ sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID)));
+ PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0);
+ AlarmManager alermManager = (AlarmManager) context
+ .getSystemService(Context.ALARM_SERVICE);
+ alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent);
} while (c.moveToNext());
}
c.close();
}
}
}
-
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
index e35893b..54e503b 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
@@ -23,8 +23,8 @@ import android.content.Intent;
public class AlarmReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
- intent.setClass(context, AlarmAlertActivity.class);//设置要启动的Activity类
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);//addFlags()方法用于添加启动标志
- context.startActivity(intent);//用于启动Activity
+ intent.setClass(context, AlarmAlertActivity.class);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ context.startActivity(intent);
}
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
index 23d7fe3..2c47ba4 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
@@ -31,10 +31,10 @@ import android.text.format.DateUtils;
public class DateTimePickerDialog extends AlertDialog implements OnClickListener {
- private Calendar mDate = Calendar.getInstance(); // 日历对象，用于存储日期和时间
- private boolean mIs24HourView; // 是否使用24小时制
- private OnDateTimeSetListener mOnDateTimeSetListener; // 日期时间设置监听器
- private DateTimePicker mDateTimePicker; // 日期时间选择器
+ private Calendar mDate = Calendar.getInstance();
+ private boolean mIs24HourView;
+ private OnDateTimeSetListener mOnDateTimeSetListener;
+ private DateTimePicker mDateTimePicker;
public interface OnDateTimeSetListener {
void OnDateTimeSet(AlertDialog dialog, long date);
@@ -42,34 +42,34 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
public DateTimePickerDialog(Context context, long date) {
super(context);
- mDateTimePicker = new DateTimePicker(context); // 创建日期时间选择器
- setView(mDateTimePicker); // 将日期时间选择器设置为对话框的视图
+ mDateTimePicker = new DateTimePicker(context);
+ setView(mDateTimePicker);
mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() {
public void onDateTimeChanged(DateTimePicker view, int year, int month,
int dayOfMonth, int hourOfDay, int minute) {
- mDate.set(Calendar.YEAR, year); // 设置年份
- mDate.set(Calendar.MONTH, month); // 设置月份
- mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth); // 设置日期
- mDate.set(Calendar.HOUR_OF_DAY, hourOfDay); // 设置小时
- mDate.set(Calendar.MINUTE, minute); // 设置分钟
- updateTitle(mDate.getTimeInMillis()); // 更新对话框标题
+ mDate.set(Calendar.YEAR, year);
+ mDate.set(Calendar.MONTH, month);
+ mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);
+ mDate.set(Calendar.HOUR_OF_DAY, hourOfDay);
+ mDate.set(Calendar.MINUTE, minute);
+ updateTitle(mDate.getTimeInMillis());
}
});
- mDate.setTimeInMillis(date); // 设置初始日期时间
- mDate.set(Calendar.SECOND, 0); // 将秒数设置为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())); // 根据系统设置确定是否使用24小时制
- updateTitle(mDate.getTimeInMillis()); // 更新对话框标题
+ mDate.setTimeInMillis(date);
+ mDate.set(Calendar.SECOND, 0);
+ mDateTimePicker.setCurrentDate(mDate.getTimeInMillis());
+ setButton(context.getString(R.string.datetime_dialog_ok), this);
+ setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null);
+ set24HourView(DateFormat.is24HourFormat(this.getContext()));
+ updateTitle(mDate.getTimeInMillis());
}
public void set24HourView(boolean is24HourView) {
- mIs24HourView = is24HourView; // 设置是否使用24小时制
+ mIs24HourView = is24HourView;
}
public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) {
- mOnDateTimeSetListener = callBack; // 设置日期时间设置监听器
+ mOnDateTimeSetListener = callBack;
}
private void updateTitle(long date) {
@@ -77,14 +77,14 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
DateUtils.FORMAT_SHOW_YEAR |
DateUtils.FORMAT_SHOW_DATE |
DateUtils.FORMAT_SHOW_TIME;
- flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR; // 根据是否使用24小时制设置标志位
- setTitle(DateUtils.formatDateTime(this.getContext(), date, flag)); // 根据日期时间和标志位设置对话框标题
+ 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()); // 触发日期时间设置监听器
+ mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis());
}
}
-}
+}
\ No newline at end of file
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
index 6e81766..613dc74 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
@@ -28,35 +28,34 @@ import android.widget.PopupMenu.OnMenuItemClickListener;
import net.micode.notes.R;
public class DropdownMenu {
- private Button mButton; // 下拉菜单的按钮
- private PopupMenu mPopupMenu; // 弹出菜单
- private Menu mMenu; // 菜单
+ private Button mButton;
+ private PopupMenu mPopupMenu;
+ private Menu mMenu;
public DropdownMenu(Context context, Button button, int menuId) {
mButton = button;
- mButton.setBackgroundResource(R.drawable.dropdown_icon); // 设置按钮的背景图像为下拉图标
- mPopupMenu = new PopupMenu(context, mButton); // 创建弹出菜单
- mMenu = mPopupMenu.getMenu(); // 获取菜单
- mPopupMenu.getMenuInflater().inflate(menuId, mMenu); // 填充菜单项
+ mButton.setBackgroundResource(R.drawable.dropdown_icon);
+ mPopupMenu = new PopupMenu(context, mButton);
+ mMenu = mPopupMenu.getMenu();
+ mPopupMenu.getMenuInflater().inflate(menuId, mMenu);
mButton.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
- mPopupMenu.show(); // 点击按钮时显示弹出菜单
+ mPopupMenu.show();
}
});
}
public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) {
if (mPopupMenu != null) {
- mPopupMenu.setOnMenuItemClickListener(listener); // 设置菜单项点击监听器
+ mPopupMenu.setOnMenuItemClickListener(listener);
}
}
public MenuItem findItem(int id) {
- return mMenu.findItem(id); // 查找指定ID的菜单项
+ return mMenu.findItem(id);
}
public void setTitle(CharSequence title) {
- mButton.setText(title); // 设置按钮的文本
+ mButton.setText(title);
}
}
-
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
index 5fbba82..96b77da 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
@@ -31,12 +31,12 @@ import net.micode.notes.data.Notes.NoteColumns;
public class FoldersListAdapter extends CursorAdapter {
public static final String [] PROJECTION = {
- NoteColumns.ID, // 列索引0：ID列
- NoteColumns.SNIPPET // 列索引1：SNIPPET列
+ NoteColumns.ID,
+ NoteColumns.SNIPPET
};
- public static final int ID_COLUMN = 0; // ID列的索引
- public static final int NAME_COLUMN = 1; // 名称列的索引
+ public static final int ID_COLUMN = 0;
+ public static final int NAME_COLUMN = 1;
public FoldersListAdapter(Context context, Cursor c) {
super(context, c);
@@ -45,7 +45,7 @@ public class FoldersListAdapter extends CursorAdapter {
@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
- return new FolderListItem(context); // 创建一个新的FolderListItem视图
+ return new FolderListItem(context);
}
@Override
@@ -53,14 +53,14 @@ public class FoldersListAdapter extends CursorAdapter {
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) view).bind(folderName);
}
}
public String getFolderName(Context context, int position) {
Cursor cursor = (Cursor) getItem(position);
return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
- .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN); // 获取指定位置的文件夹名称
+ .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
}
private class FolderListItem extends LinearLayout {
@@ -68,13 +68,13 @@ public class FoldersListAdapter extends CursorAdapter {
public FolderListItem(Context context) {
super(context);
- inflate(context, R.layout.folder_list_item, this); // 填充自定义视图
+ inflate(context, R.layout.folder_list_item, this);
mName = (TextView) findViewById(R.id.tv_folder_name);
}
public void bind(String name) {
- mName.setText(name); // 设置文件夹名称
+ mName.setText(name);
}
}
-}
+}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/LoginActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/LoginActivity.java
index beea674..d08f7b3 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/LoginActivity.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/LoginActivity.java
@@ -43,7 +43,7 @@ public class LoginActivity extends Activity {
progressDialog.setMessage("Loading...");
progressDialog.setCancelable(true);
progressDialog.show();
- Intent intent = new Intent(LoginActivity.this, NotesListActivity.class);
+ Intent intent = new Intent(LoginActivity.this, SplashActivity.class);
startActivity(intent);
finish();
} else {
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index b2e8578..7cf5b67 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -80,88 +80,83 @@ import java.util.regex.Pattern;
public class NoteEditActivity extends Activity implements OnClickListener,
NoteSettingChangedListener, OnTextViewChangeListener {
private class HeadViewHolder {
- public TextView tvModified; // 修改日期
+ public TextView tvModified;
- public ImageView ivAlertIcon; // 提醒图标
+ public ImageView ivAlertIcon;
- public TextView tvAlertDate; // 提醒日期
+ public TextView tvAlertDate;
- public ImageView ibSetBgColor; // 设置背景颜色按钮
- public EditText editText; // 编辑框
- public TextView textView; // 文本视图
+ public ImageView ibSetBgColor;
+ public EditText editText;
+ public TextView textView;
}
private static final Map sBgSelectorBtnsMap = new HashMap();
-
static {
- sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW); // 黄色背景按钮
- sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED); // 红色背景按钮
- sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE); // 蓝色背景按钮
- sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN); // 绿色背景按钮
- sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE); // 白色背景按钮
+ sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
+ sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED);
+ sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE);
+ sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN);
+ sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE);
}
private static final Map sBgSelectorSelectionMap = new HashMap();
-
static {
- sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select); // 选择的黄色背景按钮
- sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select); // 选择的红色背景按钮
- sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select); // 选择的蓝色背景按钮
- sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select); // 选择的绿色背景按钮
- sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select); // 选择的白色背景按钮
+ sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select);
+ sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select);
+ sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select);
+ sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select);
+ sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select);
}
private static final Map sFontSizeBtnsMap = new HashMap();
-
static {
- sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE); // 大号字体按钮
- sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL); // 小号字体按钮
- sFontSizeBtnsMap.put(R.id.ll_font_normal, ResourceParser.TEXT_MEDIUM); // 中号字体按钮
- sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER); // 超大号字体按钮
+ sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE);
+ sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL);
+ sFontSizeBtnsMap.put(R.id.ll_font_normal, ResourceParser.TEXT_MEDIUM);
+ sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER);
}
private static final Map sFontSelectorSelectionMap = new HashMap();
-
static {
- sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select); // 选择的大号字体按钮
- sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select); // 选择的小号字体按钮
- sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select); // 选择的中号字体按钮
- sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select); // 选择的超大号字体按钮
+ sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select);
+ sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select);
+ sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select);
+ sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select);
}
private static final String TAG = "NoteEditActivity";
- private HeadViewHolder mNoteHeaderHolder; // 头部视图持有者
-
- private View mHeadViewPanel; // 头部视图面板
+ private HeadViewHolder mNoteHeaderHolder;
- private View mNoteBgColorSelector; // 笔记背景颜色选择器
+ private View mHeadViewPanel;
- private View mFontSizeSelector; // 字体大小选择器
+ private View mNoteBgColorSelector;
- private EditText mNoteEditor; // 笔记编辑器
+ private View mFontSizeSelector;
- private View mNoteEditorPanel; // 笔记编辑器面板
+ private EditText mNoteEditor;
- private WorkingNote mWorkingNote; // 当前工作笔记
+ private View mNoteEditorPanel;
- private SharedPreferences mSharedPrefs; // 共享首选项
- private int mFontSizeId; // 字体大小ID
+ private WorkingNote mWorkingNote;
- private static final String PREFERENCE_FONT_SIZE = "pref_font_size"; // 字体大小首选项
+ private SharedPreferences mSharedPrefs;
+ private int mFontSizeId;
- private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10; // 快捷图标标题最大长度
+ private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
- public static final String TAG_CHECKED = String.valueOf('\u221A'); // 选中标签
- public static final String TAG_UNCHECKED = String.valueOf('\u25A1'); // 未选中标签
+ private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
- private LinearLayout mEditTextList; // 编辑文本列表
+ public static final String TAG_CHECKED = String.valueOf('\u221A');
+ public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
- private String mUserQuery; // 用户查询
- private Pattern mPattern; // 模式
- private EditText editText; // 编辑框
- private TextView textView; // 文本视图
+ private LinearLayout mEditTextList;
+ private String mUserQuery;
+ private Pattern mPattern;
+ private EditText editText;
+ private TextView textView;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -174,8 +169,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
initResources();
count();
}
-
- private void count() {
+ private void count(){
mNoteEditor.addTextChangedListener(new TextWatcher() {
int currentLength = 0;
@@ -192,7 +186,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
});
}
-
/**
* 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
@@ -246,7 +239,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
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())) {
+ } else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) {
// New note
long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0);
int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID,
@@ -287,11 +280,11 @@ public class NoteEditActivity extends Activity implements OnClickListener,
| WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
} else {
Log.e(TAG, "Intent not specified action, should not support");
- finish();// 初始化状态失败，结束当前Activity
+ finish();
return false;
}
mWorkingNote.setOnSettingStatusChangedListener(this);
- return true;// 输出日志信息，表示正在从被销毁的Activity中进行恢复
+ return true;
}
@Override
@@ -300,25 +293,21 @@ public class NoteEditActivity extends Activity implements OnClickListener,
initNoteScreen();
}
- private void initNoteScreen() { // 设置文本样式为指定字体大小
+ private void initNoteScreen() {
mNoteEditor.setTextAppearance(this, TextAppearanceResources
.getTexAppearanceResource(mFontSizeId));
- // 根据笔记的模式切换到对应的列表模式或文本模式
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
switchToListMode(mWorkingNote.getContent());
- } else { // 设置笔记编辑器的文本内容，并高亮显示搜索结果
+ } else {
mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
- // 将光标移动到文本末尾
mNoteEditor.setSelection(mNoteEditor.getText().length());
}
- // 隐藏所有背景选择器选中状态的视图
for (Integer id : sBgSelectorSelectionMap.keySet()) {
findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE);
}
- // 设置标题栏和笔记编辑区域的背景资源
mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
- // 设置修改时间文本
+
mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this,
mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE
| DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME
@@ -334,19 +323,18 @@ public class NoteEditActivity extends Activity implements OnClickListener,
private void showAlertHeader() {
if (mWorkingNote.hasClockAlert()) {
long time = System.currentTimeMillis();
- if (time > mWorkingNote.getAlertDate()) { // 如果提醒时间已过期，则显示"提醒已过期"文本
+ if (time > mWorkingNote.getAlertDate()) {
mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired);
- } else {// 显示相对时间，例如"2分钟前"
+ } else {
mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString(
mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS));
- }// 显示提醒时间文本和提醒图标
+ }
mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE);
mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE);
- } else { // 隐藏提醒时间文本和提醒图标
+ } else {
mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
- }
- ;
+ };
}
@Override
@@ -371,23 +359,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);
return true;
}
- // 如果字体大小选择器可见且触摸事件不在其范围内，则隐藏字体大小选择器
+
if (mFontSizeSelector.getVisibility() == View.VISIBLE
&& !inRangeOfView(mFontSizeSelector, ev)) {
mFontSizeSelector.setVisibility(View.GONE);
return true;
- }// 调用父类的dispatchTouchEvent方法处理触摸事件
+ }
return super.dispatchTouchEvent(ev);
}
private boolean inRangeOfView(View view, MotionEvent ev) {
- int[] location = new int[2];
+ int []location = new int[2];
view.getLocationOnScreen(location);
int x = location[0];
int y = location[1];
@@ -395,8 +383,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
|| ev.getX() > (x + view.getWidth())
|| ev.getY() < y
|| ev.getY() > (y + view.getHeight())) {
- return false;
- }
+ return false;
+ }
return true;
}
@@ -406,10 +394,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
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.editText = (EditText) findViewById(R.id.note_edit_view);
mNoteHeaderHolder.textView = (TextView) findViewById(R.id.text_num);
- // 初始化背景颜色选择器按钮和点击事件
+
mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
mNoteEditor = (EditText) findViewById(R.id.note_edit_view);
@@ -419,14 +407,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
ImageView iv = (ImageView) findViewById(id);
iv.setOnClickListener(this);
}
-// 初始化字体大小选择器和点击事件
+
mFontSizeSelector = findViewById(R.id.font_size_selector);
for (int id : sFontSizeBtnsMap.keySet()) {
View view = findViewById(id);
view.setOnClickListener(this);
- }
- ;
- // 初始化SharedPreferences和字体大小
+ };
mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
/**
@@ -434,42 +420,36 @@ public class NoteEditActivity extends Activity implements OnClickListener,
* The id may larger than the length of resources, in this case,
* return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE}
*/
- if (mFontSizeId >= TextAppearanceResources.getResourcesSize()) {
+ if(mFontSizeId >= TextAppearanceResources.getResourcesSize()) {
mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE;
}
- // 初始化编辑器列表
mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list);
}
@Override
protected void onPause() {
super.onPause();
- if (saveNote()) {
+ if(saveNote()) {
Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length());
}
clearSettingState();
}
private void updateWidget() {
- // 创建更新小部件的意图
Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
-
- // 根据笔记的小部件类型设置对应的小部件提供者类
if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
intent.setClass(this, NoteWidgetProvider_2x.class);
} else if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_4X) {
intent.setClass(this, NoteWidgetProvider_4x.class);
} else {
- Log.e(TAG, "Unsupported widget type");
+ Log.e(TAG, "Unspported widget type");
return;
}
- // 将当前笔记的小部件ID作为额外参数传递给意图
- intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[]{
- mWorkingNote.getWidgetId()
+ intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
+ mWorkingNote.getWidgetId()
});
- // 发送广播，通知小部件进行更新
sendBroadcast(intent);
setResult(RESULT_OK, intent);
}
@@ -477,16 +457,14 @@ public class NoteEditActivity extends Activity implements OnClickListener,
public void onClick(View v) {
int id = v.getId();
if (id == R.id.btn_set_bg_color) {
- // 显示背景颜色选择器，并显示当前笔记的背景颜色选中状态
mNoteBgColorSelector.setVisibility(View.VISIBLE);
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(View.VISIBLE);
} else if (sBgSelectorBtnsMap.containsKey(id)) {
- // 隐藏当前笔记的背景颜色选中状态，并设置新的背景颜色ID
- findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(View.GONE);
+ findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
+ View.GONE);
mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id));
mNoteBgColorSelector.setVisibility(View.GONE);
} else if (sFontSizeBtnsMap.containsKey(id)) {
- // 切换字体大小，并更新编辑器的文本样式
findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE);
mFontSizeId = sFontSizeBtnsMap.get(id);
mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit();
@@ -495,16 +473,16 @@ public class NoteEditActivity extends Activity implements OnClickListener,
getWorkingText();
switchToListMode(mWorkingNote.getContent());
} else {
- mNoteEditor.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
+ mNoteEditor.setTextAppearance(this,
+ TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
}
mFontSizeSelector.setVisibility(View.GONE);
}
}
-
@Override
public void onBackPressed() {
- if (clearSettingState()) {
+ if(clearSettingState()) {
return;
}
@@ -513,13 +491,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
private boolean clearSettingState() {
- // 如果背景颜色选择器可见，则隐藏它
if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) {
mNoteBgColorSelector.setVisibility(View.GONE);
return true;
- }
- // 如果字体大小选择器可见，则隐藏它
- else if (mFontSizeSelector.getVisibility() == View.VISIBLE) {
+ } else if (mFontSizeSelector.getVisibility() == View.VISIBLE) {
mFontSizeSelector.setVisibility(View.GONE);
return true;
}
@@ -527,35 +502,29 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
public void onBackgroundColorChanged() {
- // 显示当前笔记的背景颜色选中状态，并更新编辑器和标题栏的背景资源
- findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(View.VISIBLE);
+ findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
+ View.VISIBLE);
mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
}
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
- // 如果Activity即将关闭，则返回true
if (isFinishing()) {
return true;
}
- // 清除设置状态
clearSettingState();
- // 清除菜单项
menu.clear();
- // 根据笔记所属文件夹的不同，加载不同的菜单资源
if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
getMenuInflater().inflate(R.menu.call_note_edit, menu);
} else {
getMenuInflater().inflate(R.menu.note_edit, menu);
}
- // 根据笔记的模式，设置列表模式菜单项的标题
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_normal_mode);
} else {
menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_list_mode);
}
- // 根据笔记是否设置了提醒，显示或隐藏相应的菜单项
if (mWorkingNote.hasClockAlert()) {
menu.findItem(R.id.menu_alert).setVisible(false);
} else {
@@ -564,7 +533,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return true;
}
-
@Override
public boolean onOptionsItemSelected(MenuItem item) {
/**
@@ -621,7 +589,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
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();
@@ -658,7 +626,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
private void deleteCurrentNote() {
- // 如果当前笔记存在于数据库中
if (mWorkingNote.existInDatabase()) {
HashSet ids = new HashSet();
long id = mWorkingNote.getNoteId();
@@ -667,30 +634,28 @@ public class NoteEditActivity extends Activity implements OnClickListener,
} else {
Log.d(TAG, "Wrong note id, should not happen");
}
- // 如果不是同步模式
if (!isSyncMode()) {
- // 批量删除笔记
if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) {
Log.e(TAG, "Delete Note error");
}
} else {
- // 批量将笔记移动到垃圾箱文件夹
if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) {
Log.e(TAG, "Move notes to trash folder error, should not happens");
}
}
}
- // 标记当前笔记为已删除
mWorkingNote.markDeleted(true);
}
private boolean isSyncMode() {
- // 判断是否为同步模式
return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
}
public void onClockAlertChanged(long date, boolean set) {
- // 如果当前笔记不存在于数据库中，则先保存笔记
+ /**
+ * User could set clock to an unsaved note, so before setting the
+ * alert clock, we should save the note first
+ */
if (!mWorkingNote.existInDatabase()) {
saveNote();
}
@@ -700,45 +665,45 @@ public class NoteEditActivity extends Activity implements OnClickListener,
PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE));
showAlertHeader();
- if (!set) {
- // 取消闹钟提醒
+ if(!set) {
alarmManager.cancel(pendingIntent);
} else {
- // 设置闹钟提醒
alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent);
}
} else {
- // 如果没有笔记ID，则提示用户输入内容
+ /**
+ * There is the condition that user has input nothing (the note is
+ * not worthy saving), we have no note id, remind the user that he
+ * should input something
+ */
Log.e(TAG, "Clock alert setting error");
showToast(R.string.error_note_empty_for_clock);
}
}
public void onWidgetChanged() {
- // 更新小部件
updateWidget();
}
public void onEditTextDelete(int index, String text) {
int childCount = mEditTextList.getChildCount();
- // 如果只有一个编辑文本，则不执行删除操作
if (childCount == 1) {
return;
}
- // 更新后续编辑文本的索引
for (int i = index + 1; i < childCount; i++) {
((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
.setIndex(i - 1);
}
- // 移除指定索引处的编辑文本
mEditTextList.removeViewAt(index);
NoteEditText edit = null;
- if (index == 0) {
- edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById(R.id.et_edit_text);
+ 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);
+ edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById(
+ R.id.et_edit_text);
}
int length = edit.length();
edit.append(text);
@@ -747,12 +712,13 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
public void onEditTextEnter(int index, String text) {
- // 调试时不应该发生的情况，检查索引是否超出范围
- if (index > mEditTextList.getChildCount()) {
- Log.e(TAG, "Index out of mEditTextList boundary, should not happen");
+ /**
+ * Should not happen, check for debug
+ */
+ if(index > mEditTextList.getChildCount()) {
+ Log.e(TAG, "Index out of mEditTextList boundrary, should not happen");
}
- // 在指定索引处添加编辑文本
View view = getListItem(text, index);
mEditTextList.addView(view, index);
NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
@@ -765,23 +731,18 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
private void switchToListMode(String text) {
- // 清空编辑文本列表
mEditTextList.removeAllViews();
- // 将文本按换行符分割为多个条目
String[] items = text.split("\n");
int index = 0;
for (String item : items) {
- if (!TextUtils.isEmpty(item)) {
- // 添加每个条目的编辑文本
+ if(!TextUtils.isEmpty(item)) {
mEditTextList.addView(getListItem(item, index));
index++;
}
}
- // 添加一个空的编辑文本作为新的条目
mEditTextList.addView(getListItem("", index));
mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus();
- // 隐藏笔记编辑器，显示编辑文本列表
mNoteEditor.setVisibility(View.GONE);
mEditTextList.setVisibility(View.VISIBLE);
}
@@ -793,7 +754,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
Matcher m = mPattern.matcher(fullText);
int start = 0;
while (m.find(start)) {
- // 设置匹配到的文本背景色高亮
spannable.setSpan(
new BackgroundColorSpan(this.getResources().getColor(
R.color.user_query_highlight)), m.start(), m.end(),
@@ -805,14 +765,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
private View getListItem(String item, int index) {
- // 加载编辑文本列表项的布局
View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null);
final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item));
cb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- // 根据复选框的选中状态设置编辑文本的文本样式
if (isChecked) {
edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
} else {
@@ -822,12 +780,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
});
if (item.startsWith(TAG_CHECKED)) {
- // 如果条目以"[x] "开头，则设置复选框为选中状态，并添加删除线样式
cb.setChecked(true);
edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
item = item.substring(TAG_CHECKED.length(), item.length()).trim();
} else if (item.startsWith(TAG_UNCHECKED)) {
- // 如果条目以"[ ] "开头，则设置复选框为未选中状态，并移除删除线样式
cb.setChecked(false);
edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
item = item.substring(TAG_UNCHECKED.length(), item.length()).trim();
@@ -839,13 +795,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return view;
}
-
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);
@@ -868,7 +823,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
private boolean getWorkingText() {
boolean hasChecked = false;
- // 如果当前笔记是列表模式
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < mEditTextList.getChildCount(); i++) {
@@ -876,44 +830,47 @@ public class NoteEditActivity extends Activity implements OnClickListener,
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()) {
- // 如果编辑文本的复选框被选中，则添加"[x] "前缀
sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n");
hasChecked = true;
} else {
- // 如果编辑文本的复选框未选中，则添加"[ ] "前缀
sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n");
}
}
}
- // 设置当前笔记的工作文本为列表模式的文本
mWorkingNote.setWorkingText(sb.toString());
} else {
- // 设置当前笔记的工作文本为普通模式的文本
mWorkingNote.setWorkingText(mNoteEditor.getText().toString());
}
return hasChecked;
}
private boolean saveNote() {
- // 获取当前笔记的工作文本
getWorkingText();
- // 保存当前笔记
boolean saved = mWorkingNote.saveNote();
if (saved) {
- // 设置结果为RESULT_OK，用于标识创建/编辑状态
+ /**
+ * There are two modes from List view to edit view, open one note,
+ * create/edit a node. Opening node requires to the original
+ * position in the list when back from edit view, while creating a
+ * new node requires to the top of the list. This code
+ * {@link #RESULT_OK} is used to identify the create/edit state
+ */
setResult(RESULT_OK);
}
return saved;
}
private void sendToDesktop() {
- // 如果当前编辑的笔记不存在于数据库中，则先保存笔记
+ /**
+ * Before send message to home, we should make sure that current
+ * editing note is exists in databases. So, for new note, firstly
+ * save it
+ */
if (!mWorkingNote.existInDatabase()) {
saveNote();
}
if (mWorkingNote.getNoteId() > 0) {
- // 创建发送到桌面的快捷方式
Intent sender = new Intent();
Intent shortcutIntent = new Intent(this, NoteEditActivity.class);
shortcutIntent.setAction(Intent.ACTION_VIEW);
@@ -928,14 +885,17 @@ public class NoteEditActivity extends Activity implements OnClickListener,
showToast(R.string.info_note_enter_desktop);
sendBroadcast(sender);
} else {
- // 如果没有笔记ID，则提示用户输入内容
+ /**
+ * There is the condition that user has input nothing (the note is
+ * not worthy saving), we have no note id, remind the user that he
+ * should input something
+ */
Log.e(TAG, "Send to desktop error");
showToast(R.string.error_note_empty_for_send_to_desktop);
}
}
private String makeShortcutIconTitle(String content) {
- // 去除文本中的"[x] "和"[ ] "前缀，作为快捷方式的标题
content = content.replace(TAG_CHECKED, "");
content = content.replace(TAG_UNCHECKED, "");
return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0,
@@ -949,4 +909,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
private void showToast(int resId, int duration) {
Toast.makeText(this, resId, duration).show();
}
+
+
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java
index f2c79f9..0f5a878 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java
@@ -77,69 +77,62 @@ public class NoteItemData {
private boolean mIsMultiNotesFollowingFolder;
public NoteItemData(Context context, Cursor cursor) {
- // 构造函数，用于从数据库查询结果中创建NoteItemData对象
- mId = cursor.getLong(ID_COLUMN);
- mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN);
- mBgColorId = cursor.getInt(BG_COLOR_ID_COLUMN);
- mCreatedDate = cursor.getLong(CREATED_DATE_COLUMN);
- mHasAttachment = (cursor.getInt(HAS_ATTACHMENT_COLUMN) > 0) ? true : false;
- mModifiedDate = cursor.getLong(MODIFIED_DATE_COLUMN);
- mNotesCount = cursor.getInt(NOTES_COUNT_COLUMN);
- mParentId = cursor.getLong(PARENT_ID_COLUMN);
- mSnippet = cursor.getString(SNIPPET_COLUMN);
- mSnippet = mSnippet.replace(NoteEditActivity.TAG_CHECKED, "").replace(
- NoteEditActivity.TAG_UNCHECKED, "");
- mType = cursor.getInt(TYPE_COLUMN);
- mWidgetId = cursor.getInt(WIDGET_ID_COLUMN);
- mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN);
-
- mPhoneNumber = "";
- if (mParentId == Notes.ID_CALL_RECORD_FOLDER) {
- // 如果父文件夹ID为通话记录文件夹ID，则获取与该笔记关联的电话号码
- mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId);
- if (!TextUtils.isEmpty(mPhoneNumber)) {
- // 如果电话号码不为空，则获取联系人姓名
- mName = Contact.getContact(context, mPhoneNumber);
- if (mName == null) {
- mName = mPhoneNumber;
+ mId = cursor.getLong(ID_COLUMN);
+ mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN);
+ mBgColorId = cursor.getInt(BG_COLOR_ID_COLUMN);
+ mCreatedDate = cursor.getLong(CREATED_DATE_COLUMN);
+ mHasAttachment = (cursor.getInt(HAS_ATTACHMENT_COLUMN) > 0) ? true : false;
+ mModifiedDate = cursor.getLong(MODIFIED_DATE_COLUMN);
+ mNotesCount = cursor.getInt(NOTES_COUNT_COLUMN);
+ mParentId = cursor.getLong(PARENT_ID_COLUMN);
+ mSnippet = cursor.getString(SNIPPET_COLUMN);
+ mSnippet = mSnippet.replace(NoteEditActivity.TAG_CHECKED, "").replace(
+ NoteEditActivity.TAG_UNCHECKED, "");
+ mType = cursor.getInt(TYPE_COLUMN);
+ mWidgetId = cursor.getInt(WIDGET_ID_COLUMN);
+ mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN);
+
+ mPhoneNumber = "";
+ if (mParentId == Notes.ID_CALL_RECORD_FOLDER) {
+ mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId);
+ if (!TextUtils.isEmpty(mPhoneNumber)) {
+ mName = Contact.getContact(context, mPhoneNumber);
+ if (mName == null) {
+ mName = mPhoneNumber;
+ }
}
}
- }
-
- if (mName == null) {
- mName = "";
- }
- checkPostion(cursor);
-}
-private void checkPostion(Cursor cursor) {
- // 检查笔记在列表中的位置
- mIsLastItem = cursor.isLast() ? true : false;
- mIsFirstItem = cursor.isFirst() ? true : false;
- mIsOnlyOneItem = (cursor.getCount() == 1);
- mIsMultiNotesFollowingFolder = false;
- mIsOneNoteFollowingFolder = false;
-
- if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {
- // 如果笔记类型为普通笔记且不是第一个笔记
- int position = cursor.getPosition();
- if (cursor.moveToPrevious()) {
- if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER
- || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {
- // 如果上一个笔记类型为文件夹或系统文件夹
- if (cursor.getCount() > (position + 1)) {
- mIsMultiNotesFollowingFolder = true;
- } else {
- mIsOneNoteFollowingFolder = true;
+ if (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");
}
- }
- if (!cursor.moveToNext()) {
- throw new IllegalStateException("cursor move to previous but can't move back");
}
}
}
-}
-
public boolean isOneFollowingFolder() {
return mIsOneNoteFollowingFolder;
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index 6818d7f..64037a9 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -82,6 +82,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
/* 首页背景切换*/
private int mode = -1;
+ public static int secret_mode = 0;
+
private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
private static final int FOLDER_LIST_QUERY_TOKEN = 1;
@@ -122,8 +124,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
private ModeCallback mModeCallBack;
- public static int secret_mode = 0;
-
private static final String TAG = "NotesListActivity";
public static final int NOTES_LISTVIEW_SCROLL_RATE = 30;
@@ -424,7 +424,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
}
else{
- String str1 = "666";
+ String str1 = "520";
String [] PROJECTION = new String [] { //定义一个新的PROJECTION数组，只换掉SNIPPET
NoteColumns.ID,
NoteColumns.ALERTED_DATE,
@@ -829,6 +829,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
menu.findItem(R.id.menu_grass).setVisible(false);
} else if (mode == 1) {
menu.findItem(R.id.menu_playground1).setVisible(false);
+ } else if (mode == 2) {
+ menu.findItem(R.id.menu_car).setVisible(false);
}
if(secret_mode == 1)
menu.findItem(R.id.menu_secret).setVisible(false);
@@ -869,9 +871,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
} else if (itemId == R.id.menu_playground1) {
mode = 1;
getWindow().setBackgroundDrawableResource(R.drawable.playground1);
+ } else if (itemId == R.id.menu_car) {
+ mode = 2;
+ getWindow().setBackgroundDrawableResource(R.drawable.car);
}
- else if (itemId == R.id.menu_secret) { //进入私密模式
- secret_mode = 1;
+ else if (itemId == R.id.menu_secret){ //进入私密模式
AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this);
dialog.setTitle("重要提醒");
dialog.setMessage("您确认进入私密模式吗？");
@@ -879,6 +883,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
+ secret_mode = 1;
startAsyncNotesListQuery();
Toast.makeText(NotesListActivity.this,"您已进入私密模式",Toast.LENGTH_SHORT).show();
}
@@ -892,7 +897,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
Toast.makeText(this,"您已进入私密模式",Toast.LENGTH_SHORT).show();
}
else if (itemId == R.id.menu_quit_secret){ //退出私密模式
- secret_mode = 0;
AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this);
dialog.setTitle("重要提醒");
dialog.setMessage("您确认退出私密模式吗？");
@@ -900,6 +904,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
+ secret_mode = 0;
startAsyncNotesListQuery();
Toast.makeText(NotesListActivity.this,"您已退出私密模式",Toast.LENGTH_SHORT).show();
}
@@ -913,7 +918,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
return true;
}
-
@Override
public boolean onSearchRequested() {
startSearch(null, false, null /* appData */, false);
@@ -1047,5 +1051,4 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
return false;
}
-
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
index 74066b0..51c9cb9 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
@@ -38,13 +38,11 @@ public class NotesListAdapter extends CursorAdapter {
private int mNotesCount;
private boolean mChoiceMode;
- // 静态内部类，用于存储小部件的属性
public static class AppWidgetAttribute {
public int widgetId;
public int widgetType;
};
- // 构造函数，初始化成员变量
public NotesListAdapter(Context context) {
super(context, null);
mSelectedIndex = new HashMap();
@@ -52,13 +50,11 @@ public class NotesListAdapter extends CursorAdapter {
mNotesCount = 0;
}
- // 创建新的NotesListItem视图
@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
return new NotesListItem(context);
}
- // 将数据绑定到视图上
@Override
public void bindView(View view, Context context, Cursor cursor) {
if (view instanceof NotesListItem) {
@@ -68,24 +64,20 @@ public class NotesListAdapter extends CursorAdapter {
}
}
- // 设置指定位置的项的选中状态
public void setCheckedItem(final int position, final boolean checked) {
mSelectedIndex.put(position, checked);
notifyDataSetChanged();
}
- // 判断是否处于选择模式
public boolean isInChoiceMode() {
return mChoiceMode;
}
- // 设置选择模式
public void setChoiceMode(boolean mode) {
mSelectedIndex.clear();
mChoiceMode = mode;
}
- // 选择所有的项
public void selectAll(boolean checked) {
Cursor cursor = getCursor();
for (int i = 0; i < getCount(); i++) {
@@ -97,7 +89,6 @@ public class NotesListAdapter extends CursorAdapter {
}
}
- // 获取选中项的ID集合
public HashSet getSelectedItemIds() {
HashSet itemSet = new HashSet();
for (Integer position : mSelectedIndex.keySet()) {
@@ -114,7 +105,6 @@ public class NotesListAdapter extends CursorAdapter {
return itemSet;
}
- // 获取选中的小部件集合
public HashSet getSelectedWidget() {
HashSet itemSet = new HashSet();
for (Integer position : mSelectedIndex.keySet()) {
@@ -138,7 +128,6 @@ public class NotesListAdapter extends CursorAdapter {
return itemSet;
}
- // 获取选中项的数量
public int getSelectedCount() {
Collection values = mSelectedIndex.values();
if (null == values) {
@@ -154,13 +143,11 @@ public class NotesListAdapter extends CursorAdapter {
return count;
}
- // 判断是否所有项都被选中
public boolean isAllSelected() {
int checkedCount = getSelectedCount();
return (checkedCount != 0 && checkedCount == mNotesCount);
}
- // 判断指定位置的项是否被选中
public boolean isSelectedItem(final int position) {
if (null == mSelectedIndex.get(position)) {
return false;
@@ -168,21 +155,18 @@ public class NotesListAdapter extends CursorAdapter {
return mSelectedIndex.get(position);
}
- // 数据发生变化时更新笔记项的数量
@Override
protected void onContentChanged() {
super.onContentChanged();
calcNotesCount();
}
- // 更改游标时更新笔记项的数量
@Override
public void changeCursor(Cursor cursor) {
super.changeCursor(cursor);
calcNotesCount();
}
- // 计算笔记项的数量
private void calcNotesCount() {
mNotesCount = 0;
for (int i = 0; i < getCount(); i++) {
@@ -198,4 +182,3 @@ public class NotesListAdapter extends CursorAdapter {
}
}
}
-
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java
index 93e1aef..1221e80 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java
@@ -31,25 +31,24 @@ import net.micode.notes.tool.ResourceParser.NoteItemBgResources;
public class NotesListItem extends LinearLayout {
- private ImageView mAlert; // 显示警告图标的ImageView
- private TextView mTitle; // 显示标题的TextView
- private TextView mTime; // 显示时间的TextView
- private TextView mCallName; // 显示呼叫名称的TextView
- private NoteItemData mItemData; // 笔记项的数据
- private CheckBox mCheckBox; // 多选模式下的复选框
+ private ImageView mAlert;
+ private TextView mTitle;
+ private TextView mTime;
+ private TextView mCallName;
+ private NoteItemData mItemData;
+ private CheckBox mCheckBox;
public NotesListItem(Context context) {
super(context);
- inflate(context, R.layout.note_item, this); // 加载note_item布局文件到当前LinearLayout
- mAlert = (ImageView) findViewById(R.id.iv_alert_icon); // 初始化mAlert为布局文件中的ImageView
- mTitle = (TextView) findViewById(R.id.tv_title); // 初始化mTitle为布局文件中的TextView
- mTime = (TextView) findViewById(R.id.tv_time); // 初始化mTime为布局文件中的TextView
- mCallName = (TextView) findViewById(R.id.tv_name); // 初始化mCallName为布局文件中的TextView
- mCheckBox = (CheckBox) findViewById(android.R.id.checkbox); // 初始化mCheckBox为布局文件中的CheckBox
+ inflate(context, R.layout.note_item, this);
+ mAlert = (ImageView) findViewById(R.id.iv_alert_icon);
+ mTitle = (TextView) findViewById(R.id.tv_title);
+ mTime = (TextView) findViewById(R.id.tv_time);
+ mCallName = (TextView) findViewById(R.id.tv_name);
+ mCheckBox = (CheckBox) findViewById(android.R.id.checkbox);
}
public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) {
- // 根据选择模式和数据类型设置复选框的可见性和选中状态
if (choiceMode && data.getType() == Notes.TYPE_NOTE) {
mCheckBox.setVisibility(View.VISIBLE);
mCheckBox.setChecked(checked);
@@ -57,11 +56,8 @@ public class NotesListItem extends LinearLayout {
mCheckBox.setVisibility(View.GONE);
}
- mItemData = data; // 保存数据到成员变量
-
- // 根据数据类型和数据内容设置显示的文本和图标
+ mItemData = data;
if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
- // 如果数据是通话记录文件夹
mCallName.setVisibility(View.GONE);
mAlert.setVisibility(View.VISIBLE);
mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
@@ -69,7 +65,6 @@ public class NotesListItem extends LinearLayout {
+ context.getString(R.string.format_folder_files_count, data.getNotesCount()));
mAlert.setImageResource(R.drawable.call_record);
} else if (data.getParentId() == Notes.ID_CALL_RECORD_FOLDER) {
- // 如果数据是通话记录文件夹的子项
mCallName.setVisibility(View.VISIBLE);
mCallName.setText(data.getCallName());
mTitle.setTextAppearance(context,R.style.TextAppearanceSecondaryItem);
@@ -81,18 +76,15 @@ public class NotesListItem extends LinearLayout {
mAlert.setVisibility(View.GONE);
}
} else {
- // 其他类型的数据
mCallName.setVisibility(View.GONE);
mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
if (data.getType() == Notes.TYPE_FOLDER) {
- // 如果数据是文件夹类型
mTitle.setText(data.getSnippet()
+ context.getString(R.string.format_folder_files_count,
data.getNotesCount()));
mAlert.setVisibility(View.GONE);
} else {
- // 如果数据是笔记类型
mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
if (data.hasAlert()) {
mAlert.setImageResource(R.drawable.clock);
@@ -102,16 +94,14 @@ public class NotesListItem extends LinearLayout {
}
}
}
+ mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
- mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate())); // 设置时间文本
-
- setBackground(data); // 设置背景
+ 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()) {
@@ -122,13 +112,11 @@ public class NotesListItem extends LinearLayout {
setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id));
}
} else {
- // 如果数据是文件夹类型
setBackgroundResource(NoteItemBgResources.getFolderBgRes());
}
}
public NoteItemData getItemData() {
- return mItemData; // 返回笔记项的数据
+ return mItemData;
}
}
-
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
index 655d3b9..07c5f7e 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
@@ -70,269 +70,225 @@ public class NotesPreferenceActivity extends PreferenceActivity {
private boolean mHasAddedAccount;
@Override
-protected void onCreate(Bundle icicle) {
- super.onCreate(icicle);
-
- /* using the app icon for navigation */
- getActionBar().setDisplayHomeAsUpEnabled(true); // 设置ActionBar的导航按钮可见，通常用于返回上一个界面。
-
- addPreferencesFromResource(R.xml.preferences); // 从XML资源文件中加载偏好设置。
-
- mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY); // 获取偏好设置中的PreferenceCategory对象。
-
- mReceiver = new GTaskReceiver(); // 创建一个GTaskReceiver对象，用于接收广播。
-
- IntentFilter filter = new IntentFilter(); // 创建一个IntentFilter对象，用于过滤广播。
-
- filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME); // 添加一个广播动作到IntentFilter中。
-
- registerReceiver(mReceiver, filter); // 注册广播接收器，使其能够接收指定动作的广播。
-
- mOriAccounts = null; // 将mOriAccounts变量设置为null。
-
- View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null); // 通过布局文件`settings_header`创建一个视图对象。
-
- getListView().addHeaderView(header, null, true); // 将创建的视图对象添加为ListView的头部视图。
-}
-
+ protected void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+
+ /* using the app icon for navigation */
+ getActionBar().setDisplayHomeAsUpEnabled(true);
+
+ addPreferencesFromResource(R.xml.preferences);
+ mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);
+ mReceiver = new GTaskReceiver();
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME);
+ registerReceiver(mReceiver, filter);
+
+ mOriAccounts = null;
+ View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null);
+ getListView().addHeaderView(header, null, true);
+ }
@Override
-protected void onResume() {
- super.onResume();
-
- // 如果用户已经添加了一个新的账户，那么就需要自动设置同步账户
- if (mHasAddedAccount) {
- // 获取所有的Google账户，并将其存储在一个数组中
- Account[] accounts = getGoogleAccounts();
- // 如果新账户的数量大于旧账户的数量，说明有新账户添加
- if (mOriAccounts != null && accounts.length > mOriAccounts.length) {
- // 遍历新账户数组，与旧账户数组进行比较
- for (Account accountNew : accounts) {
- boolean found = false;
- for (Account accountOld : mOriAccounts) {
- // 如果找到了相同的账户，将found标志设置为true，并跳出循环
- if (TextUtils.equals(accountOld.name, accountNew.name)) {
- found = true;
+ protected void onResume() {
+ super.onResume();
+
+ // need to set sync account automatically if user has added a new
+ // account
+ if (mHasAddedAccount) {
+ Account[] accounts = getGoogleAccounts();
+ if (mOriAccounts != null && accounts.length > mOriAccounts.length) {
+ for (Account accountNew : accounts) {
+ boolean found = false;
+ for (Account accountOld : mOriAccounts) {
+ if (TextUtils.equals(accountOld.name, accountNew.name)) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ setSyncAccount(accountNew.name);
break;
}
}
- // 如果没有找到相同的账户，就调用setSyncAccount()方法设置同步账户为新账户的名称，并跳出循环
- if (!found) {
- setSyncAccount(accountNew.name);
- break;
- }
}
}
- }
-
- // 刷新用户界面
- refreshUI();
-}
+ refreshUI();
+ }
- @Override
-protected void onDestroy() {
- // 如果广播接收器不为空，则取消注册
- if (mReceiver != null) {
- unregisterReceiver(mReceiver);
+ @Override
+ protected void onDestroy() {
+ if (mReceiver != null) {
+ unregisterReceiver(mReceiver);
+ }
+ super.onDestroy();
}
- super.onDestroy();
-}
-private void loadAccountPreference() {
- // 清空账户类别下的所有偏好设置
- mAccountCategory.removeAll();
-
- // 创建一个Preference对象
- Preference accountPref = new Preference(this);
- final String defaultAccount = getSyncAccountName(this);
- // 设置Preference的标题和摘要
- accountPref.setTitle(getString(R.string.preferences_account_title));
- accountPref.setSummary(getString(R.string.preferences_account_summary));
- // 设置Preference的点击事件监听器
- accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
- public boolean onPreferenceClick(Preference preference) {
- // 如果当前没有正在进行同步操作
- if (!GTaskSyncService.isSyncing()) {
- // 如果默认账户为空，说明是第一次设置账户
- if (TextUtils.isEmpty(defaultAccount)) {
- // 显示选择账户的对话框
- showSelectAccountAlertDialog();
+ private void loadAccountPreference() {
+ mAccountCategory.removeAll();
+
+ Preference accountPref = new Preference(this);
+ final String defaultAccount = getSyncAccountName(this);
+ accountPref.setTitle(getString(R.string.preferences_account_title));
+ accountPref.setSummary(getString(R.string.preferences_account_summary));
+ accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+ public boolean onPreferenceClick(Preference preference) {
+ if (!GTaskSyncService.isSyncing()) {
+ if (TextUtils.isEmpty(defaultAccount)) {
+ // the first time to set account
+ showSelectAccountAlertDialog();
+ } else {
+ // if the account has already been set, we need to promp
+ // user about the risk
+ showChangeAccountConfirmAlertDialog();
+ }
} else {
- // 如果账户已经设置过，需要提示用户风险
- showChangeAccountConfirmAlertDialog();
+ Toast.makeText(NotesPreferenceActivity.this,
+ R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT)
+ .show();
}
- } else {
- // 如果当前正在进行同步操作，显示提示信息
- Toast.makeText(NotesPreferenceActivity.this,
- R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT)
- .show();
+ return true;
}
- return true;
- }
- });
+ });
- // 将Preference添加到账户类别下
- mAccountCategory.addPreference(accountPref);
-}
+ 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);
- private void loadSyncButton() {
- // 获取同步按钮和上次同步时间的视图
- Button syncButton = (Button) findViewById(R.id.preference_sync_button);
- TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
+ // set button state
+ if (GTaskSyncService.isSyncing()) {
+ syncButton.setText(getString(R.string.preferences_button_sync_cancel));
+ syncButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ GTaskSyncService.cancelSync(NotesPreferenceActivity.this);
+ }
+ });
+ } else {
+ syncButton.setText(getString(R.string.preferences_button_sync_immediately));
+ syncButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ GTaskSyncService.startSync(NotesPreferenceActivity.this);
+ }
+ });
+ }
+ syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));
- // 设置按钮状态
- if (GTaskSyncService.isSyncing()) {
- syncButton.setText(getString(R.string.preferences_button_sync_cancel));
- syncButton.setOnClickListener(new View.OnClickListener() {
- public void onClick(View v) {
- // 取消同步操作
- GTaskSyncService.cancelSync(NotesPreferenceActivity.this);
- }
- });
- } else {
- syncButton.setText(getString(R.string.preferences_button_sync_immediately));
- syncButton.setOnClickListener(new View.OnClickListener() {
- public void onClick(View v) {
- // 开始同步操作
- GTaskSyncService.startSync(NotesPreferenceActivity.this);
- }
- });
- }
- // 根据同步账户的名称设置按钮是否可用
- syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));
-
- // 设置上次同步时间
- if (GTaskSyncService.isSyncing()) {
- lastSyncTimeView.setText(GTaskSyncService.getProgressString());
- lastSyncTimeView.setVisibility(View.VISIBLE);
- } else {
- long lastSyncTime = getLastSyncTime(this);
- if (lastSyncTime != 0) {
- lastSyncTimeView.setText(getString(R.string.preferences_last_sync_time,
- DateFormat.format(getString(R.string.preferences_last_sync_time_format),
- lastSyncTime)));
+ // set last sync time
+ if (GTaskSyncService.isSyncing()) {
+ lastSyncTimeView.setText(GTaskSyncService.getProgressString());
lastSyncTimeView.setVisibility(View.VISIBLE);
} else {
- lastSyncTimeView.setVisibility(View.GONE);
+ long lastSyncTime = getLastSyncTime(this);
+ if (lastSyncTime != 0) {
+ lastSyncTimeView.setText(getString(R.string.preferences_last_sync_time,
+ DateFormat.format(getString(R.string.preferences_last_sync_time_format),
+ lastSyncTime)));
+ lastSyncTimeView.setVisibility(View.VISIBLE);
+ } else {
+ lastSyncTimeView.setVisibility(View.GONE);
+ }
}
}
-}
-
-private void refreshUI() {
- // 刷新用户界面
- loadAccountPreference();
- loadSyncButton();
-}
+ private void refreshUI() {
+ loadAccountPreference();
+ loadSyncButton();
+ }
private void showSelectAccountAlertDialog() {
- // 创建对话框构建器
- AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
-
- // 设置对话框标题视图
- View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
- TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
- titleTextView.setText(getString(R.string.preferences_dialog_select_account_title));
- TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
- subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips));
- dialogBuilder.setCustomTitle(titleView);
- dialogBuilder.setPositiveButton(null, null);
-
- // 获取Google账户列表和当前同步账户
- Account[] accounts = getGoogleAccounts();
- String defAccount = getSyncAccountName(this);
-
- mOriAccounts = accounts;
- mHasAddedAccount = false;
-
- if (accounts.length > 0) {
- // 构建单选列表项
- CharSequence[] items = new CharSequence[accounts.length];
- final CharSequence[] itemMapping = items;
- int checkedItem = -1;
- int index = 0;
- for (Account account : accounts) {
- if (TextUtils.equals(account.name, defAccount)) {
- checkedItem = index;
+ AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
+
+ View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
+ TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
+ titleTextView.setText(getString(R.string.preferences_dialog_select_account_title));
+ TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
+ subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips));
+
+ dialogBuilder.setCustomTitle(titleView);
+ dialogBuilder.setPositiveButton(null, null);
+
+ Account[] accounts = getGoogleAccounts();
+ String defAccount = getSyncAccountName(this);
+
+ mOriAccounts = accounts;
+ mHasAddedAccount = false;
+
+ if (accounts.length > 0) {
+ CharSequence[] items = new CharSequence[accounts.length];
+ final CharSequence[] itemMapping = items;
+ int checkedItem = -1;
+ int index = 0;
+ for (Account account : accounts) {
+ if (TextUtils.equals(account.name, defAccount)) {
+ checkedItem = index;
+ }
+ items[index++] = account.name;
}
- items[index++] = account.name;
+ dialogBuilder.setSingleChoiceItems(items, checkedItem,
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ setSyncAccount(itemMapping[which].toString());
+ dialog.dismiss();
+ refreshUI();
+ }
+ });
}
- dialogBuilder.setSingleChoiceItems(items, checkedItem,
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- // 设置同步账户并刷新界面
- setSyncAccount(itemMapping[which].toString());
- dialog.dismiss();
- refreshUI();
- }
- });
- }
- // 设置添加账户的视图
- View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null);
- dialogBuilder.setView(addAccountView);
-
- // 显示对话框
- final AlertDialog dialog = dialogBuilder.show();
- addAccountView.setOnClickListener(new View.OnClickListener() {
- public void onClick(View v) {
- // 标记已添加账户，并打开添加账户的界面
- mHasAddedAccount = true;
- Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");
- intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] {
- "gmail-ls"
- });
- startActivityForResult(intent, -1);
- dialog.dismiss();
- }
- });
-}
+ View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null);
+ dialogBuilder.setView(addAccountView);
-private void showChangeAccountConfirmAlertDialog() {
- // 创建对话框构建器
- AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
-
- // 设置对话框标题视图
- View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
- TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
- titleTextView.setText(getString(R.string.preferences_dialog_change_account_title,
- getSyncAccountName(this)));
- TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
- subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg));
- dialogBuilder.setCustomTitle(titleView);
-
- // 设置对话框选项
- CharSequence[] menuItemArray = new CharSequence[] {
- getString(R.string.preferences_menu_change_account),
- getString(R.string.preferences_menu_remove_account),
- getString(R.string.preferences_menu_cancel)
- };
- dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- if (which == 0) {
- // 显示选择账户的对话框
- showSelectAccountAlertDialog();
- } else if (which == 1) {
- // 移除同步账户并刷新界面
- removeSyncAccount();
- refreshUI();
+ final AlertDialog dialog = dialogBuilder.show();
+ addAccountView.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ mHasAddedAccount = true;
+ Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");
+ intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] {
+ "gmail-ls"
+ });
+ startActivityForResult(intent, -1);
+ dialog.dismiss();
}
- }
- });
- dialogBuilder.show();
-}
+ });
+ }
-private Account[] getGoogleAccounts() {
- // 获取Google账户列表
- AccountManager accountManager = AccountManager.get(this);
- return accountManager.getAccountsByType("com.google");
-}
+ private void showChangeAccountConfirmAlertDialog() {
+ AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
+
+ View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
+ TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
+ titleTextView.setText(getString(R.string.preferences_dialog_change_account_title,
+ getSyncAccountName(this)));
+ TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
+ subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg));
+ dialogBuilder.setCustomTitle(titleView);
+
+ CharSequence[] menuItemArray = new CharSequence[] {
+ getString(R.string.preferences_menu_change_account),
+ getString(R.string.preferences_menu_remove_account),
+ getString(R.string.preferences_menu_cancel)
+ };
+ dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ if (which == 0) {
+ showSelectAccountAlertDialog();
+ } else if (which == 1) {
+ removeSyncAccount();
+ refreshUI();
+ }
+ }
+ });
+ dialogBuilder.show();
+ }
+ private Account[] getGoogleAccounts() {
+ AccountManager accountManager = AccountManager.get(this);
+ return accountManager.getAccountsByType("com.google");
+ }
private void setSyncAccount(String account) {
-/*设置同步账户。它首先检查传入的账户名是否与当前保存的账户名不同，如果不同，则更新SharedPreferences中的账户名。然后，它清除上次同步时间，并在后台线程中清除本地与GTask相关的信息。最后，它显示一个Toast消息，通知用户账户设置成功。*/
if (!getSyncAccountName(this).equals(account)) {
SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = settings.edit();
@@ -383,7 +339,7 @@ private Account[] getGoogleAccounts() {
}
}).start();
}
-//设置上次同步时间
+
public static String getSyncAccountName(Context context) {
SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
Context.MODE_PRIVATE);
@@ -405,7 +361,7 @@ private Account[] getGoogleAccounts() {
}
private class GTaskReceiver extends BroadcastReceiver {
-//广播接收器，用于接收GTask同步服务的广播消息。
+
@Override
public void onReceive(Context context, Intent intent) {
refreshUI();
@@ -414,7 +370,7 @@ private Account[] getGoogleAccounts() {
syncStatus.setText(intent
.getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG));
}
-//它在接收到广播后刷新UI，并根据广播中的信息更新同步状态
+
}
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/SplashActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/SplashActivity.java
index bf13004..7eebe4c 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/SplashActivity.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/SplashActivity.java
@@ -21,9 +21,9 @@ public class SplashActivity extends AppCompatActivity {
@Override
public void run() {
Intent intent=new Intent();
- intent.setClass(SplashActivity.this, LoginActivity.class);
+ intent.setClass(SplashActivity.this, NotesListActivity.class);
startActivity(intent);
finish(); //销毁欢迎页面
- }}, 5000); // 2 秒后跳转}
+ }}, 1000); // 2 秒后跳转}
}
}
\ No newline at end of file
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
index dec46af..ec6f819 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
@@ -33,155 +33,100 @@ import net.micode.notes.ui.NoteEditActivity;
import net.micode.notes.ui.NotesListActivity;
public abstract class NoteWidgetProvider extends AppWidgetProvider {
- public static final String[] PROJECTION = new String[] {
- NoteColumns.ID, // 在查询结果中表示笔记的ID
- NoteColumns.BG_COLOR_ID, // 在查询结果中表示笔记的背景颜色的ID
- NoteColumns.SNIPPET // 在查询结果中表示笔记的摘要
+ public static final String [] PROJECTION = new String [] {
+ NoteColumns.ID,
+ NoteColumns.BG_COLOR_ID,
+ NoteColumns.SNIPPET
};
- public static final int COLUMN_ID = 0; // 笔记ID在PROJECTION数组中的索引
- public static final int COLUMN_BG_COLOR_ID = 1; // 背景颜色ID在PROJECTION数组中的索引
- public static final int COLUMN_SNIPPET = 2; // 笔记摘要在PROJECTION数组中的索引
+ public static final int COLUMN_ID = 0;
+ public static final int COLUMN_BG_COLOR_ID = 1;
+ public static final int COLUMN_SNIPPET = 2;
- private static final String TAG = "NoteWidgetProvider"; // 用于日志的标签，用于在日志中标识来自NoteWidgetProvider的信息
+ private static final String TAG = "NoteWidgetProvider";
@Override
public void onDeleted(Context context, int[] appWidgetIds) {
- // 定义一个 ContentValues 对象用于存储需要更新的数据
ContentValues values = new ContentValues();
-
- // 将无效的小部件 ID（AppWidgetManager.INVALID_APPWIDGET_ID）存入 values
values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
-
- // 遍历 appWidgetIds 数组中的所有小部件 ID
for (int i = 0; i < appWidgetIds.length; i++) {
- /**
- * 获取 ContentResolver 对象并调用 update() 方法更新数据
- * 更新的数据位于 Notes.CONTENT_NOTE_URI 地址下
- * 只更新符合条件 NoteColumns.WIDGET_ID = appWidgetIds[i] 的数据
- * 将 values 中的数据应用于更新的行
- */
- context.getContentResolver().update(
- Notes.CONTENT_NOTE_URI, // 更新的数据位于此 URI 地址下
- values, // 需要更新的数据
- NoteColumns.WIDGET_ID + "=?", // 更新条件：NoteColumns.WIDGET_ID = appWidgetIds[i]
- new String[] { String.valueOf(appWidgetIds[i])} // 更新条件的参数值
- );
+ context.getContentResolver().update(Notes.CONTENT_NOTE_URI,
+ values,
+ NoteColumns.WIDGET_ID + "=?",
+ new String[] { String.valueOf(appWidgetIds[i])});
}
}
private Cursor getNoteWidgetInfo(Context context, int widgetId) {
- /**
- * 使用 ContentResolver 对象调用 query() 方法从 Notes.CONTENT_NOTE_URI 查询数据
- * 查询的列为 PROJECTION 数组所指定的列
- * 查询条件为 NoteColumns.WIDGET_ID = widgetId 和 NoteColumns.PARENT_ID <> Notes.ID_TRASH_FOLER
- * 查询参数为 widgetId 和 Notes.ID_TRASH_FOLER
- * 排序参数为 null
- */
- return context.getContentResolver().query(
- Notes.CONTENT_NOTE_URI, // 查询的数据位于此 URI 地址下
- PROJECTION, // 查询的列为 PROJECTION 数组所指定的列
- NoteColumns.WIDGET_ID + "=? AND " + NoteColumns.PARENT_ID + "<>?", // 查询条件
- new String[]{String.valueOf(widgetId), String.valueOf(Notes.ID_TRASH_FOLER)}, // 查询参数
- null // 排序参数
- );
+ return context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
+ 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() 方法，并传入最后一个参数为 false
- * 这里重载的目的可能是为了提供一个默认的参数值
- */
update(context, appWidgetManager, appWidgetIds, false);
}
private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds,
- boolean privacyMode) {
- // 遍历 appWidgetIds 数组
+ boolean privacyMode) {
for (int i = 0; i < appWidgetIds.length; i++) {
- // 如果 appWidgetIds[i] 不等于无效的 appWidgetId
if (appWidgetIds[i] != AppWidgetManager.INVALID_APPWIDGET_ID) {
- // 获取默认背景 id
int bgId = ResourceParser.getDefaultBgId(context);
- // 默认片段为空字符串
String snippet = "";
- // 创建一个 Intent 对象，并指定其目标为 NoteEditActivity 类
Intent intent = new Intent(context, NoteEditActivity.class);
- // 设置 Intent 的标志为 Intent.FLAG_ACTIVITY_SINGLE_TOP
intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
- // 将 appWidgetIds[i] 作为额外的 widgetId 传递给 Intent
intent.putExtra(Notes.INTENT_EXTRA_WIDGET_ID, appWidgetIds[i]);
- // 将 widgetType 传递给 Intent
intent.putExtra(Notes.INTENT_EXTRA_WIDGET_TYPE, getWidgetType());
- // 调用 getNoteWidgetInfo() 方法查询与当前 widgetId 关联的便签数据
Cursor c = getNoteWidgetInfo(context, appWidgetIds[i]);
- // 判断查询结果是否为 null 且是否有数据
if (c != null && c.moveToFirst()) {
- // 如果查询结果数量大于 1，则输出错误日志并关闭 Cursor 并返回
if (c.getCount() > 1) {
Log.e(TAG, "Multiple message with same widget id:" + appWidgetIds[i]);
c.close();
return;
}
- // 获取片段内容
snippet = c.getString(COLUMN_SNIPPET);
- // 获取背景颜色 id
bgId = c.getInt(COLUMN_BG_COLOR_ID);
- // 将便签的 ID 传递给 Intent
intent.putExtra(Intent.EXTRA_UID, c.getLong(COLUMN_ID));
- // 设置 Action 为 ACTION_VIEW
intent.setAction(Intent.ACTION_VIEW);
} else {
- // 如果查询结果为空，则设置片段内容为默认的提示语
snippet = context.getResources().getString(R.string.widget_havenot_content);
- // 设置 Action 为 ACTION_INSERT_OR_EDIT
intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
}
- // 关闭 Cursor
if (c != null) {
c.close();
}
- // 创建 RemoteViews 对象，并设置其布局资源 ID
RemoteViews rv = new RemoteViews(context.getPackageName(), getLayoutId());
- // 设置 RemoteViews 中的 ImageView 的资源 ID
rv.setImageViewResource(R.id.widget_bg_image, getBgResourceId(bgId));
- // 将背景颜色 id 作为额外的参数传递给 Intent
intent.putExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, bgId);
-
/**
- * 生成用于启动 widget 宿主的 PendingIntent
+ * Generate the pending intent to start host for the widget
*/
PendingIntent pendingIntent = null;
- // 如果处于隐私模式下
if (privacyMode) {
- // 设置 RemoteViews 中的 TextView 的文本为隐私模式提示语
rv.setTextViewText(R.id.widget_text,
context.getString(R.string.widget_under_visit_mode));
- // 创建用于启动 NotesListActivity 的 PendingIntent
pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], new Intent(
context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
} else {
- // 如果不处于隐私模式下，则设置 RemoteViews 中的 TextView 的文本为片段内容
rv.setTextViewText(R.id.widget_text, snippet);
- // 创建用于启动 NoteEditActivity 的 PendingIntent
pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], intent,
PendingIntent.FLAG_UPDATE_CURRENT);
}
- // 设置 RemoteViews 中的 TextView 的点击事件为 pendingIntent
rv.setOnClickPendingIntent(R.id.widget_text, pendingIntent);
- // 更新 appWidgetManager 中对应 appWidgetId 的 widget
appWidgetManager.updateAppWidget(appWidgetIds[i], rv);
}
}
}
- protected abstract int getBgResourceId(int bgId);//根据给定的背景 ID 返回对应的背景资源 ID
+ protected abstract int getBgResourceId(int bgId);
- protected abstract int getLayoutId();//返回当前小部件的布局资源 ID。
+ protected abstract int getLayoutId();
- protected abstract int getWidgetType();//返回当前小部件的类型。
+ protected abstract int getWidgetType();
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
index 1ec1d51..adcb2f7 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
@@ -26,25 +26,21 @@ import net.micode.notes.tool.ResourceParser;
public class NoteWidgetProvider_2x extends NoteWidgetProvider {
@Override
- //重写了父类的onUpdate()方法，并且在方法中调用了父类的update()方法。
public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
super.update(context, appWidgetManager, appWidgetIds);
}
@Override
- //重写getLayoutId()方法，它返回R.layout.widget_2x，指定了当前小部件所使用的布局资源ID。
protected int getLayoutId() {
return R.layout.widget_2x;
}
@Override
- //重写getBgResourceId()方法，它接收一个背景ID参数，然后调用ResourceParser.WidgetBgResources.getWidget2xBgResource()方法来返回对应背景ID的资源ID。
protected int getBgResourceId(int bgId) {
return ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId);
}
@Override
- //重写的getWidgetType()方法，它返回Notes.TYPE_WIDGET_2X，指定了当前小部件的类型。
protected int getWidgetType() {
return Notes.TYPE_WIDGET_2X;
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
index cee1a6c..c12a02e 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
@@ -26,23 +26,20 @@ import net.micode.notes.tool.ResourceParser;
public class NoteWidgetProvider_4x extends NoteWidgetProvider {
@Override
- //重写父类NoteWidgetProvider中的onUpdate方法，使用了super关键字调用了父类的update方法。
public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
super.update(context, appWidgetManager, appWidgetIds);
}
- //非重写的getLayoutId方法，返回了R.layout.widget_4x，指定了当前小部件所使用的布局资源ID。
+
protected int getLayoutId() {
return R.layout.widget_4x;
}
@Override
- //重写了父类NoteWidgetProvider中的getBgResourceId方法，根据bgId调用了ResourceParser.WidgetBgResources.getWidget4xBgResource方法，返回对应背景ID的资源ID。
protected int getBgResourceId(int bgId) {
return ResourceParser.WidgetBgResources.getWidget4xBgResource(bgId);
}
@Override
- //重写父类NoteWidgetProvider中的getWidgetType方法，返回了Notes.TYPE_WIDGET_4X，指定了当前小部件的类型。
protected int getWidgetType() {
return Notes.TYPE_WIDGET_4X;
}
diff --git a/src/Notes-master1/app/src/main/res/layout/activity_login.xml b/src/Notes-master1/app/src/main/res/layout/activity_login.xml
index f88ecc1..8f8fd4a 100644
--- a/src/Notes-master1/app/src/main/res/layout/activity_login.xml
+++ b/src/Notes-master1/app/src/main/res/layout/activity_login.xml
@@ -17,7 +17,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textSize="18sp"
- android:text="@string/prompt_accounts" />
+ android:text="@string/prompt_account" />
+ - %1$s 条符合“%2$s”的搜索结果
+
私密模式
退出私密模式
- 用户
+ 账户
密码
登录
退出
- 取消
- App has already quitted
- Loading
- Invalid
-
- - %1$s 条符合“%2$s”的搜索结果
-
- Login_Activity
- Dummy Button
- 欢迎使用！
- 账户]]>
- SplashActivity
-
+ Your app has already quit.
+ Loading...
+ Invalid account or password.
diff --git a/src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml b/src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml
index d337a2e..c96e3fb 100644
--- a/src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml
+++ b/src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml
@@ -119,23 +119,17 @@
便籤中的文字
便籤
設置
+ 取消
+
+ - %1$s 條符合”%2$s“的搜尋結果
+
私密模式
退出私密模式
- 用户
+ 账户
密码
登录
退出
- 取消
- App has already quitted
- Loading
- Invalid
-
- - %1$s 條符合”%2$s“的搜尋結果
-
- Login_Activity
- Dummy Button
- 欢迎使用！
- 账户]]>
- SplashActivity
-
+ Your app has already quit.
+ Loading...
+ Invalid account or password.
diff --git a/src/Notes-master1/app/src/main/res/values/strings.xml b/src/Notes-master1/app/src/main/res/values/strings.xml
index 2329873..aab35d1 100644
--- a/src/Notes-master1/app/src/main/res/values/strings.xml
+++ b/src/Notes-master1/app/src/main/res/values/strings.xml
@@ -43,6 +43,7 @@
Background:lanyangyang
Background:grass
Background:playground1
+ Background:car
(%d)
New Folder
@@ -130,26 +131,23 @@
Text in your notes
Notes
set
- 私密模式
- 退出私密模式
- 用户
- 密码
- 登录
- 退出
- Cancel
- App has already quitted
- Loading
- Invalid
+ cancel
- %1$s result for \"%2$s\"
- %1$s results for \"%2$s\"
-
- Login_Activity
+ 私密模式
+ 退出私密模式
+ LoginActivity
Dummy Button
- 欢迎使用！
- 账户]]>
+ DUMMY\nCONTENT
+ 账户
+ 密码
+ 登录
+ 退出
+ Your app has already quit.
+ Loading...
+ Invalid account or password.
SplashActivity
-
diff --git a/src/Notes-master1/build.gradle b/src/Notes-master1/build.gradle
index 004e2d0..5c8fc4a 100644
--- a/src/Notes-master1/build.gradle
+++ b/src/Notes-master1/build.gradle
@@ -5,7 +5,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:8.1.2'
+ classpath 'com.android.tools.build:gradle:8.0.0'
}
}