Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish v1.16.10(192)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2021-03-02 09:19:19 +01:00
commit 58b4ebb420
6 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 191 def appVersionCode = 192
def appVersionName = '1.16.9' def appVersionName = '1.16.10'
signingConfigs { signingConfigs {
release { release {

14
app/src/main/java/it/integry/integrywmsnative/MainActivity.java
View File

@ -277,6 +277,11 @@ public class MainActivity extends BaseActivity
mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.VISIBLE); mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.VISIBLE);
return false; return false;
}); });
((ISearcableFragment) fragment).addOnPreDestroy(() -> {
mBinding.appBarMain.mainSearch.setIconified(true);
mBinding.appBarMain.mainSearch.setVisibility(View.GONE);
});
} else { } else {
mBinding.appBarMain.mainSearch.setOnQueryTextListener(null); mBinding.appBarMain.mainSearch.setOnQueryTextListener(null);
mBinding.appBarMain.mainSearch.setVisibility(View.GONE); mBinding.appBarMain.mainSearch.setVisibility(View.GONE);
@ -289,7 +294,7 @@ public class MainActivity extends BaseActivity
mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.GONE); mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.GONE);
mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.VISIBLE); mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.VISIBLE);
((ITitledFragment) fragment).onCreateActionBar(mBinding.appBarMain.toolbarTitleLeft, this); ((ITitledFragment) fragment).onCreateActionBar(mBinding.appBarMain.toolbarTitleLeft, this);
((IScrollableFragment) fragment).addOnPreDestroy(() -> { ((ITitledFragment) fragment).addOnPreDestroy(() -> {
mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.VISIBLE); mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.VISIBLE);
mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.GONE); mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.GONE);
}); });
@ -313,7 +318,7 @@ public class MainActivity extends BaseActivity
((ISelectAllFragment)fragment).onSelectAll(); ((ISelectAllFragment)fragment).onSelectAll();
} }
}); });
((ISelectAllFragment) fragment).setSelectAllOnPreDestroy(() -> { ((ISelectAllFragment) fragment).addOnPreDestroy(() -> {
mBinding.appBarMain.mainSelectAll.setVisibility(View.GONE); mBinding.appBarMain.mainSelectAll.setVisibility(View.GONE);
mBinding.appBarMain.mainSelectAll.setOnClickListener(null); mBinding.appBarMain.mainSelectAll.setOnClickListener(null);
}); });
@ -327,6 +332,11 @@ public class MainActivity extends BaseActivity
((IFilterableFragment)fragment).onFilterClick(); ((IFilterableFragment)fragment).onFilterClick();
} }
}); });
((IFilterableFragment)fragment).addOnPreDestroy(() -> {
mBinding.appBarMain.mainFilter.setVisibility(View.GONE);
mBinding.appBarMain.mainFilter.setOnClickListener(null);
});
} else { } else {
mBinding.appBarMain.mainFilter.setVisibility(View.GONE); mBinding.appBarMain.mainFilter.setVisibility(View.GONE);
mBinding.appBarMain.mainFilter.setOnClickListener(null); mBinding.appBarMain.mainFilter.setOnClickListener(null);

2
app/src/main/java/it/integry/integrywmsnative/core/interfaces/IFilterableFragment.java
View File

@ -1,6 +1,6 @@
package it.integry.integrywmsnative.core.interfaces; package it.integry.integrywmsnative.core.interfaces;
public interface IFilterableFragment { public interface IFilterableFragment extends IDestroyableFragment {
void onFilterClick(); void onFilterClick();

2
app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISearcableFragment.java
View File

@ -2,7 +2,7 @@ package it.integry.integrywmsnative.core.interfaces;
import androidx.appcompat.widget.SearchView; import androidx.appcompat.widget.SearchView;
public interface ISearcableFragment extends SearchView.OnQueryTextListener { public interface ISearcableFragment extends SearchView.OnQueryTextListener, IDestroyableFragment {
void onSearchEnabled(); void onSearchEnabled();

4
app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISelectAllFragment.java
View File

@ -1,11 +1,9 @@
package it.integry.integrywmsnative.core.interfaces; package it.integry.integrywmsnative.core.interfaces;
public interface ISelectAllFragment { public interface ISelectAllFragment extends IDestroyableFragment {
boolean isSelectAllButtonEnabled(); boolean isSelectAllButtonEnabled();
void onSelectAll(); void onSelectAll();
void setSelectAllOnPreDestroy(Runnable onPreDestroy);
} }

5
app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
View File

@ -359,11 +359,6 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm
.forEach(x -> x.getSelectedObservable().set(!allSelected)); .forEach(x -> x.getSelectedObservable().set(!allSelected));
} }
@Override
public void setSelectAllOnPreDestroy(Runnable onPreDestroy) {
this.mOnPreDestroyList.add(onPreDestroy);
}
private DialogVenditaFiltroAvanzatoViewModel mAppliedFilterViewModel; private DialogVenditaFiltroAvanzatoViewModel mAppliedFilterViewModel;