PAINTROID-396 Multiline tool with movable intermediate points

change toolposition in grid
Catrobat · Sep 4, 2023 · 9f4fc6f · 9f4fc6f
1 parent f271ea5
commit 9f4fc6f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 20 deletions.
diff --git a/Paintroid/src/main/res/drawable/ic_pocketpaint_tool_dynamic_line.xml b/Paintroid/src/main/res/drawable/ic_pocketpaint_tool_dynamic_line.xml
@@ -1,10 +1,10 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+<vector
     android:height="24dp"
-    android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M109.91,720Q81,720 60.5,699.41Q40,678.82 40,649.91Q40,621 60.49,600.5Q80.99,580 109.77,580Q115,580 120,580.5Q125,581 133,583L333,383Q331,375 330.5,370Q330,365 330,359.77Q330,330.99 350.59,310.49Q371.18,290 400.09,290Q429,290 449.5,310.63Q470,331.27 470,360.24Q470,362 467,383L577,493Q585,491 590,490.5Q595,490 600,490Q605,490 610,490.5Q615,491 623,493L783,333Q781,325 780.5,320Q780,315 780,309.77Q780,280.99 800.59,260.49Q821.18,240 850.09,240Q879,240 899.5,260.59Q920,281.18 920,310.09Q920,339 899.51,359.5Q879.01,380 850.23,380Q845,380 840,379.5Q835,379 827,377L667,537Q669,545 669.5,550Q670,555 670,560.23Q670,589.01 649.41,609.51Q628.82,630 599.91,630Q571,630 550.5,609.51Q530,589.01 530,560.23Q530,555 530.5,550Q531,545 533,537L423,427Q415,429 410,429.5Q405,430 399.75,430Q398,430 377,427L177,627Q179,635 179.5,640Q180,645 180,650.23Q180,679.01 159.41,699.51Q138.82,720 109.91,720Z"/>
+    android:viewportWidth="960"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M109.91,720Q81,720 60.5,699.41 40,678.82 40,649.91 40,621 60.49,600.5t49.27,-20.5q5.23,0 10.23,0.5 5,0.5 13,2.5l200,-200q-2,-8 -2.5,-13t-0.5,-10.23q0,-28.78 20.59,-49.27Q371.18,290 400.09,290 429,290 449.5,310.63t20.5,49.61Q470,362 467,383l110,110q8,-2 13,-2.5t10,-0.5q5,0 10,0.5t13,2.5l160,-160q-2,-8 -2.5,-13t-0.5,-10.23q0,-28.78 20.59,-49.27Q821.18,240 850.09,240 879,240 899.5,260.59q20.5,20.59 20.5,49.5Q920,339 899.51,359.5T850.23,380Q845,380 840,379.5q-5,-0.5 -13,-2.5L667,537q2,8 2.5,13t0.5,10.23q0,28.78 -20.59,49.27Q628.82,630 599.91,630 571,630 550.5,609.51T530,560.23q0,-5.23 0.5,-10.23 0.5,-5 2.5,-13L423,427q-8,2 -13,2.5t-10.25,0.5q-1.75,0 -22.75,-3L177,627q2,8 2.5,13t0.5,10.23q0,28.78 -20.59,49.27Q138.82,720 109.91,720Z"/>
 </vector>
diff --git a/Paintroid/src/main/res/layout/pocketpaint_layout_bottom_bar.xml b/Paintroid/src/main/res/layout/pocketpaint_layout_bottom_bar.xml
@@ -79,19 +79,6 @@
                 style="@style/PocketPaintToolSelectionButtonTextView"
                 android:text="@string/button_line"/>
         </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/pocketpaint_tools_dynamic_line"
-            tools:ignore="UseCompoundDrawables"
-            style="@style/PocketPaintToolSelectionButton">
-            <ImageView
-                style="@style/PocketPaintToolSelectionButtonImageView"
-                android:src="@drawable/ic_pocketpaint_tool_dynamic_line"
-                android:contentDescription="@string/button_dynamic_line"/>
-            <TextView
-                style="@style/PocketPaintToolSelectionButtonTextView"
-                android:text="@string/button_dynamic_line"/>
-        </LinearLayout>
     </TableRow>
 
     <TableRow
@@ -261,4 +248,22 @@
                 android:text="@string/button_clip"/>
         </LinearLayout>
     </TableRow>
+
+    <TableRow
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp">
+
+        <LinearLayout
+            android:id="@+id/pocketpaint_tools_dynamic_line"
+            tools:ignore="UseCompoundDrawables"
+            style="@style/PocketPaintToolSelectionButton">
+            <ImageView
+                style="@style/PocketPaintToolSelectionButtonImageView"
+                android:src="@drawable/ic_pocketpaint_tool_dynamic_line"
+                android:contentDescription="@string/button_dynamic_line"/>
+            <TextView
+                style="@style/PocketPaintToolSelectionButtonTextView"
+                android:text="@string/button_dynamic_line"/>
+        </LinearLayout>
+    </TableRow>
 </TableLayout>