Aggiornate tutte le icone del drawer e del menu principale.

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

View File

@ -147,8 +147,8 @@
<option name="values">
<map>
<entry key="assetSourceType" value="FILE" />
<entry key="outputName" value="app_round_icon" />
<entry key="sourceFile" value="C:\Work\Prod_Android\WMS_Native\ext_sources\RoundLogoWithText.svg" />
<entry key="outputName" value="ic_black_latest_delivery" />
<entry key="sourceFile" value="C:\Users\GiuseppeS\Desktop\icons8-deliver-food (1).svg" />
</map>
</option>
</PersistentState>

Binary file not shown.

View File

@ -22,7 +22,14 @@
android:name=".MainActivity"
android:screenOrientation="portrait"
android:theme="@style/Light"
android:windowSoftInputMode="adjustPan"></activity>
android:windowSoftInputMode="adjustPan">
<intent-filter>
<action android:name="android.intent.action.CLIENTBARCODEACTIVITY"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity
android:name=".gest.accettazione_ordine_inevaso.AccettazioneOrdineInevasoActivity"
android:screenOrientation="portrait"

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,10 +62,7 @@ public class BarcodeManager {
if(mCurrentBarcodeInterface != null) {
try {
mCurrentBarcodeInterface.init();
} catch (BarcodeAdapterNotFoundException ex) {
UtilityExceptions.defaultException(context, ex);
}
mCurrentBarcodeInterface.init(() -> {
mCurrentBarcodeInterface.register(data -> {
BarcodeCallbackDTO callback = getValidCallback();
@ -76,6 +75,13 @@ public class BarcodeManager {
callback.getOnScanFailed().run(ex);
}
});
});
} catch (BarcodeAdapterNotFoundException ex) {
UtilityExceptions.defaultException(context, 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();
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -0,0 +1,4 @@
<vector android:height="24dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M3,4C2.448,4 2,4.448 2,5L2,19C2,19.552 2.448,20 3,20C3.552,20 4,19.552 4,19L4,5C4,4.448 3.552,4 3,4zM6,4C5.448,4 5,4.448 5,5L5,19C5,19.552 5.448,20 6,20L8,20C8.552,20 9,19.552 9,19L9,5C9,4.448 8.552,4 8,4L6,4zM11,4C10.448,4 10,4.448 10,5L10,19C10,19.552 10.448,20 11,20C11.552,20 12,19.552 12,19L12,5C12,4.448 11.552,4 11,4zM14,4C13.448,4 13,4.448 13,5L13,19C13,19.552 13.448,20 14,20L15,20C15.552,20 16,19.552 16,19L16,5C16,4.448 15.552,4 15,4L14,4zM18,4C17.448,4 17,4.448 17,5L17,19C17,19.552 17.448,20 18,20C18.552,20 19,19.552 19,19L19,5C19,4.448 18.552,4 18,4zM21,4C20.448,4 20,4.448 20,5L20,19C20,19.552 20.448,20 21,20C21.552,20 22,19.552 22,19L22,5C22,4.448 21.552,4 21,4z"/>
</vector>

View File

@ -0,0 +1,4 @@
<vector android:height="24dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M2.5,4C2.224,4 2,4.224 2,4.5L2,9.5C2,9.776 2.224,10 2.5,10L3.5,10C3.776,10 4,9.776 4,9.5L4,4.5C4,4.224 3.776,4 3.5,4L2.5,4zM5.5,4C5.224,4 5,4.224 5,4.5L5,9.5C5,9.776 5.224,10 5.5,10L8.5,10C8.776,10 9,9.776 9,9.5L9,4.5C9,4.224 8.776,4 8.5,4L5.5,4zM10.5,4C10.224,4 10,4.224 10,4.5L10,9.5C10,9.776 10.224,10 10.5,10L11.5,10C11.776,10 12,9.776 12,9.5L12,4.5C12,4.224 11.776,4 11.5,4L10.5,4zM13.5,4C13.224,4 13,4.224 13,4.5L13,9.5C13,9.776 13.224,10 13.5,10L15.5,10C15.776,10 16,9.776 16,9.5L16,4.5C16,4.224 15.776,4 15.5,4L13.5,4zM17.5,4C17.224,4 17,4.224 17,4.5L17,9.5C17,9.776 17.224,10 17.5,10L18.5,10C18.776,10 19,9.776 19,9.5L19,4.5C19,4.224 18.776,4 18.5,4L17.5,4zM20.5,4C20.224,4 20,4.224 20,4.5L20,9.5C20,9.776 20.224,10 20.5,10L21.5,10C21.776,10 22,9.776 22,9.5L22,4.5C22,4.224 21.776,4 21.5,4L20.5,4zM4,12C2.897,12 2,12.897 2,14L2,19C2,20.103 2.897,21 4,21L20,21C21.103,21 22,20.103 22,19L22,14C22,12.897 21.103,12 20,12L4,12zM5.5,14L8.5,14C8.776,14 9,14.224 9,14.5L9,18.5C9,18.776 8.776,19 8.5,19L5.5,19C5.224,19 5,18.776 5,18.5L5,14.5C5,14.224 5.224,14 5.5,14zM10.5,14L11.5,14C11.776,14 12,14.224 12,14.5L12,18.5C12,18.776 11.776,19 11.5,19L10.5,19C10.224,19 10,18.776 10,18.5L10,14.5C10,14.224 10.224,14 10.5,14zM13.5,14L15.5,14C15.776,14 16,14.224 16,14.5L16,18.5C16,18.776 15.776,19 15.5,19L13.5,19C13.224,19 13,18.776 13,18.5L13,14.5C13,14.224 13.224,14 13.5,14zM17.5,14L18.5,14C18.776,14 19,14.224 19,14.5L19,18.5C19,18.776 18.776,19 18.5,19L17.5,19C17.224,19 17,18.776 17,18.5L17,14.5C17,14.224 17.224,14 17.5,14z"/>
</vector>

View File

@ -0,0 +1,4 @@
<vector android:height="24dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M11,2C10.448,2 10,2.448 10,3L10,11L6.5,11A0.5,0.5 0,0 0,6 11.5A0.5,0.5 0,0 0,6.1465 11.8535A0.5,0.5 0,0 0,6.1777 11.8828L11.2832,16.6973L11.3164,16.7285A1,1 0,0 0,12 17A1,1 0,0 0,12.6836 16.7285L12.6973,16.7168A1,1 0,0 0,12.707 16.7051L17.8105,11.8926A0.5,0.5 0,0 0,17.8398 11.8652L17.8477,11.8594A0.5,0.5 0,0 0,17.8535 11.8535A0.5,0.5 0,0 0,18 11.5A0.5,0.5 0,0 0,17.5 11L14,11L14,3C14,2.448 13.552,2 13,2L12,2L11,2zM3,20A1.0001,1.0001 0,1 0,3 22L21,22A1.0001,1.0001 0,1 0,21 20L3,20z"/>
</vector>

View File

@ -0,0 +1,4 @@
<vector android:height="24dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M5.75,3A1.0001,1.0001 0,0 0,4.8867 3.4961L3.1367,6.4961L0.1426,11.4863A1.0001,1.0001 0,1 0,1.8574 12.5137L3,10.6094L3,19C3,20.0931 3.9069,21 5,21L19,21C20.0931,21 21,20.0931 21,19L21,10.6094L22.1426,12.5137A1.0001,1.0001 0,1 0,23.8574 11.4863L20.877,6.5215A1.0001,1.0001 0,0 0,20.8633 6.4961L19.1133,3.4961A1.0001,1.0001 0,0 0,18.25 3L5.75,3zM6.3242,5L17.6758,5L18.8418,7L5.1582,7L6.3242,5zM10,9L14,9C14.552,9 15,9.448 15,10C15,10.552 14.552,11 14,11L10,11C9.448,11 9,10.552 9,10C9,9.448 9.448,9 10,9z"/>
</vector>

View File

@ -0,0 +1,4 @@
<vector android:height="24dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M6.9785,3.5098A1.0001,1.0001 0,0 0,6.4434 3.6875C3.7651,5.4804 2,8.5405 2,12C2,17.5113 6.4887,22 12,22C17.5113,22 22,17.5113 22,12C22,8.5405 20.2349,5.4804 17.5566,3.6875A1.0003,1.0003 0,1 0,16.4434 5.3496C18.5871,6.7847 20,9.2195 20,12C20,16.4307 16.4307,20 12,20C7.5693,20 4,16.4307 4,12C4,9.2195 5.4129,6.7847 7.5566,5.3496A1.0001,1.0001 0,0 0,6.9785 3.5098zM12,4C11.448,4 11,4.448 11,5L11,11L8.7676,11C8.3146,11 8.0852,11.5481 8.4063,11.8691L11.2109,14.6738C11.6469,15.1098 12.3531,15.1098 12.7891,14.6738L15.5938,11.8691C15.9148,11.5481 15.6854,11 15.2324,11L13,11L13,5C13,4.448 12.552,4 12,4z"/>
</vector>

View File

@ -0,0 +1,4 @@
<vector android:height="24dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M12,2A1,1 0,0 0,11.2891 2.2969L1.2031,11.0977A0.5,0.5 0,0 0,1 11.5A0.5,0.5 0,0 0,1.5 12L4,12L4,20C4,20.552 4.448,21 5,21L8,21C8.552,21 9,20.552 9,20L9,14L15,14L15,20C15,20.552 15.448,21 16,21L19,21C19.552,21 20,20.552 20,20L20,12L22.5,12A0.5,0.5 0,0 0,23 11.5A0.5,0.5 0,0 0,22.7969 11.0977L19,7.7852L19,5C19,4.448 18.552,4 18,4C17.448,4 17,4.448 17,5L17,6.0391L12.7168,2.3027A1,1 0,0 0,12.7109 2.2969A1,1 0,0 0,12 2z"/>
</vector>

View File

@ -0,0 +1,4 @@
<vector android:height="24dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M6.9785,3.5098A1.0001,1.0001 0,0 0,6.4434 3.6875C3.7651,5.4804 2,8.5405 2,12C2,17.5113 6.4887,22 12,22C17.5113,22 22,17.5113 22,12C22,8.5405 20.2349,5.4804 17.5566,3.6875A1.0003,1.0003 0,1 0,16.4434 5.3496C18.5871,6.7847 20,9.2195 20,12C20,16.4307 16.4307,20 12,20C7.5693,20 4,16.4307 4,12C4,9.2195 5.4129,6.7847 7.5566,5.3496A1.0001,1.0001 0,0 0,6.9785 3.5098zM12,4C11.7145,4 11.4289,4.1082 11.2109,4.3262L8.4063,7.1309C8.0852,7.4519 8.3146,8 8.7676,8L11,8L11,14C11,14.552 11.448,15 12,15C12.552,15 13,14.552 13,14L13,8L15.2324,8C15.6854,8 15.9148,7.4519 15.5938,7.1309L12.7891,4.3262C12.5711,4.1082 12.2855,4 12,4z"/>
</vector>

View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M6,1C2.691,1 0,3.691 0,7C0,8.771 0.776,10.3609 2,11.4609L2,18C2,18.552 2.448,19 3,19L3.0508,19C3.2958,20.692 4.742,22 6.5,22C8.258,22 9.7042,20.692 9.9492,19L14.0508,19C14.2958,20.692 15.74,22 17.498,22C19.256,22 20.7023,20.692 20.9473,19L22,19C22.552,19 23,18.552 23,18L23,15.3066C23,14.7496 22.8467,14.2064 22.5547,13.7324L20.5176,10.4277C19.9676,9.5337 19.0119,9 17.9629,9L16,9L16,7C16,6.448 15.552,6 15,6L11.9102,6C11.4312,3.167 8.967,1 6,1zM6,3C8.206,3 10,4.794 10,7C10,9.206 8.206,11 6,11C3.794,11 2,9.206 2,7C2,4.794 3.794,3 6,3zM6,5C5.448,5 5,5.448 5,6L5,8.207C5,8.34 5.0535,8.4675 5.1465,8.5605L5.998,9.4121C6.389,9.8031 7.0221,9.8031 7.4121,9.4121C7.8021,9.0211 7.8031,8.389 7.4121,7.998L7,7.5859L7,6C7,5.448 6.552,5 6,5zM16,11L17.9629,11C18.3129,11 18.6315,11.1786 18.8145,11.4766L20.8516,14.7813C20.9496,14.9392 21,15.1206 21,15.3066L21,17L20.6484,17C20.0844,15.822 18.891,15 17.5,15C16.961,15 16.456,15.1336 16,15.3516L16,11zM6.5,17C7.327,17 8,17.673 8,18.5C8,19.327 7.327,20 6.5,20C5.673,20 5,19.327 5,18.5C5,17.673 5.673,17 6.5,17zM17.5,17C18.327,17 19,17.673 19,18.5C19,19.327 18.327,20 17.5,20C16.673,20 16,19.327 16,18.5C16,17.673 16.673,17 17.5,17z"/>
</vector>

View File

@ -0,0 +1,4 @@
<vector android:height="24dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M6,2C4.895,2 4,2.895 4,4L4,6C4,6.552 4.448,7 5,7L19,7C19.552,7 20,6.552 20,6L20,4C20,2.895 19.105,2 18,2L6,2zM5,9C4.448,9 4,9.448 4,10L4,14C4,14.552 4.448,15 5,15L15.1719,15L17.4023,12.7695C17.8953,12.2765 18.5637,12 19.2617,12L20,12L20,10C20,9.448 19.552,9 19,9L5,9zM19,14C18.7798,14 18.5606,14.084 18.3926,14.252L15.7344,16.9102C15.3314,17.3132 15.6156,18 16.1836,18L18,18L18,23A1.0001,1.0001 0,1 0,20 23L20,18L21.8145,18C22.3835,18 22.6696,17.3132 22.2676,16.9102L19.6094,14.252C19.4414,14.084 19.2202,14 19,14zM5,17.002C4.448,17.002 4,17.45 4,18.002L4,20.002C4,21.107 4.895,22.002 6,22.002L16,22.002L16,20.002C15.937,20.002 15.8832,19.9826 15.8242,19.9746L15.752,19.9629C15.682,19.9499 15.6109,19.939 15.5469,19.916C14.7469,19.718 14.0721,19.1571 13.7461,18.3711C13.5621,17.9261 13.5132,17.456 13.5762,17.002L5,17.002z"/>
</vector>

View File

@ -0,0 +1,4 @@
<vector android:height="24dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M3.5,2C3.372,2 3.2445,2.0495 3.1465,2.1465C2.9515,2.3415 2.9515,2.6585 3.1465,2.8535L5.0938,4.8008C3.195,6.6199 2,9.1685 2,12C2,17.5113 6.4887,22 12,22C17.5113,22 22,17.5113 22,12C22,6.8641 18.1065,2.6176 13.1094,2.0645A1.0001,1.0001 0,0 0,13.0098 2.0586A1.0001,1.0001 0,0 0,12.8906 4.0527C16.8915,4.4956 20,7.8719 20,12C20,16.4307 16.4307,20 12,20C7.5693,20 4,16.4307 4,12C4,9.7105 4.9675,7.6644 6.5039,6.2109L8.1465,7.8535C8.3415,8.0485 8.6585,8.0485 8.8535,7.8535C8.9515,7.7565 9,7.628 9,7.5L9,3A1,1 0,0 0,8 2L3.5,2z"/>
</vector>

View File

@ -0,0 +1,4 @@
<vector android:height="24dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M12,2A1,1 0,0 0,11.293 2.2949L6.1602,7.1348A0.5,0.5 0,0 0,6.1484 7.1445L6.1465,7.1465A0.5,0.5 0,0 0,6 7.5A0.5,0.5 0,0 0,6.5 8L10,8L10,16C10,16.552 10.448,17 11,17L12,17L13,17C13.552,17 14,16.552 14,16L14,8L17.5,8A0.5,0.5 0,0 0,18 7.5A0.5,0.5 0,0 0,17.8535 7.1465L17.8223,7.1172L12.7168,2.3027A1,1 0,0 0,12.6836 2.2715A1,1 0,0 0,12 2zM3,20A1.0001,1.0001 0,1 0,3 22L21,22A1.0001,1.0001 0,1 0,21 20L3,20z"/>
</vector>

View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
</vector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
</vector>

View File

@ -0,0 +1,16 @@
<vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#388E3C" android:pathData="M29,38L7,38C5.8945,38 5,37.1055 5,36L5,15C5,13.8945 5.8945,13 7,13L27,13C28.1055,13 29,13.8945 29,15Z"/>
<path android:fillColor="#8BC34A" android:pathData="M43,38L29,38L29,18L39.5586,18C40.418,18 41.1836,18.5508 41.457,19.3672L45,30L45,36C45,37.1055 44.1055,38 43,38"/>
<path android:fillColor="#37474F" android:pathData="M41,37.5C41,39.9844 38.9844,42 36.5,42C34.0156,42 32,39.9844 32,37.5C32,35.0156 34.0156,33 36.5,33C38.9844,33 41,35.0156 41,37.5"/>
<path android:fillColor="#37474F" android:pathData="M19,37.5C19,39.9844 16.9844,42 14.5,42C12.0156,42 10,39.9844 10,37.5C10,35.0156 12.0156,33 14.5,33C16.9844,33 19,35.0156 19,37.5"/>
<path android:fillColor="#78909C" android:pathData="M38,37.5C38,38.3281 37.3281,39 36.5,39C35.6719,39 35,38.3281 35,37.5C35,36.6719 35.6719,36 36.5,36C37.3281,36 38,36.6719 38,37.5"/>
<path android:fillColor="#78909C" android:pathData="M16,37.5C16,38.3281 15.3281,39 14.5,39C13.6719,39 13,38.3281 13,37.5C13,36.6719 13.6719,36 14.5,36C15.3281,36 16,36.6719 16,37.5"/>
<path android:fillColor="#37474F" android:pathData="M40,28L33,28C32.4492,28 32,27.5508 32,27L32,21C32,20.4492 32.4492,20 33,20L38.2773,20C38.7109,20 39.0938,20.2734 39.2266,20.6836L40.9492,25.8477C40.9805,25.9492 41,26.0547 41,26.1602L41,27C41,27.5508 40.5508,28 40,28"/>
<path android:fillColor="#1B5E20" android:pathData="M12.5,27C18.8516,27 24,21.8516 24,15.5C24,14.6406 23.8984,13.8047 23.7188,13L7,13C5.8945,13 5,13.8945 5,15L5,24.207C7.0156,25.9414 9.6328,27 12.5,27Z"/>
<path android:fillColor="#00ACC1" android:pathData="M22,15.5C22,20.7461 17.7461,25 12.5,25C7.2539,25 3,20.7461 3,15.5C3,10.2539 7.2539,6 12.5,6C17.7461,6 22,10.2539 22,15.5"/>
<path android:fillColor="#EEEEEE" android:pathData="M12.5,8.5C8.6328,8.5 5.5,11.6328 5.5,15.5C5.5,19.3672 8.6328,22.5 12.5,22.5C16.3672,22.5 19.5,19.3672 19.5,15.5C19.5,11.6328 16.3672,8.5 12.5,8.5ZM12.5,16C12.2266,16 12,15.7773 12,15.5C12,15.2227 12.2266,15 12.5,15C12.7734,15 13,15.2227 13,15.5C13,15.7773 12.7734,16 12.5,16Z"/>
<path android:fillColor="#FF000000" android:pathData="M12,10L13,10L13,14.5625L12,14.5625Z"/>
<path android:fillColor="#FF000000" android:pathData="M16.3438,18.1719L15.168,19.3438L12.3984,16.5703L13.5703,15.3984Z"/>
<path android:fillColor="#FF000000" android:pathData="M12.5,14C11.6719,14 11,14.6719 11,15.5C11,16.3281 11.6719,17 12.5,17C13.3281,17 14,16.3281 14,15.5C14,14.6719 13.3281,14 12.5,14ZM12.5,16C12.2266,16 12,15.7773 12,15.5C12,15.2227 12.2266,15 12.5,15C12.7734,15 13,15.2227 13,15.5C13,15.7773 12.7734,16 12.5,16Z"/>
</vector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 992 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M9,16h6v-6h4l-7,-7 -7,7h4zM5,18h14v2L5,20z"/>
</vector>

View File

@ -138,7 +138,7 @@
android:layout_height="30dp"
android:layout_marginEnd="16dp"
android:adjustViewBounds="true"
android:src="@drawable/ic_recover_96"
android:src="@drawable/ic_black_recover"
android:tint="@android:color/white" />
<LinearLayout
@ -428,46 +428,52 @@
</com.google.android.material.card.MaterialCardView>
</RelativeLayout>
<!--<com.google.android.material.card.MaterialCardView-->
<!--android:id="@+id/fast_button_resi_clienti"-->
<!--style="@style/Widget.MaterialComponents.CardView"-->
<!--android:layout_width="0dp"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_margin="8dp"-->
<!--app:layout_constraintTop_toBottomOf="@id/fast_button_versamento"-->
<!--app:layout_constraintStart_toEndOf="@id/guide_1"-->
<!--app:layout_constraintEnd_toEndOf="parent"-->
<!--app:cardBackgroundColor="@android:color/white"-->
<!--app:cardCornerRadius="4dp">-->
<RelativeLayout
android:id="@+id/fast_button_resi_clienti"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/fast_button_versamento"
app:layout_constraintStart_toEndOf="@id/guide_1"
app:layout_constraintEnd_toEndOf="parent">
<com.google.android.material.card.MaterialCardView
style="@style/Widget.MaterialComponents.CardView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
app:cardBackgroundColor="@android:color/white"
app:cardCornerRadius="4dp">
<!--<LinearLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:gravity="center_horizontal"-->
<!--android:orientation="vertical"-->
<!--android:padding="8dp">-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="8dp">
<!--<ImageView-->
<!--android:layout_width="64sp"-->
<!--android:layout_height="wrap_content"-->
<!--android:adjustViewBounds="true"-->
<!--android:src="@drawable/ic_versamento_merce_96" />-->
<ImageView
android:layout_width="64sp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@drawable/ic_latest_delivery" />
<!--<androidx.appcompat.widget.AppCompatTextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginTop="16dp"-->
<!--android:gravity="center_horizontal"-->
<!--android:text="@string/fragment_ultime_consegne_cliente_title"-->
<!--android:textAllCaps="true"-->
<!--android:textColor="@color/grey_700"-->
<!--android:textStyle="bold" />-->
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center_horizontal"
android:text="@string/fragment_ultime_consegne_cliente_title"
android:textAllCaps="true"
android:textColor="@color/grey_700"
android:textStyle="bold" />
<!--</LinearLayout>-->
<!--</com.google.android.material.card.MaterialCardView>-->
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -4,32 +4,32 @@
<group android:checkableBehavior="single">
<item
android:id="@+id/nav_home"
android:icon="@drawable/ic_home_black_24dp"
android:icon="@drawable/ic_black_home"
android:title="Home" />
<item
android:id="@+id/nav_accettazione"
android:icon="@drawable/ic_download_black_24dp"
android:icon="@drawable/ic_black_download"
android:title="@string/accettazione_title_fragment" />
<item
android:id="@+id/nav_spedizione"
android:icon="@drawable/ic_upload_black_24dp"
android:icon="@drawable/ic_black_upload"
android:title="@string/vendita_title_fragment" />
<item
android:id="@+id/nav_rettifica_giacenze"
android:icon="@drawable/ic_empty_box_96"
android:icon="@drawable/ic_black_empty_box"
android:title="@string/rettifica_giacenze_fragment_title" />
<item
android:id="@+id/nav_versamento_merce"
android:icon="@drawable/ic_load_shelf_96"
android:icon="@drawable/ic_black_load_shelf"
android:title="@string/versamento_merce_fragment_title" />
<item
android:id="@+id/nav_free_picking"
android:icon="@drawable/ic_barcode_96"
android:icon="@drawable/ic_black_barcode_scanner"
android:title="@string/free_picking" />
<!--<item-->
<!--android:id="@+id/nav_resi_cliente"-->
<!--android:icon="@drawable/ic_barcode_96"-->
<!--android:title="@string/fragment_ultime_consegne_cliente_title" />-->
<item
android:id="@+id/nav_resi_cliente"
android:icon="@drawable/ic_black_latest_delivery"
android:title="@string/fragment_ultime_consegne_cliente_title" />
</group>
@ -38,11 +38,11 @@
<menu>
<item
android:id="@+id/nav_prod_versamento_materiale"
android:icon="@drawable/ic_settings_24dp"
android:icon="@drawable/ic_black_external"
android:title="@string/prod_versamento_materiale_title_fragment" />
<item
android:id="@+id/nav_prod_recupero_materiale"
android:icon="@drawable/ic_settings_24dp"
android:icon="@drawable/ic_black_internal"
android:title="@string/prod_recupero_materiale_title_fragment" />
</menu>
</item>

View File

@ -8,7 +8,7 @@ public interface BarcodeReaderInterface {
boolean isRightAdapter();
void init() throws BarcodeAdapterNotFoundException;
void init(Runnable onDeviceReady) throws BarcodeAdapterNotFoundException;
void deinit();

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="512px" height="512px">
<path d="M 2.5 4 C 2.224 4 2 4.224 2 4.5 L 2 9.5 C 2 9.776 2.224 10 2.5 10 L 3.5 10 C 3.776 10 4 9.776 4 9.5 L 4 4.5 C 4 4.224 3.776 4 3.5 4 L 2.5 4 z M 5.5 4 C 5.224 4 5 4.224 5 4.5 L 5 9.5 C 5 9.776 5.224 10 5.5 10 L 8.5 10 C 8.776 10 9 9.776 9 9.5 L 9 4.5 C 9 4.224 8.776 4 8.5 4 L 5.5 4 z M 10.5 4 C 10.224 4 10 4.224 10 4.5 L 10 9.5 C 10 9.776 10.224 10 10.5 10 L 11.5 10 C 11.776 10 12 9.776 12 9.5 L 12 4.5 C 12 4.224 11.776 4 11.5 4 L 10.5 4 z M 13.5 4 C 13.224 4 13 4.224 13 4.5 L 13 9.5 C 13 9.776 13.224 10 13.5 10 L 15.5 10 C 15.776 10 16 9.776 16 9.5 L 16 4.5 C 16 4.224 15.776 4 15.5 4 L 13.5 4 z M 17.5 4 C 17.224 4 17 4.224 17 4.5 L 17 9.5 C 17 9.776 17.224 10 17.5 10 L 18.5 10 C 18.776 10 19 9.776 19 9.5 L 19 4.5 C 19 4.224 18.776 4 18.5 4 L 17.5 4 z M 20.5 4 C 20.224 4 20 4.224 20 4.5 L 20 9.5 C 20 9.776 20.224 10 20.5 10 L 21.5 10 C 21.776 10 22 9.776 22 9.5 L 22 4.5 C 22 4.224 21.776 4 21.5 4 L 20.5 4 z M 4 12 C 2.897 12 2 12.897 2 14 L 2 19 C 2 20.103 2.897 21 4 21 L 20 21 C 21.103 21 22 20.103 22 19 L 22 14 C 22 12.897 21.103 12 20 12 L 4 12 z M 5.5 14 L 8.5 14 C 8.776 14 9 14.224 9 14.5 L 9 18.5 C 9 18.776 8.776 19 8.5 19 L 5.5 19 C 5.224 19 5 18.776 5 18.5 L 5 14.5 C 5 14.224 5.224 14 5.5 14 z M 10.5 14 L 11.5 14 C 11.776 14 12 14.224 12 14.5 L 12 18.5 C 12 18.776 11.776 19 11.5 19 L 10.5 19 C 10.224 19 10 18.776 10 18.5 L 10 14.5 C 10 14.224 10.224 14 10.5 14 z M 13.5 14 L 15.5 14 C 15.776 14 16 14.224 16 14.5 L 16 18.5 C 16 18.776 15.776 19 15.5 19 L 13.5 19 C 13.224 19 13 18.776 13 18.5 L 13 14.5 C 13 14.224 13.224 14 13.5 14 z M 17.5 14 L 18.5 14 C 18.776 14 19 14.224 19 14.5 L 19 18.5 C 19 18.776 18.776 19 18.5 19 L 17.5 19 C 17.224 19 17 18.776 17 18.5 L 17 14.5 C 17 14.224 17.224 14 17.5 14 z"/>
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="512px" height="512px">
<path d="M 3 4 C 2.448 4 2 4.448 2 5 L 2 19 C 2 19.552 2.448 20 3 20 C 3.552 20 4 19.552 4 19 L 4 5 C 4 4.448 3.552 4 3 4 z M 6 4 C 5.448 4 5 4.448 5 5 L 5 19 C 5 19.552 5.448 20 6 20 L 8 20 C 8.552 20 9 19.552 9 19 L 9 5 C 9 4.448 8.552 4 8 4 L 6 4 z M 11 4 C 10.448 4 10 4.448 10 5 L 10 19 C 10 19.552 10.448 20 11 20 C 11.552 20 12 19.552 12 19 L 12 5 C 12 4.448 11.552 4 11 4 z M 14 4 C 13.448 4 13 4.448 13 5 L 13 19 C 13 19.552 13.448 20 14 20 L 15 20 C 15.552 20 16 19.552 16 19 L 16 5 C 16 4.448 15.552 4 15 4 L 14 4 z M 18 4 C 17.448 4 17 4.448 17 5 L 17 19 C 17 19.552 17.448 20 18 20 C 18.552 20 19 19.552 19 19 L 19 5 C 19 4.448 18.552 4 18 4 z M 21 4 C 20.448 4 20 4.448 20 5 L 20 19 C 20 19.552 20.448 20 21 20 C 21.552 20 22 19.552 22 19 L 22 5 C 22 4.448 21.552 4 21 4 z"/>
</svg>

After

Width:  |  Height:  |  Size: 913 B

View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="512px" height="512px">
<path style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;block-progression:tb;isolation:auto;mix-blend-mode:normal" d="M 6 2 C 4.895 2 4 2.895 4 4 L 4 6 C 4 6.552 4.448 7 5 7 L 19 7 C 19.552 7 20 6.552 20 6 L 20 4 C 20 2.895 19.105 2 18 2 L 6 2 z M 5 9 C 4.448 9 4 9.448 4 10 L 4 14 C 4 14.552 4.448 15 5 15 L 15.171875 15 L 17.402344 12.769531 C 17.895344 12.276531 18.563719 12 19.261719 12 L 20 12 L 20 10 C 20 9.448 19.552 9 19 9 L 5 9 z M 19 14 C 18.77975 14 18.560578 14.083953 18.392578 14.251953 L 15.734375 16.910156 C 15.331375 17.313156 15.615594 18 16.183594 18 L 18 18 L 18 23 A 1.0001 1.0001 0 1 0 20 23 L 20 18 L 21.814453 18 C 22.383453 18 22.669578 17.313156 22.267578 16.910156 L 19.609375 14.251953 C 19.441375 14.083953 19.22025 14 19 14 z M 5 17.001953 C 4.448 17.001953 4 17.449953 4 18.001953 L 4 20.001953 C 4 21.106953 4.895 22.001953 6 22.001953 L 16 22.001953 L 16 20.001953 C 15.937 20.001953 15.883219 19.982609 15.824219 19.974609 L 15.751953 19.962891 C 15.681953 19.949891 15.610875 19.939016 15.546875 19.916016 C 14.746875 19.718016 14.072094 19.157094 13.746094 18.371094 C 13.562094 17.926094 13.513172 17.455953 13.576172 17.001953 L 5 17.001953 z" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24px" height="24px">
<path d="M 6 1 C 2.691 1 0 3.691 0 7 C 0 8.771 0.776 10.360937 2 11.460938 L 2 18 C 2 18.552 2.448 19 3 19 L 3.0507812 19 C 3.2957813 20.692 4.742 22 6.5 22 C 8.258 22 9.7042188 20.692 9.9492188 19 L 14.050781 19 C 14.295781 20.692 15.740047 22 17.498047 22 C 19.256047 22 20.702266 20.692 20.947266 19 L 22 19 C 22.552 19 23 18.552 23 18 L 23 15.306641 C 23 14.749641 22.846688 14.206422 22.554688 13.732422 L 20.517578 10.427734 C 19.967578 9.5337344 19.011891 9 17.962891 9 L 16 9 L 16 7 C 16 6.448 15.552 6 15 6 L 11.910156 6 C 11.431156 3.167 8.967 1 6 1 z M 6 3 C 8.206 3 10 4.794 10 7 C 10 9.206 8.206 11 6 11 C 3.794 11 2 9.206 2 7 C 2 4.794 3.794 3 6 3 z M 6 5 C 5.448 5 5 5.448 5 6 L 5 8.2070312 C 5 8.3400312 5.0534844 8.4675469 5.1464844 8.5605469 L 5.9980469 9.4121094 C 6.3890469 9.8031094 7.0221094 9.8031094 7.4121094 9.4121094 C 7.8021094 9.0211094 7.8031094 8.3890469 7.4121094 7.9980469 L 7 7.5859375 L 7 6 C 7 5.448 6.552 5 6 5 z M 16 11 L 17.962891 11 C 18.312891 11 18.631453 11.178562 18.814453 11.476562 L 20.851562 14.78125 C 20.949563 14.93925 21 15.120641 21 15.306641 L 21 17 L 20.648438 17 C 20.084437 15.822 18.891 15 17.5 15 C 16.961 15 16.456 15.133562 16 15.351562 L 16 11 z M 6.5 17 C 7.327 17 8 17.673 8 18.5 C 8 19.327 7.327 20 6.5 20 C 5.673 20 5 19.327 5 18.5 C 5 17.673 5.673 17 6.5 17 z M 17.5 17 C 18.327 17 19 17.673 19 18.5 C 19 19.327 18.327 20 17.5 20 C 16.673 20 16 19.327 16 18.5 C 16 17.673 16.673 17 17.5 17 z"/>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" version="1.1" width="512px" height="512px">
<g id="surface1">
<path style=" fill:#388E3C;" d="M 29 38 L 7 38 C 5.894531 38 5 37.105469 5 36 L 5 15 C 5 13.894531 5.894531 13 7 13 L 27 13 C 28.105469 13 29 13.894531 29 15 Z "/>
<path style=" fill:#8BC34A;" d="M 43 38 L 29 38 L 29 18 L 39.558594 18 C 40.417969 18 41.183594 18.550781 41.457031 19.367188 L 45 30 L 45 36 C 45 37.105469 44.105469 38 43 38 "/>
<path style=" fill:#37474F;" d="M 41 37.5 C 41 39.984375 38.984375 42 36.5 42 C 34.015625 42 32 39.984375 32 37.5 C 32 35.015625 34.015625 33 36.5 33 C 38.984375 33 41 35.015625 41 37.5 "/>
<path style=" fill:#37474F;" d="M 19 37.5 C 19 39.984375 16.984375 42 14.5 42 C 12.015625 42 10 39.984375 10 37.5 C 10 35.015625 12.015625 33 14.5 33 C 16.984375 33 19 35.015625 19 37.5 "/>
<path style=" fill:#78909C;" d="M 38 37.5 C 38 38.328125 37.328125 39 36.5 39 C 35.671875 39 35 38.328125 35 37.5 C 35 36.671875 35.671875 36 36.5 36 C 37.328125 36 38 36.671875 38 37.5 "/>
<path style=" fill:#78909C;" d="M 16 37.5 C 16 38.328125 15.328125 39 14.5 39 C 13.671875 39 13 38.328125 13 37.5 C 13 36.671875 13.671875 36 14.5 36 C 15.328125 36 16 36.671875 16 37.5 "/>
<path style=" fill:#37474F;" d="M 40 28 L 33 28 C 32.449219 28 32 27.550781 32 27 L 32 21 C 32 20.449219 32.449219 20 33 20 L 38.277344 20 C 38.710938 20 39.09375 20.273438 39.226563 20.683594 L 40.949219 25.847656 C 40.980469 25.949219 41 26.054688 41 26.160156 L 41 27 C 41 27.550781 40.550781 28 40 28 "/>
<path style=" fill:#1B5E20;" d="M 12.5 27 C 18.851563 27 24 21.851563 24 15.5 C 24 14.640625 23.898438 13.804688 23.71875 13 L 7 13 C 5.894531 13 5 13.894531 5 15 L 5 24.207031 C 7.015625 25.941406 9.632813 27 12.5 27 Z "/>
<path style=" fill:#00ACC1;" d="M 22 15.5 C 22 20.746094 17.746094 25 12.5 25 C 7.253906 25 3 20.746094 3 15.5 C 3 10.253906 7.253906 6 12.5 6 C 17.746094 6 22 10.253906 22 15.5 "/>
<path style=" fill:#EEEEEE;" d="M 12.5 8.5 C 8.632813 8.5 5.5 11.632813 5.5 15.5 C 5.5 19.367188 8.632813 22.5 12.5 22.5 C 16.367188 22.5 19.5 19.367188 19.5 15.5 C 19.5 11.632813 16.367188 8.5 12.5 8.5 Z M 12.5 16 C 12.226563 16 12 15.777344 12 15.5 C 12 15.222656 12.226563 15 12.5 15 C 12.773438 15 13 15.222656 13 15.5 C 13 15.777344 12.773438 16 12.5 16 Z "/>
<path style=" " d="M 12 10 L 13 10 L 13 14.5625 L 12 14.5625 Z "/>
<path style=" " d="M 16.34375 18.171875 L 15.167969 19.34375 L 12.398438 16.570313 L 13.570313 15.398438 Z "/>
<path style=" " d="M 12.5 14 C 11.671875 14 11 14.671875 11 15.5 C 11 16.328125 11.671875 17 12.5 17 C 13.328125 17 14 16.328125 14 15.5 C 14 14.671875 13.328125 14 12.5 14 Z M 12.5 16 C 12.226563 16 12 15.777344 12 15.5 C 12 15.222656 12.226563 15 12.5 15 C 12.773438 15 13 15.222656 13 15.5 C 13 15.777344 12.773438 16 12.5 16 Z "/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="512px" height="512px">
<path style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;block-progression:tb;isolation:auto;mix-blend-mode:normal" d="M 11 2 C 10.448 2 10 2.448 10 3 L 10 11 L 6.5 11 A 0.5 0.5 0 0 0 6 11.5 A 0.5 0.5 0 0 0 6.1464844 11.853516 A 0.5 0.5 0 0 0 6.1777344 11.882812 L 11.283203 16.697266 L 11.316406 16.728516 A 1 1 0 0 0 12 17 A 1 1 0 0 0 12.683594 16.728516 L 12.697266 16.716797 A 1 1 0 0 0 12.707031 16.705078 L 17.810547 11.892578 A 0.5 0.5 0 0 0 17.839844 11.865234 L 17.847656 11.859375 A 0.5 0.5 0 0 0 17.853516 11.853516 A 0.5 0.5 0 0 0 18 11.5 A 0.5 0.5 0 0 0 17.5 11 L 14 11 L 14 3 C 14 2.448 13.552 2 13 2 L 12 2 L 11 2 z M 3 20 A 1.0001 1.0001 0 1 0 3 22 L 21 22 A 1.0001 1.0001 0 1 0 21 20 L 3 20 z" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="512px" height="512px">
<path style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;block-progression:tb;isolation:auto;mix-blend-mode:normal" d="M 5.75 3 A 1.0001 1.0001 0 0 0 4.8867188 3.4960938 L 3.1367188 6.4960938 L 0.14257812 11.486328 A 1.0001 1.0001 0 1 0 1.8574219 12.513672 L 3 10.609375 L 3 19 C 3 20.093063 3.9069372 21 5 21 L 19 21 C 20.093063 21 21 20.093063 21 19 L 21 10.609375 L 22.142578 12.513672 A 1.0001 1.0001 0 1 0 23.857422 11.486328 L 20.876953 6.5214844 A 1.0001 1.0001 0 0 0 20.863281 6.4960938 L 19.113281 3.4960938 A 1.0001 1.0001 0 0 0 18.25 3 L 5.75 3 z M 6.3242188 5 L 17.675781 5 L 18.841797 7 L 5.1582031 7 L 6.3242188 5 z M 10 9 L 14 9 C 14.552 9 15 9.448 15 10 C 15 10.552 14.552 11 14 11 L 10 11 C 9.448 11 9 10.552 9 10 C 9 9.448 9.448 9 10 9 z" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="512px" height="512px">
<path d="M 6.9785156 3.5097656 A 1.0001 1.0001 0 0 0 6.4433594 3.6875 C 3.7651149 5.4804019 2 8.5404701 2 12 C 2 17.511334 6.4886661 22 12 22 C 17.511334 22 22 17.511334 22 12 C 22 8.5404701 20.234885 5.4804019 17.556641 3.6875 A 1.0002505 1.0002505 0 1 0 16.443359 5.3496094 C 18.587115 6.7847075 20 9.2195299 20 12 C 20 16.430666 16.430666 20 12 20 C 7.5693339 20 4 16.430666 4 12 C 4 9.2195299 5.4128851 6.7847075 7.5566406 5.3496094 A 1.0001 1.0001 0 0 0 6.9785156 3.5097656 z M 12 4 C 11.448 4 11 4.448 11 5 L 11 11 L 8.7675781 11 C 8.3145781 11 8.08525 11.548141 8.40625 11.869141 L 11.210938 14.673828 C 11.646937 15.109828 12.353063 15.109828 12.789062 14.673828 L 15.59375 11.869141 C 15.91475 11.548141 15.685422 11 15.232422 11 L 13 11 L 13 5 C 13 4.448 12.552 4 12 4 z"/>
</svg>

After

Width:  |  Height:  |  Size: 907 B

View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="512px" height="512px">
<path d="M 12 2 A 1 1 0 0 0 11.289062 2.296875 L 1.203125 11.097656 A 0.5 0.5 0 0 0 1 11.5 A 0.5 0.5 0 0 0 1.5 12 L 4 12 L 4 20 C 4 20.552 4.448 21 5 21 L 8 21 C 8.552 21 9 20.552 9 20 L 9 14 L 15 14 L 15 20 C 15 20.552 15.448 21 16 21 L 19 21 C 19.552 21 20 20.552 20 20 L 20 12 L 22.5 12 A 0.5 0.5 0 0 0 23 11.5 A 0.5 0.5 0 0 0 22.796875 11.097656 L 19 7.7851562 L 19 5 C 19 4.448 18.552 4 18 4 C 17.448 4 17 4.448 17 5 L 17 6.0390625 L 12.716797 2.3027344 A 1 1 0 0 0 12.710938 2.296875 A 1 1 0 0 0 12 2 z"/>
</svg>

After

Width:  |  Height:  |  Size: 635 B

View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="512px" height="512px">
<path d="M 6.9785156 3.5097656 A 1.0001 1.0001 0 0 0 6.4433594 3.6875 C 3.7651149 5.4804019 2 8.5404701 2 12 C 2 17.511334 6.4886661 22 12 22 C 17.511334 22 22 17.511334 22 12 C 22 8.5404701 20.234885 5.4804019 17.556641 3.6875 A 1.0002505 1.0002505 0 1 0 16.443359 5.3496094 C 18.587115 6.7847075 20 9.2195299 20 12 C 20 16.430666 16.430666 20 12 20 C 7.5693339 20 4 16.430666 4 12 C 4 9.2195299 5.4128851 6.7847075 7.5566406 5.3496094 A 1.0001 1.0001 0 0 0 6.9785156 3.5097656 z M 12 4 C 11.7145 4 11.428937 4.1081719 11.210938 4.3261719 L 8.40625 7.1308594 C 8.08525 7.4518594 8.3145781 8 8.7675781 8 L 11 8 L 11 14 C 11 14.552 11.448 15 12 15 C 12.552 15 13 14.552 13 14 L 13 8 L 15.232422 8 C 15.685422 8 15.91475 7.4518594 15.59375 7.1308594 L 12.789062 4.3261719 C 12.571063 4.1081719 12.2855 4 12 4 z"/>
</svg>

After

Width:  |  Height:  |  Size: 935 B

View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="512px" height="512px">
<path style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;block-progression:tb;isolation:auto;mix-blend-mode:normal" d="M 3.5 2 C 3.372 2 3.2444844 2.0494844 3.1464844 2.1464844 C 2.9514844 2.3414844 2.9514844 2.6585156 3.1464844 2.8535156 L 5.09375 4.8007812 C 3.1950225 6.6199194 2 9.1685121 2 12 C 2 17.511334 6.4886661 22 12 22 C 17.511334 22 22 17.511334 22 12 C 22 6.864114 18.106486 2.6175896 13.109375 2.0644531 A 1.0001 1.0001 0 0 0 13.009766 2.0585938 A 1.0001 1.0001 0 0 0 12.890625 4.0527344 C 16.891514 4.4955979 20 7.871886 20 12 C 20 16.430666 16.430666 20 12 20 C 7.5693339 20 4 16.430666 4 12 C 4 9.7105359 4.967513 7.6643975 6.5039062 6.2109375 L 8.1464844 7.8535156 C 8.3414844 8.0485156 8.6585156 8.0485156 8.8535156 7.8535156 C 8.9515156 7.7565156 9 7.628 9 7.5 L 9 3 A 1 1 0 0 0 8 2 L 3.5 2 z" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="512px" height="512px">
<path style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;block-progression:tb;isolation:auto;mix-blend-mode:normal" d="M 12 2 A 1 1 0 0 0 11.292969 2.2949219 L 6.1601562 7.1347656 A 0.5 0.5 0 0 0 6.1484375 7.1445312 L 6.1464844 7.1464844 A 0.5 0.5 0 0 0 6 7.5 A 0.5 0.5 0 0 0 6.5 8 L 10 8 L 10 16 C 10 16.552 10.448 17 11 17 L 12 17 L 13 17 C 13.552 17 14 16.552 14 16 L 14 8 L 17.5 8 A 0.5 0.5 0 0 0 18 7.5 A 0.5 0.5 0 0 0 17.853516 7.1464844 L 17.822266 7.1171875 L 12.716797 2.3027344 A 1 1 0 0 0 12.683594 2.2714844 A 1 1 0 0 0 12 2 z M 3 20 A 1.0001 1.0001 0 1 0 3 22 L 21 22 A 1.0001 1.0001 0 1 0 21 20 L 3 20 z" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
</svg>

After

Width:  |  Height:  |  Size: 934 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 145 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 120 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 158 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 KiB

View File

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M509.5 184.6L458.9 32.8C452.4 13.2 434.1 0 413.4 0H272v192h238.7c-.4-2.5-.4-5-1.2-7.4zM240 0H98.6c-20.7 0-39 13.2-45.5 32.8L2.5 184.6c-.8 2.4-.8 4.9-1.2 7.4H240V0zM0 224v240c0 26.5 21.5 48 48 48h416c26.5 0 48-21.5 48-48V224H0z"/></svg>

Before

Width:  |  Height:  |  Size: 306 B

View File

@ -20,6 +20,10 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility = '1.8'
targetCompatibility = '1.8'
}
}

View File

@ -1,8 +1,24 @@
package it.integry.honeywellscannerlibrary;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Build;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;
import com.honeywell.aidc.AidcManager;
import com.honeywell.aidc.BarcodeFailureEvent;
import com.honeywell.aidc.BarcodeReadEvent;
import com.honeywell.aidc.BarcodeReader;
import com.honeywell.aidc.InvalidScannerNameException;
import com.honeywell.aidc.ScannerUnavailableException;
import com.honeywell.aidc.UnsupportedPropertyException;
import java.util.HashMap;
import java.util.Map;
import it.integry.plugins.barcode_base_library.exception.BarcodeAdapterNotFoundException;
import it.integry.plugins.barcode_base_library.extension.RunnableArgs;
@ -11,51 +27,156 @@ import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
public class HoneyWellBarcodeReader implements BarcodeReaderInterface {
private Context mContext;
private final AppCompatActivity mContext;
private AidcManager manager;
private BarcodeReader barcodeReader;
private boolean canGoOn = false;
private static RunnableArgs<BarcodeScanDTO> mOnScanSuccessfull;
private static RunnableArgs<Exception> mOnScanFailed;
public HoneyWellBarcodeReader(Context context) {
private static final String TAG = HoneyWellBarcodeReader.class.getName();
public HoneyWellBarcodeReader(final AppCompatActivity context) {
this.mContext = context;
AidcManager.create(context, new AidcManager.CreatedCallback() {
@Override
public void onCreated(AidcManager aidcManager) {
canGoOn = true;
}
});
while(!canGoOn) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
@Override
public boolean isRightAdapter() {
return false;
String model = Build.MODEL;
if(model.equalsIgnoreCase("EDA50")) {
return true;
} else return false;
}
@Override
public void init() throws BarcodeAdapterNotFoundException {
public void init(final Runnable onDeviceReady) throws BarcodeAdapterNotFoundException {
if(isRightAdapter()) {
AidcManager.create(mContext, new AidcManager.CreatedCallback() {
@Override
public void onCreated(AidcManager aidcManager) {
manager = aidcManager;
try{
barcodeReader = manager.createBarcodeReader();
registerListenersInternal();
}
catch (InvalidScannerNameException e){
Toast.makeText(mContext, "Invalid Scanner Name Exception: " + e.getMessage(), Toast.LENGTH_SHORT).show();
}
catch (Exception e){
Toast.makeText(mContext, "Exception: " + e.getMessage(), Toast.LENGTH_SHORT).show();
}
onDeviceReady.run();
}
});
} else {
throw new BarcodeAdapterNotFoundException(getAdapterName());
}
}
@Override
public void deinit() {
if (barcodeReader != null) {
// close BarcodeReader to clean up resources.
barcodeReader.close();
barcodeReader = null;
}
if (manager != null) {
// close AidcManager to disconnect from the scanner service.
// once closed, the object can no longer be used.
manager.close();
}
}
@Override
public void register(RunnableArgs<BarcodeScanDTO> onScanSuccessfull, RunnableArgs<Exception> onScanFailed) {
mOnScanSuccessfull = onScanSuccessfull;
mOnScanFailed = onScanFailed;
}
@Override
public String getAdapterName() {
return null;
return "Honeywell";
}
private void registerListenersInternal() {
// register bar code event listener
barcodeReader.addBarcodeListener(new BarcodeReader.BarcodeListener() {
@Override
public void onBarcodeEvent(BarcodeReadEvent barcodeReadEvent) {
dispatchEvent(barcodeReadEvent);
}
@Override
public void onFailureEvent(BarcodeFailureEvent barcodeFailureEvent) {
}
});
// set the trigger mode to client control
try {
barcodeReader.setProperty(BarcodeReader.PROPERTY_TRIGGER_CONTROL_MODE,
BarcodeReader.TRIGGER_CONTROL_MODE_CLIENT_CONTROL);
} catch (UnsupportedPropertyException e) {
Toast.makeText(mContext, "Failed to apply properties", Toast.LENGTH_SHORT).show();
}
Map<String, Object> properties = new HashMap<>();
// Set Symbologies On/Off
properties.put(BarcodeReader.PROPERTY_EAN_8_ENABLED, true);
properties.put(BarcodeReader.PROPERTY_EAN_13_ENABLED, true);
properties.put(BarcodeReader.PROPERTY_CODE_39_ENABLED, true);
properties.put(BarcodeReader.PROPERTY_CODE_128_ENABLED, true);
properties.put(BarcodeReader.PROPERTY_GS1_128_ENABLED, true);
properties.put(BarcodeReader.PROPERTY_UPC_A_ENABLE, true);
properties.put(BarcodeReader.PROPERTY_EAN_8_CHECK_DIGIT_TRANSMIT_ENABLED, true);
properties.put(BarcodeReader.PROPERTY_EAN_13_CHECK_DIGIT_TRANSMIT_ENABLED, true);
properties.put(BarcodeReader.PROPERTY_UPC_A_CHECK_DIGIT_TRANSMIT_ENABLED, true);
properties.put(BarcodeReader.PROPERTY_TRIGGER_CONTROL_MODE, BarcodeReader.TRIGGER_CONTROL_MODE_AUTO_CONTROL);
// Apply the settings
barcodeReader.setProperties(properties);
try {
barcodeReader.claim();
} catch (ScannerUnavailableException e) {
e.printStackTrace();
}
}
private void dispatchEvent(BarcodeReadEvent barcodeReadEvent)
{
mContext.runOnUiThread(() -> {
BarcodeScanDTO barcodeScanDTO = new BarcodeScanDTO()
.setByteValue(barcodeReadEvent.getBarcodeData().getBytes())
.setStringValue(barcodeReadEvent.getBarcodeData())
.setType(HoneywellBarcodeTypeMapper.map(barcodeReadEvent.getCodeId()))
.setName(HoneywellBarcodeTypeMapper.map(barcodeReadEvent.getCodeId()).toString());
mOnScanSuccessfull.run(barcodeScanDTO);
});
}
}

View File

@ -0,0 +1,35 @@
package it.integry.honeywellscannerlibrary;
import android.util.Log;
import it.integry.plugins.barcode_base_library.model.BarcodeType;
public class HoneywellBarcodeTypeMapper {
public static BarcodeType map(String inputType) {
switch (inputType) {
case "h":
return BarcodeType.CODE11;
case "j":
return BarcodeType.CODE128;
case "b":
return BarcodeType.CODE39;
case "d":
return BarcodeType.EAN13;
case "D":
return BarcodeType.EAN8;
case "c":
return BarcodeType.UPCA;
case "E":
return BarcodeType.UPCE;
default:
Log.d("SCAN TYPE", inputType);
return null;
}
}
}

View File

@ -5,6 +5,8 @@ import android.content.Context;
import android.content.Intent;
import android.util.Log;
import androidx.appcompat.app.AppCompatActivity;
import java.nio.charset.StandardCharsets;
import device.common.DecodeResult;
@ -18,7 +20,7 @@ import it.integry.plugins.barcode_base_library.model.BarcodeType;
public class PointMobileBarcodeReader implements BarcodeReaderInterface {
private Context mContext;
private AppCompatActivity mContext;
private static ScanManager mScanManager;
private static DecodeResult mDecodeResult;
@ -27,7 +29,7 @@ public class PointMobileBarcodeReader implements BarcodeReaderInterface {
private static String TAG = PointMobileBarcodeReader.class.getName();
public PointMobileBarcodeReader(Context context) {
public PointMobileBarcodeReader(AppCompatActivity context) {
this.mContext = context;
mScanManager = new ScanManager();
@ -45,11 +47,13 @@ public class PointMobileBarcodeReader implements BarcodeReaderInterface {
}
@Override
public void init() throws BarcodeAdapterNotFoundException {
public void init(Runnable onDeviceReady) throws BarcodeAdapterNotFoundException {
if(isRightAdapter()){
try{
mScanManager.aDecodeSetTerminator(ScanConst.Terminator.DCD_TERMINATOR_NONE);
mScanManager.aDecodeSetResultType(ScanConst.ResultType.DCD_RESULT_USERMSG);
onDeviceReady.run();
} catch (Exception ex) {
throw new BarcodeAdapterNotFoundException(getAdapterName());
}

View File

@ -6,6 +6,8 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.os.Build;
import androidx.appcompat.app.AppCompatActivity;
import it.integry.plugins.barcode_base_library.exception.BarcodeAdapterNotFoundException;
import it.integry.plugins.barcode_base_library.extension.RunnableArgs;
import it.integry.plugins.barcode_base_library.interfaces.BarcodeReaderInterface;
@ -13,7 +15,7 @@ import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
public class ZebraBarcodeReader implements BarcodeReaderInterface {
private final Context mContext;
private final AppCompatActivity mContext;
private static RunnableArgs<BarcodeScanDTO> mOnScanSuccessfull;
private static RunnableArgs<Exception> mOnScanFailed;
@ -21,7 +23,7 @@ public class ZebraBarcodeReader implements BarcodeReaderInterface {
private static final String TAG = ZebraBarcodeReader.class.getName();
private static final String INTENT_FILTER_STRING = "it.integry.scan_filter";
public ZebraBarcodeReader(Context context) {
public ZebraBarcodeReader(AppCompatActivity context) {
this.mContext = context;
}
@ -34,12 +36,14 @@ public class ZebraBarcodeReader implements BarcodeReaderInterface {
}
@Override
public void init() throws BarcodeAdapterNotFoundException {
public void init(Runnable onDeviceReady) throws BarcodeAdapterNotFoundException {
if(isRightAdapter()) {
IntentFilter filter = new IntentFilter();
filter.addCategory(Intent.CATEGORY_DEFAULT);
filter.addAction(INTENT_FILTER_STRING);
mContext.registerReceiver(myBroadcastReceiver, filter);
onDeviceReady.run();
} else {
throw new BarcodeAdapterNotFoundException(getAdapterName());
}