From 2b3fb068df92ea0d0a16153af0e0dd044a5c4e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Thu, 7 Dec 2023 13:51:03 +0900 Subject: [PATCH] Revert "WIP" This reverts commit bf3a0c4fb89ed1d8e55c9cfd81645a7a4bb83277. --- .../one/nem/lacerta/AppBlankFragment.java | 64 ------------------- .../java/one/nem/lacerta/MainActivity.java | 18 ------ app/src/main/res/layout/activity_main.xml | 25 +++----- .../main/res/layout/app_fragment_blank.xml | 14 ---- app/src/main/res/menu/bottom_menu.xml | 8 +-- app/src/main/res/navigation/app_nav_graph.xml | 17 ++--- app/src/main/res/values/strings.xml | 2 - ui/home/build.gradle | 2 +- .../main/res/layout/fragment_home_test_ui.xml | 6 -- 9 files changed, 17 insertions(+), 139 deletions(-) delete mode 100644 app/src/main/java/one/nem/lacerta/AppBlankFragment.java delete mode 100644 app/src/main/res/layout/app_fragment_blank.xml diff --git a/app/src/main/java/one/nem/lacerta/AppBlankFragment.java b/app/src/main/java/one/nem/lacerta/AppBlankFragment.java deleted file mode 100644 index 5a9ba291..00000000 --- a/app/src/main/java/one/nem/lacerta/AppBlankFragment.java +++ /dev/null @@ -1,64 +0,0 @@ -package one.nem.lacerta; - -import android.os.Bundle; - -import androidx.fragment.app.Fragment; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -/** - * A simple {@link Fragment} subclass. - * Use the {@link AppBlankFragment#newInstance} factory method to - * create an instance of this fragment. - */ -public class AppBlankFragment extends Fragment { - - // TODO: Rename parameter arguments, choose names that match - // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER - private static final String ARG_PARAM1 = "param1"; - private static final String ARG_PARAM2 = "param2"; - - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; - - public AppBlankFragment() { - // Required empty public constructor - } - - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment AppBlankFragment. - */ - // TODO: Rename and change types and number of parameters - public static AppBlankFragment newInstance(String param1, String param2) { - AppBlankFragment fragment = new AppBlankFragment(); - Bundle args = new Bundle(); - args.putString(ARG_PARAM1, param1); - args.putString(ARG_PARAM2, param2); - fragment.setArguments(args); - return fragment; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); - } - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.app_fragment_blank, container, false); - } -} \ No newline at end of file diff --git a/app/src/main/java/one/nem/lacerta/MainActivity.java b/app/src/main/java/one/nem/lacerta/MainActivity.java index c6e95e23..1e990f71 100644 --- a/app/src/main/java/one/nem/lacerta/MainActivity.java +++ b/app/src/main/java/one/nem/lacerta/MainActivity.java @@ -1,32 +1,14 @@ package one.nem.lacerta; import androidx.appcompat.app.AppCompatActivity; -import androidx.fragment.app.FragmentManager; -import androidx.navigation.NavController; -import androidx.navigation.fragment.NavHostFragment; -import androidx.navigation.ui.NavigationUI; import android.os.Bundle; -import com.google.android.material.bottomnavigation.BottomNavigationView; - public class MainActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - - // デバッグ - FragmentManager supportFragmentManager = getSupportFragmentManager(); - NavHostFragment navHostFragment = - (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment); - NavController navController = navHostFragment.getNavController(); - BottomNavigationView bottomNav = findViewById(R.id.nav_view); - - NavigationUI.setupWithNavController(bottomNav, navController); - - // デバッグ - } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ccf4c200..6f43c270 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -8,26 +8,21 @@ - - + app:layout_constraintTop_toTopOf="parent" + + app:defaultNavHost="true" + app:navGraph="@navigation/app_nav_graph"/> + + diff --git a/app/src/main/res/layout/app_fragment_blank.xml b/app/src/main/res/layout/app_fragment_blank.xml deleted file mode 100644 index f397bdba..00000000 --- a/app/src/main/res/layout/app_fragment_blank.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/bottom_menu.xml b/app/src/main/res/menu/bottom_menu.xml index b22aa058..dac74b82 100644 --- a/app/src/main/res/menu/bottom_menu.xml +++ b/app/src/main/res/menu/bottom_menu.xml @@ -2,11 +2,7 @@ - - + android:id="@+id/homeTestUi" + android:title="HomeTestUi" /> \ No newline at end of file diff --git a/app/src/main/res/navigation/app_nav_graph.xml b/app/src/main/res/navigation/app_nav_graph.xml index e1fa1c2f..8941863b 100644 --- a/app/src/main/res/navigation/app_nav_graph.xml +++ b/app/src/main/res/navigation/app_nav_graph.xml @@ -1,23 +1,14 @@ + app:startDestination="@id/placeholder"> - - + + android:id="@+id/action_placeholder_to_ui_home_nav_graph" + app:destination="@id/ui_home_nav_graph" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b23abf1a..b3b9e87e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,3 @@ Lacerta - - Hello blank fragment \ No newline at end of file diff --git a/ui/home/build.gradle b/ui/home/build.gradle index cd929f1f..def6ac92 100644 --- a/ui/home/build.gradle +++ b/ui/home/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - namespace 'one.nem.ui.home' + namespace 'one.nem.lacerta.ui.home' compileSdk 33 defaultConfig { diff --git a/ui/home/src/main/res/layout/fragment_home_test_ui.xml b/ui/home/src/main/res/layout/fragment_home_test_ui.xml index d1e581e5..09d8de78 100644 --- a/ui/home/src/main/res/layout/fragment_home_test_ui.xml +++ b/ui/home/src/main/res/layout/fragment_home_test_ui.xml @@ -11,10 +11,4 @@ android:layout_height="match_parent" android:text="@string/hello_blank_fragment" /> -