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

Merge branch '2466-outline-button-fix' into 'master'

Browse Source 
Fix outline buttons to not have green background

Closes #2466

See merge request briar/briar!1830
This commit is contained in:
akwizgran
2024-07-25 10:09:18 +00:00
parent d369b9d150 2dd0be879e
commit 4a1a09c855
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-android/src/main/java/org/briarproject/briar/android/view/BriarButton.java
View File

@@ -48,8 +48,7 @@ public class BriarButton extends FrameLayout {
attributes.recycle(); attributes.recycle();
ContextThemeWrapper wrapper = new ContextThemeWrapper(context, style); ContextThemeWrapper wrapper = new ContextThemeWrapper(context, style);
button = isInEditMode() ? new MaterialButton(context) : button = new MaterialButton(wrapper, null, style);
new MaterialButton(wrapper, null, style);
button.setText(text); button.setText(text);
addView(button); addView(button);
progressBar = findViewById(R.id.briar_button_progress_bar); progressBar = findViewById(R.id.briar_button_progress_bar);

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

@@ -56,6 +56,7 @@
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:textSize">@dimen/text_size_medium</item> <item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:padding">@dimen/margin_large</item> <item name="android:padding">@dimen/margin_large</item>
<item name="android:backgroundTint">@color/window_background</item>
<item name="android:minHeight">@dimen/button_size</item> <item name="android:minHeight">@dimen/button_size</item>
<item name="cornerRadius">6dp</item> <item name="cornerRadius">6dp</item>
</style> </style>