From 4b5864e9ab26ab5ed7bf59f631f1221ceb025a43 Mon Sep 17 00:00:00 2001
From: physphil <physphil@gmail.com>
Date: Sun, 17 Jun 2018 14:59:12 -0400
Subject: [PATCH 1/7] Version bump

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3bf0d93..687d4ba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.physphil.android.remindme"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 9000
-        versionName "0.9"
+        versionCode 9020
+        versionName "0.9.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

From 7058163d2af9f688ad489d32597eb50fd3cae82f Mon Sep 17 00:00:00 2001
From: Phil Shadlyn <phil.shadlyn@shopify.com>
Date: Sun, 19 Aug 2018 11:51:20 -0400
Subject: [PATCH 2/7] WIP - create view for ReminderEntryField

---
 .../remindme/reminders/ReminderActivity.kt    | 33 ++++-----
 .../reminders/list/ReminderListAdapter.kt     |  4 +-
 .../android/remindme/ui/ProgressSpinner.kt    |  2 +-
 .../android/remindme/ui/ReminderEntryField.kt | 59 ++++++++++++++++
 app/src/main/res/layout/activity_reminder.xml | 67 +++++--------------
 ...list.xml => view_header_reminder_list.xml} |  0
 ..._spinner.xml => view_progress_spinner.xml} |  0
 .../main/res/layout/view_reminder_entry.xml   | 37 ++++++++++
 ...er_list.xml => view_row_reminder_list.xml} |  0
 app/src/main/res/values/attrs.xml             |  5 ++
 app/src/main/res/values/dimen.xml             |  2 +-
 app/src/main/res/values/styles.xml            |  1 -
 12 files changed, 137 insertions(+), 73 deletions(-)
 create mode 100644 app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryField.kt
 rename app/src/main/res/layout/{header_reminder_list.xml => view_header_reminder_list.xml} (100%)
 rename app/src/main/res/layout/{progress_spinner.xml => view_progress_spinner.xml} (100%)
 create mode 100644 app/src/main/res/layout/view_reminder_entry.xml
 rename app/src/main/res/layout/{row_reminder_list.xml => view_row_reminder_list.xml} (100%)

diff --git a/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt b/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt
index e1623d7..1c2790f 100644
--- a/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt
+++ b/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt
@@ -12,7 +12,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.widget.Button
 import android.widget.DatePicker
-import android.widget.EditText
 import android.widget.TextView
 import android.widget.TimePicker
 import butterknife.BindView
@@ -24,6 +23,7 @@ import com.physphil.android.remindme.R
 import com.physphil.android.remindme.RemindMeApplication
 import com.physphil.android.remindme.models.Recurrence
 import com.physphil.android.remindme.reminders.list.DeleteReminderDialogFragment
