Revert "WIP"

This reverts commit bf3a0c4fb8.
This commit is contained in:
r-ca committed 2023-12-07 13:51:03 +09:00
1 parent bf3a0c4fb8
commit 2b3fb068df
9 files changed
+17 -139

No files matched your search

+10 -15
View File
@@ -8,26 +8,21 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/nav_host_fragment"
android:id="@+id/fragmentContainerView2"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="0dp"
app:defaultNavHost="true"
app:layout_constraintBottom_toTopOf="@id/nav_view"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/app_nav_graph" />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/nav_view"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:menu="@menu/bottom_menu">
app:layout_constraintTop_toTopOf="parent"
app:defaultNavHost="true"
app:navGraph="@navigation/app_nav_graph"/>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:layout_width="match_parent"
android:layout_height="match_parent" >
</com.google.android.material.bottomnavigation.BottomNavigationView>
@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".AppBlankFragment">
<!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
</FrameLayout>
+2 -6
View File
@@ -2,11 +2,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@id/ui_home_nav_graph"
android:title="HomeTestUi"/>
<item
android:id="@id/appBlankFragment"
android:title="app_fragment_blank"/>
android:id="@+id/homeTestUi"
android:title="HomeTestUi" />
</menu>
+4 -13
View File
@@ -1,23 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<navigation 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/app_nav_graph"
app:startDestination="@id/appBlankFragment">
app:startDestination="@id/placeholder">
<include app:graph="@navigation/ui_home_nav_graph" />
<fragment
android:id="@+id/homeTestUi2"
android:name="one.nem.ui.home.HomeTestUi"
android:label="HomeTestUi" />
<fragment
android:id="@+id/appBlankFragment"
android:name="one.nem.lacerta.AppBlankFragment"
android:label="app_fragment_blank"
tools:layout="@layout/app_fragment_blank" >
<fragment android:id="@+id/placeholder" >
<action
android:id="@+id/action_appBlankFragment_to_homeTestUi22"
app:destination="@id/homeTestUi2" />
android:id="@+id/action_placeholder_to_ui_home_nav_graph"
app:destination="@id/ui_home_nav_graph" />
</fragment>
-2
View File
@@ -1,5 +1,3 @@
<resources>
<string name="app_name">Lacerta</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources>