Cambiato look della toolbar in FullWhite

app/src/main/AndroidManifest.xml

@@ -5,7 +5,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
-
     <application
         android:name=".MainApplication"
         android:allowBackup="true"
@@ -18,7 +17,7 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/it/integry/integrywmsnative/MainActivity.java

@@ -11,30 +11,25 @@ import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.SearchView;
 import android.support.v7.widget.Toolbar;
-import android.text.SpannableString;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
-import net.cachapa.expandablelayout.ExpandableLayout;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback;
-import it.integry.integrywmsnative.core.REST.consumers.ISingleValueOperationCallback;
 import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.interfaces.IRecyclerFragment;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilitySettings;
-import it.integry.integrywmsnative.core.wifi.WiFiCheckerViewHolder;
 import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneFragment;
-import it.integry.integrywmsnative.gest.accettazione.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.gest.login.LoginActivity;
 import it.integry.integrywmsnative.gest.main.MainFragment;
+import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment;
 import it.integry.integrywmsnative.gest.settings.MainSettingsFragment;
-import it.integry.integrywmsnative.gest.settings.SettingsPreferenceFragment;
 import it.integry.integrywmsnative.gest.vendita.MainVenditaFragment;
-import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper;
+import it.integry.plugins.waterfalltoolbar.WaterfallToolbar;
 
 public class MainActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
@@ -43,6 +38,8 @@ public class MainActivity extends AppCompatActivity
 
     @BindView(R.id.nav_view) NavigationView mNavigationView;
 
+    @BindView(R.id.waterfall_toolbar) WaterfallToolbar mWaterfallToolbar;
+
 
 
 
@@ -62,6 +59,9 @@ public class MainActivity extends AppCompatActivity
 
             ButterKnife.bind(this);
 
+//            WaterfallToolbar waterfallToolbar = findViewById(R.id.waterfall_toolbar);
+//            waterfallToolbar.set
+
             Toolbar toolbar = findViewById(R.id.toolbar);
             setSupportActionBar(toolbar);
 
@@ -128,6 +128,9 @@ public class MainActivity extends AppCompatActivity
     @SuppressWarnings("StatementWithEmptyBody")
     @Override
     public boolean onNavigationItemSelected(MenuItem item) {
+
+        mWaterfallToolbar.setRecyclerView(null);
+
         // Handle navigation view item clicks here.
         Fragment fragment = null;
         int id = item.getItemId();
@@ -139,7 +142,8 @@ public class MainActivity extends AppCompatActivity
             fragment = MainVenditaFragment.newInstance();
             this.adaptViewToFragment(fragment);
         } else if (id == R.id.nav_slideshow) {
-
+            fragment = RettificaGiacenzeFragment.newInstance();
+            this.adaptViewToFragment(fragment);
         } else if (id == R.id.nav_manage) {
 
         } else if (id == R.id.nav_share) {
@@ -181,6 +185,10 @@ public class MainActivity extends AppCompatActivity
         } else {
             getSupportActionBar().setTitle(R.string.app_name);
         }
