FreePaint 1.2.0

.gitignore

@@ -1,6 +1,7 @@
 # Gradle files
 .gradle/
 build/
+gradle/
 
 # Local configuration file (sdk path, etc)
 local.properties

README.md

@@ -13,9 +13,9 @@ A vector graphics drawing app for Android.
 <a href="https://f-droid.org/en/packages/io.github.pastthepixels.freepaint/">Get it on F-Droid!</a>
 
 # Screenshots
-<img width="200px" src="https://github.com/pastthepixels/FreePaint/assets/52388215/665d393b-f937-4263-bac5-8cf5b0239257" />
-<img width="200px" src="https://github.com/pastthepixels/FreePaint/assets/52388215/58481eb2-5b47-4b1c-ab8c-16e4331d4df5" />
-
+<img width="200px" src="https://github.com/pastthepixels/FreePaint/assets/52388215/5cd2b656-bcc9-4091-85e0-d821fbe38c66" />
+<img width="200px" src="https://github.com/pastthepixels/FreePaint/assets/52388215/2619125c-024f-4a9b-bc1b-214baa09c638" />
+<img width="200px" src="https://github.com/pastthepixels/FreePaint/assets/52388215/93487b6f-5506-4cec-a07a-f4c71b6e20ad" />
 
 # FEATURING
 - Material Design 3 with dynamic colors
@@ -42,6 +42,5 @@ You can drag on that rectangle to move those paths, or draw on an empty space to
   with preferences
 
 # Potential future updates?
-- Automatically smoothing lines with Bezier curves
-- Layers!
-- Pen tool (like Illustrator/Inkscape!)
+- Layers
+- Pen tool (like Illustrator/Inkscape)

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "io.github.pastthepixels.freepaint"
         minSdk 24
         targetSdk 34
-        versionCode 4 // Change this when you want to make another version!!
-        versionName "1.1.0"
+        versionCode 5 // Change this when you want to make another version!!
+        versionName "1.2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -42,7 +42,7 @@ dependencies {
     implementation 'com.github.martin-stone:hsv-alpha-color-picker-android:3.0.1'
     implementation 'androidx.preference:preference:1.2.1'
     implementation 'com.takisoft.preferencex:preferencex:1.1.0'
-    implementation 'dev.romainguy:pathway:0.10.0'
+    implementation 'dev.romainguy:pathway:0.18.0'
     /* End custom modules */
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'

app/release/output-metadata.json

@@ -11,10 +11,27 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 4,
-      "versionName": "1.1.0",
+      "versionCode": 5,
+      "versionName": "1.2.0",
       "outputFile": "app-release.apk"
     }
   ],
-  "elementType": "File"
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/app-release.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/app-release.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 24
 }

app/src/main/AndroidManifest.xml

@@ -12,22 +12,17 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.FreePaint"
         android:name=".FreePaintApplication"
-        tools:targetApi="31">
+        tools:targetApi="34">
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize|uiMode"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/Theme.FreePaint">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-
 </manifest>

app/src/main/java/io/github/pastthepixels/freepaint/FreePaintApplication.java

@@ -10,4 +10,4 @@ public void onCreate() {
         super.onCreate();
         DynamicColors.applyToActivitiesIfAvailable(this);
     }
-}
+}

app/src/main/java/io/github/pastthepixels/freepaint/DrawAppearance.java → app/src/main/java/io/github/pastthepixels/freepaint/Graphics/DrawAppearance.java

@@ -1,4 +1,4 @@
-package io.github.pastthepixels.freepaint;
+package io.github.pastthepixels.freepaint.Graphics;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -12,15 +12,10 @@
 import java.util.Objects;
 
 public class DrawAppearance {
-    // Basic implementation of special FX
-    public enum EFFECTS {none, dashed}
-
     public EFFECTS effect = EFFECTS.none;
-
     public int stroke;
     public int fill;
     public int strokeSize = 5;
-
     // If this is set to true, stroke size is measured in dp instead of px
     public boolean useDP = false;
 
@@ -103,4 +98,7 @@ public void initialisePaint(Paint paint, float dpCorrection) {
     public DrawAppearance clone() {
         return new DrawAppearance(stroke, fill, strokeSize);
     }
+
+    // Basic implementation of special FX
+    public enum EFFECTS {none, dashed}
 }

app/src/main/java/io/github/pastthepixels/freepaint/DrawCanvas.java → app/src/main/java/io/github/pastthepixels/freepaint/Graphics/DrawCanvas.java

@@ -1,8 +1,9 @@
-package io.github.pastthepixels.freepaint;
+package io.github.pastthepixels.freepaint.Graphics;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -22,6 +23,7 @@
 import java.util.Objects;
 
 import io.github.pastthepixels.freepaint.File.SVG;
+import io.github.pastthepixels.freepaint.MainActivity;
 import io.github.pastthepixels.freepaint.Tools.EraserTool;
 import io.github.pastthepixels.freepaint.Tools.PaintTool;
 import io.github.pastthepixels.freepaint.Tools.PanTool;
@@ -30,34 +32,27 @@
 
 public final class DrawCanvas extends View {
 
-    private final PaintTool paintTool = new PaintTool(this);
-
-    private final EraserTool eraserTool = new EraserTool(this);
-
-    private final PanTool panTool = new PanTool(this);
-
-    private final SelectionTool selectionTool = new SelectionTool(this);
-
-    private final SVG svgHelper = new SVG(this);
-
     public final Paint paint = new Paint();
-
-    public LinkedList<DrawPath> paths = new LinkedList<>();
-
     // Stores previous "versions" of DrawCanvas.paths you can restore
     // You can move back and forth between this, but every time you create a new change
     // it removes everything after the current index (solving the grandfather paradox, btw)
     public final ArrayList<LinkedList<DrawPath>> versions = new ArrayList<>();
     public final int MAX_VERSIONS = 256;
-    private int version_index = -1;
-
-
     public final Point documentSize = new Point(0, 0);
-
+    private final PaintTool paintTool = new PaintTool(this);
+    private final EraserTool eraserTool = new EraserTool(this);
+    private final PanTool panTool = new PanTool(this);
+    private final SelectionTool selectionTool = new SelectionTool(this);
+    private final SVG svgHelper = new SVG(this);
+    public LinkedList<DrawPath> paths = new LinkedList<>();
     public int documentColor = Color.WHITE;
-
+    private int version_index = -1;
     private TOOLS tool = TOOLS.none;
 
+    // Drawing flags
+    // Draws only the document, without any tool paths, or any rotation/translation.
+    private boolean drawMinimal = false;
+
     /**
      * Constructor
      */
@@ -147,6 +142,9 @@ public void loadFile(Uri uri) throws IOException {
         editor.putString("documentWidth", String.format("%d", (int) documentSize.x));
         editor.putString("documentHeight", String.format("%d", (int) documentSize.y));
         editor.apply();
+        // Save everything in the version history
+        versions.add(cloneDrawPathList(paths));
+        version_index += 1;
     }
 
     /**
@@ -161,7 +159,7 @@ public boolean onTouchEvent(MotionEvent event) {
         if (tool == TOOLS.none || !Objects.requireNonNull(getTool()).onTouchEvent(event)) {
             return false;
         } else {
-            if(getTool().allowVersionBackup() && event.getAction() == MotionEvent.ACTION_UP) {
+            if (getTool().allowVersionBackup() && event.getAction() == MotionEvent.ACTION_UP) {
                 // Remove any edits after the current.
                 while (versions.size() > version_index + 1) {
                     versions.remove(versions.size() - 1);
@@ -181,12 +179,13 @@ public boolean onTouchEvent(MotionEvent event) {
      * (deep) Clones a list of DrawPaths.
      * TODO: Instead of making a new list, with pointers to the same DrawPaths, clone those DrawPaths (deep clone the list).
      *       This is so that if you erase a part of a path, and modify it, you can undo that.
+     *
      * @param listToClone The list you want to clone.
      * @return A deep cloned version of the list.
      */
     public LinkedList<DrawPath> cloneDrawPathList(LinkedList<DrawPath> listToClone) {
         LinkedList<DrawPath> list = new LinkedList<>();
-        for(DrawPath pathToClone : listToClone) {
+        for (DrawPath pathToClone : listToClone) {
             list.add(pathToClone.clone());
         }
         return list;
@@ -206,6 +205,8 @@ public void undo() {
         }
         // Force redraw
         postInvalidate();
+        // Re-initialise tools
+        if (tool == TOOLS.eraser) getTool().init();
     }
 
     /**
@@ -215,12 +216,26 @@ public void redo() {
         if (version_index < versions.size() - 1) {
             version_index += 1;
             paths = cloneDrawPathList(versions.get(version_index));
-        } else if (version_index <= 0) {
+        } else if (version_index <= 0 && !versions.isEmpty()) {
             version_index = 0;
             paths = cloneDrawPathList(versions.get(0));
         }
         // Force redraw
         postInvalidate();
+        // Re-initialise tools
+        if (tool == TOOLS.eraser) getTool().init();
+    }
+
+    /**
+     * Gets a bitmap from a DrawCanvas.
+     */
+    public Bitmap toBitmap() {
+        Bitmap bitmap = Bitmap.createBitmap((int) this.documentSize.x, (int) this.documentSize.y, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        this.drawMinimal = true;
+        this.draw(canvas);
+        this.drawMinimal = false;
+        return bitmap;
     }
 
     /**
@@ -303,27 +318,33 @@ protected void onDraw(@NonNull Canvas canvas) {
         // Draws things on the screen
         canvas.save();
         // SCALES, THEN TRANSLATES (translations are independent of scales)
-        canvas.scale(panTool.scaleFactor, panTool.scaleFactor);
-        canvas.translate(panTool.offset.x + panTool.panOffset.x, panTool.offset.y + panTool.panOffset.y);
+        if (!drawMinimal) {
+            canvas.scale(panTool.scaleFactor, panTool.scaleFactor);
+            canvas.translate(panTool.offset.x + panTool.panOffset.x, panTool.offset.y + panTool.panOffset.y);
+        }
         // Draws what the page will look like
         paint.setColor(documentColor);
         paint.setStyle(Paint.Style.FILL);
-        paint.setShadowLayer(12, 0, 0, Color.argb(200, 0, 0, 0));
+        if (!drawMinimal) {
+            paint.setShadowLayer(12, 0, 0, Color.argb(200, 0, 0, 0));
+        }
         canvas.drawRect(0, 0, documentSize.x, documentSize.y, paint);
         paint.reset();
         // Draws a stroke for the page
-        paint.setColor(Color.GRAY);
-        paint.setStrokeWidth(5 / panTool.scaleFactor); // Always five pixels no matter scale
-        paint.setStyle(Paint.Style.STROKE);
-        canvas.drawRect(0, 0, documentSize.x, documentSize.y, paint);
-        paint.reset();
+        if (!drawMinimal) {
+            paint.setColor(Color.GRAY);
+            paint.setStrokeWidth(5 / panTool.scaleFactor); // Always five pixels no matter scale
+            paint.setStyle(Paint.Style.STROKE);
+            canvas.drawRect(0, 0, documentSize.x, documentSize.y, paint);
+            paint.reset();
+        }
         // Draws every path, then tool path
         for (DrawPath path : paths) {
             paint.reset();
             path.draw(canvas, paint, screenDensity, getScaleFactor());
         }
-        if (getTool() != null && getTool().getToolPaths() != null) {
-            if(getTool() instanceof EraserTool) {
+        if (!drawMinimal && getTool() != null && getTool().getToolPaths() != null) {
+            if (getTool() instanceof EraserTool) {
                 paint.setARGB(150, 0, 0, 0);
                 paint.setStyle(Paint.Style.FILL);
                 canvas.drawPaint(paint);