Implement new compose bar style, fix QK Reply compose bar size

This commit is contained in:
Moez Bhatti
2018-06-26 14:50:11 -04:00
parent bdb90f1db0
commit ad202a2f64
6 changed files with 147 additions and 132 deletions
@@ -24,7 +24,8 @@
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:background="?attr/composeBackground"
android:orientation="vertical">
android:orientation="vertical"
tools:context="com.moez.QKSMS.feature.compose.ComposeActivity">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/messageList"
@@ -149,7 +150,7 @@
android:id="@+id/composeBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="composeBackground, messageBackground, attachments, attach, attachSeparator, message, counter, send" />
app:constraint_referenced_ids="composeBackground, messageBackground, attachments, attach, message, counter, send" />
<View
android:id="@+id/composeBackground"
@@ -162,29 +163,79 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/messageBackground" />
<ImageView
android:id="@+id/gallery"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginBottom="12dp"
android:background="@drawable/circle"
android:contentDescription="@string/compose_gallery_cd"
android:elevation="4dp"
android:padding="10dp"
android:src="@drawable/ic_insert_photo_black_24dp"
android:tint="?android:attr/textColorSecondary"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/camera"
app:layout_constraintEnd_toEndOf="@id/attach"
app:layout_constraintStart_toStartOf="@id/attach" />
<ImageView
android:id="@+id/camera"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginBottom="16dp"
android:background="@drawable/circle"
android:contentDescription="@string/compose_camera_cd"
android:elevation="4dp"
android:padding="10dp"
android:src="@drawable/ic_camera_alt_black_24dp"
android:tint="?android:attr/textColorSecondary"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/attach"
app:layout_constraintEnd_toEndOf="@id/attach"
app:layout_constraintStart_toStartOf="@id/attach" />
<ImageView
android:id="@+id/attach"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="8dp"
android:background="@drawable/circle"
android:contentDescription="@string/compose_attach_cd"
android:elevation="4dp"
android:padding="10dp"
android:src="@drawable/ic_add_black_24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:backgroundTint="@color/tools_theme"
tools:tint="@color/textPrimaryDark" />
<View
android:id="@+id/messageBackground"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/rounded_rectangle_shadow"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:background="@drawable/rounded_rectangle_22dp"
android:backgroundTint="?attr/bubbleColor"
android:elevation="4dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/send"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/attach"
app:layout_constraintTop_toTopOf="@id/attachments" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/attachments"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:clipChildren="false"
android:clipToPadding="false"
android:elevation="4dp"
android:orientation="horizontal"
android:paddingEnd="8dp"
android:paddingStart="8dp"
android:paddingTop="8dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toTopOf="@id/message"
app:layout_constraintEnd_toEndOf="@id/messageBackground"
@@ -192,92 +243,46 @@
app:layout_constraintTop_toTopOf="@id/messageBackground"
tools:listitem="@layout/attachment_list_item" />
<ImageView
android:id="@+id/attach"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_marginStart="8dp"
android:contentDescription="@string/compose_attach_cd"
android:padding="10dp"
android:src="@drawable/ic_add_circle_black_24dp"
android:tint="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="@id/message"
app:layout_constraintStart_toStartOf="@id/messageBackground" />
<ImageView
android:id="@+id/camera"
android:layout_width="44dp"
android:layout_height="44dp"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/compose_camera_cd"
android:padding="10dp"
android:src="@drawable/ic_camera_alt_black_24dp"
android:tint="?android:attr/textColorSecondary"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/message"
app:layout_constraintStart_toEndOf="@id/attach" />
<ImageView
android:id="@+id/gallery"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_marginEnd="8dp"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/compose_gallery_cd"
android:padding="10dp"
android:src="@drawable/ic_insert_photo_black_24dp"
android:tint="?android:attr/textColorSecondary"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/message"
app:layout_constraintStart_toEndOf="@id/camera" />
<View
android:id="@+id/attachSeparator"
android:layout_width="1dp"
android:layout_height="0dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:background="?android:attr/divider"
app:layout_constraintBottom_toBottomOf="@id/message"
app:layout_constraintStart_toEndOf="@id/gallery"
app:layout_constraintTop_toBottomOf="@id/attachments" />
<com.moez.QKSMS.common.widget.QkEditText
android:id="@+id/message"
style="@style/TextPrimary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:background="@null"
android:elevation="4dp"
android:gravity="center_vertical"
android:hint="@string/compose_hint"
android:inputType="textLongMessage|textCapSentences|textMultiLine"
android:maxLines="6"
android:minHeight="44dp"
android:padding="12dp"
android:paddingBottom="12dp"
android:paddingEnd="16dp"
android:paddingStart="16dp"
android:paddingTop="12dp"
android:textColorHint="?android:attr/textColorTertiary"
app:layout_constraintBottom_toBottomOf="@id/messageBackground"
app:layout_constraintEnd_toStartOf="@id/sim"
app:layout_constraintStart_toEndOf="@id/attachSeparator" />
app:layout_constraintStart_toStartOf="@id/messageBackground" />
<ImageView
android:id="@+id/sim"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_marginEnd="8dp"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/compose_sim_cd"
android:elevation="4dp"
android:padding="10dp"
android:src="@drawable/ic_sim_card_black_24dp"
android:tint="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="@id/message"
app:layout_constraintEnd_toEndOf="@id/messageBackground" />
app:layout_constraintBottom_toBottomOf="@id/messageBackground"
app:layout_constraintEnd_toStartOf="@id/send" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/simIndex"
android:layout_width="0dp"
android:layout_height="0dp"
android:elevation="4dp"
android:gravity="center"
android:textColor="?android:attr/textColorPrimaryInverse"
android:textSize="14dp"
@@ -294,6 +299,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:elevation="4dp"
android:gravity="center"
app:layout_constraintBottom_toTopOf="@id/send"
app:layout_constraintEnd_toEndOf="@id/send"
@@ -306,17 +312,14 @@
android:id="@+id/send"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:background="@drawable/circle"
android:contentDescription="@string/compose_send_cd"
android:elevation="4dp"
android:padding="10dp"
android:src="@drawable/ic_send_black_24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
tools:backgroundTint="@color/tools_theme"
tools:tint="@color/textPrimaryDark" />
android:tint="?android:textColorSecondary"
app:layout_constraintBottom_toBottomOf="@id/messageBackground"
app:layout_constraintEnd_toEndOf="@id/messageBackground"
tools:backgroundTint="@color/tools_theme" />
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"