Merge remote-tracking branch 'davideas/dev' into dev

Author: Rafael Dominiquini

README.md

@@ -23,9 +23,9 @@ ext {
 
 	//Support and Build tools version
 	minSdk = 14
-	targetSdk = 23
+	targetSdk = 24
 	buildTools = "23.0.3"
-	supportLib = "23.4.0"
+	supportLib = "24.0.0"
 
 	//Support Libraries dependencies
 	supportDependencies = [

build.gradle

@@ -24,10 +24,12 @@
 import android.support.v7.widget.Toolbar;
 import android.support.v7.widget.helper.ItemTouchHelper;
 import android.text.InputType;
+import android.transition.Fade;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.Window;
 import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -120,7 +122,13 @@ public boolean handleMessage(Message message) {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
+		if (Utils.hasLollipop()) requestWindowFeature(Window.FEATURE_CONTENT_TRANSITIONS);
 		super.onCreate(savedInstanceState);
+
+		if (Utils.hasLollipop()) {
+			getWindow().setEnterTransition(new Fade());
+		}
+
 		setContentView(R.layout.activity_main);
 		Log.d(TAG, "onCreate");
 		FlexibleAdapter.enableLogs(true);
@@ -853,6 +861,12 @@ public void onBackPressed() {
 			mSearchView.setIconified(true);
 			return;
 		}
+		//Return to Overall View
+		if (DatabaseService.getInstance().getDatabaseType() != 0) {
+			MenuItem menuItem = mNavigationView.getMenu().findItem(R.id.nav_overall);
+			onNavigationItemSelected(menuItem);
+			return;
+		}
 		//Close the App
 		DatabaseService.onDestroy();
 		super.onBackPressed();

flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/MainActivity.java

@@ -198,6 +198,13 @@ public void onPrepareOptionsMenu(Menu menu) {
 		}
 	}
 
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == R.id.action_list_type)
+			mAdapter.setAnimationOnScrolling(true);
+		return super.onOptionsItemSelected(item);
+	}
+
 	@Override
 	protected GridLayoutManager createNewGridLayoutManager() {
 		GridLayoutManager gridLayoutManager = new SmoothScrollGridLayoutManager(getActivity(), mColumnCount);

flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/fragments/FragmentEndlessScrolling.java

@@ -140,4 +140,11 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		//TODO: Implement Filterable in the item interfaces
 	}
 
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == R.id.action_list_type)
+			mAdapter.setAnimationOnScrolling(true);
+		return super.onOptionsItemSelected(item);
+	}
+
 }

flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/fragments/FragmentExpandableMultiLevel.java

@@ -158,4 +158,11 @@ public void onPrepareOptionsMenu(Menu menu) {
 		}
 	}
 
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == R.id.action_list_type)
+			mAdapter.setAnimationOnScrolling(true);
+		return super.onOptionsItemSelected(item);
+	}
+
 }

flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/fragments/FragmentExpandableSections.java

@@ -231,4 +231,11 @@ public void onPrepareOptionsMenu(Menu menu) {
 		}
 	}
 
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == R.id.action_list_type)
+			mAdapter.setAnimationOnScrolling(true);
+		return super.onOptionsItemSelected(item);
+	}
+
 }

flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/fragments/FragmentHeadersSections.java

@@ -7,6 +7,7 @@
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
+import android.view.MenuItem;
 import android.widget.Toast;
 
 import java.util.ArrayList;
@@ -34,7 +35,7 @@ public class FragmentInstagramHeaders extends AbstractFragment
 	/**
 	 * Custom implementation of FlexibleAdapter
 	 */
-	private FlexibleAdapter mAdapter;
+	private FlexibleAdapter<AbstractFlexibleItem> mAdapter;
 
 
 	public static FragmentInstagramHeaders newInstance() {
@@ -62,12 +63,14 @@ public void onActivityCreated(Bundle savedInstanceState) {
 		FlipView.stopLayoutAnimation();
 	}
 
-	@SuppressWarnings({"ConstantConditions", "unchecked"})
+	@SuppressWarnings({"unchecked", "ConstantConditions"})
 	private void initializeRecyclerView(Bundle savedInstanceState) {
 		mAdapter = new FlexibleAdapter<>(DatabaseService.getInstance().getDatabaseList(), getActivity());
-		//Experimenting NEW features (v5.0.0)
-		mAdapter.setAnimationOnScrolling(true);
-		mAdapter.setAnimationOnReverseScrolling(true);
+		mAdapter.initializeListeners(getActivity())
+				.setDisplayHeadersAtStartUp(true)//Show Headers at startUp!
+				//Experimenting NEW features (v5.0.0)
+				.setAnimationOnScrolling(true)
+				.setAnimationOnReverseScrolling(true);
 		mRecyclerView = (RecyclerView) getView().findViewById(R.id.recycler_view);
 		mRecyclerView.setLayoutManager(createNewLinearLayoutManager());
 		mRecyclerView.setAdapter(mAdapter);
@@ -80,8 +83,7 @@ public boolean canReuseUpdatedViewHolder(RecyclerView.ViewHolder viewHolder) {
 			}
 		});
 		mRecyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), 0, 24));
-		mAdapter.setDisplayHeadersAtStartUp(true)//Show Headers at startUp!
-				.enableStickyHeaders()//Make headers sticky
+		mAdapter.enableStickyHeaders()//Make headers sticky
 				//Endless scroll with 1 item threshold
 				.setEndlessScrollListener(this, new ProgressItem())
 				.setEndlessScrollThreshold(1);//Default=1
@@ -120,6 +122,13 @@ public void run() {
 		}, 2000);
 	}
 
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == R.id.action_list_type)
+			mAdapter.setAnimationOnScrolling(true);
+		return super.onOptionsItemSelected(item);
+	}
+
 	@Override
 	protected GridLayoutManager createNewGridLayoutManager() {
 		return null;

flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/fragments/FragmentInstagramHeaders.java

@@ -66,7 +66,7 @@ private void initializeRecyclerView(Bundle savedInstanceState) {
 		mAdapter.setAnimationDelay(150L);
 		mRecyclerView = (RecyclerView) getView().findViewById(R.id.recycler_view);
 		mRecyclerView.setItemViewCacheSize(0);//Setting ViewCache to 0 (default=2) will animate items better while scrolling down+up with LinearLayout
-		mRecyclerView.setLayoutManager(createNewGridLayoutManager());
+		mRecyclerView.setLayoutManager(createNewStaggeredGridLayoutManager());
 		mRecyclerView.setAdapter(mAdapter);
 		mRecyclerView.setHasFixedSize(true);//Size of RV will not change
 		//mRecyclerView.setItemAnimator(new SlideInRightAnimator());
@@ -133,4 +133,11 @@ public void onPrepareOptionsMenu(Menu menu) {
 		}
 	}
 
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == R.id.action_list_type)
+			mAdapter.setAnimationOnScrolling(true);
+		return super.onOptionsItemSelected(item);
+	}
+
 }

flexible-adapter-app/src/main/java/eu/davidea/samples/flexibleadapter/fragments/FragmentOverall.java

@@ -222,4 +222,11 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		super.onCreateOptionsMenu(menu, inflater);
 	}
 
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == R.id.action_list_type)
+			mAdapter.setAnimationOnScrolling(true);
+		return super.onOptionsItemSelected(item);
+	}
+
 }