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

Finish Dashboard_Restyling

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-01-21 16:28:04 +01:00
commit c7b4e17048
35 changed files with 812 additions and 348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/assetWizardSettings.xml generated
View File

@ -28,8 +28,12 @@
</option>
<option name="values">
<map>
<entry key="outputName" value="ic_upload_black_24dp" />
<entry key="sourceFile" value="C:\Users\GiuseppeS" />
<entry key="assetSourceType" value="FILE" />
<entry key="height" value="48" />
<entry key="outputName" value="ic_outline_account_circle_48px" />
<entry key="overrideSize" value="true" />
<entry key="sourceFile" value="C:\Users\GiuseppeS\Desktop\outline-account_circle-24px.svg" />
<entry key="width" value="48" />
</map>
</option>
</PersistentState>

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

Binary file not shown.

1
app/src/main/AndroidManifest.xml
View File

@ -19,7 +19,6 @@
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:screenOrientation="portrait"
android:theme="@style/Light"
android:windowSoftInputMode="adjustPan"></activity>

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

@ -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());
}
}
}

11
app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISearcableFragment.java Normal file
View File

@ -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();
}

3
app/src/main/java/it/integry/integrywmsnative/core/interfaces/ITitledFragment.java
View File

@ -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);
}

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

@ -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<OrdineAccettazioneGroupedInevasoDTO> 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) {

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

@ -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,7 +37,8 @@ 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;
@ -79,13 +84,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 +111,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)

11
app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
View File

@ -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

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

@ -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<MtbColr> {
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<MtbColr> {
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);

5
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java
View File

@ -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());
}

7
app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
View File

@ -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

5
app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java
View File

@ -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());
}

5
app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
View File

@ -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

8
app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java
View File

@ -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());
}
}

13
app/src/main/res/drawable/circular_background_alpha_7.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<solid
android:color="@color/white_bg_alpha" />
<padding
android:left="1dp"
android:right="1dp"
android:top="1dp" />
<corners android:radius="500dp" />
</shape>

12
app/src/main/res/drawable/dashboard_header_bg.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<solid android:color="@color/colorPrimaryDark" />
<padding
android:left="1dp"
android:right="1dp"
android:top="1dp" />
<corners android:radius="@dimen/standard_rounc" />
</shape>

BIN
app/src/main/res/drawable/ic_accettazione_96.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

9
app/src/main/res/drawable/ic_outline_account_circle_24px.xml Normal file
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="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM7.07,18.28c0.43,-0.9 3.05,-1.78 4.93,-1.78s4.51,0.88 4.93,1.78C15.57,19.36 13.86,20 12,20s-3.57,-0.64 -4.93,-1.72zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33C4.62,15.49 4,13.82 4,12c0,-4.41 3.59,-8 8,-8s8,3.59 8,8c0,1.82 -0.62,3.49 -1.64,4.83zM12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13s3.5,-1.56 3.5,-3.5S13.94,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5S11.17,8 12,8s1.5,0.67 1.5,1.5S12.83,11 12,11z"/>
</vector>

4
app/src/main/res/drawable/ic_outline_account_circle_48px.xml Normal file
View File

@ -0,0 +1,4 @@
<vector android:height="48dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM7.07,18.28c0.43,-0.9 3.05,-1.78 4.93,-1.78s4.51,0.88 4.93,1.78C15.57,19.36 13.86,20 12,20s-3.57,-0.64 -4.93,-1.72zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33C4.62,15.49 4,13.82 4,12c0,-4.41 3.59,-8 8,-8s8,3.59 8,8c0,1.82 -0.62,3.49 -1.64,4.83zM12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13s3.5,-1.56 3.5,-3.5S13.94,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5S11.17,8 12,8s1.5,0.67 1.5,1.5S12.83,11 12,11z"/>
</vector>

BIN
app/src/main/res/drawable/ic_picking_libero_96.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/src/main/res/drawable/ic_rettifica_giacenze_96.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/src/main/res/drawable/ic_spedizione_96.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/src/main/res/drawable/ic_versamento_merce_96.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

1
app/src/main/res/layout/activity_main.xml
View File

@ -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" />

45
app/src/main/res/layout/app_bar_main.xml
View File

