diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml index adb28554..51ad9119 100644 --- a/.idea/assetWizardSettings.xml +++ b/.idea/assetWizardSettings.xml @@ -28,8 +28,12 @@ diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 79ac8948..2f087de4 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index f3728dbb..a549ce41 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 27 - def appVersionName = '1.0.24' + def appVersionCode = 28 + def appVersionName = '1.0.25' signingConfigs { release { diff --git a/app/google-services.json b/app/google-services.json index c55e9450..bab7083e 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -22,6 +22,14 @@ "certificate_hash": "864b69dcc40196befa65638a868cec1c61245fa6" } }, + { + "client_id": "963231271247-59qdc1vobbnjfp135ce4hv12c53s9hse.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "it.integry.integrywmsnative", + "certificate_hash": "3b6d97a981f446f5011049d781aeb9960f9352af" + } + }, { "client_id": "963231271247-6jof105pci1g0g7m2e7kjbtrtk2443g4.apps.googleusercontent.com", "client_type": 3 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bca4665b..696160d5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,7 +19,6 @@ android:theme="@style/AppTheme"> diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java index 99d90405..ebaa3bca 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java @@ -28,6 +28,7 @@ import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.interfaces.IFilterableFragment; import it.integry.integrywmsnative.core.interfaces.IPoppableActivity; import it.integry.integrywmsnative.core.interfaces.IRecyclerFragment; +import it.integry.integrywmsnative.core.interfaces.ISearcableFragment; import it.integry.integrywmsnative.core.interfaces.ISelectAllFragment; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.update.UpdatesManager; @@ -62,12 +63,12 @@ public class MainActivity extends AppCompatActivity UpdatesManager.init(this); - Toolbar toolbar = findViewById(R.id.toolbar); - setSupportActionBar(toolbar); + setSupportActionBar(mBinding.appBarMain.toolbar); + getSupportActionBar().setDisplayShowTitleEnabled(false); ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( - this, mBinding.drawerLayout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); + this, mBinding.drawerLayout, mBinding.appBarMain.toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); mBinding.drawerLayout.setDrawerListener(toggle); toggle.syncState(); @@ -178,19 +179,32 @@ public class MainActivity extends AppCompatActivity } private void adaptViewToFragment(Fragment fragment){ - if(fragment instanceof SearchView.OnQueryTextListener) { + if(fragment instanceof ISearcableFragment) { mBinding.appBarMain.mainSearch.setOnQueryTextListener((SearchView.OnQueryTextListener) fragment); mBinding.appBarMain.mainSearch.setVisibility(View.VISIBLE); + mBinding.appBarMain.mainSearch.setOnSearchClickListener(v -> { + ((ISearcableFragment) fragment).onSearchEnabled(); + }); + + mBinding.appBarMain.mainSearch.setOnCloseListener(() -> { + ((ISearcableFragment) fragment).onSearchDisabled(); + return false; + }); } else { mBinding.appBarMain.mainSearch.setOnQueryTextListener(null); mBinding.appBarMain.mainSearch.setVisibility(View.GONE); + mBinding.appBarMain.mainSearch.setOnSearchClickListener(null); + mBinding.appBarMain.mainSearch.setOnCloseListener(null); } - if(fragment instanceof ITitledFragment) { - ((ITitledFragment) fragment).onCreateActionBar(getSupportActionBar(), this); + if(fragment instanceof ITitledFragment && !(fragment instanceof MainFragment)) { + mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.GONE); + mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.VISIBLE); + ((ITitledFragment) fragment).onCreateActionBar(mBinding.appBarMain.toolbarTitleLeft, this); } else { - getSupportActionBar().setTitle(R.string.app_name); + mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.VISIBLE); + mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.GONE); } if(fragment instanceof IRecyclerFragment) { @@ -235,8 +249,6 @@ public class MainActivity extends AppCompatActivity private void init(){ - initSessionData(); - ServerStatusChecker.getIstance().addCallback(value -> { if(value && (!mIsOnline || firstCheckExecution)){ @@ -257,20 +269,4 @@ public class MainActivity extends AppCompatActivity } - - private void initSessionData() { - LinearLayout headerLayout = (LinearLayout) mBinding.navView.getHeaderView(0); - - TextView textViewUsername = headerLayout.findViewById(R.id.drawer_username); - textViewUsername.setText(SettingsManager.i().user.fullname); - - TextView textViewDeposito = headerLayout.findViewById(R.id.drawer_deposito); - textViewDeposito.setText(String.format("%s - %s", SettingsManager.i().userSession.depo.getCodMdep(), SettingsManager.i().userSession.depo.getDescrizione())); - - if(SettingsManager.iDB().getDatiAzienda() != null && SettingsManager.iDB().getDatiAzienda().isLogoAvailable()) { - ImageView imageViewLogoAzienda = headerLayout.findViewById(R.id.drawer_logoAzienda); - imageViewLogoAzienda.setImageBitmap(SettingsManager.iDB().getDatiAzienda().getLogo()); - } - } - } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/CommonConst.java b/app/src/main/java/it/integry/integrywmsnative/core/CommonConst.java index 33684659..65e70636 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/CommonConst.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/CommonConst.java @@ -5,9 +5,6 @@ public class CommonConst { public static class Login { public static class Azienda { -// public static String host = "192.168.2.13"; -// public static int port = 8080; - public static String host = "www2.studioml.it"; public static int port = 80; } @@ -20,6 +17,9 @@ public class CommonConst { public static String DEFAULT_ANONYMOUS_UL_SERIE = "UL"; } + public static class Files { + public static String RECOVER_COLLO_FILE = "recover_ul.json"; + } public static class Mail { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java index fc0079ae..d4ce4766 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java @@ -10,6 +10,8 @@ import io.fabric.sdk.android.Fabric; import it.integry.integrywmsnative.BuildConfig; import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; +import it.integry.integrywmsnative.core.data_recover.ColliDataRecover; +import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.settings.Stash; import it.integry.integrywmsnative.core.utility.UtilityResources; @@ -30,7 +32,7 @@ public class AppContext { public void init() { this.initSettings(); - //this.initCrashlytics(); + this.initCrashlytics(); this.initServerStatusChecker(); @@ -39,6 +41,8 @@ public class AppContext { this.initUtilities(); this.initLogger(); + + this.initRecoverColli(); } @@ -78,5 +82,14 @@ public class AppContext { Logger.addLogAdapter(new AndroidLogAdapter()); } + private void initRecoverColli() { + ColliDataRecover.init(mContext); + + if(ColliDataRecover.thereIsAnExistantSession()){ + MtbColt recoveredMtbColt = ColliDataRecover.getFirstSession(); + + + } + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java new file mode 100644 index 00000000..76378d38 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java @@ -0,0 +1,125 @@ +package it.integry.integrywmsnative.core.data_recover; + +import android.content.Context; + +import com.google.gson.Gson; + +import java.io.FileOutputStream; +import java.util.ArrayList; +import java.util.List; + +import it.integry.integrywmsnative.core.CommonConst; +import it.integry.integrywmsnative.core.model.MtbColt; +import it.integry.integrywmsnative.core.utility.UtilityExceptions; + +public class ColliDataRecover { + + private static class RecoverDTO { + private int numCollo; + private String serCollo; + private String dataCollo; + private String gestioneCollo; + + public int getNumCollo() { + return numCollo; + } + + public RecoverDTO setNumCollo(int numCollo) { + this.numCollo = numCollo; + return this; + } + + public String getSerCollo() { + return serCollo; + } + + public RecoverDTO setSerCollo(String serCollo) { + this.serCollo = serCollo; + return this; + } + + public String getDataCollo() { + return dataCollo; + } + + public RecoverDTO setDataCollo(String dataCollo) { + this.dataCollo = dataCollo; + return this; + } + + public String getGestioneCollo() { + return gestioneCollo; + } + + public RecoverDTO setGestioneCollo(String gestioneCollo) { + this.gestioneCollo = gestioneCollo; + return this; + } + } + + private static Context mContext; + + private static List mtbColtsSessions = new ArrayList<>(); + + public static void init(Context context) { + mContext = context; + } + + public static boolean thereIsAnExistantSession() { + return mtbColtsSessions.size() > 0; + } + + public static MtbColt getFirstSession() { + + if(thereIsAnExistantSession()){ + RecoverDTO dto = mtbColtsSessions.get(0); + mtbColtsSessions.remove(dto); + + return new MtbColt() + .setNumCollo(dto.getNumCollo()) + .setSerCollo(dto.getSerCollo()) + .setGestione(dto.getGestioneCollo()) + .setDataCollo(dto.getDataCollo()); + + + } else return null; + + } + + public static int startNewSession(MtbColt mtbColtSession) { + + RecoverDTO recoverDTO = new RecoverDTO() + .setDataCollo(mtbColtSession.getDataColloS()) + .setNumCollo(mtbColtSession.getNumCollo()) + .setSerCollo(mtbColtSession.getSerCollo()) + .setGestioneCollo(mtbColtSession.getGestione()); + + mtbColtsSessions.add(recoverDTO); + updateLocalFile(); + return mtbColtsSessions.indexOf(recoverDTO); + } + + public static void closeSession(int ID) { + mtbColtsSessions.remove(ID); + updateLocalFile(); + } + + + private static void updateLocalFile() { + FileOutputStream outputStream; + + Gson gson = new Gson(); + String jsonText = gson.toJson(mtbColtsSessions); + + try { + outputStream = mContext.openFileOutput(CommonConst.Files.RECOVER_COLLO_FILE, Context.MODE_PRIVATE); + outputStream.write(jsonText.getBytes()); + outputStream.close(); + } catch (Exception e) { + e.printStackTrace(); + UtilityExceptions.defaultException(mContext, e); + } + + } + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISearcableFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISearcableFragment.java new file mode 100644 index 00000000..80db5057 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISearcableFragment.java @@ -0,0 +1,11 @@ +package it.integry.integrywmsnative.core.interfaces; + +import androidx.appcompat.widget.SearchView; + +public interface ISearcableFragment extends SearchView.OnQueryTextListener { + + void onSearchEnabled(); + + void onSearchDisabled(); + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ITitledFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ITitledFragment.java index 716c682f..1f2dbac0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ITitledFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ITitledFragment.java @@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.interfaces; import android.content.Context; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.AppCompatTextView; /** * Created by GiuseppeS on 07/03/2018. @@ -10,6 +11,6 @@ import androidx.appcompat.app.ActionBar; public interface ITitledFragment { - void onCreateActionBar(ActionBar actionBar, Context context); + void onCreateActionBar(AppCompatTextView titleText, Context context); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java index e6483cb3..4d5a9ed5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java @@ -6,6 +6,7 @@ import android.content.Context; import android.content.Intent; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.AppCompatTextView; import androidx.databinding.DataBindingUtil; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -31,6 +32,7 @@ import it.integry.integrywmsnative.core.CommonConst; import it.integry.integrywmsnative.core.REST.CommonRESTException; import it.integry.integrywmsnative.core.coollection.Coollection; import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.core.interfaces.ISearcableFragment; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.FragmentMainAccettazioneBinding; import it.integry.integrywmsnative.gest.accettazione.core.AccettazioneHelper; @@ -46,7 +48,7 @@ import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.Accettazione import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; import it.integry.plugins.waterfalltoolbar.WaterfallToolbar; -public class MainAccettazioneFragment extends Fragment implements SearchView.OnQueryTextListener, ITitledFragment, IRecyclerFragment { +public class MainAccettazioneFragment extends Fragment implements ISearcableFragment, ITitledFragment, IRecyclerFragment { private static WaterfallToolbar mWaterfallToolbar; @@ -57,6 +59,8 @@ public class MainAccettazioneFragment extends Fragment implements SearchView.OnQ private List groupedOrdiniInevasi; private MainListAccettazioneAdapter mAdapter; + private AppCompatTextView mAppBarTitle; + @@ -75,8 +79,9 @@ public class MainAccettazioneFragment extends Fragment implements SearchView.OnQ @Override - public void onCreateActionBar(ActionBar actionBar, Context context) { - actionBar.setTitle(context.getText(R.string.accettazione_title_fragment).toString()); + public void onCreateActionBar(AppCompatTextView titleText, Context context) { + mAppBarTitle = titleText; + mAppBarTitle.setText(context.getText(R.string.accettazione_title_fragment).toString()); } @Override @@ -321,6 +326,15 @@ public class MainAccettazioneFragment extends Fragment implements SearchView.OnQ + @Override + public void onSearchEnabled() { + mAppBarTitle.setVisibility(View.GONE); + } + + @Override + public void onSearchDisabled() { + mAppBarTitle.setVisibility(View.VISIBLE); + } @Override public boolean onQueryTextSubmit(String query) { 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 c95419d8..123d91a2 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 @@ -5,10 +5,13 @@ import android.content.Context; import android.os.Bundle; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.AppCompatTextView; import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.TextView; import net.cachapa.expandablelayout.ExpandableLayout; @@ -16,6 +19,7 @@ import net.cachapa.expandablelayout.ExpandableLayout; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; +import de.hdodenhof.circleimageview.CircleImageView; import it.integry.integrywmsnative.MainActivity; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker; @@ -33,12 +37,12 @@ public class MainFragment extends Fragment implements ITitledFragment { @BindView(R.id.no_connection_top_layout) ExpandableLayout mNoConnectionLayout; @BindView(R.id.current_user_name) TextView currentUsername; - //@BindView(R.id.drawer_username) TextView drawerUsername; + @BindView(R.id.current_deposito) TextView currentDeposito; +// @BindView(R.id.drawer_logoAzienda) CircleImageView currentLogoAzienda; private View mView; public MainFragment() { - // Required empty public constructor } public static MainFragment newInstance() { @@ -79,13 +83,20 @@ public class MainFragment extends Fragment implements ITitledFragment { } }); - WiFiCheckerViewHolder wiFiCheckerViewHolder = new WiFiCheckerViewHolder(getActivity(), mView, R.id.wifi_power); - wiFiCheckerViewHolder.startMonitoring(); +// WiFiCheckerViewHolder wiFiCheckerViewHolder = new WiFiCheckerViewHolder(getActivity(), mView, R.id.wifi_power); +// wiFiCheckerViewHolder.startMonitoring(); + initSessionData(); + } + + private void initSessionData() { currentUsername.setText(SettingsManager.i().user.fullname); - //drawerUsername.setText(SettingsManager.i().user.fullname); + currentDeposito.setText(String.format("%s - %s", SettingsManager.i().userSession.depo.getCodMdep(), SettingsManager.i().userSession.depo.getDescrizione())); + if(SettingsManager.iDB().getDatiAzienda() != null && SettingsManager.iDB().getDatiAzienda().isLogoAvailable()) { +// currentLogoAzienda.setImageBitmap(SettingsManager.iDB().getDatiAzienda().getLogo()); + } } private void collapseNoConnectionLayout(){ @@ -99,8 +110,8 @@ public class MainFragment extends Fragment implements ITitledFragment { @Override - public void onCreateActionBar(ActionBar actionBar, Context context) { - actionBar.setTitle(context.getText(R.string.app_name).toString()); + public void onCreateActionBar(AppCompatTextView titleText, Context context) { + titleText.setText(context.getText(R.string.app_name).toString()); } @OnClick(R.id.fast_button_accettazione) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java index c4b990e4..30149b69 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java @@ -3,6 +3,8 @@ package it.integry.integrywmsnative.gest.picking_libero; import android.content.Context; import android.os.Bundle; + +import androidx.appcompat.widget.AppCompatTextView; import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; @@ -28,8 +30,7 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment { private PickingLiberoHelper mHelper; private PickingLiberoViewModel mViewModel; - - private ActionBar mAppCompatActionBar; + private AppCompatTextView mAppCompatActionBar; private int barcodeScannerIstanceID = -1; @@ -45,9 +46,9 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment { } @Override - public void onCreateActionBar(ActionBar actionBar, Context context) { - mAppCompatActionBar = actionBar; - mAppCompatActionBar.setTitle(context.getText(R.string.free_picking_title_fragment).toString()); + public void onCreateActionBar(AppCompatTextView titleText, Context context) { + mAppCompatActionBar = titleText; + titleText.setText(context.getText(R.string.free_picking_title_fragment).toString()); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java index d9fc57d5..45265cd6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java @@ -17,6 +17,7 @@ import java.util.List; import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.AppCompatTextView; import androidx.core.content.ContextCompat; import androidx.databinding.Observable; import androidx.databinding.ObservableArrayList; @@ -65,15 +66,15 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { private FragmentPickingLiberoBinding mBinding; private PickingLiberoHelper mHelper; - private ActionBar mAppCompatActionBar; + private AppCompatTextView mAppBarTitle; private PickingLiberoListAdapter mAdapter; - public void init(Activity context, FragmentPickingLiberoBinding binding, PickingLiberoHelper helper, ActionBar appCompatActionBar) { + public void init(Activity context, FragmentPickingLiberoBinding binding, PickingLiberoHelper helper, AppCompatTextView titleText) { mContext = context; mBinding = binding; mHelper = helper; - mAppCompatActionBar = appCompatActionBar; + mAppBarTitle = titleText; initObservable(); @@ -98,14 +99,14 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { if(mtbColt.get() != null) { initAdapter(); - mAppCompatActionBar.setTitle(String.format(mContext.getText(R.string.lu_number_text).toString(), mtbColt.get().getNumCollo())); + mAppBarTitle.setText(String.format(mContext.getText(R.string.lu_number_text).toString(), mtbColt.get().getNumCollo())); initObservableMtbColr(); } else { destroyAdapter(); - mAppCompatActionBar.setTitle(mContext.getText(R.string.free_picking).toString()); + mAppBarTitle.setText(mContext.getText(R.string.free_picking).toString()); } thereIsAnOpenedUL.set(mtbColt.get() != null); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java index 0df6c53b..b7a9951d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.res.ColorStateList; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.AppCompatTextView; import androidx.databinding.DataBindingUtil; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -102,8 +103,8 @@ public class RettificaGiacenzeFragment extends Fragment implements ITitledFragme } @Override - public void onCreateActionBar(ActionBar actionBar, Context context) { - actionBar.setTitle(context.getText(R.string.rettifica_giacenze_fragment_title).toString()); + public void onCreateActionBar(AppCompatTextView titleText, Context context) { + titleText.setText(context.getText(R.string.rettifica_giacenze_fragment_title).toString()); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java index a1222b72..6c1e7a18 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java @@ -113,7 +113,9 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked isMtbColtLoaded.set(false); mBinding.rettificaGiacenzeMainList.setAdapter(null); - if(openNew) openLU(); + ((IPoppableActivity) mContext).pop(); + + //if(openNew) openLU(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java index 05198329..0a080c34 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java @@ -3,6 +3,7 @@ package it.integry.integrywmsnative.gest.settings; import android.content.Context; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.AppCompatTextView; import androidx.databinding.DataBindingUtil; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -31,15 +32,13 @@ public class MainSettingsFragment extends Fragment implements ITitledFragment { } @Override - public void onCreateActionBar(ActionBar actionBar, Context context) { - actionBar.setTitle(context.getText(R.string.settings_category).toString()); + public void onCreateActionBar(AppCompatTextView titleText, Context context) { + titleText.setText(context.getText(R.string.settings_category).toString()); } @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - //init(); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java index 5b209fba..75306f94 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java @@ -4,6 +4,7 @@ import android.content.Context; import android.os.Bundle; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.AppCompatTextView; import androidx.preference.CheckBoxPreference; import androidx.preference.EditTextPreference; import androidx.preference.ListPreference; @@ -46,8 +47,8 @@ public class SettingsPreferenceFragment extends PreferenceFragmentCompat impleme @Override - public void onCreateActionBar(ActionBar actionBar, Context context) { - actionBar.setTitle(context.getText(R.string.settings_category).toString()); + public void onCreateActionBar(AppCompatTextView titleText, Context context) { + titleText.setText(context.getText(R.string.settings_category).toString()); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java index 8149c432..5713d1a0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java @@ -5,6 +5,7 @@ import android.content.Context; import android.content.Intent; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.AppCompatTextView; import androidx.databinding.DataBindingUtil; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -82,8 +83,8 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IR } @Override - public void onCreateActionBar(ActionBar actionBar, Context context) { - actionBar.setTitle(context.getText(R.string.vendita_title_fragment).toString()); + public void onCreateActionBar(AppCompatTextView titleText, Context context) { + titleText.setText(context.getText(R.string.vendita_title_fragment).toString()); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index 7201ad52..3dd0f1e1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -23,6 +23,7 @@ import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.REST.model.DistribuzioneColloDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; +import it.integry.integrywmsnative.core.data_recover.ColliDataRecover; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.CommonModelConsts; import it.integry.integrywmsnative.core.model.FiltroOrdineDTO; @@ -74,6 +75,8 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO private Integer defaultNumOrdOfUL = null; private Date defaultDataOrdOfUL = null; + private Integer mtbColtSessionID = null; + public VenditaOrdineInevasoViewModel(VenditaOrdineInevasoActivity activity, ArticoliInColloBottomSheetViewModel articoliInColloBottomSheetViewModel, List pickingList, List orders, List colliRegistrati) { this.mActivity = activity; this.mArticoliInColloBottomSheetViewModel = articoliInColloBottomSheetViewModel; @@ -654,6 +657,8 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO @Override public void onSuccess(MtbColt value) { + mtbColtSessionID = ColliDataRecover.startNewSession(value); + value .setDisablePrint(disablePrint) .setMtbColr(new ObservableArrayList<>()); @@ -704,7 +709,9 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO if(thereIsAnyRowInUL()) { updateDataFine(progress, () -> distribuisciCollo(progress, (generatedMtbColts) -> printCollo(progress))); } else { + ColliDataRecover.closeSession(mtbColtSessionID); deleteCollo(progress); + } } @@ -735,7 +742,11 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO MtbColt cloneMtbColt = (MtbColt) mArticoliInColloBottomSheetViewModel.mtbColt.get().clone(); - ColliMagazzinoRESTConsumer.distribuisciCollo(cloneMtbColt, DistribuzioneColloDTO.CriterioDistribuzione.UPDATE, onComplete, + ColliMagazzinoRESTConsumer.distribuisciCollo(cloneMtbColt, DistribuzioneColloDTO.CriterioDistribuzione.UPDATE, + mtbColts -> { + ColliDataRecover.closeSession(mtbColtSessionID); + onComplete.run(mtbColts); + }, ex -> UtilityExceptions.defaultException(mActivity, ex, progress)); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java index fd2ef14c..0e5e84df 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java @@ -3,6 +3,7 @@ package it.integry.integrywmsnative.gest.versamento_merce; import android.content.Context; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.AppCompatTextView; import androidx.databinding.DataBindingUtil; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -75,9 +76,6 @@ public class VersamentoMerceFragment extends Fragment implements ITitledFragment ((IPoppableActivity) getActivity()).pop(); }); - - - mVersamentoMerceViewModel.openLU(); } @@ -89,7 +87,7 @@ public class VersamentoMerceFragment extends Fragment implements ITitledFragment } @Override - public void onCreateActionBar(ActionBar actionBar, Context context) { - actionBar.setTitle(context.getText(R.string.versamento_merce_fragment_title).toString()); + public void onCreateActionBar(AppCompatTextView titleText, Context context) { + titleText.setText(context.getText(R.string.versamento_merce_fragment_title).toString()); } } diff --git a/app/src/main/res/drawable/circular_background_alpha_7.xml b/app/src/main/res/drawable/circular_background_alpha_7.xml new file mode 100644 index 00000000..d9c5e6c7 --- /dev/null +++ b/app/src/main/res/drawable/circular_background_alpha_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/dashboard_header_bg.xml b/app/src/main/res/drawable/dashboard_header_bg.xml new file mode 100644 index 00000000..5bf81da8 --- /dev/null +++ b/app/src/main/res/drawable/dashboard_header_bg.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_accettazione_96.png b/app/src/main/res/drawable/ic_accettazione_96.png new file mode 100644 index 00000000..6822976f Binary files /dev/null and b/app/src/main/res/drawable/ic_accettazione_96.png differ diff --git a/app/src/main/res/drawable/ic_outline_account_circle_24px.xml b/app/src/main/res/drawable/ic_outline_account_circle_24px.xml new file mode 100644 index 00000000..0c9a104b --- /dev/null +++ b/app/src/main/res/drawable/ic_outline_account_circle_24px.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_outline_account_circle_48px.xml b/app/src/main/res/drawable/ic_outline_account_circle_48px.xml new file mode 100644 index 00000000..95394524 --- /dev/null +++ b/app/src/main/res/drawable/ic_outline_account_circle_48px.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/drawable/ic_picking_libero_96.png b/app/src/main/res/drawable/ic_picking_libero_96.png new file mode 100644 index 00000000..7ba95e88 Binary files /dev/null and b/app/src/main/res/drawable/ic_picking_libero_96.png differ diff --git a/app/src/main/res/drawable/ic_rettifica_giacenze_96.png b/app/src/main/res/drawable/ic_rettifica_giacenze_96.png new file mode 100644 index 00000000..9b08416e Binary files /dev/null and b/app/src/main/res/drawable/ic_rettifica_giacenze_96.png differ diff --git a/app/src/main/res/drawable/ic_spedizione_96.png b/app/src/main/res/drawable/ic_spedizione_96.png new file mode 100644 index 00000000..79cb16a8 Binary files /dev/null and b/app/src/main/res/drawable/ic_spedizione_96.png differ diff --git a/app/src/main/res/drawable/ic_versamento_merce_96.png b/app/src/main/res/drawable/ic_versamento_merce_96.png new file mode 100644 index 00000000..097d8715 Binary files /dev/null and b/app/src/main/res/drawable/ic_versamento_merce_96.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 75bfcd6c..194868be 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -21,6 +21,7 @@ android:layout_height="match_parent" android:layout_gravity="start" android:fitsSystemWindows="true" + android:background="@android:color/white" app:headerLayout="@layout/nav_header_main" app:menu="@menu/activity_main_drawer" /> diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index 4d0cb088..5e1ce671 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -8,8 +8,6 @@ android:orientation="vertical" tools:context="it.integry.integrywmsnative.MainActivity"> - - + android:layout_height="?actionBarSize" + android:gravity="center_horizontal" + app:popupTheme="@style/AppTheme.PopupOverlay"> + + + + + + + + + + + + - - diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 187dc478..f51af0cc 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -40,284 +40,606 @@ - + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:gravity="center_horizontal"> - + android:layout_height="wrap_content" + android:padding="16dp" + android:background="@color/colorPrimary"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:orientation="vertical"> - + android:gravity="center_vertical"> + + + + android:orientation="vertical"> - + - + android:layout_marginTop="2dp" + style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard" + tools:text="android.studio@android.com" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index b456d9ea..6715bcb3 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -1,39 +1,34 @@ + > - + + + + + - + + + + + + + - + + + + + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e86eca4f..aa882d32 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,6 +1,6 @@ - Integry WMS Native + Integry WMS Apri menu Chiudi menu diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 25c8acae..a5441545 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,7 @@ - #1A73E7 - @color/indigo_700 + #1A73E8 + #0049b4 #387ef5 #3f3f51b5 #757575 @@ -36,6 +36,10 @@ #43A047 #388E3C + + #616161 + #424242 + #813f51b5 #5C6BC0 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 5c611118..adaa1ddf 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -6,4 +6,6 @@ 160dp 16dp 16dp + + 16dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4e2a57c5..2964c12b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - Integry WMS Native + Integry WMS Open navigation drawer Close navigation drawer diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 71c3e0a5..bcde4e13 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ - + - + + + + + + + + + + @@ -25,6 +51,8 @@ @color/colorPrimary @color/colorPrimaryDark @color/colorAccent + true + @android:color/white diff --git a/device-2019-01-21-111733.png b/device-2019-01-21-111733.png new file mode 100644 index 00000000..e72511ed Binary files /dev/null and b/device-2019-01-21-111733.png differ diff --git a/device-2019-01-21-125259.png b/device-2019-01-21-125259.png new file mode 100644 index 00000000..8ca4c2ad Binary files /dev/null and b/device-2019-01-21-125259.png differ