Skip to content

Commit 917ba8e

Browse files
feicien程辉
feicien
authored and
程辉
committed
wheelview 和 pickerview 合并
1 parent 5b1d8d0 commit 917ba8e

18 files changed

Lines changed: 2 additions & 102 deletions

‎pickerview/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ android {
5050

5151
dependencies {
5252
// compile fileTree(include: ['*.jar'], dir: 'libs')
53-
api project(path: ':wheelview')
5453
// api 'com.contrarywind:wheelview:4.1.0'
5554
implementation 'androidx.annotation:annotation:1.3.0'
5655
}

wheelview/src/main/java/com/contrarywind/adapter/WheelAdapter.java renamed to pickerview/src/main/java/com/contrarywind/adapter/WheelAdapter.java

File renamed without changes.

wheelview/src/main/java/com/contrarywind/interfaces/IPickerViewData.java renamed to pickerview/src/main/java/com/contrarywind/interfaces/IPickerViewData.java

File renamed without changes.

wheelview/src/main/java/com/contrarywind/listener/LoopViewGestureListener.java renamed to pickerview/src/main/java/com/contrarywind/listener/LoopViewGestureListener.java

File renamed without changes.

wheelview/src/main/java/com/contrarywind/listener/OnItemSelectedListener.java renamed to pickerview/src/main/java/com/contrarywind/listener/OnItemSelectedListener.java

File renamed without changes.

wheelview/src/main/java/com/contrarywind/timer/InertiaTimerTask.java renamed to pickerview/src/main/java/com/contrarywind/timer/InertiaTimerTask.java

File renamed without changes.

wheelview/src/main/java/com/contrarywind/timer/MessageHandler.java renamed to pickerview/src/main/java/com/contrarywind/timer/MessageHandler.java

File renamed without changes.

wheelview/src/main/java/com/contrarywind/timer/SmoothScrollTimerTask.java renamed to pickerview/src/main/java/com/contrarywind/timer/SmoothScrollTimerTask.java

File renamed without changes.

wheelview/src/main/java/com/contrarywind/view/WheelView.java renamed to pickerview/src/main/java/com/contrarywind/view/WheelView.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import android.view.MotionEvent;
1717
import android.view.View;
1818

19+
import com.bigkoo.pickerview.R;
1920
import com.contrarywind.adapter.WheelAdapter;
2021
import com.contrarywind.interfaces.IPickerViewData;
2122
import com.contrarywind.listener.LoopViewGestureListener;

wheelview/src/main/res/values/attrs.xml renamed to pickerview/src/main/res/values/attrs.xml

File renamed without changes.

0 commit comments

Comments
 (0)