From 3e365215bf2766b35f3a616845c423ffb3c70e72 Mon Sep 17 00:00:00 2001
From: crazybee007 <zxe3474596743@outlook.com>
Date: Wed, 23 Apr 2025 19:35:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=AF=E8=BF=90=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Notesmaster/.idea/.gitignore                  |  3 -
 .../.idea/deploymentTargetDropDown.xml        | 15 +---
 Notesmaster/.idea/gradle.xml                  |  1 -
 Notesmaster/app/build.gradle.kts              | 39 +++++-----
 .../java/net/micode/notes/MainActivity.java   | 73 ++++++++++++++++---
 .../notes/gtask/remote/GTaskASyncTask.java    |  1 -
 .../app/src/main/res/layout/activity_main.xml | 32 +++++---
 .../app/src/main/res/values/styles.xml        | 10 +++
 Notesmaster/gradle/libs.versions.toml         |  6 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 10 files changed, 121 insertions(+), 61 deletions(-)
 delete mode 100644 Notesmaster/.idea/.gitignore

diff --git a/Notesmaster/.idea/.gitignore b/Notesmaster/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/Notesmaster/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/Notesmaster/.idea/deploymentTargetDropDown.xml b/Notesmaster/.idea/deploymentTargetDropDown.xml
index 4e9206f..0c0c338 100644
--- a/Notesmaster/.idea/deploymentTargetDropDown.xml
+++ b/Notesmaster/.idea/deploymentTargetDropDown.xml
@@ -3,20 +3,7 @@
   <component name="deploymentTargetDropDown">
     <value>
       <entry key="app">
-        <State>
-          <targetSelectedWithDropDown>
-            <Target>
-              <type value="QUICK_BOOT_TARGET" />
-              <deviceKey>
-                <Key>
-                  <type value="VIRTUAL_DEVICE_PATH" />
-                  <value value="C:\Users\86152\.android\avd\Small_Phone_API_30.avd" />
-                </Key>
-              </deviceKey>
-            </Target>
-          </targetSelectedWithDropDown>
-          <timeTargetWasSelectedWithDropDown value="2025-04-23T10:17:52.385078600Z" />
-        </State>
+        <State />
       </entry>
     </value>
   </component>
diff --git a/Notesmaster/.idea/gradle.xml b/Notesmaster/.idea/gradle.xml
index 0897082..32522c1 100644
--- a/Notesmaster/.idea/gradle.xml
+++ b/Notesmaster/.idea/gradle.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/Notesmaster/app/build.gradle.kts b/Notesmaster/app/build.gradle.kts
index 30350a4..50eb966 100644
--- a/Notesmaster/app/build.gradle.kts
+++ b/Notesmaster/app/build.gradle.kts
@@ -5,13 +5,6 @@ plugins {
 android {
     namespace = "net.micode.notes"
     compileSdk = 34
-    packaging {
-        resources.excludes.add("META-INF/DEPENDENCIES");
-        resources.excludes.add("META-INF/NOTICE");
-        resources.excludes.add("META-INF/LICENSE");
-        resources.excludes.add("META-INF/LICENSE.txt");
-        resources.excludes.add("META-INF/NOTICE.txt");
-    }
 
     defaultConfig {
         applicationId = "net.micode.notes"
@@ -36,30 +29,36 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
+    buildFeatures {
+        viewBinding = true
+    }
+
+    packaging {
+        resources.excludes.add("META-INF/DEPENDENCIES");
+        resources.excludes.add("META-INF/NOTICE");
+        resources.excludes.add("META-INF/LICENSE");
+        resources.excludes.add("META-INF/LICENSE.txt");
+        resources.excludes.add("META-INF/NOTICE.txt");
+    }
 }
 
 dependencies {
 
     implementation(libs.appcompat)
     implementation(libs.material)
-    implementation(libs.activity)
     implementation(libs.constraintlayout)
+    implementation(libs.navigation.fragment)
+    implementation(libs.navigation.ui)
 //    implementation(fileTree(mapOf(
-//        "dir" to "D:\\Android\\AndroidCode\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib",
-//        "include" to listOf("*.aar", "*.jar"),
-//        "exclude" to listOf("")
-                //    部分需要重新修改
-//    implementation(fileTree(mapOf(
-//        "dir" to "D:\\Code\\AndroidCode\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib",
+//        "dir" to "D:\\Tasks\\xiaomi\\xiaomi_gitpractice\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib",
 //        "include" to listOf("*.aar", "*.jar"),
 //        "exclude" to listOf("")
 //    )))
-                //修改为如下代码：
-                implementation(files("D:\\Android\\AndroidCode\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar"))
-                implementation(files("D:\\Android\\AndroidCode\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-win-4.5.14.jar"))
-                implementation(files("D:\\Android\\AndroidCode\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpcore-4.4.16.jar"))
-//    )))
+//修改为如下代码：
+    implementation(files("D:\\Tasks\\xiaomi\\xiaomi_gitpractice\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar"))
+    implementation(files("D:\\Tasks\\xiaomi\\xiaomi_gitpractice\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-win-4.5.14.jar"))
+    implementation(files("D:\\Tasks\\xiaomi\\xiaomi_gitpractice\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpcore-4.4.16.jar"))
     testImplementation(libs.junit)
     androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)
-}
\ No newline at end of file
+}
diff --git a/Notesmaster/app/src/main/java/net/micode/notes/MainActivity.java b/Notesmaster/app/src/main/java/net/micode/notes/MainActivity.java
index 8091753..a776cfb 100644
--- a/Notesmaster/app/src/main/java/net/micode/notes/MainActivity.java
+++ b/Notesmaster/app/src/main/java/net/micode/notes/MainActivity.java
@@ -2,23 +2,76 @@ package net.micode.notes;
 
 import android.os.Bundle;
 
-import androidx.activity.EdgeToEdge;
+import com.google.android.material.snackbar.Snackbar;
+
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
+
+import android.view.View;
+
+import androidx.navigation.NavController;
+import androidx.navigation.Navigation;
+import androidx.navigation.ui.AppBarConfiguration;
+import androidx.navigation.ui.NavigationUI;
+
+import net.micode.notes.databinding.ActivityMainBinding;
+
+import android.view.Menu;
+import android.view.MenuItem;
 
 public class MainActivity extends AppCompatActivity {
 
+    private AppBarConfiguration appBarConfiguration;
+    private ActivityMainBinding binding;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        EdgeToEdge.enable(this);
-        setContentView(R.layout.activity_main);
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
-            Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
-            return insets;
+
+        binding = ActivityMainBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        setSupportActionBar(binding.toolbar);
+
+        NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);
+        appBarConfiguration = new AppBarConfiguration.Builder(navController.getGraph()).build();
+        NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);
+
+        binding.fab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+                        .setAnchorView(R.id.fab)
+                        .setAction("Action", null).show();
+            }
         });
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_main, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        //noinspection SimplifiableIfStatement
+        if (id == R.id.action_settings) {
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);
+        return NavigationUI.navigateUp(navController, appBarConfiguration)
+                || super.onSupportNavigateUp();
+    }
 }
\ No newline at end of file
diff --git a/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
index a1deb99..43cbee6 100644
--- a/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ b/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
@@ -82,7 +82,6 @@ public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
         Notification notification=builder.getNotification();
         mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
     }
-
     @Override
     protected Integer doInBackground(Void... unused) {
         publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
diff --git a/Notesmaster/app/src/main/res/layout/activity_main.xml b/Notesmaster/app/src/main/res/layout/activity_main.xml
index 86a5d97..16313e0 100644
--- a/Notesmaster/app/src/main/res/layout/activity_main.xml
+++ b/Notesmaster/app/src/main/res/layout/activity_main.xml
@@ -1,19 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".MainActivity">
 
-    <TextView
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <include layout="@layout/content_main" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_gravity="bottom|end"
+        android:layout_marginEnd="@dimen/fab_margin"
+        android:layout_marginBottom="16dp"
+        app:srcCompat="@android:drawable/ic_dialog_email" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/Notesmaster/app/src/main/res/values/styles.xml b/Notesmaster/app/src/main/res/values/styles.xml
index d750e65..16b5b0c 100644
--- a/Notesmaster/app/src/main/res/values/styles.xml
+++ b/Notesmaster/app/src/main/res/values/styles.xml
@@ -16,6 +16,15 @@
 -->
 
 <resources>
+
+    <!-- 添加缺失的字符串 -->
+    <string name="next">Next</string>
+    <string name="previous">Previous</string>
+    <string name="lorem_ipsum">Lorem ipsum dolor sit amet...</string>
+    <string name="action_settings">Settings</string>
+    <string name="first_fragment_label">First Fragment</string>
+    <string name="second_fragment_label">Second Fragment</string>
+
     <style name="TextAppearanceSuper">
         <item name="android:textSize">@dimen/text_font_size_super</item>
         <item name="android:textColorLink">#0000ff</item>
@@ -66,4 +75,5 @@
         <item name="android:displayOptions" />
         <item name="android:visibility">gone</item>
     </style>
+
 </resources>
\ No newline at end of file
diff --git a/Notesmaster/gradle/libs.versions.toml b/Notesmaster/gradle/libs.versions.toml
index 6f6c9f6..d262221 100644
--- a/Notesmaster/gradle/libs.versions.toml
+++ b/Notesmaster/gradle/libs.versions.toml
@@ -5,8 +5,9 @@ junitVersion = "1.1.5"
 espressoCore = "3.5.1"
 appcompat = "1.6.1"
 material = "1.10.0"
-activity = "1.8.0"
 constraintlayout = "2.1.4"
+navigationFragment = "2.6.0"
+navigationUi = "2.6.0"
 
 [libraries]
 junit = { group = "junit", name = "junit", version.ref = "junit" }
@@ -14,8 +15,9 @@ ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitV
 espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
 constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "navigationFragment" }
+navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "navigationUi" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
diff --git a/Notesmaster/gradle/wrapper/gradle-wrapper.properties b/Notesmaster/gradle/wrapper/gradle-wrapper.properties
index 49d0afe..01b0228 100644
--- a/Notesmaster/gradle/wrapper/gradle-wrapper.properties
+++ b/Notesmaster/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Wed Apr 09 21:44:04 CST 2025
+#Wed Apr 23 18:51:30 CST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip