aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-08-05 18:13:19 +0200
committerChristian Schneppe <christian@pix-art.de>2018-08-05 18:13:19 +0200
commitbbb53526f80c14d9ddc0f25ad5516a600e1868fa (patch)
treeb2493a52a8eefd377e2b5986f42a82886d2b3247 /src/main/res
parentb890f6e78f69f55a553d2fff92b0e82e10d97af2 (diff)
add a quick action for voice recording
* is enabled as default * can be disabled in settings
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/fragment_conversation.xml16
-rw-r--r--src/main/res/values/defaults.xml1
-rw-r--r--src/main/res/values/strings.xml2
-rw-r--r--src/main/res/xml/preferences.xml5
4 files changed, 22 insertions, 2 deletions
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index cc35d21cc..d081b6543 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -57,6 +57,7 @@
<RelativeLayout
android:id="@+id/textsend"
+
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
@@ -66,13 +67,24 @@
android:paddingLeft="2dp"
android:paddingTop="2dp">
+ <ImageButton
+ android:id="@+id/recordVoiceButton"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:background="?attr/color_background_secondary"
+ android:contentDescription="@string/attach_record_voice"
+ android:src="@drawable/ic_send_voice_offline"
+ android:visibility="gone" />
+
<de.pixart.messenger.ui.widget.EditMessage
android:id="@+id/textinput"
style="@style/Widget.Conversations.EditText"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/textSendButton"
+ android:layout_toRightOf="@+id/recordVoiceButton"
android:background="@drawable/message_bubble_sent_blue"
android:ems="10"
android:imeOptions="flagNoExtractUi|actionSend"
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index c96f22f3d..29a256afb 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -107,6 +107,7 @@
<string name="theme">light</string>
<string name="default_font_size">small</string>
<bool name="start_searching">false</bool>
+ <bool name="show_record_voice_btn">true</bool>
<string-array name="domains">
<item>pix-art.de</item>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 5b5876823..321a5f97a 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -808,4 +808,6 @@
<string name="no_application_found_to_view_contact">No application found to view contact</string>
<string name="welcome_server_info">We recommend the use of blabber.im as your provider.</string>
<string name="no_location_permission">Pix-Art Messenger needs access to location services</string>
+ <string name="pref_show_record_voice_btn_summary">Show record voice button in chats as quick action</string>
+ <string name="pref_show_record_voice_btn">Show record voice button</string>
</resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 49de3cfc0..31ca6158b 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -47,6 +47,11 @@
android:summary="@string/pref_quick_action_summary"
android:title="@string/pref_quick_action" />
<CheckBoxPreference
+ android:defaultValue="@bool/show_record_voice_btn"
+ android:key="show_record_voice_btn"
+ android:summary="@string/pref_show_record_voice_btn_summary"
+ android:title="@string/pref_show_record_voice_btn" />
+ <CheckBoxPreference
android:defaultValue="@bool/use_max_brightness"
android:key="use_max_brightness"
android:summary="@string/pref_use_max_brightness_summary"