diff --git a/.gitignore b/.gitignore index 83d6d47..c55a8bd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /build /captures .iml +.idea +*.iml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index aa622eb..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -PickView \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 9a8b7e5..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 5dea0cc..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 4a3785f..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b31283..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 5b8df39..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.7 - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 31a029c..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/PickView.iml b/PickView.iml deleted file mode 100644 index d372008..0000000 --- a/PickView.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index 933d834..76a010f 100644 --- a/README.md +++ b/README.md @@ -1,106 +1,132 @@ +# Material Wheel View +>:ferris_wheel: Prettier and simpler IOS like WheelView and other built-in WheelView UIs -[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-PickView-green.svg?style=true)](https://android-arsenal.com/details/1/2811) - -# PickView -This is a helper lib for us to pick date or province like IOS system -WheelView widget. - -# Here is date pick effect by gif - -![picker](./datepick.gif) - -##How to use - -Add more custom attributes, Just see below version 1.1.1 - - ```java - - DatePickerPopWin pickerPopWin = new DatePickerPopWin.Builder(MainActivity.this, new DatePickerPopWin.OnDatePickedListener() { - @Override - public void onDatePickCompleted(int year, int month, int day, String dateDesc) { - Toast.makeText(MainActivity.this, dateDesc, Toast.LENGTH_SHORT).show(); - } - }).textConfirm("CONFIRM") //text of confirm button - .textCancel("CANCEL") //text of cancel button - .btnTextSize(16) // button text size - .viewTextSize(25) // pick view text size - .colorCancel(Color.parseColor("#999999")) //color of cancel button - .colorConfirm(Color.parseColor("#009900"))//color of confirm button - .minYear(1990) //min year in loop - .maxYear(2550) // max year in loop - .showDayMonthYear(true) // shows like dd mm yyyy (default is false) - .dateChose("2013-11-11") // date chose when init popwindow - .build(); - - ``` - - -## About LoopView - in version 1.2.0+,can use LoopView like: - - ```java - - - app:initPosition="3" - app:lineColor="@color/colorPrimary" - app:textSize="25sp" - app:topBottomTextColor="#ffafafaf"/> - - - loopView = (LoopView) findViewById(R.id.loop_view); - loopView.setInitPosition(2); - loopView.setCanLoop(false); - loopView.setLoopListener(new LoopScrollListener() { - @Override - public void onItemSelect(int item) { - - } - }); - loopView.setTextSize(25);//must be called before setDateList - loopView.setDataList(getList()); - - ``` +[![License](https://img.shields.io/badge/License-Apache%202.0-brightgreen.svg)](https://opensource.org/licenses/Apache-2.0) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Material%20WheelView-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/5184) [![](https://jitpack.io/v/BlackBoxVision/material-wheel-view.svg)](https://jitpack.io/#BlackBoxVision/material-wheel-view) -#Dependencies +## Installation -```java +**Gradle** - compile 'com.brucetoo.pickview:library:1.2.3' - +- Add it in your root build.gradle at the end of repositories: + +```java +repositories { + maven { + url "https://jitpack.io" + } +} ``` -##TODO +- Add the dependency: -- [ ] add Province pick PopWindow (if i have time) +```java +dependencies { + compile 'com.github.BlackBoxVision:material-wheel-view:v0.0.1' +} +``` +**Maven** -- [x] add to Jcenter (Wait Jcenter manager verify) +- Add the JitPack repository to your maven file. ------- +```xml + + jitpack.io + https://jitpack.io + +``` +- Add the dependency in the form + +```xml + + com.github.BlackBoxVision + >material-wheel-view + v0.0.1 + +``` +**SBT** -#THANKS - [androidWheelView](https://github.com/weidongjian/androidWheelView) - -## License +- Add it in your build.sbt at the end of resolvers: -Copyright 2015 - 2016 Bruce too +```java +resolvers += "jitpack" at "https://jitpack.io" +``` + +- Add the dependency in the form: + +```java +libraryDependencies += "com.github.BlackBoxVision" % "material-wheel-view" % "v0.0.1" +``` + +## Usage example + +In your layout.xml: + +```xml + +``` -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +In your activity class: - http://www.apache.org/licenses/LICENSE-2.0 +```java +@Override +protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + final WheelView wheelView = (WheelView) findViewById(R.id.loop_view); -See [LICENSE](LICENSE) file for details. + wheelView.setInitPosition(2); + wheelView.setCanLoop(false); + wheelView.setLoopListener(item -> {}); + wheelView.setTextSize(12); + wheelView.setItems(getList()); + } + ``` + + Also, there is a built-in UI called DatePickerPopUpWindow, you can use it like these: + + ```java + findViewById(R.id.date).setOnClickListener(v -> { + final DatePickerPopUpWindow datePicker = new DatePickerPopUpWindow.Builder(getApplicationContext()) + .setMinYear(1990) + .setMaxYear(2550) + .setSelectedDate("2013-11-11") + .setOnDateSelectedListener(this::onDateSelected) + .setConfirmButtonText("CONFIRM") + .setCancelButtonText("CANCEL") + .setConfirmButtonTextColor(Color.parseColor("#999999")) + .setCancelButtonTextColor(Color.parseColor("#009900")) + .setButtonTextSize(16) + .setViewTextSize(15) + .setShowDayMonthYear(true) + .build(); + + datePicker.show(this); + }); +``` + +## Issues + +If you found a bug, or you have an answer, or whatever. Please, open an [issue](https://github.com/BlackBoxVision/material-wheel-view/issues). I will do the best to fix it, or help you. + +## Contributing + +Of course, if you see something that you want to upgrade from this library, or a bug that needs to be solved, **PRs are welcome!** + +## TODO +- [ ] Custom **DatePicker** component based on **WheelView** +- [ ] Custom **TimePicker** component based on **WheelView** +- [ ] Custom **DatePickerDialog** based on DatePicker **WheelView** +- [ ] Custom **TimePickerDialog** based on DatePicker **WheelView** diff --git a/app/app.iml b/app/app.iml index ddc510c..4e04982 100644 --- a/app/app.iml +++ b/app/app.iml @@ -23,8 +23,8 @@ - - + + @@ -32,12 +32,14 @@ + + @@ -82,39 +84,86 @@ - - - - - + + + + + + + + + + + + - - - - + - + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 75ae432..4e2f48d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,66 +1,50 @@ apply plugin: 'com.android.application' -apply plugin: 'cobertura' +apply plugin: 'me.tatarka.retrolambda' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 25 + buildToolsVersion "23.0.3" defaultConfig { - applicationId "com.brucetoo.pickview" + applicationId "io.blackbox_vision.wheelview.sample" minSdkVersion 14 - targetSdkVersion 23 + targetSdkVersion 25 versionCode 1 versionName "1.0" } buildTypes { -// debug { -// testCoverageEnabled = true -// } - release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + lintOptions { + disable "InvalidPackage" + abortOnError true + } + packagingOptions { + exclude "META-INF/services/javax.annotation.processing.Processor" + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} -// testOptions { -// unitTests.returnDefaultValues = true -// } +retrolambda { + jvmArgs "-noverify" } dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' -// testCompile 'org.mockito:mockito-core:1.10.19' -// testCompile 'org.robolectric:robolectric:3.1' -// testCompile 'org.powermock:powermock-module-junit4:1.6.3' -// testCompile 'org.powermock:powermock-api-mockito:1.6.3' - - compile 'com.android.support:appcompat-v7:23.0.1' - compile 'com.android.support:design:23.0.1' - compile project(":library") -// compile 'com.brucetoo.pickview:library:1.1.1' -} - -//cobertura { -// coverageFormats = ['html', 'xml'] -// coverageIgnoreTrivial = true -// -// coverageIncludes = ['.*com.bruce.pickerview.*', -// '.*com.brucetoo.pickview.*' ] -// -// coverageExcludes = ['.*android.support.*', -// '.*com.brucetoo.pickview.R.*', -// '.*com.bruce.pickerview.R.*', -// '.*$ViewInjector.*', -// '.*$ViewBinder.*', -// '.*BuildConfig.*', -// '.*Manifest.*', -// // remove non-completed code from scope -// '.*ProvincePickPopWin.*', -// '.*PickerView.*' -// ] -// -// coverageReportDir = new File("$buildDir/reports/cobertura") -//} + testCompile 'org.mockito:mockito-core:1.10.19' + testCompile 'org.robolectric:robolectric:3.1' + testCompile 'org.powermock:powermock-module-junit4:1.6.3' + testCompile 'org.powermock:powermock-api-mockito:1.6.3' + + compile 'com.android.support:appcompat-v7:25.1.0' + compile 'com.android.support:design:25.1.0' + compile project(':materialwheelview') +} \ No newline at end of file diff --git a/library/src/androidTest/java/com/bruce/pickerview/ApplicationTest.java b/app/src/androidTest/java/io/blackbox_vision/wheelview/sample/ApplicationTest.java similarity index 87% rename from library/src/androidTest/java/com/bruce/pickerview/ApplicationTest.java rename to app/src/androidTest/java/io/blackbox_vision/wheelview/sample/ApplicationTest.java index 748942e..e486be7 100644 --- a/library/src/androidTest/java/com/bruce/pickerview/ApplicationTest.java +++ b/app/src/androidTest/java/io/blackbox_vision/wheelview/sample/ApplicationTest.java @@ -1,4 +1,4 @@ -package com.bruce.pickerview; +package io.blackbox_vision.wheelview.sample; import android.app.Application; import android.test.ApplicationTestCase; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a0f0903..772d781 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="io.blackbox_vision.wheelview.sample" > mProvinceList = null; // 省份列表 -// private String mProvince = null; // 省份 -// private String mCity = null; // 城市 - private LoopView loopView; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - - FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); - - findViewById(R.id.date).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - DatePickerPopWin pickerPopWin = new DatePickerPopWin.Builder(MainActivity.this, new DatePickerPopWin.OnDatePickedListener() { - @Override - public void onDatePickCompleted(int year, int month, int day, String dateDesc) { - Toast.makeText(MainActivity.this, dateDesc, Toast.LENGTH_SHORT).show(); - } - }).textConfirm("CONFIRM") //text of confirm button - .textCancel("CANCEL") //text of cancel button - .btnTextSize(16) // button text size - .viewTextSize(25) // pick view text size - .colorCancel(Color.parseColor("#999999")) //color of cancel button - .colorConfirm(Color.parseColor("#009900"))//color of confirm button - .minYear(1990) //min year in loop - .maxYear(2550) // max year in loop - .dateChose("2013-11-11") // date chose when init popwindow - .build(); - pickerPopWin.showPopWin(MainActivity.this); - } - }); - - findViewById(R.id.province).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - - Toast.makeText(MainActivity.this, "Working on...", Toast.LENGTH_SHORT).show(); -// if(null != mProvinceList) { -// ProvincePickPopWin pickPopWin = new ProvincePickPopWin(MainActivity.this, -// mProvince, mCity, mProvinceList, MainActivity.this); -// pickPopWin.showPopWin(MainActivity.this); -// } - } - }); - - loopView = (LoopView) findViewById(R.id.loop_view); - loopView.setInitPosition(2); - loopView.setCanLoop(false); - loopView.setLoopListener(new LoopScrollListener() { - @Override - public void onItemSelect(int item) { - - } - }); - loopView.setTextSize(25);//must be called before setDateList - loopView.setDataList(getList()); -// ((new ProvinceInfoParserTask(this, mHandler))).execute();// 解析本地地址信息文件 - } - - public ArrayList getList(){ - ArrayList list = new ArrayList<>(); - for (int i = 0; i < 50; i++) { - list.add("DAY TEST:" + i); - } - return list; - } - - -// private Handler mHandler = new Handler(new Handler.Callback() { -// @Override -// public boolean handleMessage(Message msg) { -// switch (msg.what) { -// case ProvinceInfoParserTask.MSG_PARSE_RESULT_CALLBACK: // 解析地址完成 -// mProvinceList = (ArrayList) msg.obj; -// break; -// } -// return false; -// } -// }); - -// @Override -// public void onAddressPickCompleted(String province, String provinceId, String city, String cityId) { -//// Toast.makeText(this,province+"-"+provinceId+"-"+city+"-"+cityId,Toast.LENGTH_SHORT).show(); -// Toast.makeText(this,ProvinceInfoUtils.matchAddress(this,provinceId,cityId,mProvinceList),Toast.LENGTH_SHORT).show(); -// ProvinceInfoUtils.matchAddress(this,provinceId,cityId,mProvinceList); -// } -} diff --git a/app/src/main/java/io/blackbox_vision/wheelview/sample/MainActivity.java b/app/src/main/java/io/blackbox_vision/wheelview/sample/MainActivity.java new file mode 100644 index 0000000..9ddc87d --- /dev/null +++ b/app/src/main/java/io/blackbox_vision/wheelview/sample/MainActivity.java @@ -0,0 +1,85 @@ +package io.blackbox_vision.wheelview.sample; + +import android.graphics.Color; +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.widget.Toast; + +import io.blackbox_vision.wheelview.view.DatePickerPopUpWindow; +import io.blackbox_vision.wheelview.view.WheelView; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; +import java.util.Locale; + + +public final class MainActivity extends AppCompatActivity { + private static final String DEFAULT_TEMPLATE = "dd/MM/yyyy"; + + @NonNull + private final SimpleDateFormat formatter = new SimpleDateFormat(DEFAULT_TEMPLATE, Locale.getDefault()); + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + findViewById(R.id.date).setOnClickListener(v -> { + final DatePickerPopUpWindow datePicker = new DatePickerPopUpWindow.Builder(getApplicationContext()) + .setMinYear(1990) + .setMaxYear(2550) + .setSelectedDate("2013-11-11") + .setLocale(Locale.getDefault()) + .setOnDateSelectedListener(this::onDateSelected) + .setConfirmButtonText("CONFIRM") + .setCancelButtonText("CANCEL") + .setConfirmButtonTextColor(Color.parseColor("#999999")) + .setCancelButtonTextColor(Color.parseColor("#009900")) + .setButtonTextSize(16) + .setViewTextSize(15) + .setShowShortMonths(true) + .setShowDayMonthYear(true) + .build(); + + datePicker.show(this); + }); + + findViewById(R.id.province).setOnClickListener(v -> { + Toast.makeText(MainActivity.this, "Working on...", Toast.LENGTH_SHORT).show(); + }); + + final WheelView wheelView = (WheelView) findViewById(R.id.loop_view); + + wheelView.setInitialPosition(2); + wheelView.setIsLoopEnabled(false); + wheelView.addOnLoopScrollListener((item, position) -> {}); + wheelView.setTextSize(12); + wheelView.setItems(getList()); + } + + private void onDateSelected(int year, int month, int dayOfMonth) { + final Calendar calendar = Calendar.getInstance(Locale.getDefault()); + + calendar.set(Calendar.DAY_OF_MONTH, dayOfMonth); + calendar.set(Calendar.MONTH, month); + calendar.set(Calendar.YEAR, year); + + Toast.makeText(MainActivity.this, formatter.format(calendar.getTime()), Toast.LENGTH_SHORT).show(); + } + + public List getList() { + ArrayList list = new ArrayList<>(); + + for (int i = 0; i < 50; i++) { + list.add("DAY TEST:" + i); + } + + return list; + } +} diff --git a/app/src/main/java/com/brucetoo/pickview/provincepick/CityModel.java b/app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/CityModel.java similarity index 71% rename from app/src/main/java/com/brucetoo/pickview/provincepick/CityModel.java rename to app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/CityModel.java index d9665a4..6d29fc3 100644 --- a/app/src/main/java/com/brucetoo/pickview/provincepick/CityModel.java +++ b/app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/CityModel.java @@ -1,7 +1,7 @@ -package com.brucetoo.pickview.provincepick; +package io.blackbox_vision.wheelview.sample.provincepick; -import com.brucetoo.pickview.view.PickerItem; +import io.blackbox_vision.wheelview.sample.view.PickerItem; /** * 城市信息实体类 diff --git a/app/src/main/java/com/brucetoo/pickview/provincepick/ProvinceModel.java b/app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/ProvinceModel.java similarity index 93% rename from app/src/main/java/com/brucetoo/pickview/provincepick/ProvinceModel.java rename to app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/ProvinceModel.java index ed27ee0..cc6f434 100644 --- a/app/src/main/java/com/brucetoo/pickview/provincepick/ProvinceModel.java +++ b/app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/ProvinceModel.java @@ -1,7 +1,7 @@ -package com.brucetoo.pickview.provincepick; +package io.blackbox_vision.wheelview.sample.provincepick; -import com.brucetoo.pickview.view.PickerItem; +import io.blackbox_vision.wheelview.sample.view.PickerItem; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/brucetoo/pickview/provincepick/ProvincePickPopWin.java b/app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/ProvincePickPopWin.java similarity index 96% rename from app/src/main/java/com/brucetoo/pickview/provincepick/ProvincePickPopWin.java rename to app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/ProvincePickPopWin.java index 47b21d5..5fcdcaa 100644 --- a/app/src/main/java/com/brucetoo/pickview/provincepick/ProvincePickPopWin.java +++ b/app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/ProvincePickPopWin.java @@ -1,4 +1,4 @@ -package com.brucetoo.pickview.provincepick; +package io.blackbox_vision.wheelview.sample.provincepick; import android.annotation.SuppressLint; import android.app.Activity; @@ -18,10 +18,10 @@ import android.widget.Button; import android.widget.PopupWindow; -import com.brucetoo.pickview.R; -import com.brucetoo.pickview.provincepick.utils.ProvinceInfoParserTask; -import com.brucetoo.pickview.view.PickerItem; -import com.brucetoo.pickview.view.PickerView; +import io.blackbox_vision.wheelview.sample.R; +import io.blackbox_vision.wheelview.sample.provincepick.utils.ProvinceInfoParserTask; +import io.blackbox_vision.wheelview.sample.view.PickerItem; +import io.blackbox_vision.wheelview.sample.view.PickerView; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/brucetoo/pickview/provincepick/utils/ProvinceInfoHandler.java b/app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/utils/ProvinceInfoHandler.java similarity index 90% rename from app/src/main/java/com/brucetoo/pickview/provincepick/utils/ProvinceInfoHandler.java rename to app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/utils/ProvinceInfoHandler.java index ff557e0..4e33f35 100644 --- a/app/src/main/java/com/brucetoo/pickview/provincepick/utils/ProvinceInfoHandler.java +++ b/app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/utils/ProvinceInfoHandler.java @@ -1,8 +1,8 @@ -package com.brucetoo.pickview.provincepick.utils; +package io.blackbox_vision.wheelview.sample.provincepick.utils; -import com.brucetoo.pickview.provincepick.CityModel; -import com.brucetoo.pickview.provincepick.ProvinceModel; +import io.blackbox_vision.wheelview.sample.provincepick.CityModel; +import io.blackbox_vision.wheelview.sample.provincepick.ProvinceModel; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/app/src/main/java/com/brucetoo/pickview/provincepick/utils/ProvinceInfoParserTask.java b/app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/utils/ProvinceInfoParserTask.java similarity index 87% rename from app/src/main/java/com/brucetoo/pickview/provincepick/utils/ProvinceInfoParserTask.java rename to app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/utils/ProvinceInfoParserTask.java index d5aab85..a1fdfd1 100644 --- a/app/src/main/java/com/brucetoo/pickview/provincepick/utils/ProvinceInfoParserTask.java +++ b/app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/utils/ProvinceInfoParserTask.java @@ -1,10 +1,10 @@ -package com.brucetoo.pickview.provincepick.utils; +package io.blackbox_vision.wheelview.sample.provincepick.utils; import android.content.Context; import android.os.AsyncTask; import android.os.Handler; -import com.brucetoo.pickview.provincepick.ProvinceModel; +import io.blackbox_vision.wheelview.sample.provincepick.ProvinceModel; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -48,7 +48,7 @@ protected List doInBackground(Void... params) { try { SAXParserFactory sax = SAXParserFactory.newInstance();// 创建解析器 XMLReader reader = sax.newSAXParser().getXMLReader(); - InputStream in = mContext.getAssets().open("city.xml"); + InputStream in = mContext.getAssets().open("io/blackbox_vision/wheelview/sample/provincepick/utils/city.xml"); reader.setContentHandler(new ProvinceInfoHandler(provinceList));// 为reader设置内容处理器 reader.parse(new InputSource(in));// 开始解析文件 diff --git a/app/src/main/java/com/brucetoo/pickview/provincepick/utils/ProvinceInfoUtils.java b/app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/utils/ProvinceInfoUtils.java similarity index 87% rename from app/src/main/java/com/brucetoo/pickview/provincepick/utils/ProvinceInfoUtils.java rename to app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/utils/ProvinceInfoUtils.java index 0268abf..960b4e2 100644 --- a/app/src/main/java/com/brucetoo/pickview/provincepick/utils/ProvinceInfoUtils.java +++ b/app/src/main/java/io/blackbox_vision/wheelview/sample/provincepick/utils/ProvinceInfoUtils.java @@ -1,10 +1,10 @@ -package com.brucetoo.pickview.provincepick.utils; +package io.blackbox_vision.wheelview.sample.provincepick.utils; import android.content.Context; import android.content.res.Resources; -import com.brucetoo.pickview.provincepick.CityModel; -import com.brucetoo.pickview.provincepick.ProvinceModel; +import io.blackbox_vision.wheelview.sample.provincepick.CityModel; +import io.blackbox_vision.wheelview.sample.provincepick.ProvinceModel; import java.util.ArrayList; diff --git a/app/src/main/java/com/brucetoo/pickview/view/PickerItem.java b/app/src/main/java/io/blackbox_vision/wheelview/sample/view/PickerItem.java similarity index 75% rename from app/src/main/java/com/brucetoo/pickview/view/PickerItem.java rename to app/src/main/java/io/blackbox_vision/wheelview/sample/view/PickerItem.java index 6732d1f..5d255f6 100644 --- a/app/src/main/java/com/brucetoo/pickview/view/PickerItem.java +++ b/app/src/main/java/io/blackbox_vision/wheelview/sample/view/PickerItem.java @@ -1,4 +1,4 @@ -package com.brucetoo.pickview.view; +package io.blackbox_vision.wheelview.sample.view; /** * PickerView item接口类 diff --git a/app/src/main/java/com/brucetoo/pickview/view/PickerView.java b/app/src/main/java/io/blackbox_vision/wheelview/sample/view/PickerView.java similarity index 99% rename from app/src/main/java/com/brucetoo/pickview/view/PickerView.java rename to app/src/main/java/io/blackbox_vision/wheelview/sample/view/PickerView.java index d7eacb7..9614b35 100644 --- a/app/src/main/java/com/brucetoo/pickview/view/PickerView.java +++ b/app/src/main/java/io/blackbox_vision/wheelview/sample/view/PickerView.java @@ -1,4 +1,4 @@ -package com.brucetoo.pickview.view; +package io.blackbox_vision.wheelview.sample.view; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index 6e5dd8b..2c0e55a 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -17,42 +17,39 @@ android:id="@+id/date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Date Pick" - /> + android:text="Date Pick" />