+
+        if(fragment instanceof IRecyclerFragment) {
+            ((IRecyclerFragment) fragment).setWaterfallToolbar(mWaterfallToolbar);
+        }
     }
 
     private void changeContentFragment(Fragment fragment){

app/src/main/java/it/integry/integrywmsnative/core/interfaces/IRecyclerFragment.java

@@ -0,0 +1,11 @@
+package it.integry.integrywmsnative.core.interfaces;
+
+import android.support.v7.widget.RecyclerView;
+
+import it.integry.plugins.waterfalltoolbar.WaterfallToolbar;
+
+public interface IRecyclerFragment {
+
+    void setWaterfallToolbar(WaterfallToolbar waterfallToolbar);
+
+}

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

@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.gest.accettazione.core.interfaces;
+package it.integry.integrywmsnative.core.interfaces;
 
 import android.content.Context;
 

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

@@ -8,6 +8,7 @@ import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SearchView;
 import android.text.Html;
 import android.text.SpannableString;
@@ -29,21 +30,24 @@ 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.ICheckBoxCallback;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.FragmentMainAccettazioneBinding;
 import it.integry.integrywmsnative.gest.accettazione.core.AccettazioneHelper;
 import it.integry.integrywmsnative.gest.accettazione.core.MainListAccettazioneAdapter;
 import it.integry.integrywmsnative.gest.accettazione.core.interfaces.ILoadOrdiniCallback;
 import it.integry.integrywmsnative.gest.accettazione.core.interfaces.ILoadPickingListCallback;
-import it.integry.integrywmsnative.gest.accettazione.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.interfaces.IRecyclerFragment;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO;
 import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneGroupedInevasoDTO;
 import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO;
 import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.AccettazioneOrdineInevasoActivity;
 import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper;
+import it.integry.plugins.waterfalltoolbar.WaterfallToolbar;
 
-public class MainAccettazioneFragment extends Fragment implements SearchView.OnQueryTextListener, ITitledFragment {
+public class MainAccettazioneFragment extends Fragment implements SearchView.OnQueryTextListener, ITitledFragment, IRecyclerFragment {
+
+    private static WaterfallToolbar mWaterfallToolbar;
 
     private FragmentMainAccettazioneBinding mBinding;
 
@@ -95,6 +99,8 @@ public class MainAccettazioneFragment extends Fragment implements SearchView.OnQ
 
         ButterKnife.bind(this, mBinding.getRoot());
 
+        mWaterfallToolbar.setRecyclerView(mBinding.accettazioneMainList);
+
         return mBinding.getRoot();
     }
 
@@ -324,4 +330,9 @@ public class MainAccettazioneFragment extends Fragment implements SearchView.OnQ
         return true;
 
     }
+
+    @Override
+    public void setWaterfallToolbar(WaterfallToolbar waterfallToolbar) {
+        mWaterfallToolbar = waterfallToolbar;
+    }
 }

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

