Moved chat room muted icon + updated muted/unmuted icons
This commit is contained in:
parent
9a6dc56b42
commit
dc155e7302
4 changed files with 16 additions and 16 deletions
|
@ -20,6 +20,7 @@
|
||||||
<!-- To vibrate when pressing DTMF keys on numpad & incoming calls -->
|
<!-- To vibrate when pressing DTMF keys on numpad & incoming calls -->
|
||||||
<uses-permission android:name="android.permission.VIBRATE" />
|
<uses-permission android:name="android.permission.VIBRATE" />
|
||||||
|
|
||||||
|
<!-- TODO: require new permissions instead: https://developer.android.com/about/versions/13/behavior-changes-13 -->
|
||||||
<!-- Needed to attach file(s) in chat room fragment -->
|
<!-- Needed to attach file(s) in chat room fragment -->
|
||||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
|
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
|
||||||
android:maxSdkVersion="32"/>
|
android:maxSdkVersion="32"/>
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 3.4 KiB |
Binary file not shown.
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 2.7 KiB |
|
@ -113,6 +113,18 @@
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="@id/title" />
|
app:layout_constraintTop_toTopOf="@id/title" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/muted"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="20dp"
|
||||||
|
android:layout_marginRight="10dp"
|
||||||
|
android:adjustViewBounds="true"
|
||||||
|
android:contentDescription="@string/content_description_muted_chat_room"
|
||||||
|
android:src="@drawable/chat_room_menu_mute_notifications"
|
||||||
|
android:visibility="@{viewModel.notificationsMuted ? View.VISIBLE : View.GONE, default=gone}"
|
||||||
|
app:layout_constraintEnd_toStartOf="@id/endBarrier3"
|
||||||
|
app:layout_constraintTop_toTopOf="@id/title" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/unread"
|
android:id="@+id/unread"
|
||||||
style="@style/unread_count_font"
|
style="@style/unread_count_font"
|
||||||
|
@ -141,19 +153,6 @@
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toStartOf="@id/forward" />
|
app:layout_constraintEnd_toStartOf="@id/forward" />
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/muted"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="20dp"
|
|
||||||
android:layout_marginRight="10dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:adjustViewBounds="true"
|
|
||||||
android:contentDescription="@string/content_description_muted_chat_room"
|
|
||||||
android:src="@drawable/chat_room_menu_mute_notifications"
|
|
||||||
android:visibility="@{viewModel.notificationsMuted ? View.VISIBLE : View.GONE, default=gone}"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toStartOf="@id/endBarrier3" />
|
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/forward"
|
android:id="@+id/forward"
|
||||||
android:layout_width="40dp"
|
android:layout_width="40dp"
|
||||||
|
@ -176,18 +175,18 @@
|
||||||
app:constraint_referenced_ids="ephemeral, muted, forward"/>
|
app:constraint_referenced_ids="ephemeral, muted, forward"/>
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.Barrier
|
<androidx.constraintlayout.widget.Barrier
|
||||||
android:id="@+id/endBarrier2"
|
android:id="@+id/endBarrier3"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:barrierDirection="left"
|
app:barrierDirection="left"
|
||||||
app:constraint_referenced_ids="select, forward"/>
|
app:constraint_referenced_ids="select, forward"/>
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.Barrier
|
<androidx.constraintlayout.widget.Barrier
|
||||||
android:id="@+id/endBarrier3"
|
android:id="@+id/endBarrier2"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:barrierDirection="left"
|
app:barrierDirection="left"
|
||||||
app:constraint_referenced_ids="ephemeral, forward"/>
|
app:constraint_referenced_ids="muted, forward"/>
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue