Make view match width and height values if any of the two is set as W…

…RAP_CONTENT (FIX)!
slaviboy · Apr 11, 2020 · 6d08d5c · 6d08d5c
1 parent e96990a
commit 6d08d5c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/app/src/main/res/layout/color_picker_hsv_rectangular.xml b/app/src/main/res/layout/color_picker_hsv_rectangular.xml
@@ -26,9 +26,8 @@
  <com.slaviboy.colorpicker.windows.rectangular.RectangularSV
  android:id="@+id/rectangularSV"
  android:layout_width="0dp"
- android:layout_height="0dp"
+ android:layout_height="wrap_content"
  app:corner_radius="0.05vh"
- app:layout_constraintBottom_toBottomOf="@+id/guideline_windows_texts"
  app:layout_constraintLeft_toLeftOf="parent"
  app:layout_constraintRight_toRightOf="@+id/guideline_sv_h"
  app:layout_constraintTop_toTopOf="parent"
@@ -41,10 +40,10 @@
  android:layout_height="0dp"
  android:layout_marginRight="5dp"
  app:corner_radius="0.05vh"
- app:layout_constraintBottom_toBottomOf="@+id/guideline_windows_texts"
+ app:layout_constraintBottom_toBottomOf="@+id/rectangularSV"
  app:layout_constraintLeft_toLeftOf="@+id/guideline_sv_h"
  app:layout_constraintRight_toRightOf="@+id/guideline_h_a"
- app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/rectangularSV"
  app:selector_radius="0.06vh"
  app:selector_stroke_width="0.03vh"
  app:type="vertical" />
@@ -56,10 +55,10 @@
  android:layout_centerVertical="true"
  android:layout_marginRight="5dp"
  app:corner_radius="0.05vh"
- app:layout_constraintBottom_toBottomOf="@+id/guideline_windows_texts"
+ app:layout_constraintBottom_toBottomOf="@+id/rectangularSV"
  app:layout_constraintLeft_toLeftOf="@+id/guideline_h_a"
  app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/rectangularSV"
  app:selector_radius="0.06vh"
  app:selector_stroke_width="0.03vh"
  app:type="vertical" />

diff --git a/colorpicker/src/main/java/com/slaviboy/colorpicker/window/Base.kt b/colorpicker/src/main/java/com/slaviboy/colorpicker/window/Base.kt
@@ -150,20 +150,14 @@ abstract class Base : View {
  layoutParams.width = newWidth
  layoutParams.height = newHeight
  layoutParams = layoutParams
-
- // call since the layout params are changed
- this.afterMeasured {
- afterMeasuredInit()
- }
- } else {
- afterMeasuredInit()
  }
- }
 
- fun afterMeasuredInit() {
- onInitBase()
- update()
- onRedraw()
+ // since change is made measure again and initialize
+ this.afterMeasured {
+ onInitBase()
+ update()
+ onRedraw()
+ }
  }
 
  /**