Merge pull request #9 from CactiChameleon9/master

Add a relative brush size option

Author: naveensingh

app/src/main/kotlin/org/fossify/paint/activities/MainActivity.kt

@@ -170,6 +170,7 @@ class MainActivity : SimpleActivity(), CanvasListener {
             strokeWidthBar.beVisibleIf(isShowBrushSizeEnabled)
             strokeWidthPreview.beVisibleIf(isShowBrushSizeEnabled)
             myCanvas.setAllowZooming(config.allowZoomingCanvas)
+            myCanvas.setRelativeBrushSize(config.relativeBrushSize)
             updateTextColors(mainHolder)
             if (isBlackAndWhiteTheme()) {
                 strokeWidthBar.setColors(0, config.canvasBackgroundColor.getContrastColor(), 0)

app/src/main/kotlin/org/fossify/paint/activities/SettingsActivity.kt

@@ -40,6 +40,7 @@ class SettingsActivity : SimpleActivity() {
         setupPreventPhoneFromSleeping()
         setupBrushSize()
         setupAllowZoomingCanvas()
+        setupRelativeBrushSize()
         setupForcePortraitMode()
         updateTextColors(binding.settingsHolder)
 
@@ -109,6 +110,16 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
+    private fun setupRelativeBrushSize() {
+        binding.apply {
+            settingsRelativeBrushSize.isChecked = config.relativeBrushSize
+            settingsRelativeBrushSizeHolder.setOnClickListener {
+                settingsRelativeBrushSize.toggle()
+                config.relativeBrushSize = settingsRelativeBrushSize.isChecked
+            }
+        }
+    }
+
     private fun setupForcePortraitMode() {
         binding.apply {
             settingsForcePortrait.isChecked = config.forcePortraitMode

app/src/main/kotlin/org/fossify/paint/helpers/Config.kt

@@ -41,6 +41,11 @@ class Config(context: Context) : BaseConfig(context) {
         set(allowZoomingCanvas) = prefs.edit().putBoolean(ALLOW_ZOOMING_CANVAS, allowZoomingCanvas)
             .apply()
 
+    var relativeBrushSize: Boolean
+        get() = prefs.getBoolean(RELATIVE_BRUSH_SIZE, true)
+        set(relativeBrushSize) = prefs.edit().putBoolean(RELATIVE_BRUSH_SIZE, relativeBrushSize)
+            .apply()
+
     var forcePortraitMode: Boolean
         get() = prefs.getBoolean(FORCE_PORTRAIT_MODE, false)
         set(forcePortraitMode) = prefs.edit().putBoolean(FORCE_PORTRAIT_MODE, forcePortraitMode)

app/src/main/kotlin/org/fossify/paint/helpers/Constants.kt

@@ -7,6 +7,7 @@ const val BRUSH_SIZE = "brush_size_2"
 const val LAST_SAVE_FOLDER = "last_save_folder"
 const val LAST_SAVE_EXTENSION = "last_save_extension"
 const val ALLOW_ZOOMING_CANVAS = "allow_zooming_canvas"
+const val RELATIVE_BRUSH_SIZE = "relative_brush_size"
 const val FORCE_PORTRAIT_MODE = "force_portrait_mode"
 
 const val PNG = "png"

app/src/main/kotlin/org/fossify/paint/views/MyCanvas.kt

@@ -63,6 +63,7 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
     private var mCurrBrushSize = 0f
     private var mAllowMovingZooming = true
     private var mIsEraserOn = false
+    private var mRelativeBrushSize = true
     private var mIsBucketFillOn = false
     private var mWasMultitouch = false
     private var mIgnoreTouches = false
@@ -291,13 +292,21 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
 
     fun setBrushSize(newBrushSize: Float) {
         mCurrBrushSize = newBrushSize
-        mPaintOptions.strokeWidth = resources.getDimension(R.dimen.full_brush_size) * (mCurrBrushSize / mScaleFactor / 100f)
+        mPaintOptions.strokeWidth = resources.getDimension(R.dimen.full_brush_size) * (mCurrBrushSize / 100f)
+        if (mRelativeBrushSize) {
+            mPaintOptions.strokeWidth /= mScaleFactor
+        }
     }
 
     fun setAllowZooming(allowZooming: Boolean) {
         mAllowMovingZooming = allowZooming
     }
 
+    fun setRelativeBrushSize(relativeBrushSize: Boolean) {
+        mRelativeBrushSize = relativeBrushSize
+        setBrushSize(mCurrBrushSize)
+    }
+
     fun getBitmap(): Bitmap {
         val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
         val canvas = Canvas(bitmap)

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

@@ -146,6 +146,21 @@
 
             </RelativeLayout>
 
+            <RelativeLayout
+                android:id="@+id/settings_relative_brush_size_holder"
+                style="@style/SettingsHolderCheckboxStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <org.fossify.commons.views.MyMaterialSwitch
+                    android:id="@+id/settings_relative_brush_size"
+                    style="@style/SettingsSwitchStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/use_relative_brush_size" />
+
+            </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/settings_force_portrait_holder"
                 style="@style/SettingsHolderSwitchStyle"

app/src/main/res/values/strings.xml

@@ -10,6 +10,7 @@
     <!-- Settings -->
     <string name="show_brush_size">Show brush size tool</string>
     <string name="allow_zooming_moving_canvas">Allow zooming and moving the canvas with gestures</string>
+    <string name="use_relative_brush_size">Adjust brush size based on zoom level</string>
     <string name="clear">Clear</string>
     <string name="change_background_color">Change background color</string>
     <!--