@@ -0,0 +1,70 @@
+package it.integry.integrywmsnative.gest.rettifica_giacenze;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import butterknife.ButterKnife;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.databinding.FragmentRettificaGiacenzeBinding;
+import it.integry.integrywmsnative.gest.rettifica_giacenze.core.RettificaGiacenzeHelper;
+
+public class RettificaGiacenzeFragment extends Fragment implements ITitledFragment {
+
+    private RettificaGiacenzeHelper mHelper;
+    private FragmentRettificaGiacenzeBinding mBinding = null;
+
+    public RettificaGiacenzeFragment() {
+        // Required empty public constructor
+    }
+
+
+    public static RettificaGiacenzeFragment newInstance() {
+        RettificaGiacenzeFragment fragment = new RettificaGiacenzeFragment();
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_rettifica_giacenze, container, false);
+
+        mBinding.setView(this);
+
+        ButterKnife.bind(this, mBinding.getRoot());
+
+        return mBinding.getRoot();
+    }
+
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+    }
+
+
+    @Override
+    public String getTitle(Context context) {
+        return context.getResources().getString(R.string.rettifica_giacenze_fragment_title);
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java

@@ -0,0 +1,4 @@
+package it.integry.integrywmsnative.gest.rettifica_giacenze.core;
+
+public class RettificaGiacenzeHelper {
+}

app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java

@@ -0,0 +1,4 @@
+package it.integry.integrywmsnative.gest.rettifica_giacenze.viewmodel;
+
+public class RettificaGiacenzeViewModel {
+}

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

@@ -11,7 +11,7 @@ import android.view.ViewGroup;
 import butterknife.ButterKnife;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.databinding.FragmentMainSettingsBinding;
-import it.integry.integrywmsnative.gest.accettazione.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 
 public class MainSettingsFragment extends Fragment implements ITitledFragment {
 

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

@@ -18,7 +18,7 @@ import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback;
 import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.settings.SharedPrefKeys;
 import it.integry.integrywmsnative.core.utility.UtilityArray;
-import it.integry.integrywmsnative.gest.accettazione.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 
 import static br.com.zbra.androidlinq.Linq.stream;
 

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

@@ -6,8 +6,8 @@ import android.content.Intent;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.text.Html;
 import android.text.SpannableString;
 import android.view.LayoutInflater;
@@ -19,17 +19,17 @@ import com.annimon.stream.Stream;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.REST.CommonRESTException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.interfaces.IRecyclerFragment;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.databinding.FragmentMainVenditaBinding;
-import it.integry.integrywmsnative.gest.accettazione.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.gest.vendita.core.MainListVenditaAdapter;
 import it.integry.integrywmsnative.gest.vendita.core.VenditaHelper;
 import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaGroupedInevasoDTO;
@@ -37,8 +37,11 @@ import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
 import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO;
 import it.integry.integrywmsnative.gest.vendita_ordine_inevaso.VenditaOrdineInevasoActivity;
 import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper;
+import it.integry.plugins.waterfalltoolbar.WaterfallToolbar;
 
-public class MainVenditaFragment extends Fragment implements ITitledFragment {
+public class MainVenditaFragment extends Fragment implements ITitledFragment, IRecyclerFragment {
+
+    private static WaterfallToolbar mWaterfallToolbar;
 
     private VenditaHelper mHelper;
     private FragmentMainVenditaBinding mBinding = null;
@@ -86,6 +89,8 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment {
 
         initActionBar();
 
+        mWaterfallToolbar.setRecyclerView(mBinding.venditaMainList);
+
         return mBinding.getRoot();
     }
 
@@ -284,5 +289,8 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment {
 
 
 
-
+    @Override
+    public void setWaterfallToolbar(WaterfallToolbar waterfallToolbar) {
+        mWaterfallToolbar = waterfallToolbar;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java

@@ -202,7 +202,7 @@ public class MainListOrdineVenditaInevasoAdapter extends RecyclerView.Adapter<Ma
 
                 groupModelView.setOnClickListener(view -> {
                     if (mOrdineRowDispatch != null) {
-                        rowItem.getOriginalModel().setTempEan128Model(null);
+//                        rowItem.getOriginalModel().setTempEan128Model(null);
                         mOrdineRowDispatch.onOrdineRowDispatch(rowItem.getOriginalModel());
                     }
                 });

app/src/main/res/layout/app_bar_main.xml

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context="it.integry.integrywmsnative.MainActivity">
 
-    <android.support.design.widget.AppBarLayout
+
+
+    <it.integry.plugins.waterfalltoolbar.WaterfallToolbar
+        android:id="@+id/waterfall_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="wrap_content">
-        android:theme="@style/AppTheme.AppBarOverlay">
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="?attr/actionBarSize">
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay">
-
             <android.support.v7.widget.SearchView
                 android:id="@+id/main_search"
                 android:layout_width="wrap_content"
@@ -29,8 +29,10 @@
 
         </android.support.v7.widget.Toolbar>
 
-    </android.support.design.widget.AppBarLayout>
+
+    </it.integry.plugins.waterfalltoolbar.WaterfallToolbar>
+
 
     <include layout="@layout/content_main" />
 
-</android.support.design.widget.CoordinatorLayout>
+</LinearLayout>

app/src/main/res/layout/fragment_rettifica_giacenze.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <import type="android.databinding.ObservableList"/>
+        <variable name="view" type="it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment" />
+    </data>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".gest.rettifica_giacenze.RettificaGiacenzeFragment">
+
+
+
+    </FrameLayout>
+</layout>

app/src/main/res/values-it/strings.xml

@@ -12,6 +12,7 @@
     <string name="accettazione_ordine_inevaso_title_empty">Ordine di accettazione</string>
     <string name="accettazione_ordine_inevaso_title_multiple_order">Ordini di accettazione</string>
     <string name="vendita_title_fragment">Spedizione</string>
+    <string name="rettifica_giacenze_fragment_title">Rettifica giacenze</string>
     <string name="error">Ops</string>
     <string name="warning">Attenzione</string>
     <string name="ok">OK</string>

app/src/main/res/values/strings.xml

@@ -21,6 +21,7 @@
     <string name="accettazione_ordine_inevaso_title_empty">Check in order</string>
     <string name="accettazione_ordine_inevaso_title_multiple_order">Multiple acceptance orders</string>
     <string name="vendita_title_fragment">Check out</string>
+    <string name="rettifica_giacenze_fragment_title">Inventory</string>
     <string name="error">Ops</string>
     <string name="warning">Warning</string>
     <string name="ok">OK</string>