From 621cd56c6f483a20046044b74f6b302b1ca6dcb3 Mon Sep 17 00:00:00 2001 From: Sven van den Tweel Date: Sat, 5 Sep 2020 16:34:47 +0200 Subject: [PATCH 1/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ee5c49..26c4bb4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # NumberPickerPreference -[![API](https://img.shields.io/badge/API-19%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=19) [![](https://jitpack.io/v/invissvenska/NumberPickerPreference.svg)](https://jitpack.io/#invissvenska/NumberPickerPreference) +[![API](https://img.shields.io/badge/API-19%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=19) [![](https://jitpack.io/v/invissvenska/NumberPickerPreference.svg)](https://jitpack.io/#invissvenska/NumberPickerPreference) Buy Me A Coffee donate button ## Prerequisites From b514eb0750b47cbeb714e6ad8d3105fabf5ff4e6 Mon Sep 17 00:00:00 2001 From: Sven van den Tweel Date: Sat, 30 Jan 2021 14:59:39 +0100 Subject: [PATCH 2/3] Feature/step value (#6) * Added a stepvalue to increment the values not by one but also with higher increments * Update readme * Add github actions and update readme --- .github/workflows/android-library.yml | 27 +++++++++++++ README.md | 7 +++- app/build.gradle | 4 +- .../sample/MainFragment.java | 3 ++ .../sample/SettingsFragment.java | 1 + app/src/main/res/layout/content_main.xml | 14 +++++++ app/src/main/res/xml/preferences.xml | 12 ++++++ build.gradle | 6 +-- gradle/wrapper/gradle-wrapper.properties | 4 +- .../NumberDialogPreference.java | 8 +++- .../NumberPickerPreferenceDialogFragment.java | 40 ++++++++++++++++--- .../src/main/res/values-night/attrs.xml | 7 ++-- 12 files changed, 114 insertions(+), 19 deletions(-) create mode 100644 .github/workflows/android-library.yml diff --git a/.github/workflows/android-library.yml b/.github/workflows/android-library.yml new file mode 100644 index 0000000..11b5d47 --- /dev/null +++ b/.github/workflows/android-library.yml @@ -0,0 +1,27 @@ +name: Android-Library CI + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Make Gradle executable + run: chmod +x ./gradlew + - name: Build with Gradle + run: ./gradlew build + - name: Build Debug APK + run: ./gradlew assembleDebug diff --git a/README.md b/README.md index 26c4bb4..51b5e7b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # NumberPickerPreference -[![API](https://img.shields.io/badge/API-19%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=19) [![](https://jitpack.io/v/invissvenska/NumberPickerPreference.svg)](https://jitpack.io/#invissvenska/NumberPickerPreference) Buy Me A Coffee donate button +[![API](https://img.shields.io/badge/API-19%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=19) [![](https://jitpack.io/v/invissvenska/NumberPickerPreference.svg)](https://jitpack.io/#invissvenska/NumberPickerPreference) Build Status Buy Me A Coffee donate button ## Prerequisites @@ -36,6 +36,7 @@ Add the NumberDialogPreference to the preferences.xml: app:defaultValue="20" // optional, default is 0 app:numberPickerPreference_minValue="10" // optional, default is 0 app:numberPickerPreference_maxValue="60" // optional, default is 100 + app:numberPickerPreference_stepValue="1" // optional, default is 1 app:numberPickerPreference_unitText=" another quantity" /> // optional, default is "" ``` @@ -56,6 +57,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { dialogPreference.getKey(), dialogPreference.getMinValue(), dialogPreference.getMaxValue(), + dialogPreference.getStepValue(), dialogPreference.getUnitText() ); dialogFragment.setTargetFragment(this, 0); @@ -69,7 +71,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { ## Usage -To create a NumberPickerPreference with default value of 20, min value of 10, max value of 60 and custom unit text: +To create a NumberPickerPreference with default value of 20, min value of 10, max value of 60, increments of 2 and custom unit text: ```xml ``` diff --git a/app/build.gradle b/app/build.gradle index e9164df..b98a8aa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,8 +24,8 @@ android { dependencies { implementation "androidx.appcompat:appcompat:$androidXVersion" - implementation 'androidx.constraintlayout:constraintlayout:2.0.1' - testImplementation 'junit:junit:4.13' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + testImplementation 'junit:junit:4.13.1' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' diff --git a/app/src/main/java/nl/invissvenska/numberpickerpreference/sample/MainFragment.java b/app/src/main/java/nl/invissvenska/numberpickerpreference/sample/MainFragment.java index cfa823e..e2308a9 100644 --- a/app/src/main/java/nl/invissvenska/numberpickerpreference/sample/MainFragment.java +++ b/app/src/main/java/nl/invissvenska/numberpickerpreference/sample/MainFragment.java @@ -23,6 +23,7 @@ public class MainFragment extends Fragment { private TextView demo4; private TextView demo5; private TextView demo6; + private TextView demo7; public MainFragment() { //keep default constructor @@ -55,6 +56,7 @@ public void onClick(View v) { demo4 = view.findViewById(R.id.demo4); demo5 = view.findViewById(R.id.demo5); demo6 = view.findViewById(R.id.demo6); + demo7 = view.findViewById(R.id.demo7); preferences = PreferenceManager.getDefaultSharedPreferences(getContext()); return view; @@ -69,5 +71,6 @@ public void onResume() { demo4.setText("Demo_4 value is: " + preferences.getInt("demo_4", 20)); demo5.setText("Demo_5 value is: " + preferences.getInt("demo_5", 0)); demo6.setText("Demo_6 value is: " + preferences.getInt("demo_6", 0)); + demo6.setText("Demo_7 value is: " + preferences.getInt("demo_7", 10)); } } diff --git a/app/src/main/java/nl/invissvenska/numberpickerpreference/sample/SettingsFragment.java b/app/src/main/java/nl/invissvenska/numberpickerpreference/sample/SettingsFragment.java index a7d97d5..c2ff9aa 100644 --- a/app/src/main/java/nl/invissvenska/numberpickerpreference/sample/SettingsFragment.java +++ b/app/src/main/java/nl/invissvenska/numberpickerpreference/sample/SettingsFragment.java @@ -37,6 +37,7 @@ public void onDisplayPreferenceDialog(Preference preference) { dialogPreference.getKey(), dialogPreference.getMinValue(), dialogPreference.getMaxValue(), + dialogPreference.getStepValue(), dialogPreference.getUnitText() ); dialogFragment.setTargetFragment(this, 0); diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index b777abb..305366c 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -89,6 +89,20 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/demo5" /> + +