Fix icon position.

Author: jpelczar

app/src/main/java/pl/sigmapoint/StartFragment.java

@@ -218,7 +218,7 @@ public void onClick(View v) {
 
     private void generate() {
         generatedCB = new CustomButton(getActivity(),
-                new ViewGroup.LayoutParams(300, 300),
+                new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 200),
                 bgColorNormalCB.getBackgroundColorNormal(),
                 txtColorNormalCB.getTextColorNormal(),
                 null);

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

@@ -13,7 +13,7 @@
 
     <FrameLayout
         android:id="@+id/generated_container"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true" />
 

library/src/main/java/pl/sigmapoint/customview/CustomButton.java

@@ -275,13 +275,18 @@ private void setContent() {
             int width = (drawablePosition % 2 == 0) ? 0 : ViewGroup.LayoutParams.MATCH_PARENT;
             int height = (drawablePosition % 2 == 0) ? ViewGroup.LayoutParams.MATCH_PARENT : 0;
             layoutParamsText = new LinearLayout.LayoutParams(width, height);
-            layoutParamsImage = new LayoutParams(0, ViewGroup.LayoutParams.MATCH_PARENT);
+            layoutParamsImage = new LayoutParams(width, height);
             layoutParamsText.weight = (text != null) ? ((textWeight == 0) ? 1 : textWeight) : 0;
             textWeight = (int) layoutParamsText.weight;
             if (imageWeight > 0) {
                 layoutParamsImage = new LinearLayout.LayoutParams(width, height);
                 layoutParamsImage.weight = imageWeight;
                 imageWeight = (int) layoutParamsImage.weight;
+            } else {
+                if (text == null) {
+                    layoutParamsImage.weight = imageWeight;
+                    imageWeight = (int) layoutParamsImage.weight;
+                }
             }
             textView.setLayoutParams(layoutParamsText);
             imageContainer.setLayoutParams(layoutParamsImage);
@@ -517,6 +522,12 @@ public void onGlobalLayout() {
                             else
                                 ((LayoutParams) textView.getLayoutParams()).leftMargin = layoutParams.width;
                         }
+                        if (text == null) {
+                            layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
+                            layoutParams.width = 0;
+                            layoutParams.weight = 1;
+                            imageWeight = 1;
+                        }
                     } else {
                         layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT;
                         layoutParams.height = 0;