Fixing padding for icon

Author: SWRHARD

app/build.gradle

@@ -24,7 +24,7 @@ dependencies {
     implementation project(':appcompaticonbuttonlibrary')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }

app/src/main/res/layout/activity_main.xml

@@ -8,13 +8,18 @@
     tools:context=".MainActivity">
 
     <com.swrmedia.appcompaticonbuttonlibrary.AppCompatIconButton
+        android:id="@+id/btn_proceed"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/colorAccent"
+        android:layout_height="50dp"
+        android:background="#000000"
         android:gravity="center"
-        android:text="@string/app_name"
-        android:textColor="@android:color/white"
-        app:ib_iconAlign="left_of_title"
-        app:ib_iconSrc="@android:drawable/ic_lock_idle_alarm"
+        android:text="Продолжить"
+        android:textColor="#ffffff"
+        app:ib_iconPadding="25dp"
+        app:ib_iconSrc="@drawable/abc_vector_test"
+        app:ib_iconAlign="right"
         app:ib_textAllCaps="true" />
+
+
+
 </LinearLayout>

appcompaticonbuttonlibrary/build.gradle

@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 2
-        versionName "1.0.1"
+        versionCode 1
+        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -28,7 +28,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }

appcompaticonbuttonlibrary/src/main/java/com/swrmedia/appcompaticonbuttonlibrary/AppCompatIconButton.java

@@ -76,6 +76,35 @@ private void applyStyles(Context context, @Nullable AttributeSet attrs, int defS
         typedArray.recycle();
     }
 
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int desiredWidth = getPaddingLeft() + getPaddingRight();
+        int desiredHeight = getPaddingTop() + getPaddingBottom();
+
+        int measuredHeight = measureDimension(desiredHeight, heightMeasureSpec);
+        float textWidth = getPaint().measureText((String) getText());
+
+        if (drawableId != 0) {
+            desiredWidth += textWidth + iconSize + iconPadding;
+        }
+        int measuredWidth = measureDimension(desiredWidth, widthMeasureSpec);
+        setMeasuredDimension(measuredWidth, measuredHeight);
+    }
+
+    private int measureDimension(int contentSize, int measureSpec) {
+        int mode = MeasureSpec.getMode(measureSpec);
+        int specSize = MeasureSpec.getSize(measureSpec);
+        switch (mode) {
+            case MeasureSpec.EXACTLY:
+                return specSize;
+            case MeasureSpec.AT_MOST:
+                return Math.min(contentSize, specSize);
+            default:
+                return contentSize;
+        }
+    }
+
     @Override
     protected void onDraw(Canvas canvas) {
         canvas.save();
@@ -88,13 +117,13 @@ protected void onDraw(Canvas canvas) {
 
         if (icon != null) {
             float textWidth = getPaint().measureText((String) getText());
-            int left = 0;
+            int left = iconPadding;
             if (direction == Align.left_of_text) {
                 left = (int) ((getWidth() / 2f) - (textWidth / 2f) - iconSize - iconPadding);
             } else if (direction == Align.right_of_text) {
                 left = (int) ((getWidth() / 2f) + (textWidth / 2f) + dx + iconPadding);
             } else if (direction == Align.right) {
-                left = getWidth() - iconSize;
+                left = getWidth() - iconSize - iconPadding;
             }
             int top = getHeight() / 2 - iconSize / 2;
 

sh.exe.stackdump

@@ -0,0 +1,11 @@
+Stack trace:
+Frame        Function    Args
+00000010000  0018006137E (0018025BEB0, 0018024E199, 00000010000, 000FFFFBA00)
+00000010000  00180049229 (00100002000, 00000000002, 00000000002, 00180339570)
+00000010000  00180049262 (00000000002, 00180339880, 00000010000, 00000000008)
+00000010000  0018005A9EC (00000000000, 0018024E48F, 0018004A6FE, 635C655C785C655C)
+000FFFFCCD0  0018005AA90 (745C685C275C205C, 3A5C735C705C745C, 695C675C2F5C2F5C, 625C755C685C745C)
+000FFFFCCD0  001800499EC (00000000000, 00000000000, 00000000000, 00000000000)
+00000000000  00180048343 (00000000000, 00000000000, 00000000000, 00000000000)
+000FFFFFFF0  001800483F4 (00000000000, 00000000000, 00000000000, 00000000000)
+End of stack trace