diff options
| author | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2023-06-09 06:34:10 +0000 |
|---|---|---|
| committer | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2023-06-09 06:34:10 +0000 |
| commit | 8b1855bce1313ad84df8f96efdbb62e2acf7ff33 (patch) | |
| tree | 94e19efed58b931139a86c7c9c8aced91767e6c3 /app/src/main/res/layout | |
| parent | 333623483246398c76bed4aa5ee5b43c843f65cd (diff) | |
| parent | 74b9860784913c097ae59e58b0958da7744ebc2e (diff) | |
Merge branch '1227-navigation_graph' into 'main'
1227: use navigation graph component, avoid view (fragments) duplications
See merge request e/os/advanced-privacy!136
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2627a32..a5816f4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,6 +1,27 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (C) 2023 MURENA SAS + ~ Copyright (C) 2021 E FOUNDATION + ~ + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. + --> <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/container" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/nav_host_fragment" + android:name="androidx.navigation.fragment.NavHostFragment" android:layout_height="match_parent" android:layout_width="match_parent" - />
\ No newline at end of file + + app:defaultNavHost="true" + app:navGraph="@navigation/nav_graph" + /> |