From 926c2306c64fa574ce5e6ef04c924482509c7596 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=85=B4=E4=BA=91?= <1459475768@qq.com>
Date: Wed, 7 Jun 2023 12:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=B0=8F=E7=B1=B3=E4=BE=BF?=
 =?UTF-8?q?=E7=AD=BE=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetDropDown.xml            | 17 -----------------
 .../micode/notes/ui/NotesListActivity.java    | 12 ++++++++++++
 .../net/micode/notes/ui/NotesListAdapter.java | 19 +++++++++++++++++++
 app/src/main/res/menu/note_list.xml           |  9 ++++++---
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/values/styles.xml            |  4 ++--
 6 files changed, 40 insertions(+), 22 deletions(-)
 delete mode 100644 .idea/deploymentTargetDropDown.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index a45d251..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\庞浩的电脑\.android\avd\Pixel_3_API_22.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-04-07T06:12:47.008280900Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index e843aec..73bac37 100644
--- a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -788,6 +788,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             case R.id.menu_export_text: {
                 exportNoteToText();
                 break;
+
             }
             case R.id.menu_sync: {
                 if (isSyncMode()) {
@@ -809,6 +810,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 createNewNote();
                 break;
             }
+            case R.id.menu_countallNotes: {
+                showNumberofNotes();
+                break;
+            }
             case R.id.menu_search:
                 onSearchRequested();
                 break;
@@ -951,4 +956,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
         return false;
     }
+
+    private void showNumberofNotes() {
+        AlertDialog.Builder btr = new AlertDialog.Builder(this);
+        btr.setTitle("目前便签数");
+        btr.setMessage("目前有 " + Integer.toString(mNotesListAdapter.retCount()) + "个便签");
+        btr.show();
+    }
 }
diff --git a/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
index 51c9cb9..2e9ac87 100644
--- a/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
+++ b/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
@@ -181,4 +181,23 @@ public class NotesListAdapter extends CursorAdapter {
             }
         }
     }
+
+    public int retCount() {
+        int NotesCount = mNotesCount;
+        int ItemCount = getCount();
+        for (int i = 0; i < ItemCount; i++) {
+            Cursor c = (Cursor) getItem(i);
+            if (c != null) {
+                if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) {
+                    NoteItemData NoteItem = new NoteItemData(mContext, c);
+                    NotesCount += NoteItem.getNotesCount();
+                }
+            } else {
+                Log.e(TAG, "Invalid cursor");
+                return -1;
+            }
+        }
+        return NotesCount;
+    }
 }
+
diff --git a/app/src/main/res/menu/note_list.xml b/app/src/main/res/menu/note_list.xml
index 42ea736..900b49e 100644
--- a/app/src/main/res/menu/note_list.xml
+++ b/app/src/main/res/menu/note_list.xml
@@ -23,12 +23,11 @@
 
     <item
         android:id="@+id/menu_export_text"
-        android:title="@string/menu_export_text"/>
+        android:title="@string/menu_export_text" />
 
     <item
         android:id="@+id/menu_sync"
-        android:title="@string/menu_sync"/>
-
+        android:title="@string/menu_sync" />
     <item
         android:id="@+id/menu_setting"
         android:title="@string/menu_setting" />
@@ -36,4 +35,8 @@
     <item
         android:id="@+id/menu_search"
         android:title="@string/menu_search"/>
+
+    <item
+        android:id="@+id/menu_countallNotes"
+        android:title="@string/menu_countallNotes"/>
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 55df868..fee2293 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -119,6 +119,7 @@
     <string name="button_delete">Delete</string>
     <string name="call_record_folder_name">Call notes</string>
     <string name="hint_foler_name">Input name</string>
+    <string name="menu_countallNotes" translatable="false">countallNotes" </string>
 
     <string name="search_label">Searching Notes</string>
     <string name="search_hint">Search notes</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d750e65..16bebc2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -63,7 +63,7 @@
     </style>
 
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions" />
-        <item name="android:visibility">gone</item>
+        <!--<item name="android:displayOptions" />-->
+        <item name="android:visibility">visible</item>
     </style>
 </resources>
\ No newline at end of file