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 56808d30bb3813199a1a399a7d79e6bb864becb8..ad8dd552b4d7fc09dcb5be89498b7c7047d40a6e 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 1452012195bd0e7c4ebb4e93a36f2f284384c6b5..f7e07c1a6671ec8f6b872c0bda0ed88a0dffe2ac 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 e4662a8db6bc1217c9819421e1f816b25bafe171..5b73475abaa589e20a7b1da1239e19ab48712268 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 0000000000000000000000000000000000000000..45b9f9d67e9ad064a161ef6c2573e7ab6611f95b
--- /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 6aa3d59b4aee4d41eb3469bfcf4aad6d3a0a1d6e..4dc799e590705c4186dda6d9f204b292b214d7c9 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 0000000000000000000000000000000000000000..6687b91cbe857c2a65ded057d1ea7cc6a1144205
--- /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 f64b3baa1ba15cbfc190058729d9874f3d388577..ad4587fa3b6b7992b851fd527cb7646f65fe739c 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 @@