mirror of
https://github.com/dzeiocom/OpenHealth.git
synced 2025-06-22 04:59:18 +00:00
misc: some changes
This commit is contained in:
@ -3,13 +3,14 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/mobile_navigation"
|
||||
android:label="@string/app_name"
|
||||
app:startDestination="@+id/nav_home">
|
||||
|
||||
<fragment
|
||||
android:id="@+id/nav_home"
|
||||
android:name="com.dzeio.openhealth.ui.home.HomeFragment"
|
||||
android:label="@string/menu_home"
|
||||
tools:layout="@layout/fragment_home" >
|
||||
tools:layout="@layout/fragment_home">
|
||||
<action
|
||||
android:id="@+id/action_nav_home_to_nav_list_weight"
|
||||
app:destination="@id/nav_list_weight"
|
||||
@ -17,13 +18,6 @@
|
||||
app:exitAnim="@android:anim/slide_out_right"
|
||||
app:popEnterAnim="@android:anim/slide_in_left"
|
||||
app:popExitAnim="@android:anim/slide_out_right" />
|
||||
<action
|
||||
android:id="@+id/action_nav_home_to_nav_extensions"
|
||||
app:destination="@id/nav_extensions"
|
||||
app:enterAnim="@android:anim/slide_in_left"
|
||||
app:exitAnim="@android:anim/slide_out_right"
|
||||
app:popEnterAnim="@android:anim/slide_in_left"
|
||||
app:popExitAnim="@android:anim/slide_out_right" />
|
||||
<action
|
||||
android:id="@+id/action_nav_home_to_nav_water_home"
|
||||
app:destination="@id/nav_water_home"
|
||||
@ -31,32 +25,16 @@
|
||||
app:exitAnim="@android:anim/slide_out_right"
|
||||
app:popEnterAnim="@android:anim/slide_in_left"
|
||||
app:popExitAnim="@android:anim/slide_out_right" />
|
||||
<action
|
||||
android:id="@+id/action_nav_home_to_nav_settings"
|
||||
app:destination="@id/nav_settings"
|
||||
app:enterAnim="@android:anim/slide_in_left"
|
||||
app:exitAnim="@android:anim/slide_out_right"
|
||||
app:popEnterAnim="@android:anim/slide_in_left"
|
||||
app:popExitAnim="@android:anim/slide_out_right" />
|
||||
<action
|
||||
android:id="@+id/action_nav_home_to_nav_add_weight_dialog"
|
||||
app:destination="@id/nav_add_weight_dialog" />
|
||||
<action
|
||||
android:id="@+id/action_nav_home_to_aboutFragment"
|
||||
app:destination="@id/aboutFragment" />
|
||||
<action
|
||||
android:id="@+id/action_nav_home_to_browseFragment"
|
||||
app:destination="@id/browseFragment" />
|
||||
<action
|
||||
android:id="@+id/action_nav_home_to_activityFragment"
|
||||
app:destination="@id/activityFragment" />
|
||||
</fragment>
|
||||
|
||||
<fragment
|
||||
android:id="@+id/nav_extensions"
|
||||
android:name="com.dzeio.openhealth.ui.extensions.ExtensionsFragment"
|
||||
android:label="@string/menu_import"
|
||||
tools:layout="@layout/fragment_extensions" >
|
||||
android:label="@string/menu_extensions"
|
||||
tools:layout="@layout/fragment_extensions">
|
||||
<action
|
||||
android:id="@+id/action_nav_extensions_to_nav_extension"
|
||||
app:destination="@id/nav_extension" />
|
||||
@ -66,7 +44,7 @@
|
||||
android:id="@+id/nav_list_weight"
|
||||
android:name="com.dzeio.openhealth.ui.weight.ListWeightFragment"
|
||||
android:label="@string/weight"
|
||||
tools:layout="@layout/fragment_list_weight" >
|
||||
tools:layout="@layout/fragment_list_weight">
|
||||
<action
|
||||
android:id="@+id/action_nav_list_weight_to_nav_edit_weight"
|
||||
app:destination="@id/nav_edit_weight"
|
||||
@ -105,39 +83,39 @@
|
||||
app:popExitAnim="@android:anim/slide_out_right" />
|
||||
<action
|
||||
android:id="@+id/action_nav_water_home_to_nav_water_size_dialog"
|
||||
app:destination="@id/nav_water_size_dialog"
|
||||
app:enterAnim="@android:anim/slide_in_left"
|
||||
app:exitAnim="@android:anim/slide_out_right"
|
||||
app:popEnterAnim="@android:anim/slide_in_left"
|
||||
app:popExitAnim="@android:anim/slide_out_right"
|
||||
app:destination="@id/nav_water_size_dialog" />
|
||||
app:popExitAnim="@android:anim/slide_out_right" />
|
||||
</fragment>
|
||||
|
||||
<dialog
|
||||
android:id="@+id/nav_water_size_dialog"
|
||||
android:name="com.dzeio.openhealth.ui.water.WaterSizeSelectorDialog"
|
||||
tools:layout="@layout/dialog_water_size_selector"
|
||||
app:enterAnim="@android:anim/slide_in_left"
|
||||
app:exitAnim="@android:anim/slide_out_right"
|
||||
app:popEnterAnim="@android:anim/slide_in_left"
|
||||
app:popExitAnim="@android:anim/slide_out_right">
|
||||
app:popExitAnim="@android:anim/slide_out_right"
|
||||
tools:layout="@layout/dialog_water_size_selector">
|
||||
|
||||
</dialog>
|
||||
|
||||
<dialog
|
||||
android:id="@+id/nav_add_weight_dialog"
|
||||
android:name="com.dzeio.openhealth.ui.weight.AddWeightDialog"
|
||||
tools:layout="@layout/dialog_water_size_selector"
|
||||
app:enterAnim="@android:anim/slide_in_left"
|
||||
app:exitAnim="@android:anim/slide_out_right"
|
||||
app:popEnterAnim="@android:anim/slide_in_left"
|
||||
app:popExitAnim="@android:anim/slide_out_right">
|
||||
app:popExitAnim="@android:anim/slide_out_right"
|
||||
tools:layout="@layout/dialog_water_size_selector">
|
||||
|
||||
</dialog>
|
||||
|
||||
<fragment
|
||||
android:id="@+id/nav_settings"
|
||||
android:label="@string/page_settings"
|
||||
android:name="com.dzeio.openhealth.ui.settings.SettingsFragment"
|
||||
android:label="@string/page_settings"
|
||||
app:enterAnim="@android:anim/slide_in_left"
|
||||
app:exitAnim="@android:anim/slide_out_right"
|
||||
app:popEnterAnim="@android:anim/slide_in_left"
|
||||
@ -148,11 +126,11 @@
|
||||
<fragment
|
||||
android:id="@+id/nav_water_edit"
|
||||
android:name="com.dzeio.openhealth.ui.water.EditWaterDialog"
|
||||
tools:layout="@layout/dialog_water_edit_water"
|
||||
app:enterAnim="@android:anim/slide_in_left"
|
||||
app:exitAnim="@android:anim/slide_out_right"
|
||||
app:popEnterAnim="@android:anim/slide_in_left"
|
||||
app:popExitAnim="@android:anim/slide_out_right">
|
||||
app:popExitAnim="@android:anim/slide_out_right"
|
||||
tools:layout="@layout/dialog_water_edit_water">
|
||||
|
||||
<argument
|
||||
android:name="id"
|
||||
@ -163,11 +141,11 @@
|
||||
<fragment
|
||||
android:id="@+id/nav_extension"
|
||||
android:name="com.dzeio.openhealth.ui.extension.ExtensionFragment"
|
||||
tools:layout="@layout/fragment_extension"
|
||||
app:enterAnim="@android:anim/slide_in_left"
|
||||
app:exitAnim="@android:anim/slide_out_right"
|
||||
app:popEnterAnim="@android:anim/slide_in_left"
|
||||
app:popExitAnim="@android:anim/slide_out_right">
|
||||
app:popExitAnim="@android:anim/slide_out_right"
|
||||
tools:layout="@layout/fragment_extension">
|
||||
|
||||
<argument
|
||||
android:name="extension"
|
||||
@ -175,20 +153,27 @@
|
||||
|
||||
</fragment>
|
||||
<fragment
|
||||
android:id="@+id/aboutFragment"
|
||||
android:id="@+id/nav_about"
|
||||
android:name="com.dzeio.openhealth.ui.about.AboutFragment"
|
||||
android:label="AboutFragment"
|
||||
tools:layout="@layout/fragment_about"/>
|
||||
android:label="@string/about"
|
||||
tools:layout="@layout/fragment_about" />
|
||||
<fragment
|
||||
android:id="@+id/browseFragment"
|
||||
android:id="@+id/nav_browse"
|
||||
android:name="com.dzeio.openhealth.ui.browse.BrowseFragment"
|
||||
android:label="fragment_activity"
|
||||
tools:layout="@layout/fragment_activity" />
|
||||
android:label="@string/menu_browse"
|
||||
tools:layout="@layout/fragment_browse">
|
||||
<action
|
||||
android:id="@+id/action_nav_browse_to_nav_water_home"
|
||||
app:destination="@id/nav_water_home" />
|
||||
<action
|
||||
android:id="@+id/action_nav_browse_to_nav_list_weight"
|
||||
app:destination="@id/nav_list_weight" />
|
||||
</fragment>
|
||||
|
||||
|
||||
<fragment
|
||||
android:id="@+id/activityFragment"
|
||||
android:id="@+id/nav_activity"
|
||||
android:name="com.dzeio.openhealth.ui.activity.ActivityFragment"
|
||||
android:label="fragment_activity"
|
||||
android:label="@string/menu_activity"
|
||||
tools:layout="@layout/fragment_activity" />
|
||||
</navigation>
|
||||
|
||||
Reference in New Issue
Block a user