葛兴海 完善代码

src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Wed Jun 07 21:50:12 CST 2023
+#Thu Jun 08 08:00:27 CST 2023
 base.0=C\:\\Users\\Admin\\Desktop\\gitProject1\\gitProject1\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex

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

@@ -24,9 +24,9 @@ public class Notes {
      * <P>ID_TRASH_FOLDER 垃圾文件夹</P>
      */
     public static final int ID_ROOT_FOLDER = 0;
-    public static final int ID_TEMPARAY_FOLDER = -1;
+    public static final int ID_TEMPORARY_FOLDER = -1;
     public static final int ID_CALL_RECORD_FOLDER = -2;
-    public static final int ID_TRASH_FOLER = -3;
+    public static final int ID_TRASH_FOLDER = -3;
 
     public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date";
     public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id";
@@ -40,7 +40,7 @@ public class Notes {
      * <P>TYPE_WIDGET_INVALID 无效的</P>
      * <P>2x2 3x3 4x4 的</P>
      */
-    public static final int TYPE_WIDGET_INVALIDE = -1;
+    public static final int TYPE_WIDGET_INVALID = -1;
     public static final int TYPE_WIDGET_2X = 0;
     public static final int TYPE_WIDGET_4X = 1;
     public static final int TYPE_WIDGET_3X = 2; // 3x3窗口小部件

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

@@ -198,10 +198,10 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER =
             "CREATE TRIGGER folder_move_notes_on_trash " +
                     " AFTER UPDATE ON " + TABLE.NOTE +
-                    " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
+                    " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLDER +
                     " BEGIN" +
                     "  UPDATE " + TABLE.NOTE +
-                    "   SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
+                    "   SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLDER +
                     "  WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
                     " END";
 
@@ -253,14 +253,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
 
         // 临时文件夹 用于存放临时便签
         values.clear();
-        values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
+        values.put(NoteColumns.ID, Notes.ID_TEMPORARY_FOLDER);
         values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
         db.insert(TABLE.NOTE, null, values);
 
 
         // 回收站文件夹 用于存放回收站便签
         values.clear();
-        values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
+        values.put(NoteColumns.ID, Notes.ID_TRASH_FOLDER);
         values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
         db.insert(TABLE.NOTE, null, values);
     }
@@ -345,7 +345,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
                 + " TEXT NOT NULL DEFAULT ''");
         // add a trash system folder
         ContentValues values = new ContentValues();
-        values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
+        values.put(NoteColumns.ID, Notes.ID_TRASH_FOLDER);
         values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
         db.insert(TABLE.NOTE, null, values);
     }

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

@@ -62,7 +62,7 @@ public class NotesProvider extends ContentProvider {
     private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION
         + " FROM " + TABLE.NOTE
         + " WHERE " + NoteColumns.SNIPPET + " LIKE ?"
-        + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER
+        + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLDER
         + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE;
 
     @Override

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

@@ -97,7 +97,7 @@ public class WorkingNote {
         mNoteId = 0;
         mIsDeleted = false;
         mMode = 0;
-        mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
+        mWidgetType = Notes.TYPE_WIDGET_INVALID;
     }
 
     // Existing note construct
@@ -188,7 +188,7 @@ public class WorkingNote {
 
             // 如果有widget则更新widget
             if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
-                    && mWidgetType != Notes.TYPE_WIDGET_INVALIDE
+                    && mWidgetType != Notes.TYPE_WIDGET_INVALID
                     && mNoteSettingStatusListener != null) {
                 mNoteSettingStatusListener.onWidgetChanged();
             }
@@ -228,7 +228,7 @@ public class WorkingNote {
     public void markDeleted(boolean mark) {
         mIsDeleted = mark;
         if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
-                && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) {
+                && mWidgetType != Notes.TYPE_WIDGET_INVALID && mNoteSettingStatusListener != null) {
                 mNoteSettingStatusListener.onWidgetChanged();
         }
     }

src/Notes/app/src/main/java/net/micode/notes/tool/BackupUtils.java

@@ -223,7 +223,7 @@ public class BackupUtils {
                     Notes.CONTENT_NOTE_URI,
                     NOTE_PROJECTION,
                     "(" + NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER + " AND "
-                            + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + ") OR "
+                            + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLDER + ") OR "
                             + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER, null, null);
 
             if (folderCursor != null) {//导出文件夹，把里面的便签导出来
@@ -330,5 +330,3 @@ public class BackupUtils {
         return null;
     }
 }
-
-

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

@@ -96,7 +96,7 @@ public class DataUtils {//定义便签的处理工具类
         Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI,
                 new String[]{"COUNT(*)"},
                 NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>?",
-                new String[]{String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)},
+                new String[]{String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLDER)},
                 null);
 
         int count = 0;
