Began emoji selector fragment :sparkles: :construction:

7 files changed, 97 insertions, 1 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 12968d5..8242035 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,7 +39,8 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.anko:anko-commons:0.10.5" // Anko
     implementation "org.jetbrains.anko:anko-design:0.10.5" // Anko
-    implementation group: 'org.eclipse.mylyn.github', name: 'org.eclipse.egit.github.core', version: '2.1.5' // Github
+    implementation group: 'org.eclipse.mylyn.github', name: 'org.eclipse.egit.github.core', version: '2.1.5'
+    // Github
 
     /*
         General Android
diff --git a/app/src/main/java/me/texx/Texx/EmojiSelectorFragment.kt b/app/src/main/java/me/texx/Texx/EmojiSelectorFragment.kt
new file mode 100644
index 0000000..1cb13d9
--- /dev/null
+++ b/app/src/main/java/me/texx/Texx/EmojiSelectorFragment.kt
@@ -0,0 +1,43 @@
+package me.texx.Texx
+
+import android.content.Context
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+
+class EmojiSelectorFragment : Fragment() {
+    private var listener: OnFragmentInteractionListener? = null
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_emoji_selector, container, false)
+    }
+
+    fun onButtonPressed(test: String) {
+        listener?.onEmojiSelection(test)
+    }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        if (context is OnFragmentInteractionListener) {
+            listener = context
+        } else {
+            throw RuntimeException(context.toString() + " must implement OnFragmentInteractionListener")
+        }
+    }
+
+    override fun onDetach() {
+        super.onDetach()
+        listener = null
+    }
+
+    interface OnFragmentInteractionListener {
+        fun onEmojiSelection(test: String)
+    }
+
+    companion object {
+        fun newInstance() =
+                EmojiSelectorFragment().apply {}
+    }
+}
diff --git a/app/src/main/java/me/texx/Texx/PhotoEditorActivity.kt b/app/src/main/java/me/texx/Texx/PhotoEditorActivity.kt
index 1dd39c9..7aa9b07 100644
--- a/app/src/main/java/me/texx/Texx/PhotoEditorActivity.kt
+++ b/app/src/main/java/me/texx/Texx/PhotoEditorActivity.kt
@@ -70,6 +70,9 @@ class PhotoEditorActivity : AppCompatActivity() {
         // draw button
         button_draw.setOnClickListener { toggleDrawing() }
 
+        // emoji button
+        button_emoji.setOnClickListener { toggleEmojiMenu() }
+
         // type button
         button_type.setOnClickListener { toggleTextEditing("") }
 
@@ -93,6 +96,14 @@ class PhotoEditorActivity : AppCompatActivity() {
         })
     }
 
+    private fun toggleEmojiMenu() {
+
+    }
+
+    fun onEmojiSelection() {
+
+    }
+
     private fun toggleDrawing() {
         currentlyDrawing = !currentlyDrawing
         photoEditor.setBrushDrawingMode(currentlyDrawing)
diff --git a/app/src/main/res/drawable/btn_emoji.xml b/app/src/main/res/drawable/btn_emoji.xml
new file mode 100644
index 0000000..96d6cac
--- /dev/null
+++ b/app/src/main/res/drawable/btn_emoji.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="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM15.5,11c0.83,0 1.5,-0.67 1.5,-1.5S16.33,8 15.5,8 14,8.67 14,9.5s0.67,1.5 1.5,1.5zM8.5,11c0.83,0 1.5,-0.67 1.5,-1.5S9.33,8 8.5,8 7,8.67 7,9.5 7.67,11 8.5,11zM12,17.5c2.33,0 4.31,-1.46 5.11,-3.5L6.89,14c0.8,2.04 2.78,3.5 5.11,3.5z" />
+</vector>
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
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 573d20a..23030bc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,6 +33,9 @@
     <string name="bug_report_edit_title_hint">Title</string>
     <string name="bug_report_edit_description">Describe your issue</string>
 
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+
     <!--<string name="pref_title_add_friends_to_messages">Add friends to messages</string>
     <string-array name="pref_example_list_titles">
         <item>Always</item>