Skip to content

Commit

Permalink
Checkstyle entire project.
Browse files Browse the repository at this point in the history
  • Loading branch information
@JakeWharton
JakeWharton committed May 18, 2012
1 parent 1f72c1a commit 554d755
Show file tree
Hide file tree
Showing 29 changed files with 516 additions and 518 deletions.
0 library/checkstyle.xml → checkstyle.xml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion library/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<configLocation>${project.basedir}/checkstyle.xml</configLocation>
<configLocation>../checkstyle.xml</configLocation>
</configuration>
<executions>
<execution>
Expand Down
18 changes: 17 additions & 1 deletion sample/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<groupId>com.google.android</groupId>
<artifactId>support-v4</artifactId>
</dependency>

<dependency>
<groupId>com.viewpagerindicator</groupId>
<artifactId>library</artifactId>
Expand All @@ -50,6 +50,22 @@
<artifactId>android-maven-plugin</artifactId>
<extensions>true</extensions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<configLocation>../checkstyle.xml</configLocation>
</configuration>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>checkstyle</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
75 changes: 37 additions & 38 deletions sample/src/com/viewpagerindicator/sample/BaseSampleActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import java.util.Random;

import com.viewpagerindicator.PageIndicator;
import com.viewpagerindicator.sample.R;

import android.support.v4.app.FragmentActivity;
import android.support.v4.view.ViewPager;
Expand All @@ -12,41 +11,41 @@
import android.widget.Toast;

public abstract class BaseSampleActivity extends FragmentActivity {
private static final Random RANDOM = new Random();
TestFragmentAdapter mAdapter;
ViewPager mPager;
PageIndicator mIndicator;

@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu, menu);
return true;
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.random:
final int page = RANDOM.nextInt(mAdapter.getCount());
Toast.makeText(this, "Changing to page " + page, Toast.LENGTH_SHORT);
mPager.setCurrentItem(page);
return true;
case R.id.add_page:
if (mAdapter.getCount() < 10) {
mAdapter.setCount(mAdapter.getCount() + 1);
mIndicator.notifyDataSetChanged();
}
return true;
case R.id.remove_page:
if (mAdapter.getCount() > 1) {
mAdapter.setCount(mAdapter.getCount() - 1);
mIndicator.notifyDataSetChanged();
}
return true;
}
return super.onOptionsItemSelected(item);
}
private static final Random RANDOM = new Random();

TestFragmentAdapter mAdapter;
ViewPager mPager;
PageIndicator mIndicator;

@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu, menu);
return true;
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.random:
final int page = RANDOM.nextInt(mAdapter.getCount());
Toast.makeText(this, "Changing to page " + page, Toast.LENGTH_SHORT);
mPager.setCurrentItem(page);
return true;

case R.id.add_page:
if (mAdapter.getCount() < 10) {
mAdapter.setCount(mAdapter.getCount() + 1);
mIndicator.notifyDataSetChanged();
}
return true;

case R.id.remove_page:
if (mAdapter.getCount() > 1) {
mAdapter.setCount(mAdapter.getCount() - 1);
mIndicator.notifyDataSetChanged();
}
return true;
}
return super.onOptionsItemSelected(item);
}
}
22 changes: 11 additions & 11 deletions sample/src/com/viewpagerindicator/sample/ListSamples.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ public class ListSamples extends ListActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

Intent intent = getIntent();
String path = intent.getStringExtra("com.jakewharton.android.viewpagerindicator.sample.Path");

if (path == null) {
path = "";
}
Expand All @@ -49,16 +49,16 @@ protected List<Map<String, Object>> getData(String prefix) {

String[] prefixPath;
String prefixWithSlash = prefix;

if (prefix.equals("")) {
prefixPath = null;
} else {
prefixPath = prefix.split("/");
prefixWithSlash = prefix + "/";
}

int len = list.size();

Map<String, Boolean> entries = new HashMap<String, Boolean>();

for (int i = 0; i < len; i++) {
Expand All @@ -67,9 +67,9 @@ protected List<Map<String, Object>> getData(String prefix) {
String label = labelSeq != null
? labelSeq.toString()
: info.activityInfo.name;

if (prefixWithSlash.length() == 0 || label.startsWith(prefixWithSlash)) {

String[] labelPath = label.split("/");

String nextLabel = prefixPath == null ? labelPath[0] : labelPath[prefixPath.length];
Expand All @@ -87,12 +87,12 @@ protected List<Map<String, Object>> getData(String prefix) {
}
}

Collections.sort(myData, sDisplayNameComparator);
Collections.sort(myData, NAME_COMPARATOR);

return myData;
}

private final static Comparator<Map<String, Object>> sDisplayNameComparator =
private final static Comparator<Map<String, Object>> NAME_COMPARATOR =
new Comparator<Map<String, Object>>() {
private final Collator collator = Collator.getInstance();

Expand All @@ -106,7 +106,7 @@ protected Intent activityIntent(String pkg, String componentName) {
result.setClassName(pkg, componentName);
return result;
}

protected Intent browseIntent(String path) {
Intent result = new Intent();
result.setClass(this, ListSamples.class);
Expand Down
27 changes: 13 additions & 14 deletions sample/src/com/viewpagerindicator/sample/SampleCirclesDefault.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@
import android.os.Bundle;
import android.support.v4.view.ViewPager;
import com.viewpagerindicator.CirclePageIndicator;
import com.viewpagerindicator.sample.R;

public class SampleCirclesDefault extends BaseSampleActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.simple_circles);
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
mPager = (ViewPager)findViewById(R.id.pager);
mPager.setAdapter(mAdapter);
mIndicator = (CirclePageIndicator)findViewById(R.id.indicator);
mIndicator.setViewPager(mPager);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.simple_circles);

mAdapter = new TestFragmentAdapter(getSupportFragmentManager());

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

mIndicator = (CirclePageIndicator)findViewById(R.id.indicator);
mIndicator.setViewPager(mPager);
}
}
33 changes: 16 additions & 17 deletions sample/src/com/viewpagerindicator/sample/SampleCirclesInitialPage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,22 @@
import android.os.Bundle;
import android.support.v4.view.ViewPager;
import com.viewpagerindicator.CirclePageIndicator;
import com.viewpagerindicator.sample.R;

