From 56c8fcddfb275533748f0ec40493abd9459c6fb9 Mon Sep 17 00:00:00 2001 From: andrekir Date: Sun, 29 Aug 2021 23:48:49 -0300 Subject: [PATCH 1/3] sendButton img & layout --- app/src/main/res/drawable/ic_send_24.xml | 11 +++++++++++ app/src/main/res/layout/messages_fragment.xml | 19 +++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/drawable/ic_send_24.xml diff --git a/app/src/main/res/drawable/ic_send_24.xml b/app/src/main/res/drawable/ic_send_24.xml new file mode 100644 index 00000000..f0d63e17 --- /dev/null +++ b/app/src/main/res/drawable/ic_send_24.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/layout/messages_fragment.xml b/app/src/main/res/layout/messages_fragment.xml index 42e81fb7..3e829e3d 100644 --- a/app/src/main/res/layout/messages_fragment.xml +++ b/app/src/main/res/layout/messages_fragment.xml @@ -23,11 +23,10 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:layout_marginEnd="8dp" android:layout_marginBottom="8dp" android:hint="@string/send_text" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@+id/sendButton" app:layout_constraintStart_toStartOf="parent"> + + + + \ No newline at end of file From 5b26714a1ee203ec6526468ff4cd2e2ea2f9a75b Mon Sep 17 00:00:00 2001 From: andrekir Date: Tue, 31 Aug 2021 11:39:55 -0300 Subject: [PATCH 2/3] added binding.sendButton.setOnClickListener to MessagesFragment.kt --- .../java/com/geeksville/mesh/ui/MessagesFragment.kt | 11 +++++++++++ app/src/main/res/layout/messages_fragment.xml | 1 - 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt index d552e4b6..b483a5a3 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt @@ -228,6 +228,17 @@ class MessagesFragment : ScreenFragment("Messages"), Logging { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + binding.sendButton.setOnClickListener { + debug("sendButton click") + + val str = binding.messageInputText.text.toString().trim() + if (str.isNotEmpty()) + model.messagesState.sendMessage(str) + binding.messageInputText.setText("") // blow away the string the user just entered + + // requireActivity().hideKeyboard() + } + binding.messageInputText.on(EditorInfo.IME_ACTION_DONE) { debug("did IME action") diff --git a/app/src/main/res/layout/messages_fragment.xml b/app/src/main/res/layout/messages_fragment.xml index 3e829e3d..9939d3b4 100644 --- a/app/src/main/res/layout/messages_fragment.xml +++ b/app/src/main/res/layout/messages_fragment.xml @@ -34,7 +34,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:imeOptions="actionDone" - android:singleLine="true" android:text="" /> From fdff15448f68f83c8348614f8b2ec4085eb3d931 Mon Sep 17 00:00:00 2001 From: andrekir Date: Tue, 31 Aug 2021 16:59:34 -0300 Subject: [PATCH 3/3] added android:maxLength="200" to messages_fragment.xml --- app/src/main/res/layout/messages_fragment.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/messages_fragment.xml b/app/src/main/res/layout/messages_fragment.xml index 9939d3b4..8a2f54ff 100644 --- a/app/src/main/res/layout/messages_fragment.xml +++ b/app/src/main/res/layout/messages_fragment.xml @@ -33,6 +33,7 @@ android:id="@+id/messageInputText" android:layout_width="match_parent" android:layout_height="wrap_content" + android:maxLength="200" android:imeOptions="actionDone" android:text="" />