diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 17b3b8b..9be6e51 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,18 +1,6 @@ - - - - - - - - - - - - diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 22bb350..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,13 +1,5 @@ - - - diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java b/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java index 3dcc10c..1bf4cc4 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java @@ -64,13 +64,15 @@ public class MainActivity extends AppCompatActivity { if (navigationView.getMenu().getItem(0).isChecked()) { drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED); fab.setVisibility(View.VISIBLE); - } else if (navigationView.getMenu().getItem(4).isChecked()) { - finish(); } else { drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED); fab.setVisibility(View.GONE); } }); + navigationView.getMenu().getItem(4).setOnMenuItemClickListener(item -> { + finish(); + return false; + }); // Passing each menu ID as a set of Ids because each // menu should be considered as top level destinations. mAppBarConfiguration = new AppBarConfiguration.Builder(R.id.nav_home) diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/exit/ExitFragment.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/exit/ExitFragment.java deleted file mode 100644 index 8fc3de7..0000000 --- a/app/src/main/java/com/fatapp/oxygentoolbox/ui/exit/ExitFragment.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.fatapp.oxygentoolbox.ui.exit; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; - -public class ExitFragment extends Fragment { - - public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return null; - } -} \ No newline at end of file diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index 5ccbe71..d0430f6 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -29,7 +29,4 @@ android:label="@string/menu_about" tools:layout="@layout/fragment_about" /> - \ No newline at end of file