Skip to content

Commit 6387913

Browse files
committed
Renamed variables. Travis fix.
1 parent f6ed3a1 commit 6387913

5 files changed

Lines changed: 15 additions & 12 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# NavigationViewFragmentAdapters
22

3-
[ ![Download](https://api.bintray.com/packages/patloew/maven/NavigationViewFragmentAdapters/images/download.svg) ](https://bintray.com/patloew/maven/NavigationViewFragmentAdapters/_latestVersion) [![API](https://img.shields.io/badge/API-9%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=9)
3+
[![Build Status](https://travis-ci.org/patloew/NavigationViewFragmentAdapters.svg?branch=master)](https://travis-ci.org/patloew/NavigationViewFragmentAdapters) [ ![Download](https://api.bintray.com/packages/patloew/maven/NavigationViewFragmentAdapters/images/download.svg) ](https://bintray.com/patloew/maven/NavigationViewFragmentAdapters/_latestVersion) [![API](https://img.shields.io/badge/API-9%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=9)
44

55
A small library containing two adapters which allow for easy fragment management with a NavigationView.
66

library/src/main/java/com/patloew/navigationviewfragmentadapters/BaseNavigationViewFragmentAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ abstract class BaseNavigationViewFragmentAdapter {
3232
NavigationView.OnNavigationItemSelectedListener listener = null;
3333

3434
FragmentTransactionAnimations animations = new FragmentTransactionAnimations();
35-
FragmentTransactionAnimations replaceAnimations = new FragmentTransactionAnimations();
35+
FragmentTransactionAnimations backstackAnimations = new FragmentTransactionAnimations();
3636

3737
int currentlyAttachedId;
3838

@@ -69,15 +69,15 @@ public final void setCustomAnimations(@AnimRes int enter, @AnimRes int exit, @An
6969
* to the back stack.
7070
*/
7171
public final void setBackStackCustomAnimations(@AnimRes int enter, @AnimRes int exit) {
72-
replaceAnimations.setAnimations(enter, exit, 0, 0);
72+
backstackAnimations.setAnimations(enter, exit, 0, 0);
7373
}
7474

7575
/**
7676
* Sets custom animations for fragment transactions which are added
7777
* to the back stack.
7878
*/
7979
public final void setBackStackCustomAnimations(@AnimRes int enter, @AnimRes int exit, @AnimRes int popEnter, @AnimRes int popExit) {
80-
replaceAnimations.setAnimations(enter, exit, popEnter, popExit);
80+
backstackAnimations.setAnimations(enter, exit, popEnter, popExit);
8181
}
8282

8383
/**

library/src/main/java/com/patloew/navigationviewfragmentadapters/NavigationViewFragmentAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public boolean onNavigationItemSelected(MenuItem item) {
5959

6060
if(shouldAddToBackStack(itemId)) {
6161
FragmentTransaction fragmentTransaction = fm.beginTransaction();;
62-
replaceAnimations.apply(fragmentTransaction);
62+
backstackAnimations.apply(fragmentTransaction);
6363
fragmentTransaction
6464
.replace(containerId, getFragment(itemId), getTag(itemId))
6565
.addToBackStack(null)

library/src/main/java/com/patloew/navigationviewfragmentadapters/NavigationViewStateFragmentAdapter.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public abstract class NavigationViewStateFragmentAdapter extends BaseNavigationV
3333

3434
private static final String KEY_STATE = "state";
3535

36-
private StateMap mSavedState = new StateMap();
36+
private StateMap stateMap = new StateMap();
3737

3838
public NavigationViewStateFragmentAdapter(FragmentManager fragmentManager, @IdRes int containerId, @IdRes int defaultMenuItemId, Bundle savedInstanceState) {
3939
super(fragmentManager, containerId, defaultMenuItemId);
@@ -42,14 +42,14 @@ public NavigationViewStateFragmentAdapter(FragmentManager fragmentManager, @IdRe
4242
if(!savedInstanceState.containsKey(KEY_STATE)) {
4343
throw new IllegalStateException("You must call NavigationViewStateFragmentAdapter.onSaveInstanceState() in your Activity onSaveInstanceState()");
4444
} else {
45-
mSavedState = savedInstanceState.getParcelable(KEY_STATE);
45+
stateMap = savedInstanceState.getParcelable(KEY_STATE);
4646
currentlyAttachedId = savedInstanceState.getInt(KEY_CURRENTID);
4747
}
4848
}
4949
}
5050

5151
public final void onSaveInstanceState(@NonNull Bundle outState) {
52-
outState.putParcelable(KEY_STATE, mSavedState);
52+
outState.putParcelable(KEY_STATE, stateMap);
5353
outState.putInt(KEY_CURRENTID, currentlyAttachedId);
5454
}
5555

@@ -66,7 +66,7 @@ public boolean onNavigationItemSelected(MenuItem item) {
6666

6767
if(shouldAddToBackStack(itemId)) {
6868
FragmentTransaction fragmentTransaction = fm.beginTransaction();
69-
replaceAnimations.apply(fragmentTransaction);
69+
backstackAnimations.apply(fragmentTransaction);
7070
fragmentTransaction
7171
.replace(containerId, getFragment(itemId), getTag(itemId))
7272
.addToBackStack(null)
@@ -86,14 +86,14 @@ public boolean onNavigationItemSelected(MenuItem item) {
8686
Fragment detachFragment = fm.findFragmentByTag(detachTag);
8787

8888
if (detachFragment != null) {
89-
mSavedState.put(detachTag, fm.saveFragmentInstanceState(detachFragment));
89+
stateMap.put(detachTag, fm.saveFragmentInstanceState(detachFragment));
9090
fragmentTransaction.remove(detachFragment);
9191
}
9292

93-
Fragment.SavedState fss = mSavedState.get(attachTag);
93+
Fragment.SavedState fss = stateMap.get(attachTag);
9494
if (fss != null) {
9595
attachFragment.setInitialSavedState(fss);
96-
mSavedState.remove(attachTag);
96+
stateMap.remove(attachTag);
9797
}
9898
fragmentTransaction.add(containerId, attachFragment, attachTag);
9999

sample/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ android {
2323
sourceCompatibility JavaVersion.VERSION_1_8
2424
targetCompatibility JavaVersion.VERSION_1_8
2525
}
26+
lintOptions {
27+
abortOnError false
28+
}
2629
}
2730

2831
retrolambda {

0 commit comments

Comments
 (0)