Aggiornate tutte le icone del drawer e del menu principale.

This commit is contained in:
2019-05-30 19:29:42 +02:00
parent e04b2d3233
commit 57514172f4
57 changed files with 423 additions and 131 deletions

View File

@@ -1,9 +1,13 @@
package it.integry.integrywmsnative;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import androidx.annotation.IdRes;
import androidx.databinding.DataBindingUtil;
import android.content.IntentFilter;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
@@ -20,6 +24,8 @@ import android.view.MenuItem;
import android.view.View;
import androidx.fragment.app.FragmentTransaction;
import it.integry.honeywellscannerlibrary.HoneyWellBarcodeReader;
import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker;
import it.integry.integrywmsnative.core.interfaces.IFilterableFragment;
import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
@@ -42,6 +48,7 @@ import it.integry.integrywmsnative.gest.settings.MainSettingsFragment;
import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment;
import it.integry.integrywmsnative.gest.vendita.MainVenditaFragment;
import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment;
import it.integry.plugins.barcode_base_library.exception.BarcodeAdapterNotFoundException;
public class MainActivity extends AppCompatActivity
implements NavigationView.OnNavigationItemSelectedListener, IPoppableActivity {
@@ -78,8 +85,8 @@ public class MainActivity extends AppCompatActivity
openMain();
init();
}
}
private void startLoginActivity(){
this.finish();

View File

@@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.barcode_reader;
import android.content.Context;
import androidx.appcompat.app.AppCompatActivity;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.List;
@@ -16,7 +18,7 @@ import it.integry.zebrascannerlibrary.ZebraBarcodeReader;
public class BarcodeManager {
private static Context context;
private static AppCompatActivity context;
private static BarcodeReaderInterface mCurrentBarcodeInterface;
private static List<BarcodeCallbackDTO> mBarcodeCallbacksStacktrace = new ArrayList<>();
@@ -27,11 +29,11 @@ public class BarcodeManager {
private static Class<? extends BarcodeReaderInterface>[] registeredBarcodeReaderInterfaces = new Class[]{
PointMobileBarcodeReader.class,
ZebraBarcodeReader.class,
// HoneyWellBarcodeReader.class
HoneyWellBarcodeReader.class
};
public static void init(Context context) {
public static void init(AppCompatActivity context) {
BarcodeManager.context = context;
initBarcodeReader();
@@ -60,22 +62,26 @@ public class BarcodeManager {
if(mCurrentBarcodeInterface != null) {
try {
mCurrentBarcodeInterface.init();
mCurrentBarcodeInterface.init(() -> {
mCurrentBarcodeInterface.register(data -> {
BarcodeCallbackDTO callback = getValidCallback();
if(callback != null && mEnabled) {
callback.getOnScanSuccessfull().run(data);
}
}, ex -> {
BarcodeCallbackDTO callback = getValidCallback();
if(callback != null && mEnabled) {
callback.getOnScanFailed().run(ex);
}
});
});
} catch (BarcodeAdapterNotFoundException ex) {
UtilityExceptions.defaultException(context, ex);
}
mCurrentBarcodeInterface.register(data -> {
BarcodeCallbackDTO callback = getValidCallback();
if(callback != null && mEnabled) {
callback.getOnScanSuccessfull().run(data);
}
}, ex -> {
BarcodeCallbackDTO callback = getValidCallback();
if(callback != null && mEnabled) {
callback.getOnScanFailed().run(ex);
}
});
}
}

View File

@@ -31,14 +31,12 @@ public class AppContext {
public void init() {
this.initUtilities();
this.initSettings();
this.initCrashlytics();
this.initBarcode();
this.initUtilities();
this.initLogger();
this.initRecoverColli();
@@ -65,10 +63,6 @@ public class AppContext {
}
}
private void initBarcode() {
BarcodeManager.init(mContext);
}
private void initUtilities() {
UtilityResources.init(mContext);
UtilityToast.init(mContext);

View File

@@ -6,7 +6,9 @@ import android.text.SpannableString;
import java.lang.reflect.Method;
import androidx.appcompat.app.AppCompatActivity;
import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
import it.integry.integrywmsnative.core.class_router.ClassRouter;
import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
@@ -22,6 +24,9 @@ public class MainContext {
public void init(Runnable onContextInitialized) {
BarcodeManager.init(mContext);
this.initDBData(() -> {
onContextInitialized.run();
});

View File

@@ -121,7 +121,7 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS
ButterKnife.bind(this, mBinding.getRoot());
// if(mWaterfallToolbar != null) mWaterfallToolbar.setRecyclerView(mBinding.venditaMainList);
mToolbar.setRecyclerView(mBinding.venditaMainList);
if(mToolbar != null) mToolbar.setRecyclerView(mBinding.venditaMainList);
return mBinding.getRoot();
}