@@ -117,7 +117,7 @@ public class DataUtils {//定义便签的处理工具类
     public static boolean visibleInNoteDatabase(ContentResolver resolver, long noteId, int type) {//在数据库中是否可见
         Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
                 null,
-                NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER,
+                NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLDER,
                 new String[]{String.valueOf(type)},
                 null);
 
@@ -134,7 +134,7 @@ public class DataUtils {//定义便签的处理工具类
     public static boolean checkVisibleFolderName(ContentResolver resolver, String name) {//检查文件名以获取文件是否存在
         Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, null,
                 NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER +
-                        " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER +
+                        " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLDER +
                         " AND " + NoteColumns.SNIPPET + "=?",
                 new String[]{name}, null);
         boolean exist = false;

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

@@ -164,7 +164,7 @@ public class ResourceParser {
 //文本外观资源，包括默认字体，以及获取资源大小
         public static int getTexAppearanceResource(int id) {
             /**
-             * HACKME: Fix bug of store the resource id in shared preference.
+             * @HACKME: Fix bug of store the resource id in shared preference.
              * The id may larger than the length of resources, in this case,
              * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE}
              */

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

@@ -1,19 +1,4 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// Apache许可证协议
 package net.micode.notes.ui;
 
 import android.app.Activity;

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

@@ -4,8 +4,6 @@ package net.micode.notes.ui;
 import android.content.Context;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.PopupMenu;
 import android.widget.PopupMenu.OnMenuItemClickListener;

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

@@ -221,7 +221,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID,
                     AppWidgetManager.INVALID_APPWIDGET_ID);
             int widgetType = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_TYPE,
-                    Notes.TYPE_WIDGET_INVALIDE);
+                    Notes.TYPE_WIDGET_INVALID);
             int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID,
                     ResourceParser.getDefaultBgId(this));
 
@@ -625,7 +625,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                     Log.e(TAG, "Delete Note error");
                 }
             } else {
-                if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) {
+                if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLDER)) {
                     Log.e(TAG, "Move notes to trash folder error, should not happens");
                 }
             }

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

@@ -181,7 +181,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             }
 
             WorkingNote note = WorkingNote.createEmptyNote(this, Notes.ID_ROOT_FOLDER,
-                    AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALIDE,
+                    AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALID,
                     ResourceParser.RED);
             note.setWorkingText(sb.toString());
             if (note.saveNote()) {
@@ -496,7 +496,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                     // in sync mode, we'll move the deleted note into the trash
                     // folder
                     if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter
-                            .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) {
+                            .getSelectedItemIds(), Notes.ID_TRASH_FOLDER)) {
                         Log.e(TAG, "Move notes to trash folder error, should not happens");
                     }
                 }
@@ -508,7 +508,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 if (widgets != null) {
                     for (AppWidgetAttribute widget : widgets) {
                         if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID
-                                && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) {
+                                && widget.widgetType != Notes.TYPE_WIDGET_INVALID) {
                             updateWidget(widget.widgetId, widget.widgetType);
                         }
                     }
@@ -533,12 +533,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             DataUtils.batchDeleteNotes(mContentResolver, ids);
         } else {
             // in sync mode, we'll move the deleted folder into the trash folder
-            DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLER);
+            DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLDER);
         }
         if (widgets != null) {
             for (AppWidgetAttribute widget : widgets) {
                 if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID
-                        && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) {
+                        && widget.widgetType != Notes.TYPE_WIDGET_INVALID) {
                     updateWidget(widget.widgetId, widget.widgetType);
                 }
             }
@@ -959,7 +959,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 selection,
                 new String[]{
                         String.valueOf(Notes.TYPE_FOLDER),
-                        String.valueOf(Notes.ID_TRASH_FOLER),
+                        String.valueOf(Notes.ID_TRASH_FOLDER),
                         String.valueOf(mCurrentFolderId)
                 },
                 NoteColumns.MODIFIED_DATE + " DESC");

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

@@ -47,13 +47,12 @@ public class NotesListItem extends LinearLayout {
             mCallName.setVisibility(View.GONE);
             mAlert.setVisibility(View.VISIBLE);
             mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
-            mTitle.setText(context.getString(R.string.call_record_folder_name)
-                    + context.getString(R.string.format_folder_files_count, data.getNotesCount()));
+            mTitle.setText(context.getString(R.string.call_record_folder_name) + context.getString(R.string.format_folder_files_count, data.getNotesCount()));
             mAlert.setImageResource(R.drawable.call_record);
         } else if (data.getParentId() == Notes.ID_CALL_RECORD_FOLDER) {
             mCallName.setVisibility(View.VISIBLE);
             mCallName.setText(data.getCallName());
-            mTitle.setTextAppearance(context,R.style.TextAppearanceSecondaryItem);
+            mTitle.setTextAppearance(context, R.style.TextAppearanceSecondaryItem);
             mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
             if (data.hasAlert()) {
                 mAlert.setImageResource(R.drawable.clock);
@@ -66,9 +65,8 @@ public class NotesListItem extends LinearLayout {
             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()));
+                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()));

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

@@ -1,6 +1,7 @@
 // Apache许可证协议
 
 package net.micode.notes.widget;
+
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
@@ -20,15 +21,15 @@ import net.micode.notes.ui.NotesListActivity;
 
 // 该类实现了桌面中的窗口小部件
 public abstract class NoteWidgetProvider extends AppWidgetProvider { // 小米便签窗口小部件
-    public static final String [] PROJECTION = new String [] {
-        NoteColumns.ID,
-        NoteColumns.BG_COLOR_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;
-    public static final int COLUMN_BG_COLOR_ID  = 1;
-    public static final int COLUMN_SNIPPET      = 2;
+    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";
 
@@ -48,7 +49,7 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { // 小米
         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) },
+                new String[]{String.valueOf(widgetId), String.valueOf(Notes.ID_TRASH_FOLDER)},
                 null);
     }
 
@@ -57,7 +58,7 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { // 小米
     }
 
     private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds,
-            boolean privacyMode) { // 更新窗口小部件中的内容
+                        boolean privacyMode) { // 更新窗口小部件中的内容
         /*
          * Generate the pending intent to start host for the widget
          */