filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Add rounded corners to bottom sheet dialog." 

This reverts commit 17c43c9188.
This commit is contained in:
Jonny Andrew 2022-10-24 09:26:11 +01:00
parent 0650b6ae22
commit 293811220d
No known key found for this signature in database
GPG Key ID: 2B6F5CF6A1EEB0B8
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
View File

@ -14,7 +14,6 @@
<!-- Default color for text View --> <!-- Default color for text View -->
<item name="android:textColorTertiary">@color/element_content_primary_light</item> <item name="android:textColorTertiary">@color/element_content_primary_light</item>
<item name="android:textColorLink">@color/element_link_light</item> <item name="android:textColorLink">@color/element_link_light</item>
<item name="bottomSheetStyle">@style/BottomSheetStyle</item>
</style> </style>
<style name="Theme.Vector.BottomSheetDialog.Dark" parent="Theme.MaterialComponents.BottomSheetDialog"> <style name="Theme.Vector.BottomSheetDialog.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
@ -29,7 +28,6 @@
<!-- Default color for text View --> <!-- Default color for text View -->
<item name="android:textColorTertiary">@color/element_content_primary_dark</item> <item name="android:textColorTertiary">@color/element_content_primary_dark</item>
<item name="android:textColorLink">@color/element_link_dark</item> <item name="android:textColorLink">@color/element_link_dark</item>
<item name="bottomSheetStyle">@style/BottomSheetStyle</item>
</style> </style>
<style name="Theme.Vector.BottomSheetDialog.Black" parent="Theme.Vector.BottomSheetDialog.Dark"> <style name="Theme.Vector.BottomSheetDialog.Black" parent="Theme.Vector.BottomSheetDialog.Dark">
@ -37,15 +35,6 @@
</style> </style>
<!-- BottomSheet style --> <!-- BottomSheet style -->
<style name="BottomSheetStyle" parent="Widget.MaterialComponents.BottomSheet.Modal">
<item name="shapeAppearance">@style/BottomSheetShapeAppearance</item>
</style>
<style name="BottomSheetShapeAppearance" parent="">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">20dp</item>
</style>
<style name="BottomSheetItemTextMain"> <style name="BottomSheetItemTextMain">
<item name="android:fontFamily">sans-serif-medium</item> <item name="android:fontFamily">sans-serif-medium</item>
<item name="android:layout_width">0dp</item> <item name="android:layout_width">0dp</item>

1
vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
View File

@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?colorSurface"
android:orientation="vertical"> android:orientation="vertical">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView

3
vector/src/main/res/layout/view_bottom_sheet_action_button.xml
View File

@ -10,6 +10,7 @@
android:id="@+id/bottomSheetActionClickableZone" android:id="@+id/bottomSheetActionClickableZone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?colorSurface"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:foreground="?attr/selectableItemBackground" android:foreground="?attr/selectableItemBackground"
@ -92,4 +93,4 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</merge> </merge>