Skip to content

Improve bottom sheets design #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xz-dev merged 2 commits into from
Sep 25, 2022
Merged

Improve bottom sheets design #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e02660
Improve bottom sheets design
krlvm Sep 25, 2022
eab9574
Merge branch 'dev' of https://github.com/xz-dev/NewPipe into xz-dev
krlvm Sep 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/src/main/res/values-v27/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,15 @@
</style>
<style name="Base.BlackTheme" parent="Base.V27.BlackTheme" />

<!-- Bottom Sheets -->
<style name="BottomSheetDialogTheme.Light.V27" parent="BottomSheetDialogTheme.Light.V21">
<item name="android:windowLightNavigationBar">true</item>
</style>
<style name="BottomSheetDialogTheme.Light.Base" parent="BottomSheetDialogTheme.Light.V27"/>

<style name="BottomSheetDialogTheme.Dark.V27" parent="BottomSheetDialogTheme.Dark.V21">
<item name="android:windowLightNavigationBar">false</item>
</style>
<style name="BottomSheetDialogTheme.Dark.Base" parent="BottomSheetDialogTheme.Dark.V27"/>

</resources>
2 changes: 2 additions & 0 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<color name="dark_card_item_background_color">#313131</color>
<color name="dark_card_item_contrast_color">#474747</color>
<color name="dark_border_color">#33FFFFFF</color>
<color name="dark_bottom_sheet_color">#424242</color>

<!-- Black Theme -->
<color name="black_background_color">#000000</color>
Expand All @@ -48,6 +49,7 @@
<color name="black_card_item_background_color">#0F0F0F</color>
<color name="black_card_item_contrast_color">#202020</color>
<color name="black_border_color">#25FFFFFF</color>
<color name="black_bottom_sheet_color">#121212</color>

<!-- Miscellaneous -->
<color name="queue_background_color">@color/dark_queue_background_color</color>
Expand Down
27 changes: 25 additions & 2 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<item name="colorAccent">@color/light_youtube_accent_color</item>
<item name="android:windowBackground">@color/light_background_color</item>
<item name="windowBackground">@color/light_background_color</item>
<item name="bottomSheetDialogTheme">@style/BottomSheetDialogTheme.Light</item>

<item name="separator_color">@color/light_separator_color</item>
<item name="contrast_background_color">@color/light_contrast_background_color</item>
Expand All @@ -53,6 +54,7 @@
<item name="colorAccent">@color/dark_youtube_accent_color</item>
<item name="android:windowBackground">@color/dark_background_color</item>
<item name="windowBackground">@color/dark_background_color</item>
<item name="bottomSheetDialogTheme">@style/BottomSheetDialogTheme.Dark</item>

<item name="separator_color">@color/dark_separator_color</item>
<item name="contrast_background_color">@color/dark_contrast_background_color</item>
Expand All @@ -66,7 +68,6 @@
<item name="card_item_contrast_color">@color/dark_card_item_contrast_color</item>
<item name="border_color">@color/dark_border_color</item>
<item name="dashed_border">@drawable/dashed_border_dark</item>
<item name="bottomSheetDialogTheme">@style/Theme.Design.BottomSheetDialog</item>
</style>
<style name="Base.DarkTheme" parent="Base.V21.DarkTheme" />
<style name="DarkTheme" parent="Base.DarkTheme"/>
Expand All @@ -75,6 +76,7 @@
<style name="Base.V21.BlackTheme" parent="DarkTheme">
<item name="android:windowBackground">@color/black_background_color</item>
<item name="windowBackground">@color/black_background_color</item>
<item name="bottomSheetDialogTheme">@style/BottomSheetDialogTheme.Black</item>

<item name="separator_color">@color/black_separator_color</item>
<item name="contrast_background_color">@color/black_contrast_background_color</item>
Expand All @@ -83,7 +85,6 @@
<item name="card_item_contrast_color">@color/black_card_item_contrast_color</item>
<item name="border_color">@color/black_border_color</item>
<item name="dashed_border">@drawable/dashed_border_black</item>
<item name="bottomSheetDialogTheme">@style/Theme.Design.BottomSheetDialog</item>
</style>
<style name="Base.BlackTheme" parent="Base.V21.BlackTheme" />
<style name="BlackTheme" parent="Base.BlackTheme"/>
Expand Down Expand Up @@ -157,4 +158,26 @@

<style name="RouterActivityThemeDark" parent="Base.RouterActivityThemeDark" />

<style name="BottomSheetDialogTheme.Light.V21" parent="Theme.Design.Light.BottomSheetDialog">
<item name="android:windowIsFloating">false</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/white</item>
</style>
<style name="BottomSheetDialogTheme.Light.Base" parent="BottomSheetDialogTheme.Light.V21"/>

<style name="BottomSheetDialogTheme.Dark.V21" parent="Theme.Design.BottomSheetDialog">
<item name="android:windowIsFloating">false</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@color/dark_bottom_sheet_color</item>
</style>
<style name="BottomSheetDialogTheme.Dark.Base" parent="BottomSheetDialogTheme.Dark.V21"/>

<style name="BottomSheetDialogTheme.Black" parent="BottomSheetDialogTheme.Dark.Base">
<item name="android:navigationBarColor">#121212</item>
<item name="bottomSheetStyle">@style/BottomSheetStyle.Black</item>
</style>
<style name="BottomSheetStyle.Black" parent="Widget.Design.BottomSheet.Modal">
<item name="android:background">@color/black_bottom_sheet_color</item>
</style>

</resources>