+import com.physphil.android.remindme.ui.ReminderEntryField
 import com.physphil.android.remindme.util.getDisplayDate
 import com.physphil.android.remindme.util.getDisplayTime
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -40,11 +40,11 @@ class ReminderActivity : BaseActivity(), TimePickerDialog.OnTimeSetListener,
         DatePickerDialog.OnDateSetListener, RecurrencePickerDialog.OnRecurrenceSetListener,
         DeleteReminderDialogFragment.Listener {
 
-    @BindView(R.id.reminder_title_text)
-    lateinit var titleText: EditText
+    @BindView(R.id.reminder_title_title)
+    lateinit var title: ReminderEntryField
 
-    @BindView(R.id.reminder_body_text)
-    lateinit var bodyText: EditText
+    @BindView(R.id.reminder_body)
+    lateinit var body: ReminderEntryField
 
     @BindView(R.id.reminder_time_btn)
     lateinit var timeText: Button
@@ -86,9 +86,9 @@ class ReminderActivity : BaseActivity(), TimePickerDialog.OnTimeSetListener,
                 .subscribe({
                     // on success. Save Reminder in viewmodel and update UI
                     viewModel.reminder = it
-                    titleText.setText(it.title, TextView.BufferType.EDITABLE)
-                    titleText.setSelection(it.title.length)
-                    bodyText.setText(it.body, TextView.BufferType.EDITABLE)
+                    title.text.setText(it.title, TextView.BufferType.EDITABLE)
+                    title.text.setSelection(it.title.length)
+                    body.text.setText(it.body, TextView.BufferType.EDITABLE)
                     timeText.text = it.getDisplayTime(this)
                     dateText.text = it.getDisplayDate(this)
                     repeatText.setText(it.recurrence.displayString)
@@ -108,15 +108,16 @@ class ReminderActivity : BaseActivity(), TimePickerDialog.OnTimeSetListener,
         viewModel.closeActivityEvent.observe(this, Observer { finish() })
     }
 
-    @OnTextChanged(R.id.reminder_title_text)
-    fun onTitleChanged(text: CharSequence) {
-        viewModel.updateTitle(text.toString())
-    }
+    //todo - Move all these listeners to class of resepctive views
+//    @OnTextChanged(R.id.reminder_title_text)
+//    fun onTitleChanged(text: CharSequence) {
+//        viewModel.updateTitle(text.toString())
+//    }
 
-    @OnTextChanged(R.id.reminder_body_text)
-    fun onBodyChanged(text: CharSequence) {
-        viewModel.updateBody(text.toString())
-    }
+//    @OnTextChanged(R.id.reminder_body_text)
+//    fun onBodyChanged(text: CharSequence) {
+//        viewModel.updateBody(text.toString())
+//    }
 
     @OnClick(R.id.reminder_time_btn, R.id.reminder_time_icon)
     fun onTimeClicked() {
diff --git a/app/src/main/java/com/physphil/android/remindme/reminders/list/ReminderListAdapter.kt b/app/src/main/java/com/physphil/android/remindme/reminders/list/ReminderListAdapter.kt
index 844e7cb..9ad3296 100644
--- a/app/src/main/java/com/physphil/android/remindme/reminders/list/ReminderListAdapter.kt
+++ b/app/src/main/java/com/physphil/android/remindme/reminders/list/ReminderListAdapter.kt
@@ -76,11 +76,11 @@ class ReminderListAdapter : RecyclerView.Adapter<ReminderListAdapter.ViewHolder>
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         return if (viewType == VIEW_TYPE_HEADER) {
-            val view = LayoutInflater.from(parent.context).inflate(R.layout.header_reminder_list, parent, false)
+            val view = LayoutInflater.from(parent.context).inflate(R.layout.view_header_reminder_list, parent, false)
             HeaderViewHolder(view)
         }
         else {
-            val view = LayoutInflater.from(parent.context).inflate(R.layout.row_reminder_list, parent, false)
+            val view = LayoutInflater.from(parent.context).inflate(R.layout.view_row_reminder_list, parent, false)
             ReminderViewHolder(view)
         }
     }
diff --git a/app/src/main/java/com/physphil/android/remindme/ui/ProgressSpinner.kt b/app/src/main/java/com/physphil/android/remindme/ui/ProgressSpinner.kt
index ad0616c..0b584e6 100644
--- a/app/src/main/java/com/physphil/android/remindme/ui/ProgressSpinner.kt
+++ b/app/src/main/java/com/physphil/android/remindme/ui/ProgressSpinner.kt
@@ -17,7 +17,7 @@ class ProgressSpinner : ConstraintLayout {
     constructor(context: Context) : this(context, null)
     constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
     constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
-        val view = inflate(context, R.layout.progress_spinner, this)
+        val view = inflate(context, R.layout.view_progress_spinner, this)
         ButterKnife.bind(this, view)
 
         attrs?.let {
diff --git a/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryField.kt b/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryField.kt
new file mode 100644
index 0000000..820327e
--- /dev/null
+++ b/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryField.kt
@@ -0,0 +1,59 @@
+package com.physphil.android.remindme.ui
+
+import android.content.Context
+import android.support.annotation.DrawableRes
+import android.support.annotation.StringRes
+import android.support.constraint.ConstraintLayout
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.TextView
+import butterknife.BindView
+import butterknife.ButterKnife
+import com.physphil.android.remindme.R
+
+/**
+ * Copyright (c) 2018 Phil Shadlyn
+ */
+class ReminderEntryField @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0)
+    : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    @BindView(R.id.reminder_entry_title)
+    lateinit var title: TextView
+
+    @BindView(R.id.reminder_entry_field)
+    lateinit var text: EditText
+
+    @BindView(R.id.reminder_entry_icon)
+    lateinit var icon: ImageView
+
+    init {
+        val view = LayoutInflater.from(context).inflate(R.layout.view_reminder_entry, this)
+        ButterKnife.bind(this, view)
+
+        attrs?.let {
+            val ta = context.obtainStyledAttributes(attrs, R.styleable.ReminderEntryField)
+            val title = ta.getResourceId(R.styleable.ReminderEntryField_field_title, 0)
+            val icon = ta.getResourceId(R.styleable.ReminderEntryField_field_icon, 0)
+
+            if (title > 0) {
+                setTitle(title)
+            }
+
+            if (icon > 0) {
+                setIcon(icon)
+            }
+
+            ta.recycle()
+        }
+    }
+
+    fun setTitle(@StringRes title: Int) {
+        this.title.setText(title)
+    }
+
+    fun setIcon(@DrawableRes icon: Int) {
+        this.icon.setImageResource(icon)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_reminder.xml b/app/src/main/res/layout/activity_reminder.xml
index 167cb75..3be93a3 100644
--- a/app/src/main/res/layout/activity_reminder.xml
+++ b/app/src/main/res/layout/activity_reminder.xml
@@ -11,64 +11,27 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <TextView
+        <com.physphil.android.remindme.ui.ReminderEntryField
             android:id="@+id/reminder_title_title"
-            style="@style/Reminder.Title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/global_margin_large"
-            android:layout_marginStart="@dimen/reminder_input_margin_start"
-            android:layout_marginTop="@dimen/global_margin_xlarge"
-            android:text="@string/reminder_title_title"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
-
-        <EditText
-            android:id="@+id/reminder_title_text"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/global_margin_xlarge"
-            android:inputType="textCapSentences"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/reminder_title_title"
-            app:layout_constraintTop_toBottomOf="@id/reminder_title_title"/>
-
-        <ImageView
-            android:id="@+id/reminder_title_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/global_margin_large"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/reminder_title_title"
-            app:srcCompat="@drawable/ic_notifications_24dp"/>
-
-        <TextView
-            android:id="@+id/reminder_body_title"
-            style="@style/Reminder.Title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/reminder_body_title"
-            app:layout_constraintStart_toStartOf="@id/reminder_title_title"
-            app:layout_constraintTop_toBottomOf="@id/reminder_title_text"/>
+            android:layout_marginTop="@dimen/global_margin_xlarge"
+            app:field_icon="@drawable/ic_notifications_24dp"
+            app:field_title="@string/reminder_title_title"
+            app:layout_constraintTop_toTopOf="parent"/>
 
-        <EditText
-            android:id="@+id/reminder_body_text"
-            android:layout_width="0dp"
+        <com.physphil.android.remindme.ui.ReminderEntryField
+            android:id="@+id/reminder_body"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/global_margin_xlarge"
-            android:inputType="textMultiLine|textCapSentences"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/reminder_body_title"
-            app:layout_constraintTop_toBottomOf="@id/reminder_body_title"/>
-
-        <ImageView
-            android:id="@+id/reminder_body_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/global_margin_large"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/reminder_body_title"
-            app:srcCompat="@drawable/ic_view_headline_24dp"/>
+            android:layout_marginTop="@dimen/global_margin_xlarge"
+            app:field_icon="@drawable/ic_view_headline_24dp"
+            app:field_title="@string/reminder_body_title"
+            app:layout_constraintTop_toBottomOf="@id/reminder_title_title"/>
 
         <Button
             android:id="@+id/reminder_time_btn"
@@ -76,8 +39,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/global_margin_xxxlarge"
-            app:layout_constraintStart_toStartOf="@id/reminder_body_text"
-            app:layout_constraintTop_toBottomOf="@id/reminder_body_text"
+            app:layout_constraintStart_toStartOf="@id/reminder_body"
+            app:layout_constraintTop_toBottomOf="@id/reminder_body"
             tools:text="12:09pm"/>
 
         <ImageView
diff --git a/app/src/main/res/layout/header_reminder_list.xml b/app/src/main/res/layout/view_header_reminder_list.xml
similarity index 100%
rename from app/src/main/res/layout/header_reminder_list.xml
rename to app/src/main/res/layout/view_header_reminder_list.xml
diff --git a/app/src/main/res/layout/progress_spinner.xml b/app/src/main/res/layout/view_progress_spinner.xml
similarity index 100%
rename from app/src/main/res/layout/progress_spinner.xml
rename to app/src/main/res/layout/view_progress_spinner.xml
diff --git a/app/src/main/res/layout/view_reminder_entry.xml b/app/src/main/res/layout/view_reminder_entry.xml
new file mode 100644
index 0000000..258de89
--- /dev/null
+++ b/app/src/main/res/layout/view_reminder_entry.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/reminder_entry_title"
+        style="@style/Reminder.Title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/global_margin_large"
+        android:layout_marginStart="@dimen/reminder_input_margin_start"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@string/reminder_title_title"/>
+
+    <EditText
+        android:id="@+id/reminder_entry_field"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:inputType="textCapSentences"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/reminder_entry_title"
+        app:layout_constraintTop_toBottomOf="@id/reminder_entry_title"/>
+
+    <ImageView
+        android:id="@+id/reminder_entry_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/reminder_entry_title"
+        tools:srcCompat="@drawable/ic_notifications_24dp"/>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_reminder_list.xml b/app/src/main/res/layout/view_row_reminder_list.xml
similarity index 100%
rename from app/src/main/res/layout/row_reminder_list.xml
rename to app/src/main/res/layout/view_row_reminder_list.xml
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d25eae5..e57ff4d 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -3,4 +3,9 @@
     <declare-styleable name="ProgressSpinner">
         <attr name="spinner_message" format="reference|string"/>
     </declare-styleable>
+
+    <declare-styleable name="ReminderEntryField">
+        <attr name="field_title" format="reference"/>
+        <attr name="field_icon" format="reference"/>
+    </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index e25f8e0..2d17e4a 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -21,6 +21,6 @@
 
     <dimen name="line_spacing_large">4dp</dimen>
 
-    <dimen name="reminder_input_margin_start">64dp</dimen>
+    <dimen name="reminder_input_margin_start">48dp</dimen>
     <dimen name="reminder_divider_margin">12dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fc75826..15d3988 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,7 +16,6 @@
         <item name="android:paddingEnd">@dimen/global_margin_small</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:layout_marginTop">@dimen/global_margin_xxlarge</item>
     </style>
 
     <style name="ReminderListTime">

From d50537177de6f811773ba6d19ad5b50f13918a96 Mon Sep 17 00:00:00 2001
From: Phil Shadlyn <phil.shadlyn@shopify.com>
Date: Sun, 19 Aug 2018 22:17:50 -0400
Subject: [PATCH 3/7] WIP - create view for ReminderEntryButton

---
 .../remindme/reminders/ReminderActivity.kt    | 45 ++++++-----
 .../remindme/ui/ReminderEntryButton.kt        | 53 +++++++++++++
 .../android/remindme/ui/ReminderEntryField.kt |  5 ++
 app/src/main/res/layout/activity_reminder.xml | 77 ++++++-------------
 .../main/res/layout/view_reminder_entry.xml   |  2 +-
 .../res/layout/view_reminder_entry_button.xml | 27 +++++++
 app/src/main/res/values/attrs.xml             |  5 ++
 7 files changed, 135 insertions(+), 79 deletions(-)
 create mode 100644 app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryButton.kt
 create mode 100644 app/src/main/res/layout/view_reminder_entry_button.xml

diff --git a/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt b/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt
index 1c2790f..5061254 100644
--- a/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt
+++ b/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt
@@ -12,17 +12,16 @@ import android.view.Menu
 import android.view.MenuItem
 import android.widget.Button
 import android.widget.DatePicker
-import android.widget.TextView
 import android.widget.TimePicker
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
-import butterknife.OnTextChanged
 import com.physphil.android.remindme.BaseActivity
 import com.physphil.android.remindme.R
 import com.physphil.android.remindme.RemindMeApplication
 import com.physphil.android.remindme.models.Recurrence
 import com.physphil.android.remindme.reminders.list.DeleteReminderDialogFragment
+import com.physphil.android.remindme.ui.ReminderEntryButton
 import com.physphil.android.remindme.ui.ReminderEntryField
 import com.physphil.android.remindme.util.getDisplayDate
 import com.physphil.android.remindme.util.getDisplayTime
@@ -40,20 +39,20 @@ class ReminderActivity : BaseActivity(), TimePickerDialog.OnTimeSetListener,
         DatePickerDialog.OnDateSetListener, RecurrencePickerDialog.OnRecurrenceSetListener,
         DeleteReminderDialogFragment.Listener {
 
-    @BindView(R.id.reminder_title_title)
-    lateinit var title: ReminderEntryField
+    @BindView(R.id.reminder_title)
+    lateinit var titleView: ReminderEntryField
 
     @BindView(R.id.reminder_body)
-    lateinit var body: ReminderEntryField
+    lateinit var bodyView: ReminderEntryField
 
-    @BindView(R.id.reminder_time_btn)
-    lateinit var timeText: Button
+    @BindView(R.id.reminder_time)
+    lateinit var timeView: ReminderEntryButton
 
-    @BindView(R.id.reminder_date_btn)
-    lateinit var dateText: Button
+    @BindView(R.id.reminder_date)
+    lateinit var dateView: ReminderEntryButton
 
-    @BindView(R.id.reminder_repeat_btn)
-    lateinit var repeatText: Button
+    @BindView(R.id.reminder_recurrence)
+    lateinit var recurrenceView: ReminderEntryButton
 
     /** A [CompositeDisposable] to contain all active subscriptions. Should be cleared when Activity is destroyed */
     private val disposables = CompositeDisposable()
@@ -86,12 +85,11 @@ class ReminderActivity : BaseActivity(), TimePickerDialog.OnTimeSetListener,
                 .subscribe({
                     // on success. Save Reminder in viewmodel and update UI
                     viewModel.reminder = it
-                    title.text.setText(it.title, TextView.BufferType.EDITABLE)
-                    title.text.setSelection(it.title.length)
-                    body.text.setText(it.body, TextView.BufferType.EDITABLE)
-                    timeText.text = it.getDisplayTime(this)
-                    dateText.text = it.getDisplayDate(this)
-                    repeatText.setText(it.recurrence.displayString)
+                    titleView.setText(it.title)
+                    bodyView.setText(it.body)
+                    timeView.setText(it.getDisplayTime(this))
+                    dateView.setText(it.getDisplayDate(this))
+                    recurrenceView.setText(it.recurrence.displayString)
 
                     // Clear any notifications for this Reminder
                     notificationManager.cancel(it.notificationId)
@@ -99,9 +97,9 @@ class ReminderActivity : BaseActivity(), TimePickerDialog.OnTimeSetListener,
                     // on error
                 }))
 
-        viewModel.getReminderTime().observe(this, Observer { it?.let { timeText.text = it } })
-        viewModel.getReminderDate().observe(this, Observer { it?.let { dateText.text = it } })
-        viewModel.getReminderRecurrence().observe(this, Observer { it?.let { repeatText.setText(it) } })
+        viewModel.getReminderTime().observe(this, Observer { it?.let { timeView.setText(it) } })
+        viewModel.getReminderDate().observe(this, Observer { it?.let { dateView.setText(it) } })
+        viewModel.getReminderRecurrence().observe(this, Observer { it?.let { recurrenceView.setText(it) } })
         viewModel.getToolbarTitle().observe(this, Observer { it?.let { setToolbarTitle(it) } })
         viewModel.clearNotificationEvent.observe(this, Observer { it?.let { notificationManager.cancel(it) } })
         viewModel.confirmDeleteEvent.observe(this, Observer { DeleteReminderDialogFragment.newInstance().show(supportFragmentManager, DeleteReminderDialogFragment.TAG) })
@@ -119,7 +117,7 @@ class ReminderActivity : BaseActivity(), TimePickerDialog.OnTimeSetListener,
 //        viewModel.updateBody(text.toString())
 //    }
 
-    @OnClick(R.id.reminder_time_btn, R.id.reminder_time_icon)
+    @OnClick(R.id.reminder_time)
     fun onTimeClicked() {
         val calendar = viewModel.reminder.time
         TimePickerDialog(this, R.style.Pickers, this,
@@ -127,7 +125,7 @@ class ReminderActivity : BaseActivity(), TimePickerDialog.OnTimeSetListener,
                 calendar.get(Calendar.MINUTE), false).show()
     }
 
-    @OnClick(R.id.reminder_date_btn, R.id.reminder_date_icon)
+    @OnClick(R.id.reminder_date)
     fun onDateClicked() {
         val calendar = viewModel.reminder.time
         DatePickerDialog(this, R.style.Pickers, this,
@@ -136,11 +134,12 @@ class ReminderActivity : BaseActivity(), TimePickerDialog.OnTimeSetListener,
                 calendar.get(Calendar.DAY_OF_MONTH)).show()
     }
 
-    @OnClick(R.id.reminder_repeat_btn, R.id.reminder_repeat_icon)
+    @OnClick(R.id.reminder_recurrence)
     fun onRecurrenceClicked() {
         RecurrencePickerDialog.newInstance(viewModel.reminder.recurrence)
                 .show(supportFragmentManager, RecurrencePickerDialog.TAG)
     }
+    // end todo
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         super.onCreateOptionsMenu(menu)
diff --git a/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryButton.kt b/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryButton.kt
new file mode 100644
index 0000000..1bf3c64
--- /dev/null
+++ b/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryButton.kt
@@ -0,0 +1,53 @@
+package com.physphil.android.remindme.ui
+
+import android.content.Context
+import android.support.annotation.DrawableRes
+import android.support.constraint.ConstraintLayout
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.Button
+import android.widget.ImageView
+import butterknife.BindView
+import butterknife.ButterKnife
+import com.physphil.android.remindme.R
+
+class ReminderEntryButton @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0)
+    : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    @BindView(R.id.reminder_entry_button_icon)
+    lateinit var icon: ImageView
+
+    @BindView(R.id.reminder_entry_button)
+    lateinit var button: Button
+
+    init {
+        val view = LayoutInflater.from(context).inflate(R.layout.view_reminder_entry_button, this)
+        ButterKnife.bind(this, view)
+
+        attrs?.let {
+            val ta = context.obtainStyledAttributes(attrs, R.styleable.ReminderEntryButton)
+            val text = ta.getString(R.styleable.ReminderEntryButton_button_text)
+            val icon = ta.getResourceId(R.styleable.ReminderEntryButton_button_icon, 0)
+
+            if (icon > 0) {
+                setIcon(icon)
+            }
+
+            text?.let { setText(it) }
+
+            ta.recycle()
+        }
+    }
+
+    fun setText(text: String) {
+        this.button.text = text
+    }
+
+    fun setText(res: Int) {
+        setText(context.getString(res))
+    }
+
+    fun setIcon(@DrawableRes icon: Int) {
+        this.icon.setImageResource(icon)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryField.kt b/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryField.kt
index 820327e..57a7241 100644
--- a/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryField.kt
+++ b/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryField.kt
@@ -56,4 +56,9 @@ class ReminderEntryField @JvmOverloads constructor(context: Context, attrs: Attr
     fun setIcon(@DrawableRes icon: Int) {
         this.icon.setImageResource(icon)
     }
+
+    fun setText(text: String) {
+        this.text.setText(text, TextView.BufferType.EDITABLE)
+        this.text.setSelection(text.length)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_reminder.xml b/app/src/main/res/layout/activity_reminder.xml
index 3be93a3..53dacc8 100644
--- a/app/src/main/res/layout/activity_reminder.xml
+++ b/app/src/main/res/layout/activity_reminder.xml
@@ -7,12 +7,13 @@
     android:layout_height="match_parent"
     android:fillViewport="true">
 
-    <android.support.constraint.ConstraintLayout
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
         <com.physphil.android.remindme.ui.ReminderEntryField
-            android:id="@+id/reminder_title_title"
+            android:id="@+id/reminder_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/global_margin_xlarge"
@@ -30,72 +31,38 @@
             android:layout_marginStart="@dimen/global_margin_large"
             android:layout_marginTop="@dimen/global_margin_xlarge"
             app:field_icon="@drawable/ic_view_headline_24dp"
-            app:field_title="@string/reminder_body_title"
-            app:layout_constraintTop_toBottomOf="@id/reminder_title_title"/>
+            app:field_title="@string/reminder_body_title"/>
 
-        <Button
-            android:id="@+id/reminder_time_btn"
-            style="@style/Button.Large.Primary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/global_margin_xxxlarge"
-            app:layout_constraintStart_toStartOf="@id/reminder_body"
-            app:layout_constraintTop_toBottomOf="@id/reminder_body"
-            tools:text="12:09pm"/>
-
-        <ImageView
-            android:id="@+id/reminder_time_icon"
+        <com.physphil.android.remindme.ui.ReminderEntryButton
+            android:id="@+id/reminder_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/global_margin_large"
             android:layout_marginStart="@dimen/global_margin_large"
-            app:layout_constraintBottom_toBottomOf="@id/reminder_time_btn"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/reminder_time_btn"
-            app:srcCompat="@drawable/ic_time_24dp"/>
-
-        <Button
-            android:id="@+id/reminder_date_btn"
-            style="@style/Button.Large.Primary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/global_margin_xxxlarge"
-            app:layout_constraintStart_toStartOf="@id/reminder_time_btn"
-            app:layout_constraintTop_toBottomOf="@id/reminder_time_btn"
-            tools:text="Jan 25, 2018"/>
+            app:button_icon="@drawable/ic_time_24dp"/>
 
-        <ImageView
-            android:id="@+id/reminder_date_icon"
+        <com.physphil.android.remindme.ui.ReminderEntryButton
+            android:id="@+id/reminder_date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/global_margin_large"
             android:layout_marginStart="@dimen/global_margin_large"
-            app:layout_constraintBottom_toBottomOf="@id/reminder_date_btn"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/reminder_date_btn"
-            app:srcCompat="@drawable/ic_date_range_24dp"/>
-
-        <Button
-            android:id="@+id/reminder_repeat_btn"
-            style="@style/Button.Large.Primary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/global_margin_xlarge"
             android:layout_marginTop="@dimen/global_margin_xxxlarge"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@id/reminder_date_btn"
-            app:layout_constraintTop_toBottomOf="@id/reminder_date_btn"
-            app:layout_constraintVertical_bias="0.0"
-            tools:text="Hourly"/>
+            app:button_icon="@drawable/ic_date_range_24dp"
+            tools:button_text="Jan 26, 2018"/>
 
-        <ImageView
-            android:id="@+id/reminder_repeat_icon"
+        <com.physphil.android.remindme.ui.ReminderEntryButton
+            android:id="@+id/reminder_recurrence"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/global_margin_xlarge"
+            android:layout_marginEnd="@dimen/global_margin_xlarge"
             android:layout_marginStart="@dimen/global_margin_large"
-            app:layout_constraintBottom_toBottomOf="@id/reminder_repeat_btn"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/reminder_repeat_btn"
-            app:srcCompat="@drawable/ic_repeat_24dp"/>
+            android:layout_marginTop="@dimen/global_margin_xxxlarge"
+            app:button_icon="@drawable/ic_repeat_24dp"
+            tools:button_text="Hourly"/>
 
-    </android.support.constraint.ConstraintLayout>
+    </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_reminder_entry.xml b/app/src/main/res/layout/view_reminder_entry.xml
index 258de89..b58a196 100644
--- a/app/src/main/res/layout/view_reminder_entry.xml
+++ b/app/src/main/res/layout/view_reminder_entry.xml
@@ -21,7 +21,7 @@
         android:id="@+id/reminder_entry_field"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:inputType="textCapSentences"
+        android:inputType="textMultiLine|textCapSentences"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/reminder_entry_title"
         app:layout_constraintTop_toBottomOf="@id/reminder_entry_title"/>
diff --git a/app/src/main/res/layout/view_reminder_entry_button.xml b/app/src/main/res/layout/view_reminder_entry_button.xml
new file mode 100644
index 0000000..b27aa9c
--- /dev/null
+++ b/app/src/main/res/layout/view_reminder_entry_button.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/reminder_entry_button_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:srcCompat="@drawable/ic_time_24dp"/>
+
+    <Button
+        android:id="@+id/reminder_entry_button"
+        style="@style/Button.Large.Primary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/global_margin_xlarge"
+        app:layout_constraintStart_toEndOf="@id/reminder_entry_button_icon"
+        tools:text="12:09pm"/>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index e57ff4d..8983466 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -8,4 +8,9 @@
         <attr name="field_title" format="reference"/>
         <attr name="field_icon" format="reference"/>
     </declare-styleable>
+
+    <declare-styleable name="ReminderEntryButton">
+        <attr name="button_icon" format="reference"/>
+        <attr name="button_text" format="string"/>
+    </declare-styleable>
 </resources>
\ No newline at end of file

From 4036e841c374f2d9fa45986ddd8b61d556988852 Mon Sep 17 00:00:00 2001
From: Phil Shadlyn <phil.shadlyn@shopify.com>
Date: Mon, 20 Aug 2018 17:29:08 -0400
Subject: [PATCH 4/7] WIP - Added on click listener handling in
 ReminderEntryButton

---
 .../remindme/reminders/ReminderActivity.kt    | 54 +++++++++----------
 .../remindme/ui/ReminderEntryButton.kt        | 14 +++++
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt b/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt
index 5061254..c1c9fb6 100644
--- a/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt
+++ b/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt
@@ -10,12 +10,10 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.widget.Button
 import android.widget.DatePicker
 import android.widget.TimePicker
 import butterknife.BindView
 import butterknife.ButterKnife
-import butterknife.OnClick
 import com.physphil.android.remindme.BaseActivity
 import com.physphil.android.remindme.R
 import com.physphil.android.remindme.RemindMeApplication
@@ -68,7 +66,7 @@ class ReminderActivity : BaseActivity(), TimePickerDialog.OnTimeSetListener,
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_reminder)
         setHomeArrowBackNavigation()
-        ButterKnife.bind(this)
+        bindViews()
         bindViewModel()
     }
 
@@ -77,6 +75,31 @@ class ReminderActivity : BaseActivity(), TimePickerDialog.OnTimeSetListener,
         disposables.clear()
     }
 
+    private fun bindViews() {
+        ButterKnife.bind(this)
+
+        // TODO - clean this up, send clicks directly to viewmodel
+        timeView.setOnClickListener {
+            val calendar = viewModel.reminder.time
+            TimePickerDialog(this, R.style.Pickers, this,
+                    calendar.get(Calendar.HOUR_OF_DAY),
+                    calendar.get(Calendar.MINUTE), false).show()
+        }
+
+        dateView.setOnClickListener {
+            val calendar = viewModel.reminder.time
+            DatePickerDialog(this, R.style.Pickers, this,
+                    calendar.get(Calendar.YEAR),
+                    calendar.get(Calendar.MONTH),
+                    calendar.get(Calendar.DAY_OF_MONTH)).show()
+        }
+
+        recurrenceView.setOnClickListener {
+            RecurrencePickerDialog.newInstance(viewModel.reminder.recurrence)
+                    .show(supportFragmentManager, RecurrencePickerDialog.TAG)
+        }
+    }
+
     private fun bindViewModel() {
         // Will either be called immediately with stored value, or will be updated upon successful read from database
         disposables.add(viewModel.observableReminder
@@ -106,7 +129,7 @@ class ReminderActivity : BaseActivity(), TimePickerDialog.OnTimeSetListener,
         viewModel.closeActivityEvent.observe(this, Observer { finish() })
     }
 
-    //todo - Move all these listeners to class of resepctive views
+    //todo - Move all these listeners to class of respective views
 //    @OnTextChanged(R.id.reminder_title_text)
 //    fun onTitleChanged(text: CharSequence) {
 //        viewModel.updateTitle(text.toString())
@@ -116,29 +139,6 @@ class ReminderActivity : BaseActivity(), TimePickerDialog.OnTimeSetListener,
 //    fun onBodyChanged(text: CharSequence) {
 //        viewModel.updateBody(text.toString())
 //    }
-
-    @OnClick(R.id.reminder_time)
-    fun onTimeClicked() {
-        val calendar = viewModel.reminder.time
-        TimePickerDialog(this, R.style.Pickers, this,
-                calendar.get(Calendar.HOUR_OF_DAY),
-                calendar.get(Calendar.MINUTE), false).show()
-    }
-
-    @OnClick(R.id.reminder_date)
-    fun onDateClicked() {
-        val calendar = viewModel.reminder.time
-        DatePickerDialog(this, R.style.Pickers, this,
-                calendar.get(Calendar.YEAR),
-                calendar.get(Calendar.MONTH),
-                calendar.get(Calendar.DAY_OF_MONTH)).show()
-    }
-
-    @OnClick(R.id.reminder_recurrence)
-    fun onRecurrenceClicked() {
-        RecurrencePickerDialog.newInstance(viewModel.reminder.recurrence)
-                .show(supportFragmentManager, RecurrencePickerDialog.TAG)
-    }
     // end todo
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
diff --git a/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryButton.kt b/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryButton.kt
index 1bf3c64..14a1da6 100644
--- a/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryButton.kt
+++ b/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryButton.kt
@@ -5,10 +5,12 @@ import android.support.annotation.DrawableRes
 import android.support.constraint.ConstraintLayout
 import android.util.AttributeSet
 import android.view.LayoutInflater
+import android.view.View
 import android.widget.Button
 import android.widget.ImageView
 import butterknife.BindView
 import butterknife.ButterKnife
+import butterknife.OnClick
 import com.physphil.android.remindme.R
 
 class ReminderEntryButton @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0)
@@ -20,6 +22,9 @@ class ReminderEntryButton @JvmOverloads constructor(context: Context, attrs: Att
     @BindView(R.id.reminder_entry_button)
     lateinit var button: Button
 
+    // TODO do this better?
+    private var listener: OnClickListener? = null
+
     init {
         val view = LayoutInflater.from(context).inflate(R.layout.view_reminder_entry_button, this)
         ButterKnife.bind(this, view)
@@ -50,4 +55,13 @@ class ReminderEntryButton @JvmOverloads constructor(context: Context, attrs: Att
     fun setIcon(@DrawableRes icon: Int) {
         this.icon.setImageResource(icon)
     }
+
+    override fun setOnClickListener(l: OnClickListener?) {
+        listener = l
+    }
+
+    @OnClick(R.id.reminder_entry_button, R.id.reminder_entry_button_icon)
+    protected fun onButtonClicked(view: View) {
+        listener?.onClick(view)
+    }
 }
\ No newline at end of file

From d95bcc34709c4d8223c887cd018a74adc4da6a4b Mon Sep 17 00:00:00 2001
From: Phil Shadlyn <phil.shadlyn@shopify.com>
Date: Thu, 23 Aug 2018 16:26:27 -0400
Subject: [PATCH 5/7] Redirect input events to ViewModel, relay instructions
 back to Activity via LiveData

---
 .../remindme/reminders/ReminderActivity.kt    | 82 +++++++++++++------
 .../remindme/reminders/ReminderViewModel.kt   | 30 +++++++
 .../remindme/ui/ReminderEntryButton.kt        |  1 -
 .../android/remindme/ui/ReminderEntryField.kt | 18 +++-
 4 files changed, 100 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt b/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt
index c1c9fb6..7b0ae13 100644
--- a/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt
+++ b/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt
@@ -78,25 +78,24 @@ class ReminderActivity : BaseActivity(), TimePickerDialog.OnTimeSetListener,
     private fun bindViews() {
         ButterKnife.bind(this)
 
-        // TODO - clean this up, send clicks directly to viewmodel
+        titleView.setOnTextChangedListener {
+            viewModel.updateTitle(it)
+        }
+
+        bodyView.setOnTextChangedListener {
+            viewModel.updateBody(it)
+        }
+
         timeView.setOnClickListener {
-            val calendar = viewModel.reminder.time
-            TimePickerDialog(this, R.style.Pickers, this,
-                    calendar.get(Calendar.HOUR_OF_DAY),
-                    calendar.get(Calendar.MINUTE), false).show()
+            viewModel.openTimePicker()
         }
 
         dateView.setOnClickListener {
-            val calendar = viewModel.reminder.time
-            DatePickerDialog(this, R.style.Pickers, this,
-                    calendar.get(Calendar.YEAR),
-                    calendar.get(Calendar.MONTH),
-                    calendar.get(Calendar.DAY_OF_MONTH)).show()
+            viewModel.openDatePicker()
         }
 
         recurrenceView.setOnClickListener {
-            RecurrencePickerDialog.newInstance(viewModel.reminder.recurrence)
-                    .show(supportFragmentManager, RecurrencePickerDialog.TAG)
+            viewModel.openRecurrencePicker()
         }
     }
 
@@ -124,22 +123,51 @@ class ReminderActivity : BaseActivity(), TimePickerDialog.OnTimeSetListener,
         viewModel.getReminderDate().observe(this, Observer { it?.let { dateView.setText(it) } })
         viewModel.getReminderRecurrence().observe(this, Observer { it?.let { recurrenceView.setText(it) } })
         viewModel.getToolbarTitle().observe(this, Observer { it?.let { setToolbarTitle(it) } })
-        viewModel.clearNotificationEvent.observe(this, Observer { it?.let { notificationManager.cancel(it) } })
-        viewModel.confirmDeleteEvent.observe(this, Observer { DeleteReminderDialogFragment.newInstance().show(supportFragmentManager, DeleteReminderDialogFragment.TAG) })
-        viewModel.closeActivityEvent.observe(this, Observer { finish() })
-    }
 
-    //todo - Move all these listeners to class of respective views
-//    @OnTextChanged(R.id.reminder_title_text)
-//    fun onTitleChanged(text: CharSequence) {
-//        viewModel.updateTitle(text.toString())
-//    }
-
-//    @OnTextChanged(R.id.reminder_body_text)
-//    fun onBodyChanged(text: CharSequence) {
-//        viewModel.updateBody(text.toString())
-//    }
-    // end todo
+        viewModel.clearNotificationEvent.observe(this, Observer {
+            it?.let {
+                notificationManager.cancel(it)
+            }
+        })
+
+        viewModel.confirmDeleteEvent.observe(this, Observer {
+            DeleteReminderDialogFragment.newInstance().show(supportFragmentManager, DeleteReminderDialogFragment.TAG)
+        })
+
+        viewModel.closeActivityEvent.observe(this, Observer {
+            finish()
+        })
+
+        viewModel.openTimePickerEvent.observe(this, Observer {
+            it?.let {
+                TimePickerDialog(this,
+                        R.style.Pickers,
+                        this,
+                        it.hour,
+                        it.minute,
+                        false).show()
+            }
+        })
+
+        viewModel.openDatePickerEvent.observe(this, Observer {
+            it?.let {
+                DatePickerDialog(this,
+                        R.style.Pickers,
+                        this,
+                        it.year,
+                        it.month,
+                        it.day).show()
+
+            }
+        })
+
+        viewModel.openRecurrencePickerEvent.observe(this, Observer {
+            it?.let {
+                RecurrencePickerDialog.newInstance(it)
+                        .show(supportFragmentManager, RecurrencePickerDialog.TAG)
+            }
+        })
+    }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         super.onCreateOptionsMenu(menu)
diff --git a/app/src/main/java/com/physphil/android/remindme/reminders/ReminderViewModel.kt b/app/src/main/java/com/physphil/android/remindme/reminders/ReminderViewModel.kt
index 8f7df2f..21a70e6 100644
--- a/app/src/main/java/com/physphil/android/remindme/reminders/ReminderViewModel.kt
+++ b/app/src/main/java/com/physphil/android/remindme/reminders/ReminderViewModel.kt
@@ -4,6 +4,7 @@ import android.arch.lifecycle.LiveData
 import android.arch.lifecycle.MutableLiveData
 import android.arch.lifecycle.ViewModel
 import android.content.Context
+import android.support.annotation.VisibleForTesting
 import android.view.MenuItem
 import com.physphil.android.remindme.R
 import com.physphil.android.remindme.data.ReminderRepo
@@ -30,6 +31,9 @@ class ReminderViewModel(id: String? = null, private val repo: ReminderRepo, priv
     val clearNotificationEvent = SingleLiveEvent<Int>()
     val confirmDeleteEvent = SingleLiveEvent<Void>()
     val closeActivityEvent = SingleLiveEvent<Void>()
+    val openTimePickerEvent = SingleLiveEvent<Time>()
+    val openDatePickerEvent = SingleLiveEvent<Date>()
+    val openRecurrencePickerEvent = SingleLiveEvent<Recurrence>()
 
     private val reminderTime = MutableLiveData<String>()
     private val reminderDate = MutableLiveData<String>()
@@ -71,6 +75,29 @@ class ReminderViewModel(id: String? = null, private val repo: ReminderRepo, priv
         reminderRecurrence.value = recurrence.displayString
     }
 
+    fun openTimePicker() {
+        with(reminder.time) {
+            openTimePickerEvent.postValue(Time(
+                    hour = get(Calendar.HOUR_OF_DAY),
+                    minute = get(Calendar.MINUTE)
+            ))
+        }
+    }
+
+    fun openDatePicker() {
+        with(reminder.time) {
+            openDatePickerEvent.postValue(Date(
+                    year = get(Calendar.YEAR),
+                    month = get(Calendar.MONTH),
+                    day = get(Calendar.DAY_OF_MONTH)
+            ))
+        }
+    }
+
+    fun openRecurrencePicker() {
+        openRecurrencePickerEvent.postValue(reminder.recurrence)
+    }
+
     fun saveReminder() {
         // Set all second fields to 0 before saving, so alarm happens at exactly the specified time
         reminder.time.set(Calendar.SECOND, 0)
@@ -114,4 +141,7 @@ class ReminderViewModel(id: String? = null, private val repo: ReminderRepo, priv
                 reminder.body,
                 reminder.recurrence.id)
     }
+
+    data class Time(val hour: Int, val minute: Int)
+    data class Date(val year: Int, val month: Int, val day: Int)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryButton.kt b/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryButton.kt
index 14a1da6..d03c892 100644
--- a/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryButton.kt
+++ b/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryButton.kt
@@ -22,7 +22,6 @@ class ReminderEntryButton @JvmOverloads constructor(context: Context, attrs: Att
     @BindView(R.id.reminder_entry_button)
     lateinit var button: Button
 
-    // TODO do this better?
     private var listener: OnClickListener? = null
 
     init {
diff --git a/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryField.kt b/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryField.kt
index 57a7241..c7f313b 100644
--- a/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryField.kt
+++ b/app/src/main/java/com/physphil/android/remindme/ui/ReminderEntryField.kt
@@ -11,6 +11,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import butterknife.OnTextChanged
 import com.physphil.android.remindme.R
 
 /**
@@ -28,6 +29,8 @@ class ReminderEntryField @JvmOverloads constructor(context: Context, attrs: Attr
     @BindView(R.id.reminder_entry_icon)
     lateinit var icon: ImageView
 
+    private var textChangedListener: ((String) -> Unit)? = null
+
     init {
         val view = LayoutInflater.from(context).inflate(R.layout.view_reminder_entry, this)
         ButterKnife.bind(this, view)
@@ -53,12 +56,21 @@ class ReminderEntryField @JvmOverloads constructor(context: Context, attrs: Attr
         this.title.setText(title)
     }
 
+    fun setText(text: String) {
+        this.text.setText(text)
+    }
+
     fun setIcon(@DrawableRes icon: Int) {
         this.icon.setImageResource(icon)
     }
 
-    fun setText(text: String) {
-        this.text.setText(text, TextView.BufferType.EDITABLE)
-        this.text.setSelection(text.length)
+    fun setOnTextChangedListener(listener: (String) -> Unit) {
+        textChangedListener = listener
+    }
+
+    @OnTextChanged(R.id.reminder_entry_field)
+    protected fun onTextChanged(text: CharSequence) {
+        textChangedListener?.invoke(text.toString())
     }
+
 }
\ No newline at end of file

From 3f102481777c7f610678afc2d22694bf4ec2b646 Mon Sep 17 00:00:00 2001
From: Phil Shadlyn <phil.shadlyn@shopify.com>
Date: Sun, 23 Sep 2018 10:23:13 -0400
Subject: [PATCH 6/7] Update comments

---
 .../physphil/android/remindme/reminders/ReminderActivity.kt    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt b/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt
index 7b0ae13..1c6ae5a 100644
--- a/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt
+++ b/app/src/main/java/com/physphil/android/remindme/reminders/ReminderActivity.kt
@@ -26,10 +26,9 @@ import com.physphil.android.remindme.util.getDisplayTime
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
-import java.util.Calendar
 
 /**
- * Create a new observableReminder or edit and existing one.
+ * Create a new [Reminder] or edit and existing one.
  *
  * Copyright (c) 2017 Phil Shadlyn
  */

From c162466ae9fae9096418035b376d454075aef4d6 Mon Sep 17 00:00:00 2001
From: Phil Shadlyn <phil.shadlyn@shopify.com>
Date: Sun, 23 Sep 2018 10:26:51 -0400
Subject: [PATCH 7/7] Version bump

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 687d4ba..7d5e5ba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.physphil.android.remindme"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 9020
-        versionName "0.9.2"
+        versionCode 9030
+        versionName "0.9.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {