Merge branch 'develop' of github.com:parley-messaging/android-library into develop

Author: alexkok

parley/src/main/java/nu/parley/android/view/compose/ComposeMediaInputView.java

@@ -20,7 +20,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.core.widget.ImageViewCompat;
 
 import java.io.File;
@@ -39,7 +39,7 @@
 
 public final class ComposeMediaInputView extends FrameLayout implements View.OnClickListener {
 
-    private AppCompatImageView addMediaView;
+    private AppCompatImageButton addMediaView;
     private ParleyLaunchCallback launchCallback;
 
     private File currentPhotoPath;
@@ -64,7 +64,7 @@ private void init() {
 
         addMediaView = findViewById(R.id.add_media_view);
 
-        setOnClickListener(this);
+        addMediaView.setOnClickListener(this);
     }
 
     @Nullable

parley/src/main/res/layout/view_compose.xml

@@ -34,7 +34,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end|bottom"
-            android:contentDescription="@string/parley_accessibility_photo_button" />
+            />
     </FrameLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton

parley/src/main/res/layout/view_compose_media.xml

@@ -5,11 +5,13 @@
     android:layout_height="wrap_content"
     android:layout_gravity="center">
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/add_media_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:importantForAccessibility="no"
-        tools:src="@drawable/parley_ic_add" />
+        android:background="@null"
+        android:contentDescription="@string/parley_accessibility_photo_button"
+        tools:src="@drawable/parley_ic_add"
+        />
 
 </FrameLayout>

parley/src/main/res/values-nl/strings.xml

@@ -31,7 +31,7 @@
     <!-- Accessibility -->
     <string name="parley_accessibility_close">Sluiten</string>
     <string name="parley_accessibility_button">Knop</string>
-    <string name="parley_accessibility_photo_button">Foto. Knop.</string>
+    <string name="parley_accessibility_photo_button">Foto</string>
     <string name="parley_accessibility_send">Versturen</string>
     <string name="parley_accessibility_message_informational">Informatief bericht.</string>
     <string name="parley_accessibility_message_from_you">Bericht van jou.</string>

parley/src/main/res/values/strings.xml

@@ -32,7 +32,7 @@
     <!-- Accessibility -->
     <string name="parley_accessibility_close">Close</string>
     <string name="parley_accessibility_button">Button</string>
-    <string name="parley_accessibility_photo_button">Photo. Button.</string>
+    <string name="parley_accessibility_photo_button">Photo</string>
     <string name="parley_accessibility_send">Send</string>
     <string name="parley_accessibility_message_informational">Informational message.</string>
     <string name="parley_accessibility_message_from_you">Message from you.</string>