Skip to content

Commit 16e2b5a

Browse files
committed
Consolidate adapters since TitleProvider is no longer around.
1 parent 3b8ea14 commit 16e2b5a

11 files changed

+14
-23
lines changed

sample/src/com/viewpagerindicator/sample/SampleTitlesBottom.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ protected void onCreate(Bundle savedInstanceState) {
1010
super.onCreate(savedInstanceState);
1111
setContentView(R.layout.simple_titles_bottom);
1212

13-
mAdapter = new TestTitleFragmentAdapter(getSupportFragmentManager());
13+
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
1414

1515
mPager = (ViewPager)findViewById(R.id.pager);
1616
mPager.setAdapter(mAdapter);

sample/src/com/viewpagerindicator/sample/SampleTitlesCenterClickListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ protected void onCreate(Bundle savedInstanceState) {
1414
super.onCreate(savedInstanceState);
1515
setContentView(R.layout.simple_titles);
1616

17-
mAdapter = new TestTitleFragmentAdapter(getSupportFragmentManager());
17+
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
1818

1919
mPager = (ViewPager)findViewById(R.id.pager);
2020
mPager.setAdapter(mAdapter);

sample/src/com/viewpagerindicator/sample/SampleTitlesDefault.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ protected void onCreate(Bundle savedInstanceState) {
1111
super.onCreate(savedInstanceState);
1212
setContentView(R.layout.simple_titles);
1313

14-
mAdapter = new TestTitleFragmentAdapter(getSupportFragmentManager());
14+
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
1515

1616
mPager = (ViewPager)findViewById(R.id.pager);
1717
mPager.setAdapter(mAdapter);

sample/src/com/viewpagerindicator/sample/SampleTitlesInitialPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ protected void onCreate(Bundle savedInstanceState) {
1111
super.onCreate(savedInstanceState);
1212
setContentView(R.layout.simple_titles);
1313

14-
mAdapter = new TestTitleFragmentAdapter(getSupportFragmentManager());
14+
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
1515

1616
mPager = (ViewPager)findViewById(R.id.pager);
1717
mPager.setAdapter(mAdapter);

sample/src/com/viewpagerindicator/sample/SampleTitlesStyledLayout.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ protected void onCreate(Bundle savedInstanceState) {
1111
super.onCreate(savedInstanceState);
1212
setContentView(R.layout.themed_titles);
1313

14-
mAdapter = new TestTitleFragmentAdapter(getSupportFragmentManager());
14+
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
1515

1616
mPager = (ViewPager)findViewById(R.id.pager);
1717
mPager.setAdapter(mAdapter);

sample/src/com/viewpagerindicator/sample/SampleTitlesStyledMethods.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ protected void onCreate(Bundle savedInstanceState) {
1212
super.onCreate(savedInstanceState);
1313
setContentView(R.layout.simple_titles);
1414

15-
mAdapter = new TestTitleFragmentAdapter(getSupportFragmentManager());
15+
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
1616

1717
mPager = (ViewPager)findViewById(R.id.pager);
1818
mPager.setAdapter(mAdapter);

sample/src/com/viewpagerindicator/sample/SampleTitlesStyledTheme.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ protected void onCreate(Bundle savedInstanceState) {
1313
//The look of this sample is set via a style in the manifest
1414
setContentView(R.layout.simple_titles);
1515

16-
mAdapter = new TestTitleFragmentAdapter(getSupportFragmentManager());
16+
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
1717

1818
mPager = (ViewPager)findViewById(R.id.pager);
1919
mPager.setAdapter(mAdapter);

sample/src/com/viewpagerindicator/sample/SampleTitlesTriangle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ protected void onCreate(Bundle savedInstanceState) {
1212
super.onCreate(savedInstanceState);
1313
setContentView(R.layout.simple_titles);
1414

15-
mAdapter = new TestTitleFragmentAdapter(getSupportFragmentManager());
15+
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
1616

1717
mPager = (ViewPager)findViewById(R.id.pager);
1818
mPager.setAdapter(mAdapter);

sample/src/com/viewpagerindicator/sample/SampleTitlesWithListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ protected void onCreate(Bundle savedInstanceState) {
1212
super.onCreate(savedInstanceState);
1313
setContentView(R.layout.simple_titles);
1414

15-
mAdapter = new TestTitleFragmentAdapter(getSupportFragmentManager());
15+
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
1616

1717
mPager = (ViewPager)findViewById(R.id.pager);
1818
mPager.setAdapter(mAdapter);

sample/src/com/viewpagerindicator/sample/TestFragmentAdapter.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ public int getCount() {
2323
return mCount;
2424
}
2525

26+
@Override
27+
public CharSequence getPageTitle(int position) {
28+
return TestFragmentAdapter.CONTENT[position % CONTENT.length];
29+
}
30+
2631
public void setCount(int count) {
2732
if (count > 0 && count <= 10) {
2833
mCount = count;

sample/src/com/viewpagerindicator/sample/TestTitleFragmentAdapter.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)