Merge branch 'master' into m3_redesign
This commit is contained in:
commit
42a7c324fa
|
@ -1059,7 +1059,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
|
|||
if(att.isUploadingOrProcessing())
|
||||
att.cancelUpload();
|
||||
attachments.remove(att);
|
||||
uploadNextQueuedAttachment();
|
||||
if(!areThereAnyUploadingAttachments())
|
||||
uploadNextQueuedAttachment();
|
||||
attachmentsView.removeView(att.view);
|
||||
if(getMediaAttachmentsCount()==0)
|
||||
attachmentsView.setVisibility(View.GONE);
|
||||
|
|
|
@ -335,6 +335,13 @@
|
|||
<item name="android:paddingRight">24dp</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Mastodon.M3.Button.Outlined">
|
||||
<item name="android:background">@drawable/bg_button_m3_outlined</item>
|
||||
<item name="android:textColor">@color/button_text_m3_text</item>
|
||||
<item name="android:paddingLeft">24dp</item>
|
||||
<item name="android:paddingRight">24dp</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Mastodon.M3.EditText" parent="android:Widget.Material.EditText">
|
||||
<item name="android:background">@drawable/bg_m3_outlined_text_field_nopad</item>
|
||||
<item name="android:textAppearance">@style/m3_body_large</item>
|
||||
|
|
Loading…
Reference in New Issue