@ -8,8 +8,6 @@
android:orientation="vertical"
tools:context="it.integry.integrywmsnative.MainActivity">
<it.integry.plugins.waterfalltoolbar.WaterfallToolbar
android:id="@+id/waterfall_toolbar"
android:layout_width="match_parent"
@ -18,7 +16,46 @@
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize">
android:layout_height="?actionBarSize"
android:gravity="center_horizontal"
app:popupTheme="@style/AppTheme.PopupOverlay">
<LinearLayout
android:id="@+id/toolbar_title_centered_layout"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_gravity="center">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_launcher"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:layout_gravity="center"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:letterSpacing="-0.05"
style="@style/AppTheme.NewMaterial.Text.ToolbarTitle"
android:layout_gravity="center"/>
</LinearLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/toolbar_title_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:letterSpacing="-0.05"
android:visibility="gone"
style="@style/AppTheme.NewMaterial.Text.ToolbarTitle"/>
<androidx.appcompat.widget.SearchView
android:id="@+id/main_search"
@ -53,10 +90,8 @@
</androidx.appcompat.widget.Toolbar>
</it.integry.plugins.waterfalltoolbar.WaterfallToolbar>
<include layout="@layout/content_main" />
</LinearLayout>

752
app/src/main/res/layout/fragment_main.xml
View File

