Use Autosizing TextViews #8

Author: davidmigloz

CHANGELOG.md

@@ -0,0 +1,31 @@
+# Change Log
+
+## Version 2.0  *(20/04/2018)*
+
+- Implement keys using Autosizing TextViews #8
+- Adding `keyPadding` attribute
+- Remove `numberKeyTextSize` attribute **(breaking change)**
+- Update support libraries to 27.1.1 #7
+- Update buildToolsVersion to 27.0.3 #7
+- Update gradle to 4.6 #7
+
+## Version 1.0  *(18/01/2018)*
+
+- Update support libraries to 27.0.2
+- Update buildToolsVersion to 26.0.2
+- Update gradle to 4.1
+- Improve decimal sample
+
+## Version 0.3  *(25/09/2017)*
+
+- Update support libraries to 26.1.0
+- Update buildToolsVersion to 26.0.1
+
+## Version 0.2  *(25/09/2017)*
+
+- Library crashes when running on API 19 #1
+- Update buildToolsVersion "25.0.3"
+
+## Version 0.1  *(20/07/2017)*
+
+- Initial release

README.md

@@ -25,10 +25,12 @@ Add the dependency:
 
 ```gradle
 dependencies {
-	compile 'com.github.davidmigloz:number-keyboard:1.0'
+	compile 'com.github.davidmigloz:number-keyboard:2.0'
 }
 ```
 
