Skip to content

Commit ea00ea3

Browse files
kyleduokyleduo
committed
1.1.0
1 parent 40b662b commit ea00ea3

File tree

10 files changed

+175
-72
lines changed

10 files changed

+175
-72
lines changed

‎README.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Use with Gradle:
77

88
```
99
dependencies {
10-
compile 'com.lantouzi.wheelview:library:1.0.1'
10+
compile 'com.lantouzi.wheelview:library:1.1.0'
1111
}
1212
```
1313

@@ -17,7 +17,7 @@ Screenshot of Demo:
1717

1818
Usage
1919
---
20-
Style the view in xml:
20+
### Style the view in xml:
2121

2222
* **lwvHighlightColor** highlight color for selected item and the cursor.
2323
* **lwvMarkColor** color of mark on normal status.
@@ -29,6 +29,24 @@ Style the view in xml:
2929
* **lwvCenterMarkTextSize** text size of the center mark text (on selected status)
3030
* **lwvAdditionalCenterMark** additional text used for unit of the center mark.
3131

32+
### Listener
33+
34+
```
35+
public interface OnWheelItemSelectedListener {
36+
// Called each time when the center index changed.
37+
void onWheelItemChanged(WheelView wheelView, int position);
38+
39+
// Called only when the center index selected and wheel never moving to others.
40+
void onWheelItemSelected(WheelView wheelView, int position);
41+
}
42+
```
43+
44+
45+
### Limit scope of selection.
46+
*(Added in 1.1.0)*
47+
48+
* **setMinSelectableIndex/setMaxSelectableIndex** limit min/max index whitch is selectable in code.
49+
3250
Check out the demo project for more information.
3351

3452
License

‎build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
buildscript {
44
repositories {
5-
jcenter{"http://jcenter.bintray.com/"};
5+
jcenter()
66
}
77
dependencies {
88
classpath 'com.android.tools.build:gradle:1.3.0'
@@ -15,7 +15,7 @@ buildscript {
1515

1616
allprojects {
1717
repositories {
18-
jcenter{"http://jcenter.bintray.com/"};
18+
jcenter()
1919
}
2020
}
2121

‎demo/demo.iml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,13 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
6767
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
69-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7268
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" />
7369
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" />
7470
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7571
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
7772
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
7873
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7974
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
8175
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8276
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8377
</content>

‎demo/src/main/java/com/lantouzi/wheelview/demo/MainActivity.java

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
public class MainActivity extends AppCompatActivity {
1414

1515
private WheelView mWheelView, mWheelView2, mWheelView3, mWheelView4, mWheelView5;
16-
private TextView mSelectedTv;
16+
private TextView mSelectedTv, mChangedTv;
1717

1818
@Override
1919
protected void onCreate(Bundle savedInstanceState) {
@@ -26,6 +26,7 @@ protected void onCreate(Bundle savedInstanceState) {
2626
mWheelView4 = (WheelView) findViewById(R.id.wheelview4);
2727
mWheelView5 = (WheelView) findViewById(R.id.wheelview5);
2828
mSelectedTv = (TextView) findViewById(R.id.selected_tv);
29+
mChangedTv = (TextView) findViewById(R.id.changed_tv);
2930

3031
final List<String> items = new ArrayList<>();
3132
for (int i = 1; i <= 40; i++) {
@@ -72,10 +73,26 @@ protected void onCreate(Bundle savedInstanceState) {
7273
mWheelView4.setItems(items);
7374

7475
mWheelView5.setItems(items);
76+
mWheelView5.setMinSelectableIndex(3);
77+
mWheelView5.setMaxSelectableIndex(items.size() - 3);
78+
79+
items.remove(items.size() - 1);
80+
items.remove(items.size() - 2);
81+
items.remove(items.size() - 3);
82+
items.remove(items.size() - 4);
83+
84+
mSelectedTv.setText(String.format("onWheelItemSelected：%1$s", ""));
85+
mChangedTv.setText(String.format("onWheelItemChanged：%1$s", ""));
86+
7587
mWheelView5.setOnWheelItemSelectedListener(new WheelView.OnWheelItemSelectedListener() {
7688
@Override
77-
public void onWheelItemSelected(int position) {
78-
mSelectedTv.setText("选择：" + items.get(position) + "万");
89+
public void onWheelItemSelected(WheelView wheelView, int position) {
90+
mSelectedTv.setText(String.format("onWheelItemSelected：%1$s", wheelView.getItems().get(position)));
91+
}
92+
93+
@Override
94+
public void onWheelItemChanged(WheelView wheelView, int position) {
95+
mChangedTv.setText(String.format("onWheelItemChanged：%1$s", wheelView.getItems().get(position)));
7996
}
8097
});
8198

‎demo/src/main/res/layout/activity_main.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,13 @@
7474
app:lwvMarkTextColor="#CACACA"
7575
app:lwvMarkTextSize="12sp"/>
7676

77+
<TextView
78+
android:id="@+id/changed_tv"
79+
android:layout_width="match_parent"
80+
android:layout_height="wrap_content"
81+
android:layout_margin="8dp"
82+
android:gravity="center"/>
83+
7784
<TextView
7885
android:id="@+id/selected_tv"
7986
android:layout_width="match_parent"

‎library/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ apply plugin: 'com.github.dcendents.android-maven'
33
apply plugin: 'com.jfrog.bintray'
44

55
// This is the library version used when deploying the artifact
6-
version = "1.0.1"
6+
version = "1.1.0"
77

88
android {
99
compileSdkVersion 23
1010
buildToolsVersion "23.0.1"
11-
resourcePrefix "ltzwheelview__"
11+
resourcePrefix "lwv"
1212

1313
defaultConfig {
1414
minSdkVersion 11
1515
targetSdkVersion 23
16-
versionCode 2
17-
versionName "1.0.1"
16+
versionCode 3
17+
versionName "1.1.0"
1818
}
1919
buildTypes {
2020
release {

‎library/library.iml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":library" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.lantouzi.wheelview" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":library" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.lantouzi.wheelview" external.system.module.version="1.1.0" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -65,7 +65,6 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
6968
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
7069
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
7170
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -76,9 +75,7 @@
7675
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
7776
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7877
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
8078
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
8279
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8380
</content>
8481
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />

0 commit comments

Comments
 (0)