public class SampleCirclesInitialPage extends BaseSampleActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.simple_circles);
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
mPager = (ViewPager)findViewById(R.id.pager);
mPager.setAdapter(mAdapter);
mIndicator = (CirclePageIndicator)findViewById(R.id.indicator);
mIndicator.setViewPager(mPager);
mIndicator.setCurrentItem(mAdapter.getCount() - 1);
//You can also do: indicator.setViewPager(pager, initialPage);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.simple_circles);

mAdapter = new TestFragmentAdapter(getSupportFragmentManager());

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

mIndicator = (CirclePageIndicator)findViewById(R.id.indicator);
mIndicator.setViewPager(mPager);
mIndicator.setCurrentItem(mAdapter.getCount() - 1);

//You can also do: indicator.setViewPager(pager, initialPage);
}
}
31 changes: 15 additions & 16 deletions sample/src/com/viewpagerindicator/sample/SampleCirclesSnap.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,21 @@
import android.os.Bundle;
import android.support.v4.view.ViewPager;
import com.viewpagerindicator.CirclePageIndicator;
import com.viewpagerindicator.sample.R;

public class SampleCirclesSnap extends BaseSampleActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.simple_circles);
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
mPager = (ViewPager)findViewById(R.id.pager);
mPager.setAdapter(mAdapter);
CirclePageIndicator indicator = (CirclePageIndicator)findViewById(R.id.indicator);
mIndicator = indicator;
indicator.setViewPager(mPager);
indicator.setSnap(true);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.simple_circles);

mAdapter = new TestFragmentAdapter(getSupportFragmentManager());

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

CirclePageIndicator indicator = (CirclePageIndicator)findViewById(R.id.indicator);
mIndicator = indicator;
indicator.setViewPager(mPager);
indicator.setSnap(true);
}
}
27 changes: 13 additions & 14 deletions sample/src/com/viewpagerindicator/sample/SampleCirclesStyledLayout.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@
import android.os.Bundle;
import android.support.v4.view.ViewPager;
import com.viewpagerindicator.CirclePageIndicator;
import com.viewpagerindicator.sample.R;

public class SampleCirclesStyledLayout extends BaseSampleActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.themed_circles);
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
mPager = (ViewPager)findViewById(R.id.pager);
mPager.setAdapter(mAdapter);
mIndicator = (CirclePageIndicator)findViewById(R.id.indicator);
mIndicator.setViewPager(mPager);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.themed_circles);

mAdapter = new TestFragmentAdapter(getSupportFragmentManager());

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

mIndicator = (CirclePageIndicator)findViewById(R.id.indicator);
mIndicator.setViewPager(mPager);
}
}
43 changes: 21 additions & 22 deletions sample/src/com/viewpagerindicator/sample/SampleCirclesStyledMethods.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,28 @@
import android.os.Bundle;
import android.support.v4.view.ViewPager;
import com.viewpagerindicator.CirclePageIndicator;
import com.viewpagerindicator.sample.R;

public class SampleCirclesStyledMethods extends BaseSampleActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.simple_circles);
mAdapter = new TestFragmentAdapter(getSupportFragmentManager());
mPager = (ViewPager)findViewById(R.id.pager);
mPager.setAdapter(mAdapter);
CirclePageIndicator indicator = (CirclePageIndicator)findViewById(R.id.indicator);
mIndicator = indicator;
indicator.setViewPager(mPager);
final float density = getResources().getDisplayMetrics().density;
indicator.setBackgroundColor(0xFFCCCCCC);
indicator.setRadius(10 * density);
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.simple_circles);

mAdapter = new TestFragmentAdapter(getSupportFragmentManager());

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

CirclePageIndicator indicator = (CirclePageIndicator)findViewById(R.id.indicator);
mIndicator = indicator;
indicator.setViewPager(mPager);

final float density = getResources().getDisplayMetrics().density;
indicator.setBackgroundColor(0xFFCCCCCC);
indicator.setRadius(10 * density);
indicator.setPageColor(0x880000FF);
indicator.setFillColor(0xFF888888);
indicator.setStrokeColor(0xFF000000);
indicator.setStrokeWidth(2 * density);
}
indicator.setFillColor(0xFF888888);
indicator.setStrokeColor(0xFF000000);
indicator.setStrokeWidth(2 * density);
}
}
Loading

0 comments on commit 554d755

Please sign in to comment.