Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

Migrate app to Material Design 3

Browse Source 
without dynamic colors, trying to look as before
This commit is contained in:
Torsten Grote
2024-05-10 14:37:00 -03:00
parent ab223da18c
commit e8ee0f4b44
63 changed files with 412 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
briar-android/src/main/res/values/styles.xml
View File

@@ -1,15 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="BriarToolbar" parent="Widget.AppCompat.Toolbar">
<item name="android:background">?colorPrimary</item>
<item name="android:textColorPrimary">@color/briar_text_primary_inverse</item>
<item name="android:textSize">@dimen/text_size_medium</item>
<item name="colorPrimary">@color/briar_primary</item>
<item name="titleTextAppearance">@style/BriarToolbarTitleTextAppearance</item>
<item name="subtitleTextAppearance">@style/BriarToolbarSubTitleTextAppearance</item>
<style name="BriarToolbar" parent="Widget.Material3.Toolbar">
<item name="android:background">@color/briar_primary</item>
<item name="titleTextColor">@color/briar_text_primary_inverse</item>
<item name="subtitleTextColor">@color/briar_text_secondary_inverse</item>
<item name="android:theme">@style/BriarToolbarTheme</item>
<item name="popupTheme">@style/PopupMenu</item>
</style>
@@ -18,46 +13,35 @@
<item name="colorControlNormal">@color/briar_text_primary_inverse</item>
</style>
<style name="BriarToolbarTitleTextAppearance" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
<item name="android:textColor">@color/briar_text_primary_inverse</item>
</style>
<style name="BriarToolbarSubTitleTextAppearance" parent="TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
<item name="android:textColor">@color/briar_text_secondary_inverse</item>
</style>
<style name="PopupMenu" parent="Theme.AppCompat.DayNight.DarkActionBar">
<style name="PopupMenu" parent="Theme.Material3.DayNight">
<item name="android:colorBackground">@color/window_background</item>
</style>
<style name="ButtonTheme" parent="Theme.AppCompat.DayNight">
<!-- A strange hack needed only to override button color on all API levels -->
<item name="colorAccent">@color/briar_button_background_color</item>
</style>
<style name="BriarButton" parent="Widget.AppCompat.Button.Colored">
<item name="android:theme">@style/ButtonTheme</item>
<style name="BriarButton" parent="Widget.Material3.Button">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:padding">@dimen/margin_large</item>
<item name="android:textColor">@color/button_text</item>
<item name="android:minHeight">@dimen/button_size</item>
</style>
<style name="BriarButtonFlat" parent="Widget.AppCompat.Button.Borderless">
<style name="BriarButtonFlat" parent="Widget.Material3.Button.TextButton">
<item name="android:textSize">@dimen/text_size_medium</item>
</style>
<style name="BriarButtonFlat.Negative" parent="BriarButtonFlat">
<item name="android:textColor">@color/briar_button_text_negative</item>
<item name="iconTint">@color/briar_button_text_negative</item>
</style>
<style name="BriarButtonFlat.Positive" parent="BriarButtonFlat">
<item name="android:textColor">@color/briar_button_text_positive</item>
<item name="iconTint">@color/briar_button_text_positive</item>
</style>
<style name="BriarButtonFlat.Neutral" parent="BriarButtonFlat">
<item name="android:textColor">@color/briar_button_text_neutral</item>
<item name="iconTint">@color/briar_button_text_neutral</item>
</style>
<style name="BriarButtonFlat.Positive.Tiny" parent="BriarButtonFlat.Positive">
@@ -66,7 +50,7 @@
<item name="android:minWidth">@dimen/button_size</item>
</style>
<style name="BriarButtonOutline" parent="Widget.AppCompat.Button.Borderless">
<style name="BriarButtonOutline" parent="Widget.Material3.Button.OutlinedButton">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">@dimen/text_size_medium</item>
@@ -106,6 +90,17 @@
<item name="android:background">@color/thread_indicator</item>
</style>
<style name="CircularProgress" parent="Widget.Material3.CircularProgressIndicator">
<item name="android:indeterminate">true</item>
<item name="indicatorColor">@color/briar_accent</item>
</style>
<style name="CircularProgress.Large" parent="Widget.Material3.CircularProgressIndicator">
<item name="android:indeterminate">true</item>
<item name="indicatorColor">@color/briar_accent</item>
<item name="indicatorSize">76dp</item>
</style>
<style name="BriarAvatar">
<item name="civ_border_width">@dimen/avatar_border_width</item>
<item name="civ_border_color">?android:attr/textColorSecondary</item>
@@ -135,7 +130,7 @@
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">@dimen/forum_nested_line_width</item>
<item name="android:layout_marginLeft">5dp</item>
<item name="android:layout_marginStart" tools:targetApi="jelly_bean_mr1">5dp</item>
<item name="android:layout_marginStart">5dp</item>
<item name="android:background">@color/thread_indicator</item>
<item name="android:visibility">gone</item>
</style>
@@ -149,6 +144,7 @@
<style name="StepBubble">
<item name="android:layout_width">28dp</item>
<item name="android:layout_height">28dp</item>
<!-- FIXME in dark theme accent is same color as StepBubble.Completed -->
<item name="android:background">@drawable/bubble_accent</item>
<item name="android:gravity">center</item>
<item name="android:textColor">@android:color/white</item>