diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java index 6f34135..13890ff 100644 --- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java +++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java @@ -95,11 +95,13 @@ public class MainActivity extends AppCompatActivity private CustomAccountManager mAccountManager; private boolean isPaused = false; private boolean isLoggedInBeforePause = false; + private boolean isDrawerFixed = false; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); mAccountManager = new CustomAccountManager(AccountManager.get(this), () -> MainActivity.this); + isDrawerFixed = getResources().getBoolean(R.bool.isDrawerFixed); int desiredPage = getDefaultFragmentAfterLogin(); String desiredData = ""; Intent intent = getIntent(); @@ -120,11 +122,13 @@ public class MainActivity extends AppCompatActivity Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - DrawerLayout drawer = findViewById(R.id.drawer_layout); - ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( - this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); - drawer.addDrawerListener(toggle); - toggle.syncState(); + if (!isDrawerFixed) { + DrawerLayout drawer = findViewById(R.id.drawer_layout); + ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( + this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); + drawer.addDrawerListener(toggle); + toggle.syncState(); + } mNavigationView = findViewById(R.id.nav_view); mNavigationView.setNavigationItemSelectedListener(this); @@ -210,7 +214,7 @@ public class MainActivity extends AppCompatActivity } DrawerLayout drawer = findViewById(R.id.drawer_layout); - if (drawer.isDrawerOpen(GravityCompat.START)) { + if (drawer.isDrawerOpen(GravityCompat.START) && !isDrawerFixed) { drawer.closeDrawer(GravityCompat.START); } else { if (mFragmentPage == FRAGMENT_MODULES_DETAILS) { @@ -305,8 +309,10 @@ public class MainActivity extends AppCompatActivity break; } - DrawerLayout drawer = findViewById(R.id.drawer_layout); - drawer.closeDrawer(GravityCompat.START); + if (!isDrawerFixed) { + DrawerLayout drawer = findViewById(R.id.drawer_layout); + drawer.closeDrawer(GravityCompat.START); + } int size = mNavigationView.getMenu().size(); for (int k = 0; k < size; k++) { @@ -544,7 +550,7 @@ public class MainActivity extends AppCompatActivity if (!viewBtn.hasOnClickListeners()) viewBtn.setOnClickListener(v -> { DrawerLayout drawer = findViewById(R.id.drawer_layout); - if (drawer.isDrawerOpen(GravityCompat.START)) { + if (drawer.isDrawerOpen(GravityCompat.START) && !isDrawerFixed) { drawer.closeDrawer(GravityCompat.START); } mAccountManager.getTokenByType(AccountGeneral.ACCOUNT_TYPE, AccountGeneral.AUTHTOKEN_TYPE_KVV, null, null); diff --git a/app/src/main/res/layout-sw600dp/activity_main.xml b/app/src/main/res/layout-sw600dp/activity_main.xml new file mode 100644 index 0000000..ed7326a --- /dev/null +++ b/app/src/main/res/layout-sw600dp/activity_main.xml @@ -0,0 +1,32 @@ + + + + + + + + + + diff --git a/app/src/main/res/values-sw600dp/config_ui.xml b/app/src/main/res/values-sw600dp/config_ui.xml new file mode 100644 index 0000000..0169986 --- /dev/null +++ b/app/src/main/res/values-sw600dp/config_ui.xml @@ -0,0 +1,4 @@ + + + true + \ No newline at end of file diff --git a/app/src/main/res/values/config_ui.xml b/app/src/main/res/values/config_ui.xml new file mode 100644 index 0000000..f903dc6 --- /dev/null +++ b/app/src/main/res/values/config_ui.xml @@ -0,0 +1,4 @@ + + + false + \ No newline at end of file