aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/activity_photo_editor.xml14
-rw-r--r--app/src/main/res/layout/fragment_emoji_selector.xml14
2 files changed, 28 insertions, 0 deletions
diff --git a/app/src/main/res/layout/activity_photo_editor.xml b/app/src/main/res/layout/activity_photo_editor.xml
index 4c848da..fa00abe 100644
--- a/app/src/main/res/layout/activity_photo_editor.xml
+++ b/app/src/main/res/layout/activity_photo_editor.xml
@@ -66,6 +66,16 @@
app:layout_constraintTop_toTopOf="parent" />
<Button
+ android:id="@+id/button_emoji"
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:layout_marginEnd="16dp"
+ android:layout_marginTop="24dp"
+ android:background="@drawable/btn_emoji"
+ app:layout_constraintEnd_toStartOf="@+id/button_type"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <Button
android:id="@+id/button_type"
android:layout_width="30dp"
android:layout_height="30dp"
@@ -104,4 +114,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
+ <FrameLayout
+ android:id="@+id/fragment_emoji_selector"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
</android.support.constraint.ConstraintLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_emoji_selector.xml b/app/src/main/res/layout/fragment_emoji_selector.xml
new file mode 100644
index 0000000..3c49fbf
--- /dev/null
+++ b/app/src/main/res/layout/fragment_emoji_selector.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".EmojiSelectorFragment">
+
+ <!-- TODO: Update blank fragment layout -->
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:text="@string/hello_blank_fragment" />
+
+</FrameLayout> \ No newline at end of file