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

Completato restyling dashboard

Browse Source
This commit is contained in:
Giuseppe Scorrano
2019-01-21 16:24:37 +01:00
parent f56bb7dd95
commit 299b5ca0ea
33 changed files with 723 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
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();
@@ -124,8 +125,8 @@ public class MainActivity extends AppCompatActivity
@Override
public boolean onNavigationItemSelected(MenuItem item) {
//mBinding.appBarMain.waterfallToolbar.resetElevation();
//mBinding.appBarMain.waterfallToolbar.setRecyclerView(null);
mBinding.appBarMain.waterfallToolbar.resetElevation();
mBinding.appBarMain.waterfallToolbar.setRecyclerView(null);
// Handle navigation view item clicks here.
Fragment fragment = null;
@@ -178,23 +179,36 @@ 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) {
//((IRecyclerFragment) fragment).setWaterfallToolbar(mBinding.appBarMain.waterfallToolbar);
((IRecyclerFragment) fragment).setWaterfallToolbar(mBinding.appBarMain.waterfallToolbar);
}
if(fragment instanceof ISelectAllFragment && ((ISelectAllFragment)fragment).isEnabled()) {
@@ -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) {

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

@@ -5,6 +5,7 @@ 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;
@@ -37,7 +38,7 @@ 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.current_deposito) TextView currentDeposito;
@BindView(R.id.drawer_logoAzienda) CircleImageView currentLogoAzienda;
// @BindView(R.id.drawer_logoAzienda) CircleImageView currentLogoAzienda;
private View mView;
@@ -83,8 +84,8 @@ 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();
@@ -92,12 +93,10 @@ public class MainFragment extends Fragment implements ITitledFragment {
private void initSessionData() {
currentUsername.setText(SettingsManager.i().user.fullname);
//TextView textViewDeposito = headerLayout.findViewById(R.id.drawer_deposito);
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());
// currentLogoAzienda.setImageBitmap(SettingsManager.iDB().getDatiAzienda().getLogo());
}
}
@@ -112,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());
}
}