diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java index 0d522fb4..ac8346cd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java @@ -102,7 +102,7 @@ public class MainActivity extends BaseActivity ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( this, mBinding.drawerLayout, mBinding.appBarMain.toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); - mBinding.drawerLayout.setDrawerListener(toggle); + mBinding.drawerLayout.addDrawerListener(toggle); toggle.syncState(); @@ -122,6 +122,16 @@ public class MainActivity extends BaseActivity startActivity(myIntent); } + + public void toggleDrawer() { + if (mBinding.drawerLayout.isDrawerOpen(GravityCompat.START)) { + mBinding.drawerLayout.closeDrawer(GravityCompat.START); + } else { + mBinding.drawerLayout.openDrawer(GravityCompat.START); + } + } + + @Override public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { @@ -294,9 +304,13 @@ public class MainActivity extends BaseActivity for (int i = 0; i < count; i++) { getSupportFragmentManager().popBackStack(); } + + mBinding.appBarMain.elevatedToolbar.setVisibility(getSupportFragmentManager().getBackStackEntryCount() > 1 ? View.VISIBLE : View.GONE); } private void adaptViewToFragment(Fragment fragment) { + mBinding.appBarMain.elevatedToolbar.setVisibility(fragment instanceof MainFragment ? View.GONE : View.VISIBLE); + if (fragment instanceof ISearchableFragment) { mBinding.appBarMain.mainSearch.setOnQueryTextListener((SearchView.OnQueryTextListener) fragment); mBinding.appBarMain.mainSearch.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index 368311fa..8ffd9ca1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -1,10 +1,7 @@ package it.integry.integrywmsnative.gest.main; -import android.animation.ArgbEvaluator; -import android.animation.ObjectAnimator; import android.content.Context; -import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.LayoutInflater; @@ -122,7 +119,6 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_main, container, false); mBindings.setView(this); - mBindings.easterEggHorrorBloodExpandableLayout.setExpanded(false, false); return mBindings.getRoot(); } @@ -246,6 +242,13 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab } + + public void toggleDrawer() { + if (getActivity() != null && getActivity() instanceof MainActivity) { + ((MainActivity) getActivity()).toggleDrawer(); + } + } + private void collapseNoConnectionLayout() { if (getActivity() != null) getActivity().runOnUiThread(() -> mBindings.noConnectionTopLayout.collapse(true)); @@ -335,89 +338,6 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab this.mOnPreDestroyList.add(onPreDestroy); } - - public void toggleEasterEggMode() { - easterEggToggle = !easterEggToggle; - - - int rootBgStart, rootBgEnd; - int profileBgStart, profileBgEnd; - float titleFlipStart, titleFlipEnd; - int animationTimeMillis = 0; - - if (easterEggToggle) { - rootBgStart = Color.argb(255, 255, 255, 255); - rootBgEnd = Color.argb(255, 0, 0, 0); - - profileBgStart = Color.argb(255, 26, 115, 232); - profileBgEnd = Color.argb(255, 211, 47, 47); - animationTimeMillis = 2500; - titleFlipStart = 1f; - titleFlipEnd = -1f; - } else { - rootBgStart = Color.argb(255, 0, 0, 0); - rootBgEnd = Color.argb(255, 255, 255, 255); - - profileBgStart = Color.argb(255, 211, 47, 47); - profileBgEnd = Color.argb(255, 26, 115, 232); - animationTimeMillis = 750; - titleFlipStart = -1f; - titleFlipEnd = 1f; - } - - mBindings.easterEggHorrorBloodExpandableLayout.setDuration(animationTimeMillis); - mBindings.easterEggHorrorBloodExpandableLayout.setExpanded(easterEggToggle, true); - - View rootActivityView = requireActivity().findViewById(R.id.drawer_layout); - ObjectAnimator colorFadeRootBg = ObjectAnimator.ofObject(rootActivityView, "backgroundColor", - new ArgbEvaluator(), - rootBgStart, - rootBgEnd); - - colorFadeRootBg.setDuration(animationTimeMillis); - colorFadeRootBg.start(); - - View toolbarActivityView = requireActivity().findViewById(R.id.toolbar); - ObjectAnimator colorFadeToolbarBg = ObjectAnimator.ofObject(toolbarActivityView, "backgroundColor", - new ArgbEvaluator(), - rootBgStart, - rootBgEnd); - - colorFadeToolbarBg.setDuration(animationTimeMillis); - colorFadeToolbarBg.start(); - - ObjectAnimator colorFadeProfileBg = ObjectAnimator.ofObject(mBindings.profileRootContainer, "backgroundColor", - new ArgbEvaluator(), - profileBgStart, - profileBgEnd); - - colorFadeProfileBg.setDuration(animationTimeMillis); - colorFadeProfileBg.start(); - - View toolbarTitleActivityView = requireActivity().findViewById(R.id.toolbar_title); - ObjectAnimator flipToolbarTitleX = ObjectAnimator.ofFloat(toolbarTitleActivityView, "scaleX", - titleFlipStart, - titleFlipEnd); - - flipToolbarTitleX.setDuration(animationTimeMillis); - flipToolbarTitleX.start(); - - ObjectAnimator flipToolbarTitleY = ObjectAnimator.ofFloat(toolbarTitleActivityView, "scaleY", - titleFlipStart, - titleFlipEnd); - - flipToolbarTitleY.setDuration(animationTimeMillis); - flipToolbarTitleY.start(); - - ObjectAnimator colorFadeTitleTextColor = ObjectAnimator.ofObject(toolbarTitleActivityView, "textColor", - new ArgbEvaluator(), - rootBgEnd, - rootBgStart); - - colorFadeTitleTextColor.setDuration(animationTimeMillis); - colorFadeTitleTextColor.start(); - } - public void changeUserDepo() { DialogSwitchUserDepoView.newInstance(SettingsManager.iDB().getAvailableCodMdep(), this::onUserDepoChanged) .show(getParentFragmentManager(), "switch-user-depo"); diff --git a/app/src/main/res/drawable/easter_egg__horror_blood.xml b/app/src/main/res/drawable/easter_egg__horror_blood.xml deleted file mode 100644 index adc323f1..00000000 --- a/app/src/main/res/drawable/easter_egg__horror_blood.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index de9f1897..b86de747 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -8,6 +8,7 @@ type="it.integry.integrywmsnative.gest.main.MainFragment" /> + @@ -25,6 +26,162 @@ android:layout_height="wrap_content" android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -