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

Finish Hotfix-Vario

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-02-20 19:32:40 +01:00
commit 17d2e7f980
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

4
app/build.gradle
View File

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 36 def appVersionCode = 37
def appVersionName = '1.0.33' def appVersionName = '1.0.34'
signingConfigs { signingConfigs {
release { release {

2
app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java
View File

@ -108,7 +108,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
ButterKnife.bind(this, mBinding.getRoot()); ButterKnife.bind(this, mBinding.getRoot());
mWaterfallToolbar.setRecyclerView(mBinding.accettazioneMainList); if(mWaterfallToolbar != null) mWaterfallToolbar.setRecyclerView(mBinding.accettazioneMainList);
return mBinding.getRoot(); return mBinding.getRoot();
} }

2
app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
View File

@ -78,7 +78,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
ButterKnife.bind(this, mBindings.getRoot()); ButterKnife.bind(this, mBindings.getRoot());
mWaterfallToolbar.setNestedScrollView(mBindings.fragmentMainScrollview); if(mWaterfallToolbar != null) mWaterfallToolbar.setNestedScrollView(mBindings.fragmentMainScrollview);
init(); init();
return mBindings.getRoot(); return mBindings.getRoot();

2
app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java
View File

@ -100,7 +100,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked<MtbColr> {
if(mtbColt.get() != null) { if(mtbColt.get() != null) {
initAdapter(); initAdapter();
mAppBarTitle.setText(String.format(mContext.getText(R.string.lu_number_text).toString(), mtbColt.get().getNumCollo())); if(mAppBarTitle != null) mAppBarTitle.setText(String.format(mContext.getText(R.string.lu_number_text).toString(), mtbColt.get().getNumCollo()));
initObservableMtbColr(); initObservableMtbColr();
} }

4
waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt
View File

@ -54,9 +54,11 @@ open class WaterfallToolbar : androidx.cardview.widget.CardView {
var scrollViewScrollListener : ViewTreeObserver.OnScrollChangedListener = ViewTreeObserver.OnScrollChangedListener { var scrollViewScrollListener : ViewTreeObserver.OnScrollChangedListener = ViewTreeObserver.OnScrollChangedListener {
// real position must always get updated // real position must always get updated
if(scrollView != null) {
realPosition.value = scrollView!!.scrollY realPosition.value = scrollView!!.scrollY
mutualScrollListenerAction() mutualScrollListenerAction()
} }
}
/** /**
* The scroll view whose scroll is going to be listened * The scroll view whose scroll is going to be listened
@ -69,9 +71,11 @@ open class WaterfallToolbar : androidx.cardview.widget.CardView {
var nestedScrollViewScrollListener : ViewTreeObserver.OnScrollChangedListener = ViewTreeObserver.OnScrollChangedListener { var nestedScrollViewScrollListener : ViewTreeObserver.OnScrollChangedListener = ViewTreeObserver.OnScrollChangedListener {
// real position must always get updated // real position must always get updated
if(nestedScrollView != null) {
realPosition.value = nestedScrollView!!.scrollY realPosition.value = nestedScrollView!!.scrollY
mutualScrollListenerAction() mutualScrollListenerAction()
} }
}
/** /**
* The three variables ahead are null safe, since they are always set * The three variables ahead are null safe, since they are always set