Merge remote-tracking branch 'origin/master' into lhn

app/src/main/AndroidManifest.xml

@@ -20,8 +20,9 @@
     android:versionCode="1"
     android:versionName="0.1" >
 
+    <!-- 运行该应用所需SDK版本声明 -->
     <uses-sdk android:minSdkVersion="14" />
-
+    <!-- APP所需权限申请 -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -32,11 +33,13 @@
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
+    <!-- 应用图标和应用名称 -->
     <application
         android:icon="@drawable/icon_app"
         android:label="@string/app_name" >
+        <!-- 活动声明 -->
         <activity
-            android:name=".ui.NotesListActivity"
+            android:name=".ui.activities.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
@@ -51,7 +54,7 @@
         </activity>
 
         <activity
-            android:name=".ui.NoteEditActivity"
+            android:name=".ui.activities.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme" >
@@ -80,11 +83,12 @@
                 android:resource="@xml/searchable" />
         </activity>
 
+        <!-- 内容提供者程序声明 -->
         <provider
             android:name="net.micode.notes.data.NotesProvider"
             android:authorities="micode_notes"
             android:multiprocess="true" />
-
+        <!-- 内容访问者程序声明 -->
         <receiver
             android:name=".widget.NoteWidgetProvider_2x"
             android:label="@string/app_widget2x2" >
@@ -125,14 +129,14 @@
         </receiver>
 
         <activity
-            android:name=".ui.AlarmAlertActivity"
+            android:name=".ui.activities.AlarmAlertActivity"
             android:label="@string/app_name"
             android:launchMode="singleInstance"
             android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
         </activity>
 
         <activity
-            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+            android:name="net.micode.notes.ui.activities.NotesPreferenceActivity"
             android:label="@string/preferences_title"
             android:launchMode="singleTop"
             android:theme="@android:style/Theme.Holo.Light" >

app/src/main/java/net/micode/notes/data/Notes.java

@@ -17,6 +17,7 @@
 package net.micode.notes.data;
 
 import android.net.Uri;
+
 public class Notes {
     public static final String AUTHORITY = "micode_notes";
     public static final String TAG = "Notes";

app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java

@@ -25,8 +25,8 @@ import android.content.Intent;
 import android.os.AsyncTask;
 
 import net.micode.notes.R;
-import net.micode.notes.ui.NotesListActivity;
+import net.micode.notes.ui.activities.NotesListActivity;
-import net.micode.notes.ui.NotesPreferenceActivity;
+import net.micode.notes.ui.activities.NotesPreferenceActivity;
 
 
 public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {

app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java

@@ -30,7 +30,7 @@ import net.micode.notes.gtask.data.TaskList;
 import net.micode.notes.gtask.exception.ActionFailureException;
 import net.micode.notes.gtask.exception.NetworkFailureException;
 import net.micode.notes.tool.GTaskStringUtils;
-import net.micode.notes.ui.NotesPreferenceActivity;
+import net.micode.notes.ui.activities.NotesPreferenceActivity;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;

app/src/main/java/net/micode/notes/model/Note.java

@@ -15,6 +15,7 @@
  */
 
 package net.micode.notes.model;
+
 import android.content.ContentProviderOperation;
 import android.content.ContentProviderResult;
 import android.content.ContentUris;
@@ -38,6 +39,7 @@ public class Note {
     private ContentValues mNoteDiffValues;
     private NoteData mNoteData;
     private static final String TAG = "Note";
+
     /**
      * Create a new note id for adding a new note to databases
      */

app/src/main/java/net/micode/notes/model/WorkingNote.java

@@ -360,6 +360,7 @@ public class WorkingNote {
 
         /**
          * Call when switch between check list mode and normal mode
+         *
          * @param oldMode is previous mode before change
          * @param newMode is new mode
          */

app/src/main/java/net/micode/notes/tool/DataUtils.java

@@ -37,6 +37,7 @@ import java.util.HashSet;
 
 public class DataUtils {
     public static final String TAG = "DataUtils";
+
     public static boolean batchDeleteNotes(ContentResolver resolver, HashSet<Long> ids) {
         if (ids == null) {
             Log.d(TAG, "the ids is null");

app/src/main/java/net/micode/notes/tool/ResourceParser.java

@@ -20,7 +20,7 @@ import android.content.Context;
 import android.preference.PreferenceManager;
 
 import net.micode.notes.R;
-import net.micode.notes.ui.NotesPreferenceActivity;
+import net.micode.notes.ui.activities.NotesPreferenceActivity;
 
 public class ResourceParser {
 

app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java

@@ -27,9 +27,13 @@ import android.database.Cursor;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 
-
+/**
+ * 闹钟传回的初始化信息接收者
+ * 在设置闹钟之后该活动类会接受来自闹钟系统传回的消息并进行相关处理
+ */
 public class AlarmInitReceiver extends BroadcastReceiver {
 
+    // 数据格式封包
     private static final String[] PROJECTION = new String[]{
             NoteColumns.ID,
             NoteColumns.ALERTED_DATE
@@ -38,6 +42,7 @@ public class AlarmInitReceiver extends BroadcastReceiver {
     private static final int COLUMN_ID = 0;
     private static final int COLUMN_ALERTED_DATE = 1;
 
+    // 接收到闹钟应用的广播后执行该方法
     @Override
     public void onReceive(Context context, Intent intent) {
         long currentDate = System.currentTimeMillis();

app/src/main/java/net/micode/notes/ui/AlarmReceiver.java

@@ -20,6 +20,12 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
+import net.micode.notes.ui.activities.AlarmAlertActivity;
+
+/**
+ * 闹钟广播消息的接收者
+ * 根据消息内容发起 Intent 调用
+ */
 public class AlarmReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {

app/src/main/java/net/micode/notes/ui/DateTimePicker.java

@@ -28,10 +28,18 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.NumberPicker;
 
+/**
+ * 日期选择器，是 [FrameLayout] 的子类
+ */
 public class DateTimePicker extends FrameLayout {
 
     private static final boolean DEFAULT_ENABLE_STATE = true;
 
+    /**
+     * 常量声明，包含一些数值范围等
+     * 例如小时可选范围为0~23小时
+     * 分钟可选范围为0~59分钟
+     */
     private static final int HOURS_IN_HALF_DAY = 12;
     private static final int HOURS_IN_ALL_DAY = 24;
     private static final int DAYS_IN_ALL_WEEK = 7;
@@ -46,25 +54,59 @@ public class DateTimePicker extends FrameLayout {
     private static final int AMPM_SPINNER_MIN_VAL = 0;
     private static final int AMPM_SPINNER_MAX_VAL = 1;
 
+    /**
+     * 天数选择器
+     */
     private final NumberPicker mDateSpinner;
+    /**
+     * 时间选择器
+     */
     private final NumberPicker mHourSpinner;
+    /**
+     * 分钟选择器
+     */
     private final NumberPicker mMinuteSpinner;
+    /**
+     * AM / PM 早晚选择器
+     */
     private final NumberPicker mAmPmSpinner;
+    /**
+     * 日期实例对象
+     */
     private Calendar mDate;
-
+    /**
+     * 日期显示的数值
+     */
     private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK];
-
+    /**
+     * 是否是早晨
+     */
     private boolean mIsAm;
-
+    /**
+     * 是否是24小时制
+     */
     private boolean mIs24HourView;
-
+    /**
+     * 是否启用
+     */
     private boolean mIsEnabled = DEFAULT_ENABLE_STATE;
-
+    /**
+     * 是否正在初始化中
+     */
     private boolean mInitialising;
-
+    /**
+     * 日期变更监听器
+     */
     private OnDateTimeChangedListener mOnDateTimeChangedListener;
-
+    /**
-    private NumberPicker.OnValueChangeListener mOnDateChangedListener = new NumberPicker.OnValueChangeListener() {
+     * 数值改变监听器
+     * <p>
+     * 在数值更改时同步修改 mDate 的数值
+     * 并刷新选择器的数值
+     * 触发时间改变监听器
+     */
+    private NumberPicker.OnValueChangeListener mOnDateChangedListener =
+            new NumberPicker.OnValueChangeListener() {
                 @Override
                 public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
                     mDate.add(Calendar.DAY_OF_YEAR, newVal - oldVal);
@@ -72,7 +114,12 @@ public class DateTimePicker extends FrameLayout {
                     onDateTimeChanged();
                 }
             };
-
+    /**
+     * 数值改变监听器
+     * <p>
+     * 在数值改变时传入选择器对象和操作前与操作后的数值
+     * 对数值进行具体的分析
+     */
     private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() {
         @Override
         public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
@@ -114,7 +161,9 @@ public class DateTimePicker extends FrameLayout {
             }
         }
     };
-
+    /**
+     * 分钟改变监听器
+     */
     private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() {
         @Override
         public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
@@ -143,7 +192,10 @@ public class DateTimePicker extends FrameLayout {
             onDateTimeChanged();
         }
     };
-
+    /**
+     * 早晚变更的监听器
+     * 在选择AM / PM的时候通知监听器触发方法
+     */
     private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() {
         @Override
         public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
@@ -342,6 +394,7 @@ public class DateTimePicker extends FrameLayout {
 
     /**
      * Get current hour in 24 hour mode, in the range (0~23)
+     *
      * @return The current hour in 24 hour mode
      */
     public int getCurrentHourOfDay() {
@@ -470,16 +523,26 @@ public class DateTimePicker extends FrameLayout {
 
     /**
      * Set the callback that indicates the 'Set' button has been pressed.
+     *
      * @param callback the callback, if null will do nothing
      */
     public void setOnDateTimeChangedListener(OnDateTimeChangedListener callback) {
         mOnDateTimeChangedListener = callback;
     }
 
+    /**
+     * 在日期时间改变时调用该方法
+     * 如果日期时间改变监听器为空则不处理
+     * 不为空则调用监听器的方法
+     */
     private void onDateTimeChanged() {
-        if (mOnDateTimeChangedListener != null) {
+        if (mOnDateTimeChangedListener == null) return;
-            mOnDateTimeChangedListener.onDateTimeChanged(this, getCurrentYear(),
+        mOnDateTimeChangedListener.onDateTimeChanged(this,
-                    getCurrentMonth(), getCurrentDay(), getCurrentHourOfDay(), getCurrentMinute());
+                getCurrentYear(),
-        }
+                getCurrentMonth(),
+                getCurrentDay(),
+                getCurrentHourOfDay(),
+                getCurrentMinute()
+        );
     }
 }

app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java

@@ -29,6 +29,12 @@ import android.content.DialogInterface.OnClickListener;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 
+/**
+ * 日期选择器 界面
+ * 将用户交互与日期选择器数据类对接
+ * 并保存了一些基础信息，如当前日期、是否为24小时格式等
+ * 也注册了相应的事件监听器
+ */
 public class DateTimePickerDialog extends AlertDialog implements OnClickListener {
 
     private Calendar mDate = Calendar.getInstance();
@@ -36,10 +42,11 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
     private OnDateTimeSetListener mOnDateTimeSetListener;
     private DateTimePicker mDateTimePicker;
 
+    // 为什么要在类里面声明公开接口还在其他类中使用？这样做并不规范
     public interface OnDateTimeSetListener {
         void OnDateTimeSet(AlertDialog dialog, long date);
     }
-
+    // 构造方法
     public DateTimePickerDialog(Context context, long date) {
         super(context);
         mDateTimePicker = new DateTimePicker(context);
@@ -63,15 +70,15 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
         set24HourView(DateFormat.is24HourFormat(this.getContext()));
         updateTitle(mDate.getTimeInMillis());
     }
-
+    // 设置为 24 小时的日期显示格式
     public void set24HourView(boolean is24HourView) {
         mIs24HourView = is24HourView;
     }
-
+    // 初始化 OnDateTimeSetListener 监听器
     public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) {
         mOnDateTimeSetListener = callBack;
     }
-
+    // 更新弹出窗口标题
     private void updateTitle(long date) {
         int flag =
                 DateUtils.FORMAT_SHOW_YEAR |
@@ -80,9 +87,10 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
         flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR;
         setTitle(DateUtils.formatDateTime(this.getContext(), date, flag));
     }
-
+    @Override
     public void onClick(DialogInterface arg0, int arg1) {
         if (mOnDateTimeSetListener != null) {
+            // onClick 委托至 OnDateTimeSetListener
             mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis());
         }
     }

app/src/main/java/net/micode/notes/ui/DropdownMenu.java

@@ -27,9 +27,16 @@ import android.widget.PopupMenu.OnMenuItemClickListener;
 
 import net.micode.notes.R;
 
+/**
+ * 下拉菜单的数据类
+ * 并封装了一个下拉菜单内容选定事件监听器
+ */
 public class DropdownMenu {
+    // 菜单按钮
     private Button mButton;
+    // 弹出菜单
     private PopupMenu mPopupMenu;
+    // 菜单
     private Menu mMenu;
 
     public DropdownMenu(Context context, Button button, int menuId) {
@@ -44,17 +51,17 @@ public class DropdownMenu {
             }
         });
     }
-
+    // 绑定监听器
     public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) {
         if (mPopupMenu != null) {
             mPopupMenu.setOnMenuItemClickListener(listener);
         }
     }
-
+    // 根据id获取MenuItem
     public MenuItem findItem(int id) {
         return mMenu.findItem(id);
     }
-
+    // 设置菜单按钮的文本
     public void setTitle(CharSequence title) {
         mButton.setText(title);
     }

app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java

@@ -28,7 +28,9 @@ import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 
-
+/**
+ * 文件列表适配器
+ */
 public class FoldersListAdapter extends CursorAdapter {
     public static final String[] PROJECTION = {
             NoteColumns.ID,
@@ -43,11 +45,24 @@ public class FoldersListAdapter extends CursorAdapter {
         // TODO Auto-generated constructor stub
     }
 
+    /**
+     * 创建新视图
+     * @param context   上下文
+     * @param cursor    数据库指针
+     * @param parent    父视图
+     * @return View     视图对象
+     */
     @Override
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
         return new FolderListItem(context);
     }
 
+    /**
+     * 视图绑定方法
+     * @param view      视图
+     * @param context   上下文
+     * @param cursor    数据库指针
+     */
     @Override
     public void bindView(View view, Context context, Cursor cursor) {
         if (view instanceof FolderListItem) {
@@ -56,14 +71,20 @@ public class FoldersListAdapter extends CursorAdapter {
             ((FolderListItem) view).bind(folderName);
         }
     }
-
+    /**
+     * 获取文件夹名称
+      */
     public String getFolderName(Context context, int position) {
         Cursor cursor = (Cursor) getItem(position);
         return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
                 .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
     }
 
+    /**
+     * 文件列表中的子项
+     */
     private class FolderListItem extends LinearLayout {
+        // 保存文件名
         private TextView mName;
 
         public FolderListItem(Context context) {
@@ -71,7 +92,7 @@ public class FoldersListAdapter extends CursorAdapter {
             inflate(context, R.layout.folder_list_item, this);
             mName = (TextView) findViewById(R.id.tv_folder_name);
         }
-
+        // 设置文件名
         public void bind(String name) {
             mName.setText(name);
         }

app/src/main/java/net/micode/notes/ui/NoteEditText.java

@@ -33,10 +33,15 @@ import android.view.MotionEvent;
 import android.widget.EditText;
 
 import net.micode.notes.R;
+import net.micode.notes.ui.activities.NoteEditActivity;
 
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * 笔记编辑控件
+ * 扩展了默认控件的一些基础功能
+ */
 public class NoteEditText extends EditText {
     private static final String TAG = "NoteEditText";
     private int mIndex;
@@ -46,7 +51,8 @@ public class NoteEditText extends EditText {
     private static final String SCHEME_HTTP = "http:";
     private static final String SCHEME_EMAIL = "mailto:";
 
-    private static final Map<String, Integer> sSchemaActionResMap = new HashMap<String, Integer>();
+    private static final Map<String, Integer> sSchemaActionResMap = new HashMap<>();
+    // 静态初始化
     static {
         sSchemaActionResMap.put(SCHEME_TEL, R.string.note_link_tel);
         sSchemaActionResMap.put(SCHEME_HTTP, R.string.note_link_web);
@@ -74,22 +80,32 @@ public class NoteEditText extends EditText {
          */
         void onTextChange(int index, boolean hasText);
     }
-
+    /**
+     * 文本视图改变事件监听器
+      */
     private OnTextViewChangeListener mOnTextViewChangeListener;
-
+    /**
+     * 构造器
+      */
     public NoteEditText(Context context) {
         super(context, null);
         mIndex = 0;
     }
-
+    /**
+     * 设置索引值
+      */
     public void setIndex(int index) {
         mIndex = index;
     }
-
+    /**
+    * 绑定 文本视图改变事件监听器
+     */
     public void setOnTextViewChangeListener(OnTextViewChangeListener listener) {
         mOnTextViewChangeListener = listener;
     }
-
+    /**
+     * 构造器
+      */
     public NoteEditText(Context context, AttributeSet attrs) {
         super(context, attrs, android.R.attr.editTextStyle);
     }
@@ -99,6 +115,9 @@ public class NoteEditText extends EditText {
         // TODO Auto-generated constructor stub
     }
 
+    /**
+     * 点击事件
+     */
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         switch (event.getAction()) {
@@ -121,6 +140,12 @@ public class NoteEditText extends EditText {
         return super.onTouchEvent(event);
     }
 
+    /**
+     * 按下键
+     * @param keyCode   按键对应编码
+     * @param event     键盘事件
+     * @return boolean  是否成功处理
+     */
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         switch (keyCode) {
@@ -138,6 +163,12 @@ public class NoteEditText extends EditText {
         return super.onKeyDown(keyCode, event);
     }
 
+    /**
+     * 松开键
+     * @param keyCode   键对应编码
+     * @param event     键盘事件
+     * @return          是否处理成功
+     */
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         switch (keyCode) {
@@ -167,6 +198,12 @@ public class NoteEditText extends EditText {
         return super.onKeyUp(keyCode, event);
     }
 
+    /**
+     * 焦点事件改变
+     * @param focused   改变的结果是对焦还是失焦
+     * @param direction 方向
+     * @param previouslyFocusedRect 上一个聚焦的区域
+     */
     @Override
     protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
         if (mOnTextViewChangeListener != null) {
@@ -179,6 +216,10 @@ public class NoteEditText extends EditText {
         super.onFocusChanged(focused, direction, previouslyFocusedRect);
     }
 
+    /**
+     * 菜单内容初始化
+     * @param menu  菜单
+     */
     @Override
     protected void onCreateContextMenu(ContextMenu menu) {
         if (getText() instanceof Spanned) {

app/src/main/java/net/micode/notes/ui/NoteItemData.java

@@ -24,10 +24,14 @@ import net.micode.notes.data.Contact;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.tool.DataUtils;
+import net.micode.notes.ui.activities.NoteEditActivity;
 
-
+/**
+ * 便签列表子项
+ * 存储许多便签有关的数据
+ */
 public class NoteItemData {
-    static final String [] PROJECTION = new String [] {
+    public static final String[] PROJECTION = new String[]{
             NoteColumns.ID,
             NoteColumns.ALERTED_DATE,
             NoteColumns.BG_COLOR_ID,
@@ -81,7 +85,7 @@ public class NoteItemData {
         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;
+        mHasAttachment = cursor.getInt(HAS_ATTACHMENT_COLUMN) > 0;
         mModifiedDate = cursor.getLong(MODIFIED_DATE_COLUMN);
         mNotesCount = cursor.getInt(NOTES_COUNT_COLUMN);
         mParentId = cursor.getLong(PARENT_ID_COLUMN);
@@ -110,8 +114,8 @@ public class NoteItemData {
     }
 
     private void checkPostion(Cursor cursor) {
-        mIsLastItem = cursor.isLast() ? true : false;
+        mIsLastItem = cursor.isLast();
-        mIsFirstItem = cursor.isFirst() ? true : false;
+        mIsFirstItem = cursor.isFirst();
         mIsOnlyOneItem = (cursor.getCount() == 1);
         mIsMultiNotesFollowingFolder = false;
         mIsOneNoteFollowingFolder = false;

app/src/main/java/net/micode/notes/ui/NotesListAdapter.java

@@ -30,7 +30,9 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 
-
+/**
+ * 便签列表适配器
+ */
 public class NotesListAdapter extends CursorAdapter {
     private static final String TAG = "NotesListAdapter";
     private Context mContext;
@@ -38,23 +40,45 @@ public class NotesListAdapter extends CursorAdapter {
     private int mNotesCount;
     private boolean mChoiceMode;
 
+    /**
+     * APP页面属性类
+     */
     public static class AppWidgetAttribute {
         public int widgetId;
         public int widgetType;
-    };
+    }
+
+    ;
 
+    /**
+     * 构造器
+     * @param context 便签列表上下文环境
+     */
     public NotesListAdapter(Context context) {
         super(context, null);
-        mSelectedIndex = new HashMap<Integer, Boolean>();
+        mSelectedIndex = new HashMap<>();
         mContext = context;
         mNotesCount = 0;
     }
 
+    /**
+     * 新建便签列表视图的方法
+     * @param context   上下文环境
+     * @param cursor    数据库指针
+     * @param parent    视图父类
+     * @return
+     */
     @Override
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
         return new NotesListItem(context);
     }
 
+    /**
+     * 视图绑定
+     * @param view      视图
+     * @param context   上下文
+     * @param cursor    数据库指针
+     */
     @Override
     public void bindView(View view, Context context, Cursor cursor) {
         if (view instanceof NotesListItem) {
@@ -64,20 +88,37 @@ public class NotesListAdapter extends CursorAdapter {
         }
     }
 
+    /**
+     * 设置子项选中状态
+     * @param position  子项的索引
+     * @param checked   是否选中
+     */
     public void setCheckedItem(final int position, final boolean checked) {
         mSelectedIndex.put(position, checked);
         notifyDataSetChanged();
     }
 
+    /**
+     * 是否在决策模式
+     * @return  结果
+     */
     public boolean isInChoiceMode() {
         return mChoiceMode;
     }
 
+    /**
+     * 设置决策模式是否启用
+     * @param mode  是否启用
+     */
     public void setChoiceMode(boolean mode) {
         mSelectedIndex.clear();
         mChoiceMode = mode;
     }
 
+    /**
+     * 选择全部便签
+     * @param checked   选中/取消选择
+     */
     public void selectAll(boolean checked) {
         Cursor cursor = getCursor();
         for (int i = 0; i < getCount(); i++) {
@@ -89,6 +130,10 @@ public class NotesListAdapter extends CursorAdapter {
         }
     }
 
+    /**
+     * 获取当前选定的所有标签项的Id
+     * @return
+     */
     public HashSet<Long> getSelectedItemIds() {
         HashSet<Long> itemSet = new HashSet<Long>();
         for (Integer position : mSelectedIndex.keySet()) {
@@ -105,6 +150,9 @@ public class NotesListAdapter extends CursorAdapter {
         return itemSet;
     }
 
+    /**
+     * 获取选中的界面
+     */
     public HashSet<AppWidgetAttribute> getSelectedWidget() {
         HashSet<AppWidgetAttribute> itemSet = new HashSet<AppWidgetAttribute>();
         for (Integer position : mSelectedIndex.keySet()) {
@@ -128,6 +176,10 @@ public class NotesListAdapter extends CursorAdapter {
         return itemSet;
     }
 
+    /**
+     * 获取当前选中的数量
+     * @return 数量
+     */
     public int getSelectedCount() {
         Collection<Boolean> values = mSelectedIndex.values();
         if (null == values) {
@@ -143,11 +195,20 @@ public class NotesListAdapter extends CursorAdapter {
         return count;
     }
 
+    /**
+     * 标签是否全部选中
+     * @return 是否全选
+     */
     public boolean isAllSelected() {
         int checkedCount = getSelectedCount();
         return (checkedCount != 0 && checkedCount == mNotesCount);
     }
 
+    /**
+     * 是否选择了指定索引的便签项
+     * @param position
+     * @return
+     */
     public boolean isSelectedItem(final int position) {
         if (null == mSelectedIndex.get(position)) {
             return false;
@@ -155,18 +216,28 @@ public class NotesListAdapter extends CursorAdapter {
         return mSelectedIndex.get(position);
     }
 
+    /**
+     * 在内容改变时调用该方法重新计算便签数量
+     */
     @Override
     protected void onContentChanged() {
         super.onContentChanged();
         calcNotesCount();
     }
 
+    /**
+     * 修改数据库指针然后重新计算标签项
+     * @param cursor    新的指针
+     */
     @Override
     public void changeCursor(Cursor cursor) {
         super.changeCursor(cursor);
         calcNotesCount();
     }
 
+    /**
+     * 计算便签数量
+     */
     private void calcNotesCount() {
         mNotesCount = 0;
         for (int i = 0; i < getCount(); i++) {

app/src/main/java/net/micode/notes/ui/NotesListItem.java

@@ -29,7 +29,10 @@ import net.micode.notes.data.Notes;
 import net.micode.notes.tool.DataUtils;
 import net.micode.notes.tool.ResourceParser.NoteItemBgResources;
 
-
+/**
+ * 便签项子类
+ * 存储便签列表中便签的状态
+ */
 public class NotesListItem extends LinearLayout {
     private ImageView mAlert;
     private TextView mTitle;
@@ -99,6 +102,10 @@ public class NotesListItem extends LinearLayout {
         setBackground(data);
     }
 
+    /**
+     * 根据传入的便签项的数据类修改便签背景色
+     * @param data  便签项的数据类
+     */
     private void setBackground(NoteItemData data) {
         int id = data.getBgColorId();
         if (data.getType() == Notes.TYPE_NOTE) {
@@ -116,6 +123,10 @@ public class NotesListItem extends LinearLayout {
         }
     }
 
+    /**
+     * 获取该列表便签项绑定的数据类
+     * @return  数据类
+     */
     public NoteItemData getItemData() {
         return mItemData;
     }

app/src/main/java/net/micode/notes/ui/activities/AlarmAlertActivity.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.micode.notes.ui;
+package net.micode.notes.ui.activities;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -39,13 +39,19 @@ import net.micode.notes.tool.DataUtils;
 
 import java.io.IOException;
 
-
+/**
+ * 闹钟应用活动类
+ */
 public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
     private long mNoteId;
     private String mSnippet;
     private static final int SNIPPET_PREW_MAX_LEN = 60;
     MediaPlayer mPlayer;
 
+    /**
+     * onCreate 生命周期方法
+     * @param savedInstanceState 之前保存的实例状态
+     */
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -83,11 +89,18 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
         }
     }
 
+    /**
+     * 屏幕是否开着
+     * @return  状态
+     */
     private boolean isScreenOn() {
         PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
         return pm.isScreenOn();
     }
 
+    /**
+     * 播放闹钟提示音
+     */
     private void playAlarmSound() {
         Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
 
@@ -119,6 +132,9 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
         }
     }
 
+    /**
+     * 显示操作弹窗
+     */
     private void showActionDialog() {
         AlertDialog.Builder dialog = new AlertDialog.Builder(this);
         dialog.setTitle(R.string.app_name);
@@ -130,6 +146,11 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
         dialog.show().setOnDismissListener(this);
     }
 
+    /**
+     * 在点击时调用该时间
+     * @param dialog    弹窗接口
+     * @param which     接口类型
+     */
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case DialogInterface.BUTTON_NEGATIVE:
@@ -143,11 +164,18 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
         }
     }
 
+    /**
+     * 在活动停止调用，停止播放闹钟声音
+     * @param dialog
+     */
     public void onDismiss(DialogInterface dialog) {
         stopAlarmSound();
         finish();
     }
 
+    /**
+     * 停止播放闹钟声音
+     */
     private void stopAlarmSound() {
         if (mPlayer != null) {
             mPlayer.stop();

app/src/main/java/net/micode/notes/ui/activities/NoteEditActivity.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.micode.notes.ui;
+package net.micode.notes.ui.activities;
 
 import android.app.Activity;
 import android.app.AlarmManager;
@@ -60,7 +60,10 @@ import net.micode.notes.model.WorkingNote.NoteSettingChangedListener;
 import net.micode.notes.tool.DataUtils;
 import net.micode.notes.tool.ResourceParser;
 import net.micode.notes.tool.ResourceParser.TextAppearanceResources;
+import net.micode.notes.ui.AlarmReceiver;
+import net.micode.notes.ui.DateTimePickerDialog;
 import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener;
+import net.micode.notes.ui.NoteEditText;
 import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
 import net.micode.notes.widget.NoteWidgetProvider_2x;
 import net.micode.notes.widget.NoteWidgetProvider_4x;
@@ -85,6 +88,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     private static final Map<Integer, Integer> sBgSelectorBtnsMap = new HashMap<Integer, Integer>();
+
     static {
         sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
         sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED);
@@ -94,6 +98,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     private static final Map<Integer, Integer> sBgSelectorSelectionMap = new HashMap<Integer, Integer>();
+
     static {
         sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select);
         sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select);
@@ -103,6 +108,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     private static final Map<Integer, Integer> sFontSizeBtnsMap = new HashMap<Integer, Integer>();
+
     static {
         sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE);
         sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL);
@@ -111,6 +117,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     private static final Map<Integer, Integer> sFontSelectorSelectionMap = new HashMap<Integer, Integer>();
+
     static {
         sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select);
         sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select);
@@ -309,7 +316,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         } else {
             mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
             mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
-        };
+        }
+        ;
     }
 
     @Override
@@ -383,7 +391,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         for (int id : sFontSizeBtnsMap.keySet()) {
             View view = findViewById(id);
             view.setOnClickListener(this);
-        };
+        }
+        ;
         mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
         mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
         /**

app/src/main/java/net/micode/notes/ui/activities/NotesListActivity.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.micode.notes.ui;
+package net.micode.notes.ui.activities;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -68,7 +68,12 @@ import net.micode.notes.model.WorkingNote;
 import net.micode.notes.tool.BackupUtils;
 import net.micode.notes.tool.DataUtils;
 import net.micode.notes.tool.ResourceParser;
+import net.micode.notes.ui.DropdownMenu;
+import net.micode.notes.ui.FoldersListAdapter;
+import net.micode.notes.ui.NoteItemData;
+import net.micode.notes.ui.NotesListAdapter;
 import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute;
+import net.micode.notes.ui.NotesListItem;
 import net.micode.notes.widget.NoteWidgetProvider_2x;
 import net.micode.notes.widget.NoteWidgetProvider_4x;
 
@@ -93,7 +98,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     private enum ListEditState {
         NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER
-    };
+    }
+
+    ;
 
     private ListEditState mState;
 
@@ -406,7 +413,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             return false;
         }
 
-    };
+    }
+
+    ;
 
     private void startAsyncNotesListQuery() {
         String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION

app/src/main/java/net/micode/notes/ui/activities/NotesPreferenceActivity.java

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package net.micode.notes.ui;
+package net.micode.notes.ui.activities;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
-import android.app.ActionBar;
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
 import android.content.ContentValues;
@@ -35,7 +34,6 @@ import android.preference.PreferenceCategory;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;

app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java

@@ -15,6 +15,7 @@
  */
 
 package net.micode.notes.widget;
+
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
@@ -29,8 +30,8 @@ import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.tool.ResourceParser;
-import net.micode.notes.ui.NoteEditActivity;
+import net.micode.notes.ui.activities.NoteEditActivity;
-import net.micode.notes.ui.NotesListActivity;
+import net.micode.notes.ui.activities.NotesListActivity;
 
 public abstract class NoteWidgetProvider extends AppWidgetProvider {
     public static final String[] PROJECTION = new String[]{