Skip to content

Changed the swipe selector and swipe adapter to directly add list of items #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rohitshampur wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Changed the swipe selector and swipe adapter to directly add list of items #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1f9270
.iml change commit
rohitshampur Mar 2, 2016
bd07566
Changed SwipeSelector and SwipeAdapter to directly add list of items …
rohitshampur Mar 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions sample/sample.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,18 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
<orderEntry type="module" module-name="swipe-selector" exported="" />
</component>
Expand Down
19 changes: 10 additions & 9 deletions sample/src/main/java/com/example/swipeselector/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import com.roughike.swipeselector.SwipeItem;
import com.roughike.swipeselector.SwipeSelector;

import java.util.List;

public class MainActivity extends AppCompatActivity {
/**
* Size options
Expand All @@ -30,22 +32,21 @@ public class MainActivity extends AppCompatActivity {
*/
private static final int DELIVERY_NONE = 0;
private static final int DELIVERY_YES = 1;
private List<SwipeItem> itemList;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);

final SwipeSelector sizeSelector = (SwipeSelector) findViewById(R.id.sizeSelector);
sizeSelector.setItems(
new SwipeItem(-1, "Select a size", "Start by swiping left."),
new SwipeItem(SIZE_KIDS, "Kids' size", "For the small appetite. Can be shared by four toddlers."),
new SwipeItem(SIZE_NORMAL, "Normal", "Our most popular size. Ideal for kids before their growth spurt."),
new SwipeItem(SIZE_LARGE, "Large", "This is two times the normal size. Suits well for the hangover " +
"after a bachelor party."),
new SwipeItem(SIZE_HUGE, "Huge", "Suitable for families. Also perfect for a bigger appetite if your " +
"name happens to be Furious Pete.")
);
itemList.add(new SwipeItem(-1, "Select a size", "Start by swiping left."));
itemList.add(new SwipeItem(SIZE_KIDS, "Kids' size", "For the small appetite. Can be shared by four toddlers."));
itemList.add(new SwipeItem(SIZE_NORMAL, "Normal", "Our most popular size. Ideal for kids before their growth spurt."));
itemList.add(new SwipeItem(SIZE_LARGE, "Large", "This is two times the normal size. Suits well for the hangover " +
"after a bachelor party."));
itemList.add(new SwipeItem(SIZE_HUGE, "Huge", "Suitable for families. Also perfect for a bigger appetite if your " + "name happens to be Furious Pete."));
sizeSelector.setItems(itemList);

final SwipeSelector toppingSelector = (SwipeSelector) findViewById(R.id.toppingSelector);
toppingSelector.setItems(
Expand Down
9 changes: 8 additions & 1 deletion swipe-selector/src/main/java/com/roughike/swipeselector/SwipeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

/*
* SwipeSelector library for Android
Expand Down Expand Up @@ -61,7 +62,7 @@ class SwipeAdapter extends PagerAdapter implements View.OnClickListener, ViewPag
private final int mContentRightPadding;

private OnSwipeItemSelectedListener mOnItemSelectedListener;
private ArrayList<SwipeItem> mItems;
private List<SwipeItem> mItems;
private int mCurrentPosition;

private SwipeAdapter(ViewPager viewPager, ViewGroup indicatorContainer, int indicatorSize, int indicatorMargin,
Expand Down Expand Up @@ -268,6 +269,12 @@ protected void setItems(SwipeItem... items) {
setActiveIndicator(0);
notifyDataSetChanged();
}
protected void setItems(List<SwipeItem> items) {
mItems = items;
mCurrentPosition = 0;
setActiveIndicator(0);
notifyDataSetChanged();
}

protected SwipeItem getSelectedItem() {
return mItems.get(mCurrentPosition);
Expand Down
12 changes: 12 additions & 0 deletions swipe-selector/src/main/java/com/roughike/swipeselector/SwipeSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import android.widget.FrameLayout;
import android.widget.ImageView;

import java.util.List;


/*
* SwipeSelector library for Android
Expand Down Expand Up @@ -144,6 +146,16 @@ public void setItems(SwipeItem... swipeItems) {
mAdapter.setItems(swipeItems);
}

/**
* A method for giving this SwipeSelector something to show.
*
* @param swipeItems an array of {@link SwipeItem} to show
* inside this view.
*/
public void setItems(List<SwipeItem> swipeItems) {
mAdapter.setItems(swipeItems);
}

/**
* @return the selected slides' SwipeItem.
*/
Expand Down
5 changes: 1 addition & 4 deletions swipe-selector/swipe-selector.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
Expand All @@ -81,15 +80,13 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
</component>
</module>