Skip to content

Upgrade to Material You and dyanmic colors #89

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
bubelov merged 1 commit into from
Nov 15, 2021
Merged

Upgrade to Material You and dyanmic colors #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_app.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
style="@style/Widget.MaterialComponents.AppBarLayout.Surface"
style="@style/Widget.Material3.AppBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-night/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<item name="android:navigationBarColor">?colorSurface</item>
</style>

<style name="FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
<style name="FloatingActionButton" parent="Widget.Material3.FloatingActionButton.Primary">
<item name="backgroundTint">?colorSurface</item>
<item name="tint">?colorOnSurface</item>
</style>
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/values-v31/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="ThemeColors" parent="Theme.Material3.DynamicColors.DayNight">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>

</resources>
7 changes: 5 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
@@ -1,11 +1,14 @@
<resources xmlns:tools="http://schemas.android.com/tools">

<style name="BaseAppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- overriden in v31/styles.xml by dynamic theme -->
<style name="ThemeColors" parent="Theme.Material3.DayNight.NoActionBar">
<item name="colorPrimary">@color/color_primary</item>
<item name="colorPrimaryDark">@color/color_primary_dark</item>
<item name="colorSecondary">@color/color_secondary</item>
<item name="colorAccent">@color/color_accent</item>
</style>

<style name="BaseAppTheme" parent="ThemeColors">
<item name="floatingActionButtonStyle">@style/FloatingActionButton</item>

<item name="android:statusBarColor">@android:color/transparent</item>
Expand All @@ -17,7 +20,7 @@
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
</style>

<style name="FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
<style name="FloatingActionButton" parent="Widget.Material3.FloatingActionButton.Primary">
<item name="backgroundTint">?colorPrimary</item>
<item name="tint">?colorOnPrimary</item>
</style>
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ versions_okhttp=4.9.1
versions_lifecycle=2.3.1
versions_recyclerview=1.2.1
versions_nextcloud_sso=0.6.0-rc5
versions_material=1.4.0
versions_material=1.5.0-beta01
versions_picasso=2.71828
versions_nav=2.3.5
versions_koin=2.2.3
Expand Down