+[CHANGELOG](https://github.com/davidmigloz/number-keyboard/blob/master/CHANGELOG.md)
+
 #### Step 3
 
 Use `NumberKeyboard` view in your layout:
@@ -49,9 +51,10 @@ Use `NumberKeyboard` view in your layout:
   - `decimal`: numbers, comma and backspace keys.
   - `fingerprint`: numbers, fingerprint and backspace keys.
   - `custom`: numbers and defined auxiliary keys.
-- `keyboard:keyHeight="[dimension]"` (default: 70dp): key height.
+- `keyboard:keyWidth="[dimension]"` (default: `match_parent`): key width (`wrap_content` not allowed).      
+- `keyboard:keyHeight="[dimension]"` (default: `match_parent`): key height (`wrap_content` not allowed).
+- `keyboard:keyPadding="[dimension]"` (default: `16dp`): key padding.
 - `keyboard:numberKeyBackground="[reference]"` (default: circle): number keys background drawable.
-- `keyboard:numberKeyTextSize="[dimension]"` (default: 32sp): number keys text size.
 - `keyboard:numberKeyTextColor="[reference]"` (default: dark blue): number keys text color.
 - `keyboard:leftAuxBtnIcon="[reference]"` (default: none): if `keyboardType="custom"`, icon shown in left auxiliary button.
 - `keyboard:leftAuxBtnBackground="[reference]"` (default: none): if `keyboardType="custom"`, left auxiliary button background.
@@ -66,8 +69,8 @@ Use `NumberKeyboard` view in your layout:
 - `showRightAuxButton()`: shows right auxiliary button.
 - `setKeyWidth()`: sets key width in px.
 - `setKeyHeight()`: sets key height in px.
+- `setKeyPadding()`: sets key padding in px.
 - `setNumberKeyBackground()`: sets number keys background.
-- `setNumberKeyTextSize()`: sets number keys text size.
 - `setNumberKeyTextColor()`: sets number keys text color.
 - `setNumberKeyTypeface()`: sets number keys text typeface.
 - `setLeftAuxButtonIcon()`: sets left auxiliary button icon.
@@ -105,7 +108,7 @@ Pull request are very appreciated.
 
 ## License
 
-Copyright (c) 2017 David Miguel Lozano
+Copyright (c) 2018 David Miguel Lozano
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

img/screenshot.jpg

@@ -28,6 +28,7 @@ android {
 
 dependencies {
     implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:support-v4:27.1.1'
     api "com.android.support:gridlayout-v7:27.1.1"
 }
 

lib/build.gradle

@@ -27,9 +27,9 @@
 @SuppressWarnings("unused")
 public class NumberKeyboard extends GridLayout {
 
-    private static final int DEFAULT_KEY_WIDTH_DP = 70;
-    private static final int DEFAULT_KEY_HEIGHT_DP = 70;
-    private static final int DEFAULT_KEY_TEXT_SIZE_SP = 32;
+    private static final int DEFAULT_KEY_WIDTH_DP = -1; // match_parent
+    private static final int DEFAULT_KEY_HEIGHT_DP = -1; // match_parent
+    private static final int DEFAULT_KEY_PADDING_DP = 16;
 
     static {
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
@@ -39,10 +39,10 @@ public class NumberKeyboard extends GridLayout {
     private int keyWidth;
     @Dimension
     private int keyHeight;
+    @Dimension
+    private int keyPadding;
     @DrawableRes
     private int numberKeyBackground;
-    @Dimension
-    private int numberKeyTextSize;
     @ColorRes
     private int numberKeyTextColor;
     @DrawableRes
@@ -116,6 +116,9 @@ public void showRightAuxButton() {
      * Sets key width in px.
      */
     public void setKeyWidth(int px) {
+        if (px == DEFAULT_KEY_WIDTH_DP) {
+            return;
+        }
         for (TextView key : numericKeys) {
             key.getLayoutParams().width = px;
         }
@@ -128,6 +131,9 @@ public void setKeyWidth(int px) {
      * Sets key height in px.
      */
     public void setKeyHeight(int px) {
+        if (px == DEFAULT_KEY_HEIGHT_DP) {
+            return;
+        }
         for (TextView key : numericKeys) {
             key.getLayoutParams().height = px;
         }
@@ -137,20 +143,23 @@ public void setKeyHeight(int px) {
     }
 
     /**
-     * Sets number keys background.
+     * Sets key padding in px.
      */
-    public void setNumberKeyBackground(@DrawableRes int background) {
+    public void setKeyPadding(int px) {
         for (TextView key : numericKeys) {
-            key.setBackground(ContextCompat.getDrawable(getContext(), background));
+            key.setPadding(px, px, px, px);
+            key.setCompoundDrawablePadding(-1 * px);
         }
+        leftAuxBtn.setPadding(px, px, px, px);
+        rightAuxBtn.setPadding(px, px, px, px);
     }
 
     /**
-     * Sets number keys text size.
+     * Sets number keys background.
      */
-    public void setNumberKeyTextSize(@Dimension int size) {
+    public void setNumberKeyBackground(@DrawableRes int background) {
         for (TextView key : numericKeys) {
-            key.setTextSize(TypedValue.COMPLEX_UNIT_PX, size);
+            key.setBackground(ContextCompat.getDrawable(getContext(), background));
         }
     }
 
@@ -213,16 +222,14 @@ private void initializeAttributes(AttributeSet attrs) {
                 throw new IllegalArgumentException("keyboardType attribute is required.");
             }
             // Get key sizes
-            keyWidth = array.getLayoutDimension(R.styleable.NumberKeyboard_keyWidth,
-                    dpToPx(DEFAULT_KEY_WIDTH_DP));
-            keyHeight = array.getLayoutDimension(R.styleable.NumberKeyboard_keyHeight,
-                    dpToPx(DEFAULT_KEY_HEIGHT_DP));
+            keyWidth = array.getLayoutDimension(R.styleable.NumberKeyboard_keyWidth, DEFAULT_KEY_WIDTH_DP);
+            keyHeight = array.getLayoutDimension(R.styleable.NumberKeyboard_keyHeight, DEFAULT_KEY_HEIGHT_DP);
+            // Get key padding
+            keyPadding = array.getDimensionPixelSize(R.styleable.NumberKeyboard_keyPadding,
+                    dpToPx(DEFAULT_KEY_PADDING_DP));
             // Get number key background
             numberKeyBackground = array.getResourceId(R.styleable.NumberKeyboard_numberKeyBackground,
                     R.drawable.key_bg);
-            // Get number key text size
-            numberKeyTextSize = array.getDimensionPixelSize(R.styleable.NumberKeyboard_numberKeyTextSize,
-                    spToPx(DEFAULT_KEY_TEXT_SIZE_SP));
             // Get number key text color
             numberKeyTextColor = array.getResourceId(R.styleable.NumberKeyboard_numberKeyTextColor,
                     R.drawable.key_text_color);
@@ -299,8 +306,8 @@ private void inflateView() {
     private void setStyles() {
         setKeyWidth(keyWidth);
         setKeyHeight(keyHeight);
+        setKeyPadding(keyPadding);
         setNumberKeyBackground(numberKeyBackground);
-        setNumberKeyTextSize(numberKeyTextSize);
         setNumberKeyTextColor(numberKeyTextColor);
         setLeftAuxButtonIcon(leftAuxBtnIcon);
         setLeftAuxButtonBackground(leftAuxBtnBackground);
@@ -350,11 +357,4 @@ public void onClick(View v) {
     public int dpToPx(float valueInDp) {
         return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, valueInDp, getResources().getDisplayMetrics());
     }
-
-    /**
-     * Utility method to convert sp to pixels.
-     */
-    public int spToPx(float valueInSp) {
-        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, valueInSp, getResources().getDisplayMetrics());
-    }
 }

lib/src/main/java/com/davidmiguel/numberkeyboard/NumberKeyboard.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * 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
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
+package com.davidmiguel.numberkeyboard;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+/**
+ * {@link android.widget.FrameLayout} which forces itself to be laid out as square.
+ * https://developer.android.com/samples/ActivitySceneTransitionBasic/src/com.example.android.activityscenetransitionbasic/SquareFrameLayout.html#l26
+ */
+public class SquareFrameLayout extends FrameLayout {
+
+    public SquareFrameLayout(Context context) {
+        super(context);
+    }
+
+    public SquareFrameLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SquareFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        final int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+        final int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+
+        if (widthSize == 0 && heightSize == 0) {
+            // If there are no constraints on size, let FrameLayout measure
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+            // Now use the smallest of the measured dimensions for both dimensions
+            final int minSize = Math.min(getMeasuredWidth(), getMeasuredHeight());
+            setMeasuredDimension(minSize, minSize);
+            return;
+        }
+
+        final int size;
+        if (widthSize == 0 || heightSize == 0) {
+            // If one of the dimensions has no restriction on size, set both dimensions to be the
+            // on that does
+            size = Math.max(widthSize, heightSize);
+        } else {
+            // Both dimensions have restrictions on size, set both dimensions to be the
+            // smallest of the two
+            size = Math.min(widthSize, heightSize);
+        }
+
+        final int newMeasureSpec = MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY);
+        super.onMeasure(newMeasureSpec, newMeasureSpec);
+    }
+}