mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-13 11:19:04 +01:00
Address issues of first design review
less round buttons, fixed outline buttons, fixed dialogs
This commit is contained in:
@@ -18,8 +18,7 @@
|
||||
app:fab_fabDrawable="@drawable/ic_action_add"
|
||||
app:fab_fabRippleColor="@android:color/transparent"
|
||||
app:fab_menu="@menu/contact_list_actions"
|
||||
app:fab_miniFabTextBackground="@color/briar_accent"
|
||||
app:fab_miniFabTextColor="@android:color/white"
|
||||
app:fab_miniFabTextBackground="?attr/colorPrimary"
|
||||
app:layout_anchorGravity="bottom|right|end"
|
||||
app:layout_behavior="org.briarproject.briar.android.view.SnackbarAwareBehavior" />
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
<Button
|
||||
android:id="@+id/button"
|
||||
style="@style/BriarButton"
|
||||
style="@style/BriarButtonOutline"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/margin_medium"
|
||||
@@ -55,7 +55,7 @@
|
||||
app:layout_constraintBottom_toBottomOf="@+id/button"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/button"
|
||||
app:srcCompat="@drawable/ic_help_outline_white"
|
||||
app:srcCompat="@drawable/ic_info_white"
|
||||
app:tint="@color/briar_button_text_positive" />
|
||||
|
||||
</merge>
|
||||
@@ -1,7 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="briar_lime_950">#283E0F</color>
|
||||
<color name="briar_lime_600">#67a60f</color>
|
||||
<color name="briar_lime_600_new">#65A30D</color>
|
||||
<color name="briar_lime_500">#82C91E</color>
|
||||
<color name="briar_lime_400">#82c91e</color>
|
||||
<color name="briar_lime_400_new">#A3E635</color>
|
||||
|
||||
@@ -91,8 +93,8 @@
|
||||
|
||||
|
||||
|
||||
<color name="md_theme_primary">@color/briar_lime_600_new</color>
|
||||
<color name="md_theme_onPrimary">#FFFFFF</color>
|
||||
<color name="md_theme_primary">@color/briar_lime_500</color>
|
||||
<color name="md_theme_onPrimary">@color/briar_lime_950</color>
|
||||
<color name="md_theme_primaryContainer">@color/briar_night_700</color>
|
||||
<color name="md_theme_onPrimaryContainer">@android:color/white</color>
|
||||
<color name="md_theme_secondary">@color/briar_night_700</color>
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<item name="android:textSize">@dimen/text_size_medium</item>
|
||||
<item name="android:padding">@dimen/margin_large</item>
|
||||
<item name="android:minHeight">@dimen/button_size</item>
|
||||
<item name="cornerRadius">6dp</item>
|
||||
</style>
|
||||
|
||||
<style name="BriarButtonFlat" parent="Widget.Material3.Button.TextButton">
|
||||
@@ -54,8 +55,9 @@
|
||||
<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:background">@drawable/button_outline</item>
|
||||
<item name="android:padding">@dimen/margin_large</item>
|
||||
<item name="android:minHeight">@dimen/button_size</item>
|
||||
<item name="cornerRadius">6dp</item>
|
||||
</style>
|
||||
|
||||
<style name="BriarButtonOutline.Negative" parent="BriarButtonOutline">
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
<item name="android:activityCloseExitAnimation">@anim/screen_new_out</item>
|
||||
</style>
|
||||
|
||||
<style name="BriarDialogTheme" parent="Theme.Material3.DayNight.Dialog.MinWidth">
|
||||
<style name="BriarDialogTheme" parent="Theme.Material3.DayNight.Dialog">
|
||||
<item name="colorPrimary">@color/briar_primary</item>
|
||||
<item name="buttonBarPositiveButtonStyle">@style/BriarButtonFlat.Positive</item>
|
||||
<item name="buttonBarNeutralButtonStyle">@style/BriarButtonFlat.Neutral</item>
|
||||
|
||||
Reference in New Issue
Block a user