gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-06 14:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

update bottom sheet design to latest material3, including icon tinting

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-04-05 14:46:30 +02:00 committed by Marcel Hibbe
parent 06f42a4c00
commit b66474dcb5
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
12 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/res/layout/bottom_sheet.xml
View File

@ -23,7 +23,6 @@
android:id="@+id/bottom_sheet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_bottom_sheet"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

1
app/src/main/res/layout/controller_entry_menu.xml
View File

@ -23,7 +23,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_bottom_sheet"
android:paddingStart="@dimen/standard_padding"
android:paddingTop="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_half_padding">

1
app/src/main/res/layout/dialog_attachment.xml
View File

@ -25,7 +25,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_bottom_sheet"
android:orientation="vertical"
android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_padding"

1
app/src/main/res/layout/dialog_bottom_contacts.xml
View File

@ -23,7 +23,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_bottom_sheet"
android:orientation="vertical"
android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_padding"

1
app/src/main/res/layout/dialog_conversation_operations.xml
View File

@ -25,7 +25,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_bottom_sheet"
android:orientation="vertical"
android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_padding"

13
app/src/main/res/layout/dialog_message_actions.xml
View File

@ -23,7 +23,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_bottom_sheet"
android:orientation="vertical"
android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_padding"
@ -125,7 +124,7 @@
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_content_copy"
app:tint="@color/grey_600" />
app:tint="@color/high_emphasis_menu_icon" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/menu_text_copy_message"
@ -156,7 +155,7 @@
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_eye_off"
app:tint="@color/grey_600" />
app:tint="@color/high_emphasis_menu_icon" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/menu_text_mark_as_unread"
@ -187,7 +186,7 @@
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_share_action"
app:tint="@color/grey_600" />
app:tint="@color/high_emphasis_menu_icon" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/menu_text_forward_message"
@ -218,7 +217,7 @@
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_reply"
app:tint="@color/grey_600" />
app:tint="@color/high_emphasis_menu_icon" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/menu_text_reply_to_message"
@ -249,7 +248,7 @@
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_reply"
app:tint="@color/grey_600" />
app:tint="@color/high_emphasis_menu_icon" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/menu_text_reply_privately"
@ -280,7 +279,7 @@
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_delete"
app:tint="@color/grey_600" />
app:tint="@color/high_emphasis_menu_icon" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/menu_text_delete_message"

1
app/src/main/res/layout/dialog_message_reactions.xml
View File

@ -24,7 +24,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_bottom_sheet"
android:orientation="vertical"
android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_padding"

1
app/src/main/res/layout/dialog_scope.xml
View File

@ -24,7 +24,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_bottom_sheet"
android:orientation="vertical"
android:paddingStart="@dimen/standard_padding"
android:paddingTop="@dimen/standard_half_padding"

5
app/src/main/res/layout/reaction_item.xml
View File

@ -38,8 +38,9 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:ellipsize="middle"
android:gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceListItem"
android:gravity="center_vertical|start"
android:textColor="@color/high_emphasis_text"
android:textSize="@dimen/bottom_sheet_text_size"
tools:text="Participant Name" />
<androidx.emoji.widget.EmojiTextView

3
app/src/main/res/values-night/colors.xml
View File

@ -40,6 +40,9 @@
<color name="low_emphasis_text">#61ffffff</color>
<color name="high_emphasis_text_inverse">#de000000</color>
<!-- bottom sheet specific icon default color -->
<color name="high_emphasis_menu_icon">#8Affffff</color>
<color name="bg_default">#121212</color>
<color name="bg_default_semitransparent">#99121212</color>
<color name="bg_inverse">@color/grey950</color>

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

@ -45,6 +45,9 @@
<color name="high_emphasis_text_dark_background">#deffffff</color>
<color name="medium_emphasis_text_dark_background">#99ffffff</color>
<!-- bottom sheet specific icon default color -->
<color name="high_emphasis_menu_icon">#8A000000</color>
<!-- Text color of sent messages -->
<color name="nc_outcoming_text_default">#FFFFFF</color>
<!-- Text color of received messages -->

11
app/src/main/res/values/styles.xml
View File

@ -40,6 +40,7 @@
<item name="android:navigationBarColor">@color/bg_default</item>
<item name="android:seekBarStyle">@style/Nextcloud.Material.Incoming.SeekBar</item>
<item name="seekBarStyle">@style/Nextcloud.Material.Incoming.SeekBar</item>
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog</item>
</style>
<style name="ThemeOverlay.AppTheme.PopupMenu" parent="ThemeOverlay.MaterialComponents.Dark">
@ -55,6 +56,14 @@
<item name="elevation">1dp</item>
</style>
<style name="ThemeOverlay.App.BottomSheetDialog" parent="ThemeOverlay.MaterialComponents.DayNight.BottomSheetDialog">
<item name="bottomSheetStyle">@style/Talk.BottomSheetDialog</item>
</style>
<style name="Talk.BottomSheetDialog" parent="Widget.MaterialComponents.BottomSheet.Modal">
<item name="backgroundTint">@color/bg_bottom_sheet</item>
</style>
<style name="TransparentTheme" parent="Theme.MaterialComponents.NoActionBar.Bridge">
<item name="android:windowNoTitle">true</item>
<item name="android:windowBackground">@android:color/background_dark</item>
@ -235,7 +244,7 @@
<item name="android:colorControlNormal">#ffffff</item>
</style>
<style name="BottomSheetDialogThemeNoFloating" parent="Theme.Design.Light.BottomSheetDialog">
<style name="BottomSheetDialogThemeNoFloating" parent="ThemeOverlay.MaterialComponents.DayNight.BottomSheetDialog">
<item name="android:windowIsFloating">false</item>
<item name="android:windowSoftInputMode">adjustResize</item>
</style>