Skip to content

Commit 6f34be3

Browse files
Piotr Zawadzkizawadz88
authored andcommitted
removed redundant argument from StepAdapter's findStep method (issue #64)
1 parent 1030605 commit 6f34be3

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

material-stepper/src/main/java/com/stepstone/stepper/StepperLayout.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ private boolean isLastPosition(int position) {
574574
}
575575

576576
private Step findCurrentStep() {
577-
return mStepAdapter.findStep(mPager, mCurrentStepPosition);
577+
return mStepAdapter.findStep(mCurrentStepPosition);
578578
}
579579

580580
private void onPrevious() {
@@ -662,7 +662,7 @@ private void onUpdate(int newStepPosition, boolean animate) {
662662
mStepperType.showErrorStateOnBack(mShowErrorStateOnBack);
663663
mStepperType.onStepSelected(newStepPosition);
664664
mListener.onStepSelected(newStepPosition);
665-
Step step = mStepAdapter.findStep(mPager, newStepPosition);
665+
Step step = mStepAdapter.findStep(newStepPosition);
666666
if (step != null) {
667667
step.onSelected();
668668
}

material-stepper/src/main/java/com/stepstone/stepper/adapter/AbstractFragmentStepAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import android.support.v4.app.FragmentManager;
2424
import android.support.v4.app.FragmentPagerAdapter;
2525
import android.support.v4.view.PagerAdapter;
26-
import android.support.v4.view.ViewPager;
2726

27+
import com.stepstone.stepper.R;
2828
import com.stepstone.stepper.Step;
2929
import com.stepstone.stepper.viewmodel.StepViewModel;
3030

@@ -54,8 +54,8 @@ public final Fragment getItem(@IntRange(from = 0) int position) {
5454

5555
/** {@inheritDoc} */
5656
@SuppressWarnings("unchecked")
57-
public Step findStep(ViewPager viewPager, @IntRange(from = 0) int position) {
58-
String fragmentTag = "android:switcher:" + viewPager.getId() + ":" + this.getItemId(position);
57+
public Step findStep(@IntRange(from = 0) int position) {
58+
String fragmentTag = "android:switcher:" + R.id.ms_stepPager + ":" + this.getItemId(position);
5959
return (Step) mFragmentManager.findFragmentByTag(fragmentTag);
6060
}
6161

material-stepper/src/main/java/com/stepstone/stepper/adapter/StepAdapter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@ public interface StepAdapter {
2424
/**
2525
* Finds the given step without creating it.
2626
* @see FragmentPagerAdapter#makeFragmentName(int, long)
27-
* @param viewPager view pager to use for displaying step fragments
2827
* @param position step position
2928
* @return step fragment
3029
*/
31-
Step findStep(ViewPager viewPager, @IntRange(from = 0) int position);
30+
Step findStep(@IntRange(from = 0) int position);
3231

3332
/**
3433
* Returns the view information to be used to display the step.

sample/src/main/java/com/stepstone/stepper/sample/adapter/SampleStepAdapter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import android.content.Context;
44
import android.support.annotation.IntRange;
55
import android.support.annotation.NonNull;
6-
import android.support.v4.view.ViewPager;
76
import android.util.SparseArray;
87
import android.view.View;
98
import android.view.ViewGroup;
@@ -46,7 +45,7 @@ public int getCount() {
4645
}
4746

4847
@Override
49-
public Step findStep(ViewPager viewPager, int position) {
48+
public Step findStep(int position) {
5049
return pages.size() > 0 ? pages.get(position) : null;
5150
}
5251

0 commit comments

Comments
 (0)