gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-11 14:54:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

adjust audio output to latest material design bottom sheet specs

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-02-07 14:07:07 +01:00
parent 7f0980e6d2
commit 3e22741c1d
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
app/src/main/res/layout/dialog_audio_output.xml
View File

@ -25,28 +25,26 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/bg_call_screen_dialog" android:background="@color/bg_call_screen_dialog"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="@dimen/standard_padding"> android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_half_padding">
<TextView <TextView
android:id="@+id/upload" android:id="@+id/upload"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="@dimen/headline_item_height"
android:padding="@dimen/standard_padding" android:gravity="start|center_vertical"
android:text="@string/audio_output_dialog_headline" android:text="@string/audio_output_dialog_headline"
android:textAlignment="viewStart" android:textColor="@color/medium_emphasis_text_dark_background"
android:textColor="@color/grey_600"
android:textSize="@dimen/bottom_sheet_text_size" /> android:textSize="@dimen/bottom_sheet_text_size" />
<LinearLayout <LinearLayout
android:id="@+id/audio_output_bluetooth" android:id="@+id/audio_output_bluetooth"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/small_item_height"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="@dimen/standard_padding"
android:paddingTop="@dimen/standard_half_padding"
android:paddingRight="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_half_padding"
tools:ignore="UseCompoundDrawables"> tools:ignore="UseCompoundDrawables">
<ImageView <ImageView
@ -62,10 +60,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical" android:layout_gravity="start|center_vertical"
android:layout_marginStart="@dimen/standard_margin" android:paddingStart="@dimen/standard_double_padding"
android:paddingEnd="@dimen/zero"
android:text="@string/audio_output_bluetooth" android:text="@string/audio_output_bluetooth"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textColor="@color/call_screen_text" android:textColor="@color/high_emphasis_text_dark_background"
android:textSize="@dimen/bottom_sheet_text_size" /> android:textSize="@dimen/bottom_sheet_text_size" />
</LinearLayout> </LinearLayout>
@ -73,13 +72,10 @@
<LinearLayout <LinearLayout
android:id="@+id/audio_output_speaker" android:id="@+id/audio_output_speaker"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/small_item_height"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="@dimen/standard_padding"
android:paddingTop="@dimen/standard_half_padding"
android:paddingRight="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_half_padding"
tools:ignore="UseCompoundDrawables"> tools:ignore="UseCompoundDrawables">
<ImageView <ImageView
@ -95,10 +91,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical" android:layout_gravity="start|center_vertical"
android:layout_marginStart="@dimen/standard_margin" android:paddingStart="@dimen/standard_double_padding"
android:paddingEnd="@dimen/zero"
android:text="@string/audio_output_speaker" android:text="@string/audio_output_speaker"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textColor="@color/call_screen_text" android:textColor="@color/high_emphasis_text_dark_background"
android:textSize="@dimen/bottom_sheet_text_size" /> android:textSize="@dimen/bottom_sheet_text_size" />
</LinearLayout> </LinearLayout>
@ -106,13 +103,10 @@
<LinearLayout <LinearLayout
android:id="@+id/audio_output_earspeaker" android:id="@+id/audio_output_earspeaker"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/small_item_height"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="@dimen/standard_padding"
android:paddingTop="@dimen/standard_half_padding"
android:paddingRight="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_half_padding"
tools:ignore="UseCompoundDrawables"> tools:ignore="UseCompoundDrawables">
<ImageView <ImageView
@ -128,10 +122,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical" android:layout_gravity="start|center_vertical"
android:layout_marginStart="@dimen/standard_margin" android:paddingStart="@dimen/standard_double_padding"
android:paddingEnd="@dimen/zero"
android:text="@string/audio_output_phone" android:text="@string/audio_output_phone"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textColor="@color/call_screen_text" android:textColor="@color/high_emphasis_text_dark_background"
android:textSize="@dimen/bottom_sheet_text_size" /> android:textSize="@dimen/bottom_sheet_text_size" />
</LinearLayout> </LinearLayout>
@ -139,13 +134,10 @@
<LinearLayout <LinearLayout
android:id="@+id/audio_output_wired_headset" android:id="@+id/audio_output_wired_headset"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/small_item_height"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="@dimen/standard_padding"
android:paddingTop="@dimen/standard_half_padding"
android:paddingRight="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_half_padding"
tools:ignore="UseCompoundDrawables"> tools:ignore="UseCompoundDrawables">
<ImageView <ImageView
@ -161,10 +153,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical" android:layout_gravity="start|center_vertical"
android:layout_marginStart="@dimen/standard_margin" android:paddingStart="@dimen/standard_double_padding"
android:paddingEnd="@dimen/zero"
android:text="@string/audio_output_wired_headset" android:text="@string/audio_output_wired_headset"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textColor="@color/call_screen_text" android:textColor="@color/high_emphasis_text_dark_background"
android:textSize="@dimen/bottom_sheet_text_size" /> android:textSize="@dimen/bottom_sheet_text_size" />
</LinearLayout> </LinearLayout>

4
app/src/main/res/values/colors.xml
View File

@ -40,6 +40,10 @@
<color name="medium_emphasis_text">#99000000</color> <color name="medium_emphasis_text">#99000000</color>
<color name="low_emphasis_text">#61000000</color> <color name="low_emphasis_text">#61000000</color>
<!-- general text colors for dark background -->
<color name="high_emphasis_text_dark_background">#deffffff</color>
<color name="medium_emphasis_text_dark_background">#99ffffff</color>
<!-- Text color of sent messages --> <!-- Text color of sent messages -->
<color name="nc_outcoming_text_default">#FFFFFF</color> <color name="nc_outcoming_text_default">#FFFFFF</color>
<!-- Text color of received messages --> <!-- Text color of received messages -->

1
app/src/main/res/values/dimens.xml
View File

@ -23,6 +23,7 @@
<dimen name="activity_horizontal_margin">16dp</dimen> <dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="item_height">72dp</dimen> <dimen name="item_height">72dp</dimen>
<dimen name="headline_item_height">56dp</dimen>
<dimen name="small_item_height">48dp</dimen> <dimen name="small_item_height">48dp</dimen>
<dimen name="min_size_clickable_area">48dp</dimen> <dimen name="min_size_clickable_area">48dp</dimen>