From c7a7013c76a187b735c778eb2fecf591638aa311 Mon Sep 17 00:00:00 2001
From: gexinghai <2874903098@qq.com>
Date: Tue, 25 Apr 2023 22:49:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .../buildOutputCleanup/cache.properties       |   4 ++--
 .../buildOutputCleanup/outputFiles.bin        | Bin 21143 -> 21251 bytes
 src/Notes/.gradle/file-system.probe           | Bin 8 -> 8 bytes
 src/Notes/app/build.gradle                    |   1 +
 src/Notes/app/src/main/AndroidManifest.xml    |   1 -
 .../net/micode/notes/ui/NoteEditActivity.java |   4 ++--
 src/Notes/build.gradle                        |   2 +-
 src/Notes/gradle.properties                   |   3 +++
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 10 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 src/Notes/gradle.properties

diff --git a/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 954fdfe768077d02bbc42cc917898e521aad2ca1..927f3d8a84bfade90e1cdd9e4c8f429ec154ad09 100644
GIT binary patch
literal 17
VcmZRcBz45$;=iS#3}C>t6aY7{1tb6f

literal 17
VcmZRcBz45$;=iS#3}C?c0RT7o1#SQU

diff --git a/src/Notes/.gradle/buildOutputCleanup/cache.properties b/src/Notes/.gradle/buildOutputCleanup/cache.properties
index 299c01e..0eba958 100644
--- a/src/Notes/.gradle/buildOutputCleanup/cache.properties
+++ b/src/Notes/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Sun Apr 02 08:57:27 CST 2023
-gradle.version=7.5
+#Sun Apr 23 18:04:59 CST 2023
+gradle.version=8.0
diff --git a/src/Notes/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes/.gradle/buildOutputCleanup/outputFiles.bin
index 1d2c5943108ac22b6a3999f9d0ad9c43bc29e48c..5e353d5402f6ac4f3c0a512adc9cb5afa6161d80 100644
GIT binary patch
literal 21251
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
M%Dhd_|6*VN0Czat1ONa4

literal 21143
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

diff --git a/src/Notes/.gradle/file-system.probe b/src/Notes/.gradle/file-system.probe
index efea4229efb376ab89875ee2c5f669481776bd07..9cc85cefe894f155380edfff9b93f4f3aeb377e1 100644
GIT binary patch
literal 8
PcmZQzU~FGIW&cC~2`~d1

literal 8
PcmZQzU~FGhz_beh2S)-|

diff --git a/src/Notes/app/build.gradle b/src/Notes/app/build.gradle
index ae0b4c4..1e45ad2 100644
--- a/src/Notes/app/build.gradle
+++ b/src/Notes/app/build.gradle
@@ -17,4 +17,5 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+    namespace 'net.micode.notes'
 }
diff --git a/src/Notes/app/src/main/AndroidManifest.xml b/src/Notes/app/src/main/AndroidManifest.xml
index 41511bc..a30799f 100644
--- a/src/Notes/app/src/main/AndroidManifest.xml
+++ b/src/Notes/app/src/main/AndroidManifest.xml
@@ -17,7 +17,6 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="net.micode.notes"
     android:versionCode="1"
     android:versionName="0.1" >
 
diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 387c03a..9cfb996 100644
--- a/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -322,7 +322,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        /**
+        /*
          * For new note without note id, we should firstly save it to
          * generate a id. If the editing note is not worth saving, there
          * is no id which is equivalent to create new note
@@ -387,7 +387,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         };
         mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
         mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
-        /**
+        /*
          * 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}
diff --git a/src/Notes/build.gradle b/src/Notes/build.gradle
index cdb59e3..07f17b1 100644
--- a/src/Notes/build.gradle
+++ b/src/Notes/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
     }
 }
 
diff --git a/src/Notes/gradle.properties b/src/Notes/gradle.properties
new file mode 100644
index 0000000..f82049a
--- /dev/null
+++ b/src/Notes/gradle.properties
@@ -0,0 +1,3 @@
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
\ No newline at end of file
diff --git a/src/Notes/gradle/wrapper/gradle-wrapper.properties b/src/Notes/gradle/wrapper/gradle-wrapper.properties
index 829fbb8..ff44dd1 100644
--- a/src/Notes/gradle/wrapper/gradle-wrapper.properties
+++ b/src/Notes/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Apr 02 08:57:13 CST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME