Merge pull request #61 from TonyHaddad91/master

Adding ability to change selected text size
ShawnLin013 · Jun 12, 2017 · b0562d3 · b0562d3
2 parents 49ef5a2 + 0410a0c
commit b0562d3
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -41,6 +41,10 @@ numberPicker.setTextColorResource(R.color.dark_grey);
 numberPicker.setTextSize(getResources().getDimension(R.dimen.text_size));
 numberPicker.setTextSize(R.dimen.text_size);
 
+// set selected text size
+numberPicker.setSelectedTextSize(getResources().getDimension(R.dimen.selected_text_size));
+numberPicker.setSelectedTextSize(R.dimen.selected_text_size);
+
 // set typeface
 numberPicker.setTypeface(Typeface.create(getString(R.string.roboto_light), Typeface.NORMAL));
 numberPicker.setTypeface(getString(R.string.roboto_light), Typeface.NORMAL);
@@ -68,6 +72,7 @@ add `xmlns:app="http://schemas.android.com/apk/res-auto"`
     app:np_selectedTextColor="@color/colorPrimary"
     app:np_textColor="@color/colorPrimary"
     app:np_textSize="@dimen/text_size"
+    app:np_selectedTextSize="@dimen/selected_text_size"
     app:np_typeface="@string/roboto_light"
     app:np_value="3" />
 ```
@@ -88,6 +93,7 @@ add `xmlns:app="http://schemas.android.com/apk/res-auto"`
 |np_selectedTextColor|The text color of the selected number.|
 |np_textColor|The text color of the numbers.|
 |np_textSize|The text size of the numbers.|
+|np_selectedTextSize|The text size of the selected number.|
 |np_typeface|The typeface of the numbers.|
 |np_value|The current value of this widget.|
 |np_wheelItemCount|The number of items show in the selector wheel.|

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.novoda:bintray-release:0.3.4'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 17 00:26:16 CST 2016
+#Sat Jun 10 11:18:32 SGT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/library/src/main/java/com/shawnlin/numberpicker/NumberPicker.java b/library/src/main/java/com/shawnlin/numberpicker/NumberPicker.java
@@ -220,6 +220,11 @@ public static final Formatter getTwoDigitFormatter() {
      */
     private float mTextSize = DEFAULT_TEXT_SIZE;
 
+    /**
+     * The size of the selected text.
+     */
+    private float mSelectedTextSize = DEFAULT_TEXT_SIZE;
+
     /**
      * The typeface of the text.
      */
@@ -585,6 +590,7 @@ public NumberPicker(Context context, AttributeSet attrs, int defStyle) {
         mSelectedTextColor = attributesArray.getColor(R.styleable.NumberPicker_np_selectedTextColor, mSelectedTextColor);
         mTextColor = attributesArray.getColor(R.styleable.NumberPicker_np_textColor, mTextColor);
         mTextSize = attributesArray.getDimension(R.styleable.NumberPicker_np_textSize, spToPx(mTextSize));
+        mSelectedTextSize = attributesArray.getDimension(R.styleable.NumberPicker_np_selectedTextSize, spToPx(mSelectedTextSize));
         mTypeface = Typeface.create(attributesArray.getString(R.styleable.NumberPicker_np_typeface), Typeface.NORMAL);
         mFormatter = stringToFormatter(attributesArray.getString(R.styleable.NumberPicker_np_formatter));
         mWheelItemCount = attributesArray.getInt(R.styleable.NumberPicker_np_wheelItemCount, mWheelItemCount);
@@ -614,6 +620,7 @@ public NumberPicker(Context context, AttributeSet attrs, int defStyle) {
         setSelectedTextColor(mSelectedTextColor);
         setTextColor(mTextColor);
         setTextSize(mTextSize);
+        setSelectedTextSize(mSelectedTextSize);
         setTypeface(mTypeface);
         setFormatter(mFormatter);
         updateInputTextView();
@@ -1365,8 +1372,10 @@ protected void onDraw(Canvas canvas) {
         int[] selectorIndices = mSelectorIndices;
         for (int i = 0; i < selectorIndices.length; i++) {
             if (i == mWheelMiddleItemIndex) {
+                mSelectorWheelPaint.setTextSize(mSelectedTextSize);
                 mSelectorWheelPaint.setColor(mSelectedTextColor);
             } else {
+                mSelectorWheelPaint.setTextSize(mTextSize);
                 mSelectorWheelPaint.setColor(mTextColor);
             }
 
@@ -2072,14 +2081,20 @@ public void setTextColorResource(@ColorRes int colorId) {
 
     public void setTextSize(float textSize) {
         mTextSize = textSize;
-        mSelectedText.setTextSize(pxToSp(mTextSize));
         mSelectorWheelPaint.setTextSize(mTextSize);
     }
 
     public void setTextSize(@DimenRes int dimenId) {
         setTextSize(getResources().getDimension(dimenId));
     }
+    public void setSelectedTextSize(float textSize) {
+        mSelectedTextSize = textSize;
+        mSelectedText.setTextSize(pxToSp(mSelectedTextSize));
+    }
 
+    public void setSelectedTextSize(@DimenRes int dimenId) {
+        setSelectedTextSize(getResources().getDimension(dimenId));
+    }
     public void setTypeface(Typeface typeface) {
         mTypeface = typeface;
         if (mTypeface != null) {
@@ -2183,4 +2198,7 @@ public Typeface getTypeface() {
         return mTypeface;
     }
 
+    public float getmSelectedTextSize() {
+        return mSelectedTextSize;
+    }
 }
diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
@@ -19,6 +19,7 @@
         <attr name="np_selectedTextColor" format="color" />
         <attr name="np_textColor" format="color" />
         <attr name="np_textSize" format="dimension" />
+        <attr name="np_selectedTextSize" format="dimension" />
         <attr name="np_typeface" format="string" />
         <attr name="np_value" format="integer" />
         <attr name="np_wheelItemCount" format="integer" />

diff --git a/sample/src/main/java/com/shawnlin/numberpicker/sample/MainActivity.java b/sample/src/main/java/com/shawnlin/numberpicker/sample/MainActivity.java
@@ -39,6 +39,10 @@ protected void onCreate(Bundle savedInstanceState) {
         numberPicker.setTextSize(getResources().getDimension(R.dimen.text_size));
         numberPicker.setTextSize(R.dimen.text_size);
 
+        // set selected text size
+        numberPicker.setSelectedTextSize(getResources().getDimension(R.dimen.selected_text_size));
+        numberPicker.setSelectedTextSize(R.dimen.selected_text_size);
+
         // set typeface
         numberPicker.setTypeface(Typeface.create(getString(R.string.roboto_light), Typeface.NORMAL));
         numberPicker.setTypeface(getString(R.string.roboto_light), Typeface.NORMAL);

diff --git a/sample/src/main/res/layout/content_main.xml b/sample/src/main/res/layout/content_main.xml
@@ -35,6 +35,7 @@
         app:np_selectedTextColor="@color/colorAccent"
         app:np_textColor="@color/colorAccent"
         app:np_textSize="@dimen/text_size"
+        app:np_selectedTextSize="@dimen/selected_text_size"
         app:np_typeface="@string/roboto_light" />
 
 </RelativeLayout>
diff --git a/sample/src/main/res/values/dimens.xml b/sample/src/main/res/values/dimens.xml
@@ -5,4 +5,5 @@
     <dimen name="fab_margin">16dp</dimen>
 
     <dimen name="text_size">30dp</dimen>
+    <dimen name="selected_text_size">35dp</dimen>
 </resources>