From 88b00f3fc74446a1727c93722c7b64179b45a9db Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期五, 18 四月 2025 17:40:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2
---
app/src/main/res/navigation/mobile_navigation.xml | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 9a3d6a7..bd4637d 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -5,6 +5,8 @@
android:id="@+id/mobile_navigation"
app:startDestination="@+id/navigation_home">
+ <!-- 对应的多个片段-->
+ <!-- tools:layout="@layout/fragment_home"表示设计视图中显示的应该是fragment_home.xml的内容，而不是当前布局的内容-->
<fragment
android:id="@+id/navigation_home"
android:name="com.example.firstapp.ui.home.HomeFragment"
@@ -21,5 +23,34 @@
android:id="@+id/navigation_notifications"
android:name="com.example.firstapp.ui.notifications.NotificationsFragment"
android:label="@string/title_notifications"
- tools:layout="@layout/fragment_notifications" />
+ tools:layout="@layout/fragment_notifications" >
+
+ <!-- 新增的action，跳转到 ReminderSettingsFragmentOther -->
+ <action
+ android:id="@+id/action_settings_to_reminderSettingsFragmentOther"
+ app:destination="@id/reminderSettingsFragmentOther"
+ app:enterAnim="@anim/nav_default_enter_anim"
+ app:exitAnim="@anim/nav_default_exit_anim"
+ app:popEnterAnim="@anim/nav_default_pop_enter_anim"
+ app:popExitAnim="@anim/nav_default_pop_exit_anim" />
+
+ </fragment>
+
+
+ <fragment
+ android:id="@+id/reminderSettingsFragmentOther"
+ android:name="com.example.firstapp.ui.reminderOther.ReminderSettingsFragmentOther"
+ android:label="设置其他提醒"
+ tools:layout="@layout/fragment_reminder_settings_fragment_other" >
+
+ <action
+ android:id="@+id/action_reminderSettingsFragmentOther_to_reminderSettingsFragmentOtherAdd"
+ app:destination="@id/reminderSettingsFragmentOtherAdd" />
+ </fragment>
+
+ <fragment
+ android:id="@+id/reminderSettingsFragmentOtherAdd"
+ android:name="com.example.firstapp.ui.reminderOther.ReminderSettingsFragmentOtherAdd"
+ android:label="新增" />
+
</navigation>
\ No newline at end of file
--
Gitblit v1.9.3