aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarvin Borner2018-09-03 20:03:40 +0200
committerMarvin Borner2018-09-03 20:03:40 +0200
commit5189137f51e08a2d83f5ecf9ae9739c7366ff8a1 (patch)
tree94660c378051db722498de57cee394f93bdc6eee
parentaecf0b00f315847459f7ff100e050bacff604b47 (diff)
Began adding tex feature for photos :sparkles: :lipstick:
-rw-r--r--app/src/main/res/drawable/ic_text_fields_white_24dp.xml10
-rw-r--r--app/src/main/res/layout/activity_photo_editor.xml58
2 files changed, 44 insertions, 24 deletions
diff --git a/app/src/main/res/drawable/ic_text_fields_white_24dp.xml b/app/src/main/res/drawable/ic_text_fields_white_24dp.xml
new file mode 100644
index 0000000..3baa101
--- /dev/null
+++ b/app/src/main/res/drawable/ic_text_fields_white_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:tint="#FFFFFF"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M2.5,4v3h5v12h3L10.5,7h5L15.5,4h-13zM21.5,9h-9v3h3v7h3v-7h3L21.5,9z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_photo_editor.xml b/app/src/main/res/layout/activity_photo_editor.xml
index 1128e90..2217663 100644
--- a/app/src/main/res/layout/activity_photo_editor.xml
+++ b/app/src/main/res/layout/activity_photo_editor.xml
@@ -32,30 +32,6 @@
app:srcCompat="@drawable/ic_send_black_24dp" />
<Button
- android:id="@+id/photoDrawButton"
- android:layout_width="30dp"
- android:layout_height="30dp"
- android:layout_marginEnd="24dp"
- android:layout_marginTop="24dp"
- android:background="@drawable/ic_mode_edit_white_24dp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <com.rtugeek.android.colorseekbar.ColorSeekBar
- android:id="@+id/drawColorSeekbar"
- android:layout_width="38dp"
- android:layout_height="300dp"
- android:layout_marginEnd="28dp"
- android:layout_marginTop="24dp"
- android:visibility="gone"
- app:barHeight="15dp"
- app:colorSeeds="@array/material_colors"
- app:isVertical="true"
- app:layout_constraintEnd_toEndOf="@+id/imageEditor"
- app:layout_constraintTop_toBottomOf="@+id/photoDrawButton"
- app:thumbHeight="40dp" />
-
- <Button
android:id="@+id/undoButton"
android:layout_width="30dp"
android:layout_height="30dp"
@@ -79,4 +55,38 @@
app:layout_constraintStart_toEndOf="@+id/undoButton"
app:layout_constraintTop_toTopOf="parent" />
+ <Button
+ android:id="@+id/drawButton"
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:layout_marginEnd="24dp"
+ android:layout_marginTop="24dp"
+ android:background="@drawable/ic_mode_edit_white_24dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <Button
+ android:id="@+id/typeButton"
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:layout_marginEnd="16dp"
+ android:layout_marginTop="24dp"
+ android:background="@drawable/ic_text_fields_white_24dp"
+ app:layout_constraintEnd_toStartOf="@+id/drawButton"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <com.rtugeek.android.colorseekbar.ColorSeekBar
+ android:id="@+id/colorSeekbar"
+ android:layout_width="38dp"
+ android:layout_height="300dp"
+ android:layout_marginEnd="28dp"
+ android:layout_marginTop="24dp"
+ android:visibility="gone"
+ app:barHeight="15dp"
+ app:colorSeeds="@array/material_colors"
+ app:isVertical="true"
+ app:layout_constraintEnd_toEndOf="@+id/imageEditor"
+ app:layout_constraintTop_toBottomOf="@+id/drawButton"
+ app:thumbHeight="40dp" />
+
</android.support.constraint.ConstraintLayout> \ No newline at end of file