Merge pull request '完善功能' (#7) from wx into main

java/net/micode/notes/ui/AlarmInitReceiver.java

@@ -23,6 +23,7 @@ import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
+import android.os.Build;
 
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
@@ -56,7 +57,11 @@ public class AlarmInitReceiver extends BroadcastReceiver {
                     PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0);
                     AlarmManager alermManager = (AlarmManager) context
                             .getSystemService(Context.ALARM_SERVICE);
-                    alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent);
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        alermManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent);
+                    } else {
+                        alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent);
+                    }
                 } while (c.moveToNext());
             }
             c.close();

java/net/micode/notes/ui/NoteEditActivity.java

@@ -28,6 +28,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Paint;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.text.Spannable;
@@ -626,10 +627,13 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
             AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE));
             showAlertHeader();
-            if(!set) {
+            alarmManager.cancel(pendingIntent);
-                alarmManager.cancel(pendingIntent);
+            if(set) {
-            } else {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent);
+                    alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, date, pendingIntent);
+                } else {
+                    alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent);
+                }
             }
         } else {
             /**

java/net/micode/notes/ui/NotesListActivity.java

@@ -78,6 +78,8 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.HashSet;
 
+import androidx.appcompat.app.AppCompatDelegate;
+
 public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
     private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
 
@@ -207,6 +209,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     protected void onStart() {
         super.onStart();
         startAsyncNotesListQuery();
+        if (mAddNewNote != null) {
+            mAddNewNote.setVisibility(View.VISIBLE);
+        }
     }
 
     private void initResources() {
@@ -812,6 +817,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             case R.id.menu_search:
                 onSearchRequested();
                 break;
+            case R.id.menu_toggle_night_mode:
+                int currentMode = AppCompatDelegate.getDefaultNightMode();
+                if (currentMode == AppCompatDelegate.MODE_NIGHT_YES) {
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                } else {
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                }
+                recreate();
+                return true;
             default:
                 break;
         }