From ce38abf7f8889c69ffb6345980894fc9e35f83e9 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 14 Nov 2021 10:42:00 +0100
Subject: [PATCH] use square colorpicker

---
 app/build.gradle                                      |  2 +-
 .../draw/pro/activities/MainActivity.kt               |  3 ++-
 app/src/main/res/layout/dialog_save_image.xml         | 11 ++---------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8ca0d7e..85ba9d0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,6 +56,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:2f86d76a56'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:a82ec0a6f3'
     implementation "androidx.print:print:1.0.0"
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt
index 368ea0c..e68cd2d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt
@@ -13,6 +13,7 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.WindowManager
 import android.webkit.MimeTypeMap
+import android.widget.ImageView
 import android.widget.SeekBar
 import androidx.print.PrintHelper
 import com.simplemobiletools.commons.dialogs.ColorPickerDialog
@@ -502,7 +503,7 @@ class MainActivity : SimpleActivity(), CanvasListener {
 
     private fun setColor(pickedColor: Int) {
         color = pickedColor
-        color_picker.setFillWithStroke(color, config.canvasBackgroundColor.getContrastColor())
+        color_picker.setFillWithStroke(color, config.canvasBackgroundColor.getContrastColor(), true)
         my_canvas.setColor(color)
         isEraserOn = false
         updateEraserState()
diff --git a/app/src/main/res/layout/dialog_save_image.xml b/app/src/main/res/layout/dialog_save_image.xml
index 02d3824..22abccf 100644
--- a/app/src/main/res/layout/dialog_save_image.xml
+++ b/app/src/main/res/layout/dialog_save_image.xml
@@ -18,6 +18,7 @@
             android:id="@+id/save_image_path_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingStart="@dimen/small_margin"
             android:text="@string/path"
             android:textSize="@dimen/smaller_text_size" />
 
@@ -25,23 +26,15 @@
             android:id="@+id/save_image_path"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingStart="@dimen/medium_margin"
+            android:paddingStart="@dimen/small_margin"
             android:paddingTop="@dimen/small_margin"
             android:paddingEnd="@dimen/small_margin"
             android:paddingBottom="@dimen/activity_margin" />
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/save_image_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/filename"
-            android:textSize="@dimen/smaller_text_size" />
-
         <com.simplemobiletools.commons.views.MyEditText
             android:id="@+id/save_image_filename"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/small_margin"
             android:layout_marginBottom="@dimen/activity_margin"
             android:singleLine="true"
             android:textCursorDrawable="@null"