From 43312d0c0c019dc0e905714ce4ee511bb95247bf Mon Sep 17 00:00:00 2001 From: Alex Leigh Date: Fri, 1 Sep 2023 17:55:18 -0700 Subject: [PATCH] ris: Full bottom nav working w/ child fragments --- .../java/lc/ris/android/HomeFragment.java | 23 --------------- .../java/lc/ris/android/ItemFragment.java | 4 +-- .../java/lc/ris/android/MainActivity.java | 3 ++ .../java/lc/ris/android/SettingsFragment.java | 29 +++++++++++++++++++ .../lc/ris/android/StockPickFragment.java | 5 ---- .../src/main/res/layout/fragment_settings.xml | 14 +++++++++ .../app/src/main/res/menu/menu_bottom_nav.xml | 9 ++++-- .../app/src/main/res/navigation/nav_graph.xml | 3 ++ 8 files changed, 57 insertions(+), 33 deletions(-) create mode 100644 android/RapidInventorySystem/app/src/main/java/lc/ris/android/SettingsFragment.java create mode 100644 android/RapidInventorySystem/app/src/main/res/layout/fragment_settings.xml diff --git a/android/RapidInventorySystem/app/src/main/java/lc/ris/android/HomeFragment.java b/android/RapidInventorySystem/app/src/main/java/lc/ris/android/HomeFragment.java index 56808d30b..ad8dd552b 100644 --- a/android/RapidInventorySystem/app/src/main/java/lc/ris/android/HomeFragment.java +++ b/android/RapidInventorySystem/app/src/main/java/lc/ris/android/HomeFragment.java @@ -12,16 +12,6 @@ import androidx.fragment.app.Fragment; * create an instance of this fragment. */ public class HomeFragment 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 HomeFragment() { // Required empty public constructor } @@ -37,22 +27,9 @@ public class HomeFragment extends Fragment { // TODO: Rename and change types and number of parameters public static HomeFragment newInstance(String param1, String param2) { HomeFragment fragment = new HomeFragment(); - 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) { diff --git a/android/RapidInventorySystem/app/src/main/java/lc/ris/android/ItemFragment.java b/android/RapidInventorySystem/app/src/main/java/lc/ris/android/ItemFragment.java index 145201219..f7e07c1a6 100644 --- a/android/RapidInventorySystem/app/src/main/java/lc/ris/android/ItemFragment.java +++ b/android/RapidInventorySystem/app/src/main/java/lc/ris/android/ItemFragment.java @@ -14,9 +14,7 @@ public class ItemFragment extends Fragment { } public static ItemFragment newInstance() { - ItemFragment fragment = new ItemFragment(); - - return fragment; + return new ItemFragment(); } diff --git a/android/RapidInventorySystem/app/src/main/java/lc/ris/android/MainActivity.java b/android/RapidInventorySystem/app/src/main/java/lc/ris/android/MainActivity.java index e4662a8db..5b73475ab 100644 --- a/android/RapidInventorySystem/app/src/main/java/lc/ris/android/MainActivity.java +++ b/android/RapidInventorySystem/app/src/main/java/lc/ris/android/MainActivity.java @@ -42,6 +42,9 @@ public class MainActivity extends AppCompatActivity { case R.id.itemFragment: fragment = ItemFragment.newInstance(); break; + case R.id.settingsFragment: + fragment = SettingsFragment.newInstance(); + break; } fragmentManager.beginTransaction().replace(R.id.nav_host_fragment, fragment).commit(); diff --git a/android/RapidInventorySystem/app/src/main/java/lc/ris/android/SettingsFragment.java b/android/RapidInventorySystem/app/src/main/java/lc/ris/android/SettingsFragment.java new file mode 100644 index 000000000..45b9f9d67 --- /dev/null +++ b/android/RapidInventorySystem/app/src/main/java/lc/ris/android/SettingsFragment.java @@ -0,0 +1,29 @@ +package lc.ris.android; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import androidx.fragment.app.Fragment; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link SettingsFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class SettingsFragment extends Fragment { + public SettingsFragment() { + // Required empty public constructor + } + + public static SettingsFragment newInstance() { + return new SettingsFragment(); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_settings, container, false); + } +} \ No newline at end of file diff --git a/android/RapidInventorySystem/app/src/main/java/lc/ris/android/StockPickFragment.java b/android/RapidInventorySystem/app/src/main/java/lc/ris/android/StockPickFragment.java index 6aa3d59b4..4dc799e59 100644 --- a/android/RapidInventorySystem/app/src/main/java/lc/ris/android/StockPickFragment.java +++ b/android/RapidInventorySystem/app/src/main/java/lc/ris/android/StockPickFragment.java @@ -20,11 +20,6 @@ public class StockPickFragment extends Fragment { return new StockPickFragment(); } - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/android/RapidInventorySystem/app/src/main/res/layout/fragment_settings.xml b/android/RapidInventorySystem/app/src/main/res/layout/fragment_settings.xml new file mode 100644 index 000000000..6687b91cb --- /dev/null +++ b/android/RapidInventorySystem/app/src/main/res/layout/fragment_settings.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/android/RapidInventorySystem/app/src/main/res/menu/menu_bottom_nav.xml b/android/RapidInventorySystem/app/src/main/res/menu/menu_bottom_nav.xml index f64b3baa1..ad4587fa3 100644 --- a/android/RapidInventorySystem/app/src/main/res/menu/menu_bottom_nav.xml +++ b/android/RapidInventorySystem/app/src/main/res/menu/menu_bottom_nav.xml @@ -13,12 +13,17 @@ + android:title="Pick"/> + android:title="Inventory"/> + + \ No newline at end of file diff --git a/android/RapidInventorySystem/app/src/main/res/navigation/nav_graph.xml b/android/RapidInventorySystem/app/src/main/res/navigation/nav_graph.xml index 120a02df3..484a59efe 100644 --- a/android/RapidInventorySystem/app/src/main/res/navigation/nav_graph.xml +++ b/android/RapidInventorySystem/app/src/main/res/navigation/nav_graph.xml @@ -27,7 +27,10 @@ + + \ No newline at end of file -- GitLab