@ -40,284 +40,606 @@
</net.cachapa.expandablelayout.ExpandableLayout>
<androidx.cardview.widget.CardView
app:cardBackgroundColor="@android:color/white"
app:cardCornerRadius="4dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:background="@color/colorPrimary">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:textColor="@android:color/black"
android:layout_marginTop="10dp"
android:layout_marginLeft="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Informazioni generali"
android:textAllCaps="true"
android:textStyle="bold"/>
android:orientation="vertical">
<LinearLayout
android:padding="15dp"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical">
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="36dp"
android:layout_height="36dp"
android:adjustViewBounds="true"
android:src="@drawable/ic_outline_account_circle_48px"
android:tint="@android:color/white"
android:layout_marginEnd="16dp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.40"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="Utente corrente"
android:textColor="@android:color/black"
app:layout_constraintEnd_toStartOf="@+id/guideline"
app:layout_constraintStart_toStartOf="parent" />
android:orientation="vertical">
<TextView
android:id="@+id/current_user_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
tools:text="Android Studio"
style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard" />
<TextView
android:id="@+id/current_deposito"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
tools:text="android.studio@android.com" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
<!--<RelativeLayout-->
<!--android:id="@+id/layout_logo_azienda"-->
<!--android:layout_width="100dp"-->
<!--android:layout_height="100dp"-->
<!--android:background="@drawable/circular_background_alpha_7"-->
<!--android:layout_gravity="center_horizontal"-->
<!--android:gravity="center_horizontal"-->
<!--android:layout_centerHorizontal="true"-->
<!--android:padding="8dp">-->
<!--<RelativeLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent"-->
<!--android:background="@drawable/circular_background">-->
<!--<de.hdodenhof.circleimageview.CircleImageView-->
<!--android:id="@+id/drawer_logoAzienda"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent" />-->
<!--</RelativeLayout>-->
<!--</RelativeLayout>-->
</RelativeLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:padding="8dp">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/central_guideline_dashboard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
<com.google.android.material.card.MaterialCardView
style="@style/Widget.MaterialComponents.CardView"
android:id="@+id/fast_button_accettazione"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="0dp"
android:layout_marginStart="0dp"
android:text="N/A"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="@+id/guideline_username"
app:layout_constraintEnd_toEndOf="parent" />
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
app:cardBackgroundColor="@android:color/white"
app:cardCornerRadius="4dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/central_guideline_dashboard">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:padding="8dp">
<ImageView
android:layout_width="64sp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@drawable/ic_accettazione_96"/>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:textColor="@color/grey_700"
android:textStyle="bold"
android:text="@string/accettazione_title_fragment"
android:layout_marginTop="16dp"/>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<androidx.cardview.widget.CardView
style="@style/Widget.MaterialComponents.CardView"
android:id="@+id/fast_button_spedizione"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
app:cardBackgroundColor="@android:color/white"
app:cardCornerRadius="4dp"
app:layout_constraintStart_toStartOf="@id/central_guideline_dashboard"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:padding="8dp">
<ImageView
android:layout_width="64sp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@drawable/ic_spedizione_96"/>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:textColor="@color/grey_700"
android:textStyle="bold"
android:text="@string/vendita_title_fragment"
android:layout_marginTop="16dp"/>
</LinearLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:clipToPadding="false"
android:padding="8dp">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline1"
android:id="@+id/central_guideline_dashboard__line2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.40"/>
app:layout_constraintGuide_percent="0.5" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="Segnale WI-FI"
android:textColor="@android:color/black"
app:layout_constraintEnd_toStartOf="@+id/guideline"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/wifi_power"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="0dp"
android:layout_marginStart="0dp"
android:text="N/A"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="@+id/guideline1"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
app:cardBackgroundColor="@android:color/white"
app:cardCornerRadius="4dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:textColor="@android:color/black"
android:layout_marginTop="10dp"
android:layout_marginLeft="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Azioni rapide"
android:textAllCaps="true"
android:textStyle="bold"/>
<LinearLayout
android:layout_margin="15dp"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="1">
<LinearLayout
android:id="@+id/fast_button_accettazione"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_weight="0.5"
android:gravity="center">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_margin="8dp"
android:background="@android:color/white"
android:src="@drawable/ic_download_black_24dp"
android:tint="@color/mainGreen" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Accettazione"
android:gravity="center_horizontal"/>
</LinearLayout>
<LinearLayout
android:id="@+id/fast_button_spedizione"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_weight="0.5"
android:gravity="center">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_margin="8dp"
android:background="@android:color/white"
android:src="@drawable/ic_upload_black_24dp"
android:tint="@color/mainOrange" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Spedizione"
android:gravity="center_horizontal"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="16dp"
android:weightSum="0.9">
<LinearLayout
<com.google.android.material.card.MaterialCardView
style="@style/Widget.MaterialComponents.CardView"
android:id="@+id/fast_button_rettifica_giacenze"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_weight="0.3"
android:gravity="center">
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
app:cardBackgroundColor="@android:color/white"
app:cardCornerRadius="4dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/central_guideline_dashboard__line2">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_margin="8dp"
android:background="@android:color/white"
android:src="@drawable/ic_empty_box_96"
android:tint="@color/brown_500" />
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:padding="8dp">
<ImageView
android:layout_width="64sp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@drawable/ic_rettifica_giacenze_96"/>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Rettifica Giacenze"
android:gravity="center_horizontal"/>
android:textAllCaps="true"
android:textColor="@color/grey_700"
android:textStyle="bold"
android:text="@string/rettifica_giacenze_fragment_title"
android:gravity="center_horizontal"
android:layout_marginTop="16dp"/>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<LinearLayout
<androidx.cardview.widget.CardView
style="@style/Widget.MaterialComponents.CardView"
android:id="@+id/fast_button_versamento"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_weight="0.3"
android:gravity="center">
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
app:cardBackgroundColor="@android:color/white"
app:cardCornerRadius="4dp"
app:layout_constraintStart_toStartOf="@id/central_guideline_dashboard__line2"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:padding="8dp">
<ImageView
android:layout_width="64sp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@drawable/ic_versamento_merce_96"/>
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_margin="8dp"
android:background="@android:color/white"
android:src="@drawable/ic_load_shelf_96"
android:tint="@color/teal_500" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:textColor="@color/grey_700"
android:textStyle="bold"
android:text="@string/versamento_merce_fragment_title"
android:gravity="center_horizontal"
android:text="Versamento Merce"/>
android:layout_marginTop="16dp"/>
</LinearLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:padding="8dp">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/central_guideline_dashboard__line3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
<androidx.cardview.widget.CardView
style="@style/Widget.MaterialComponents.CardView"
android:id="@+id/fast_button_picking_libero"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_weight="0.3"
android:gravity="center">
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
app:cardBackgroundColor="@android:color/white"
app:cardCornerRadius="4dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/central_guideline_dashboard__line3">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_margin="8dp"
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:padding="8dp">
<ImageView
android:layout_width="64sp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:background="@android:color/white"
android:src="@drawable/ic_barcode_96"
android:tint="@color/colorPrimary" />
android:src="@drawable/ic_picking_libero_96"/>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:textColor="@color/grey_700"
android:textStyle="bold"
android:text="@string/free_picking"
android:gravity="center_horizontal"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
android:gravity="center_horizontal"
android:layout_marginTop="16dp"/>
</LinearLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
<!---->
<!--<androidx.cardview.widget.CardView-->
<!--app:cardBackgroundColor="@android:color/white"-->
<!--app:cardCornerRadius="4dp"-->
<!--android:layout_marginLeft="10dp"-->
<!--android:layout_marginRight="10dp"-->
<!--android:layout_marginBottom="10dp"-->
<!--android:layout_marginTop="10dp"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content">-->
<!--<LinearLayout-->
<!--android:orientation="vertical"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content">-->
<!--<TextView-->
<!--android:textColor="@android:color/black"-->
<!--android:layout_marginTop="10dp"-->
<!--android:layout_marginLeft="10dp"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:text="Informazioni generali"-->
<!--android:textAllCaps="true"-->
<!--android:textStyle="bold"/>-->
<!--<LinearLayout-->
<!--android:padding="15dp"-->
<!--android:orientation="vertical"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content">-->
<!--<androidx.constraintlayout.widget.ConstraintLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content">-->
<!--<androidx.constraintlayout.widget.Guideline-->
<!--android:id="@+id/guideline_username"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:orientation="vertical"-->
<!--app:layout_constraintGuide_percent="0.40"/>-->
<!--</androidx.constraintlayout.widget.ConstraintLayout>-->
<!--<androidx.constraintlayout.widget.ConstraintLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content">-->
<!--<androidx.constraintlayout.widget.Guideline-->
<!--android:id="@+id/guideline1"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:orientation="vertical"-->
<!--app:layout_constraintGuide_percent="0.40"/>-->
<!--<TextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginStart="8dp"-->
<!--android:text="Segnale WI-FI"-->
<!--android:textColor="@android:color/black"-->
<!--app:layout_constraintEnd_toStartOf="@+id/guideline"-->
<!--app:layout_constraintStart_toStartOf="parent" />-->
<!--<TextView-->
<!--android:id="@+id/wifi_power"-->
<!--android:layout_width="0dp"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginEnd="0dp"-->
<!--android:layout_marginStart="0dp"-->
<!--android:text="N/A"-->
<!--android:textSize="16sp"-->
<!--app:layout_constraintStart_toStartOf="@+id/guideline1"-->
<!--app:layout_constraintEnd_toEndOf="parent" />-->
<!--</androidx.constraintlayout.widget.ConstraintLayout>-->
<!--</LinearLayout>-->
<!--</LinearLayout>-->
<!--</androidx.cardview.widget.CardView>-->
<!--<androidx.cardview.widget.CardView-->
<!--app:cardBackgroundColor="@android:color/white"-->
<!--app:cardCornerRadius="4dp"-->
<!--android:layout_marginLeft="10dp"-->
<!--android:layout_marginRight="10dp"-->
<!--android:layout_marginBottom="10dp"-->
<!--android:layout_marginTop="10dp"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content">-->
<!--<LinearLayout-->
<!--android:orientation="vertical"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content">-->
<!--<TextView-->
<!--android:textColor="@android:color/black"-->
<!--android:layout_marginTop="10dp"-->
<!--android:layout_marginLeft="10dp"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:text="Azioni rapide"-->
<!--android:textAllCaps="true"-->
<!--android:textStyle="bold"/>-->
<!--<LinearLayout-->
<!--android:layout_margin="15dp"-->
<!--android:orientation="vertical"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content">-->
<!--<LinearLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:orientation="horizontal"-->
<!--android:weightSum="1">-->
<!--<LinearLayout-->
<!--android:id="@+id/fast_button_accettazione"-->
<!--android:layout_width="0dp"-->
<!--android:layout_height="wrap_content"-->
<!--android:orientation="vertical"-->
<!--android:layout_weight="0.5"-->
<!--android:gravity="center">-->
<!--<androidx.appcompat.widget.AppCompatImageView-->
<!--android:layout_width="36dp"-->
<!--android:layout_height="36dp"-->
<!--android:layout_margin="8dp"-->
<!--android:background="@android:color/white"-->
<!--android:src="@drawable/ic_download_black_24dp"-->
<!--android:tint="@color/mainGreen" />-->
<!--<androidx.appcompat.widget.AppCompatTextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:text="Accettazione"-->
<!--android:gravity="center_horizontal"/>-->
<!--</LinearLayout>-->
<!--<LinearLayout-->
<!--android:id="@+id/fast_button_spedizione"-->
<!--android:layout_width="0dp"-->
<!--android:layout_height="wrap_content"-->
<!--android:orientation="vertical"-->
<!--android:layout_weight="0.5"-->
<!--android:gravity="center">-->
<!--<androidx.appcompat.widget.AppCompatImageView-->
<!--android:layout_width="36dp"-->
<!--android:layout_height="36dp"-->
<!--android:layout_margin="8dp"-->
<!--android:background="@android:color/white"-->
<!--android:src="@drawable/ic_upload_black_24dp"-->
<!--android:tint="@color/mainOrange" />-->
<!--<androidx.appcompat.widget.AppCompatTextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:text="Spedizione"-->
<!--android:gravity="center_horizontal"/>-->
<!--</LinearLayout>-->
<!--</LinearLayout>-->
<!--<LinearLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:orientation="horizontal"-->
<!--android:layout_marginTop="16dp"-->
<!--android:weightSum="0.9">-->
<!--<LinearLayout-->
<!--android:id="@+id/fast_button_rettifica_giacenze"-->
<!--android:layout_width="0dp"-->
<!--android:layout_height="wrap_content"-->
<!--android:orientation="vertical"-->
<!--android:layout_weight="0.3"-->
<!--android:gravity="center">-->
<!--<androidx.appcompat.widget.AppCompatImageView-->
<!--android:layout_width="36dp"-->
<!--android:layout_height="36dp"-->
<!--android:layout_margin="8dp"-->
<!--android:background="@android:color/white"-->
<!--android:src="@drawable/ic_empty_box_96"-->
<!--android:tint="@color/brown_500" />-->
<!--<androidx.appcompat.widget.AppCompatTextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:text="Rettifica Giacenze"-->
<!--android:gravity="center_horizontal"/>-->
<!--</LinearLayout>-->
<!--<LinearLayout-->
<!--android:id="@+id/fast_button_versamento"-->
<!--android:layout_width="0dp"-->
<!--android:layout_height="wrap_content"-->
<!--android:orientation="vertical"-->
<!--android:layout_weight="0.3"-->
<!--android:gravity="center">-->
<!--<androidx.appcompat.widget.AppCompatImageView-->
<!--android:layout_width="36dp"-->
<!--android:layout_height="36dp"-->
<!--android:layout_margin="8dp"-->
<!--android:background="@android:color/white"-->
<!--android:src="@drawable/ic_load_shelf_96"-->
<!--android:tint="@color/teal_500" />-->
<!--<androidx.appcompat.widget.AppCompatTextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:gravity="center_horizontal"-->
<!--android:text="Versamento Merce"/>-->
<!--</LinearLayout>-->
<!--<LinearLayout-->
<!--android:id="@+id/fast_button_picking_libero"-->
<!--android:layout_width="0dp"-->
<!--android:layout_height="wrap_content"-->
<!--android:orientation="vertical"-->
<!--android:layout_weight="0.3"-->
<!--android:gravity="center">-->
<!--<androidx.appcompat.widget.AppCompatImageView-->
<!--android:layout_width="36dp"-->
<!--android:layout_height="36dp"-->
<!--android:layout_margin="8dp"-->
<!--android:adjustViewBounds="true"-->
<!--android:scaleType="centerInside"-->
<!--android:background="@android:color/white"-->
<!--android:src="@drawable/ic_barcode_96"-->
<!--android:tint="@color/colorPrimary" />-->
<!--<androidx.appcompat.widget.AppCompatTextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:text="@string/free_picking"-->
<!--android:gravity="center_horizontal"/>-->
<!--</LinearLayout>-->
<!--</LinearLayout>-->
<!--</LinearLayout>-->
<!--</LinearLayout>-->
<!--</androidx.cardview.widget.CardView>-->
</LinearLayout>
</FrameLayout>

41
app/src/main/res/layout/nav_header_main.xml
View File

@ -1,39 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/side_nav_bar"
android:gravity="bottom"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:theme="@style/ThemeOverlay.AppCompat.Dark">
>
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/drawer_logoAzienda"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing"
android:src="@android:drawable/sym_def_app_icon" />
<!--<de.hdodenhof.circleimageview.CircleImageView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:paddingTop="@dimen/nav_header_vertical_spacing"-->
<!--android:src="@android:drawable/sym_def_app_icon" />-->
<TextView
android:id="@+id/drawer_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing"
tools:text="Android Studio"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<!--<TextView-->
<!--android:id="@+id/drawer_username"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:paddingTop="@dimen/nav_header_vertical_spacing"-->
<!--tools:text="Android Studio"-->
<!--android:textAppearance="@style/TextAppearance.AppCompat.Body1" />-->
<TextView
android:id="@+id/drawer_deposito"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="android.studio@android.com" />
<!--<TextView-->
<!--android:id="@+id/drawer_deposito"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--tools:text="android.studio@android.com" />-->
</LinearLayout>
</layout>

2
app/src/main/res/values-it/strings.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Integry WMS Native</string>
<string name="app_name">Integry WMS</string>
<string name="navigation_drawer_open">Apri menu</string>
<string name="navigation_drawer_close">Chiudi menu</string>

8
app/src/main/res/values/colors.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#1A73E7</color>
<color name="colorPrimaryDark">@color/indigo_700</color>
<color name="colorPrimary">#1A73E8</color>
<color name="colorPrimaryDark">#0049b4</color>
<color name="colorAccent">#387ef5</color>
<color name="colorRipple">#3f3f51b5</color>
<color name="colorPrimaryGray">#757575</color>
@ -36,6 +36,10 @@
<color name="green_600">#43A047</color>
<color name="green_700">#388E3C</color>
<color name="grey_700">#616161</color>
<color name="grey_800">#424242</color>
<color name="alpha_indigo_500">#813f51b5</color>
<color name="indigo_400">#5C6BC0</color>

2
app/src/main/res/values/dimens.xml
View File

@ -6,4 +6,6 @@
<dimen name="nav_header_height">160dp</dimen>
<dimen name="fab_margin">16dp</dimen>
<dimen name="bottom_sheet_round16">16dp</dimen>
<dimen name="standard_rounc">16dp</dimen>
</resources>

2
app/src/main/res/values/strings.xml
View File

@ -1,5 +1,5 @@
<resources>
<string name="app_name" translatable="false">Integry WMS Native</string>
<string name="app_name" translatable="false">Integry WMS</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>

32
app/src/main/res/values/styles.xml
View File

@ -1,7 +1,7 @@
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
<style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
@ -17,6 +17,32 @@
<item name="windowNoTitle">true</item>
</style>
<style name="AppTheme.NewMaterial">
<item name="android:fontFamily">@font/open_sans_regular</item>
</style>
<style name="AppTheme.NewMaterial.Text" parent = "AppTheme.NewMaterial">
</style>
<style name="AppTheme.NewMaterial.Text.ToolbarTitle" parent="AppTheme.NewMaterial.Text">
<item name="android:textColor">#5F6368</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">20sp</item>
</style>
<style name="AppTheme.NewMaterial.Text.TextBoxDashboard" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textColor">@android:color/white</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">20sp</item>
</style>
<style name="AppTheme.NewMaterial.Text.TextBoxLittleDashboard" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textColor">@android:color/white</item>
<item name="android:fontFamily">@font/open_sans_regular</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">16sp</item>
</style>
<style name="SplashTheme" parent="AppTheme.NoActionBar">
<item name="android:windowBackground">@drawable/splash_background</item>
</style>
@ -25,6 +51,8 @@
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
<item name="android:statusBarColor">@android:color/white</item>
</style>

BIN
device-2019-01-21-111733.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 572 KiB

BIN
device-2019-01-21-125259.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 MiB